diff --git a/docs/api/wscript_build b/docs/api/wscript_build
index 70165263..fdcecb50 100644
--- a/docs/api/wscript_build
+++ b/docs/api/wscript_build
@@ -4,6 +4,7 @@
import pproc as subprocess
import os
+import Utils
for module in ('midori', 'katze'):
try:
diff --git a/extensions/adblock.c b/extensions/adblock.c
index 5d9847e2..8b021afd 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2009 Christian Dywan
+ Copyright (C) 2009-2010 Christian Dywan
Copyright (C) 2009 Alexander Butenko
This library is free software; you can redistribute it and/or
@@ -28,12 +28,25 @@
#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] != '-'
+#ifdef G_ENABLE_DEBUG
+ #define adblock_debug(dmsg, darg1, darg2) \
+ do { if (debug == 1) g_debug (dmsg, darg1, darg2); } while (0)
+#else
+ #define adblock_debug(dmsg, darg1, darg2) /* nothing */
+#endif
static GHashTable* pattern;
static GHashTable* keys;
static gchar* blockcss = NULL;
static gchar* blockcssprivate = NULL;
static gchar* blockscript = NULL;
+#ifdef G_ENABLE_DEBUG
+static guint debug;
+#endif
static gboolean
adblock_parse_file (gchar* path);
@@ -83,6 +96,7 @@ adblock_init_db ()
katze_assign (blockcssprivate, g_strdup (""));
}
+#if WEBKIT_CHECK_VERSION (1, 1, 2)
static void
adblock_download_notify_status_cb (WebKitDownload* download,
GParamSpec* pspec,
@@ -96,6 +110,7 @@ adblock_download_notify_status_cb (WebKitDownload* download,
g_free (path);
/* g_object_unref (download); */
}
+#endif
static gchar*
adblock_get_filename_for_uri (const gchar* uri)
@@ -152,6 +167,7 @@ adblock_reload_rules (MidoriExtension* extension,
if (!adblock_parse_file (path))
{
+ #if WEBKIT_CHECK_VERSION (1, 1, 2)
WebKitNetworkRequest* request;
WebKitDownload* download;
gchar* destination = g_filename_to_uri (path, NULL, NULL);
@@ -164,6 +180,7 @@ adblock_reload_rules (MidoriExtension* extension,
g_signal_connect (download, "notify::status",
G_CALLBACK (adblock_download_notify_status_cb), path);
webkit_download_start (download);
+ #endif
}
else
g_free (path);
@@ -192,7 +209,7 @@ adblock_preferences_render_tick_cb (GtkTreeViewColumn* column,
g_object_set (renderer,
"activatable", ADBLOCK_FILTER_VALID (filter),
- "active", ADBLOCK_FILTER_VALID (filter) && filter[4] != '-',
+ "active", ADBLOCK_FILTER_VALID (filter) && ADBLOCK_FILTER_IS_SET (filter),
NULL);
g_free (filter);
@@ -225,7 +242,7 @@ adblock_preferences_renderer_toggle_toggled_cb (GtkCellRendererToggle* renderer,
if (ADBLOCK_FILTER_VALID (filter))
{
- filter[4] = ':';
+ ADBLOCK_FILTER_SET (filter, TRUE);
if (gtk_cell_renderer_toggle_get_active (renderer))
{
if (!strncmp (filter, "http", 4))
@@ -234,7 +251,7 @@ adblock_preferences_renderer_toggle_toggled_cb (GtkCellRendererToggle* renderer,
g_unlink (filename);
g_free (filename);
}
- filter[4] = '-';
+ ADBLOCK_FILTER_SET (filter, FALSE);
}
gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, filter, -1);
@@ -256,7 +273,7 @@ adblock_preferences_render_text_cb (GtkTreeViewColumn* column,
gtk_tree_model_get (model, iter, 0, &filter, -1);
if (ADBLOCK_FILTER_VALID (filter))
- filter[4] = ':';
+ ADBLOCK_FILTER_SET (filter, TRUE);
g_object_set (renderer,
"text", filter,
@@ -609,7 +626,7 @@ adblock_is_matched_by_pattern (const gchar* req_uri,
return FALSE;
else
{
- /* g_debug("blocked by pattern regexp=%s -- %s", g_regex_get_pattern (regex), req_uri); */
+ adblock_debug ("blocked by pattern regexp=%s -- %s", g_regex_get_pattern (regex), req_uri);
return TRUE;
}
}
@@ -646,7 +663,7 @@ adblock_is_matched_by_key (const gchar* opts,
}
else
{
- /* g_debug("blocked by key sig=%s regexp=%s -- %s", sig, g_regex_get_pattern (regex), req_uri); */
+ adblock_debug ("blocked by regexp=%s -- %s", g_regex_get_pattern (regex), uri);
g_list_free (regex_bl);
return TRUE;
}
@@ -752,7 +769,10 @@ adblock_resource_request_starting_cb (WebKitWebView* web_view,
if (!page_uri || !strcmp (page_uri, "about:blank"))
page_uri = req_uri;
- /* g_test_timer_start (); */
+ #ifdef G_ENABLE_DEBUG
+ if (debug == 2)
+ g_test_timer_start ();
+ #endif
/* TODO: opts should be defined */
if (adblock_is_matched (NULL, req_uri, page_uri))
{
@@ -761,7 +781,10 @@ adblock_resource_request_starting_cb (WebKitWebView* web_view,
webkit_network_request_set_uri (request, "about:blank");
g_object_set_data (G_OBJECT (web_view), "blocked-uris", blocked_uris);
}
- /* g_debug ("%f", g_test_timer_elapsed ()); */
+ #ifdef G_ENABLE_DEBUG
+ if (debug == 2)
+ g_debug ("match: %f%s", g_test_timer_elapsed (), "seconds");
+ #endif
}
#else
@@ -907,13 +930,16 @@ adblock_load_finished_cb (WebKitWebView *web_view,
{
JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
GList* uris = g_object_get_data (G_OBJECT (web_view), "blocked-uris");
+ gchar* script;
+ GList* li;
+
if (g_list_nth_data (uris, 0) == NULL)
return;
- gchar* script = adblock_prepare_urihider_js (uris);
+ script = adblock_prepare_urihider_js (uris);
webkit_web_view_execute_script (web_view, script);
sokoke_js_script_eval (js_context, script, NULL);
- GList* li = NULL;
+ li = NULL;
for (li = uris; li != NULL; li = g_list_next (li))
uris = g_list_remove (uris, li->data);
g_free (script);
@@ -935,7 +961,7 @@ adblock_add_tab_cb (MidoriBrowser* browser,
MidoriView* view,
MidoriExtension* extension)
{
- GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view));
+ GtkWidget* web_view = midori_view_get_web_view (view);
#if HAVE_WEBKIT_RESOURCE_REQUEST
GtkWidget* image = g_object_get_data (G_OBJECT (browser), "status-image");
#endif
@@ -1082,7 +1108,7 @@ adblock_compile_regexp (GHashTable* tbl,
if (!g_regex_match_simple ("[\\*]", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) &&
!g_hash_table_lookup (keystbl, sig))
{
- /* g_debug ("sig: %s %s", sig, patt); */
+ adblock_debug ("sig: %s %s", sig, patt);
g_hash_table_insert (keystbl, sig, regex);
signature_count++;
}
@@ -1091,7 +1117,7 @@ adblock_compile_regexp (GHashTable* tbl,
if (g_regex_match_simple ("^\\*", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) &&
!g_hash_table_lookup (tbl, opts))
{
- /* g_debug ("patt2: %s %s", sig, patt); */
+ adblock_debug ("patt2: %s %s", sig, patt);
g_hash_table_insert (tbl, opts, regex);
}
g_free (sig);
@@ -1102,7 +1128,7 @@ adblock_compile_regexp (GHashTable* tbl,
}
else
{
- /*g_debug ("patt: %s", patt); */
+ adblock_debug ("patt: %s%s", patt, "");
/* Pattern is a regexp chars */
g_hash_table_insert (tbl, opts, regex);
}
@@ -1139,7 +1165,7 @@ adblock_add_url_pattern (gchar* format,
fixed_patt = adblock_fixup_regexp (patt);
format_patt = g_strdup_printf (format, fixed_patt);
- /* g_debug ("got: %s opts %s", format_patt, opts); */
+ adblock_debug ("got: %s opts %s", format_patt, opts);
adblock_compile_regexp (pattern, keys, format_patt, opts);
g_strfreev (data);
@@ -1282,7 +1308,7 @@ adblock_deactivate_tabs (MidoriView* view,
MidoriBrowser* browser,
MidoriExtension* extension)
{
- GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view));
+ GtkWidget* web_view = midori_view_get_web_view (view);
#if HAVE_WEBKIT_RESOURCE_REQUEST
GtkWidget* image = g_object_get_data (G_OBJECT (browser), "status-image");
#endif
@@ -1332,6 +1358,9 @@ static void
adblock_activate_cb (MidoriExtension* extension,
MidoriApp* app)
{
+ #ifdef G_ENABLE_DEBUG
+ const gchar* debug_mode;
+ #endif
KatzeArray* browsers;
MidoriBrowser* browser;
guint i;
@@ -1342,6 +1371,19 @@ adblock_activate_cb (MidoriExtension* extension,
G_CALLBACK (adblock_session_request_queued_cb), NULL);
#endif
+ #ifdef G_ENABLE_DEBUG
+ debug_mode = g_getenv ("MIDORI_ADBLOCK");
+ if (debug_mode)
+ {
+ if (*debug_mode == '1')
+ debug = 1;
+ else if (*debug_mode == '2')
+ debug = 2;
+ else
+ debug = 0;
+ }
+ #endif
+
adblock_reload_rules (extension, FALSE);
browsers = katze_object_get_object (app, "browsers");
diff --git a/extensions/addons.c b/extensions/addons.c
new file mode 100644
index 00000000..2ccd4851
--- /dev/null
+++ b/extensions/addons.c
@@ -0,0 +1,1262 @@
+/*
+ Copyright (C) 2008 Christian Dywan
+ Copyright (C) 2008-2010 Arno Renevier
+
+ This library is free software; you can redistribute it 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 extensions add support for user addons: userscripts and userstyles */
+
+#include
+#include
+#include
+#include
+
+#include "config.h"
+
+#if HAVE_UNISTD_H
+ #include
+#endif
+
+#ifndef X_OK
+ #define X_OK 1
+#endif
+
+typedef enum
+{
+ ADDON_NONE,
+ ADDONS_USER_SCRIPTS,
+ ADDONS_USER_STYLES
+} AddonsKind;
+
+#define ADDONS_TYPE \
+ (addons_get_type ())
+#define ADDONS(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADDONS_TYPE, Addons))
+#define ADDONS_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), ADDONS_TYPE, AddonsClass))
+#define IS_ADDONS(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADDONS_TYPE))
+#define IS_ADDONS_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), ADDONS_TYPE))
+#define ADDONS_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), ADDONS_TYPE, AddonsClass))
+
+typedef struct _Addons Addons;
+typedef struct _AddonsClass AddonsClass;
+
+struct _AddonsClass
+{
+ GtkVBoxClass parent_class;
+};
+
+struct _Addons
+{
+ GtkVBox parent_instance;
+
+ GtkWidget* toolbar;
+ GtkWidget* treeview;
+
+ AddonsKind kind;
+};
+
+static void
+addons_iface_init (MidoriViewableIface* iface);
+
+G_DEFINE_TYPE_WITH_CODE (Addons, addons, GTK_TYPE_VBOX,
+ G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE,
+ addons_iface_init));
+
+struct AddonElement
+{
+ gchar* fullpath;
+ gchar* displayname;
+ gchar* description;
+ gchar* script_content;
+
+ gboolean enabled;
+ gboolean broken;
+
+ GSList* includes;
+ GSList* excludes;
+};
+
+struct AddonsList
+{
+ GtkListStore* liststore;
+ GSList* elements;
+};
+
+static void
+midori_addons_button_add_clicked_cb (GtkToolItem* toolitem,
+ Addons* addons)
+{
+ gchar* addons_type;
+ gchar* path;
+ GtkWidget* dialog;
+
+ if (addons->kind == ADDONS_USER_SCRIPTS)
+ {
+ addons_type = g_strdup ("userscripts");
+ path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
+ PACKAGE_NAME, "scripts", NULL);
+ }
+ else if (addons->kind == ADDONS_USER_STYLES)
+ {
+ addons_type = g_strdup ("userstyles");
+ path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
+ PACKAGE_NAME, "styles", NULL);
+ }
+ else
+ g_assert_not_reached ();
+
+ dialog = gtk_message_dialog_new (
+ GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
+ _("Copy %s to the folder %s."), addons_type, path);
+ g_free (addons_type);
+ g_free (path);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+}
+
+GtkWidget*
+addons_get_toolbar (MidoriViewable* viewable)
+{
+ GtkWidget* toolbar;
+ GtkToolItem* toolitem;
+
+ g_return_val_if_fail (IS_ADDONS (viewable), NULL);
+
+ if (!ADDONS (viewable)->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);
+ toolitem = gtk_tool_item_new ();
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
+ gtk_widget_show (GTK_WIDGET (toolitem));
+
+ /* separator */
+ toolitem = gtk_separator_tool_item_new ();
+ gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem),
+ FALSE);
+ gtk_tool_item_set_expand (toolitem, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
+ gtk_widget_show (GTK_WIDGET (toolitem));
+
+ /* add button */
+ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
+ gtk_tool_item_set_is_important (toolitem, TRUE);
+ g_signal_connect (toolitem, "clicked",
+ G_CALLBACK (midori_addons_button_add_clicked_cb), viewable);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
+
+ gtk_widget_show (GTK_WIDGET (toolitem));
+ ADDONS (viewable)->toolbar = toolbar;
+
+ g_signal_connect (toolbar, "destroy",
+ G_CALLBACK (gtk_widget_destroyed),
+ &ADDONS (viewable)->toolbar);
+ }
+
+ return ADDONS (viewable)->toolbar;
+}
+
+static const gchar*
+addons_get_label (MidoriViewable* viewable)
+{
+ Addons* addons = ADDONS (viewable);
+ if (addons->kind == ADDONS_USER_SCRIPTS)
+ return _("Userscripts");
+ else if (addons->kind == ADDONS_USER_STYLES)
+ return _("Userstyles");
+ return NULL;
+}
+
+static const gchar*
+addons_get_stock_id (MidoriViewable* viewable)
+{
+ Addons* addons = ADDONS (viewable);
+ if (addons->kind == ADDONS_USER_SCRIPTS)
+ return STOCK_SCRIPT;
+ else if (addons->kind == ADDONS_USER_STYLES)
+ return STOCK_STYLE;
+ return NULL;
+}
+
+static void
+addons_iface_init (MidoriViewableIface* iface)
+{
+ iface->get_stock_id = addons_get_stock_id;
+ iface->get_label = addons_get_label;
+ iface->get_toolbar = addons_get_toolbar;
+}
+
+static void
+addons_free_elements (GSList* elements)
+{
+ struct AddonElement* element;
+ GSList* start = elements;
+
+ while (elements)
+ {
+ element = elements->data;
+ g_free (element->fullpath);
+ g_free (element->displayname);
+ g_free (element->description);
+ g_free (element->script_content);
+ g_slist_free (element->includes);
+ g_slist_free (element->excludes);
+
+ elements = g_slist_next (elements);
+ }
+
+ g_slist_free (start);
+}
+
+static void
+addons_class_init (AddonsClass* class)
+{
+}
+
+static void
+addons_treeview_render_tick_cb (GtkTreeViewColumn* column,
+ GtkCellRenderer* renderer,
+ GtkTreeModel* model,
+ GtkTreeIter* iter,
+ GtkWidget* treeview)
+{
+ struct AddonElement *element;
+
+ gtk_tree_model_get (model, iter, 0, &element, -1);
+
+ g_object_set (renderer,
+ "active", element->enabled,
+ "sensitive", !element->broken,
+ NULL);
+}
+
+static void
+addons_cell_renderer_toggled_cb (GtkCellRendererToggle* renderer,
+ const gchar* path,
+ Addons* addons)
+{
+ GtkTreeModel* model;
+ GtkTreeIter iter;
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (addons->treeview));
+ if (gtk_tree_model_get_iter_from_string (model, &iter, path))
+ {
+ struct AddonElement *element;
+ GtkTreePath* tree_path;
+
+ gtk_tree_model_get (model, &iter, 0, &element, -1);
+
+ element->enabled = !element->enabled;
+
+ /* After enabling or disabling an element, the tree view
+ is not updated automatically; we need to notify tree model
+ in order to take the modification into account */
+ tree_path = gtk_tree_path_new_from_string (path);
+ gtk_tree_model_row_changed (model, tree_path, &iter);
+ gtk_tree_path_free (tree_path);
+ }
+}
+
+static void
+addons_treeview_render_text_cb (GtkTreeViewColumn* column,
+ GtkCellRenderer* renderer,
+ GtkTreeModel* model,
+ GtkTreeIter* iter,
+ GtkWidget* treeview)
+{
+ struct AddonElement *element;
+
+ gtk_tree_model_get (model, iter, 0, &element, -1);
+
+ g_object_set (renderer, "text", element->displayname, NULL);
+ if (!element->enabled)
+ g_object_set (renderer, "sensitive", false, NULL);
+ else
+ g_object_set (renderer, "sensitive", true, NULL);
+}
+
+static void
+addons_treeview_row_activated_cb (GtkTreeView* treeview,
+ GtkTreePath* path,
+ GtkTreeViewColumn* column,
+ Addons* addons)
+{
+ GtkTreeModel* model = gtk_tree_view_get_model (treeview);
+ GtkTreeIter iter;
+ if (gtk_tree_model_get_iter (model, &iter, path))
+ {
+ struct AddonElement *element;
+
+ gtk_tree_model_get (model, &iter, 0, &element, -1);
+
+ element->enabled = !element->enabled;
+
+ /* After enabling or disabling an element, the tree view
+ is not updated automatically; we need to notify tree model
+ in order to take the modification into account */
+ gtk_tree_model_row_changed (model, path, &iter);
+ }
+}
+
+static GSList*
+addons_get_directories (AddonsKind kind)
+{
+ gchar* folder_name;
+ GSList* directories;
+ const char* const* datadirs;
+ gchar* path;
+
+ g_assert (kind == ADDONS_USER_SCRIPTS || kind == ADDONS_USER_STYLES);
+
+ directories = NULL;
+ if (kind == ADDONS_USER_SCRIPTS)
+ folder_name = g_strdup ("scripts");
+ else if (kind == ADDONS_USER_STYLES)
+ folder_name = g_strdup ("styles");
+ else
+ g_assert_not_reached ();
+
+ path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
+ PACKAGE_NAME, folder_name, NULL);
+ if (g_access (path, X_OK) == 0)
+ directories = g_slist_prepend (directories, path);
+ else
+ g_free (path);
+
+ datadirs = g_get_system_data_dirs ();
+ while (*datadirs)
+ {
+ path = g_build_path (G_DIR_SEPARATOR_S, *datadirs,
+ PACKAGE_NAME, folder_name, NULL);
+ if (g_access (path, X_OK) == 0)
+ directories = g_slist_prepend (directories, path);
+ else
+ g_free (path);
+ datadirs++;
+ }
+
+ g_free (folder_name);
+
+ return directories;
+}
+
+static GSList*
+addons_get_files (AddonsKind kind)
+{
+ GSList* files;
+ GDir* addon_dir;
+ GSList* list;
+ GSList* directories;
+ const gchar* filename;
+ gchar* dirname;
+ gchar* fullname;
+ gchar* file_extension;
+
+ g_assert (kind == ADDONS_USER_SCRIPTS || kind == ADDONS_USER_STYLES);
+
+ if (kind == ADDONS_USER_SCRIPTS)
+ file_extension = g_strdup (".js");
+ else if (kind == ADDONS_USER_STYLES)
+ file_extension = g_strdup (".css");
+
+ files = NULL;
+
+ directories = addons_get_directories (kind);
+ list = directories;
+ while (directories)
+ {
+ dirname = directories->data;
+ if ((addon_dir = g_dir_open (dirname, 0, NULL)))
+ {
+ while ((filename = g_dir_read_name (addon_dir)))
+ {
+ if (g_str_has_suffix (filename, file_extension))
+ {
+ fullname = g_build_filename (dirname, filename, NULL);
+ files = g_slist_prepend (files, fullname);
+ }
+ }
+ g_dir_close (addon_dir);
+ }
+ g_free (dirname);
+ directories = g_slist_next (directories);
+ }
+
+ g_slist_free (list);
+ g_free (file_extension);
+
+ return files;
+}
+
+static gboolean
+js_metadata_from_file (const gchar* filename,
+ GSList** includes,
+ GSList** excludes,
+ gchar** name,
+ gchar** description)
+{
+ GIOChannel* channel;
+ gboolean found_meta;
+ gchar* line;
+ gchar* rest_of_line;
+
+ if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK))
+ return FALSE;
+
+ channel = g_io_channel_new_file (filename, "r", 0);
+ if (!channel)
+ return FALSE;
+
+ found_meta = FALSE;
+
+ while (g_io_channel_read_line (channel, &line, NULL, NULL, NULL)
+ == G_IO_STATUS_NORMAL)
+ {
+ if (g_str_has_prefix (line, "// ==UserScript=="))
+ found_meta = TRUE;
+ else if (found_meta)
+ {
+ if (g_str_has_prefix (line, "// ==/UserScript=="))
+ found_meta = FALSE;
+ else if (g_str_has_prefix (line, "// @require ") ||
+ g_str_has_prefix (line, "// @resource "))
+ {
+ /* We don't support these, so abort here */
+ g_free (line);
+ g_io_channel_shutdown (channel, false, 0);
+ g_slist_free (*includes);
+ g_slist_free (*excludes);
+ *includes = NULL;
+ *excludes = NULL;
+ return FALSE;
+ }
+ else if (includes && g_str_has_prefix (line, "// @include "))
+ {
+ rest_of_line = g_strdup (line + strlen ("// @include "));
+ rest_of_line = g_strstrip (rest_of_line);
+ *includes = g_slist_prepend (*includes, rest_of_line);
+ }
+ else if (excludes && g_str_has_prefix (line, "// @exclude "))
+ {
+ rest_of_line = g_strdup (line + strlen ("// @exclude "));
+ rest_of_line = g_strstrip (rest_of_line);
+ *excludes = g_slist_prepend (*excludes, rest_of_line);
+ }
+ else if (name && g_str_has_prefix (line, "// @name "))
+ {
+ rest_of_line = g_strdup (line + strlen ("// @name "));
+ rest_of_line = g_strstrip (rest_of_line);
+ *name = rest_of_line;
+ }
+ else if (description && g_str_has_prefix (line, "// @description "))
+ {
+ rest_of_line = g_strdup (line + strlen ("// @description "));
+ rest_of_line = g_strstrip (rest_of_line);
+ *description = rest_of_line;
+ }
+ }
+ g_free (line);
+ }
+ g_io_channel_shutdown (channel, false, 0);
+ g_io_channel_unref (channel);
+
+ return TRUE;
+}
+
+static gboolean
+css_metadata_from_file (const gchar* filename,
+ GSList** includes,
+ GSList** excludes)
+{
+ GIOChannel* channel;
+ gchar* line;
+ gchar* rest_of_line;
+
+ if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK))
+ return FALSE;
+
+ channel = g_io_channel_new_file (filename, "r", 0);
+ if (!channel)
+ return FALSE;
+
+ while (g_io_channel_read_line (channel, &line, NULL, NULL, NULL)
+ == G_IO_STATUS_NORMAL)
+ {
+ if (g_str_has_prefix (line, "@-moz-document"))
+ { /* FIXME: We merely look for includes. We should honor blocks. */
+ if (includes)
+ {
+ gchar** parts;
+ guint i;
+
+ rest_of_line = g_strdup (line + strlen ("@-moz-document"));
+ rest_of_line = g_strstrip (rest_of_line);
+ parts = g_strsplit (rest_of_line, " ", 0);
+ i = 0;
+ while (parts[i])
+ {
+ gchar* value = NULL;
+ if (g_str_has_prefix (parts[i], "url-prefix("))
+ value = g_strdup (parts[i] + strlen ("url-prefix("));
+ else if (g_str_has_prefix (parts[i], "url("))
+ value = g_strdup (parts[i] + strlen ("url("));
+ if (value)
+ {
+ guint j;
+
+ if (value[0] != '\'' && value[0] != '"')
+ {
+ /* Wrong syntax, abort */
+ g_free (value);
+ g_strfreev (parts);
+ g_free (line);
+ g_io_channel_shutdown (channel, false, 0);
+ g_slist_free (*includes);
+ g_slist_free (*excludes);
+ *includes = NULL;
+ *excludes = NULL;
+ return FALSE;
+ }
+ j = 1;
+ while (value[j] != '\0')
+ {
+ if (value[j] == value[0])
+ break;
+ j++;
+ }
+ *includes = g_slist_prepend (*includes, g_strndup (value + 1, j - 1));
+ g_free (value);
+ }
+
+ /* FIXME: Recognize "domain" */
+ i++;
+ }
+ g_strfreev (parts);
+ }
+ }
+ g_free (line);
+ }
+ g_io_channel_shutdown (channel, false, 0);
+ g_io_channel_unref (channel);
+
+ return TRUE;
+}
+
+static gboolean
+addons_get_element_content (gchar* file_path,
+ AddonsKind kind,
+ gchar** content)
+{
+ gchar* file_content;
+ guint meta;
+ guint i, n;
+
+ g_assert (kind == ADDONS_USER_SCRIPTS || kind == ADDONS_USER_STYLES);
+
+ if (g_file_get_contents (file_path, &file_content, NULL, NULL))
+ {
+ if (kind == ADDONS_USER_SCRIPTS)
+ {
+ *content = g_strdup_printf (
+ "window.addEventListener ('DOMContentLoaded',"
+ "function () { %s }, true);", file_content);
+ }
+ else if (kind == ADDONS_USER_STYLES)
+ {
+ meta = 0;
+ n = strlen (file_content);
+ for (i = 0; i < n; i++)
+ {
+ /* Replace line breaks with spaces */
+ if (file_content[i] == '\n' || file_content[i] == '\r')
+ file_content[i] = ' ';
+ /* Change all single quotes to double quotes */
+ if (file_content[i] == '\'')
+ file_content[i] = '\"';
+ /* Turn metadata we inspected earlier into comments */
+ if (!meta && file_content[i] == '@')
+ {
+ file_content[i] = '/';
+ meta++;
+ }
+ else if (meta == 1
+ && (file_content[i] == '-' || file_content[i] == 'n'))
+ {
+ file_content[i] = '*';
+ meta++;
+ }
+ else if (meta == 2 && file_content[i] == '{')
+ {
+ file_content[i - 1] = '*';
+ file_content[i] = '/';
+ meta++;
+ }
+ else if (meta == 3 && file_content[i] == '{')
+ meta++;
+ else if (meta == 4 && file_content[i] == '}')
+ meta--;
+ else if (meta == 3 && file_content[i] == '}')
+ {
+ file_content[i] = ' ';
+ meta = 0;
+ }
+ }
+
+ *content = g_strdup_printf (
+ "window.addEventListener ('DOMContentLoaded',"
+ "function () {"
+ "var mystyle = document.createElement(\"style\");"
+ "mystyle.setAttribute(\"type\", \"text/css\");"
+ "mystyle.appendChild(document.createTextNode('%s'));"
+ "var head = document.getElementsByTagName(\"head\")[0];"
+ "if (head) head.appendChild(mystyle);"
+ "else document.documentElement.insertBefore"
+ "(mystyle, document.documentElement.firstChild);"
+ "}, true);",
+ file_content);
+
+ }
+ g_free (file_content);
+ if (*content)
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static void
+addons_update_elements (MidoriExtension* extension,
+ AddonsKind kind)
+{
+ GSList* addon_files;
+ GSList* files_list;
+ gchar* name;
+ gchar* fullpath;
+ struct AddonElement* element;
+ struct AddonsList* addons_list;
+ GSList* elements = NULL;
+ GtkListStore* liststore = NULL;
+ GtkTreeIter iter;
+ gchar* config_file;
+ GKeyFile* keyfile;
+
+ if (kind == ADDONS_USER_SCRIPTS)
+ addons_list = g_object_get_data (G_OBJECT (extension), "scripts-list");
+ else if (kind == ADDONS_USER_STYLES)
+ addons_list = g_object_get_data (G_OBJECT (extension), "styles-list");
+ else
+ g_assert_not_reached ();
+
+ if (addons_list)
+ {
+ liststore = addons_list->liststore;
+ elements = addons_list->elements;
+ }
+
+ if (elements)
+ addons_free_elements (elements);
+
+ if (liststore)
+ gtk_list_store_clear (liststore);
+ else
+ liststore = gtk_list_store_new (3, G_TYPE_POINTER,
+ G_TYPE_INT,
+ G_TYPE_STRING);
+
+ keyfile = g_key_file_new ();
+ config_file = g_build_filename (midori_extension_get_config_dir (extension),
+ "addons", NULL);
+ g_key_file_load_from_file (keyfile, config_file, G_KEY_FILE_NONE, NULL);
+
+ addon_files = addons_get_files (kind);
+ files_list = addon_files;
+
+ elements = NULL;
+ while (addon_files)
+ {
+ fullpath = addon_files->data;
+ element = g_new (struct AddonElement, 1);
+ element->displayname = g_filename_display_basename (fullpath);
+ element->fullpath = fullpath;
+ element->enabled = TRUE;
+ element->broken = FALSE;
+ element->includes = NULL;
+ element->excludes = NULL;
+ element->description = NULL;
+ element->script_content = NULL;
+
+ if (kind == ADDONS_USER_SCRIPTS)
+ {
+ name = NULL;
+ if (!js_metadata_from_file (fullpath,
+ &element->includes, &element->excludes,
+ &name, &element->description))
+ element->broken = TRUE;
+
+ if (name)
+ katze_assign (element->displayname, name);
+
+ if (!element->broken)
+ if (!addons_get_element_content (fullpath, kind,
+ &(element->script_content)))
+ element->broken = TRUE;
+
+ if (g_key_file_get_integer (keyfile, "scripts", fullpath, NULL) & 1)
+ element->enabled = FALSE;
+ }
+ else if (kind == ADDONS_USER_STYLES)
+ {
+ if (!css_metadata_from_file (fullpath,
+ &element->includes,
+ &element->excludes))
+ element->broken = TRUE;
+
+ if (!element->broken)
+ if (!addons_get_element_content (fullpath, kind,
+ &(element->script_content)))
+ element->broken = TRUE;
+
+ if (g_key_file_get_integer (keyfile, "styles", fullpath, NULL) & 1)
+ element->enabled = FALSE;
+ }
+
+ gtk_list_store_append (liststore, &iter);
+ gtk_list_store_set (liststore, &iter,
+ 0, element, 1, 0, 2, "", -1);
+
+ addon_files = g_slist_next (addon_files);
+ elements = g_slist_prepend (elements, element);
+ }
+ g_slist_free (files_list);
+ g_free (config_file);
+ g_key_file_free (keyfile);
+
+ if (addons_list)
+ g_free (addons_list);
+ addons_list = g_new (struct AddonsList, 1);
+ addons_list->elements = elements;
+ addons_list->liststore = liststore;
+
+ if (kind == ADDONS_USER_SCRIPTS)
+ g_object_set_data (G_OBJECT (extension), "scripts-list", addons_list);
+ else if (kind == ADDONS_USER_STYLES)
+ g_object_set_data (G_OBJECT (extension), "styles-list", addons_list);
+}
+
+static void
+addons_init (Addons* addons)
+{
+ GtkTreeViewColumn* column;
+ GtkCellRenderer* renderer_text;
+ GtkCellRenderer* renderer_toggle;
+
+ addons->treeview = gtk_tree_view_new ();
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (addons->treeview), FALSE);
+ column = gtk_tree_view_column_new ();
+ renderer_toggle = gtk_cell_renderer_toggle_new ();
+ gtk_tree_view_column_pack_start (column, renderer_toggle, FALSE);
+ gtk_tree_view_column_set_cell_data_func (column, renderer_toggle,
+ (GtkTreeCellDataFunc)addons_treeview_render_tick_cb,
+ addons->treeview, NULL);
+ g_signal_connect (renderer_toggle, "toggled",
+ G_CALLBACK (addons_cell_renderer_toggled_cb), addons);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (addons->treeview), column);
+ column = gtk_tree_view_column_new ();
+ renderer_text = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (column, renderer_text, FALSE);
+ gtk_tree_view_column_set_cell_data_func (column, renderer_text,
+ (GtkTreeCellDataFunc)addons_treeview_render_text_cb,
+ addons->treeview, NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (addons->treeview), column);
+ g_signal_connect (addons->treeview, "row-activated",
+ G_CALLBACK (addons_treeview_row_activated_cb),
+ addons);
+ gtk_widget_show (addons->treeview);
+ gtk_box_pack_start (GTK_BOX (addons), addons->treeview, TRUE, TRUE, 0);
+}
+
+static gchar*
+addons_convert_to_simple_regexp (const gchar* pattern)
+{
+ guint len;
+ gchar* dest;
+ guint pos;
+ guint i;
+ gchar c;
+
+ len = strlen (pattern);
+ dest = g_malloc0 (len * 2 + 1);
+ dest[0] = '^';
+ pos = 1;
+
+ for (i = 0; i < len; i++)
+ {
+ c = pattern[i];
+ switch (c)
+ {
+ case '*':
+ dest[pos] = '.';
+ dest[pos + 1] = c;
+ pos++;
+ pos++;
+ break;
+ case '.' :
+ case '?' :
+ case '^' :
+ case '$' :
+ case '+' :
+ case '{' :
+ case '[' :
+ case '|' :
+ case '(' :
+ case ')' :
+ case ']' :
+ case '\\' :
+ dest[pos] = '\\';
+ dest[pos + 1] = c;
+ pos++;
+ pos++;
+ break;
+ case ' ' :
+ break;
+ default:
+ dest[pos] = pattern[i];
+ pos ++;
+ }
+ }
+ return dest;
+}
+
+static gboolean
+addons_may_run (const gchar* uri,
+ GSList** includes,
+ GSList** excludes)
+{
+ gboolean match;
+ GSList* list;
+
+ if (*includes)
+ match = FALSE;
+ else
+ match = TRUE;
+
+ list = *includes;
+ while (list)
+ {
+ gchar* re = addons_convert_to_simple_regexp (list->data);
+ gboolean matched = g_regex_match_simple (re, uri, 0, 0);
+ g_free (re);
+ if (matched)
+ {
+ match = TRUE;
+ break;
+ }
+ list = g_slist_next (list);
+ }
+ if (!match)
+ return FALSE;
+
+ list = *excludes;
+ while (list)
+ {
+ gchar* re = addons_convert_to_simple_regexp (list->data);
+ gboolean matched = g_regex_match_simple (re, uri, 0, 0);
+ g_free (re);
+ if (matched)
+ {
+ match = FALSE;
+ break;
+ }
+ list = g_slist_next (list);
+ }
+ return match;
+}
+
+static gboolean
+addons_skip_element (struct AddonElement* element,
+ gchar* uri)
+{
+ if (!element->enabled || element->broken)
+ return TRUE;
+ if (element->includes || element->excludes)
+ if (!addons_may_run (uri, &element->includes, &element->excludes))
+ return TRUE;
+ return FALSE;
+}
+
+static void
+addons_context_ready_cb (WebKitWebView* web_view,
+ WebKitWebFrame* web_frame,
+ JSContextRef js_context,
+ JSObjectRef js_window,
+ MidoriExtension* extension)
+{
+ gchar* uri;
+ GSList* scripts, *styles;
+ struct AddonElement* script, *style;
+ struct AddonsList* scripts_list, *styles_list;
+ uri = katze_object_get_string (web_view, "uri");
+ /* Don't run scripts or styles on blank or special pages */
+ if (!(uri && *uri && strncmp (uri, "about:", 6)))
+ {
+ g_free (uri);
+ return;
+ }
+
+ scripts_list = g_object_get_data (G_OBJECT (extension), "scripts-list");
+ scripts = scripts_list->elements;
+ while (scripts)
+ {
+ script = scripts->data;
+ if (addons_skip_element (script, uri))
+ {
+ scripts = g_slist_next (scripts);
+ continue;
+ }
+ if (script->script_content)
+ webkit_web_view_execute_script (web_view, script->script_content);
+ scripts = g_slist_next (scripts);
+ }
+
+ styles_list = g_object_get_data (G_OBJECT (extension), "styles-list");
+ styles = styles_list->elements;
+ while (styles)
+ {
+ style = styles->data;
+ if (addons_skip_element (style, uri))
+ {
+ styles = g_slist_next (styles);
+ continue;
+ }
+ if (style->script_content)
+ webkit_web_view_execute_script (web_view, style->script_content);
+ styles = g_slist_next (styles);
+ }
+}
+
+static void
+addons_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 (addons_context_ready_cb), extension);
+}
+
+static void
+addons_add_tab_foreach_cb (MidoriView* view,
+ MidoriBrowser* browser,
+ MidoriExtension* extension)
+{
+ addons_add_tab_cb (browser, view, extension);
+}
+
+static void
+addons_deactivate_tabs (MidoriView* view,
+ MidoriExtension* extension)
+{
+ GtkWidget* web_view = midori_view_get_web_view (view);
+ g_signal_handlers_disconnect_by_func (
+ web_view, addons_context_ready_cb, extension);
+}
+
+static void
+addons_browser_destroy (MidoriBrowser* browser,
+ MidoriExtension* extension)
+{
+ GtkWidget* scripts, *styles;
+
+ midori_browser_foreach (browser, (GtkCallback)addons_deactivate_tabs, extension);
+ g_signal_handlers_disconnect_by_func (browser, addons_add_tab_cb, extension);
+
+ scripts = (GtkWidget*)g_object_get_data (G_OBJECT (browser), "scripts-addons");
+ gtk_widget_destroy (scripts);
+ styles = (GtkWidget*)g_object_get_data (G_OBJECT (browser), "styles-addons");
+ gtk_widget_destroy (styles);
+}
+
+GtkWidget*
+addons_new (AddonsKind kind, MidoriExtension* extension)
+{
+ GtkWidget* addons;
+ GtkListStore* liststore;
+ struct AddonsList* list;
+
+ addons = g_object_new (ADDONS_TYPE, NULL);
+ ADDONS (addons)->kind = kind;
+
+ if (kind == ADDONS_USER_SCRIPTS)
+ list = g_object_get_data (G_OBJECT (extension), "scripts-list");
+ else if (kind == ADDONS_USER_STYLES)
+ list = g_object_get_data (G_OBJECT (extension), "styles-list");
+ else
+ g_assert_not_reached ();
+
+ liststore = list->liststore;
+ gtk_tree_view_set_model (GTK_TREE_VIEW (ADDONS(addons)->treeview),
+ GTK_TREE_MODEL (liststore));
+ gtk_widget_queue_draw (GTK_WIDGET (ADDONS(addons)->treeview));
+
+ return addons;
+}
+
+static void
+addons_app_add_browser_cb (MidoriApp* app,
+ MidoriBrowser* browser,
+ MidoriExtension* extension)
+{
+ GtkWidget* panel;
+ GtkWidget* scripts, *styles;
+
+ midori_browser_foreach (browser,
+ (GtkCallback)addons_add_tab_foreach_cb, extension);
+ g_signal_connect (browser, "add-tab",
+ G_CALLBACK (addons_add_tab_cb), extension);
+ panel = katze_object_get_object (browser, "panel");
+
+ scripts = addons_new (ADDONS_USER_SCRIPTS, extension);
+ gtk_widget_show (scripts);
+ midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (scripts));
+ g_object_set_data (G_OBJECT (browser), "scripts-addons", scripts);
+
+ styles = addons_new (ADDONS_USER_STYLES, extension);
+ gtk_widget_show (styles);
+ midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (styles));
+ g_object_set_data (G_OBJECT (browser), "styles-addons", styles);
+
+ g_object_unref (panel);
+}
+
+static void
+addons_save_settings (MidoriApp* app,
+ MidoriExtension* extension)
+{
+ struct AddonsList* scripts_list, *styles_list;
+ struct AddonElement* script, *style;
+ GSList* scripts, *styles;
+ GKeyFile* keyfile;
+ const gchar* config_dir;
+ gchar* config_file;
+ GError* error = NULL;
+
+ keyfile = g_key_file_new ();
+
+ /* scripts */
+ scripts_list = g_object_get_data (G_OBJECT (extension), "scripts-list");
+ scripts = scripts_list->elements;
+ while (scripts)
+ {
+ script = scripts->data;
+ if (!script->enabled)
+ g_key_file_set_integer (keyfile, "scripts", script->fullpath, 1);
+ scripts = g_slist_next (scripts);
+ }
+
+ /* styles */
+ styles_list = g_object_get_data (G_OBJECT (extension), "styles-list");
+ styles = styles_list->elements;
+ while (styles)
+ {
+ style = styles->data;
+ if (!style->enabled)
+ g_key_file_set_integer (keyfile, "styles", style->fullpath, 1);
+ styles = g_slist_next (styles);
+ }
+
+ config_dir = midori_extension_get_config_dir (extension);
+ config_file = g_build_filename (config_dir, "addons", NULL);
+ katze_mkdir_with_parents (config_dir, 0700);
+ sokoke_key_file_save_to_file (keyfile, config_file, &error);
+ if (error)
+ {
+ g_warning (_("The configuration of the extension '%s' couldn't be saved: %s\n"),
+ _("User addons"), error->message);
+ g_error_free (error);
+ }
+
+ g_free (config_file);
+ g_key_file_free (keyfile);
+}
+
+static void
+addons_disable_monitors (MidoriExtension* extension)
+{
+ GSList* monitors;
+
+ monitors = g_object_get_data (G_OBJECT (extension), "monitors");
+ if (!monitors)
+ return;
+
+ g_slist_foreach (monitors, (GFunc)g_file_monitor_cancel, NULL);
+ g_slist_free (monitors);
+ g_object_set_data (G_OBJECT (extension), "monitors", NULL);
+}
+
+static void
+addons_deactivate_cb (MidoriExtension* extension,
+ MidoriApp* app)
+{
+ KatzeArray* browsers;
+ MidoriBrowser* browser;
+ GSource* source;
+ guint i = 0;
+
+ addons_disable_monitors (extension);
+ addons_save_settings (NULL, extension);
+
+ browsers = katze_object_get_object (app, "browsers");
+ while ((browser = katze_array_get_nth_item (browsers, i++)))
+ addons_browser_destroy (browser, extension);
+
+ source = g_object_get_data (G_OBJECT (extension), "monitor-timer");
+ if (source && !g_source_is_destroyed (source))
+ g_source_destroy (source);
+
+ g_signal_handlers_disconnect_by_func (
+ app, addons_app_add_browser_cb, extension);
+ g_signal_handlers_disconnect_by_func (
+ app, addons_save_settings, extension);
+ g_signal_handlers_disconnect_by_func (
+ extension, addons_deactivate_cb, app);
+
+ g_object_unref (browsers);
+}
+
+static gboolean
+addons_reset_all_elements_cb (MidoriExtension* extension)
+{
+ addons_save_settings (NULL, extension);
+ addons_update_elements (extension, ADDONS_USER_STYLES);
+ addons_update_elements (extension, ADDONS_USER_SCRIPTS);
+ g_object_set_data (G_OBJECT (extension), "monitor-timer", NULL);
+ return FALSE;
+}
+
+static void
+addons_directory_monitor_changed (GFileMonitor* monitor,
+ GFile* child,
+ GFile* other_file,
+ GFileMonitorEvent flags,
+ MidoriExtension* extension)
+{
+ char* basename;
+ GSource* source;
+
+ basename = g_file_get_basename (child);
+ if (g_str_has_prefix (basename, ".") ||
+ g_str_has_suffix (basename, "~")) /* Hidden or temporary files */
+ return;
+
+ /* We receive a lot of change events, so we use a timeout to trigger
+ elements update only once */
+ source = g_object_get_data (G_OBJECT (extension), "monitor-timer");
+ if (source && !g_source_is_destroyed (source))
+ g_source_destroy (source);
+
+ source = g_timeout_source_new_seconds (1);
+ g_source_set_callback (source, (GSourceFunc)addons_reset_all_elements_cb,
+ extension, NULL);
+ g_source_attach (source, NULL);
+ g_object_set_data (G_OBJECT (extension), "monitor-timer", source);
+ g_source_unref (source);
+}
+
+static void
+addons_monitor_directories (MidoriExtension* extension,
+ AddonsKind kind)
+{
+ GSList* directories;
+ GSList* list;
+ GError* error;
+ GSList* monitors;
+ GFileMonitor* monitor;
+ GFile* directory;
+
+ g_assert (kind == ADDONS_USER_SCRIPTS || kind == ADDONS_USER_STYLES);
+
+ monitors = g_object_get_data (G_OBJECT (extension), "monitors");
+
+ directories = addons_get_directories (kind);
+ list = directories;
+ while (directories)
+ {
+ directory = g_file_new_for_path (directories->data);
+ directories = g_slist_next (directories);
+ error = NULL;
+ monitor = g_file_monitor_directory (directory,
+ G_FILE_MONITOR_NONE,
+ NULL, &error);
+ if (monitor)
+ {
+ g_signal_connect (monitor, "changed",
+ G_CALLBACK (addons_directory_monitor_changed), extension);
+ monitors = g_slist_prepend (monitors, monitor);
+ }
+ else
+ {
+ g_warning (_("Can't monitor folder '%s': %s"),
+ g_file_get_parse_name (directory), error->message);
+ g_error_free (error);
+ }
+ g_object_unref (directory);
+ }
+ g_object_set_data (G_OBJECT (extension), "monitors", monitors);
+ g_slist_free (directories);
+}
+
+static void
+addons_activate_cb (MidoriExtension* extension,
+ MidoriApp* app)
+{
+ KatzeArray* browsers;
+ MidoriBrowser* browser;
+ guint i;
+
+ browsers = katze_object_get_object (app, "browsers");
+ addons_update_elements (extension, ADDONS_USER_STYLES);
+ addons_monitor_directories (extension, ADDONS_USER_STYLES);
+ addons_update_elements (extension, ADDONS_USER_SCRIPTS);
+ addons_monitor_directories (extension, ADDONS_USER_STYLES);
+
+ i = 0;
+ while ((browser = katze_array_get_nth_item (browsers, i++)))
+ addons_app_add_browser_cb (app, browser, extension);
+ g_object_unref (browsers);
+
+ g_signal_connect (app, "add-browser",
+ G_CALLBACK (addons_app_add_browser_cb), extension);
+
+ g_signal_connect (app, "quit",
+ G_CALLBACK (addons_save_settings), extension);
+
+ g_signal_connect (extension, "deactivate",
+ G_CALLBACK (addons_deactivate_cb), app);
+}
+
+MidoriExtension*
+extension_init (void)
+{
+ MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION,
+ "name", _("User addons"),
+ "description", _("Support for userscripts and userstyles"),
+ "version", "0.1",
+ "authors", "Arno Renevier ",
+ NULL);
+ g_signal_connect (extension, "activate",
+ G_CALLBACK (addons_activate_cb), NULL);
+
+ return extension;
+}
diff --git a/extensions/colorful-tabs.c b/extensions/colorful-tabs.c
index 01a0bd7b..d9c108ef 100644
--- a/extensions/colorful-tabs.c
+++ b/extensions/colorful-tabs.c
@@ -1,5 +1,6 @@
/*
Copyright (C) 2009 Christian Dywan
+ Copyright (C) 2010 Samuel Creshal
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -11,56 +12,118 @@
#include
+static void
+colorful_tabs_modify_fg (GtkWidget* child,
+ GdkColor* color)
+{
+ if (GTK_IS_LABEL (child))
+ {
+ gtk_widget_modify_fg (child, GTK_STATE_ACTIVE, color);
+ gtk_widget_modify_fg (child, GTK_STATE_NORMAL, color);
+ }
+}
+
static void
colorful_tabs_view_notify_uri_cb (MidoriView* view,
GParamSpec* pspec,
MidoriExtension* extension)
{
+ GtkWidget* box;
GtkWidget* label;
SoupURI* uri;
- gchar* hash;
gchar* colorstr;
GdkColor color;
+ GdkColor fgcolor;
+ GdkPixbuf* icon;
label = midori_view_get_proxy_tab_label (view);
- /* Find a color that is unique to an address. We merely compute
- a hash value, pick the first 6 + 1 characters and turn the
- first into a hash sign, ie. #8b424b. In case a color is too
- dark, we lighten it up a litte. Finally we make the event box
- visible and modify its background. */
-
- if ((uri = soup_uri_new (midori_view_get_display_uri (view))) && uri->host)
+ if ((uri = soup_uri_new (midori_view_get_display_uri (view)))
+ && uri->host && (katze_object_get_enum (view, "load-status") == MIDORI_LOAD_FINISHED))
{
- hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri->host, -1);
+ icon = midori_view_get_icon (view);
+
+ if (midori_view_get_icon_uri (view) != NULL)
+ {
+ GdkPixbuf* newpix;
+ guchar* pixels;
+
+ newpix = gdk_pixbuf_scale_simple (icon, 1, 1, GDK_INTERP_BILINEAR);
+ g_return_if_fail (gdk_pixbuf_get_bits_per_sample (newpix) == 8);
+ pixels = gdk_pixbuf_get_pixels (newpix);
+ color.red = pixels[0] * 225;
+ color.green = pixels[1] * 225;
+ color.blue = pixels[2] * 225;
+ }
+ else
+ {
+ gchar* hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri->host, 1);
+ colorstr = g_strndup (hash, 6 + 1);
+ g_free (hash);
+ colorstr[0] = '#';
+ gdk_color_parse (colorstr, &color);
+ }
soup_uri_free (uri);
- colorstr = g_strndup (hash, 6 + 1);
- g_free (hash);
- colorstr[0] = '#';
- gdk_color_parse (colorstr, &color);
- if (color.red < 35000)
- color.red += 25000 + (color.blue + 1) / 2;
- if (color.green < 35000)
- color.green += 25000 + (color.red + 1) / 2;
- if (color.blue < 35000)
- color.blue += 25000 + (color.green + 1) / 2;
+
+ if ((color.red < 35000)
+ && (color.green < 35000)
+ && (color.blue < 35000))
+ {
+ color.red += 20000;
+ color.green += 20000;
+ color.blue += 20000;
+ }
+
+ /* 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);
+
+ box = gtk_bin_get_child (GTK_BIN (label));
+
gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), TRUE);
+
+ gtk_container_foreach (GTK_CONTAINER (box),
+ (GtkCallback) colorful_tabs_modify_fg,
+ &fgcolor);
+
gtk_widget_modify_bg (label, GTK_STATE_NORMAL, &color);
+
+ if (color.red < 10000)
+ color.red = 5000;
+ else
+ color.red -= 5000;
+ if (color.blue < 10000)
+ color.blue = 5000;
+ else
+ color.blue -= 5000;
+ if (color.green < 10000)
+ color.green = 5000;
+ else
+ color.green -= 5000;
+
gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, &color);
}
else
{
gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL);
gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL);
+ gtk_container_foreach (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (label))),
+ (GtkCallback) colorful_tabs_modify_fg,
+ NULL);
}
}
+
static void
colorful_tabs_browser_add_tab_cb (MidoriBrowser* browser,
GtkWidget* view,
MidoriExtension* extension)
{
colorful_tabs_view_notify_uri_cb (MIDORI_VIEW (view), NULL, extension);
- g_signal_connect (view, "notify::uri",
+ g_signal_connect (view, "notify::icon",
G_CALLBACK (colorful_tabs_view_notify_uri_cb), extension);
}
@@ -90,6 +153,9 @@ colorful_tabs_deactivate_cb (MidoriExtension* extension,
gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), FALSE);
gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL);
gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL);
+ gtk_container_foreach (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (label))),
+ (GtkCallback) colorful_tabs_modify_fg,
+ NULL);
g_signal_handlers_disconnect_by_func (
view, colorful_tabs_view_notify_uri_cb, extension);
}
@@ -137,8 +203,8 @@ extension_init (void)
MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION,
"name", _("Colorful Tabs"),
"description", _("Tint each tab distinctly"),
- "version", "0.1",
- "authors", "Christian Dywan ",
+ "version", "0.5",
+ "authors", "Christian Dywan , Samuel Creshal ",
NULL);
g_signal_connect (extension, "activate",
diff --git a/extensions/external-applications.vala b/extensions/external-applications.vala
new file mode 100644
index 00000000..f56b3c4b
--- /dev/null
+++ b/extensions/external-applications.vala
@@ -0,0 +1,105 @@
+/*
+ Copyright (C) 2010 Christian Dywan
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+using Gtk;
+using WebKit;
+using Midori;
+
+public class ExternalApplications : Midori.Extension {
+ Dialog? dialog;
+ bool launch (string command, string uri) {
+ try {
+ var info = GLib.AppInfo.create_from_commandline (command, "", 0);
+ var uris = new List();
+ uris.prepend (uri);
+ info.launch_uris (uris, new GLib.AppLaunchContext ());
+ return true;
+ }
+ catch (GLib.Error error) {
+ var error_dialog = new Gtk.MessageDialog (null, 0,
+ Gtk.MessageType.ERROR, Gtk.ButtonsType.OK,
+ "Failed to launch external application.");
+ error_dialog.format_secondary_text (error.message);
+ error_dialog.response.connect ((dialog, response)
+ => { dialog.destroy (); });
+ error_dialog.show ();
+ }
+ return false;
+ }
+ bool navigating (WebFrame web_frame, NetworkRequest request,
+ WebNavigationAction action, WebPolicyDecision decision) {
+ string uri = request.get_uri ();
+ if (uri.has_prefix ("ftp://")) {
+ if (launch ("gftp", uri)) {
+ decision.ignore ();
+ return true;
+ }
+ }
+ return false;
+ }
+ void tab_added (View tab) {
+ var web_view = tab.get_web_view ();
+ web_view.navigation_policy_decision_requested.connect (navigating);
+ }
+ void configure_external_applications () {
+ if (dialog == null) {
+ dialog = new Dialog.with_buttons ("Configure External Applications",
+ get_app ().browser,
+ DialogFlags.DESTROY_WITH_PARENT | DialogFlags.NO_SEPARATOR,
+ STOCK_CLOSE, ResponseType.CLOSE);
+ dialog.icon_name = STOCK_PROPERTIES;
+ dialog.destroy.connect ((dialog) => { dialog = null; });
+ dialog.response.connect ((dialog, response) => { dialog.destroy (); });
+ dialog.show ();
+ }
+ else
+ dialog.present ();
+ }
+ void tool_menu_populated (Menu menu) {
+ var menuitem = new MenuItem.with_mnemonic ("Configure _External Applications...");
+ menuitem.activate.connect (configure_external_applications);
+ menuitem.show ();
+ menu.append (menuitem);
+ }
+ void browser_added (Browser browser) {
+ foreach (var tab in browser.get_tabs ())
+ tab_added (tab);
+ browser.add_tab.connect (tab_added);
+ browser.populate_tool_menu.connect (tool_menu_populated);
+ }
+ void activated (Midori.App app) {
+ foreach (var browser in app.get_browsers ())
+ browser_added (browser);
+ app.add_browser.connect (browser_added);
+ }
+ void deactivated () {
+ var app = get_app ();
+ app.add_browser.disconnect (browser_added);
+ foreach (var browser in app.get_browsers ()) {
+ foreach (var tab in browser.get_tabs ())
+ /* */;
+ browser.populate_tool_menu.disconnect (tool_menu_populated);
+ }
+ }
+ internal ExternalApplications () {
+ GLib.Object (name: "External Applications",
+ description: "Associate URL schemes with external commands",
+ version: "0.1",
+ authors: "Christian Dywan ");
+ activate.connect (activated);
+ deactivate.connect (deactivated);
+ }
+}
+
+public Midori.Extension extension_init () {
+ return new ExternalApplications ();
+}
+
diff --git a/extensions/feed-panel/feed-atom.c b/extensions/feed-panel/feed-atom.c
index 3b0a33e5..0cf14c30 100644
--- a/extensions/feed-panel/feed-atom.c
+++ b/extensions/feed-panel/feed-atom.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2009 Dale Whittaker
+ Copyright (C) 2009-2010 Dale Whittaker
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -130,34 +130,6 @@ atom_get_link (KatzeItem* item,
xmlFree (newtype);
}
-static gchar*
-atom_get_title (FeedParser* fparser)
-{
- const gchar* name;
-
- if (!(name = katze_item_get_name (fparser->item)))
- {
- gchar* type;
-
- type = (gchar*)xmlGetProp (fparser->node, BAD_CAST "type");
- if (type)
- {
- gchar* content = NULL;
-
- if (g_str_equal (type, "html") ||
- g_str_equal (type, "xhtml"))
- content = feed_get_element_markup (fparser);
-
- xmlFree (type);
-
- if (content)
- return content;
- }
- return feed_get_element_string (fparser);
- }
- return g_strdup (name);
-}
-
static void
atom_preparse_entry (FeedParser* fparser)
{
@@ -181,12 +153,12 @@ atom_parse_entry (FeedParser* fparser)
}
else if (!xmlStrcmp (node->name, BAD_CAST "title"))
{
- content = atom_get_title (fparser);
+ content = feed_get_element_string (fparser);
katze_item_set_name (fparser->item, content);
}
else if (!xmlStrcmp (node->name, BAD_CAST "summary"))
{
- content = feed_get_element_string (fparser);
+ content = feed_get_element_markup (fparser);
katze_item_set_text (fparser->item, content);
}
else if (!xmlStrcmp (node->name, BAD_CAST "updated"))
@@ -209,7 +181,7 @@ atom_parse_entry (FeedParser* fparser)
/* Only retrieve content if there is no summary */
if (!katze_item_get_text (fparser->item))
{
- content = feed_get_element_string (fparser);
+ content = feed_get_element_markup (fparser);
katze_item_set_text (fparser->item, content);
}
}
@@ -269,12 +241,12 @@ atom_parse_feed (FeedParser* fparser)
}
else if (!xmlStrcmp (node->name, BAD_CAST "title"))
{
- content = atom_get_title (fparser);
+ content = feed_get_element_string (fparser);
katze_item_set_name (fparser->item, content);
}
else if (!xmlStrcmp (node->name, BAD_CAST "subtitle"))
{
- content = feed_get_element_string (fparser);
+ content = feed_get_element_markup (fparser);
katze_item_set_text (fparser->item, content);
}
else if (!xmlStrcmp (node->name, BAD_CAST "updated"))
diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c
index eacb56ab..8ef29d69 100644
--- a/extensions/feed-panel/feed-panel.c
+++ b/extensions/feed-panel/feed-panel.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2009 Dale Whittaker
+ Copyright (C) 2009-2010 Dale Whittaker
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -657,8 +657,12 @@ webview_navigation_request_cb (WebKitWebView* web_view,
uri = webkit_network_request_get_uri (request);
n = midori_browser_add_uri (browser, uri);
midori_browser_set_current_page (browser, n);
+ webkit_web_policy_decision_ignore (policy_decision);
+
+ return TRUE;
}
- return TRUE;
+
+ return FALSE;
}
static const gchar*
diff --git a/extensions/feed-panel/feed-parse.c b/extensions/feed-panel/feed-parse.c
index 1f4b1614..1f7c41b0 100644
--- a/extensions/feed-panel/feed-parse.c
+++ b/extensions/feed-panel/feed-parse.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2009 Dale Whittaker
+ Copyright (C) 2009-2010 Dale Whittaker
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -13,16 +13,24 @@
#include
gchar*
-feed_get_element_string (FeedParser* fparser)
+feed_get_element_markup (FeedParser* fparser)
{
xmlNodePtr node;
node = fparser->node;
+ if (node->children &&
+ !xmlIsBlankNode (node->children) &&
+ node->children->type == XML_ELEMENT_NODE)
+ {
+ return ((gchar*) xmlNodeGetContent (node->children));
+ }
+
if (!node->children ||
xmlIsBlankNode (node->children) ||
- node->children->type != XML_TEXT_NODE
- )
+ (node->children->type != XML_TEXT_NODE &&
+ node->children->type != XML_CDATA_SECTION_NODE)
+ )
{
/* Some servers add required elements with no content,
* create a dummy string to handle it.
@@ -70,19 +78,11 @@ feed_remove_markup (gchar* markup)
}
gchar*
-feed_get_element_markup (FeedParser* fparser)
+feed_get_element_string (FeedParser* fparser)
{
gchar* markup;
- xmlNodePtr node = fparser->node;
- if (node->children &&
- !xmlIsBlankNode (node->children) &&
- node->children->type == XML_ELEMENT_NODE)
- {
- return (gchar*) xmlNodeGetContent (node->children);
- }
-
- markup = feed_get_element_string (fparser);
+ markup = feed_get_element_markup (fparser);
return feed_remove_markup (markup);
}
diff --git a/extensions/feed-panel/feed-rss.c b/extensions/feed-panel/feed-rss.c
index e8022634..8351fd53 100644
--- a/extensions/feed-panel/feed-rss.c
+++ b/extensions/feed-panel/feed-rss.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2009 Dale Whittaker
+ Copyright (C) 2009-2010 Dale Whittaker
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -107,12 +107,12 @@ rss_parse_item (FeedParser* fparser)
}
else if (!xmlStrcmp (node->name, BAD_CAST "title"))
{
- content = feed_get_element_markup (fparser);
+ content = feed_get_element_string (fparser);
katze_item_set_name (fparser->item, content);
}
else if (!xmlStrcmp (node->name, BAD_CAST "description"))
{
- content = feed_get_element_string (fparser);
+ content = feed_get_element_markup (fparser);
katze_item_set_text (fparser->item, content);
}
else if (!xmlStrcmp (node->name, BAD_CAST "pubDate"))
@@ -184,12 +184,12 @@ rss_parse_channel (FeedParser* fparser)
if (!xmlStrcmp (node->name, BAD_CAST "title"))
{
- content = feed_get_element_markup (fparser);
+ content = feed_get_element_string (fparser);
katze_item_set_name (fparser->item, content);
}
else if (!xmlStrcmp (node->name, BAD_CAST "description"))
{
- content = feed_get_element_string (fparser);
+ content = feed_get_element_markup (fparser);
katze_item_set_text (fparser->item, content);
}
else if (!xmlStrcmp (node->name, BAD_CAST "lastBuildDate"))
diff --git a/extensions/formhistory.c b/extensions/formhistory.c
index 9b33300e..f0790af8 100644
--- a/extensions/formhistory.c
+++ b/extensions/formhistory.c
@@ -306,7 +306,7 @@ formhistory_add_tab_cb (MidoriBrowser* browser,
MidoriView* view,
MidoriExtension* extension)
{
- GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view));
+ GtkWidget* web_view = midori_view_get_web_view (view);
g_signal_connect (web_view, "window-object-cleared",
G_CALLBACK (formhistory_window_object_cleared_cb), NULL);
#if WEBKIT_CHECK_VERSION (1, 1, 4)
@@ -348,7 +348,7 @@ formhistory_deactivate_tabs (MidoriView* view,
MidoriBrowser* browser,
MidoriExtension* extension)
{
- GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view));
+ GtkWidget* web_view = midori_view_get_web_view (view);
g_signal_handlers_disconnect_by_func (
web_view, formhistory_window_object_cleared_cb, NULL);
#if WEBKIT_CHECK_VERSION (1, 1, 4)
diff --git a/extensions/mouse-gestures.c b/extensions/mouse-gestures.c
index eedaa572..c3c93bf0 100644
--- a/extensions/mouse-gestures.c
+++ b/extensions/mouse-gestures.c
@@ -1,6 +1,6 @@
/*
Copyright (C) 2009 Matthias Kruk
- Copyright (C) 2009 Christian Dywan
+ Copyright (C) 2009-2010 Christian Dywan
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -28,6 +28,7 @@ struct MouseGestureNode {
} MouseGestureNode_t;
struct _MouseGesture {
+ MouseButton button;
struct MouseGestureNode start;
struct MouseGestureNode middle;
struct MouseGestureNode end;
@@ -37,8 +38,6 @@ struct _MouseGesture {
#define DEVIANCE 20
#define MINLENGTH 50
-#define MOUSE_GESTURES_BUTTON MOUSE_BUTTON_MIDDLE
-
MouseGesture *gesture;
void mouse_gesture_clear (MouseGesture *g)
@@ -65,7 +64,7 @@ mouse_gestures_button_press_event_cb (GtkWidget* web_view,
GdkEvent* event,
MidoriBrowser* browser)
{
- if (event->button.button == MOUSE_GESTURES_BUTTON)
+ if (event->button.button == gesture->button)
{
/* If the gesture was previously cleaned,
start a new gesture and coordinates. */
@@ -98,27 +97,36 @@ mouse_gestures_motion_notify_event_cb (GtkWidget* web_view,
{
gesture->middle.x = x;
gesture->middle.y = y;
+ return TRUE;
}
else if ((gesture->middle.x - x < DEVIANCE && gesture->middle.x - x > -DEVIANCE) ||
(gesture->middle.y - y < DEVIANCE && gesture->middle.y - y > -DEVIANCE))
{
gesture->end.x = x;
gesture->end.y = y;
+ return TRUE;
}
-
- return TRUE;
}
return FALSE;
}
static gboolean
-mouse_gestures_button_release_event_cb (GtkWidget* web_view,
- GdkEvent* event,
- MidoriBrowser* browser)
+mouse_gestures_activate_action (MidoriView* view,
+ const gchar* name)
+{
+ MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
+ midori_browser_activate_action (browser, name);
+ return TRUE;
+}
+
+static gboolean
+mouse_gestures_button_release_event_cb (GtkWidget* web_view,
+ GdkEventButton* event,
+ MidoriView* view)
{
/* All mouse gestures will use this mouse button */
- if (gesture->last == MOUSE_GESTURES_BUTTON)
+ if (gesture->last == gesture->button)
{
/* The initial horizontal move is between the bounds */
if ((gesture->middle.x - gesture->start.x < DEVIANCE) &&
@@ -133,18 +141,18 @@ mouse_gestures_button_release_event_cb (GtkWidget* web_view,
(gesture->middle.y - gesture->end.y > -DEVIANCE) &&
(gesture->end.x > gesture->middle.x + MINLENGTH))
/* We moved down then right: close the tab */
- midori_browser_activate_action (browser, "TabClose");
+ return mouse_gestures_activate_action (view, "TabClose");
/* Then we the final vertical move is between the bounds and
we moved left more than MINLENGTH pixels */
else if ((gesture->middle.y - gesture->end.y < DEVIANCE) &&
(gesture->middle.y - gesture->end.y > -DEVIANCE) &&
(gesture->end.x + MINLENGTH < gesture->middle.x))
/* We moved down then left: reload */
- midori_browser_activate_action (browser, "Reload");
+ return mouse_gestures_activate_action (view, "Reload");
/* The end node was never updated, we only did a vertical move */
else if(gesture->end.y == 0 && gesture->end.x == 0)
/* We moved down then: create a new tab */
- midori_browser_activate_action (browser, "TabNew");
+ return mouse_gestures_activate_action (view, "TabNew");
}
/* We initially moved up more than MINLENGTH pixels */
else if (gesture->middle.y + MINLENGTH < gesture->start.y)
@@ -152,7 +160,7 @@ mouse_gestures_button_release_event_cb (GtkWidget* web_view,
/* The end node was never updated, we only did a vertical move */
if (gesture->end.y == 0 && gesture->end.x == 0)
/* We moved up: stop */
- midori_browser_activate_action (browser, "Stop");
+ return mouse_gestures_activate_action (view, "Stop");
}
}
/* The initial horizontal move is between the bounds */
@@ -165,7 +173,7 @@ mouse_gestures_button_release_event_cb (GtkWidget* web_view,
/* The end node was never updated, we only did an horizontal move */
if (gesture->end.x == 0 && gesture->end.y == 0)
/* We moved right: forward */
- midori_browser_activate_action (browser, "Forward");
+ return mouse_gestures_activate_action (view, "Forward");
}
/* We initially moved left more than MINLENGTH pixels */
else if (gesture->middle.x + MINLENGTH < gesture->start.x)
@@ -173,12 +181,18 @@ mouse_gestures_button_release_event_cb (GtkWidget* web_view,
/* The end node was never updated, we only did an horizontal move */
if (gesture->end.x == 0 && gesture->end.y == 0)
/* We moved left: back */
- midori_browser_activate_action (browser, "Back");
+ return mouse_gestures_activate_action (view, "Back");
}
}
-
mouse_gesture_clear (gesture);
+ }
+ if (event->button == 3)
+ {
+ GtkWidget* menu = gtk_menu_new ();
+ midori_view_populate_popup (view, menu, TRUE);
+ katze_widget_popup (GTK_WIDGET (web_view), GTK_MENU (menu),
+ event, KATZE_MENU_POSITION_CURSOR);
return TRUE;
}
@@ -190,7 +204,7 @@ mouse_gestures_add_tab_cb (MidoriBrowser* browser,
MidoriView* view,
MidoriExtension* extension)
{
- GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view));
+ GtkWidget* web_view = midori_view_get_web_view (view);
g_object_connect (web_view,
"signal::button-press-event",
@@ -198,7 +212,7 @@ mouse_gestures_add_tab_cb (MidoriBrowser* browser,
"signal::motion-notify-event",
mouse_gestures_motion_notify_event_cb, browser,
"signal::button-release-event",
- mouse_gestures_button_release_event_cb, browser,
+ mouse_gestures_button_release_event_cb, view,
NULL);
}
@@ -231,7 +245,7 @@ static void
mouse_gestures_deactivate_tabs (MidoriView* view,
MidoriBrowser* browser)
{
- GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view));
+ GtkWidget* web_view = midori_view_get_web_view (view);
g_object_disconnect (web_view,
"any_signal::button-press-event",
@@ -239,7 +253,7 @@ mouse_gestures_deactivate_tabs (MidoriView* view,
"any_signal::motion-notify-event",
mouse_gestures_motion_notify_event_cb, browser,
"any_signal::button-release-event",
- mouse_gestures_button_release_event_cb, browser,
+ mouse_gestures_button_release_event_cb, view,
NULL);
}
@@ -270,6 +284,7 @@ mouse_gestures_activate_cb (MidoriExtension* extension,
guint i;
gesture = mouse_gesture_new ();
+ gesture->button = midori_extension_get_integer (extension, "button");
browsers = katze_object_get_object (app, "browsers");
i = 0;
@@ -289,7 +304,7 @@ extension_init (void)
"description", _("Control Midori by moving the mouse"),
"version", "0.1",
"authors", "Matthias Kruk ", NULL);
- midori_extension_install_integer (extension, "button", MOUSE_GESTURES_BUTTON);
+ midori_extension_install_integer (extension, "button", MOUSE_BUTTON_RIGHT);
g_signal_connect (extension, "activate",
G_CALLBACK (mouse_gestures_activate_cb), NULL);
diff --git a/extensions/status-clock.c b/extensions/status-clock.c
new file mode 100644
index 00000000..96bcf74d
--- /dev/null
+++ b/extensions/status-clock.c
@@ -0,0 +1,187 @@
+/*
+ Copyright (C) 2010 Arno Renevier
+
+ This library is free software; you can redistribute it 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 extension adds time and/or date in midori statusbar. Format for time
+ * display can be configured by creating a desktop entry file named
+ * ~/.config/midori/extensions/libclock.so/config
+ *
+ * That file must contain a section "settings", and a key "format". That format
+ * will be used as format parameter to strftime. For example, If you want to
+ * display full date and time according to your locale, "config" must contain:
+ *
+ * [settings]
+ * format=%c
+ *
+ * If that file does not exist, or format specification cannot be read, format
+ * fallback to %R which means time will be display with a 24-hour notation. For
+ * example, 13:53
+ */
+
+#include
+
+#include "config.h"
+
+#define DEFAULT_FORMAT "%R"
+
+static void
+clock_deactivate_cb (MidoriExtension* extension,
+ MidoriApp* app);
+
+static void
+clock_set_timeout (MidoriBrowser* browser,
+ guint interval);
+
+static gboolean
+clock_set_current_time (MidoriBrowser* browser)
+{
+ MidoriExtension* extension;
+ GtkWidget* label;
+ const gchar* format;
+ struct tm *tm;
+ time_t rawtime;
+ char datestring[60];
+ guint interval;
+
+ extension = g_object_get_data (G_OBJECT (browser), "clock-extension");
+ label = g_object_get_data (G_OBJECT (browser), "clock-label");
+ format = midori_extension_get_string (extension, "format");
+
+ rawtime = time (NULL);
+ tm = localtime (&rawtime);
+
+ strftime (datestring, 60, format, tm);
+ gtk_label_set_label (GTK_LABEL (label), datestring);
+
+ if (g_strstr_len (format, -1, "%c")
+ || g_strstr_len (format, -1, "%N")
+ || g_strstr_len (format, -1, "%s")
+ || g_strstr_len (format, -1, "%S")
+ || g_strstr_len (format, -1, "%T")
+ || g_strstr_len (format, -1, "%X")
+ )
+ interval = 1;
+ else
+ /* FIXME: Occasionally there are more than 60 seconds in a minute. */
+ interval = MAX (60 - tm->tm_sec, 1);
+
+ clock_set_timeout (browser, interval);
+
+ return FALSE;
+}
+
+static void
+clock_set_timeout (MidoriBrowser* browser,
+ guint interval)
+{
+ GSource* source;
+ source = g_timeout_source_new_seconds (interval);
+ g_source_set_callback (source, (GSourceFunc)clock_set_current_time, browser, NULL);
+ g_source_attach (source, NULL);
+ g_object_set_data (G_OBJECT (browser), "clock-timer", source);
+ g_source_unref (source);
+}
+
+static void
+clock_browser_destroy_cb (MidoriBrowser* browser,
+ gpointer data)
+{
+ GSource* source;
+ source = g_object_get_data (G_OBJECT (browser), "clock-timer");
+ g_source_destroy (source);
+ g_signal_handlers_disconnect_by_func (browser, clock_browser_destroy_cb, NULL);
+}
+
+static void
+clock_app_add_browser_cb (MidoriApp* app,
+ MidoriBrowser* browser,
+ MidoriExtension* extension)
+{
+ GtkWidget* statusbar;
+ GtkWidget* label;
+
+ label = gtk_label_new (NULL);
+
+ statusbar = katze_object_get_object (browser, "statusbar");
+ gtk_box_pack_end (GTK_BOX (statusbar), label, FALSE, FALSE, 0);
+
+ g_object_set_data (G_OBJECT (browser), "clock-label", label);
+ g_object_set_data (G_OBJECT (browser), "clock-extension", extension);
+
+ clock_set_current_time (browser);
+ gtk_widget_show (label);
+
+ g_object_unref (statusbar);
+
+ g_signal_connect (browser, "destroy", G_CALLBACK (clock_browser_destroy_cb), NULL);
+}
+
+static void
+clock_deactivate_cb (MidoriExtension* extension,
+ MidoriApp* app)
+{
+ KatzeArray* browsers;
+ MidoriBrowser* browser;
+ GtkWidget* label;
+ guint i = 0;
+
+ browsers = katze_object_get_object (app, "browsers");
+ while ((browser = katze_array_get_nth_item (browsers, i++)))
+ {
+ clock_browser_destroy_cb (browser, NULL);
+ label = g_object_get_data (G_OBJECT (browser), "clock-label");
+ gtk_widget_destroy (label);
+ g_object_set_data (G_OBJECT (browser), "clock-label", NULL);
+ }
+
+ g_signal_handlers_disconnect_by_func (
+ app, clock_app_add_browser_cb, extension);
+ g_signal_handlers_disconnect_by_func (
+ extension, clock_deactivate_cb, app);
+ g_object_unref (browsers);
+}
+
+static void
+clock_activate_cb (MidoriExtension* extension,
+ MidoriApp* app)
+{
+ KatzeArray* browsers;
+ MidoriBrowser* browser;
+ guint i = 0;
+
+ browsers = katze_object_get_object (app, "browsers");
+ while ((browser = katze_array_get_nth_item (browsers, i++)))
+ clock_app_add_browser_cb (app, browser, extension);
+ g_signal_connect (app, "add-browser",
+ G_CALLBACK (clock_app_add_browser_cb), extension);
+
+ g_signal_connect (extension, "deactivate",
+ G_CALLBACK (clock_deactivate_cb), app);
+
+ g_object_unref (browsers);
+}
+
+MidoriExtension*
+extension_init (void)
+{
+ MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION,
+ "name", _("Status clock"),
+ "description", _("Display date and time in the statusbar"),
+ "version", "0.1",
+ "authors", "Arno Renevier ",
+ NULL);
+ midori_extension_install_string (extension, "format", DEFAULT_FORMAT);
+
+ g_signal_connect (extension, "activate",
+ G_CALLBACK (clock_activate_cb), NULL);
+
+ return extension;
+}
diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c
index 6fb1fc8f..2d182d5e 100644
--- a/extensions/tab-panel.c
+++ b/extensions/tab-panel.c
@@ -329,8 +329,13 @@ tab_panel_view_notify_icon_cb (GtkWidget* view,
{
GtkTreeModel* model = tab_panel_get_model_for_browser (browser);
GtkTreeIter iter;
+ GtkWidget* label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view));
+ GtkStyle* style = gtk_widget_get_style (label);
if (tab_panel_get_iter_for_view (model, &iter, view))
- gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 3, icon, -1);
+ gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
+ 3, icon,
+ 6, &style->bg[GTK_STATE_NORMAL],
+ -1);
}
}
@@ -354,12 +359,10 @@ tab_panel_view_notify_title_cb (GtkWidget* view,
GtkTreeIter iter;
if (tab_panel_get_iter_for_view (model, &iter, view))
{
- GtkWidget* label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view));
- GtkStyle* style = gtk_widget_get_style (label);
gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
4, title,
5, midori_view_get_label_ellipsize (MIDORI_VIEW (view)),
- 6, &style->bg[GTK_STATE_NORMAL], -1);
+ -1);
}
}
}
diff --git a/extensions/tab-switcher.c b/extensions/tab-switcher.c
index d4749e83..add09df1 100644
--- a/extensions/tab-switcher.c
+++ b/extensions/tab-switcher.c
@@ -25,7 +25,8 @@ static GdkPixbuf* tab_selector_get_snapshot(MidoriView* view,
gfloat factor;
g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
- web_view = gtk_bin_get_child (GTK_BIN (view));
+
+ web_view = midori_view_get_web_view (view);
if(maxwidth < 0) {
maxwidth *= -1;
diff --git a/extensions/wscript_build b/extensions/wscript_build
index c09986ed..668bb6de 100644
--- a/extensions/wscript_build
+++ b/extensions/wscript_build
@@ -14,13 +14,18 @@ for extension in extensions:
for fila in files:
if fila[-2:] == '.c':
source += ' ' + extension + os.sep + fila
+ elif 'VALAC' in bld.env and 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':
+ if extension[-2:] == '.c':
+ target = extension[:-2]
+ elif 'VALAC' in bld.env and extension[-5:] == '.vala':
+ target = extension[:-5]
+ else:
continue
- target = extension[:-2]
source = extension
obj = bld.new_task_gen ('cc', 'shlib')
@@ -28,6 +33,8 @@ for extension in extensions:
obj.includes = '..'
obj.source = source
obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON'
+ obj.vapi_dirs = '../midori'
+ obj.packages = 'glib-2.0 gio-2.0 gtk+-2.0 libsoup-2.4 webkit-1.0 midori'
obj.install_path = '${LIBDIR}/midori'
if bld.env['platform'] == 'win32':
obj.uselib_local = 'midori'
diff --git a/katze/katze-array.c b/katze/katze-array.c
index 1a7cba09..44b77501 100644
--- a/katze/katze-array.c
+++ b/katze/katze-array.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008-2009 Christian Dywan
+ Copyright (C) 2008-2010 Christian Dywan
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -76,7 +76,7 @@ _katze_array_add_item (KatzeArray* array,
{
GType type = G_OBJECT_TYPE (item);
- g_return_if_fail (katze_array_is_a (array, type));
+ /* g_return_if_fail (katze_array_is_a (array, type)); */
g_object_ref (item);
if (g_type_is_a (type, KATZE_TYPE_ITEM))
katze_item_set_parent (item, array);
@@ -461,6 +461,24 @@ katze_array_move_item (KatzeArray* array,
g_signal_emit (array, signals[MOVE_ITEM], 0, item, position);
}
+/**
+ * katze_array_get_items:
+ * @array: a #KatzeArray
+ *
+ * Retrieves the items as a list.
+ *
+ * Return value: a newly allocated #GList of items
+ *
+ * Since: 0.2.5
+ **/
+GList*
+katze_array_get_items (KatzeArray* array)
+{
+ g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL);
+
+ return g_list_copy (array->items);
+}
+
/**
* katze_array_clear:
* @array: a #KatzeArray
diff --git a/katze/katze-array.h b/katze/katze-array.h
index 06953607..17d203d8 100644
--- a/katze/katze-array.h
+++ b/katze/katze-array.h
@@ -77,6 +77,9 @@ katze_array_move_item (KatzeArray* array,
gpointer item,
gint position);
+GList*
+katze_array_get_items (KatzeArray* array);
+
void
katze_array_clear (KatzeArray* array);
diff --git a/katze/katze-item.c b/katze/katze-item.c
index e3962a39..9ea98bd3 100644
--- a/katze/katze-item.c
+++ b/katze/katze-item.c
@@ -189,7 +189,6 @@ katze_item_finalize (GObject* object)
g_free (item->name);
g_free (item->text);
g_free (item->uri);
- g_free (item->icon);
g_free (item->token);
g_hash_table_unref (item->metadata);
@@ -217,7 +216,7 @@ katze_item_set_property (GObject* object,
katze_assign (item->uri, g_value_dup_string (value));
break;
case PROP_ICON:
- katze_assign (item->icon, g_value_dup_string (value));
+ katze_item_set_icon (item, g_value_get_string (value));
break;
case PROP_TOKEN:
katze_assign (item->token, g_value_dup_string (value));
@@ -254,7 +253,7 @@ katze_item_get_property (GObject* object,
g_value_set_string (value, item->uri);
break;
case PROP_ICON:
- g_value_set_string (value, item->icon);
+ g_value_set_string (value, katze_item_get_icon (item));
break;
case PROP_TOKEN:
g_value_set_string (value, item->token);
@@ -398,7 +397,7 @@ katze_item_get_icon (KatzeItem* item)
{
g_return_val_if_fail (KATZE_IS_ITEM (item), NULL);
- return item->icon;
+ return katze_item_get_meta_string (item, "icon");
}
/**
@@ -414,7 +413,7 @@ katze_item_set_icon (KatzeItem* item,
{
g_return_if_fail (KATZE_IS_ITEM (item));
- katze_assign (item->icon, g_strdup (icon));
+ katze_item_set_meta_string (item, "icon", icon);
g_object_notify (G_OBJECT (item), "icon");
}
@@ -698,7 +697,6 @@ katze_item_copy (KatzeItem* item)
"name", item->name,
"text", item->text,
"uri", item->uri,
- "icon", item->icon,
"token", item->token,
"added", item->added,
"parent", item->parent,
diff --git a/katze/katze-item.h b/katze/katze-item.h
index 344f5013..387a7a23 100644
--- a/katze/katze-item.h
+++ b/katze/katze-item.h
@@ -39,7 +39,6 @@ struct _KatzeItem
gchar* name;
gchar* text;
gchar* uri;
- gchar* icon;
gchar* token;
gint64 added;
GHashTable* metadata;
diff --git a/katze/katze-net.c b/katze/katze-net.c
index c4cdbaea..d781b9b8 100644
--- a/katze/katze-net.c
+++ b/katze/katze-net.c
@@ -27,7 +27,6 @@ struct _KatzeNet
{
GObject parent_instance;
- GHashTable* memory;
gchar* cache_path;
guint cache_size;
@@ -53,18 +52,9 @@ katze_net_class_init (KatzeNetClass* class)
gobject_class->finalize = katze_net_finalize;
}
-static void
-katze_net_object_maybe_unref (gpointer object)
-{
- if (object)
- g_object_unref (object);
-}
-
static void
katze_net_init (KatzeNet* net)
{
- net->memory = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, katze_net_object_maybe_unref);
net->cache_path = g_build_filename (g_get_user_cache_dir (),
PACKAGE_NAME, NULL);
@@ -76,7 +66,6 @@ katze_net_finalize (GObject* object)
{
KatzeNet* net = KATZE_NET (object);
- g_hash_table_destroy (net->memory);
katze_assign (net->cache_path, NULL);
G_OBJECT_CLASS (katze_net_parent_class)->finalize (object);
@@ -147,7 +136,7 @@ katze_net_priv_free (KatzeNetPriv* priv)
g_free (priv);
}
-static gchar*
+gchar*
katze_net_get_cached_path (KatzeNet* net,
const gchar* uri,
const gchar* subfolder)
@@ -383,242 +372,3 @@ katze_net_load_uri (KatzeNet* net,
g_idle_add ((GSourceFunc)katze_net_default_cb, priv);
}
-typedef struct
-{
- KatzeNet* net;
- gchar* icon_file;
- KatzeNetIconCb icon_cb;
- GtkWidget* widget;
- gpointer user_data;
-} KatzeNetIconPriv;
-
-static void
-katze_net_icon_priv_free (KatzeNetIconPriv* priv)
-{
- g_free (priv->icon_file);
- if (priv->widget)
- g_object_unref (priv->widget);
- g_free (priv);
-}
-
-static gboolean
-katze_net_icon_status_cb (KatzeNetRequest* request,
- KatzeNetIconPriv* priv)
-{
- switch (request->status)
- {
- case KATZE_NET_VERIFIED:
- if (request->mime_type &&
- !g_str_has_prefix (request->mime_type, "image/"))
- {
- katze_net_icon_priv_free (priv);
- return FALSE;
- }
- break;
- case KATZE_NET_MOVED:
- break;
- default:
- katze_net_icon_priv_free (priv);
- return FALSE;
- }
-
- return TRUE;
-}
-
-static void
-katze_net_icon_transfer_cb (KatzeNetRequest* request,
- KatzeNetIconPriv* priv)
-{
- 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)
- {
- if ((fp = fopen (priv->icon_file, "wb")))
- {
- ret = fwrite (request->data, 1, request->length, fp);
- fclose (fp);
- if ((ret - request->length) != 0)
- {
- g_warning ("Error writing to file %s "
- "in katze_net_icon_transfer_cb()", priv->icon_file);
- }
- pixbuf = gdk_pixbuf_new_from_file (priv->icon_file, NULL);
- }
- else
- pixbuf = katze_pixbuf_new_from_buffer ((guchar*)request->data,
- request->length, request->mime_type, NULL);
- if (pixbuf)
- g_object_ref (pixbuf);
- g_hash_table_insert (priv->net->memory,
- g_strdup (priv->icon_file), pixbuf);
- }
-
- if (!priv->icon_cb)
- {
- katze_net_icon_priv_free (priv);
- return;
- }
-
- if (!pixbuf)
- {
- if (priv->widget)
- pixbuf = gtk_widget_render_icon (priv->widget,
- GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL);
- else
- {
- priv->icon_cb (NULL, priv->user_data);
- katze_net_icon_priv_free (priv);
- return;
- }
- }
-
- if (priv->widget)
- settings = gtk_widget_get_settings (priv->widget);
- else
- settings = gtk_settings_get_for_screen (gdk_screen_get_default ());
-
- gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU,
- &icon_width, &icon_height);
- pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height,
- GDK_INTERP_BILINEAR);
- g_object_unref (pixbuf);
-
- priv->icon_cb (pixbuf_scaled, priv->user_data);
- katze_net_icon_priv_free (priv);
-}
-
-/**
- * katze_net_load_icon:
- * @net: a #KatzeNet
- * @uri: an URI string, or %NULL
- * @icon_cb: function to call upon completion
- * @widget: a related #GtkWidget, or %NULL
- * @user_data: data to pass to the callback
- *
- * Requests a transfer of an icon for @uri. This is
- * implemented by looking for a favicon.ico, an
- * image according to the file type or even a
- * generated icon. The provided icon is intended
- * for user interfaces and not guaranteed to be
- * the same over multiple requests, plus it may
- * be scaled to fit the menu icon size.
- *
- * Pass a valid #GtkWidget to @widget if you want
- * a themed default icon in case of a missing icon,
- * otherwise %NULL will be returned in that case.
- *
- * The caller is expected to use the returned icon
- * and update it if @icon_cb is called.
- *
- * Depending on whether the icon was previously
- * cached or @uri is a local resource, the returned
- * icon may already be the final one.
- *
- * Note that both the returned #GdkPixbuf and the
- * icon passed to @icon_cb are newly allocated and
- * the caller owns the reference.
- *
- * Since 0.1.2 @widget can be %NULL.
- *
- * Return value: a #GdkPixbuf, or %NULL
- **/
-GdkPixbuf*
-katze_net_load_icon (KatzeNet* net,
- const gchar* uri,
- KatzeNetIconCb icon_cb,
- GtkWidget* widget,
- gpointer user_data)
-{
- KatzeNetIconPriv* priv;
- gchar* icon_uri;
- gchar* icon_file;
- GdkPixbuf* pixbuf;
- gint icon_width, icon_height;
- GdkPixbuf* pixbuf_scaled;
- GtkSettings* settings;
-
- g_return_val_if_fail (KATZE_IS_NET (net), NULL);
- g_return_val_if_fail (!widget || GTK_IS_WIDGET (widget), NULL);
- g_return_val_if_fail (uri != NULL, NULL);
-
- pixbuf = NULL;
- icon_uri = g_strdup (g_object_get_data (G_OBJECT (net), uri));
- g_object_set_data (G_OBJECT (net), uri, NULL);
- if ((icon_uri && g_str_has_prefix (icon_uri, "http"))
- || g_str_has_prefix (uri, "http"))
- {
- if (!icon_uri)
- {
- guint i = 8;
- while (uri[i] != '\0' && uri[i] != '/')
- i++;
- if (uri[i] == '/')
- {
- icon_uri = g_strdup (uri);
- icon_uri[i] = '\0';
- icon_uri = g_strdup_printf ("%s/favicon.ico", icon_uri);
- }
- else
- icon_uri = g_strdup_printf ("%s/favicon.ico", uri);
- }
-
- icon_file = katze_net_get_cached_path (net, icon_uri, "icons");
-
- if (g_hash_table_lookup_extended (net->memory,
- icon_file, NULL, (gpointer)&pixbuf))
- {
- g_free (icon_file);
- if (pixbuf)
- g_object_ref (pixbuf);
- }
- else if ((pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL)))
- g_free (icon_file);
- /* If the called doesn't provide an icon callback,
- we assume there is no interest in loading an un-cached icon. */
- else if (icon_cb)
- {
- priv = g_new0 (KatzeNetIconPriv, 1);
- priv->net = net;
- priv->icon_file = icon_file;
- priv->icon_cb = icon_cb;
- priv->widget = widget ? g_object_ref (widget) : NULL;
- priv->user_data = user_data;
-
- katze_net_load_uri (net, icon_uri,
- (KatzeNetStatusCb)katze_net_icon_status_cb,
- (KatzeNetTransferCb)katze_net_icon_transfer_cb, priv);
- }
- g_free (icon_uri);
- }
-
- if (!pixbuf)
- {
- if (widget)
- pixbuf = gtk_widget_render_icon (widget,
- GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL);
- else
- return NULL;
- }
-
- if (widget)
- settings = gtk_widget_get_settings (widget);
- else
- settings = gtk_settings_get_for_screen (gdk_screen_get_default ());
-
- gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU,
- &icon_width, &icon_height);
- pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height,
- GDK_INTERP_BILINEAR);
- g_object_unref (pixbuf);
-
- return pixbuf_scaled;
-}
diff --git a/katze/katze-net.h b/katze/katze-net.h
index d57a74b0..f26a0ce1 100644
--- a/katze/katze-net.h
+++ b/katze/katze-net.h
@@ -74,15 +74,10 @@ katze_net_load_uri (KatzeNet* net,
KatzeNetTransferCb transfer_cb,
gpointer user_data);
-typedef void (*KatzeNetIconCb) (GdkPixbuf* icon,
- gpointer user_data);
-
-GdkPixbuf*
-katze_net_load_icon (KatzeNet* net,
+gchar*
+katze_net_get_cached_path (KatzeNet* net,
const gchar* uri,
- KatzeNetIconCb icon_cb,
- GtkWidget* widget,
- gpointer user_data);
+ const gchar* subfolder);
G_END_DECLS
diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c
index dce2189d..6dcbbac1 100644
--- a/katze/katze-throbber.c
+++ b/katze/katze-throbber.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2007-2008 Christian Dywan
+ Copyright (C) 2007-2010 Christian Dywan
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,6 +16,8 @@
#include
#include
+#define HAVE_SPINNER GTK_CHECK_VERSION (2, 20, 0)
+
#if !GTK_CHECK_VERSION (2, 18, 0)
#define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation
#define gtk_widget_set_has_window(wdgt, wnd) \
@@ -25,7 +27,11 @@
struct _KatzeThrobber
{
+ #if HAVE_SPINNER
+ GtkSpinner parent_instance;
+ #else
GtkMisc parent_instance;
+ #endif
GtkIconSize icon_size;
gchar* icon_name;
@@ -42,7 +48,20 @@ struct _KatzeThrobber
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
{
@@ -106,11 +125,13 @@ katze_throbber_expose_event (GtkWidget* widget,
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)
@@ -206,6 +227,9 @@ 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;
}
@@ -431,14 +455,17 @@ katze_throbber_set_animated (KatzeThrobber* throbber,
throbber->animated = animated;
+ #if HAVE_SPINNER
+ g_object_set (throbber, "active", animated, NULL);
+ #else
if (animated && (throbber->timer_id < 0))
throbber->timer_id = g_timeout_add_full (
G_PRIORITY_LOW, 50,
(GSourceFunc)katze_throbber_timeout,
throbber,
(GDestroyNotify)katze_throbber_timeout_destroy);
-
gtk_widget_queue_draw (GTK_WIDGET (throbber));
+ #endif
g_object_notify (G_OBJECT (throbber), "animated");
}
@@ -741,6 +768,7 @@ katze_throbber_unmap (GtkWidget* widget)
GTK_WIDGET_CLASS (katze_throbber_parent_class)->unmap (widget);
}
+#if !HAVE_SPINNER
static gboolean
katze_throbber_timeout (KatzeThrobber* throbber)
{
@@ -756,6 +784,7 @@ katze_throbber_timeout_destroy (KatzeThrobber* throbber)
throbber->index = 0;
throbber->timer_id = -1;
}
+#endif
static void
katze_throbber_style_set (GtkWidget* widget,
@@ -803,10 +832,16 @@ katze_throbber_aligned_coords (GtkWidget* widget,
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
gtk_widget_get_allocation (widget, &allocation);
gtk_widget_size_request (widget, &requisition);
@@ -823,6 +858,11 @@ katze_throbber_expose_event (GtkWidget* widget,
gint ax, ay;
KatzeThrobber* throbber = KATZE_THROBBER (widget);
+ #if HAVE_SPINNER
+ if (throbber->animated)
+ return GTK_WIDGET_CLASS (katze_throbber_parent_class)->expose_event (widget, event);
+ #endif
+
if (G_UNLIKELY (!throbber->width || !throbber->height))
return TRUE;
diff --git a/katze/katze-throbber.h b/katze/katze-throbber.h
index dfa714a8..18c212ed 100644
--- a/katze/katze-throbber.h
+++ b/katze/katze-throbber.h
@@ -33,16 +33,6 @@ typedef struct _KatzeThrobber KatzeThrobber;
typedef struct _KatzeThrobberPrivate KatzeThrobberPrivate;
typedef struct _KatzeThrobberClass KatzeThrobberClass;
-struct _KatzeThrobberClass
-{
- GtkMiscClass parent_class;
-
- /* Padding for future expansion */
- void (*_katze_reserved1) (void);
- void (*_katze_reserved2) (void);
- void (*_katze_reserved3) (void);
- void (*_katze_reserved4) (void);
-};
GType
katze_throbber_get_type (void) G_GNUC_CONST;
diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index a4af47a5..5416eb7b 100644
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -29,6 +29,9 @@
#include
#endif
+#if !GTK_CHECK_VERSION (2, 14, 0)
+ #define gtk_widget_get_window(wdgt) wdgt->window
+#endif
#if !GTK_CHECK_VERSION (2, 18, 0)
#define gtk_widget_get_has_window(wdgt) !GTK_WIDGET_NO_WINDOW (wdgt)
#define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation
@@ -85,6 +88,7 @@ proxy_combo_box_text_changed_cb (GtkComboBox* button,
gchar* text = gtk_combo_box_get_active_text (button);
const gchar* property = g_object_get_data (G_OBJECT (button), "property");
g_object_set (object, property, text, NULL);
+ g_free (text);
}
static const gchar*
@@ -1457,7 +1461,7 @@ katze_load_cached_icon (const gchar* uri,
{
GdkPixbuf* icon = NULL;
- if (g_str_has_prefix (uri, "http://"))
+ if (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri,"https://"))
{
guint i;
gchar* icon_uri;
diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c
index cfdacf9c..583a09a4 100644
--- a/midori/gtkiconentry.c
+++ b/midori/gtkiconentry.c
@@ -67,8 +67,6 @@ gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry,
((pos) == GTK_ICON_ENTRY_PRIMARY || \
(pos) == GTK_ICON_ENTRY_SECONDARY)
-#define GTK_ICON_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ICON_ENTRY, GtkIconEntryPrivate))
-
typedef struct
{
GdkPixbuf *pixbuf;
@@ -84,13 +82,13 @@ typedef struct
gboolean insensitive;
} EntryIconInfo;
-typedef struct _GtkIconEntryPrivate
+struct _GtkIconEntryPrivate
{
gdouble fraction;
EntryIconInfo icons[MAX_ICONS];
gulong icon_released_id;
-} GtkIconEntryPrivate;
+};
enum
{
@@ -602,7 +600,7 @@ entry_expose_event (GtkWidget* entry,
GdkWindow* text_area;
gint width, height;
- priv = GTK_ICON_ENTRY_GET_PRIVATE (icon_entry);
+ priv = icon_entry->priv;
text_area = GTK_ENTRY (entry)->text_area;
gdk_drawable_get_size (text_area, &width, &height);
@@ -620,6 +618,9 @@ entry_expose_event (GtkWidget* entry,
static void
gtk_icon_entry_init (GtkIconEntry *entry)
{
+ entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (entry, GTK_TYPE_ICON_ENTRY,
+ GtkIconEntryPrivate);
+
g_signal_connect_after (entry, "expose-event",
G_CALLBACK (entry_expose_event), entry);
}
@@ -662,7 +663,7 @@ gtk_icon_entry_map (GtkWidget *widget)
GTK_WIDGET_CLASS (parent_class)->map (widget);
- priv = GTK_ICON_ENTRY_GET_PRIVATE (widget);
+ priv = GTK_ICON_ENTRY (widget)->priv;
for (i = 0; i < MAX_ICONS; i++)
{
@@ -692,7 +693,7 @@ gtk_icon_entry_unmap (GtkWidget *widget)
{
int i;
- priv = GTK_ICON_ENTRY_GET_PRIVATE (widget);
+ priv = GTK_ICON_ENTRY (widget)->priv;
for (i = 0; i < MAX_ICONS; i++)
{
@@ -809,7 +810,7 @@ get_icon_width (GtkIconEntry *entry, GtkIconEntryPosition icon_pos)
GtkIconEntryPrivate *priv;
EntryIconInfo *icon_info;
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
icon_info = &priv->icons[icon_pos];
if (icon_info->pixbuf == NULL)
@@ -911,7 +912,7 @@ gtk_icon_entry_realize (GtkWidget *widget)
int i;
entry = GTK_ICON_ENTRY (widget);
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
GTK_WIDGET_CLASS (parent_class)->realize (widget);
@@ -955,7 +956,7 @@ gtk_icon_entry_unrealize (GtkWidget *widget)
int i;
entry = GTK_ICON_ENTRY (widget);
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
@@ -1006,7 +1007,7 @@ place_windows (GtkIconEntry *icon_entry, GtkAllocation *widget_alloc)
GtkIconEntryPrivate *priv;
gint y;
- priv = GTK_ICON_ENTRY_GET_PRIVATE (icon_entry);
+ priv = icon_entry->priv;
get_text_area_size (icon_entry, &text_area_alloc);
@@ -1066,7 +1067,7 @@ get_pixbuf_from_icon (GtkIconEntry *entry, GtkIconEntryPosition icon_pos)
EntryIconInfo *icon_info;
GtkIconEntryPrivate *priv;
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
icon_info = &priv->icons[icon_pos];
g_object_ref (icon_info->pixbuf);
@@ -1131,7 +1132,7 @@ draw_icon (GtkWidget *widget, GtkIconEntryPosition icon_pos)
gint x, y, width, height;
entry = GTK_ICON_ENTRY (widget);
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
icon_info = &priv->icons[icon_pos];
if (icon_info->pixbuf == NULL || !GTK_WIDGET_REALIZED (widget))
@@ -1211,7 +1212,7 @@ gtk_icon_entry_expose (GtkWidget *widget, GdkEventExpose *event)
g_return_val_if_fail (event != NULL, FALSE);
entry = GTK_ICON_ENTRY (widget);
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
if (GTK_WIDGET_DRAWABLE (widget))
{
@@ -1256,7 +1257,7 @@ gtk_icon_entry_enter_notify (GtkWidget *widget, GdkEventCrossing *event)
int i;
entry = GTK_ICON_ENTRY (widget);
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
for (i = 0; i < MAX_ICONS; i++)
{
@@ -1293,7 +1294,7 @@ gtk_icon_entry_leave_notify (GtkWidget *widget, GdkEventCrossing *event)
int i;
entry = GTK_ICON_ENTRY (widget);
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
for (i = 0; i < MAX_ICONS; i++)
{
@@ -1322,7 +1323,7 @@ gtk_icon_entry_button_press (GtkWidget *widget, GdkEventButton *event)
int i;
entry = GTK_ICON_ENTRY (widget);
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
for (i = 0; i < MAX_ICONS; i++)
{
@@ -1355,7 +1356,7 @@ gtk_icon_entry_button_release (GtkWidget *widget, GdkEventButton *event)
int i;
entry = GTK_ICON_ENTRY (widget);
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
for (i = 0; i < MAX_ICONS; i++)
{
@@ -1407,7 +1408,7 @@ icon_theme_changed (GtkIconEntry *entry)
GtkIconEntryPrivate *priv;
int i;
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
for (i = 0; i < MAX_ICONS; i++)
{
@@ -1445,7 +1446,7 @@ gtk_icon_entry_set_icon_internal (GtkIconEntry *entry,
g_return_if_fail (GTK_IS_ICON_ENTRY (entry));
g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos));
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
icon_info = &priv->icons[icon_pos];
if (pixbuf == icon_info->pixbuf)
@@ -1517,7 +1518,7 @@ gtk_icon_entry_set_icon_from_pixbuf (GtkIconEntry *entry,
g_return_if_fail (GTK_IS_ICON_ENTRY (entry));
g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos));
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
icon_info = &priv->icons[icon_pos];
if (pixbuf == icon_info->pixbuf)
@@ -1614,7 +1615,7 @@ gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry,
g_return_if_fail (GTK_IS_ICON_ENTRY (entry));
g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos));
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
icon_info = &priv->icons[icon_pos];
screen = gtk_widget_get_screen (GTK_WIDGET (entry));
@@ -1672,7 +1673,7 @@ gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry,
GError *error = NULL;
GtkIconInfo *info;
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
icon_info = &priv->icons[icon_pos];
screen = gtk_widget_get_screen (GTK_WIDGET (entry));
@@ -1725,7 +1726,7 @@ gtk_icon_entry_set_cursor (const GtkIconEntry *entry,
GtkIconEntryPrivate *priv;
GdkCursor *cursor;
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
icon_info = &priv->icons[icon_pos];
icon_info->cursor_type = cursor_type;
@@ -1757,7 +1758,7 @@ gtk_icon_entry_set_icon_highlight (const GtkIconEntry *entry,
EntryIconInfo *icon_info;
GtkIconEntryPrivate *priv;
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ICON_ENTRY (entry));
@@ -1792,7 +1793,7 @@ gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry,
g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), NULL);
g_return_val_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos), NULL);
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
return priv->icons[icon_pos].pixbuf;
}
@@ -1818,7 +1819,7 @@ gtk_icon_entry_get_gicon (const GtkIconEntry *entry,
g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), NULL);
g_return_val_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos), NULL);
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
icon_info = &priv->icons[icon_pos];
return icon_info->storage_type == _GTK_IMAGE_GICON ? icon_info->gicon : NULL;
@@ -1843,7 +1844,7 @@ gtk_icon_entry_get_icon_highlight (const GtkIconEntry *entry,
g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), FALSE);
g_return_val_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos), FALSE);
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
return priv->icons[icon_pos].highlight;
}
@@ -1869,7 +1870,7 @@ gtk_icon_entry_set_tooltip (const GtkIconEntry *entry,
g_return_if_fail (GTK_IS_ICON_ENTRY (entry));
g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos));
- priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
+ priv = entry->priv;
icon_info = &priv->icons[icon_pos];
@@ -1899,7 +1900,7 @@ gtk_icon_entry_set_icon_sensitive (const GtkIconEntry *icon_entry,
g_return_if_fail (GTK_IS_ICON_ENTRY (icon_entry));
g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos));
- priv = GTK_ICON_ENTRY_GET_PRIVATE (icon_entry);
+ priv = icon_entry->priv;
icon_info = &priv->icons[icon_pos];
@@ -1922,7 +1923,7 @@ gtk_icon_entry_set_progress_fraction (GtkIconEntry *icon_entry,
g_return_if_fail (GTK_IS_ICON_ENTRY (icon_entry));
- priv = GTK_ICON_ENTRY_GET_PRIVATE (icon_entry);
+ priv = icon_entry->priv;
priv->fraction = CLAMP (fraction, 0.0, 1.0);
if (GTK_ENTRY (icon_entry)->text_area)
diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h
index 0ca041a2..6c07ce35 100644
--- a/midori/gtkiconentry.h
+++ b/midori/gtkiconentry.h
@@ -62,12 +62,15 @@ typedef enum
GTK_ICON_ENTRY_SECONDARY
} GtkIconEntryPosition;
-typedef struct _GtkIconEntry GtkIconEntry;
-typedef struct _GtkIconEntryClass GtkIconEntryClass;
+typedef struct _GtkIconEntry GtkIconEntry;
+typedef struct _GtkIconEntryClass GtkIconEntryClass;
+typedef struct _GtkIconEntryPrivate GtkIconEntryPrivate;
struct _GtkIconEntry
{
GtkEntry parent_object;
+
+ GtkIconEntryPrivate* priv;
};
struct _GtkIconEntryClass
diff --git a/midori/main.c b/midori/main.c
index d02bb7cb..628665c3 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -15,7 +15,6 @@
#endif
#include "midori.h"
-#include "midori-addons.h"
#include "midori-array.h"
#include "midori-bookmarks.h"
#include "midori-console.h"
@@ -54,6 +53,13 @@
#define BOOKMARK_FILE "bookmarks.xbel"
#endif
+#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+ #include
+ #include
+ #include
+ #include
+#endif
+
static gchar*
build_config_filename (const gchar* filename)
{
@@ -654,11 +660,6 @@ midori_app_add_browser_cb (MidoriApp* app,
gtk_widget_show (addon);
midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon));
- /* Userscripts */
- addon = midori_addons_new (MIDORI_ADDON_USER_SCRIPTS, GTK_WIDGET (browser));
- gtk_widget_show (addon);
- midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon));
-
/* Extensions */
addon = g_object_new (MIDORI_TYPE_EXTENSIONS, NULL);
gtk_widget_show (addon);
@@ -752,10 +753,10 @@ soup_session_settings_notify_http_proxy_cb (MidoriWebSettings* settings,
GParamSpec* pspec,
SoupSession* session)
{
- gboolean auto_detect_proxy;
+ MidoriProxy proxy_type;
- auto_detect_proxy = katze_object_get_boolean (settings, "auto-detect-proxy");
- if (auto_detect_proxy)
+ proxy_type = katze_object_get_enum (settings, "proxy-type");
+ if (proxy_type == MIDORI_PROXY_AUTOMATIC)
{
gboolean gnome_supported = FALSE;
GModule* module;
@@ -773,12 +774,14 @@ soup_session_settings_notify_http_proxy_cb (MidoriWebSettings* settings,
if (!gnome_supported)
midori_soup_session_set_proxy_uri (session, g_getenv ("http_proxy"));
}
- else
+ else if (proxy_type == MIDORI_PROXY_HTTP)
{
gchar* http_proxy = katze_object_get_string (settings, "http-proxy");
midori_soup_session_set_proxy_uri (session, http_proxy);
g_free (http_proxy);
}
+ else
+ midori_soup_session_set_proxy_uri (session, NULL);
}
#if !WEBKIT_CHECK_VERSION (1, 1, 11)
@@ -843,6 +846,29 @@ midori_soup_session_prepare (SoupSession* session,
SoupSessionFeature* feature;
gchar* config_file;
+ #if WEBKIT_CHECK_VERSION (1, 1, 14) && defined (HAVE_LIBSOUP_2_29_91)
+ const gchar* certificate_files[] =
+ {
+ "/etc/pki/tls/certs/ca-bundle.crt",
+ "/etc/ssl/certs/ca-certificates.crt",
+ NULL
+ };
+ guint i;
+
+ for (i = 0; i < G_N_ELEMENTS (certificate_files); i++)
+ if (g_access (certificate_files[i], F_OK) == 0)
+ {
+ g_object_set (session,
+ "ssl-ca-file", certificate_files[i],
+ "ssl-strict", FALSE,
+ NULL);
+ break;
+ }
+ if (i == G_N_ELEMENTS (certificate_files))
+ g_warning (_("No root certificate file is available. "
+ "SSL certificates cannot be verified."));
+ #endif
+
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);
@@ -1422,6 +1448,92 @@ signal_handler (int signal_id)
}
#endif
+static void
+midori_soup_session_block_uris_cb (SoupSession* session,
+ SoupMessage* msg,
+ gchar* blocked_uris)
+{
+ static GRegex* regex = NULL;
+ SoupURI* soup_uri;
+ gchar* uri;
+ if (!regex)
+ regex = g_regex_new (blocked_uris, 0, 0, NULL);
+ soup_uri = soup_message_get_uri (msg);
+ uri = soup_uri_to_string (soup_uri, FALSE);
+ if (g_regex_match (regex, uri, 0, 0))
+ {
+ soup_uri = soup_uri_new ("http://.invalid");
+ soup_message_set_uri (msg, soup_uri);
+ soup_uri_free (soup_uri);
+ }
+ g_free (uri);
+}
+
+typedef struct {
+ MidoriBrowser* browser;
+ guint timeout;
+ gchar* uri;
+} MidoriInactivityTimeout;
+
+static gboolean
+midori_inactivity_timeout (gpointer data)
+{
+ #ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+ MidoriInactivityTimeout* mit = data;
+ static Display* xdisplay = NULL;
+ static XScreenSaverInfo* mit_info = NULL;
+ static int has_extension = -1;
+ int event_base, error_base;
+
+ if (has_extension == -1)
+ {
+ GdkDisplay* display = gtk_widget_get_display (GTK_WIDGET (mit->browser));
+ xdisplay = GDK_DISPLAY_XDISPLAY (display);
+ has_extension = XScreenSaverQueryExtension (xdisplay,
+ &event_base, &error_base);
+ }
+
+ if (has_extension)
+ {
+ if (!mit_info)
+ mit_info = XScreenSaverAllocInfo ();
+
+ XScreenSaverQueryInfo (xdisplay, RootWindow (xdisplay, 0), mit_info);
+ if (mit_info->idle / 1000 > mit->timeout)
+ {
+ guint i = 0;
+ GtkWidget* view;
+
+ while ((view = midori_browser_get_nth_tab (mit->browser, i++)))
+ gtk_widget_destroy (view);
+ midori_browser_set_current_uri (mit->browser, mit->uri);
+ /* TODO: Re-run initial commands */
+
+ }
+ }
+ #else
+ /* TODO: Implement for other windowing systems */
+ #endif
+
+ return TRUE;
+}
+
+static void
+midori_setup_inactivity_reset (MidoriBrowser* browser,
+ gint inactivity_reset,
+ const gchar* uri)
+{
+ if (inactivity_reset > 0)
+ {
+ MidoriInactivityTimeout* mit = g_new (MidoriInactivityTimeout, 1);
+ mit->browser = browser;
+ mit->timeout = inactivity_reset;
+ mit->uri = g_strdup (uri);
+ g_timeout_add_seconds (inactivity_reset, midori_inactivity_timeout,
+ mit);
+ }
+}
+
int
main (int argc,
char** argv)
@@ -1434,6 +1546,8 @@ main (int argc,
gboolean execute;
gboolean version;
gchar** uris;
+ gchar* block_uris;
+ gint inactivity_reset;
MidoriApp* app;
gboolean result;
GError* error;
@@ -1459,6 +1573,13 @@ main (int argc,
N_("Display program version"), NULL },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris,
N_("Addresses"), NULL },
+ { "block-uris", 'b', 0, G_OPTION_ARG_STRING, &block_uris,
+ N_("Block URIs according to regular expression PATTERN"), _("PATTERN") },
+ #ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
+ { "inactivity-reset", 'i', 0, G_OPTION_ARG_INT, &inactivity_reset,
+ /* i18n: CLI: Close tabs, clear private data, open starting page */
+ N_("Reset Midori after SECONDS seconds of inactivity"), N_("SECONDS") },
+ #endif
{ NULL }
};
GString* error_messages;
@@ -1534,6 +1655,8 @@ main (int argc,
execute = FALSE;
version = FALSE;
uris = NULL;
+ block_uris = NULL;
+ inactivity_reset = 0;
error = NULL;
if (!gtk_init_with_args (&argc, &argv, _("[Addresses]"), entries,
GETTEXT_PACKAGE, &error))
@@ -1557,7 +1680,7 @@ main (int argc,
{
g_print (
"%s %s\n\n"
- "Copyright (c) 2007-2009 Christian Dywan\n\n"
+ "Copyright (c) 2007-2010 Christian Dywan\n\n"
"%s\n"
"\t%s\n\n"
"%s\n"
@@ -1642,11 +1765,20 @@ main (int argc,
i++;
}
}
+ if (block_uris)
+ g_signal_connect (webkit_get_default_session (), "request-queued",
+ G_CALLBACK (midori_soup_session_block_uris_cb),
+ g_strdup (block_uris));
+ midori_setup_inactivity_reset (browser, inactivity_reset, webapp);
midori_startup_timer ("App created: \t%f");
gtk_main ();
return 0;
}
+ /* FIXME: Inactivity reset is only supported for app mode */
+ if (inactivity_reset > 0)
+ g_error ("--inactivity-reset is currently only supported with --app.");
+
/* Standalone javascript support */
if (run)
return midori_run_script (uris ? *uris : NULL);
@@ -1978,6 +2110,11 @@ main (int argc,
if (execute)
g_object_set_data (G_OBJECT (app), "execute-command", uris);
+ if (block_uris)
+ g_signal_connect (webkit_get_default_session (), "request-queued",
+ G_CALLBACK (midori_soup_session_block_uris_cb),
+ g_strdup (block_uris));
+
gtk_main ();
diff --git a/midori/midori-app.c b/midori/midori-app.c
index d8cb2d9f..d4cfd16b 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008-2009 Christian Dywan
+ Copyright (C) 2008-2010 Christian Dywan
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -227,6 +227,14 @@ midori_app_class_init (MidoriAppClass* class)
{
GObjectClass* gobject_class;
+ /**
+ * MidoriApp::add-browser:
+ * @app: the object on which the signal is emitted
+ * @browser: a #MidoriBrowser
+ *
+ * A new browser is being added to the app,
+ * see midori_app_add_browser().
+ */
signals[ADD_BROWSER] = g_signal_new (
"add-browser",
G_TYPE_FROM_CLASS (class),
@@ -243,7 +251,8 @@ midori_app_class_init (MidoriAppClass* class)
* @app: the object on which the signal is emitted
* @browser: a #MidoriBrowser
*
- * A new browser is being added to the app.
+ * A browser is being removed from the app because it
+ * was destroyed.
*
* Since: 0.1.7
*/
@@ -258,6 +267,13 @@ midori_app_class_init (MidoriAppClass* class)
G_TYPE_NONE, 1,
MIDORI_TYPE_BROWSER);
+ /**
+ * MidoriApp::quit:
+ * @app: the object on which the signal is emitted
+ * @browser: a #MidoriBrowser
+ *
+ * The app is being quit, see midori_app_quit().
+ */
signals[QUIT] = g_signal_new (
"quit",
G_TYPE_FROM_CLASS (class),
@@ -470,14 +486,17 @@ midori_app_command_received (MidoriApp* app,
gchar* fixed_uri = sokoke_magic_uri (*uris);
if (!fixed_uri)
fixed_uri = g_strdup (*uris);
- if (first)
+ if (sokoke_recursive_fork_protection (fixed_uri, FALSE))
{
- midori_browser_set_current_uri (browser, fixed_uri);
- first = FALSE;
+ if (first)
+ {
+ midori_browser_set_current_uri (browser, fixed_uri);
+ first = FALSE;
+ }
+ else
+ midori_browser_set_current_page (browser,
+ midori_browser_add_uri (browser, fixed_uri));
}
- else
- midori_browser_set_current_page (browser,
- midori_browser_add_uri (browser, fixed_uri));
g_free (fixed_uri);
uris++;
}
@@ -1128,11 +1147,48 @@ midori_app_create_browser (MidoriApp* app)
NULL);
}
+/**
+ * midori_app_get_browsers:
+ * @app: a #MidoriApp
+ *
+ * Retrieves the browsers as a list.
+ *
+ * Return value: a newly allocated #Glist of #MidoriBrowser
+ *
+ * Since: 0.2.5
+ **/
+GList*
+midori_app_get_browsers (MidoriApp* app)
+{
+ g_return_val_if_fail (MIDORI_IS_APP (app), NULL);
+
+ return katze_array_get_items (app->browsers);
+}
+
+/**
+ * midori_app_get_browser:
+ * @app: a #MidoriApp
+ *
+ * Determines the current browser, which is the one that was
+ * last focussed.
+ *
+ * Return value: the current #MidoriBrowser
+ *
+ * Since: 0.2.5
+ **/
+MidoriBrowser*
+midori_app_get_browser (MidoriApp* app)
+{
+ g_return_val_if_fail (MIDORI_IS_APP (app), NULL);
+
+ return app->browser;
+}
+
/**
* midori_app_quit:
* @app: a #MidoriApp
*
- * Quits the #MidoriApp singleton.
+ * Quits the #MidoriApp.
*
* Since 0.1.2 the "quit" signal is always emitted before quitting.
**/
diff --git a/midori/midori-app.h b/midori/midori-app.h
index 7c280967..c9a10e0c 100644
--- a/midori/midori-app.h
+++ b/midori/midori-app.h
@@ -65,6 +65,12 @@ midori_app_add_browser (MidoriApp* app,
MidoriBrowser*
midori_app_create_browser (MidoriApp* app);
+MidoriBrowser*
+midori_app_get_browser (MidoriApp* app);
+
+GList*
+midori_app_get_browsers (MidoriApp* app);
+
void
midori_app_quit (MidoriApp* app);
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 566b800d..2bf7c971 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2007-2009 Christian Dywan
+ Copyright (C) 2007-2010 Christian Dywan
Copyright (C) 2008 Dale Whittaker
Copyright (C) 2009 Jérôme Geulfucci
@@ -198,9 +198,11 @@ static void
midori_browser_set_bookmarks (MidoriBrowser* browser,
KatzeArray* bookmarks);
+#if WEBKIT_CHECK_VERSION (1, 1, 3)
static void
midori_browser_add_download_item (MidoriBrowser* browser,
WebKitDownload* download);
+#endif
GdkPixbuf*
midori_search_action_get_icon (KatzeItem* item,
@@ -216,6 +218,9 @@ _action_menus_activate_item_alt (GtkAction* action,
guint button,
MidoriBrowser* browser);
+static void
+midori_browser_add_speed_dial (MidoriBrowser* browser);
+
#define _action_by_name(brwsr, nme) \
gtk_action_group_get_action (brwsr->action_group, nme)
#define _action_set_sensitive(brwsr, nme, snstv) \
@@ -339,10 +344,10 @@ _midori_browser_update_interface (MidoriBrowser* browser)
g_object_set (action,
"stock-id", GTK_STOCK_STOP,
"tooltip", _("Stop loading the current page"), NULL);
- if (!browser->progress_in_location || !GTK_WIDGET_VISIBLE (browser->navigationbar))
+ if (!browser->progress_in_location || !gtk_widget_get_visible (browser->navigationbar))
gtk_widget_show (browser->progressbar);
- if (!GTK_WIDGET_VISIBLE (browser->statusbar) &&
- !GTK_WIDGET_VISIBLE (browser->navigationbar) &&
+ if (!gtk_widget_get_visible (browser->statusbar) &&
+ !gtk_widget_get_visible (browser->navigationbar) &&
browser->progress_in_location)
gtk_widget_show (browser->navigationbar);
if (browser->progress_in_location)
@@ -375,6 +380,9 @@ _midori_browser_update_interface (MidoriBrowser* browser)
MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO);
gtk_action_set_sensitive (_action_by_name (browser, "AddNewsFeed"), FALSE);
}
+ midori_location_action_set_security_hint (
+ MIDORI_LOCATION_ACTION (action), midori_view_get_security (view));
+
}
static void
@@ -387,7 +395,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser,
katze_assign (browser->statusbar_text, sokoke_format_uri_for_display (text));
- if (!GTK_WIDGET_VISIBLE (browser->statusbar) && !is_location)
+ if (!gtk_widget_get_visible (browser->statusbar) && !is_location)
{
GtkAction* action = _action_by_name (browser, "Location");
MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
@@ -682,6 +690,15 @@ midori_browser_edit_bookmark_uri_changed_cb (GtkEntry* entry,
|| g_str_has_prefix (uri, "javascript:")));
}
+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);
+}
+
/* Private function, used by MidoriBookmarks and MidoriHistory */
/* static */ void
midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
@@ -704,7 +721,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
GtkWidget* check_toolbar;
GtkWidget* check_app;
- if (!browser->bookmarks || !GTK_WIDGET_VISIBLE (browser))
+ if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
if (is_folder)
@@ -837,6 +854,21 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
gtk_widget_show_all (hbox);
}
+ if (new_bookmark && !is_folder)
+ {
+ hbox = gtk_hbox_new (FALSE, 8);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 1);
+ label = gtk_label_new (NULL);
+ gtk_size_group_add_widget (sizegroup, label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ label = gtk_button_new_with_mnemonic (_("Add to _Speed Dial"));
+ g_signal_connect (label, "clicked",
+ G_CALLBACK (midori_browser_edit_bookmark_add_speed_dial_cb), bookmark);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (content_area), hbox);
+ gtk_widget_show_all (hbox);
+ }
+
hbox = gtk_hbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 1);
label = gtk_label_new (NULL);
@@ -888,7 +920,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
}
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)))
- if (!GTK_WIDGET_VISIBLE (browser->bookmarkbar))
+ if (!gtk_widget_get_visible (browser->bookmarkbar))
_action_set_active (browser, "Bookmarkbar", TRUE);
folder = browser->bookmarks;
@@ -931,7 +963,46 @@ midori_view_add_bookmark_cb (GtkWidget* menuitem,
midori_browser_edit_bookmark_dialog_new (browser, item, TRUE, FALSE);
}
-#if !WEBKIT_CHECK_VERSION (1, 1, 3)
+#if WEBKIT_CHECK_VERSION (1, 1, 3)
+static gboolean
+midori_browser_prepare_download (MidoriBrowser* browser,
+ WebKitDownload* download,
+ const gchar* uri)
+
+{
+ guint64 total_size = webkit_download_get_total_size (download);
+ GFile* file = g_file_new_for_uri (uri);
+ GFile* folder = g_file_get_parent (file);
+ GError* error = NULL;
+ GFileInfo* info = g_file_query_filesystem_info (folder,
+ G_FILE_ATTRIBUTE_FILESYSTEM_FREE, NULL, &error);
+ guint64 free_space = g_file_info_get_attribute_uint64 (info,
+ G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
+ g_object_unref (file);
+ g_object_unref (folder);
+ if (free_space < total_size)
+ {
+ gchar* message = g_strdup_printf (
+ _("There is not enough free space to download \"%s\"."), &uri[7]);
+ gchar* total_size_string = g_format_size_for_display (total_size);
+ gchar* free_space_string = g_format_size_for_display (free_space);
+ gchar* detailed_message = g_strdup_printf (
+ _("The file needs %s but only %s are left."),
+ total_size_string, free_space_string);
+ sokoke_message_dialog (GTK_MESSAGE_ERROR, message, detailed_message);
+ g_free (message);
+ g_free (detailed_message);
+ g_free (total_size_string);
+ g_free (free_space_string);
+ g_object_unref (download);
+ return FALSE;
+ }
+
+ webkit_download_set_destination_uri (download, uri);
+ midori_browser_add_download_item (browser, download);
+ return TRUE;
+}
+#else
static void
midori_browser_save_transfer_cb (KatzeNetRequest* request,
gchar* filename)
@@ -970,7 +1041,7 @@ midori_browser_save_uri (MidoriBrowser* browser,
gchar* last_slash;
gchar* folder;
- if (!GTK_WIDGET_VISIBLE (browser))
+ if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
dialog = sokoke_file_chooser_dialog_new (_("Save file as"),
@@ -1025,10 +1096,9 @@ midori_browser_save_uri (MidoriBrowser* browser,
download = webkit_download_new (request);
g_object_unref (request);
destination = g_filename_to_uri (filename, NULL, NULL);
- webkit_download_set_destination_uri (download, destination);
+ if (midori_browser_prepare_download (browser, download, destination))
+ webkit_download_start (download);
g_free (destination);
- midori_browser_add_download_item (browser, download);
- webkit_download_start (download);
#else
katze_net_load_uri (browser->net, uri, NULL,
(KatzeNetTransferCb)midori_browser_save_transfer_cb, filename);
@@ -1270,9 +1340,9 @@ midori_browser_view_copy_history (GtkWidget* view_to,
guint length_from;
gint i;
- copy_from = WEBKIT_WEB_VIEW (gtk_bin_get_child (GTK_BIN (view_from)));
+ copy_from = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view_from)));
list_from = webkit_web_view_get_back_forward_list (copy_from);
- copy_to = WEBKIT_WEB_VIEW (gtk_bin_get_child (GTK_BIN (view_to)));
+ copy_to = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (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);
@@ -1493,6 +1563,7 @@ midori_browser_add_download_item (MidoriBrowser* browser,
G_CALLBACK (midori_browser_download_button_clicked_cb), download);
}
+
static void
midori_view_download_save_as_response_cb (GtkWidget* dialog,
gint response,
@@ -1502,10 +1573,9 @@ midori_view_download_save_as_response_cb (GtkWidget* dialog,
if (response == GTK_RESPONSE_OK)
{
gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
- webkit_download_set_destination_uri (download, uri);
- midori_browser_add_download_item (browser, download);
+ if (midori_browser_prepare_download (browser, download, uri))
+ webkit_download_start (download);
g_free (uri);
- webkit_download_start (download);
}
else
g_object_unref (download);
@@ -1529,10 +1599,14 @@ midori_view_download_requested_cb (GtkWidget* view,
{
dialog = sokoke_file_chooser_dialog_new (_("Save file"),
GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE);
+ gtk_file_chooser_set_do_overwrite_confirmation (
+ GTK_FILE_CHOOSER (dialog), TRUE);
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
folder = katze_object_get_string (browser->settings, "download-folder");
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), folder);
g_free (folder);
+ g_signal_connect (dialog, "destroy",
+ G_CALLBACK (gtk_widget_destroyed), &dialog);
g_signal_connect (dialog, "response",
G_CALLBACK (midori_view_download_save_as_response_cb), browser);
}
@@ -1543,6 +1617,8 @@ midori_view_download_requested_cb (GtkWidget* view,
}
else
{
+ const gchar* suggested;
+ gchar* basename;
gchar* filename;
gchar* uri;
@@ -1550,14 +1626,34 @@ midori_view_download_requested_cb (GtkWidget* view,
folder = g_strdup (g_get_tmp_dir ());
else
folder = katze_object_get_string (browser->settings, "download-folder");
- filename = g_build_filename (folder,
- webkit_download_get_suggested_filename (download), NULL);
+ suggested = webkit_download_get_suggested_filename (download);
+ /* The suggested name may contain a folder name */
+ basename = g_path_get_basename (suggested);
+ filename = g_build_filename (folder, basename, NULL);
+ g_free (basename);
+ /* If the filename exists, choose a different name */
+ if (g_access (filename, F_OK) == 0)
+ {
+ /* FIXME: Put the number in front of the extension */
+ gsize length = strlen (filename);
+ do
+ {
+ if (g_ascii_isdigit (filename[length - 1]))
+ filename[length - 1] += 1;
+ else
+ {
+ gchar* new_filename = g_strconcat (filename, "0", NULL);
+ katze_assign (filename, new_filename);
+ length = strlen (filename);
+ }
+ }
+ while (g_access (filename, F_OK) == 0);
+ }
g_free (folder);
uri = g_filename_to_uri (filename, NULL, NULL);
g_free (filename);
- webkit_download_set_destination_uri (download, uri);
+ midori_browser_prepare_download (browser, download, uri);
g_free (uri);
- midori_browser_add_download_item (browser, download);
}
}
return TRUE;
@@ -1604,14 +1700,14 @@ midori_view_search_text_cb (GtkWidget* view,
gtk_widget_hide (GTK_WIDGET (browser->find_case));
gtk_widget_hide (GTK_WIDGET (browser->find_highlight));
gtk_widget_hide (GTK_WIDGET (browser->find_close));
- if (!GTK_WIDGET_VISIBLE (browser->find))
+ if (!gtk_widget_get_visible (browser->find))
gtk_entry_set_text (GTK_ENTRY (browser->find_text), "");
gtk_widget_show (browser->find);
gtk_window_set_focus (GTK_WINDOW (browser), browser->find_text);
gtk_editable_insert_text (GTK_EDITABLE (browser->find_text), typing, -1, &position);
gtk_editable_set_position (GTK_EDITABLE (browser->find_text), -1);
}
- if (GTK_WIDGET_VISIBLE (browser->find) && !typing)
+ if (gtk_widget_get_visible (browser->find) && !typing)
{
#if !HAVE_HILDON
gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text),
@@ -1672,8 +1768,6 @@ _midori_browser_add_tab (MidoriBrowser* browser,
guint n;
GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view),
- GTK_SHADOW_ETCHED_IN);
tab_label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view));
@@ -1784,12 +1878,14 @@ midori_browser_key_press_event (GtkWidget* widget,
{
GtkWindow* window = GTK_WINDOW (widget);
GtkWidgetClass* widget_class;
+ guint clean_state;
if (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))
if (sokoke_window_activate_key (window, event))
return TRUE;
- if (gtk_window_propagate_key_event (window, event))
+ clean_state = event->state & gtk_accelerator_get_default_mod_mask();
+ if (!clean_state && gtk_window_propagate_key_event (window, event))
return TRUE;
if (!(event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))
@@ -1803,6 +1899,42 @@ midori_browser_key_press_event (GtkWidget* widget,
return widget_class->key_press_event (widget, event);
}
+static gboolean
+midori_browser_delete_event (GtkWidget* widget,
+ GdkEventAny* event)
+{
+ MidoriBrowser* browser = MIDORI_BROWSER (widget);
+ GList* children;
+ GtkWidget* dialog = NULL;
+ gboolean cancel = FALSE;
+
+ children = gtk_container_get_children (GTK_CONTAINER (browser->transferbar));
+ if (g_list_length (children) > 1)
+ {
+ dialog = gtk_message_dialog_new (GTK_WINDOW (widget),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+ _("Some files are being downloaded"));
+ gtk_window_set_title (GTK_WINDOW (dialog),
+ _("Some files are being downloaded"));
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
+ _("_Quit Midori"), GTK_RESPONSE_ACCEPT);
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ _("The transfers will be cancelled if Midori quits."));
+ }
+ g_list_free (children);
+ if (dialog != NULL)
+ {
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_CANCEL)
+ cancel = TRUE;
+ gtk_widget_destroy (dialog);
+ }
+
+ return cancel;
+}
+
static void
midori_browser_class_init (MidoriBrowserClass* class)
{
@@ -1966,6 +2098,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->delete_event = midori_browser_delete_event;
gobject_class = G_OBJECT_CLASS (class);
gobject_class->dispose = midori_browser_dispose;
@@ -2213,6 +2346,15 @@ _action_tab_new_activate (GtkAction* action,
midori_browser_set_current_page (browser, n);
}
+static void
+midori_browser_spawn_app (const gchar* uri)
+{
+ const gchar* executable = sokoke_get_argv (NULL)[0];
+ gchar* command = g_strconcat (executable, " -a", NULL);
+ sokoke_spawn_program (command, uri, FALSE);
+ g_free (command);
+}
+
static void
_action_private_browsing_activate (GtkAction* action,
MidoriBrowser* browser)
@@ -2222,9 +2364,9 @@ _action_private_browsing_activate (GtkAction* action,
{
/* FIXME: Use the same binary that is running right now */
if (*uri != '\0')
- sokoke_spawn_program ("midori -a", uri, FALSE);
+ midori_browser_spawn_app (uri);
else
- sokoke_spawn_program ("midori -a", "about:blank", FALSE);
+ midori_browser_spawn_app ("about:blank");
}
}
@@ -2238,7 +2380,7 @@ _action_open_activate (GtkAction* action,
GtkWidget* dialog;
GtkWidget* view;
- if (!GTK_WIDGET_VISIBLE (browser))
+ if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
dialog = sokoke_file_chooser_dialog_new (_("Open file"),
@@ -2353,7 +2495,7 @@ _action_compact_add_activate (GtkAction* action,
"AddDesktopShortcut", "AddNewsFeed" };
guint i;
- if (!GTK_WIDGET_VISIBLE (browser))
+ if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
dialog = g_object_new (GTK_TYPE_DIALOG,
@@ -2407,7 +2549,7 @@ _action_print_activate (GtkAction* action,
{
GtkWidget* view;
- if (!GTK_WIDGET_VISIBLE (browser))
+ if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
if ((view = midori_browser_get_current_tab (browser)))
@@ -2567,7 +2709,7 @@ static void
_action_find_activate (GtkAction* action,
MidoriBrowser* browser)
{
- if (GTK_WIDGET_VISIBLE (browser->find))
+ if (gtk_widget_get_visible (browser->find))
_midori_browser_find_done (browser);
else
{
@@ -2614,9 +2756,7 @@ _midori_browser_find_done (MidoriBrowser* browser)
midori_view_unmark_text_matches (MIDORI_VIEW (view));
gtk_widget_hide (browser->find);
browser->find_typing = FALSE;
- gtk_window_set_focus (GTK_WINDOW (browser),
- gtk_bin_get_child (GTK_BIN (view)) ?
- gtk_bin_get_child (GTK_BIN (view)) : view);
+ gtk_window_set_focus (GTK_WINDOW (browser), view);
}
static void
@@ -2645,7 +2785,8 @@ midori_browser_find_text_focus_out_event_cb (GtkWidget* entry,
GdkEventFocus* event,
MidoriBrowser* browser)
{
- _midori_browser_find_done (browser);
+ if (browser->find_typing)
+ _midori_browser_find_done (browser);
return FALSE;
}
@@ -2754,6 +2895,23 @@ midori_browser_get_toolbar_actions (MidoriBrowser* browser)
return actions;
}
+/**
+ * midori_browser_get_settings:
+ *
+ * Retrieves the settings instance of the browser.
+ *
+ * Return value: a #MidoriWebSettings instance
+ *
+ * Since: 0.2.5
+ **/
+MidoriWebSettings*
+midori_browser_get_settings (MidoriBrowser* browser)
+{
+ g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
+
+ return browser->settings;
+}
+
static gboolean
midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget,
gint x,
@@ -2806,7 +2964,7 @@ midori_browser_menu_item_select_cb (GtkWidget* menuitem,
if (item)
{
tooltip = g_strdup (katze_item_get_uri (item));
- sokoke_prefetch_uri (tooltip);
+ sokoke_prefetch_uri (tooltip, NULL, NULL);
}
}
_midori_browser_set_statusbar_text (browser, tooltip);
@@ -3036,7 +3194,7 @@ midori_browser_open_bookmark (MidoriBrowser* browser,
/* FIXME: Use the same binary that is running right now */
if (katze_item_get_meta_integer (item, "app") != -1)
- sokoke_spawn_program ("midori -a", uri_fixed, FALSE);
+ midori_browser_spawn_app (uri_fixed);
else
{
midori_browser_set_current_uri (browser, uri_fixed);
@@ -3058,19 +3216,20 @@ _action_tools_populate_popup (GtkAction* action,
GtkMenu* menu,
MidoriBrowser* browser)
{
- static const GtkActionEntry actions[] = {
- { "ManageSearchEngines" },
- { "ClearPrivateData" },
- #if WEBKIT_CHECK_VERSION (1, 1, 17)
- { "InspectPage" },
- #endif
- { "-" },
- { NULL },
- { "p" },
- #ifdef G_OS_WIN32
- { NULL },
- { "Preferences" },
- #endif
+ static const GtkActionEntry actions[] =
+ {
+ { "ManageSearchEngines" },
+ { "ClearPrivateData" },
+ #if WEBKIT_CHECK_VERSION (1, 1, 17)
+ { "InspectPage" },
+ #endif
+ { "-" },
+ { NULL },
+ { "p" },
+ #ifdef G_OS_WIN32
+ { NULL },
+ { "Preferences" },
+ #endif
};
guint i;
@@ -3293,7 +3452,7 @@ _action_preferences_activate (GtkAction* action,
{
static GtkWidget* dialog = NULL;
- if (!GTK_WIDGET_VISIBLE (browser))
+ if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
if (!dialog)
@@ -3351,8 +3510,8 @@ _action_menubar_activate (GtkToggleAction* action,
sokoke_widget_set_visible (browser->menubar, active);
g_object_set_data (G_OBJECT (browser), "midori-toolbars-visible",
- GTK_WIDGET_VISIBLE (browser->menubar)
- || GTK_WIDGET_VISIBLE (browser->navigationbar)
+ gtk_widget_get_visible (browser->menubar)
+ || gtk_widget_get_visible (browser->navigationbar)
? (void*)0xdeadbeef : NULL);
}
@@ -3365,8 +3524,8 @@ _action_navigationbar_activate (GtkToggleAction* action,
sokoke_widget_set_visible (browser->navigationbar, active);
g_object_set_data (G_OBJECT (browser), "midori-toolbars-visible",
- GTK_WIDGET_VISIBLE (browser->menubar)
- || GTK_WIDGET_VISIBLE (browser->navigationbar)
+ gtk_widget_get_visible (browser->menubar)
+ || gtk_widget_get_visible (browser->navigationbar)
? (void*)0xdeadbeef : NULL);
}
@@ -3465,7 +3624,7 @@ _action_view_encoding_activate (GtkAction* action,
GtkWidget* web_view;
name = gtk_action_get_name (current);
- web_view = gtk_bin_get_child (GTK_BIN (view));
+ web_view = midori_view_get_web_view (MIDORI_VIEW (view));
if (!strcmp (name, "EncodingAutomatic"))
g_object_set (web_view, "custom-encoding", NULL, NULL);
else
@@ -3599,7 +3758,7 @@ _action_source_view_activate (GtkAction* action,
source = midori_view_new (browser->net);
midori_view_set_settings (MIDORI_VIEW (source), browser->settings);
midori_view_set_uri (MIDORI_VIEW (source), "");
- web_view = gtk_bin_get_child (GTK_BIN (source));
+ web_view = midori_view_get_web_view (MIDORI_VIEW (source));
webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (web_view), TRUE);
webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), uri);
gtk_widget_show (source);
@@ -3664,7 +3823,7 @@ _action_scroll_somewhere_activate (GtkAction* action,
view = midori_browser_get_current_tab (browser);
if (!view)
return;
- web_view = WEBKIT_WEB_VIEW (gtk_bin_get_child (GTK_BIN (view)));
+ web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view)));
name = gtk_action_get_name (action);
if (g_str_equal (name, "ScrollLeft"))
@@ -3775,7 +3934,7 @@ static void
_action_location_activate (GtkAction* action,
MidoriBrowser* browser)
{
- if (!GTK_WIDGET_VISIBLE (browser->navigationbar))
+ if (!gtk_widget_get_visible (browser->navigationbar))
gtk_widget_show (browser->navigationbar);
}
@@ -3969,9 +4128,10 @@ _action_location_secondary_icon_released (GtkAction* action,
if ((view = midori_browser_get_current_tab (browser)))
{
const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view));
+ const gchar* feed;
if (gtk_window_get_focus (GTK_WINDOW (browser)) == widget)
_action_location_submit_uri (action, uri, FALSE, browser);
- else if ((uri = g_object_get_data (G_OBJECT (view), "news-feeds")))
+ else if ((feed = g_object_get_data (G_OBJECT (view), "news-feeds")))
{
KatzeArray* news_feeds;
KatzeItem* item;
@@ -4014,7 +4174,7 @@ _action_location_secondary_icon_released (GtkAction* action,
KATZE_MENU_POSITION_RIGHT);
}
else
- midori_browser_subscribe_to_news_feed (browser, uri);
+ midori_browser_subscribe_to_news_feed (browser, feed);
g_object_unref (news_feeds);
}
else
@@ -4066,7 +4226,7 @@ _action_search_activate (GtkAction* action,
while (((proxy = g_slist_nth_data (proxies, i++))))
if (GTK_IS_TOOL_ITEM (proxy))
{
- if (!GTK_WIDGET_VISIBLE (browser->navigationbar))
+ if (!gtk_widget_get_visible (browser->navigationbar))
gtk_widget_show (browser->navigationbar);
return;
}
@@ -4117,7 +4277,7 @@ static void
_action_search_focus_out (GtkAction* action,
MidoriBrowser* browser)
{
- if (GTK_WIDGET_VISIBLE (browser->statusbar) && !browser->show_navigationbar)
+ if (gtk_widget_get_visible (browser->statusbar) && !browser->show_navigationbar)
gtk_widget_hide (browser->navigationbar);
}
@@ -4343,12 +4503,14 @@ midori_browser_menu_middle_click_on_navigation_action (MidoriBrowser* browser,
else if (g_str_equal (name, "Back"))
{
GtkWidget* view;
+ GtkWidget* page;
WebKitWebBackForwardList* back_forward_list;
WebKitWebHistoryItem* back_item;
const gchar* back_uri;
gint n;
- view = gtk_bin_get_child (GTK_BIN (midori_browser_get_current_tab (browser)));
+ page = midori_browser_get_current_tab (browser);
+ view = midori_view_get_web_view (MIDORI_VIEW (page));
back_forward_list =
webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view));
@@ -4366,12 +4528,14 @@ midori_browser_menu_middle_click_on_navigation_action (MidoriBrowser* browser,
else if (g_str_equal (name, "Forward"))
{
GtkWidget *view;
+ GtkWidget *page;
WebKitWebBackForwardList *back_forward_list;
WebKitWebHistoryItem *forward_item;
const gchar *forward_uri;
gint n;
- view = gtk_bin_get_child (GTK_BIN (midori_browser_get_current_tab (browser)));
+ page = midori_browser_get_current_tab (browser);
+ view = midori_view_get_web_view (MIDORI_VIEW (page));
back_forward_list =
webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view));
@@ -4511,7 +4675,7 @@ _action_bookmarks_import_activate (GtkAction* action,
guint i;
KatzeItem* item;
- if (!browser->bookmarks || !GTK_WIDGET_VISIBLE (browser))
+ if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
dialog = gtk_dialog_new_with_buttons (
@@ -4648,7 +4812,7 @@ _action_bookmarks_export_activate (GtkAction* action,
gchar* path = NULL;
GError* error;
- if (!browser->bookmarks || !GTK_WIDGET_VISIBLE (browser))
+ if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
file_dialog = sokoke_file_chooser_dialog_new (_("Save file as"),
@@ -4679,7 +4843,7 @@ _action_manage_search_engines_activate (GtkAction* action,
{
static GtkWidget* dialog = NULL;
- if (!GTK_WIDGET_VISIBLE (browser))
+ if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
if (!dialog)
@@ -4807,7 +4971,7 @@ _action_clear_private_data_activate (GtkAction* action,
{
static GtkWidget* dialog = NULL;
- if (!GTK_WIDGET_VISIBLE (browser))
+ if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
if (!dialog)
@@ -4826,6 +4990,7 @@ _action_clear_private_data_activate (GtkAction* action,
gint clear_prefs = MIDORI_CLEAR_NONE;
g_object_get (browser->settings, "clear-private-data", &clear_prefs, NULL);
+ /* i18n: Dialog: Clear Private Data, in the Tools menu */
dialog = gtk_dialog_new_with_buttons (_("Clear Private Data"),
GTK_WINDOW (browser),
GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -4916,7 +5081,7 @@ _action_inspect_page_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* view = midori_browser_get_current_tab (browser);
- WebKitWebView* web_view = WEBKIT_WEB_VIEW (gtk_bin_get_child (GTK_BIN (view)));
+ WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view)));
WebKitWebInspector* inspector = webkit_web_view_get_inspector (web_view);
webkit_web_inspector_show (inspector);
}
@@ -4946,22 +5111,15 @@ _action_tab_current_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* view = midori_browser_get_current_tab (browser);
- GtkWidget* child = gtk_bin_get_child (GTK_BIN (view));
- gtk_widget_grab_focus (child ? child : view);
+ gtk_widget_grab_focus (view);
}
-static const gchar* credits_authors[] = {
- "Christian Dywan ", NULL };
-static const gchar* credits_documenters[] = {
- "Christian Dywan ", NULL };
-static const gchar* credits_artists[] = {
- "Nancy Runge ", NULL };
-
-static const gchar* license =
- "This library is free software; you can redistribute it and/or\n"
- "modify it under the terms of the GNU Lesser General Public\n"
- "License as published by the Free Software Foundation; either\n"
- "version 2.1 of the License, or (at your option) any later version.\n";
+static const gchar* credits_authors[] =
+ { "Christian Dywan ", NULL };
+static const gchar* credits_documenters[] =
+ { "Christian Dywan ", NULL };
+static const gchar* credits_artists[] =
+ { "Nancy Runge ", NULL };
static void
_action_about_activate_link (GtkAboutDialog* about,
@@ -4998,6 +5156,11 @@ _action_about_activate (GtkAction* action,
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION, WEBKIT_MICRO_VERSION,
_("A lightweight web browser."));
+ const gchar* license =
+ _("This library is free software; you can redistribute it and/or "
+ "modify it under the terms of the GNU Lesser General Public "
+ "License as published by the Free Software Foundation; either "
+ "version 2.1 of the License, or (at your option) any later version.");
gtk_about_dialog_set_email_hook (_action_about_activate_email, NULL, NULL);
gtk_about_dialog_set_url_hook (_action_about_activate_link, browser, NULL);
@@ -5006,7 +5169,7 @@ _action_about_activate (GtkAction* action,
"name", PACKAGE_NAME,
"version", PACKAGE_VERSION,
"comments", comments,
- "copyright", "Copyright © 2007-2009 Christian Dywan",
+ "copyright", "Copyright © 2007-2010 Christian Dywan",
"website", "http://www.twotoasts.de",
"authors", credits_authors,
"documenters", credits_documenters,
@@ -5015,6 +5178,7 @@ _action_about_activate (GtkAction* action,
"wrap-license", TRUE,
"translator-credits", _("translator-credits"),
NULL);
+ g_free (comments);
}
static void
@@ -5057,7 +5221,7 @@ _action_help_link_activate (GtkAction* action,
#endif
}
else if (!strncmp ("HelpFAQ", action_name, 7))
- uri = "http://wiki.xfce.org/_export/xhtml/midori_faq";
+ uri = "http://wiki.xfce.org/midori/faq";
else if (!strncmp ("HelpBugs", action_name, 8))
uri = "http://www.twotoasts.de/bugs/";
else
@@ -5319,270 +5483,273 @@ _action_trash_empty_activate (GtkAction* action,
}
}
-static const GtkActionEntry entries[] = {
- { "File", NULL, N_("_File") },
- { "WindowNew", STOCK_WINDOW_NEW,
- N_("New _Window"), "n",
- N_("Open a new window"), G_CALLBACK (_action_window_new_activate) },
- { "TabNew", STOCK_TAB_NEW,
- NULL, "t",
- N_("Open a new tab"), G_CALLBACK (_action_tab_new_activate) },
- { "PrivateBrowsing", NULL,
- N_("P_rivate Browsing"), "n",
- N_("Don't save any private data while browsing"),
- G_CALLBACK (_action_private_browsing_activate), },
- { "Open", GTK_STOCK_OPEN,
- NULL, "o",
- N_("Open a file"), G_CALLBACK (_action_open_activate) },
- { "SaveAs", GTK_STOCK_SAVE_AS,
- NULL, "s",
- N_("Save to a file"), G_CALLBACK (_action_save_as_activate) },
- { "AddSpeedDial", NULL,
- N_("Add to Speed _dial"), "h",
- N_("Add shortcut to speed dial"), G_CALLBACK (_action_add_speed_dial_activate) },
- { "AddDesktopShortcut", NULL,
- N_("Add Shortcut to the _desktop"), "h",
- N_("Add shortcut to the desktop"), G_CALLBACK (_action_add_desktop_shortcut_activate) },
- { "AddNewsFeed", NULL,
- N_("Subscribe to News _feed"), NULL,
- N_("Subscribe to this news feed"), G_CALLBACK (_action_add_news_feed_activate) },
- { "CompactAdd", GTK_STOCK_ADD,
- NULL, NULL,
- NULL, G_CALLBACK (_action_compact_add_activate) },
- { "TabClose", GTK_STOCK_CLOSE,
- N_("_Close Tab"), "w",
- N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) },
- { "WindowClose", NULL,
- N_("C_lose Window"), "w",
- N_("Close this window"), G_CALLBACK (_action_window_close_activate) },
- { "Print", GTK_STOCK_PRINT,
- NULL, "p",
- N_("Print the current page"), G_CALLBACK (_action_print_activate) },
- { "Quit", GTK_STOCK_QUIT,
- NULL, "q",
- N_("Quit the application"), G_CALLBACK (_action_quit_activate) },
+static const GtkActionEntry entries[] =
+{
+ { "File", NULL, N_("_File") },
+ { "WindowNew", STOCK_WINDOW_NEW,
+ N_("New _Window"), "n",
+ N_("Open a new window"), G_CALLBACK (_action_window_new_activate) },
+ { "TabNew", STOCK_TAB_NEW,
+ NULL, "t",
+ N_("Open a new tab"), G_CALLBACK (_action_tab_new_activate) },
+ { "PrivateBrowsing", NULL,
+ N_("P_rivate Browsing"), "n",
+ N_("Don't save any private data while browsing"),
+ G_CALLBACK (_action_private_browsing_activate), },
+ { "Open", GTK_STOCK_OPEN,
+ NULL, "o",
+ N_("Open a file"), G_CALLBACK (_action_open_activate) },
+ { "SaveAs", GTK_STOCK_SAVE_AS,
+ NULL, "s",
+ N_("Save to a file"), G_CALLBACK (_action_save_as_activate) },
+ { "AddSpeedDial", NULL,
+ N_("Add to Speed _dial"), "h",
+ N_("Add shortcut to speed dial"), G_CALLBACK (_action_add_speed_dial_activate) },
+ { "AddDesktopShortcut", NULL,
+ N_("Add Shortcut to the _desktop"), "h",
+ N_("Add shortcut to the desktop"), G_CALLBACK (_action_add_desktop_shortcut_activate) },
+ { "AddNewsFeed", NULL,
+ N_("Subscribe to News _feed"), NULL,
+ N_("Subscribe to this news feed"), G_CALLBACK (_action_add_news_feed_activate) },
+ { "CompactAdd", GTK_STOCK_ADD,
+ NULL, NULL,
+ NULL, G_CALLBACK (_action_compact_add_activate) },
+ { "TabClose", GTK_STOCK_CLOSE,
+ N_("_Close Tab"), "w",
+ N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) },
+ { "WindowClose", NULL,
+ N_("C_lose Window"), "w",
+ N_("Close this window"), G_CALLBACK (_action_window_close_activate) },
+ { "Print", GTK_STOCK_PRINT,
+ NULL, "p",
+ N_("Print the current page"), G_CALLBACK (_action_print_activate) },
+ { "Quit", GTK_STOCK_QUIT,
+ NULL, "q",
+ N_("Quit the application"), G_CALLBACK (_action_quit_activate) },
- { "Edit", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK (_action_edit_activate) },
- #if WEBKIT_CHECK_VERSION (1, 1, 14)
- { "Undo", GTK_STOCK_UNDO,
- NULL, "z",
- N_("Undo the last modification"), G_CALLBACK (_action_undo_activate) },
- { "Redo", GTK_STOCK_REDO,
- NULL, "z",
- N_("Redo the last modification"), G_CALLBACK (_action_redo_activate) },
- #endif
- { "Cut", GTK_STOCK_CUT,
- NULL, "x",
- N_("Cut the selected text"), G_CALLBACK (_action_cut_activate) },
- { "Copy", GTK_STOCK_COPY,
- NULL, "c",
- N_("Copy the selected text"), G_CALLBACK (_action_copy_activate) },
- { "Copy_", GTK_STOCK_COPY,
- NULL, "c",
- N_("Copy the selected text"), G_CALLBACK (_action_copy_activate) },
- { "Paste", GTK_STOCK_PASTE,
- NULL, "v",
- N_("Paste text from the clipboard"), G_CALLBACK (_action_paste_activate) },
- { "Delete", GTK_STOCK_DELETE,
- NULL, NULL,
- N_("Delete the selected text"), G_CALLBACK (_action_delete_activate) },
- { "SelectAll", GTK_STOCK_SELECT_ALL,
- NULL, "a",
- N_("Select all text"), G_CALLBACK (_action_select_all_activate) },
- { "Find", GTK_STOCK_FIND,
- NULL, "f",
- N_("Find a word or phrase in the page"), G_CALLBACK (_action_find_activate) },
- { "FindNext", GTK_STOCK_GO_FORWARD,
- N_("Find _Next"), "g",
- N_("Find the next occurrence of a word or phrase"), G_CALLBACK (_action_find_next_activate) },
- { "FindPrevious", GTK_STOCK_GO_BACK,
- N_("Find _Previous"), "g",
- N_("Find the previous occurrence of a word or phrase"),
- G_CALLBACK (_action_find_previous_activate) },
- { "Preferences", GTK_STOCK_PREFERENCES,
- NULL, "p",
- N_("Configure the application preferences"), G_CALLBACK (_action_preferences_activate) },
+ { "Edit", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK (_action_edit_activate) },
+ #if WEBKIT_CHECK_VERSION (1, 1, 14)
+ { "Undo", GTK_STOCK_UNDO,
+ NULL, "z",
+ N_("Undo the last modification"), G_CALLBACK (_action_undo_activate) },
+ { "Redo", GTK_STOCK_REDO,
+ NULL, "z",
+ N_("Redo the last modification"), G_CALLBACK (_action_redo_activate) },
+ #endif
+ { "Cut", GTK_STOCK_CUT,
+ NULL, "x",
+ N_("Cut the selected text"), G_CALLBACK (_action_cut_activate) },
+ { "Copy", GTK_STOCK_COPY,
+ NULL, "c",
+ N_("Copy the selected text"), G_CALLBACK (_action_copy_activate) },
+ { "Copy_", GTK_STOCK_COPY,
+ NULL, "c",
+ N_("Copy the selected text"), G_CALLBACK (_action_copy_activate) },
+ { "Paste", GTK_STOCK_PASTE,
+ NULL, "v",
+ N_("Paste text from the clipboard"), G_CALLBACK (_action_paste_activate) },
+ { "Delete", GTK_STOCK_DELETE,
+ NULL, NULL,
+ N_("Delete the selected text"), G_CALLBACK (_action_delete_activate) },
+ { "SelectAll", GTK_STOCK_SELECT_ALL,
+ NULL, "a",
+ N_("Select all text"), G_CALLBACK (_action_select_all_activate) },
+ { "Find", GTK_STOCK_FIND,
+ NULL, "f",
+ N_("Find a word or phrase in the page"), G_CALLBACK (_action_find_activate) },
+ { "FindNext", GTK_STOCK_GO_FORWARD,
+ N_("Find _Next"), "g",
+ N_("Find the next occurrence of a word or phrase"), G_CALLBACK (_action_find_next_activate) },
+ { "FindPrevious", GTK_STOCK_GO_BACK,
+ N_("Find _Previous"), "g",
+ N_("Find the previous occurrence of a word or phrase"),
+ G_CALLBACK (_action_find_previous_activate) },
+ { "Preferences", GTK_STOCK_PREFERENCES,
+ NULL, "p",
+ N_("Configure the application preferences"), G_CALLBACK (_action_preferences_activate) },
- { "View", NULL, N_("_View") },
- { "Toolbars", NULL, N_("_Toolbars") },
- { "Reload", GTK_STOCK_REFRESH,
- NULL, "r",
- N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
- { "Stop", GTK_STOCK_STOP,
- NULL, "Escape",
- N_("Stop loading the current page"), G_CALLBACK (_action_reload_stop_activate) },
- { "ReloadStop", GTK_STOCK_STOP,
- NULL, "r",
- N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
- { "ZoomIn", GTK_STOCK_ZOOM_IN,
- NULL, "plus",
- N_("Increase the zoom level"), G_CALLBACK (_action_zoom_in_activate) },
- { "ZoomOut", GTK_STOCK_ZOOM_OUT,
- NULL, "minus",
- N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_out_activate) },
- { "ZoomNormal", GTK_STOCK_ZOOM_100,
- NULL, "0",
- N_("Reset the zoom level"), G_CALLBACK (_action_zoom_normal_activate) },
- { "Encoding", NULL, N_("_Encoding") },
- { "SourceView", NULL,
- N_("View So_urce"), "U",
- N_("View the source code of the page"), G_CALLBACK (_action_source_view_activate) },
- { "Fullscreen", GTK_STOCK_FULLSCREEN,
- NULL, "F11",
- N_("Toggle fullscreen view"), G_CALLBACK (_action_fullscreen_activate) },
- #if WEBKIT_CHECK_VERSION (1, 1, 4)
- { "ScrollLeft", NULL,
- N_("Scroll _Left"), "h",
- N_("Scroll to the left"), G_CALLBACK (_action_scroll_somewhere_activate) },
- { "ScrollDown", NULL,
- N_("Scroll _Down"), "j",
- N_("Scroll down"), G_CALLBACK (_action_scroll_somewhere_activate) },
- { "ScrollUp", NULL,
- N_("Scroll _Up"), "k",
- N_("Scroll up"), G_CALLBACK (_action_scroll_somewhere_activate) },
- { "ScrollRight", NULL,
- N_("Scroll _Right"), "l",
- N_("Scroll to the right"), G_CALLBACK (_action_scroll_somewhere_activate) },
- #endif
+ { "View", NULL, N_("_View") },
+ { "Toolbars", NULL, N_("_Toolbars") },
+ { "Reload", GTK_STOCK_REFRESH,
+ NULL, "r",
+ N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
+ { "Stop", GTK_STOCK_STOP,
+ NULL, "Escape",
+ N_("Stop loading the current page"), G_CALLBACK (_action_reload_stop_activate) },
+ { "ReloadStop", GTK_STOCK_STOP,
+ NULL, "r",
+ N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
+ { "ZoomIn", GTK_STOCK_ZOOM_IN,
+ NULL, "plus",
+ N_("Increase the zoom level"), G_CALLBACK (_action_zoom_in_activate) },
+ { "ZoomOut", GTK_STOCK_ZOOM_OUT,
+ NULL, "minus",
+ N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_out_activate) },
+ { "ZoomNormal", GTK_STOCK_ZOOM_100,
+ NULL, "0",
+ N_("Reset the zoom level"), G_CALLBACK (_action_zoom_normal_activate) },
+ { "Encoding", NULL, N_("_Encoding") },
+ { "SourceView", NULL,
+ N_("View So_urce"), "U",
+ N_("View the source code of the page"), G_CALLBACK (_action_source_view_activate) },
+ { "Fullscreen", GTK_STOCK_FULLSCREEN,
+ NULL, "F11",
+ N_("Toggle fullscreen view"), G_CALLBACK (_action_fullscreen_activate) },
+ #if WEBKIT_CHECK_VERSION (1, 1, 4)
+ { "ScrollLeft", NULL,
+ N_("Scroll _Left"), "h",
+ N_("Scroll to the left"), G_CALLBACK (_action_scroll_somewhere_activate) },
+ { "ScrollDown", NULL,
+ N_("Scroll _Down"), "j",
+ N_("Scroll down"), G_CALLBACK (_action_scroll_somewhere_activate) },
+ { "ScrollUp", NULL,
+ N_("Scroll _Up"), "k",
+ N_("Scroll up"), G_CALLBACK (_action_scroll_somewhere_activate) },
+ { "ScrollRight", NULL,
+ N_("Scroll _Right"), "l",
+ N_("Scroll to the right"), G_CALLBACK (_action_scroll_somewhere_activate) },
+ #endif
- { "Go", NULL, N_("_Go") },
- { "Back", GTK_STOCK_GO_BACK,
- NULL, "Left",
- N_("Go back to the previous page"), G_CALLBACK (_action_back_activate) },
- { "Forward", GTK_STOCK_GO_FORWARD,
- NULL, "Right",
- N_("Go forward to the next page"), G_CALLBACK (_action_forward_activate) },
- { "Previous", GTK_STOCK_MEDIA_PREVIOUS,
- NULL, "Left",
- /* i18n: Visit the previous logical page, ie. in a forum or blog */
- N_("Go to the previous sub-page"), G_CALLBACK (_action_previous_activate) },
- { "Next", GTK_STOCK_MEDIA_NEXT,
- NULL, "Right",
- /* i18n: Visit the following logical page, ie. in a forum or blog */
- N_("Go to the next sub-page"), G_CALLBACK (_action_next_activate) },
- { "Homepage", STOCK_HOMEPAGE,
- NULL, "Home",
- N_("Go to your homepage"), G_CALLBACK (_action_homepage_activate) },
- { "TrashEmpty", GTK_STOCK_CLEAR,
- N_("Empty Trash"), "",
- N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) },
- { "UndoTabClose", GTK_STOCK_UNDELETE,
- N_("Undo _Close Tab"), "t",
- N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) },
+ { "Go", NULL, N_("_Go") },
+ { "Back", GTK_STOCK_GO_BACK,
+ NULL, "Left",
+ N_("Go back to the previous page"), G_CALLBACK (_action_back_activate) },
+ { "Forward", GTK_STOCK_GO_FORWARD,
+ NULL, "Right",
+ N_("Go forward to the next page"), G_CALLBACK (_action_forward_activate) },
+ { "Previous", GTK_STOCK_MEDIA_PREVIOUS,
+ NULL, "Left",
+ /* i18n: Visit the previous logical page, ie. in a forum or blog */
+ N_("Go to the previous sub-page"), G_CALLBACK (_action_previous_activate) },
+ { "Next", GTK_STOCK_MEDIA_NEXT,
+ NULL, "Right",
+ /* i18n: Visit the following logical page, ie. in a forum or blog */
+ N_("Go to the next sub-page"), G_CALLBACK (_action_next_activate) },
+ { "Homepage", STOCK_HOMEPAGE,
+ NULL, "Home",
+ N_("Go to your homepage"), G_CALLBACK (_action_homepage_activate) },
+ { "TrashEmpty", GTK_STOCK_CLEAR,
+ N_("Empty Trash"), "",
+ N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) },
+ { "UndoTabClose", GTK_STOCK_UNDELETE,
+ N_("Undo _Close Tab"), "t",
+ N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) },
- { "BookmarkAdd", STOCK_BOOKMARK_ADD,
- NULL, "d",
- N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) },
- { "BookmarkFolderAdd", NULL,
- N_("Add a new _folder"), "",
- N_("Add a new bookmark folder"), G_CALLBACK (_action_bookmark_folder_add_activate) },
- { "BookmarksImport", NULL,
- N_("_Import bookmarks"), "",
- NULL, G_CALLBACK (_action_bookmarks_import_activate) },
- { "BookmarksExport", NULL,
- N_("_Export bookmarks"), "",
- NULL, G_CALLBACK (_action_bookmarks_export_activate) },
- { "ManageSearchEngines", GTK_STOCK_PROPERTIES,
- N_("_Manage Search Engines"), "s",
- N_("Add, edit and remove search engines..."),
- G_CALLBACK (_action_manage_search_engines_activate) },
- { "ClearPrivateData", NULL,
- N_("_Clear Private Data"), "Delete",
- N_("Clear private data..."),
- G_CALLBACK (_action_clear_private_data_activate) },
- #if WEBKIT_CHECK_VERSION (1, 1, 17)
- { "InspectPage", NULL,
- N_("_Inspect Page"), "i",
- N_("Inspect page details and access developer tools..."),
- G_CALLBACK (_action_inspect_page_activate) },
- #endif
+ { "BookmarkAdd", STOCK_BOOKMARK_ADD,
+ NULL, "d",
+ N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) },
+ { "BookmarkFolderAdd", NULL,
+ N_("Add a new _folder"), "",
+ N_("Add a new bookmark folder"), G_CALLBACK (_action_bookmark_folder_add_activate) },
+ { "BookmarksImport", NULL,
+ N_("_Import bookmarks"), "",
+ NULL, G_CALLBACK (_action_bookmarks_import_activate) },
+ { "BookmarksExport", NULL,
+ N_("_Export bookmarks"), "",
+ NULL, G_CALLBACK (_action_bookmarks_export_activate) },
+ { "ManageSearchEngines", GTK_STOCK_PROPERTIES,
+ N_("_Manage Search Engines"), "s",
+ N_("Add, edit and remove search engines..."),
+ G_CALLBACK (_action_manage_search_engines_activate) },
+ { "ClearPrivateData", NULL,
+ N_("_Clear Private Data"), "Delete",
+ N_("Clear private data..."),
+ G_CALLBACK (_action_clear_private_data_activate) },
+ #if WEBKIT_CHECK_VERSION (1, 1, 17)
+ { "InspectPage", NULL,
+ N_("_Inspect Page"), "i",
+ N_("Inspect page details and access developer tools..."),
+ G_CALLBACK (_action_inspect_page_activate) },
+ #endif
- { "TabPrevious", GTK_STOCK_GO_BACK,
- N_("_Previous Tab"), "Page_Up",
- N_("Switch to the previous tab"), G_CALLBACK (_action_tab_previous_activate) },
- { "TabNext", GTK_STOCK_GO_FORWARD,
- N_("_Next Tab"), "Page_Down",
- N_("Switch to the next tab"), G_CALLBACK (_action_tab_next_activate) },
- { "TabCurrent", NULL,
- N_("Focus _Current Tab"), "Home",
- N_("Focus the current tab"), G_CALLBACK (_action_tab_current_activate) },
- { "LastSession", NULL,
- N_("Open last _session"), NULL,
- N_("Open the tabs saved in the last session"), NULL },
+ { "TabPrevious", GTK_STOCK_GO_BACK,
+ N_("_Previous Tab"), "Page_Up",
+ N_("Switch to the previous tab"), G_CALLBACK (_action_tab_previous_activate) },
+ { "TabNext", GTK_STOCK_GO_FORWARD,
+ N_("_Next Tab"), "Page_Down",
+ N_("Switch to the next tab"), G_CALLBACK (_action_tab_next_activate) },
+ { "TabCurrent", NULL,
+ N_("Focus _Current Tab"), "Home",
+ N_("Focus the current tab"), G_CALLBACK (_action_tab_current_activate) },
+ { "LastSession", NULL,
+ N_("Open last _session"), NULL,
+ N_("Open the tabs saved in the last session"), NULL },
- { "Help", NULL, N_("_Help") },
- { "HelpContents", GTK_STOCK_HELP,
- N_("_Contents"), "F1",
- N_("Show the documentation"), G_CALLBACK (_action_help_link_activate) },
- { "HelpFAQ", NULL,
- N_("_Frequent Questions"), NULL,
- N_("Show the Frequently Asked Questions"), G_CALLBACK (_action_help_link_activate) },
- { "HelpBugs", NULL,
- N_("_Report a Bug"), NULL,
- N_("Open Midori's bug tracker"), G_CALLBACK (_action_help_link_activate) },
- { "About", GTK_STOCK_ABOUT,
- NULL, "",
- N_("Show information about the program"), G_CALLBACK (_action_about_activate) },
- { "Dummy", NULL, "Dummy" },
- };
- static const guint entries_n = G_N_ELEMENTS (entries);
+ { "Help", NULL, N_("_Help") },
+ { "HelpContents", GTK_STOCK_HELP,
+ N_("_Contents"), "F1",
+ N_("Show the documentation"), G_CALLBACK (_action_help_link_activate) },
+ { "HelpFAQ", NULL,
+ N_("_Frequent Questions"), NULL,
+ N_("Show the Frequently Asked Questions"), G_CALLBACK (_action_help_link_activate) },
+ { "HelpBugs", NULL,
+ N_("_Report a Bug"), NULL,
+ N_("Open Midori's bug tracker"), G_CALLBACK (_action_help_link_activate) },
+ { "About", GTK_STOCK_ABOUT,
+ NULL, "",
+ N_("Show information about the program"), G_CALLBACK (_action_about_activate) },
+ { "Dummy", NULL, "Dummy" },
+};
+static const guint entries_n = G_N_ELEMENTS (entries);
-static const GtkToggleActionEntry toggle_entries[] = {
- { "Menubar", NULL,
- N_("_Menubar"), "",
- N_("Show menubar"), G_CALLBACK (_action_menubar_activate),
- FALSE },
- { "Navigationbar", NULL,
- N_("_Navigationbar"), "",
- N_("Show navigationbar"), G_CALLBACK (_action_navigationbar_activate),
- FALSE },
- { "Panel", GTK_STOCK_INDENT,
- N_("Side_panel"), "F9",
- N_("Show sidepanel"), G_CALLBACK (_action_panel_activate),
- FALSE },
- { "Bookmarkbar", NULL,
- N_("_Bookmarkbar"), "",
- N_("Show bookmarkbar"), G_CALLBACK (_action_bookmarkbar_activate),
- FALSE },
- { "Transferbar", NULL,
- N_("_Transferbar"), "",
- N_("Show transferbar"), G_CALLBACK (_action_transferbar_activate),
- FALSE },
- { "Statusbar", NULL,
- N_("_Statusbar"), "",
- N_("Show statusbar"), G_CALLBACK (_action_statusbar_activate),
- FALSE },
- };
- static const guint toggle_entries_n = G_N_ELEMENTS (toggle_entries);
+static const GtkToggleActionEntry toggle_entries[] =
+{
+ { "Menubar", NULL,
+ N_("_Menubar"), "",
+ N_("Show menubar"), G_CALLBACK (_action_menubar_activate),
+ FALSE },
+ { "Navigationbar", NULL,
+ N_("_Navigationbar"), "",
+ N_("Show navigationbar"), G_CALLBACK (_action_navigationbar_activate),
+ FALSE },
+ { "Panel", GTK_STOCK_INDENT,
+ N_("Side_panel"), "F9",
+ N_("Show sidepanel"), G_CALLBACK (_action_panel_activate),
+ FALSE },
+ { "Bookmarkbar", NULL,
+ N_("_Bookmarkbar"), "",
+ N_("Show bookmarkbar"), G_CALLBACK (_action_bookmarkbar_activate),
+ FALSE },
+ { "Transferbar", NULL,
+ N_("_Transferbar"), "",
+ N_("Show transferbar"), G_CALLBACK (_action_transferbar_activate),
+ FALSE },
+ { "Statusbar", NULL,
+ N_("_Statusbar"), "",
+ N_("Show statusbar"), G_CALLBACK (_action_statusbar_activate),
+ FALSE },
+};
+static const guint toggle_entries_n = G_N_ELEMENTS (toggle_entries);
-static const GtkRadioActionEntry encoding_entries[] = {
-{ "EncodingAutomatic", NULL,
- N_("_Automatic"), "",
- NULL, 1 },
- { "EncodingChinese", NULL,
- N_("Chinese (BIG5)"), "",
- NULL, 1 },
- { "EncodingJapanese", NULL,
- /* i18n: A double underscore "__" is used to prevent an unwanted mnemonic */
- N_("Japanese (SHIFT__JIS)"), "",
- NULL, 1 },
- { "EncodingKorean", NULL,
- N_("Korean (EUC-KR)"), "",
- NULL, 1 },
- { "EncodingRussian", NULL,
- N_("Russian (KOI8-R)"), "",
- NULL, 1 },
- { "EncodingUnicode", NULL,
- N_("Unicode (UTF-8)"), "",
- NULL, 1 },
- { "EncodingWestern", NULL,
- N_("Western (ISO-8859-1)"), "",
- NULL, 1 },
- { "EncodingCustom", NULL,
- N_("Custom..."), "",
- NULL, 1 },
- };
- static const guint encoding_entries_n = G_N_ELEMENTS (encoding_entries);
+static const GtkRadioActionEntry encoding_entries[] =
+{
+ { "EncodingAutomatic", NULL,
+ N_("_Automatic"), "",
+ NULL, 1 },
+ { "EncodingChinese", NULL,
+ N_("Chinese (BIG5)"), "",
+ NULL, 1 },
+ { "EncodingJapanese", NULL,
+ /* i18n: A double underscore "__" is used to prevent the mnemonic */
+ N_("Japanese (SHIFT__JIS)"), "",
+ NULL, 1 },
+ { "EncodingKorean", NULL,
+ N_("Korean (EUC-KR)"), "",
+ NULL, 1 },
+ { "EncodingRussian", NULL,
+ N_("Russian (KOI8-R)"), "",
+ NULL, 1 },
+ { "EncodingUnicode", NULL,
+ N_("Unicode (UTF-8)"), "",
+ NULL, 1 },
+ { "EncodingWestern", NULL,
+ N_("Western (ISO-8859-1)"), "",
+ NULL, 1 },
+ { "EncodingCustom", NULL,
+ N_("Custom..."), "",
+ NULL, 1 },
+};
+static const guint encoding_entries_n = G_N_ELEMENTS (encoding_entries);
static void
midori_browser_window_state_event_cb (MidoriBrowser* browser,
@@ -5644,7 +5811,7 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser,
{
GtkWidget* widget = GTK_WIDGET (browser);
- if (GTK_WIDGET_REALIZED (widget) && !browser->alloc_timeout)
+ if (gtk_widget_get_realized (widget) && !browser->alloc_timeout)
{
gpointer last_page;
@@ -5679,123 +5846,123 @@ midori_browser_destroy_cb (MidoriBrowser* browser)
}
static const gchar* ui_markup =
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- /* For accelerators to work all actions need to be used
- *somewhere* in the UI definition */
- ""
- ""
- ""
- ""
- "";
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ /* For accelerators to work all actions need to be used
+ *somewhere* in the UI definition */
+ ""
+ ""
+ ""
+ ""
+ "";
static void
midori_browser_realize_cb (GtkStyle* style,
@@ -6667,7 +6834,8 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem,
if (event->button == 2)
{
GtkWidget* parent = gtk_widget_get_parent (toolitem);
- GtkAction* action = gtk_widget_get_action (parent);
+ GtkAction* action = gtk_activatable_get_related_action (
+ GTK_ACTIVATABLE (parent));
return midori_browser_menu_middle_click_on_navigation_action (browser, action);
}
@@ -6834,7 +7002,7 @@ _midori_browser_update_settings (MidoriBrowser* browser)
last_panel_position);
/* The browser may not yet be visible, which means that we can't set the
page. So we set it in midori_browser_size_allocate_cb */
- if (GTK_WIDGET_VISIBLE (browser))
+ if (gtk_widget_get_visible (GTK_WIDGET (browser)))
midori_panel_set_current_page (MIDORI_PANEL (browser->panel), last_panel_page);
else
g_object_set_data (G_OBJECT (browser), "last-page",
@@ -7478,14 +7646,11 @@ midori_browser_set_current_page (MidoriBrowser* browser,
gint n)
{
GtkWidget* view;
- GtkWidget* web_view;
gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n);
view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n);
- if (view && midori_view_is_blank (MIDORI_VIEW (view)))
+ if (midori_view_is_blank (MIDORI_VIEW (view)))
gtk_action_activate (_action_by_name (browser, "Location"));
- else if ((web_view = gtk_bin_get_child (GTK_BIN (view))))
- gtk_widget_grab_focus (web_view);
else
gtk_widget_grab_focus (view);
}
@@ -7531,36 +7696,35 @@ midori_browser_get_nth_tab (MidoriBrowser* browser,
}
/**
- * midori_browser_set_current_tab:
+ * midori_browser_set_tab:
* @browser: a #MidoriBrowser
* @view: a #GtkWidget
*
* Switches to the page containing @view.
*
* The widget will also grab the focus automatically.
+ *
+ * Since: 0.2.6
**/
void
midori_browser_set_current_tab (MidoriBrowser* browser,
GtkWidget* view)
{
gint n;
- GtkWidget* web_view;
g_return_if_fail (MIDORI_IS_BROWSER (browser));
g_return_if_fail (GTK_IS_WIDGET (view));
n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), view);
gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n);
- if (view && midori_view_is_blank (MIDORI_VIEW (view)))
+ if (midori_view_is_blank (MIDORI_VIEW (view)))
gtk_action_activate (_action_by_name (browser, "Location"));
- else if ((web_view = gtk_bin_get_child (GTK_BIN (view))))
- gtk_widget_grab_focus (web_view);
else
gtk_widget_grab_focus (view);
}
/**
- * midori_browser_get_current_tab:
+ * midori_browser_get_tab:
* @browser: a #MidoriBrowser
*
* Retrieves the currently selected tab.
@@ -7570,6 +7734,8 @@ midori_browser_set_current_tab (MidoriBrowser* browser,
* See also midori_browser_get_current_page().
*
* Return value: the selected tab, or %NULL
+ *
+ * Since: 0.2.6
**/
GtkWidget*
midori_browser_get_current_tab (MidoriBrowser* browser)
@@ -7586,7 +7752,25 @@ midori_browser_get_current_tab (MidoriBrowser* browser)
}
/**
- * midori_browser_get_proxy_array:
+ * midori_browser_get_tabs:
+ * @browser: a #MidoriBrowser
+ *
+ * Retrieves the tabs as a list.
+ *
+ * Return value: a newly allocated #GList of #MidoriView
+ *
+ * Since: 0.2.5
+ **/
+GList*
+midori_browser_get_tabs (MidoriBrowser* browser)
+{
+ g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
+
+ return gtk_container_get_children (GTK_CONTAINER (browser->notebook));
+}
+
+/**
+ * midori_browser_get_proxy_items:
* @browser: a #MidoriBrowser
*
* Retrieves a proxy array representing the respective proxy items
@@ -7598,6 +7782,26 @@ midori_browser_get_current_tab (MidoriBrowser* browser)
* may release its reference at some point.
*
* Return value: the proxy #KatzeArray
+ *
+ * Since: 0.2.5
+ **/
+KatzeArray*
+midori_browser_get_proxy_items (MidoriBrowser* browser)
+{
+ g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
+
+ return browser->proxy_array;
+}
+
+/**
+ * midori_browser_get_proxy_array:
+ * @browser: a #MidoriBrowser
+ *
+ * Retrieves a proxy array representing the respective proxy items.
+ *
+ * Return value: the proxy #KatzeArray
+ *
+ * Deprecated: 0.2.5: Use midori_browser_get_proxy_item instead.
**/
KatzeArray*
midori_browser_get_proxy_array (MidoriBrowser* browser)
diff --git a/midori/midori-browser.h b/midori/midori-browser.h
index 1b3d8734..7129bcc8 100644
--- a/midori/midori-browser.h
+++ b/midori/midori-browser.h
@@ -18,6 +18,7 @@
#endif
#include
+#include "midori-view.h"
G_BEGIN_DECLS
@@ -129,9 +130,17 @@ midori_browser_get_nth_tab (MidoriBrowser* browser,
void
midori_browser_set_current_tab (MidoriBrowser* browser,
GtkWidget* widget);
+#define midori_browser_set_tab midori_browser_set_current_tab
GtkWidget*
midori_browser_get_current_tab (MidoriBrowser* browser);
+#define midori_browser_get_tab midori_browser_get_current_tab
+
+GList*
+midori_browser_get_tabs (MidoriBrowser* browser);
+
+KatzeArray*
+midori_browser_get_proxy_items (MidoriBrowser* browser);
KatzeArray*
midori_browser_get_proxy_array (MidoriBrowser* browser);
@@ -145,6 +154,9 @@ midori_browser_quit (MidoriBrowser* browser);
const gchar**
midori_browser_get_toolbar_actions (MidoriBrowser* browser);
+MidoriWebSettings*
+midori_browser_get_settings (MidoriBrowser* browser);
+
G_END_DECLS
#endif /* __MIDORI_BROWSER_H__ */
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 87eb5689..9434e1cd 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2008-2009 Christian Dywan
- Copyright (C) 2008 Dale Whittaker
+ Copyright (C) 2008-2010 Christian Dywan
+ Copyright (C) 2008-2010 Dale Whittaker
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -373,7 +373,8 @@ midori_location_action_popup_timeout_cb (gpointer data)
result = sqlite3_step (stmt);
if (result != SQLITE_ROW && !action->search_engines)
{
- g_print (_("Failed to select from history\n"));
+ if (result == SQLITE_ERROR)
+ g_print (_("Failed to select from history\n"));
sqlite3_reset (stmt);
sqlite3_clear_bindings (stmt);
midori_location_action_popdown_completion (action);
@@ -384,6 +385,7 @@ midori_location_action_popup_timeout_cb (gpointer data)
{
GtkTreeModel* model = NULL;
GtkWidget* popup;
+ GtkWidget* popup_frame;
GtkWidget* scrolled;
GtkWidget* treeview;
GtkCellRenderer* renderer;
@@ -393,10 +395,13 @@ midori_location_action_popup_timeout_cb (gpointer data)
popup = gtk_window_new (GTK_WINDOW_POPUP);
gtk_window_set_type_hint (GTK_WINDOW (popup), GDK_WINDOW_TYPE_HINT_COMBO);
+ popup_frame = gtk_frame_new (NULL);
+ gtk_frame_set_shadow_type (GTK_FRAME (popup_frame), GTK_SHADOW_ETCHED_IN);
+ gtk_container_add (GTK_CONTAINER (popup), popup_frame);
scrolled = g_object_new (GTK_TYPE_SCROLLED_WINDOW,
"hscrollbar-policy", GTK_POLICY_NEVER,
"vscrollbar-policy", GTK_POLICY_AUTOMATIC, NULL);
- gtk_container_add (GTK_CONTAINER (popup), scrolled);
+ gtk_container_add (GTK_CONTAINER (popup_frame), scrolled);
treeview = gtk_tree_view_new_with_model (model);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
gtk_tree_view_set_hover_selection (GTK_TREE_VIEW (treeview), TRUE);
@@ -486,7 +491,7 @@ midori_location_action_popup_timeout_cb (gpointer data)
searches += i;
}
- if (!GTK_WIDGET_VISIBLE (action->popup))
+ if (!gtk_widget_get_visible (action->popup))
{
GtkWidget* toplevel = gtk_widget_get_toplevel (action->entry);
gtk_window_set_screen (GTK_WINDOW (action->popup),
@@ -831,7 +836,7 @@ midori_location_action_button_press_event_cb (GtkEntry* entry,
GdkEventKey* event,
MidoriLocationAction* action)
{
- if (action->popup && GTK_WIDGET_VISIBLE (action->popup))
+ if (action->popup && gtk_widget_get_visible (action->popup))
{
midori_location_action_popdown_completion (action);
@@ -863,7 +868,7 @@ midori_location_action_key_press_event_cb (GtkEntry* entry,
case GDK_Right:
case GDK_KP_Right:
- if (location_action->popup && GTK_WIDGET_VISIBLE (location_action->popup))
+ if (location_action->popup && gtk_widget_get_visible (location_action->popup))
{
GtkTreeModel* model = location_action->completion_model;
GtkTreeIter iter;
@@ -892,7 +897,7 @@ midori_location_action_key_press_event_cb (GtkEntry* entry,
break;
case GDK_Escape:
{
- if (location_action->popup && GTK_WIDGET_VISIBLE (location_action->popup))
+ if (location_action->popup && gtk_widget_get_visible (location_action->popup))
{
midori_location_action_popdown_completion (location_action);
text = gtk_entry_get_text (entry);
@@ -906,7 +911,7 @@ midori_location_action_key_press_event_cb (GtkEntry* entry,
}
case GDK_Page_Up:
case GDK_Page_Down:
- if (!(location_action->popup && GTK_WIDGET_VISIBLE (location_action->popup)))
+ if (!(location_action->popup && gtk_widget_get_visible (location_action->popup)))
return TRUE;
case GDK_Down:
case GDK_KP_Down:
@@ -915,7 +920,7 @@ midori_location_action_key_press_event_cb (GtkEntry* entry,
{
GtkWidget* parent;
- if (location_action->popup && GTK_WIDGET_VISIBLE (location_action->popup))
+ if (location_action->popup && gtk_widget_get_visible (location_action->popup))
{
GtkTreeModel* model = location_action->completion_model;
gint matches = gtk_tree_model_iter_n_children (model, NULL);
@@ -1680,3 +1685,60 @@ midori_location_action_clear (MidoriLocationAction* location_action)
midori_location_action_toggle_arrow (location_action);
}
+
+/**
+ * midori_location_action_set_security_hint:
+ * @location_action: a #MidoriLocationAction
+ * @hint: a security hint
+ *
+ * Sets a security hint on the action, so that the security status
+ * can be reflected visually.
+ *
+ * Since: 0.2.5
+ **/
+void
+midori_location_action_set_security_hint (MidoriLocationAction* location_action,
+ MidoriSecurity hint)
+{
+ GSList* proxies;
+ GtkWidget* entry;
+ GtkWidget* child;
+
+ g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
+
+ proxies = gtk_action_get_proxies (GTK_ACTION (location_action));
+
+ for (; proxies != NULL; proxies = g_slist_next (proxies))
+ if (GTK_IS_TOOL_ITEM (proxies->data))
+ {
+ GdkColor bg_color = { 0, 1 };
+ GdkColor fg_color = { 0, 1 };
+
+ entry = midori_location_action_entry_for_proxy (proxies->data);
+ child = gtk_bin_get_child (GTK_BIN (entry));
+
+ if (hint == MIDORI_SECURITY_UNKNOWN)
+ {
+ gdk_color_parse ("#ef7070", &bg_color);
+ gdk_color_parse ("#000", &fg_color);
+ #if !HAVE_HILDON
+ gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (child),
+ GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_INFO);
+ #endif
+ }
+ else if (hint == MIDORI_SECURITY_TRUSTED)
+ {
+ gdk_color_parse ("#fcf19a", &bg_color);
+ gdk_color_parse ("#000", &fg_color);
+ #if !HAVE_HILDON
+ gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (child),
+ GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_DIALOG_AUTHENTICATION);
+ #endif
+ }
+
+ gtk_widget_modify_base (child, GTK_STATE_NORMAL,
+ bg_color.red == 1 ? NULL : &bg_color);
+ gtk_widget_modify_text (child, GTK_STATE_NORMAL,
+ bg_color.red == 1 ? NULL : &fg_color);
+ }
+}
diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h
index 2dc56314..3decc542 100644
--- a/midori/midori-locationaction.h
+++ b/midori/midori-locationaction.h
@@ -13,6 +13,7 @@
#define __MIDORI_LOCATION_ACTION_H__
#include
+#include "midori-view.h"
G_BEGIN_DECLS
@@ -101,6 +102,10 @@ midori_location_action_delete_item_from_uri (MidoriLocationAction* location_acti
void
midori_location_action_clear (MidoriLocationAction* location_action);
+void
+midori_location_action_set_security_hint (MidoriLocationAction* location_action,
+ MidoriSecurity hint);
+
G_END_DECLS
#endif /* __MIDORI_LOCATION_ACTION_H__ */
diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index 1698bef5..33618ae3 100644
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -405,7 +405,6 @@ midori_panel_init (MidoriPanel* panel)
/* Create the sidebar */
panel->toolbar = gtk_toolbar_new ();
- gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), GTK_TOOLBAR_ICONS);
gtk_toolbar_set_icon_size (GTK_TOOLBAR (panel->toolbar), GTK_ICON_SIZE_BUTTON);
gtk_toolbar_set_show_arrow (GTK_TOOLBAR (panel->toolbar), FALSE);
gtk_widget_show_all (panel->toolbar);
@@ -657,7 +656,7 @@ midori_panel_construct_menu_item (MidoriPanel* panel,
menuitem = gtk_action_create_menu_item (action);
g_object_set_data (G_OBJECT (menuitem), "page", viewable);
- if (GTK_WIDGET_VISIBLE (viewable))
+ if (gtk_widget_get_visible (GTK_WIDGET (viewable)))
gtk_widget_show (menuitem);
return menuitem;
}
@@ -841,7 +840,7 @@ midori_panel_append_page (MidoriPanel* panel,
g_signal_connect (viewable, "destroy",
G_CALLBACK (midori_panel_viewable_destroy_cb), panel);
- if (!GTK_WIDGET_VISIBLE (viewable))
+ if (!gtk_widget_get_visible (GTK_WIDGET (viewable)))
{
gtk_widget_hide (scrolled);
gtk_widget_hide (GTK_WIDGET (toolitem));
@@ -992,7 +991,7 @@ midori_panel_set_current_page (MidoriPanel* panel,
GList* items;
const gchar* label;
- if (!GTK_WIDGET_VISIBLE (viewable))
+ if (!gtk_widget_get_visible (viewable))
return;
gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->toolbook), n);
diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 3898ccde..80b207e7 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -183,14 +183,13 @@ midori_preferences_homepage_current_clicked_cb (GtkWidget* button,
#if !HAVE_HILDON
static void
-midori_preferences_notify_auto_detect_proxy_cb (MidoriWebSettings* settings,
- GParamSpec* pspec,
- GtkWidget* entry)
+midori_preferences_notify_proxy_type_cb (MidoriWebSettings* settings,
+ GParamSpec* pspec,
+ GtkWidget* entry)
{
- MidoriIdentity auto_detect_proxy = katze_object_get_enum (settings,
- "auto-detect-proxy");
+ MidoriProxy proxy_type = katze_object_get_enum (settings, "proxy-type");
- gtk_widget_set_sensitive (entry, !auto_detect_proxy);
+ gtk_widget_set_sensitive (entry, proxy_type == MIDORI_PROXY_HTTP);
}
#endif
@@ -410,6 +409,12 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
SPANNED_ADD (button);
button = katze_property_proxy (settings, "zoom-text-and-images", NULL);
INDENTED_ADD (button);
+ #if WEBKIT_CHECK_VERSION (1, 1, 11)
+ button = katze_property_proxy (settings, "javascript-can-open-windows-automatically", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Allow scripts to open popups"));
+ gtk_widget_set_tooltip_text (button, _("Whether scripts are allowed to open popup windows automatically"));
+ SPANNED_ADD (button);
+ #endif
#if WEBKIT_CHECK_VERSION (1, 1, 6)
FRAME_NEW (_("Spell Checking"));
/* FIXME: Provide a nice dictionary selection */
@@ -480,16 +485,17 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
PAGE_NEW (GTK_STOCK_NETWORK, _("Network"));
FRAME_NEW (_("Network"));
#if !HAVE_HILDON
- label = katze_property_label (settings, "http-proxy");
+ label = katze_property_label (settings, "proxy-type");
+ INDENTED_ADD (label);
+ button = katze_property_proxy (settings, "proxy-type", NULL);
+ SPANNED_ADD (button);
+ label = gtk_label_new (_("Hostname"));
INDENTED_ADD (label);
entry = katze_property_proxy (settings, "http-proxy", NULL);
SPANNED_ADD (entry);
- INDENTED_ADD (gtk_event_box_new ());
- button = katze_property_proxy (settings, "auto-detect-proxy", NULL);
- SPANNED_ADD (button);
- g_signal_connect (settings, "notify::auto-detect-proxy",
- G_CALLBACK (midori_preferences_notify_auto_detect_proxy_cb), entry);
- midori_preferences_notify_auto_detect_proxy_cb (settings, NULL, entry);
+ g_signal_connect (settings, "notify::proxy-type",
+ G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry);
+ midori_preferences_notify_proxy_type_cb (settings, NULL, entry);
#endif
label = katze_property_label (settings, "identify-as");
INDENTED_ADD (label);
diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index c46dafe7..f49fd14b 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -393,7 +393,7 @@ midori_search_action_manage_activate_cb (GtkWidget* menuitem,
GtkWidget* dialog;
dialog = midori_search_action_get_dialog (search_action);
- if (GTK_WIDGET_VISIBLE (dialog))
+ if (gtk_widget_get_visible (dialog))
gtk_window_present (GTK_WINDOW (dialog));
else
gtk_widget_show (dialog);
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 917ccb3a..cc183b2c 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2007-2009 Christian Dywan
+ Copyright (C) 2007-2010 Christian Dywan
Copyright (C) 2009 Jean-François Guchens
This library is free software; you can redistribute it and/or
@@ -61,12 +61,15 @@ midori_view_item_meta_data_changed (KatzeItem* item,
struct _MidoriView
{
- KatzeScrolled parent_instance;
+ GtkVBox parent_instance;
gchar* uri;
+ gboolean special;
gchar* title;
+ MidoriSecurity security;
gchar* mime_type;
GdkPixbuf* icon;
+ gchar* icon_uri;
gdouble progress;
MidoriLoadStatus load_status;
gboolean minimized;
@@ -103,14 +106,17 @@ struct _MidoriView
gboolean back_forward_set;
KatzeNet* net;
+ GHashTable* memory;
+
+ GtkWidget* scrolled_window;
};
struct _MidoriViewClass
{
- KatzeScrolledClass parent_class;
+ GtkVBoxClass parent_class;
};
-G_DEFINE_TYPE (MidoriView, midori_view, KATZE_TYPE_SCROLLED);
+G_DEFINE_TYPE (MidoriView, midori_view, GTK_TYPE_VBOX);
GType
midori_load_status_get_type (void)
@@ -149,12 +155,30 @@ midori_new_view_get_type (void)
return type;
}
+GType
+midori_security_get_type (void)
+{
+ static GType type = 0;
+ if (!type)
+ {
+ static const GEnumValue values[] = {
+ { MIDORI_SECURITY_NONE, "MIDORI_SECURITY_NONE", "No security" },
+ { MIDORI_SECURITY_UNKNOWN, "MIDORI_SECURITY_UNKNOWN", "Security unknown" },
+ { MIDORI_SECURITY_TRUSTED, "MIDORI_SECURITY_TRUSTED", "Trusted security" },
+ { 0, NULL, NULL }
+ };
+ type = g_enum_register_static ("MidoriSecurity", values);
+ }
+ return type;
+}
+
enum
{
PROP_0,
PROP_URI,
PROP_TITLE,
+ PROP_SECURITY,
PROP_MIME_TYPE,
PROP_ICON,
PROP_LOAD_STATUS,
@@ -201,6 +225,10 @@ midori_view_get_property (GObject* object,
GValue* value,
GParamSpec* pspec);
+static gboolean
+midori_view_focus_in_event (GtkWidget* widget,
+ GdkEventFocus* event);
+
static void
midori_view_settings_notify_cb (MidoriWebSettings* settings,
GParamSpec* pspec,
@@ -215,15 +243,11 @@ static void
midori_view_speed_dial_save (GtkWidget* web_view,
const gchar* message);
-static void
-midori_view_populate_popup (MidoriView* view,
- GtkWidget* menu,
- gboolean manual);
-
static void
midori_view_class_init (MidoriViewClass* class)
{
GObjectClass* gobject_class;
+ GtkWidgetClass* gtkwidget_class;
GParamFlags flags;
signals[ACTIVATE_ACTION] = g_signal_new (
@@ -420,6 +444,9 @@ midori_view_class_init (MidoriViewClass* class)
gobject_class->set_property = midori_view_set_property;
gobject_class->get_property = midori_view_get_property;
+ gtkwidget_class = GTK_WIDGET_CLASS (class);
+ gtkwidget_class->focus_in_event = midori_view_focus_in_event;
+
flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS;
g_object_class_install_property (gobject_class,
@@ -440,6 +467,23 @@ midori_view_class_init (MidoriViewClass* class)
NULL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ /**
+ * MidoriView:security:
+ *
+ * The security status of the loaded page.
+ *
+ * Since: 0.2.5
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_SECURITY,
+ g_param_spec_enum (
+ "security",
+ "Security",
+ "The security of the currently loaded page",
+ MIDORI_TYPE_SECURITY,
+ MIDORI_SECURITY_NONE,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
/**
* MidoriView:mime-type:
*
@@ -713,11 +757,175 @@ midori_view_icon_cb (GdkPixbuf* icon,
midori_view_update_icon (view, icon);
}
+typedef void (*KatzeNetIconCb) (GdkPixbuf* icon,
+ MidoriView* view);
+
+typedef struct
+{
+ gchar* icon_file;
+ gchar* icon_uri;
+ MidoriView* view;
+} KatzeNetIconPriv;
+
+void
+katze_net_icon_priv_free (KatzeNetIconPriv* priv)
+{
+ g_free (priv->icon_file);
+ g_free (priv->icon_uri);
+ g_free (priv);
+}
+
+gboolean
+katze_net_icon_status_cb (KatzeNetRequest* request,
+ KatzeNetIconPriv* priv)
+{
+ switch (request->status)
+ {
+ case KATZE_NET_VERIFIED:
+ if (request->mime_type && strncmp (request->mime_type, "image/", 6))
+ {
+ katze_net_icon_priv_free (priv);
+ return FALSE;
+ }
+ break;
+ case KATZE_NET_MOVED:
+ break;
+ default:
+ katze_net_icon_priv_free (priv);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+void
+katze_net_icon_transfer_cb (KatzeNetRequest* request,
+ KatzeNetIconPriv* priv)
+{
+ 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)
+ {
+ if ((fp = fopen (priv->icon_file, "wb")))
+ {
+ ret = fwrite (request->data, 1, request->length, fp);
+ fclose (fp);
+ if ((ret - request->length) != 0)
+ {
+ g_warning ("Error writing to file %s "
+ "in katze_net_icon_transfer_cb()", priv->icon_file);
+ }
+ pixbuf = gdk_pixbuf_new_from_file (priv->icon_file, NULL);
+ }
+ else
+ pixbuf = katze_pixbuf_new_from_buffer ((guchar*)request->data,
+ request->length, request->mime_type, NULL);
+ if (pixbuf)
+ g_object_ref (pixbuf);
+ g_hash_table_insert (priv->view->memory,
+ g_strdup (priv->icon_file), pixbuf);
+ }
+
+ if (!pixbuf)
+ {
+ midori_view_icon_cb (NULL, priv->view);
+ katze_net_icon_priv_free (priv);
+ return;
+ }
+
+ settings = gtk_widget_get_settings (priv->view->web_view);
+ gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU,
+ &icon_width, &icon_height);
+ pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height,
+ GDK_INTERP_BILINEAR);
+ g_object_unref (pixbuf);
+
+ katze_assign (priv->view->icon_uri, g_strdup (priv->icon_uri));
+ midori_view_icon_cb (pixbuf_scaled, priv->view);
+ katze_net_icon_priv_free (priv);
+}
+
+
static void
_midori_web_view_load_icon (MidoriView* view)
{
- GdkPixbuf* pixbuf = katze_net_load_icon (view->net, view->uri,
- (KatzeNetIconCb)midori_view_icon_cb, NULL, view);
+ GdkPixbuf* pixbuf;
+ KatzeNetIconPriv* priv;
+ gchar* icon_uri;
+ gchar* icon_file;
+ gint icon_width, icon_height;
+ GdkPixbuf* pixbuf_scaled;
+ GtkSettings* settings;
+
+ pixbuf = NULL;
+ icon_uri = g_strdup (view->icon_uri);
+
+ if ((icon_uri && g_str_has_prefix (icon_uri, "http"))
+ || g_str_has_prefix (view->uri, "http"))
+ {
+ if (!icon_uri)
+ {
+ guint i = 8;
+ while (view->uri[i] != '\0' && view->uri[i] != '/')
+ i++;
+ if (view->uri[i] == '/')
+ {
+ icon_uri = g_strdup (view->uri);
+ icon_uri[i] = '\0';
+ icon_uri = g_strdup_printf ("%s/favicon.ico", icon_uri);
+ }
+ else
+ icon_uri = g_strdup_printf ("%s/favicon.ico", view->uri);
+ }
+
+ icon_file = katze_net_get_cached_path (view->net, icon_uri, "icons");
+ if (g_hash_table_lookup_extended (view->memory,
+ icon_file, NULL, (gpointer)&pixbuf))
+ {
+ g_free (icon_file);
+ if (pixbuf)
+ {
+ g_object_ref (pixbuf);
+ katze_assign (view->icon_uri, icon_uri);
+ }
+ }
+ else if ((pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL)))
+ {
+ g_free (icon_file);
+ katze_assign (view->icon_uri, icon_uri);
+ }
+ else
+ {
+ priv = g_new0 (KatzeNetIconPriv, 1);
+ priv->icon_file = icon_file;
+ priv->icon_uri = icon_uri;
+ priv->view = view;
+
+ katze_net_load_uri (view->net, icon_uri,
+ (KatzeNetStatusCb)katze_net_icon_status_cb,
+ (KatzeNetTransferCb)katze_net_icon_transfer_cb, priv);
+ }
+ }
+
+ if (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);
+ g_object_unref (pixbuf);
+ pixbuf = pixbuf_scaled;
+ }
midori_view_update_icon (view, pixbuf);
}
@@ -729,6 +937,9 @@ midori_view_update_load_status (MidoriView* view,
if (view->load_status == load_status)
return;
+ if (load_status == MIDORI_LOAD_FINISHED)
+ view->special = FALSE;
+
view->load_status = load_status;
g_object_notify (G_OBJECT (view), "load-status");
@@ -755,7 +966,7 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView* web_view
return TRUE;
}
}
- /* TODO: Handle more external protocols */
+ view->special = FALSE;
return FALSE;
}
@@ -785,6 +996,7 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view,
uri = webkit_web_frame_get_uri (web_frame);
g_return_if_fail (uri != NULL);
katze_assign (view->uri, sokoke_format_uri_for_display (uri));
+ katze_assign (view->icon_uri, NULL);
if (view->item)
{
#if 0
@@ -838,9 +1050,32 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view,
midori_view_update_icon (view, NULL);
+ if (!strncmp (uri, "https", 5))
+ {
+#if WEBKIT_CHECK_VERSION (1, 1, 14) && defined (HAVE_LIBSOUP_2_29_91)
+ WebKitWebDataSource *source;
+ WebKitNetworkRequest *request;
+ SoupMessage *message;
+
+ source = webkit_web_frame_get_data_source (web_frame);
+ request = webkit_web_data_source_get_request (source);
+ message = webkit_network_request_get_message (request);
+
+ if (message
+ && soup_message_get_flags (message) & SOUP_MESSAGE_CERTIFICATE_TRUSTED)
+ view->security = MIDORI_SECURITY_TRUSTED;
+ else
+#endif
+ view->security = MIDORI_SECURITY_UNKNOWN;
+ }
+ else
+ view->security = MIDORI_SECURITY_NONE;
+ g_object_notify (G_OBJECT (view), "security");
+
midori_view_update_load_status (view, MIDORI_LOAD_COMMITTED);
g_object_thaw_notify (G_OBJECT (view));
+
}
static void
@@ -865,9 +1100,7 @@ midori_view_web_view_resource_request_cb (WebKitWebView* web_view,
const gchar* uri = webkit_network_request_get_uri (request);
/* Only apply custom URIs to special pages for security purposes */
- if (view->uri && *view->uri && strncmp (view->uri, "about:", 6)
- && !webkit_web_data_source_get_unreachable_uri (
- webkit_web_frame_get_data_source (web_frame)))
+ if (!view->special)
return;
if (g_str_has_prefix (uri, "res://"))
@@ -884,13 +1117,13 @@ midori_view_web_view_resource_request_cb (WebKitWebView* web_view,
}
else if (g_str_has_prefix (uri, "stock://"))
{
- GtkIconTheme* icon_theme = gtk_icon_theme_get_default ();
+ GdkPixbuf* pixbuf;
const gchar* icon_name = &uri[8] ? &uri[8] : "";
- gint icon_size = 22;
- GtkIconInfo* info;
+ gint icon_size = GTK_ICON_SIZE_MENU;
if (g_ascii_isalpha (icon_name[0]))
- icon_size = strstr (icon_name, "dialog") ? 48 : 22;
+ icon_size = strstr (icon_name, "dialog") ?
+ GTK_ICON_SIZE_DIALOG : GTK_ICON_SIZE_BUTTON;
else if (g_ascii_isdigit (icon_name[0]))
{
guint i = 0;
@@ -899,32 +1132,74 @@ midori_view_web_view_resource_request_cb (WebKitWebView* web_view,
{
gchar* size = g_strndup (icon_name, i - 1);
icon_size = atoi (size);
+ /* Compatibility: map pixel to symbolic size */
+ if (icon_size == 16)
+ icon_size = GTK_ICON_SIZE_MENU;
g_free (size);
icon_name = &icon_name[i];
}
}
- if ((info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, icon_size, 0)))
+ pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), icon_name, icon_size, NULL);
+ if (!pixbuf)
+ pixbuf = gtk_widget_render_icon (GTK_WIDGET (view),
+ GTK_STOCK_MISSING_IMAGE, icon_size, NULL);
+ if (pixbuf)
{
- const gchar* filename = gtk_icon_info_get_filename (info);
- if (filename)
- {
- gchar* file_uri = g_filename_to_uri (filename, NULL, NULL);
- webkit_network_request_set_uri (request, file_uri);
- g_free (file_uri);
- }
- gtk_icon_info_free (info);
+ gboolean success;
+ gchar* buffer;
+ gsize buffer_size;
+ gchar* encoded;
+ gchar* data_uri;
+
+ success = gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &buffer_size, "png", NULL, NULL);
+ g_object_unref (pixbuf);
+ if (!success)
+ return;
+
+ encoded = g_base64_encode ((guchar*)buffer, buffer_size);
+ g_free (buffer);
+ data_uri = g_strconcat ("data:image/png;base64,", encoded, NULL);
+ g_free (encoded);
+ webkit_network_request_set_uri (request, data_uri);
+ g_free (data_uri);
+ return;
}
}
}
#endif
+static void
+midori_view_load_alternate_string (MidoriView* view,
+ const gchar* data,
+ const gchar* res_root,
+ const gchar* uri,
+ WebKitWebFrame* web_frame)
+{
+ WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view);
+ if (!web_frame)
+ web_frame = webkit_web_view_get_main_frame (web_view);
+ view->special = TRUE;
+ #if WEBKIT_CHECK_VERSION (1, 1, 14)
+ webkit_web_frame_load_alternate_string (
+ web_frame, data, uri, uri);
+ #elif WEBKIT_CHECK_VERSION (1, 1, 6)
+ webkit_web_frame_load_alternate_string (
+ web_frame, data, res_root, uri);
+ #else
+ webkit_web_view_load_html_string (
+ web_view, data, res_root);
+ #endif
+}
+
static gboolean
-webkit_web_view_load_error_cb (WebKitWebView* web_view,
- WebKitWebFrame* web_frame,
- const gchar* uri,
- GError* error,
- MidoriView* view)
+midori_view_display_error (MidoriView* view,
+ const gchar* uri,
+ const gchar* title,
+ const gchar* message,
+ const gchar* description,
+ const gchar* try_again,
+ WebKitWebFrame* web_frame)
{
gchar* template_file = g_build_filename ("midori", "res", "error.html", NULL);
gchar* path = sokoke_find_data_filename (template_file);
@@ -939,8 +1214,6 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view,
#endif
gchar* res_root;
gchar* stock_root;
- gchar* title;
- gchar* message;
gchar* result;
#if WEBKIT_CHECK_VERSION (1, 1, 14)
@@ -953,27 +1226,19 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view,
stock_root = g_strdup_printf ("http://localhost:%d/stock", port);
#endif
- title = g_strdup_printf (_("Error - %s"), uri);
- message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri);
result = sokoke_replace_variables (template,
"{title}", title,
"{message}", message,
- "{description}", error->message,
- "{tryagain}", _("Try again"),
+ "{description}", description,
+ "{tryagain}", try_again,
"{res}", res_root,
"{stock}", stock_root,
NULL);
g_free (template);
- g_free (message);
- g_free (title);
- #if WEBKIT_CHECK_VERSION (1, 1, 14)
- webkit_web_frame_load_alternate_string (web_frame,
- result, "about:blank", uri);
- #else
- webkit_web_frame_load_alternate_string (web_frame,
- result, res_root, uri);
- #endif
+ midori_view_load_alternate_string (view,
+ result, res_root, uri, web_frame);
+
g_free (res_root);
g_free (stock_root);
g_free (result);
@@ -985,6 +1250,22 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view,
return FALSE;
}
+
+static gboolean
+webkit_web_view_load_error_cb (WebKitWebView* web_view,
+ WebKitWebFrame* web_frame,
+ const gchar* uri,
+ GError* error,
+ MidoriView* view)
+{
+ gchar* title = g_strdup_printf (_("Error - %s"), uri);
+ gchar* message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri);
+ gboolean result = midori_view_display_error (view, uri, title,
+ message, error->message, _("Try again"), web_frame);
+ g_free (message);
+ g_free (title);
+ return result;
+}
#else
static void
webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame,
@@ -1002,7 +1283,7 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame,
title = g_strdup_printf (_("Not found - %s"), view->uri);
katze_assign (view->title, title);
logo_path = sokoke_find_data_filename ("midori/logo-shade.png");
- logo_uri = g_filename_to_uri (logo_path);
+ logo_uri = g_filename_to_uri (logo_path, NULL, NULL);
g_free (logo_path);
data = g_strdup_printf (
"%s"
@@ -1032,7 +1313,7 @@ midori_view_apply_scroll_position (MidoriView* view)
{
if (view->scrollh > 0)
{
- GtkAdjustment* adjustment = katze_object_get_object (view, "hadjustment");
+ GtkAdjustment* adjustment = katze_object_get_object (view->scrolled_window, "hadjustment");
gtk_adjustment_set_value (adjustment, view->scrollh);
g_object_unref (adjustment);
}
@@ -1042,7 +1323,7 @@ midori_view_apply_scroll_position (MidoriView* view)
{
if (view->scrollv > 0)
{
- GtkAdjustment* adjustment = katze_object_get_object (view, "vadjustment");
+ GtkAdjustment* adjustment = katze_object_get_object (view->scrolled_window, "vadjustment");
gtk_adjustment_set_value (adjustment, view->scrollv);
g_object_unref (adjustment);
}
@@ -1076,8 +1357,10 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view,
"{ var t = l[i].type; var r = l[i].rel; "
"if (t && (t.indexOf ('rss') != -1 || t.indexOf ('atom') != -1)) "
"f.push (l[i].href + '|' + l[i].title);"
- "else if (r && r.indexOf ('icon') != -1) f.push (l[i].href); } "
- "return f; })("
+ #if !WEBKIT_CHECK_VERSION (1, 1, 18)
+ "else if (r && r.indexOf ('icon') != -1) f.push (l[i].href); "
+ #endif
+ "} return f; })("
"document.getElementsByTagName ('link'));", NULL);
gchar** items = g_strsplit (value, ",", 0);
guint i = 0;
@@ -1099,9 +1382,10 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view,
if (!default_uri)
default_uri = g_strdup (parts[0]);
}
+ #if !WEBKIT_CHECK_VERSION (1, 1, 18)
else
- g_object_set_data_full (G_OBJECT (view->net), view->uri,
- g_strdup (*parts), (GDestroyNotify)g_free);
+ katze_assign (view->icon_uri, g_strdup (*parts));
+ #endif
g_strfreev (parts);
i++;
@@ -1118,6 +1402,17 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view,
g_object_thaw_notify (G_OBJECT (view));
}
+#if WEBKIT_CHECK_VERSION (1, 1, 18)
+static void
+midori_web_view_notify_icon_uri_cb (WebKitWebView* web_view,
+ GParamSpec* pspec,
+ MidoriView* view)
+{
+ katze_assign (view->icon_uri, katze_object_get_string (web_view, "icon-uri"));
+ _midori_web_view_load_icon (view);
+}
+#endif
+
#if WEBKIT_CHECK_VERSION (1, 1, 4)
static void
webkit_web_view_notify_uri_cb (WebKitWebView* web_view,
@@ -1216,7 +1511,7 @@ webkit_web_view_hovering_over_link_cb (WebKitWebView* web_view,
MidoriView* view)
{
#if !(WEBKIT_CHECK_VERSION (2, 18, 0) && defined (HAVE_LIBSOUP_2_29_3))
- sokoke_prefetch_uri (link_uri);
+ sokoke_prefetch_uri (link_uri, NULL, NULL);
#endif
katze_assign (view->link_uri, g_strdup (link_uri));
@@ -1450,13 +1745,6 @@ midori_web_view_set_clipboard (GtkWidget* widget,
gtk_clipboard_set_text (clipboard, text, -1);
}
-static void
-midori_web_view_menu_open_activate_cb (GtkWidget* widget,
- MidoriView* view)
-{
- midori_view_set_uri (view, view->link_uri);
-}
-
static void
midori_web_view_menu_new_window_activate_cb (GtkWidget* widget,
MidoriView* view)
@@ -1504,15 +1792,6 @@ midori_web_view_menu_image_new_tab_activate_cb (GtkWidget* widget,
g_free (uri);
}
-static void
-midori_web_view_menu_image_new_window_activate_cb (GtkWidget* widget,
- MidoriView* view)
-{
- gchar* uri = katze_object_get_string (view->hit_test, "image-uri");
- g_signal_emit (view, signals[NEW_WINDOW], 0, uri);
- g_free (uri);
-}
-
static void
midori_web_view_menu_image_copy_activate_cb (GtkWidget* widget,
MidoriView* view)
@@ -1660,13 +1939,6 @@ midori_web_view_menu_download_activate_cb (GtkWidget* widget,
sokoke_spawn_program (view->download_manager, view->link_uri, FALSE);
}
-static void
-midori_web_view_menu_add_bookmark_activate_cb (GtkWidget* widget,
- MidoriView* view)
-{
- g_signal_emit (view, signals[ADD_BOOKMARK], 0, view->link_uri);
-}
-
#if WEBKIT_CHECK_VERSION (1, 1, 17)
static void
midori_web_view_menu_inspect_element_activate_cb (GtkWidget* widget,
@@ -1718,7 +1990,24 @@ midori_view_insert_menu_item (GtkMenuShell* menu,
return menuitem;
}
-static void
+/**
+ * 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
+ */
+void
midori_view_populate_popup (MidoriView* view,
GtkWidget* menu,
gboolean manual)
@@ -1898,9 +2187,6 @@ midori_view_populate_popup (MidoriView* view,
}
if (view->link_uri)
{
- midori_view_insert_menu_item (menu_shell, -1,
- _("Open _Link"), NULL,
- G_CALLBACK (midori_web_view_menu_open_activate_cb), widget);
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);
@@ -1926,9 +2212,6 @@ midori_view_populate_popup (MidoriView* view,
midori_view_insert_menu_item (menu_shell, -1,
_("Download with Download _Manager"), STOCK_TRANSFER,
G_CALLBACK (midori_web_view_menu_download_activate_cb), widget);
- midori_view_insert_menu_item (menu_shell, -1,
- NULL, STOCK_BOOKMARK_ADD,
- G_CALLBACK (midori_web_view_menu_add_bookmark_activate_cb), widget);
}
if (is_image)
@@ -1938,9 +2221,6 @@ midori_view_populate_popup (MidoriView* view,
midori_view_insert_menu_item (menu_shell, -1,
_("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,
- _("Open Image in New Wi_ndow"), STOCK_WINDOW_NEW,
- G_CALLBACK (midori_web_view_menu_image_new_window_activate_cb), widget);
midori_view_insert_menu_item (menu_shell, -1,
_("Copy Image _Address"), NULL,
G_CALLBACK (midori_web_view_menu_image_copy_activate_cb), widget);
@@ -1975,9 +2255,8 @@ midori_view_populate_popup (MidoriView* view,
{
items = gtk_container_get_children (GTK_CONTAINER (menu));
menuitem = (GtkWidget*)g_list_nth_data (items, 0);
- /* hack to localize menu item */
- label = gtk_bin_get_child (GTK_BIN (menuitem));
- gtk_label_set_label (GTK_LABEL (label), _("Open _Link"));
+ /* hack to hide menu item */
+ gtk_widget_hide (menuitem);
midori_view_insert_menu_item (menu_shell, 1,
_("Open Link in New _Tab"), STOCK_TAB_NEW,
G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), widget);
@@ -1996,7 +2275,7 @@ midori_view_populate_popup (MidoriView* view,
#else
/* hack to disable non-functional Download File */
gtk_widget_hide (menuitem);
- gtk_widget_set_no_show_all (menuitem);
+ gtk_widget_set_no_show_all (menuitem, TRUE);
midori_view_insert_menu_item (menu_shell, 3,
_("_Save Link destination"), NULL,
G_CALLBACK (midori_web_view_menu_save_as_activate_cb), widget);
@@ -2005,9 +2284,6 @@ midori_view_populate_popup (MidoriView* view,
midori_view_insert_menu_item (menu_shell, 4,
_("Download with Download _Manager"), STOCK_TRANSFER,
G_CALLBACK (midori_web_view_menu_download_activate_cb), widget);
- midori_view_insert_menu_item (menu_shell, 5,
- NULL, STOCK_BOOKMARK_ADD,
- G_CALLBACK (midori_web_view_menu_add_bookmark_activate_cb), widget);
}
#endif
@@ -2168,7 +2444,7 @@ midori_view_populate_popup (MidoriView* view,
menuitem = sokoke_action_create_popup_menu_item (
gtk_action_group_get_action (actions, "Encoding"));
gtk_menu_shell_append (menu_shell, menuitem);
- if (GTK_WIDGET_IS_SENSITIVE (menuitem))
+ if (gtk_widget_get_sensitive (menuitem))
{
GtkWidget* sub_menu;
static const GtkActionEntry encodings[] = {
@@ -2290,7 +2566,7 @@ static gboolean
webkit_web_view_web_view_ready_cb (GtkWidget* web_view,
MidoriView* view)
{
- GtkWidget* new_view = gtk_widget_get_parent (web_view);
+ GtkWidget* new_view = gtk_widget_get_parent (gtk_widget_get_parent (web_view));
MidoriNewView where = MIDORI_NEW_VIEW_TAB;
/* FIXME: Open windows opened by scripts in tabs if they otherwise
@@ -2363,9 +2639,20 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view,
if (webkit_web_view_can_show_mime_type (WEBKIT_WEB_VIEW (web_view), mime_type))
{
+ #if WEBKIT_CHECK_VERSION (1, 1, 14)
+ gboolean view_source = webkit_web_view_get_view_source_mode (WEBKIT_WEB_VIEW (web_view));
+
+ /* Render raw XML, including news feeds, as source */
+ if (!view_source && (!strcmp (mime_type, "application/xml")
+ || !strcmp (mime_type, "text/xml")))
+ view_source = TRUE;
+ webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (web_view), view_source);
+ #endif
+
katze_assign (view->mime_type, g_strdup (mime_type));
midori_view_update_icon (view, NULL);
g_object_notify (G_OBJECT (view), "mime-type");
+
return FALSE;
}
@@ -2373,11 +2660,7 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view,
dialog = gtk_message_dialog_new (
NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
_("Open or download file"));
- #if GLIB_CHECK_VERSION (2, 18, 0)
content_type = g_content_type_from_mime_type (mime_type);
- #else
- content_type = g_strdup (mime_type);
- #endif
if (!content_type)
#ifdef G_OS_WIN32
content_type = g_content_type_get_mime_type ("*");
@@ -2530,7 +2813,7 @@ midori_view_notify_hadjustment_cb (MidoriView* view,
GParamSpec* pspec,
gpointer data)
{
- GtkAdjustment* hadjustment = katze_object_get_object (view, "hadjustment");
+ GtkAdjustment* hadjustment = katze_object_get_object (view->scrolled_window, "hadjustment");
g_signal_connect (hadjustment, "notify::value",
G_CALLBACK (midori_view_hadjustment_notify_value_cb), view);
g_object_unref (hadjustment);
@@ -2551,19 +2834,30 @@ midori_view_notify_vadjustment_cb (MidoriView* view,
GParamSpec* pspec,
gpointer data)
{
- GtkAdjustment* vadjustment = katze_object_get_object (view, "vadjustment");
+ GtkAdjustment* vadjustment = katze_object_get_object (view->scrolled_window, "vadjustment");
g_signal_connect (vadjustment, "notify::value",
G_CALLBACK (midori_view_vadjustment_notify_value_cb), view);
g_object_unref (vadjustment);
}
+void
+katze_net_object_maybe_unref (gpointer object)
+{
+ if (object)
+ g_object_unref (object);
+}
+
static void
midori_view_init (MidoriView* view)
{
view->uri = NULL;
view->title = NULL;
+ view->security = MIDORI_SECURITY_NONE;
view->mime_type = g_strdup ("");
view->icon = NULL;
+ view->icon_uri = NULL;
+ view->memory = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, katze_net_object_maybe_unref);
view->progress = 0.0;
view->load_status = MIDORI_LOAD_FINISHED;
view->minimized = FALSE;
@@ -2582,12 +2876,15 @@ midori_view_init (MidoriView* view)
view->download_manager = NULL;
view->news_aggregator = NULL;
view->web_view = NULL;
-
/* Adjustments are not created initially, but overwritten later */
- g_object_set (view, "hadjustment", NULL, "vadjustment", NULL, NULL);
- g_signal_connect (view, "notify::hadjustment",
+ view->scrolled_window = katze_scrolled_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view->scrolled_window),
+ GTK_SHADOW_ETCHED_OUT);
+ gtk_container_add (GTK_CONTAINER (view), view->scrolled_window);
+
+ g_signal_connect (view->scrolled_window, "notify::hadjustment",
G_CALLBACK (midori_view_notify_hadjustment_cb), view);
- g_signal_connect (view, "notify::vadjustment",
+ g_signal_connect (view->scrolled_window, "notify::vadjustment",
G_CALLBACK (midori_view_notify_vadjustment_cb), view);
}
@@ -2611,6 +2908,8 @@ midori_view_finalize (GObject* object)
katze_assign (view->uri, NULL);
katze_assign (view->title, NULL);
katze_object_assign (view->icon, NULL);
+ katze_assign (view->icon_uri, NULL);
+ g_hash_table_destroy (view->memory);
katze_assign (view->statusbar_text, NULL);
katze_assign (view->link_uri, NULL);
katze_assign (view->selected_text, NULL);
@@ -2693,6 +2992,9 @@ midori_view_get_property (GObject* object,
case PROP_TITLE:
g_value_set_string (value, view->title);
break;
+ case PROP_SECURITY:
+ g_value_set_enum (value, view->security);
+ break;
case PROP_MIME_TYPE:
g_value_set_string (value, view->mime_type);
break;
@@ -2729,6 +3031,20 @@ midori_view_get_property (GObject* object,
}
}
+static gboolean
+midori_view_focus_in_event (GtkWidget* widget,
+ GdkEventFocus* event)
+{
+ MidoriView* view = MIDORI_VIEW (widget);
+
+ /* Always propagate focus to the child web view,
+ * create it if it's not there yet. */
+ if (!view->web_view)
+ midori_view_construct_web_view (view);
+ gtk_widget_grab_focus (view->web_view);
+ return TRUE;
+}
+
/**
* midori_view_new:
* @net: a #KatzeNet
@@ -2767,7 +3083,7 @@ _midori_view_update_settings (MidoriView* view)
if (view->web_view)
g_object_set (view->web_view,
"full-content-zoom", zoom_text_and_images, NULL);
- g_object_set (view, "kinetic-scrolling", kinetic_scrolling, NULL);
+ g_object_set (view->scrolled_window, "kinetic-scrolling", kinetic_scrolling, NULL);
}
static void
@@ -3032,6 +3348,10 @@ midori_view_construct_web_view (MidoriView* view)
webkit_web_view_progress_changed_cb, view,
"signal::load-finished",
webkit_web_view_load_finished_cb, view,
+ #if WEBKIT_CHECK_VERSION (1, 1, 18)
+ "signal::notify::icon-uri",
+ midori_web_view_notify_icon_uri_cb, view,
+ #endif
#if WEBKIT_CHECK_VERSION (1, 1, 4)
"signal::notify::uri",
webkit_web_view_notify_uri_cb, view,
@@ -3091,8 +3411,8 @@ midori_view_construct_web_view (MidoriView* view)
"zoom-text-and-images"), NULL);
}
- gtk_widget_show (view->web_view);
- gtk_container_add (GTK_CONTAINER (view), view->web_view);
+ gtk_container_add (GTK_CONTAINER (view->scrolled_window), view->web_view);
+ gtk_widget_show_all (view->scrolled_window);
inspector = katze_object_get_object (view->web_view, "web-inspector");
g_object_connect (inspector,
@@ -3182,21 +3502,15 @@ midori_view_set_uri (MidoriView* view,
"{click_to_add}", _("Click to add a shortcut"),
"{enter_shortcut_address}", _("Enter shortcut address"),
"{enter_shortcut_name}", _("Enter shortcut title"),
- "{are_you_sure}", _("Are you sure you want to delete this shortcut?"), NULL);
+ "{are_you_sure}", _("Are you sure you want to delete this shortcut?"),
+ "{set_dial_width}", _("Set number of columns"),
+ "{enter_dial_width}", _("Enter number of columns:"),
+ "{set_shortcut_count}", _("Set number of shortcuts"),
+ "{enter_shortcut_count}", _("Enter number of shortcuts:"), NULL);
- #if WEBKIT_CHECK_VERSION (1, 1, 14)
- webkit_web_frame_load_alternate_string (
- webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)),
- data, "about:blank", "about:blank");
- #elif WEBKIT_CHECK_VERSION (1, 1, 6)
- webkit_web_frame_load_alternate_string (
- webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)),
- data, res_root, "about:blank");
- #else
- webkit_web_view_load_html_string (
- WEBKIT_WEB_VIEW (view->web_view), data, res_root);
- #endif
+ midori_view_load_alternate_string (view,
+ data, res_root, "about:blank", NULL);
g_free (res_root);
g_free (stock_root);
@@ -3401,11 +3715,13 @@ midori_view_is_blank (MidoriView* view)
* midori_view_get_icon:
* @view: a #MidoriView
*
- * Retrieves the icon of the view.
+ * Retrieves the icon of the view, or a default icon. See
+ * midori_view_get_icon_uri() if you need to distinguish
+ * the origin of an icon.
*
* The returned icon is owned by the @view and must not be modified.
*
- * Return value: a #GdkPixbuf
+ * Return value: a #GdkPixbuf, or %NULL
**/
GdkPixbuf*
midori_view_get_icon (MidoriView* view)
@@ -3415,6 +3731,31 @@ midori_view_get_icon (MidoriView* view)
return view->icon;
}
+/**
+ * midori_view_get_icon_uri:
+ * @view: a #MidoriView
+ *
+ * Retrieves the address of the icon of the view
+ * if the loaded website has an icon, otherwise
+ * %NULL.
+ * Note that if there is no icon uri, midori_view_get_icon()
+ * will still return a default icon.
+ *
+ * The returned string is owned by the @view and must not be freed.
+ *
+ * Return value: a string, or %NULL
+ *
+ * Since: 0.2.5
+ **/
+const gchar*
+midori_view_get_icon_uri (MidoriView* view)
+{
+ g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
+
+ return view->icon_uri;
+}
+
+
/**
* midori_view_get_display_uri:
* @view: a #MidoriView
@@ -3961,7 +4302,6 @@ midori_view_get_proxy_tab_label (MidoriView* view)
view->tab_icon = katze_throbber_new ();
katze_throbber_set_static_pixbuf (KATZE_THROBBER (view->tab_icon),
midori_view_get_icon (view));
- gtk_misc_set_alignment (GTK_MISC (view->tab_icon), 0.0, 0.5);
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);
@@ -3995,6 +4335,8 @@ midori_view_get_proxy_tab_label (MidoriView* view)
#endif
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);
@@ -4133,27 +4475,21 @@ midori_view_can_zoom_out (MidoriView* view)
gboolean
midori_view_can_view_source (MidoriView* view)
{
- #if GLIB_CHECK_VERSION (2, 18, 0)
gchar* content_type;
gchar* text_type;
- #endif
+ gboolean is_text;
g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
if (midori_view_is_blank (view))
return FALSE;
- #if GLIB_CHECK_VERSION (2, 18, 0)
content_type = g_content_type_from_mime_type (view->mime_type);
text_type = g_content_type_from_mime_type ("text/plain");
- return g_content_type_is_a (content_type, text_type);
- #elif defined (G_OS_UNIX)
- return g_content_type_is_a (view->mime_type, "text/plain");
- #else
- return g_str_has_prefix (view->mime_type, "text/")
- || g_strrstr (view->mime_type, "xml")
- || g_strrstr (view->mime_type, "javascript");
- #endif
+ is_text = g_content_type_is_a (content_type, text_type);
+ g_free (content_type);
+ g_free (text_type);
+ return is_text;
}
#define can_do(what) \
@@ -4184,7 +4520,9 @@ midori_view_reload (MidoriView* view,
g_return_if_fail (MIDORI_IS_VIEW (view));
-#if WEBKIT_CHECK_VERSION (1, 1, 6)
+#if WEBKIT_CHECK_VERSION (1, 1, 14)
+ title = NULL;
+#elif WEBKIT_CHECK_VERSION (1, 1, 6)
/* WebKit 1.1.6 doesn't handle "alternate content" flawlessly,
so reloading via Javascript works but not via API calls. */
title = g_strdup_printf (_("Error - %s"), view->uri);
@@ -4193,7 +4531,7 @@ midori_view_reload (MidoriView* view,
again, not the error page which isn't even a proper page */
title = g_strdup_printf (_("Error - %s"), view->uri);
#endif
- if (view->title && strstr (title, view->title))
+ if (view->title && title && strstr (title, view->title))
webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), view->uri);
else if (!(view->uri && *view->uri && strncmp (view->uri, "about:", 6)))
{
@@ -4585,7 +4923,7 @@ midori_view_get_snapshot (MidoriView* view,
GdkPixbuf* pixbuf;
g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
- web_view = gtk_bin_get_child (GTK_BIN (view));
+ web_view = view->web_view;
g_return_val_if_fail (web_view->window, NULL);
x = web_view->allocation.x;
@@ -4647,6 +4985,38 @@ midori_view_get_snapshot (MidoriView* view,
return pixbuf;
}
+/**
+ * midori_view_get_web_view
+ * @view: a #MidoriView
+ *
+ * Returns: The #WebKitWebView for this view
+ *
+ * Since: 0.2.5
+ **/
+GtkWidget*
+midori_view_get_web_view (MidoriView* view)
+{
+ g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
+
+ return view->web_view;
+}
+
+/**
+ * midori_view_get_security
+ * @view: a #MidoriView
+ *
+ * Returns: The #MidoriSecurity for this view
+ *
+ * Since: 0.2.5
+ **/
+MidoriSecurity
+midori_view_get_security (MidoriView* view)
+{
+ g_return_val_if_fail (MIDORI_IS_VIEW (view), MIDORI_SECURITY_NONE);
+
+ return view->security;
+}
+
static void
thumb_view_load_status_cb (MidoriView* thumb_view,
GParamSpec* pspec,
diff --git a/midori/midori-view.h b/midori/midori-view.h
index d3fa0894..e1ae4dde 100644
--- a/midori/midori-view.h
+++ b/midori/midori-view.h
@@ -46,6 +46,20 @@ midori_new_view_get_type (void) G_GNUC_CONST;
#define MIDORI_TYPE_VIEW \
(midori_view_get_type ())
+
+typedef enum
+{
+ MIDORI_SECURITY_NONE, /* The connection is neither encrypted nor verified. */
+ MIDORI_SECURITY_UNKNOWN, /* The security is unknown, due to lack of validation. */
+ MIDORI_SECURITY_TRUSTED /* The security is validated and trusted. */
+} MidoriSecurity;
+
+GType
+midori_security_get_type (void) G_GNUC_CONST;
+
+#define MIDORI_TYPE_SECURITY \
+ (midori_security_get_type ())
+
#define MIDORI_VIEW(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_VIEW, MidoriView))
#define MIDORI_VIEW_CLASS(klass) \
@@ -92,6 +106,9 @@ midori_view_get_display_title (MidoriView* view);
GdkPixbuf*
midori_view_get_icon (MidoriView* view);
+const gchar*
+midori_view_get_icon_uri (MidoriView* view);
+
const gchar*
midori_view_get_link_uri (MidoriView* view);
@@ -206,6 +223,18 @@ midori_view_get_snapshot (MidoriView* view,
gint width,
gint height);
+GtkWidget*
+midori_view_get_web_view (MidoriView* view);
+
+MidoriSecurity
+midori_view_get_security (MidoriView* view);
+
+void
+midori_view_populate_popup (MidoriView* view,
+ GtkWidget* menu,
+ gboolean manual);
+
+
G_END_DECLS
#endif /* __MIDORI_VIEW_H__ */
diff --git a/midori/midori-viewable.c b/midori/midori-viewable.c
index 5a8966cb..566f847e 100644
--- a/midori/midori-viewable.c
+++ b/midori/midori-viewable.c
@@ -122,6 +122,8 @@ midori_viewable_base_finalize (MidoriViewableIface* iface)
* the #MidoriViewable via midori_viewable_register_protocol().
*
* Return value: a new #MidoriViewable, or %NULL
+ *
+ * Deprecated: 0.2.6
**/
GtkWidget*
midori_viewable_new_from_uri (const gchar* uri)
@@ -210,6 +212,8 @@ viewable_type_implements (GType type,
* "midori://dummy": support URIs like "midori://dummy/foo"
*
* Return value: a new #MidoriViewable, or %NULL
+ *
+ * Deprecated: 0.2.6
**/
void
midori_viewable_register_protocol (GType type,
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index d07baa01..b7e573af 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008-2009 Christian Dywan
+ Copyright (C) 2008-2010 Christian Dywan
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -28,67 +28,63 @@ struct _MidoriWebSettings
{
WebKitWebSettings parent_instance;
- gboolean remember_last_window_size;
+ gboolean remember_last_window_size : 1;
+ MidoriWindowState last_window_state : 2;
+ gboolean show_menubar : 1;
+ gboolean show_navigationbar : 1;
+ gboolean show_bookmarkbar : 1;
+ gboolean show_panel : 1;
+ gboolean show_transferbar : 1;
+ gboolean show_statusbar : 1;
+ MidoriToolbarStyle toolbar_style : 3;
+ gboolean progress_in_location : 1;
+ gboolean search_engines_in_completion : 1;
+ gboolean compact_sidepanel : 1;
+ gboolean show_panel_controls : 1;
+ gboolean right_align_sidepanel : 1;
+ gboolean open_panels_in_windows : 1;
+ MidoriStartup load_on_startup : 2;
+ gboolean show_crash_dialog : 1;
+ gboolean speed_dial_in_new_tabs : 1;
+ gboolean ask_for_destination_folder : 1;
+ gboolean notify_transfer_completed : 1;
+ MidoriPreferredEncoding preferred_encoding : 3;
+ gboolean always_show_tabbar : 1;
+ gboolean close_buttons_on_tabs : 1;
+ MidoriNewPage open_new_pages_in : 2;
+ MidoriNewPage open_external_pages_in : 2;
+ gboolean middle_click_opens_selection : 1;
+ gboolean open_tabs_in_the_background : 1;
+ gboolean open_tabs_next_to_current : 1;
+ gboolean open_popups_in_tabs : 1;
+ gboolean zoom_text_and_images : 1;
+ gboolean find_while_typing : 1;
+ gboolean kinetic_scrolling : 1;
+ MidoriAcceptCookies accept_cookies : 2;
+ gboolean original_cookies_only : 1;
+ gboolean remember_last_visited_pages : 1;
+ gboolean remember_last_downloaded_files : 1;
+ MidoriProxy proxy_type : 2;
+ gboolean auto_detect_proxy : 1;
+ MidoriIdentity identify_as : 3;
+
gint last_window_width;
gint last_window_height;
- MidoriWindowState last_window_state;
gint last_panel_position;
gint last_panel_page;
gint last_web_search;
+ gint maximum_cookie_age;
+ gint maximum_history_age;
- gboolean show_menubar;
- gboolean show_navigationbar;
- gboolean show_bookmarkbar;
- gboolean show_panel;
- gboolean show_transferbar;
- gboolean show_statusbar;
-
- MidoriToolbarStyle toolbar_style;
- gboolean progress_in_location;
- gboolean search_engines_in_completion;
gchar* toolbar_items;
- gboolean compact_sidepanel;
- gboolean show_panel_controls;
- gboolean right_align_sidepanel;
- gboolean open_panels_in_windows;
-
- MidoriStartup load_on_startup;
gchar* homepage;
- gboolean show_crash_dialog;
- gboolean speed_dial_in_new_tabs;
gchar* download_folder;
- gboolean ask_for_destination_folder;
- gboolean notify_transfer_completed;
gchar* download_manager;
gchar* text_editor;
gchar* news_aggregator;
gchar* location_entry_search;
- MidoriPreferredEncoding preferred_encoding;
-
- gboolean always_show_tabbar;
- gboolean close_buttons_on_tabs;
- MidoriNewPage open_new_pages_in;
- MidoriNewPage open_external_pages_in;
- gboolean middle_click_opens_selection;
- gboolean open_tabs_in_the_background;
- gboolean open_tabs_next_to_current;
- gboolean open_popups_in_tabs;
-
- gboolean zoom_text_and_images;
- gboolean find_while_typing;
- gboolean kinetic_scrolling;
- MidoriAcceptCookies accept_cookies;
- gboolean original_cookies_only;
- gint maximum_cookie_age;
-
- gboolean remember_last_visited_pages;
- gint maximum_history_age;
- gboolean remember_last_downloaded_files;
-
gchar* http_proxy;
gchar* http_accept_language;
- gboolean auto_detect_proxy;
- MidoriIdentity identify_as;
gchar* ident_string;
gint clear_private_data;
@@ -170,6 +166,7 @@ enum
PROP_MAXIMUM_HISTORY_AGE,
PROP_REMEMBER_LAST_DOWNLOADED_FILES,
+ PROP_PROXY_TYPE,
PROP_HTTP_PROXY,
PROP_AUTO_DETECT_PROXY,
PROP_IDENTIFY_AS,
@@ -272,6 +269,23 @@ midori_toolbar_style_get_type (void)
return type;
}
+GType
+midori_proxy_get_type (void)
+{
+ static GType type = 0;
+ if (!type)
+ {
+ static const GEnumValue values[] = {
+ { MIDORI_PROXY_AUTOMATIC, "MIDORI_PROXY_AUTOMATIC", N_("Automatic (GNOME or environment)") },
+ { MIDORI_PROXY_HTTP, "MIDORI_PROXY_HTTP", N_("HTTP proxy server") },
+ { MIDORI_PROXY_NONE, "MIDORI_PROXY_NONE", N_("No proxy server") },
+ { 0, NULL, NULL }
+ };
+ type = g_enum_register_static ("MidoriProxy", values);
+ }
+ return type;
+}
+
GType
midori_accept_cookies_get_type (void)
{
@@ -1019,22 +1033,39 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
+ /**
+ * MidoriWebSettings:proxy-type:
+ *
+ * The type of proxy server to use.
+ *
+ * Since: 0.2.5
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_PROXY_TYPE,
+ g_param_spec_enum (
+ "proxy-type",
+ _("Proxy server"),
+ _("The type of proxy server to use"),
+ MIDORI_TYPE_PROXY,
+ MIDORI_PROXY_AUTOMATIC,
+ flags));
+
g_object_class_install_property (gobject_class,
PROP_HTTP_PROXY,
g_param_spec_string (
"http-proxy",
- _("Proxy Server"),
+ _("HTTP Proxy Server"),
_("The proxy server used for HTTP connections"),
NULL,
flags));
/**
- * MidoriWebSettings:auto-detect-proxy:
- *
- * Whether to detect the proxy server automatically from the environment
- *
- * Since: 0.1.3
- */
+ * MidoriWebSettings:auto-detect-proxy:
+ *
+ * Whether to detect the proxy server automatically from the environment
+ *
+ * Deprecated: 0.2.5
+ */
g_object_class_install_property (gobject_class,
PROP_AUTO_DETECT_PROXY,
g_param_spec_boolean (
@@ -1491,6 +1522,13 @@ midori_web_settings_set_property (GObject* object,
web_settings->remember_last_downloaded_files = g_value_get_boolean (value);
break;
+ case PROP_PROXY_TYPE:
+ web_settings->proxy_type = g_value_get_enum (value);
+ web_settings->auto_detect_proxy =
+ web_settings->proxy_type == MIDORI_PROXY_AUTOMATIC
+ ? TRUE : FALSE;
+ g_object_notify (object, "auto-detect-proxy");
+ break;
case PROP_HTTP_PROXY:
katze_assign (web_settings->http_proxy, g_value_dup_string (value));
break;
@@ -1735,6 +1773,9 @@ midori_web_settings_get_property (GObject* object,
g_value_set_boolean (value, web_settings->remember_last_downloaded_files);
break;
+ case PROP_PROXY_TYPE:
+ g_value_set_enum (value, web_settings->proxy_type);
+ break;
case PROP_HTTP_PROXY:
g_value_set_string (value, web_settings->http_proxy);
break;
diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h
index ca9f3c9e..05ad0f7c 100644
--- a/midori/midori-websettings.h
+++ b/midori/midori-websettings.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008 Christian Dywan
+ Copyright (C) 2008-2010 Christian Dywan
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -119,6 +119,19 @@ midori_toolbar_style_get_type (void) G_GNUC_CONST;
#define MIDORI_TYPE_TOOLBAR_STYLE \
(midori_toolbar_style_get_type ())
+typedef enum
+{
+ MIDORI_PROXY_AUTOMATIC,
+ MIDORI_PROXY_HTTP,
+ MIDORI_PROXY_NONE
+} MidoriProxy;
+
+GType
+midori_proxy_get_type (void) G_GNUC_CONST;
+
+#define MIDORI_TYPE_PROXY \
+ (midori_proxy_get_type ())
+
typedef enum
{
MIDORI_ACCEPT_COOKIES_ALL,
diff --git a/midori/midori.vapi b/midori/midori.vapi
new file mode 100644
index 00000000..eb0f1f29
--- /dev/null
+++ b/midori/midori.vapi
@@ -0,0 +1,153 @@
+/* Copyright (C) 2010 Christian Dywan
+ This file is licensed under the terms of the expat license, see the file EXPAT. */
+
+[CCode (cprefix = "Midori", lower_case_cprefix = "midori_")]
+namespace Midori {
+ [CCode (cheader_filename = "midori/midori.h")]
+ public class App : GLib.Object {
+ public App ();
+ public Browser create_browser ();
+ public GLib.List get_browsers ();
+
+ [NoAccessorMethod]
+ public string name { get; set; }
+ [NoAccessorMethod]
+ public Midori.WebSettings settings { get; set; }
+ [NoAccessorMethod]
+ public GLib.Object bookmarks { get; set; }
+ [NoAccessorMethod]
+ public GLib.Object trash { get; set; }
+ [NoAccessorMethod]
+ public GLib.Object search_engines { get; set; }
+ [NoAccessorMethod]
+ public GLib.Object history { get; set; }
+ [NoAccessorMethod]
+ public GLib.Object extensions { get; set; }
+ [NoAccessorMethod]
+ public GLib.Object browsers { get; }
+ public Browser? browser { get; }
+
+ [HasEmitter]
+ public signal void add_browser (Browser browser);
+ public signal void remove_browser (Browser browser);
+ [HasEmitter]
+ public signal void quit ();
+ }
+ public class Browser : Gtk.Window {
+ public Browser ();
+ public int add_item (GLib.Object item);
+ public int add_uri (string uri);
+ public unowned View get_nth_tab (int n);
+ public GLib.List get_tabs ();
+ public unowned Gtk.ActionGroup get_action_group ();
+ public unowned Browser get_for_widget (Gtk.Widget widget);
+ public unowned string[] get_toolbar_actions ();
+ public unowned GLib.Object get_proxy_items ();
+
+ [NoAccessorMethod]
+ public Gtk.MenuBar menubar { get; }
+ [NoAccessorMethod]
+ public Gtk.Toolbar navigationbar { get; }
+ [NoAccessorMethod]
+ public Gtk.Notebook notebook { get; }
+ [NoAccessorMethod]
+ public Gtk.Widget panel { get; }
+ [NoAccessorMethod]
+ public string uri { get; set; }
+ public Gtk.Widget? tab { get; set; }
+ [NoAccessorMethod]
+ public uint load_status { get; }
+ [NoAccessorMethod]
+ public Gtk.Statusbar statusbar { get; }
+ [NoAccessorMethod]
+ public string statusbar_text { get; set; }
+ public Midori.WebSettings settings { get; set; }
+ [NoAccessorMethod]
+ public GLib.Object bookmarks { get; set; }
+ [NoAccessorMethod]
+ public GLib.Object trash { get; set; }
+ [NoAccessorMethod]
+ public GLib.Object search_engines { get; set; }
+ [NoAccessorMethod]
+ public GLib.Object history { get; set; }
+ [NoAccessorMethod]
+ public bool show_tabs { get; set; }
+
+ public signal Browser new_window (Browser? browser);
+ [HasEmitter]
+ public signal void add_tab (View tab);
+ [HasEmitter]
+ public signal void remove_tab (View tab);
+ [HasEmitter]
+ public signal void activate_action (string name);
+ public signal void add_download (GLib.Object download);
+ public signal void populate_tool_menu (Gtk.Menu menu);
+ [HasEmitter]
+ public signal void quit ();
+ }
+
+ public class Extension : GLib.Object {
+ [CCode (has_construct_function = false)]
+ public Extension ();
+ public unowned Midori.App get_app ();
+
+ [NoAccessorMethod]
+ public string name { get; set; }
+ [NoAccessorMethod]
+ public string description { get; set; }
+ [NoAccessorMethod]
+ public string version { get; set; }
+ [NoAccessorMethod]
+ public string authors { get; set; }
+
+ public signal void activate (Midori.App app);
+ public signal void deactivate ();
+ }
+
+ public class View : Gtk.VBox {
+ [CCode (type = "GtkWidget*")]
+ public View (GLib.Object net);
+ public void set_uri (string uri);
+ public bool is_blank ();
+ public string get_display_uri ();
+ public string get_display_title ();
+ public string get_icon_uri ();
+ public string get_link_uri ();
+ public bool has_selection ();
+ public string get_selected_text ();
+ public Gtk.MenuItem get_proxy_menu_item ();
+ public Gtk.Menu get_tab_menu ();
+ public Pango.EllipsizeMode get_label_ellipsize ();
+ public Gtk.Label get_proxy_tab_label ();
+ public GLib.Object get_proxy_item ();
+ public bool can_view_source ();
+ public bool can_find ();
+ public void search_text (string text, bool case_sensitive, bool forward);
+ public void mark_text_matches (string text, bool case_sensitive);
+ public void set_highlight_text_matches (bool highlight);
+ public bool execute_script (string script, out string exception);
+ public Gdk.Pixbuf get_snapshot (int width, int height);
+ public unowned WebKit.WebView get_web_view ();
+ public void populate_popup (Gtk.Menu menu, bool manual);
+
+ public string uri { get; }
+ public string title { get; }
+ public int security { get; }
+ public string mime_type { get; }
+ public Gdk.Pixbuf icon { get; }
+ public int load_status { get; }
+ public double progress { get; set; }
+ public bool minimized { get; }
+ public float zoom_level { get; }
+ public GLib.Object news_feeds { get; }
+ public string statusbar_text { get; }
+ public WebSettings settings { get; set; }
+ public GLib.Object net { get; }
+
+ }
+
+ public class WebSettings : WebKit.WebSettings {
+ public WebSettings ();
+ }
+}
+
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 657ba9a3..04c37af5 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -224,12 +224,7 @@ sokoke_show_uri_with_mime_type (GdkScreen* screen,
GList* files;
gpointer context;
- #if GLIB_CHECK_VERSION (2, 18, 0)
content_type = g_content_type_from_mime_type (mime_type);
- #else
- content_type = g_strdup (mime_type);
- #endif
-
app_info = g_app_info_get_default_for_type (content_type,
!g_str_has_prefix (uri, "file://"));
g_free (content_type);
@@ -273,6 +268,7 @@ sokoke_show_uri (GdkScreen* screen,
guint32 timestamp,
GError** error)
{
+
#if HAVE_HILDON
HildonURIAction* action = hildon_uri_get_default_action_by_uri (uri, NULL);
return hildon_uri_open (uri, action, error);
@@ -352,6 +348,8 @@ sokoke_show_uri (GdkScreen* screen,
g_return_val_if_fail (uri != NULL, FALSE);
g_return_val_if_fail (!error || !*error, FALSE);
+ sokoke_recursive_fork_protection (uri, TRUE);
+
#if GTK_CHECK_VERSION (2, 14, 0)
if (gtk_show_uri (screen, uri, timestamp, error))
return TRUE;
@@ -637,6 +635,45 @@ gchar* sokoke_search_uri (const gchar* uri,
return search;
}
+static void
+sokoke_resolve_hostname_cb (SoupAddress *address,
+ guint status,
+ gpointer data)
+{
+ if (status == SOUP_STATUS_OK)
+ *(gint *)data = 1;
+ else
+ *(gint *)data = 2;
+}
+
+/**
+ * sokoke_resolve_hostname
+ * @hostname: a string typed by a user
+ *
+ * Takes a string that was typed by a user,
+ * resolves the hostname, and returns the status.
+ *
+ * Return value: %TRUE if is a valid host, else %FALSE
+ **/
+gboolean
+sokoke_resolve_hostname (const gchar* hostname)
+{
+ gchar* uri;
+ gint host_resolved = 0;
+
+ uri = g_strconcat ("http://", hostname, NULL);
+ if (sokoke_prefetch_uri (uri, sokoke_resolve_hostname_cb,
+ &host_resolved))
+ {
+ GTimer* timer = g_timer_new ();
+ while (!host_resolved && g_timer_elapsed (timer, NULL) < 10)
+ g_main_context_iteration (NULL, FALSE);
+ g_timer_destroy (timer);
+ }
+ g_free (uri);
+ return host_resolved == 1 ? TRUE : FALSE;
+}
+
/**
* sokoke_magic_uri:
* @uri: a string typed by a user
@@ -679,7 +716,8 @@ sokoke_magic_uri (const gchar* uri)
((search = strchr (uri, ':')) || (search = strchr (uri, '@'))) &&
search[0] && !g_ascii_isalpha (search[1]))
return sokoke_idn_to_punycode (g_strconcat ("http://", uri, NULL));
- if (!strncmp (uri, "localhost", 9) && (uri[9] == '\0' || uri[9] == '/'))
+ if ((!strcmp (uri, "localhost") || strchr (uri, '/'))
+ && sokoke_resolve_hostname (uri))
return g_strconcat ("http://", uri, NULL);
if (!search)
{
@@ -816,7 +854,8 @@ sokoke_get_desktop (void)
GdkDisplay* display = gdk_display_get_default ();
Display* xdisplay = GDK_DISPLAY_XDISPLAY (display);
Window root_window = RootWindow (xdisplay, 0);
- Atom save_mode_atom = gdk_x11_get_xatom_by_name ("_DT_SAVE_MODE");
+ Atom save_mode_atom = gdk_x11_get_xatom_by_name_for_display (
+ display, "_DT_SAVE_MODE");
Atom actual_type;
int actual_format;
unsigned long n_items, bytes;
@@ -973,7 +1012,7 @@ sokoke_entry_set_default_text (GtkEntry* entry,
PANGO_STYLE_ITALIC);
gtk_entry_set_text (entry, default_text);
}
- else if (!GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (entry)))
+ else if (!gtk_widget_has_focus (GTK_WIDGET (entry)))
{
gint has_default = GPOINTER_TO_INT (
g_object_get_data (G_OBJECT (entry), "sokoke_has_default"));
@@ -1265,6 +1304,7 @@ sokoke_register_stock_items (void)
{ STOCK_PLUGINS, N_("Netscape p_lugins"), 0, 0, GTK_STOCK_CONVERT },
{ STOCK_USER_TRASH, N_("_Closed Tabs"), 0, 0, "gtk-undo-ltr" },
{ STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD },
+ { GTK_STOCK_DIRECTORY, N_("New _Folder"), 0, 0, NULL },
};
factory = gtk_icon_factory_new ();
@@ -1443,7 +1483,7 @@ sokoke_find_config_filename (const gchar* folder,
* Looks for the specified filename in the system data
* directories, depending on the platform.
*
- * Return value: a full path
+ * Return value: a newly allocated full path
**/
gchar*
sokoke_find_data_filename (const gchar* filename)
@@ -1451,10 +1491,16 @@ sokoke_find_data_filename (const gchar* filename)
const gchar* const* data_dirs = g_get_system_data_dirs ();
guint i = 0;
const gchar* data_dir;
+ gchar* path;
+
+ path = g_build_filename (g_get_user_data_dir (), filename, NULL);
+ if (g_access (path, F_OK) == 0)
+ return path;
+ g_free (path);
while ((data_dir = data_dirs[i++]))
{
- gchar* path = g_build_filename (data_dir, filename, NULL);
+ path = g_build_filename (data_dir, filename, NULL);
if (g_access (path, F_OK) == 0)
return path;
g_free (path);
@@ -1687,7 +1733,9 @@ sokoke_file_chooser_dialog_new (const gchar* title,
* Return value: %TRUE on success
**/
gboolean
-sokoke_prefetch_uri (const char* uri)
+sokoke_prefetch_uri (const char* uri,
+ SoupAddressCallback callback,
+ gpointer user_data)
{
#define MAXHOSTS 50
static gchar* hosts = NULL;
@@ -1724,7 +1772,7 @@ sokoke_prefetch_uri (const char* uri)
gchar* new_hosts;
address = soup_address_new (s_uri->host, SOUP_ADDRESS_ANY_PORT);
- soup_address_resolve_async (address, 0, 0, 0, 0);
+ soup_address_resolve_async (address, 0, 0, callback, user_data);
g_object_unref (address);
if (host_count > MAXHOSTS)
@@ -1736,10 +1784,42 @@ sokoke_prefetch_uri (const char* uri)
new_hosts = g_strdup_printf ("%s|%s", hosts, s_uri->host);
katze_assign (hosts, new_hosts);
}
+ else if (callback)
+ callback (NULL, SOUP_STATUS_OK, user_data);
soup_uri_free (s_uri);
return TRUE;
}
+/**
+ * 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;
+}
+
/* Provide a new way for SoupSession to assume an 'Accept-Language'
string automatically from the return value of g_get_language_names(),
properly formatted according to RFC2616.
diff --git a/midori/sokoke.h b/midori/sokoke.h
index 7d46de24..46da82e8 100644
--- a/midori/sokoke.h
+++ b/midori/sokoke.h
@@ -27,6 +27,13 @@
#if !GLIB_CHECK_VERSION (2, 14, 0)
#define G_PARAM_STATIC_STRINGS \
(G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
+#endif
+
+#if !GLIB_CHECK_VERSION (2, 18, 0)
+ #define g_content_type_from_mime_type(mtp) g_strdup (mtp)
+#endif
+
+#if !GTK_CHECK_VERSION (2, 14, 0)
#define gtk_dialog_get_content_area(dlg) dlg->vbox
#endif
@@ -38,6 +45,12 @@
#if !GTK_CHECK_VERSION (2, 18, 0)
#define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL (widget)
#define gtk_widget_has_focus(widget) GTK_WIDGET_HAS_FOCUS (widget)
+ #define gtk_widget_get_visible(widget) GTK_WIDGET_VISIBLE (widget)
+ #define gtk_widget_get_sensitive(widget) GTK_WIDGET_IS_SENSITIVE (widget)
+#endif
+
+#if !GTK_CHECK_VERSION (2, 20, 0)
+ #define gtk_widget_get_realized(widget) GTK_WIDGET_REALIZED (widget)
#endif
#if !GTK_CHECK_VERSION(2, 12, 0)
@@ -221,9 +234,18 @@ sokoke_file_chooser_dialog_new (const gchar* title,
GtkFileChooserAction action);
gboolean
-sokoke_prefetch_uri (const char* uri);
+sokoke_prefetch_uri (const char* uri,
+ SoupAddressCallback callback,
+ gpointer user_data);
+
+gboolean
+sokoke_resolve_hostname (const gchar* hostname);
gchar *
sokoke_accept_languages (const gchar* const * lang_names);
+gboolean
+sokoke_recursive_fork_protection (const gchar* uri,
+ gboolean set_uri);
+
#endif /* !__SOKOKE_H__ */
diff --git a/midori/wscript_build b/midori/wscript_build
index ca664c65..bb76c6f0 100644
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -6,7 +6,7 @@ import platform
progressive = True
libs = 'M UNIQUE LIBSOUP GMODULE GTHREAD LIBIDN GIO GTK SQLITE ' \
- 'LIBNOTIFY WEBKIT LIBXML X11 WS2_32 OPENSSL HILDON HILDON_FM'
+ 'LIBNOTIFY WEBKIT LIBXML X11 XSS WS2_32 OPENSSL HILDON HILDON_FM'
if progressive or Options.commands['check']:
obj = bld.new_task_gen ('cc', 'staticlib')
diff --git a/panels/midori-addons.c b/panels/midori-addons.c
deleted file mode 100644
index 88061950..00000000
--- a/panels/midori-addons.c
+++ /dev/null
@@ -1,1079 +0,0 @@
-/*
- Copyright (C) 2008 Christian Dywan
- Copyright (C) 2008 Arnaud Renevier
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#if HAVE_CONFIG_H
- #include
-#endif
-
-#include "midori-addons.h"
-#include "midori-stock.h"
-
-#include "sokoke.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#if HAVE_UNISTD_H
- #include
-#endif
-
-struct _MidoriAddons
-{
- GtkVBox parent_instance;
-
- GtkWidget* web_widget;
- GtkWidget* toolbar;
- GtkWidget* treeview;
-
- GSList* elements;
-};
-
-struct _MidoriAddonsClass
-{
- GtkVBoxClass parent_class;
-};
-
-struct AddonElement
-{
- gchar *fullpath;
- gchar *name;
- gchar *description;
- gboolean enabled;
- gboolean broken;
-
- GSList* includes;
- GSList* excludes;
-};
-
-static void
-midori_addons_viewable_iface_init (MidoriViewableIface* iface);
-
-G_DEFINE_TYPE_WITH_CODE (MidoriAddons, midori_addons, GTK_TYPE_VBOX,
- G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE,
- midori_addons_viewable_iface_init));
-
-enum
-{
- PROP_0,
-
- PROP_KIND,
- PROP_WEB_WIDGET
-};
-
-static void
-midori_addons_finalize (GObject* object);
-
-static void
-midori_addons_set_property (GObject* object,
- guint prop_id,
- const GValue* value,
- GParamSpec* pspec);
-
-static void
-midori_addons_get_property (GObject* object,
- guint prop_id,
- GValue* value,
- GParamSpec* pspec);
-
-GType
-midori_addon_kind_get_type (void)
-{
- static GType type = 0;
- if (!type)
- {
- static const GEnumValue values[] = {
- { MIDORI_ADDON_NONE, "MIDORI_ADDON_NONE", N_("None") },
- { MIDORI_ADDON_USER_SCRIPTS, "MIDORI_USER_SCRIPTS", N_("Userscripts") },
- { MIDORI_ADDON_USER_STYLES, "MIDORI_USER_STYLES", N_("Userstyles") },
- { 0, NULL, NULL }
- };
- type = g_enum_register_static ("MidoriAddonKind", values);
- }
- return type;
-}
-
-static void
-midori_addons_class_init (MidoriAddonsClass* class)
-{
- GObjectClass* gobject_class;
- GParamFlags flags;
-
- gobject_class = G_OBJECT_CLASS (class);
- gobject_class->finalize = midori_addons_finalize;
- gobject_class->set_property = midori_addons_set_property;
- gobject_class->get_property = midori_addons_get_property;
-
- flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT;
-
- g_object_class_install_property (gobject_class,
- PROP_KIND,
- g_param_spec_enum (
- "kind",
- "Kind",
- "The kind of addons",
- MIDORI_TYPE_ADDON_KIND,
- MIDORI_ADDON_NONE,
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_WEB_WIDGET,
- g_param_spec_object (
- "web-widget",
- "Web Widget",
- "The assigned web widget",
- GTK_TYPE_WIDGET,
- G_PARAM_READWRITE));
-}
-
-static const gchar*
-midori_addons_get_label (MidoriViewable* viewable)
-{
- return _("Userscripts");
-}
-
-static const gchar*
-midori_addons_get_stock_id (MidoriViewable* viewable)
-{
- return STOCK_SCRIPTS;
-}
-
-static void
-midori_addons_viewable_iface_init (MidoriViewableIface* iface)
-{
- iface->get_stock_id = midori_addons_get_stock_id;
- iface->get_label = midori_addons_get_label;
- iface->get_toolbar = midori_addons_get_toolbar;
-}
-
-static void
-midori_addons_set_property (GObject* object,
- guint prop_id,
- const GValue* value,
- GParamSpec* pspec)
-{
- MidoriAddons* addons = MIDORI_ADDONS (object);
-
- switch (prop_id)
- {
- case PROP_KIND:
- /* Ignored */
- break;
- case PROP_WEB_WIDGET:
- katze_object_assign (addons->web_widget, g_value_dup_object (value));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-midori_addons_get_property (GObject* object,
- guint prop_id,
- GValue* value,
- GParamSpec* pspec)
-{
- MidoriAddons* addons = MIDORI_ADDONS (object);
-
- switch (prop_id)
- {
- case PROP_KIND:
- g_value_set_enum (value, MIDORI_ADDON_USER_SCRIPTS);
- break;
- case PROP_WEB_WIDGET:
- g_value_set_object (value, addons->web_widget);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static GSList*
-_addons_get_directories (MidoriAddons* addons)
-{
- const gchar* folders[] = { "scripts", "styles" };
- GSList *directories;
- guint i;
- const char* const* datadirs;
- gchar* path;
-
- directories = NULL;
-
- for (i = 0; i < G_N_ELEMENTS (folders); i++)
- {
- path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
- PACKAGE_NAME, folders[i], NULL);
- if (g_access (path, X_OK) == 0)
- directories = g_slist_prepend (directories, path);
- else
- g_free (path);
-
- datadirs = g_get_system_data_dirs ();
- while (*datadirs)
- {
- path = g_build_path (G_DIR_SEPARATOR_S, *datadirs,
- PACKAGE_NAME, folders[i], NULL);
- if (g_access (path, X_OK) == 0)
- directories = g_slist_prepend (directories, path);
- else
- g_free (path);
- datadirs++;
- }
- }
-
- return directories;
-}
-
-static GSList*
-_addons_get_files (MidoriAddons* addons)
-{
- GSList* files;
- GDir* addon_dir;
- GSList* list;
- GSList* directories;
- const gchar* filename;
- gchar* dirname;
- gchar* fullname;
-
- files = NULL;
-
- directories = _addons_get_directories (addons);
- list = directories;
- while (directories)
- {
- dirname = directories->data;
- if ((addon_dir = g_dir_open (dirname, 0, NULL)))
- {
- while ((filename = g_dir_read_name (addon_dir)))
- {
- if (g_str_has_suffix (filename, ".js")
- || g_str_has_suffix (filename, ".css"))
- {
- fullname = g_build_filename (dirname, filename, NULL);
- files = g_slist_prepend (files, fullname);
- }
- }
- g_dir_close (addon_dir);
- }
- g_free (dirname);
- directories = g_slist_next (directories);
- }
- g_slist_free (list);
-
- return files;
-}
-
-static void
-midori_addons_directory_monitor_changed (GFileMonitor* monitor,
- GFile* child,
- GFile* other_file,
- GFileMonitorEvent flags,
- MidoriAddons* addons)
-{
- midori_addons_update_elements (addons);
-}
-
-static void
-midori_addons_button_add_clicked_cb (GtkToolItem* toolitem,
- MidoriAddons* addons)
-{
- gchar* path_scripts, *path_styles;
- GtkWidget* dialog;
-
- path_scripts = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
- PACKAGE_NAME, "scripts", NULL);
- path_styles = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
- PACKAGE_NAME, "styles", NULL);
- dialog = gtk_message_dialog_new (
- GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
- _("Copy userscripts to the folder %s and "
- "copy userstyles to the folder %s."), path_scripts, path_styles);
- g_free (path_scripts);
- g_free (path_styles);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-}
-
-static void
-midori_addons_treeview_render_tick_cb (GtkTreeViewColumn* column,
- GtkCellRenderer* renderer,
- GtkTreeModel* model,
- GtkTreeIter* iter,
- GtkWidget* treeview)
-{
- struct AddonElement *element;
-
- gtk_tree_model_get (model, iter, 0, &element, -1);
-
- g_object_set (renderer,
- "active", element->enabled,
- "sensitive", !element->broken,
- NULL);
-}
-
-static void
-midori_addons_treeview_render_text_cb (GtkTreeViewColumn* column,
- GtkCellRenderer* renderer,
- GtkTreeModel* model,
- GtkTreeIter* iter,
- GtkWidget* treeview)
-{
- struct AddonElement *element;
-
- gtk_tree_model_get (model, iter, 0, &element, -1);
-
- g_object_set (renderer, "text", element->name, NULL);
- if (!element->enabled)
- g_object_set (renderer, "sensitive", false, NULL);
- else
- g_object_set (renderer, "sensitive", true, NULL);
-}
-
-static void
-midori_addons_treeview_row_activated_cb (GtkTreeView* treeview,
- GtkTreePath* path,
- GtkTreeViewColumn* column,
- MidoriAddons* addons)
-{
- GtkTreeModel* model = gtk_tree_view_get_model (treeview);
- GtkTreeIter iter;
- if (gtk_tree_model_get_iter (model, &iter, path))
- {
- struct AddonElement *element;
-
- gtk_tree_model_get (model, &iter, 0, &element, -1);
-
- element->enabled = !element->enabled;
-
- /* After enabling or disabling an element, the tree view
- is not updated automatically; we need to notify tree model
- in order to take the modification into account */
- gtk_tree_model_row_changed (model, path, &iter);
- }
-}
-
-static void
-midori_addons_cell_renderer_toggled_cb (GtkCellRendererToggle* renderer,
- const gchar* path,
- MidoriAddons* addons)
-{
- GtkTreeModel* model;
- GtkTreeIter iter;
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (addons->treeview));
- if (gtk_tree_model_get_iter_from_string (model, &iter, path))
- {
- struct AddonElement *element;
- GtkTreePath* tree_path;
-
- gtk_tree_model_get (model, &iter, 0, &element, -1);
-
- element->enabled = !element->enabled;
-
- /* After enabling or disabling an element, the tree view
- is not updated automatically; we need to notify tree model
- in order to take the modification into account */
- tree_path = gtk_tree_path_new_from_string (path);
- gtk_tree_model_row_changed (model, tree_path, &iter);
- gtk_tree_path_free (tree_path);
- }
-}
-
-static void
-midori_addons_init (MidoriAddons* addons)
-{
- GtkTreeViewColumn* column;
- GtkCellRenderer* renderer_text;
- GtkCellRenderer* renderer_toggle;
-
- addons->web_widget = NULL;
- addons->elements = NULL;
-
- addons->treeview = gtk_tree_view_new ();
- gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (addons->treeview), FALSE);
- column = gtk_tree_view_column_new ();
- renderer_toggle = gtk_cell_renderer_toggle_new ();
- gtk_tree_view_column_pack_start (column, renderer_toggle, FALSE);
- gtk_tree_view_column_set_cell_data_func (column, renderer_toggle,
- (GtkTreeCellDataFunc)midori_addons_treeview_render_tick_cb,
- addons->treeview, NULL);
- g_signal_connect (renderer_toggle, "toggled",
- G_CALLBACK (midori_addons_cell_renderer_toggled_cb), addons);
- gtk_tree_view_append_column (GTK_TREE_VIEW (addons->treeview), column);
- column = gtk_tree_view_column_new ();
- renderer_text = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (column, renderer_text, FALSE);
- gtk_tree_view_column_set_cell_data_func (column, renderer_text,
- (GtkTreeCellDataFunc)midori_addons_treeview_render_text_cb,
- addons->treeview, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (addons->treeview), column);
- g_signal_connect (addons->treeview, "row-activated",
- G_CALLBACK (midori_addons_treeview_row_activated_cb),
- addons);
- gtk_widget_show (addons->treeview);
- gtk_box_pack_start (GTK_BOX (addons), addons->treeview, TRUE, TRUE, 0);
-}
-
-static void
-midori_addons_finalize (GObject* object)
-{
- MidoriAddons* addons = MIDORI_ADDONS (object);
-
- katze_object_assign (addons->web_widget, NULL);
-
- g_slist_free (addons->elements);
-}
-
-static gboolean
-js_metadata_from_file (const gchar* filename,
- GSList** includes,
- GSList** excludes,
- gchar** name,
- gchar** description)
-{
- GIOChannel* channel;
- gboolean found_meta;
- gchar* line;
- gchar* rest_of_line;
-
- if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK))
- return FALSE;
-
- channel = g_io_channel_new_file (filename, "r", 0);
- if (!channel)
- return FALSE;
-
- found_meta = FALSE;
-
- while (g_io_channel_read_line (channel, &line, NULL, NULL, NULL)
- == G_IO_STATUS_NORMAL)
- {
- if (g_str_has_prefix (line, "// ==UserScript=="))
- found_meta = TRUE;
- else if (found_meta)
- {
- if (g_str_has_prefix (line, "// ==/UserScript=="))
- found_meta = FALSE;
- else if (g_str_has_prefix (line, "// @require ") ||
- g_str_has_prefix (line, "// @resource "))
- {
- /* We don't support these, so abort here */
- g_free (line);
- g_io_channel_shutdown (channel, false, 0);
- g_slist_free (*includes);
- g_slist_free (*excludes);
- *includes = NULL;
- *excludes = NULL;
- return FALSE;
- }
- else if (includes && g_str_has_prefix (line, "// @include "))
- {
- rest_of_line = g_strdup (line + strlen ("// @include "));
- rest_of_line = g_strstrip (rest_of_line);
- *includes = g_slist_prepend (*includes, rest_of_line);
- }
- else if (excludes && g_str_has_prefix (line, "// @exclude "))
- {
- rest_of_line = g_strdup (line + strlen ("// @exclude "));
- rest_of_line = g_strstrip (rest_of_line);
- *excludes = g_slist_prepend (*excludes, rest_of_line);
- }
- else if (name && g_str_has_prefix (line, "// @name "))
- {
- rest_of_line = g_strdup (line + strlen ("// @name "));
- rest_of_line = g_strstrip (rest_of_line);
- *name = rest_of_line;
- }
- else if (description && g_str_has_prefix (line, "// @description "))
- {
- rest_of_line = g_strdup (line + strlen ("// @description "));
- rest_of_line = g_strstrip (rest_of_line);
- *description = rest_of_line;
- }
- }
- g_free (line);
- }
- g_io_channel_shutdown (channel, false, 0);
- g_io_channel_unref (channel);
-
- return TRUE;
-}
-
-static gboolean
-css_metadata_from_file (const gchar* filename,
- GSList** includes,
- GSList** excludes)
-{
- GIOChannel* channel;
- gchar* line;
- gchar* rest_of_line;
-
- if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK))
- return FALSE;
-
- channel = g_io_channel_new_file (filename, "r", 0);
- if (!channel)
- return FALSE;
-
- while (g_io_channel_read_line (channel, &line, NULL, NULL, NULL)
- == G_IO_STATUS_NORMAL)
- {
- if (g_str_has_prefix (line, "@namespace"))
- ; /* FIXME: Check "http://www.w3.org/1999/xhtml", skip otherwise */
- else if (g_str_has_prefix (line, "@-moz-document"))
- { /* FIXME: We merely look for includes. We should honor blocks. */
- if (includes)
- {
- gchar** parts;
- guint i;
-
- rest_of_line = g_strdup (line + strlen ("@-moz-document"));
- rest_of_line = g_strstrip (rest_of_line);
- parts = g_strsplit (rest_of_line, " ", 0);
- i = 0;
- while (parts[i])
- {
- if (g_str_has_prefix (parts[i], "url-prefix("))
- {
- gchar* value = g_strdup (parts[i] + strlen ("url-prefix("));
- guint j;
-
- if (value[0] != '\'' && value[0] != '"')
- {
- /* Wrong syntax, abort */
- g_free (value);
- g_strfreev (parts);
- g_free (line);
- g_io_channel_shutdown (channel, false, 0);
- g_slist_free (*includes);
- g_slist_free (*excludes);
- *includes = NULL;
- *excludes = NULL;
- return FALSE;
- }
- j = 1;
- while (value[j] != '\0')
- {
- if (value[j] == value[0])
- break;
- j++;
- }
- *includes = g_slist_prepend (*includes, g_strndup (value + 1, j - 1));
- g_free (value);
- }
- /* FIXME: Recognize "domain" */
- i++;
- }
- g_strfreev (parts);
- }
- }
- g_free (line);
- }
- g_io_channel_shutdown (channel, false, 0);
- g_io_channel_unref (channel);
-
- return TRUE;
-}
-
-static gchar*
-_convert_to_simple_regexp (const gchar* pattern)
-{
- guint len;
- gchar* dest;
- guint pos;
- guint i;
- gchar c;
-
- len = strlen (pattern);
- dest = g_malloc0 (len * 2 + 1);
- dest[0] = '^';
- pos = 1;
-
- for (i = 0; i < len; i++)
- {
- c = pattern[i];
- switch (c)
- {
- case '*':
- dest[pos] = '.';
- dest[pos + 1] = c;
- pos++;
- pos++;
- break;
- case '.' :
- case '?' :
- case '^' :
- case '$' :
- case '+' :
- case '{' :
- case '[' :
- case '|' :
- case '(' :
- case ')' :
- case ']' :
- case '\\' :
- dest[pos] = '\\';
- dest[pos + 1] = c;
- pos++;
- pos++;
- break;
- case ' ' :
- break;
- default:
- dest[pos] = pattern[i];
- pos ++;
- }
- }
- return dest;
-}
-
-static gboolean
-_may_load_script (const gchar* uri,
- GSList** includes,
- GSList** excludes)
-{
- gboolean match;
- GSList* list;
- gchar* re;
-
- if (*includes)
- match = FALSE;
- else
- match = TRUE;
-
- list = *includes;
- while (list)
- {
- re = _convert_to_simple_regexp (list->data);
- if (g_regex_match_simple (re, uri, 0, 0))
- {
- match = TRUE;
- break;
- }
- g_free (re);
- list = g_slist_next (list);
- }
- if (!match)
- {
- return FALSE;
- }
- list = *excludes;
- while (list)
- {
- re = _convert_to_simple_regexp (list->data);
- if (g_regex_match_simple (re, uri, 0, 0))
- {
- match = FALSE;
- break;
- }
- g_free (re);
- list = g_slist_next (list);
- }
- return match;
-}
-
-static gboolean
-_js_script_from_file (JSContextRef js_context,
- const gchar* filename,
- gchar** exception)
-{
- gboolean result = FALSE;
- gchar* script;
- GError* error = NULL;
- gchar* wrapped_script;
-
- if (g_file_get_contents (filename, &script, NULL, &error))
- {
- /* Wrap the script to prevent global variables */
- wrapped_script = g_strdup_printf (
- "window.addEventListener ('DOMContentLoaded',"
- "function () { %s }, true);", script);
- if (sokoke_js_script_eval (js_context, wrapped_script, exception))
- result = TRUE;
- g_free (wrapped_script);
- g_free (script);
- }
- else
- {
- *exception = g_strdup (error->message);
- g_error_free (error);
- }
- return result;
-}
-
-static gboolean
-_js_style_from_file (JSContextRef js_context,
- const gchar* filename,
- gchar** exception)
-{
- gboolean result;
- gchar* style;
- GError* error;
- guint i, n;
- gchar* style_script;
-
- result = FALSE;
- error = NULL;
- if (g_file_get_contents (filename, &style, NULL, &error))
- {
- guint meta = 0;
- n = strlen (style);
- for (i = 0; i < n; i++)
- {
- /* Replace line breaks with spaces */
- if (style[i] == '\n' || style[i] == '\r')
- style[i] = ' ';
- /* Change all single quotes to double quotes */
- if (style[i] == '\'')
- style[i] = '\"';
- /* Turn metadata we inspected earlier into comments */
- if (!meta && style[i] == '@')
- {
- style[i] = '/';
- meta++;
- }
- else if (meta == 1 && (style[i] == '-' || style[i] == 'n'))
- {
- style[i] = '*';
- meta++;
- }
- else if (meta == 2 && style[i] == '{')
- {
- style[i - 1] = '*';
- style[i] = '/';
- meta++;
- }
- else if (meta == 3 && style[i] == '{')
- meta++;
- else if (meta == 4 && style[i] == '}')
- meta--;
- else if (meta == 3 && style[i] == '}')
- {
- style[i] = ' ';
- meta = 0;
- }
- }
-
- style_script = g_strdup_printf (
- "window.addEventListener ('DOMContentLoaded',"
- "function () {"
- "var mystyle = document.createElement(\"style\");"
- "mystyle.setAttribute(\"type\", \"text/css\");"
- "mystyle.appendChild(document.createTextNode('%s'));"
- "var head = document.getElementsByTagName(\"head\")[0];"
- "if (head) head.appendChild(mystyle);"
- "else document.documentElement.insertBefore(mystyle, document.documentElement.firstChild);"
- "}, true);",
- style);
- if (sokoke_js_script_eval (js_context, style_script, exception))
- result = TRUE;
- g_free (style_script);
- g_free (style);
- }
- else
- {
- *exception = g_strdup (error->message);
- g_error_free (error);
- }
- return result;
-}
-
-static void
-midori_web_widget_context_ready_cb (GtkWidget* web_widget,
- JSGlobalContextRef js_context,
- MidoriAddons* addons)
-{
- gchar* uri;
- GSList* elements;
- struct AddonElement* element;
- gchar* fullname;
- gchar* exception;
- gchar* message;
-
- uri = katze_object_get_string (web_widget, "uri");
- /* Don't run scripts or styles on blank or special pages */
- if (!(uri && *uri && strncmp (uri, "about:", 6)))
- {
- g_free (uri);
- return;
- }
-
- elements = addons->elements;
- while (elements)
- {
- element = elements->data;
- if (!element->enabled || element->broken)
- {
- elements = g_slist_next (elements);
- continue;
- }
-
- fullname = element->fullpath;
-
- if (element->includes || element->excludes)
- if (!_may_load_script (uri, &element->includes, &element->excludes))
- {
- elements = g_slist_next (elements);
- continue;
- }
-
- exception = NULL;
- if (g_str_has_suffix (fullname, ".js") &&
- !_js_script_from_file (js_context, fullname, &exception))
- {
- message = g_strdup_printf ("console.error ('%s');", exception);
- sokoke_js_script_eval (js_context, message, NULL);
- g_free (message);
- g_free (exception);
- }
- else if (g_str_has_suffix (fullname, ".css") &&
- !_js_style_from_file (js_context, fullname, &exception))
- {
- message = g_strdup_printf ("console.error ('%s');", exception);
- sokoke_js_script_eval (js_context, message, NULL);
- g_free (message);
- g_free (exception);
- }
-
- elements = g_slist_next (elements);
- }
-
- g_free (uri);
-}
-
-/**
- * midori_addons_new:
- * @kind: the kind of addon
- * @web_widget: a web widget
- *
- * Creates a new addons widget.
- *
- * @web_widget can be one of the following:
- * %MidoriBrowser, %MidoriWebView, %WebKitWebView
- *
- * Return value: a new #MidoriAddons
- **/
-GtkWidget*
-midori_addons_new (MidoriAddonKind kind,
- GtkWidget* web_widget)
-{
- MidoriAddons* addons;
- GSList* directories;
- GSList* list;
- GFile* directory;
- GError* error;
- GFileMonitor* monitor;
-
- g_return_val_if_fail (GTK_IS_WIDGET (web_widget), NULL);
-
- addons = g_object_new (MIDORI_TYPE_ADDONS,
- "kind", kind,
- "web-widget", web_widget,
- NULL);
-
- if (kind == MIDORI_ADDON_USER_SCRIPTS || kind == MIDORI_ADDON_USER_STYLES)
- g_signal_connect (addons->web_widget, "context-ready",
- G_CALLBACK (midori_web_widget_context_ready_cb), addons);
-
- midori_addons_update_elements (addons);
-
- directories = _addons_get_directories (addons);
- list = directories;
- while (directories)
- {
- directory = g_file_new_for_path (directories->data);
- directories = g_slist_next (directories);
- error = NULL;
- monitor = g_file_monitor_directory (directory,
- G_FILE_MONITOR_NONE,
- NULL, &error);
- if (monitor)
- g_signal_connect (monitor, "changed",
- G_CALLBACK (midori_addons_directory_monitor_changed), addons);
- else
- {
- g_warning (_("Can't monitor folder '%s': %s"),
- g_file_get_parse_name (directory), error->message);
- g_error_free (error);
- }
- g_object_unref (directory);
- }
- g_slist_free (list);
-
- return GTK_WIDGET (addons);
-}
-
-/**
- * midori_addons_get_toolbar:
- * @addons: a #MidoriAddons
- *
- * Retrieves the toolbar of the addons. A new widget
- * is created on the first call of this function.
- *
- * Return value: a toolbar widget
- *
- * Deprecated: 0.1.2: Use midori_viewable_get_toolbar() instead.
- **/
-GtkWidget*
-midori_addons_get_toolbar (MidoriViewable* addons)
-{
- GtkWidget* toolbar;
- GtkToolItem* toolitem;
-
- g_return_val_if_fail (MIDORI_IS_ADDONS (addons), NULL);
-
- if (!MIDORI_ADDONS (addons)->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);
- toolitem = gtk_tool_item_new ();
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
- gtk_widget_show (GTK_WIDGET (toolitem));
-
- /* separator */
- toolitem = gtk_separator_tool_item_new ();
- gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem),
- FALSE);
- gtk_tool_item_set_expand (toolitem, TRUE);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
- gtk_widget_show (GTK_WIDGET (toolitem));
-
- /* add button */
- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
- gtk_tool_item_set_is_important (toolitem, TRUE);
- g_signal_connect (toolitem, "clicked",
- G_CALLBACK (midori_addons_button_add_clicked_cb), addons);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
- gtk_widget_show (GTK_WIDGET (toolitem));
- MIDORI_ADDONS (addons)->toolbar = toolbar;
-
- g_signal_connect (toolbar, "destroy",
- G_CALLBACK (gtk_widget_destroyed),
- &MIDORI_ADDONS (addons)->toolbar);
- }
-
- return MIDORI_ADDONS (addons)->toolbar;
-}
-
-/**
- * midori_addons_update_elements:
- * @addons: a #MidoriAddons
- *
- * Updates all addons elements (file paths and metadata).
- *
- **/
-void
-midori_addons_update_elements (MidoriAddons* addons)
-{
- GTree* disabled;
- GSList* elements;
- gboolean broken;
- gchar* fullname;
- gchar* displayname;
- gchar* name;
- gchar* description;
- GSList* includes;
- GSList* excludes;
- GtkListStore* liststore;
- GtkTreeIter iter;
- GSList* addon_files;
- GSList* list;
- struct AddonElement* element;
-
- g_return_if_fail (MIDORI_IS_ADDONS (addons));
-
- /* FIXME: would GHashTable be better? */
- disabled = g_tree_new ((GCompareFunc)strcmp);
- elements = addons->elements;
- while (elements)
- {
- element = elements->data;
- if (!element->enabled)
- g_tree_insert (disabled, element->fullpath, NULL);
- elements = g_slist_next (elements);
- }
-
- g_slist_free (addons->elements);
- addons->elements = NULL;
-
- liststore = gtk_list_store_new (3, G_TYPE_POINTER,
- G_TYPE_INT,
- G_TYPE_STRING);
-
- addon_files = _addons_get_files (addons);
- list = addon_files;
- while (addon_files)
- {
- fullname = addon_files->data;
- displayname = g_filename_display_basename (fullname);
- description = NULL;
- includes = NULL;
- excludes = NULL;
- broken = FALSE;
-
- if (g_str_has_suffix (fullname, ".js"))
- {
- name = NULL;
- if (!js_metadata_from_file (fullname, &includes, &excludes,
- &name, &description))
- broken = TRUE;
-
- if (name)
- {
- g_free (displayname);
- displayname = name;
- }
- }
- else if (g_str_has_suffix (fullname, ".css"))
- {
- if (!css_metadata_from_file (fullname, &includes, &excludes))
- broken = TRUE;
- }
-
- element = g_new (struct AddonElement, 1);
- element->name = displayname;
- element->description = description;
- element->fullpath = fullname;
-
- if (g_tree_lookup_extended (disabled, fullname, NULL, NULL))
- element->enabled = FALSE;
- else
- element->enabled = TRUE;
- element->broken = broken;
- element->includes = includes;
- element->excludes = excludes;
- addons->elements = g_slist_prepend (addons->elements, element);
-
- gtk_list_store_append (liststore, &iter);
- gtk_list_store_set (liststore, &iter,
- 0, element, 1, 0, 2, "", -1);
-
- addon_files = g_slist_next (addon_files);
- }
- addons->elements = g_slist_reverse (addons->elements);
-
- g_tree_destroy (disabled);
- g_slist_free (list);
-
- gtk_tree_view_set_model (GTK_TREE_VIEW (addons->treeview),
- GTK_TREE_MODEL (liststore));
-
- gtk_widget_queue_draw (GTK_WIDGET (addons->treeview));
-}
diff --git a/panels/midori-addons.h b/panels/midori-addons.h
deleted file mode 100644
index 662745ab..00000000
--- a/panels/midori-addons.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- Copyright (C) 2008 Christian Dywan
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#ifndef __MIDORI_ADDONS_H__
-#define __MIDORI_ADDONS_H__
-
-#include
-
-#include
-
-#include "midori-viewable.h"
-
-G_BEGIN_DECLS
-
-#define MIDORI_TYPE_ADDONS \
- (midori_addons_get_type ())
-#define MIDORI_ADDONS(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_ADDONS, MidoriAddons))
-#define MIDORI_ADDONS_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_ADDONS, MidoriAddonsClass))
-#define MIDORI_IS_ADDONS(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_ADDONS))
-#define MIDORI_IS_ADDONS_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_ADDONS))
-#define MIDORI_ADDONS_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_ADDONS, MidoriAddonsClass))
-
-typedef struct _MidoriAddons MidoriAddons;
-typedef struct _MidoriAddonsClass MidoriAddonsClass;
-
-typedef enum
-{
- MIDORI_ADDON_NONE,
- MIDORI_ADDON_USER_SCRIPTS,
- MIDORI_ADDON_USER_STYLES
-} MidoriAddonKind;
-
-GType
-midori_addon_kind_get_type (void) G_GNUC_CONST;
-
-#define MIDORI_TYPE_ADDON_KIND \
- (midori_addon_kind_get_type ())
-
-GType
-midori_addons_get_type (void);
-
-GtkWidget*
-midori_addons_new (MidoriAddonKind kind,
- GtkWidget* web_widget);
-
-GtkWidget*
-midori_addons_get_toolbar (MidoriViewable* addons);
-
-void
-midori_addons_update_elements (MidoriAddons* addons);
-
-G_END_DECLS
-
-#endif /* __MIDORI_ADDONS_H__ */
diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 87cc2421..2a901f01 100644
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -185,14 +185,6 @@ midori_bookmarks_folder_clicked_cb (GtkWidget* toolitem)
NULL, TRUE, TRUE);
}
-static void
-midori_bookmarks_import_clicked_cb (GtkWidget* toolitem)
-{
- MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (toolitem));
- /* FIXME: Take selected folder into account */
- midori_browser_activate_action (browser, "BookmarksImport");
-}
-
static void
midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview,
MidoriBookmarks* bookmarks)
@@ -234,7 +226,6 @@ midori_bookmarks_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);
bookmarks->toolbar = toolbar;
toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
@@ -266,13 +257,6 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
gtk_tool_item_set_expand (toolitem, TRUE);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
gtk_widget_show (GTK_WIDGET (toolitem));
- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CONVERT);
- gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
- _("Import bookmarks..."));
- g_signal_connect (toolitem, "clicked",
- G_CALLBACK (midori_bookmarks_import_clicked_cb), bookmarks);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
- gtk_widget_show (GTK_WIDGET (toolitem));
toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY);
gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
_("Add a new folder"));
diff --git a/panels/midori-console.c b/panels/midori-console.c
index f758589f..b70cf11a 100644
--- a/panels/midori-console.c
+++ b/panels/midori-console.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008-2009 Christian Dywan
+ Copyright (C) 2008-2010 Christian Dywan
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -186,6 +186,47 @@ midori_console_button_copy_clicked_cb (GtkToolItem* toolitem,
}
}
+static void
+midori_console_button_copy_all_clicked_cb (GtkToolItem* toolitem,
+ MidoriConsole* console)
+{
+ GtkTreeModel* model;
+ GtkTreeIter iter;
+ gint count;
+ GString* all_text;
+ GdkDisplay* display;
+ GtkClipboard* clipboard;
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (console->treeview));
+ if (!gtk_tree_model_get_iter_first (model, &iter))
+ return;
+
+ count = gtk_tree_model_iter_n_children (model, NULL);
+ all_text = g_string_sized_new (count * 96);
+
+ do
+ {
+ gchar* text;
+ gchar* message;
+ gint line;
+ gchar* source_id;
+
+ gtk_tree_model_get (model, &iter, 0, &message, 1, &line, 2, &source_id, -1);
+
+ text = g_strdup_printf ("%d @ %s: %s\n", line, source_id, message);
+ g_free (source_id);
+ g_free (message);
+ g_string_append (all_text, text);
+ g_free (text);
+ }
+ while (gtk_tree_model_iter_next (model, &iter));
+
+ display = gtk_widget_get_display (GTK_WIDGET (console));
+ clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
+ gtk_clipboard_set_text (clipboard, all_text->str, -1);
+ g_string_free (all_text, TRUE);
+}
+
static void
midori_console_button_clear_clicked_cb (GtkToolItem* toolitem,
MidoriConsole* console)
@@ -308,7 +349,6 @@ midori_console_get_toolbar (MidoriViewable* console)
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);
toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_COPY);
gtk_tool_item_set_is_important (toolitem, TRUE);
@@ -316,6 +356,15 @@ midori_console_get_toolbar (MidoriViewable* console)
G_CALLBACK (midori_console_button_copy_clicked_cb), console);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
gtk_widget_show (GTK_WIDGET (toolitem));
+
+ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DND_MULTIPLE);
+ gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Copy _All"));
+ gtk_tool_item_set_tooltip_text (toolitem, _("Copy All"));
+ g_signal_connect (toolitem, "clicked",
+ G_CALLBACK (midori_console_button_copy_all_clicked_cb), console);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
+ gtk_widget_show (GTK_WIDGET (toolitem));
+
/* TODO: What about a find entry here that filters e.g. by url? */
toolitem = gtk_separator_tool_item_new ();
gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem),
diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c
index 6fe8fb75..f1702ea3 100644
--- a/panels/midori-extensions.c
+++ b/panels/midori-extensions.c
@@ -105,7 +105,6 @@ midori_extensions_get_toolbar (MidoriViewable* extensions)
GtkWidget* 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);
MIDORI_EXTENSIONS (extensions)->toolbar = toolbar;
@@ -286,147 +285,6 @@ midori_extensions_treeview_row_activated_cb (GtkTreeView* treeview,
}
}
-static void
-midori_extensions_preferences_activate_cb (GtkWidget* menuitem,
- MidoriExtensions* extensions)
-{
- MidoriExtension* extension;
-
- extension = g_object_get_data (G_OBJECT (menuitem), "MidoriExtension");
- g_return_if_fail (extension != NULL);
-}
-
-static void
-midori_extensions_website_activate_cb (GtkWidget* menuitem,
- MidoriExtensions* extensions)
-{
- gchar* uri;
- gint n;
- MidoriBrowser* browser;
-
- MidoriExtension* extension;
-
- extension = g_object_get_data (G_OBJECT (menuitem), "MidoriExtension");
- g_return_if_fail (extension != NULL);
- uri = katze_object_get_string (extension, "website");
-
- browser = midori_browser_get_for_widget (GTK_WIDGET (extensions));
- n = midori_browser_add_uri (browser, uri);
- midori_browser_set_current_page (browser, n);
-
- g_free (uri);
-}
-
-static void
-midori_extensions_about_activate_cb (GtkWidget* menuitem,
- MidoriExtensions* extensions)
-{
- MidoriExtension* extension;
-
- extension = g_object_get_data (G_OBJECT (menuitem), "MidoriExtension");
- g_return_if_fail (extension != NULL);
-}
-
-static GtkWidget*
-midori_extensions_popup_menu_item (GtkMenu* menu,
- const gchar* stock_id,
- const gchar* label,
- MidoriExtension* extension,
- gpointer callback,
- gboolean enabled,
- MidoriExtensions* extensions)
-{
- GtkWidget* menuitem;
-
- 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 (!enabled)
- gtk_widget_set_sensitive (menuitem, FALSE);
-
- g_object_set_data (G_OBJECT (menuitem), "MidoriExtension", extension);
-
- if (callback)
- g_signal_connect (menuitem, "activate", G_CALLBACK (callback), extensions);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
- gtk_widget_show (menuitem);
-
- return menuitem;
-}
-
-static void
-midori_extensions_popup (GtkWidget* widget,
- GdkEventButton* event,
- MidoriExtension* extension,
- MidoriExtensions* extensions)
-{
- GtkWidget* menu;
- gchar* website;
-
- website = katze_object_get_string (extension, "website");
-
- menu = gtk_menu_new ();
- midori_extensions_popup_menu_item (GTK_MENU (menu), GTK_STOCK_PREFERENCES, NULL, extension,
- midori_extensions_preferences_activate_cb, FALSE,
- extensions);
- midori_extensions_popup_menu_item (GTK_MENU (menu), GTK_STOCK_HOME, NULL, extension,
- midori_extensions_website_activate_cb, website != NULL,
- extensions);
- midori_extensions_popup_menu_item (GTK_MENU (menu), GTK_STOCK_ABOUT, NULL, extension,
- midori_extensions_about_activate_cb, FALSE,
- extensions);
-
- katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
-
- g_free (website);
-}
-
-static gboolean
-midori_extensions_popup_menu_cb (GtkWidget* widget,
- MidoriExtensions* extensions)
-{
- GtkTreeModel* model;
- GtkTreeIter iter;
-
- if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter))
- {
- MidoriExtension *extension;
-
- gtk_tree_model_get (model, &iter, 0, &extension, -1);
-
- midori_extensions_popup (widget, NULL, extension, extensions);
- g_object_unref (extension);
- return TRUE;
- }
- return FALSE;
-}
-
-static gboolean
-midori_extensions_button_release_event_cb (GtkWidget* widget,
- GdkEventButton* event,
- MidoriExtensions* extensions)
-{
- GtkTreeModel* model;
- GtkTreeIter iter;
-
- if (event->button != 3)
- return FALSE;
-
- if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter))
- {
- MidoriExtension* extension;
-
- gtk_tree_model_get (model, &iter, 0, &extension, -1);
-
- midori_extensions_popup (widget, event, extension, extensions);
- g_object_unref (extension);
- return TRUE;
- }
- return FALSE;
-}
-
static void
midori_extensions_cell_renderer_toggled_cb (GtkCellRendererToggle* renderer,
const gchar* path,
@@ -511,10 +369,6 @@ midori_extensions_init (MidoriExtensions* extensions)
g_object_connect (extensions->treeview,
"signal::row-activated",
midori_extensions_treeview_row_activated_cb, extensions,
- "signal::button-release-event",
- midori_extensions_button_release_event_cb, extensions,
- "signal::popup-menu",
- midori_extensions_popup_menu_cb, extensions,
NULL);
gtk_widget_show (extensions->treeview);
gtk_box_pack_start (GTK_BOX (extensions), extensions->treeview, TRUE, TRUE, 0);
diff --git a/panels/midori-history.c b/panels/midori-history.c
index 41b19514..2eed597d 100644
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -429,7 +429,6 @@ midori_history_get_toolbar (MidoriViewable* viewable)
#endif
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);
history->toolbar = toolbar;
#if HAVE_SQLITE
diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c
index 55d74c49..8292010e 100644
--- a/panels/midori-transfers.c
+++ b/panels/midori-transfers.c
@@ -127,7 +127,6 @@ midori_transfers_get_toolbar (MidoriViewable* transfers)
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);
toolitem = gtk_tool_item_new ();
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2bb0115b..faa2a58d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,7 +12,6 @@ midori/midori-view.c
midori/midori-preferences.c
midori/midori-searchaction.c
midori/sokoke.c
-panels/midori-addons.c
panels/midori-bookmarks.c
panels/midori-console.c
panels/midori-extensions.c
@@ -26,6 +25,7 @@ katze/katze-array.c
katze/katze-arrayaction.c
katze/katze-preferences.c
extensions/adblock.c
+extensions/addons.c
extensions/colorful-tabs.c
extensions/cookie-manager/cookie-manager.c
extensions/cookie-manager/cookie-manager-page.c
diff --git a/po/ca.po b/po/ca.po
index bdb274b6..ede343d8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: midori\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-02 06:06+0100\n"
-"PO-Revision-Date: 2010-02-21 12:44+0100\n"
+"POT-Creation-Date: 2010-05-19 04:07+0000\n"
+"PO-Revision-Date: 2010-05-04 19:53+0100\n"
"Last-Translator: Carles Muñoz Gorriz \n"
"Language-Team: Catalan\n"
"MIME-Version: 1.0\n"
@@ -24,9 +24,9 @@ msgstr ""
msgid "Lightweight web browser"
msgstr "Navegador web lleuger"
-#: ../data/midori.desktop.in.h:2 ../midori/main.c:1307 ../midori/main.c:1538
-#: ../midori/main.c:1546 ../midori/main.c:1562
-#: ../midori/midori-websettings.c:299
+#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664
+#: ../midori/main.c:1672 ../midori/main.c:1688
+#: ../midori/midori-websettings.c:313
msgid "Midori"
msgstr "Midori"
@@ -34,177 +34,198 @@ msgstr "Midori"
msgid "Web Browser"
msgstr "Navegador web"
-#: ../midori/main.c:96
+#: ../midori/main.c:102
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "No s'ha pogut carregar la configuració: %s\n"
-#: ../midori/main.c:145
+#: ../midori/main.c:151
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "El valor «%s» no és vàlid per %s"
-#: ../midori/main.c:152 ../midori/main.c:238
+#: ../midori/main.c:158 ../midori/main.c:244
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Valor de configuració «%s» no és vàlid"
-#: ../midori/main.c:364 ../extensions/formhistory.c:446
+#: ../midori/main.c:370 ../extensions/formhistory.c:446
#, 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:419
+#: ../midori/main.c:425
#, 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:439
+#: ../midori/main.c:445
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "No s'ha pogut desar la configuració: %s"
-#: ../midori/main.c:477
+#: ../midori/main.c:483
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "No es pot desar les enginys de cerca. %s"
-#: ../midori/main.c:496 ../midori/main.c:546 ../midori/main.c:566
+#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572
#, c-format
msgid "The bookmarks couldn't be saved. %s"
msgstr "No s'han pogut desar les adreces d'interès. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:596 ../midori/main.c:619
+#: ../midori/main.c:602 ../midori/main.c:625
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "No s'han pogut desar les escombraries. %s"
-#: ../midori/main.c:683 ../midori/main.c:898
+#: ../midori/main.c:684 ../midori/main.c:924
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "No s'ha pogut desar la sessió. %s"
-#: ../midori/main.c:932
+#: ../midori/main.c:868
+msgid "No root certificate file is available. SSL certificates cannot be verified."
+msgstr "No es disposa del certificat arrel. Els certificats SSL no es poden verificar."
+
+#: ../midori/main.c:958
msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem."
msgstr "Sembla que Midori ha fallat el darrer cop que s'ha executat. Si això ha ocorregut repetidament, proveu una de les següents opcions per a resoldre el problema."
-#: ../midori/main.c:947
+#: ../midori/main.c:973
msgid "Modify _preferences"
msgstr "Modificació de les _preferències"
-#: ../midori/main.c:951
+#: ../midori/main.c:977
msgid "Reset the last _session"
msgstr "Reiniciar la darrera _sessió"
-#: ../midori/main.c:956
+#: ../midori/main.c:982
msgid "Disable all _extensions"
msgstr "Inhabilita totes les _extensions"
-#: ../midori/main.c:1191 ../midori/main.c:1802
+#: ../midori/main.c:1217 ../midori/main.c:1937
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "No s'ha pogut carregar la sessió: %s\n"
-#: ../midori/main.c:1307
+#: ../midori/main.c:1336
msgid "No filename specified"
msgstr "No s'ha especificat un nom de fitxer"
-#: ../midori/main.c:1326
+#: ../midori/main.c:1355
msgid "An unknown error occured."
msgstr "Ha ocorregut un error desconegut."
-#: ../midori/main.c:1357
+#: ../midori/main.c:1386
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "S'ha desat una captura a: %s\n"
-#: ../midori/main.c:1440
+#: ../midori/main.c:1557
msgid "Run ADDRESS as a web application"
msgstr "Executa ADREÇA com una aplicació web"
-#: ../midori/main.c:1440
+#: ../midori/main.c:1557
msgid "ADDRESS"
msgstr "ADREÇA"
-#: ../midori/main.c:1443
+#: ../midori/main.c:1560
msgid "Use FOLDER as configuration folder"
msgstr "Empra CARPETA com a carpeta de configuració"
-#: ../midori/main.c:1443
+#: ../midori/main.c:1560
msgid "FOLDER"
msgstr "CARPETA"
-#: ../midori/main.c:1446
+#: ../midori/main.c:1563
msgid "Show a diagnostic dialog"
msgstr "Mostra el diàleg de diagnosis"
-#: ../midori/main.c:1448
+#: ../midori/main.c:1565
msgid "Run the specified filename as javascript"
msgstr "Executa el fitxer especificat com a javascript"
-#: ../midori/main.c:1451
+#: ../midori/main.c:1568
msgid "Take a snapshot of the specified URI"
msgstr "Fes una captura de la ubicació especificada"
-#: ../midori/main.c:1454
+#: ../midori/main.c:1571
msgid "Execute the specified command"
msgstr "Executar la comanda especificada"
-#: ../midori/main.c:1456
+#: ../midori/main.c:1573
msgid "Display program version"
msgstr "Mostra la versió del programa"
-#: ../midori/main.c:1458
+#: ../midori/main.c:1575
msgid "Addresses"
msgstr "Adreces"
-#: ../midori/main.c:1535
+#: ../midori/main.c:1577
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Bloquejar URIs segons l'expressió regular PATRÓ"
+
+#: ../midori/main.c:1577
+msgid "PATTERN"
+msgstr "PATRÓ"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:1581
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Reiniciar Midori després de SEGONS d'activitat"
+
+#: ../midori/main.c:1581
+msgid "SECONDS"
+msgstr "SEGONS"
+
+#: ../midori/main.c:1661
msgid "[Addresses]"
msgstr "[adreces]"
-#: ../midori/main.c:1563
+#: ../midori/main.c:1689
msgid "Please report comments, suggestions and bugs to:"
msgstr "Envieu comentaris, suggeriments i informes d'error a:"
-#: ../midori/main.c:1565
+#: ../midori/main.c:1691
msgid "Check for new versions at:"
msgstr "Comprova si hi ha noves versions a:"
-#: ../midori/main.c:1653
+#: ../midori/main.c:1788
msgid "The specified configuration folder is invalid."
msgstr "La carpeta de configuració especificada és invalida."
-#: ../midori/main.c:1701
+#: ../midori/main.c:1836
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:1756
+#: ../midori/main.c:1891
#, 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:1785
+#: ../midori/main.c:1920
#, c-format
msgid "The bookmarks couldn't be loaded: %s\n"
msgstr "No s'ha pogut carregar les adreces d'interès: %s\n"
-#: ../midori/main.c:1817
+#: ../midori/main.c:1952
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "No s'han pogut carregar les escombraries: %s\n"
-#: ../midori/main.c:1831
+#: ../midori/main.c:1966
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "No s'ha pogut carregar l'historial: %s\n"
-#: ../midori/main.c:1845
+#: ../midori/main.c:1980
msgid "The following errors occured:"
msgstr "S'han produït els següents errors:"
-#: ../midori/main.c:1861
+#: ../midori/main.c:1996
msgid "_Ignore"
msgstr "_Ignora"
@@ -221,1381 +242,1428 @@ msgstr "Document format erròniament."
msgid "Unrecognized bookmark format."
msgstr "No es reconeix el format de l'adreça d'interès."
-#: ../midori/midori-array.c:718 ../midori/sokoke.c:1076
+#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115
#, c-format
msgid "Writing failed."
msgstr "Ha fallat l'escriptura"
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5372
-#: ../midori/midori-browser.c:5378
+#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538
+#: ../midori/midori-browser.c:5544
msgid "Reload the current page"
msgstr "Actualitza la pàgina actual"
-#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541
msgid "Stop loading the current page"
msgstr "Atura la càrrega d'aquesta pàgina"
-#: ../midori/midori-browser.c:452
+#: ../midori/midori-browser.c:460
#, c-format
msgid "%d%% loaded"
msgstr "%d%% carregat"
-#: ../midori/midori-browser.c:490
+#: ../midori/midori-browser.c:498
#, c-format
msgid "Failed to update title: %s\n"
msgstr "No s'ha pogut actualitzar el títol: %s\n"
-#: ../midori/midori-browser.c:504
+#: ../midori/midori-browser.c:512
#, c-format
msgid "Unexpected action '%s'."
msgstr "Acció inesperada «%s»."
-#: ../midori/midori-browser.c:711
+#: ../midori/midori-browser.c:728
msgid "New folder"
msgstr "Nova carpeta"
-#: ../midori/midori-browser.c:711
+#: ../midori/midori-browser.c:728
msgid "Edit folder"
msgstr "Edita la carpeta"
-#: ../midori/midori-browser.c:713
+#: ../midori/midori-browser.c:730
msgid "New bookmark"
msgstr "Nova adreça d'interès"
-#: ../midori/midori-browser.c:713
+#: ../midori/midori-browser.c:730
msgid "Edit bookmark"
msgstr "Edita l'adreça d'interès"
-#: ../midori/midori-browser.c:744
+#: ../midori/midori-browser.c:761
msgid "_Title:"
msgstr "_Títol:"
-#: ../midori/midori-browser.c:757 ../midori/midori-searchaction.c:961
+#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961
msgid "_Description:"
msgstr "_Descripció:"
-#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:975
+#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975
#: ../extensions/feed-panel/main.c:376
msgid "_Address:"
msgstr "_Adreça:"
-#: ../midori/midori-browser.c:806 ../midori/midori-browser.c:4562
+#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694
msgid "_Folder:"
msgstr "_Carpeta:"
-#: ../midori/midori-browser.c:816 ../midori/midori-browser.c:896
-#: ../midori/midori-browser.c:4567 ../midori/midori-browser.c:4599
+#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928
+#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731
msgid "Toplevel folder"
msgstr "Carpeta de nivell superior"
-#: ../midori/midori-browser.c:845
+#: ../midori/midori-browser.c:864
+msgid "Add to _Speed Dial"
+msgstr "Afegeix al _marcador ràpid"
+
+#: ../midori/midori-browser.c:877
msgid "Show in the tool_bar"
msgstr "Mostra a la _barra d'eines"
-#: ../midori/midori-browser.c:860
+#: ../midori/midori-browser.c:892
msgid "Run as _web application"
msgstr "Executa com una aplicació _web"
-#: ../midori/midori-browser.c:976 ../midori/midori-browser.c:4617
+#: ../midori/midori-browser.c:986
+#, 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:990
+#, 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:1047 ../midori/midori-browser.c:4749
+#: ../midori/midori-browser.c:4781
msgid "Save file as"
msgstr "Anomena i desa"
-#: ../midori/midori-browser.c:1350 ../panels/midori-transfers.c:271
+#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270
#, c-format
msgid "%s of %s"
msgstr "%s de %s"
-#: ../midori/midori-browser.c:1386
+#: ../midori/midori-browser.c:1456
#, c-format
msgid "The file '%s' has been downloaded."
msgstr "S'ha descarregat el fitxer «%s»."
-#: ../midori/midori-browser.c:1390
+#: ../midori/midori-browser.c:1460
msgid "Transfer completed"
msgstr "Transferència finalitzada"
-#: ../midori/midori-browser.c:1530
+#: ../midori/midori-browser.c:1600
msgid "Save file"
msgstr "Desa el fitxer"
-#: ../midori/midori-browser.c:2244
+#: ../midori/midori-browser.c:2349
msgid "Open file"
msgstr "Obre un fitxer"
-#: ../midori/midori-browser.c:2320 ../extensions/feed-panel/main.c:364
+#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364
msgid "New feed"
msgstr "Nou canal"
-#: ../midori/midori-browser.c:2361 ../midori/midori-browser.c:5437
-#: ../panels/midori-bookmarks.c:242
+#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603
+#: ../panels/midori-bookmarks.c:233
msgid "Add a new bookmark"
msgstr "Afegeix una adreça d'interès"
-#: ../midori/midori-browser.c:2918 ../panels/midori-history.c:332
+#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332
#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465
#, 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"
-#: ../midori/midori-browser.c:2998 ../midori/midori-searchaction.c:484
+#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484
msgid "Empty"
msgstr "Buit"
-#: ../midori/midori-browser.c:3613 ../midori/sokoke.c:400
-#: ../midori/sokoke.c:410 ../midori/sokoke.c:438 ../midori/sokoke.c:464
-#: ../midori/sokoke.c:478
+#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398
+#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462
+#: ../midori/sokoke.c:476
msgid "Could not run external program."
msgstr "No s'ha pogut executar el programa extern."
-#: ../midori/midori-browser.c:3927 ../midori/midori-browser.c:5825
+#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997
#, 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:4259 ../panels/midori-bookmarks.c:795
-#: ../panels/midori-history.c:751
+#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779
+#: ../panels/midori-history.c:750
msgid "Open all in _Tabs"
msgstr "Obre-ho tot en _pestanyes"
-#: ../midori/midori-browser.c:4266 ../panels/midori-bookmarks.c:801
-#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545
+#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785
+#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545
msgid "Open in New _Tab"
msgstr "Obre l'enllaç en una _pestanya nova"
-#: ../midori/midori-browser.c:4269 ../panels/midori-bookmarks.c:803
-#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547
+#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787
+#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547
msgid "Open in New _Window"
msgstr "Obre en una _finestra nova"
# Nom d'un navegador web.
-#: ../midori/midori-browser.c:4488
+#: ../midori/midori-browser.c:4620
msgid "Arora"
msgstr "Arora"
# Nom d'un navegador web japonès
-#: ../midori/midori-browser.c:4489
+#: ../midori/midori-browser.c:4621
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4490
+#: ../midori/midori-browser.c:4622
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4491
+#: ../midori/midori-browser.c:4623
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4492
+#: ../midori/midori-browser.c:4624
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4513 ../panels/midori-bookmarks.c:271
+#: ../midori/midori-browser.c:4645
msgid "Import bookmarks..."
msgstr "Importa les adreces d'interès…"
-#: ../midori/midori-browser.c:4516 ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608
msgid "_Import bookmarks"
msgstr "_Importa les adreces d'interès"
-#: ../midori/midori-browser.c:4527
+#: ../midori/midori-browser.c:4659
msgid "_Application:"
msgstr "_Aplicació:"
-#: ../midori/midori-browser.c:4554 ../midori/midori-browser.c:5541
-#: ../midori/midori-websettings.c:230 ../midori/midori-websettings.c:304
-#: ../katze/katze-utils.c:687
+#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712
+#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318
+#: ../katze/katze-utils.c:691
msgid "Custom..."
msgstr "Personalitzat…"
-#: ../midori/midori-browser.c:4628
+#: ../midori/midori-browser.c:4760
msgid "Failed to import bookmarks"
msgstr "No s'han pogut importar les adreces d'interès"
-#: ../midori/midori-browser.c:4685 ../panels/midori-history.c:141
+#: ../midori/midori-browser.c:4796
+msgid "Failed to export bookmarks"
+msgstr "No s'han pogut exportar les adreces d'interès"
+
+#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141
#: ../panels/midori-history.c:171
#, c-format
msgid "Failed to remove history item: %s\n"
msgstr "No s'ha pogut eliminar un element de l'historial: %s\n"
-#: ../midori/midori-browser.c:4791
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-browser.c:4957
msgid "Clear Private Data"
msgstr "Neteja les dades privades"
-#: ../midori/midori-browser.c:4795
+#: ../midori/midori-browser.c:4961
msgid "_Clear private data"
msgstr "_Neteja les dades privades"
-#: ../midori/midori-browser.c:4809
+#: ../midori/midori-browser.c:4975
msgid "Clear the following data:"
msgstr "Neteja les següents dades"
-#: ../midori/midori-browser.c:4820 ../midori/midori-preferences.c:524
+#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530
#: ../panels/midori-history.c:119
msgid "History"
msgstr "Historial"
-#: ../midori/midori-browser.c:4826
+#: ../midori/midori-browser.c:4992
msgid "Cookies"
msgstr "Galetes"
-#: ../midori/midori-browser.c:4831
+#: ../midori/midori-browser.c:4997
msgid "'Flash' Cookies"
msgstr "Galetes «Flash»"
-#: ../midori/midori-browser.c:4836
+#: ../midori/midori-browser.c:5002
msgid "Website icons"
msgstr "Icones de llocs webs"
-#: ../midori/midori-browser.c:4841 ../midori/sokoke.c:1266
+#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305
msgid "_Closed Tabs"
msgstr "Pestanyes _tancades"
-#: ../midori/midori-browser.c:4846 ../extensions/web-cache.c:464
+#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464
msgid "Web Cache"
msgstr "Memòria cau Web"
-#: ../midori/midori-browser.c:4854
+#: ../midori/midori-browser.c:5020
msgid "Clear private data when _quitting Midori"
msgstr "Neteja les dades provades al _sortir de Midori"
-#: ../midori/midori-browser.c:4962
+#: ../midori/midori-browser.c:5121
msgid "A lightweight web browser."
msgstr "Un navegador de pàgines web lleuger."
-#: ../midori/midori-browser.c:4978
+#: ../midori/midori-browser.c:5123
+msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version."
+msgstr "Aquesta llibreria és software lliure; podeu redistribuir-la i/o modificar-la segons els termes de la GNU Lesser General Public License tal com està publicat per la Free Software Foundation; ja sigui a la versió 2.1, o (segons la vostra tria) versió posterior."
+
+#: ../midori/midori-browser.c:5142
msgid "translator-credits"
msgstr ""
"Carles Muñoz Gorriz , 2009-2010.\n"
"Harald Servat , 2009."
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5451
msgid "_File"
msgstr "_Fitxer"
-#: ../midori/midori-browser.c:5287 ../midori/sokoke.c:1267
+#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306
msgid "New _Window"
msgstr "Nova _finestra"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5454
msgid "Open a new window"
msgstr "Obre una finestra nova"
-#: ../midori/midori-browser.c:5291
+#: ../midori/midori-browser.c:5457
msgid "Open a new tab"
msgstr "Obre una pestanya nova"
-#: ../midori/midori-browser.c:5293
+#: ../midori/midori-browser.c:5459
msgid "P_rivate Browsing"
msgstr "Navegació p_rivada"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5460
msgid "Don't save any private data while browsing"
msgstr "No desar qualsevol mena de dada privada mentre es navega"
-#: ../midori/midori-browser.c:5298
+#: ../midori/midori-browser.c:5464
msgid "Open a file"
msgstr "Obre un fitxer"
-#: ../midori/midori-browser.c:5301
+#: ../midori/midori-browser.c:5467
msgid "Save to a file"
msgstr "Desa en un fitxer"
-#: ../midori/midori-browser.c:5303
+#: ../midori/midori-browser.c:5469
msgid "Add to Speed _dial"
msgstr "Afegeix al _marcador ràpid"
-#: ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:5470
msgid "Add shortcut to speed dial"
msgstr "Afegeix drecera al marcador ràpid"
-#: ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:5472
msgid "Add Shortcut to the _desktop"
msgstr "Afegeix drecera a l'_escriptori"
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:5473
msgid "Add shortcut to the desktop"
msgstr "Afegeix drecera a l'escriptori"
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:5475
msgid "Subscribe to News _feed"
msgstr "Subscriure's a un _canal de notícies"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5476
msgid "Subscribe to this news feed"
msgstr "Subscriure's a aquest canal de notícies"
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5481
msgid "_Close Tab"
msgstr "Tan_ca la pestanya"
-#: ../midori/midori-browser.c:5316
+#: ../midori/midori-browser.c:5482
msgid "Close the current tab"
msgstr "Tanca la pestanya actual"
-#: ../midori/midori-browser.c:5318
+#: ../midori/midori-browser.c:5484
msgid "C_lose Window"
msgstr "_Tanca la finestra"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5485
msgid "Close this window"
msgstr "Tanca aquesta finestra"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5488
msgid "Print the current page"
msgstr "Imprimeix la pàgina actual"
-#: ../midori/midori-browser.c:5325
+#: ../midori/midori-browser.c:5491
msgid "Quit the application"
msgstr "Surt de l'aplicació"
-#: ../midori/midori-browser.c:5327
+#: ../midori/midori-browser.c:5493
msgid "_Edit"
msgstr "_Edita"
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5497
msgid "Undo the last modification"
msgstr "Desfés la darrera modificació"
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5500
msgid "Redo the last modification"
msgstr "Refés la darrera modifcació"
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5504
msgid "Cut the selected text"
msgstr "Talla el text seleccionat"
-#: ../midori/midori-browser.c:5341 ../midori/midori-browser.c:5344
+#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510
msgid "Copy the selected text"
msgstr "Copia el text seleccionat al porta-retalls"
-#: ../midori/midori-browser.c:5347
+#: ../midori/midori-browser.c:5513
msgid "Paste text from the clipboard"
msgstr "Enganxa el text al porta-retalls"
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5516
msgid "Delete the selected text"
msgstr "Suprimeix el text seleccionat"
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:5519
msgid "Select all text"
msgstr "Selecciona tot el text"
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5522
msgid "Find a word or phrase in the page"
msgstr "Cerca una paraula o frase a la pàgina"
-#: ../midori/midori-browser.c:5358
+#: ../midori/midori-browser.c:5524
msgid "Find _Next"
msgstr "Cerca el _següent"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5525
msgid "Find the next occurrence of a word or phrase"
msgstr "Cerca la següent ocurrència de la paraula o frase"
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5527
msgid "Find _Previous"
msgstr "Cerca l'_anterior"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5528
msgid "Find the previous occurrence of a word or phrase"
msgstr "Cerca l'anterior ocurrència de la paraula o frase"
-#: ../midori/midori-browser.c:5366
+#: ../midori/midori-browser.c:5532
msgid "Configure the application preferences"
msgstr "Canvia les preferències de l'aplicació"
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5534
msgid "_View"
msgstr "_Visualitza"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5535
msgid "_Toolbars"
msgstr "Barres d'e_ines"
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5547
msgid "Increase the zoom level"
msgstr "Augmenta el nivell d'ampliació"
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5550
msgid "Decrease the zoom level"
msgstr "Disminueix el nivell d'ampliació"
-#: ../midori/midori-browser.c:5387
+#: ../midori/midori-browser.c:5553
msgid "Reset the zoom level"
msgstr "Reiniciar el nivell d'ampliació"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5554
msgid "_Encoding"
msgstr "_Codificació"
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5556
msgid "View So_urce"
msgstr "Veure codi _font"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5557
msgid "View the source code of the page"
msgstr "Veure el codi font de la pàgina"
-#: ../midori/midori-browser.c:5394
+#: ../midori/midori-browser.c:5560
msgid "Toggle fullscreen view"
msgstr "Commuta la vista a pantalla completa"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5563
msgid "Scroll _Left"
msgstr "Desplaçament _esquerra"
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5564
msgid "Scroll to the left"
msgstr "Desplaçar cap a l'esquerra"
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5566
msgid "Scroll _Down"
msgstr "Desplaçament a_vall"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5567
msgid "Scroll down"
msgstr "Desplaçar cap avall"
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5569
msgid "Scroll _Up"
msgstr "Desplaçament _amunt"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5570
msgid "Scroll up"
msgstr "Desplaçar cap amunt"
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5572
msgid "Scroll _Right"
msgstr "Desplaçament _dreta"
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5573
msgid "Scroll to the right"
msgstr "Desplaçament cap a la dreta"
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5576
msgid "_Go"
msgstr "Vé_s"
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5579
msgid "Go back to the previous page"
msgstr "Torna a la pàgina anterior"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5582
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:5420
+#: ../midori/midori-browser.c:5586
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:5424
+#: ../midori/midori-browser.c:5590
msgid "Go to the next sub-page"
msgstr "Avança al apartat següent de la pàgina"
-#: ../midori/midori-browser.c:5427
+#: ../midori/midori-browser.c:5593
msgid "Go to your homepage"
msgstr "Va a la vostre pàgina d'inici"
-#: ../midori/midori-browser.c:5429
+#: ../midori/midori-browser.c:5595
msgid "Empty Trash"
msgstr "Buida la paperera"
-#: ../midori/midori-browser.c:5430
+#: ../midori/midori-browser.c:5596
msgid "Delete the contents of the trash"
msgstr "Esborra tot el contingut de la paperera"
-#: ../midori/midori-browser.c:5432
+#: ../midori/midori-browser.c:5598
msgid "Undo _Close Tab"
msgstr "Desfés _tanca pestanya"
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5599
msgid "Open the last closed tab"
msgstr "Obre la darrera pestanya tancada"
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5605
msgid "Add a new _folder"
msgstr "Afegeix una _carpeta"
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5606
msgid "Add a new bookmark folder"
msgstr "Afegeix una carpeta d'adreces d'interès"
-#: ../midori/midori-browser.c:5445 ../midori/midori-searchaction.c:493
+#: ../midori/midori-browser.c:5611
+msgid "_Export bookmarks"
+msgstr "_Exporta les adreces d'interès"
+
+#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493
msgid "_Manage Search Engines"
msgstr "_Gestiona els ginys de cerca"
-#: ../midori/midori-browser.c:5446
+#: ../midori/midori-browser.c:5615
msgid "Add, edit and remove search engines..."
msgstr "Afegeix, edita o treu ginys de cerca…"
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5618
msgid "_Clear Private Data"
msgstr "_Neteja les dades privades"
-#: ../midori/midori-browser.c:5450
+#: ../midori/midori-browser.c:5619
msgid "Clear private data..."
msgstr "Neteja les dades privades…"
-#: ../midori/midori-browser.c:5454
+#: ../midori/midori-browser.c:5623
msgid "_Inspect Page"
msgstr "_Inspecciona la pàgina"
-#: ../midori/midori-browser.c:5455
+#: ../midori/midori-browser.c:5624
msgid "Inspect page details and access developer tools..."
msgstr "Inspecciona els detalls de la pàgina i accedeix a les eines per desenvolupadors…"
-#: ../midori/midori-browser.c:5460
+#: ../midori/midori-browser.c:5629
msgid "_Previous Tab"
msgstr "_Anterior pestanya"
-#: ../midori/midori-browser.c:5461
+#: ../midori/midori-browser.c:5630
msgid "Switch to the previous tab"
msgstr "Canvia a la pestanya anterior"
-#: ../midori/midori-browser.c:5463
+#: ../midori/midori-browser.c:5632
msgid "_Next Tab"
msgstr "_Següent pestanya"
-#: ../midori/midori-browser.c:5464
+#: ../midori/midori-browser.c:5633
msgid "Switch to the next tab"
msgstr "Canvia a la pestanya següent"
-#: ../midori/midori-browser.c:5466
+#: ../midori/midori-browser.c:5635
msgid "Focus _Current Tab"
msgstr "Enfoca la pestanya _actual"
-#: ../midori/midori-browser.c:5467
+#: ../midori/midori-browser.c:5636
msgid "Focus the current tab"
msgstr "Enfoca la pestanya actual"
-#: ../midori/midori-browser.c:5469
+#: ../midori/midori-browser.c:5638
msgid "Open last _session"
msgstr "Obre la darrera _sessió"
-#: ../midori/midori-browser.c:5470
+#: ../midori/midori-browser.c:5639
msgid "Open the tabs saved in the last session"
msgstr "Obre les pestanyes emmagatzemades a la darrera sessió"
-#: ../midori/midori-browser.c:5472
+#: ../midori/midori-browser.c:5641
msgid "_Help"
msgstr "A_juda"
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5643
msgid "_Contents"
msgstr "_Continguts"
-#: ../midori/midori-browser.c:5475
+#: ../midori/midori-browser.c:5644
msgid "Show the documentation"
msgstr "Mostra la documentació"
-#: ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:5646
msgid "_Frequent Questions"
msgstr "_Preguntes freqüents"
-#: ../midori/midori-browser.c:5478
+#: ../midori/midori-browser.c:5647
msgid "Show the Frequently Asked Questions"
msgstr "Mostra les preguntes més freqüents"
-#: ../midori/midori-browser.c:5480
+#: ../midori/midori-browser.c:5649
msgid "_Report a Bug"
msgstr "Informa d'un _error"
-#: ../midori/midori-browser.c:5481
+#: ../midori/midori-browser.c:5650
msgid "Open Midori's bug tracker"
msgstr "Obre el sistema de seguiment d'errors de Midori"
-#: ../midori/midori-browser.c:5484
+#: ../midori/midori-browser.c:5653
msgid "Show information about the program"
msgstr "Mostra la informació sobre aquest programa"
-#: ../midori/midori-browser.c:5491
+#: ../midori/midori-browser.c:5661
msgid "_Menubar"
msgstr "Barra de _menú"
-#: ../midori/midori-browser.c:5492
+#: ../midori/midori-browser.c:5662
msgid "Show menubar"
msgstr "Mostra la barra de menú"
-#: ../midori/midori-browser.c:5495
+#: ../midori/midori-browser.c:5665
msgid "_Navigationbar"
msgstr "Barra de _navegació"
-#: ../midori/midori-browser.c:5496
+#: ../midori/midori-browser.c:5666
msgid "Show navigationbar"
msgstr "Mostra barra de navegació"
-#: ../midori/midori-browser.c:5499
+#: ../midori/midori-browser.c:5669
msgid "Side_panel"
msgstr "_Quadre lateral"
-#: ../midori/midori-browser.c:5500
+#: ../midori/midori-browser.c:5670
msgid "Show sidepanel"
msgstr "Mostra el quadre lateral"
-#: ../midori/midori-browser.c:5503
+#: ../midori/midori-browser.c:5673
msgid "_Bookmarkbar"
msgstr "Barra d'_adreces d'interès"
-#: ../midori/midori-browser.c:5504
+#: ../midori/midori-browser.c:5674
msgid "Show bookmarkbar"
msgstr "Mostra la barra d'adreces d'interès"
-#: ../midori/midori-browser.c:5507
+#: ../midori/midori-browser.c:5677
msgid "_Transferbar"
msgstr "Barra de _transferències"
-#: ../midori/midori-browser.c:5508
+#: ../midori/midori-browser.c:5678
msgid "Show transferbar"
msgstr "Mostra la barra de transferències"
-#: ../midori/midori-browser.c:5511
+#: ../midori/midori-browser.c:5681
msgid "_Statusbar"
msgstr "Barra d'_estat"
-#: ../midori/midori-browser.c:5512
+#: ../midori/midori-browser.c:5682
msgid "Show statusbar"
msgstr "Mostra la barra d'estat"
-#: ../midori/midori-browser.c:5519
+#: ../midori/midori-browser.c:5690
msgid "_Automatic"
msgstr "_Automàtic"
-#: ../midori/midori-browser.c:5522 ../midori/midori-websettings.c:224
+#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221
msgid "Chinese (BIG5)"
msgstr "Chinese Traditional (Big5)"
-#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
-#: ../midori/midori-browser.c:5526
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5697
msgid "Japanese (SHIFT__JIS)"
msgstr "Japonès (Shift_JIS)"
-#: ../midori/midori-browser.c:5529 ../midori/midori-websettings.c:226
+#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223
msgid "Korean (EUC-KR)"
msgstr "Koreà (EUC-KR)"
-#: ../midori/midori-browser.c:5532 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224
msgid "Russian (KOI8-R)"
msgstr "Rus (KOI8-R)"
-#: ../midori/midori-browser.c:5535 ../midori/midori-websettings.c:228
+#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5538 ../midori/midori-websettings.c:229
+#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226
msgid "Western (ISO-8859-1)"
msgstr "Occidental (ISO-8859-1)"
-#: ../midori/midori-browser.c:6085
+#: ../midori/midori-browser.c:6257
msgid "_Separator"
msgstr "_Separador"
-#: ../midori/midori-browser.c:6092
+#: ../midori/midori-browser.c:6264
msgid "_Location..."
msgstr "_Ubicació…"
-#: ../midori/midori-browser.c:6094
+#: ../midori/midori-browser.c:6266
msgid "Open a particular location"
msgstr "Obre una ubicació"
-#: ../midori/midori-browser.c:6118
+#: ../midori/midori-browser.c:6290
msgid "_Web Search..."
msgstr "Cerca _web…"
-#: ../midori/midori-browser.c:6120
+#: ../midori/midori-browser.c:6292
msgid "Run a web search"
msgstr "Executa una cerca web"
-#: ../midori/midori-browser.c:6141
+#: ../midori/midori-browser.c:6313
msgid "Reopen a previously closed tab or window"
msgstr "Reobre una pestanya o finestra prèviament tancada"
-#: ../midori/midori-browser.c:6156
+#: ../midori/midori-browser.c:6328
msgid "_Recently visited pages"
msgstr "Pàgines visitades _recentment"
-#: ../midori/midori-browser.c:6158
+#: ../midori/midori-browser.c:6330
msgid "Reopen pages that you visited earlier"
msgstr "Reobre pàgines que heu visitat anteriorment"
-#: ../midori/midori-browser.c:6173 ../midori/sokoke.c:1256
+#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295
msgid "_Bookmarks"
msgstr "_Adreces d'interès"
-#: ../midori/midori-browser.c:6175
+#: ../midori/midori-browser.c:6347
msgid "Show the saved bookmarks"
msgstr "Mostra les adreces d'interès desades"
-#: ../midori/midori-browser.c:6190
+#: ../midori/midori-browser.c:6362
msgid "_Tools"
msgstr "E_ines"
-#: ../midori/midori-browser.c:6203
+#: ../midori/midori-browser.c:6375
msgid "_Window"
msgstr "Fines_tra"
-#: ../midori/midori-browser.c:6205
+#: ../midori/midori-browser.c:6377
msgid "Show a list of all open tabs"
msgstr "Mostra una llista de totes les pestanyes obertes"
-#: ../midori/midori-browser.c:6219
+#: ../midori/midori-browser.c:6391
msgid "_Menu"
msgstr "_Menú"
-#: ../midori/midori-browser.c:6221
+#: ../midori/midori-browser.c:6393
msgid "Menu"
msgstr "Menú"
#. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:6425
+#: ../midori/midori-browser.c:6597
msgid "_Inline Find:"
msgstr "Cerca en _línia:"
-#: ../midori/midori-browser.c:6456
+#: ../midori/midori-browser.c:6628
msgid "Previous"
msgstr "Anterior"
-#: ../midori/midori-browser.c:6461
+#: ../midori/midori-browser.c:6633
msgid "Next"
msgstr "Següent"
-#: ../midori/midori-browser.c:6466
+#: ../midori/midori-browser.c:6638
msgid "Match Case"
msgstr "Coincidència de majúscules i minúscules"
-#: ../midori/midori-browser.c:6475
+#: ../midori/midori-browser.c:6647
msgid "Highlight Matches"
msgstr "Ressalta les coincidències"
-#: ../midori/midori-browser.c:6487
+#: ../midori/midori-browser.c:6659
msgid "Close Findbar"
msgstr "Tanca la barra de cerques"
-#: ../midori/midori-browser.c:6533 ../panels/midori-transfers.c:142
+#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141
msgid "Clear All"
msgstr "Netejar-ho tot"
-#: ../midori/midori-browser.c:6890
+#: ../midori/midori-browser.c:7063
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Opció inesperada «%s»"
-#: ../midori/midori-locationaction.c:375
+#: ../midori/midori-locationaction.c:377
#, c-format
msgid "Failed to select from history\n"
msgstr "No s'ha pogut seleccionar de l'historial\n"
-#: ../midori/midori-locationaction.c:453
+#: ../midori/midori-locationaction.c:459
#, c-format
msgid "Search for %s"
msgstr "Cercar %s"
-#: ../midori/midori-locationaction.c:476
+#: ../midori/midori-locationaction.c:482
#, c-format
msgid "Search with %s"
msgstr "Cerca amb %s"
-#: ../midori/midori-locationaction.c:1188
+#: ../midori/midori-locationaction.c:1197
#, c-format
msgid "Failed to execute database statement\n"
msgstr "No s'ha pogut executar la declaració de base de dades\n"
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1245
+#: ../midori/midori-locationaction.c:1254
msgid "Paste and p_roceed"
msgstr "Enganxa i _procedeix"
-#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435
+#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434
msgid "Detach chosen panel from the window"
msgstr "Desenganxar el panell triat de la finestra"
-#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447
-#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
+#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446
+#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642
msgid "Align sidepanel to the right"
msgstr "Alinear el panell lateral a la dreta"
-#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458
+#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457
msgid "Close panel"
msgstr "Tanca el quadre"
-#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644
+#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
msgid "Align sidepanel to the left"
msgstr "Alinear el panell lateral a l'esquerra"
-#: ../midori/midori-panel.c:798
+#: ../midori/midori-panel.c:797
msgid "Hide operating controls"
msgstr "Oculta els controls d'operació"
-#: ../midori/midori-websettings.c:207
+#: ../midori/midori-websettings.c:204
msgid "Show Blank page"
msgstr "Mostra pàgina en blanc"
-#: ../midori/midori-websettings.c:208
+#: ../midori/midori-websettings.c:205
msgid "Show Homepage"
msgstr "Mostra la pàgina d'inici"
-#: ../midori/midori-websettings.c:209
+#: ../midori/midori-websettings.c:206
msgid "Show last open tabs"
msgstr "Mostra les pestanyes obertes recentment"
-#: ../midori/midori-websettings.c:225
+#: ../midori/midori-websettings.c:222
msgid "Japanese (SHIFT_JIS)"
msgstr "Japonès (Shift_JIS)"
-#: ../midori/midori-websettings.c:245
+#: ../midori/midori-websettings.c:242
msgid "New tab"
msgstr "Nova pestanya"
-#: ../midori/midori-websettings.c:246
+#: ../midori/midori-websettings.c:243
msgid "New window"
msgstr "Nova finestra"
-#: ../midori/midori-websettings.c:247
+#: ../midori/midori-websettings.c:244
msgid "Current tab"
msgstr "Pestanya actual"
-#: ../midori/midori-websettings.c:262
+#: ../midori/midori-websettings.c:259
msgid "Default"
msgstr "Per defecte"
-#: ../midori/midori-websettings.c:263
+#: ../midori/midori-websettings.c:260
msgid "Icons"
msgstr "Icones"
-#: ../midori/midori-websettings.c:264
+#: ../midori/midori-websettings.c:261
msgid "Small icons"
msgstr "Icones petites"
-#: ../midori/midori-websettings.c:265
+#: ../midori/midori-websettings.c:262
msgid "Text"
msgstr "Text"
-#: ../midori/midori-websettings.c:266
+#: ../midori/midori-websettings.c:263
msgid "Icons and text"
msgstr "Icones i text"
-#: ../midori/midori-websettings.c:267
+#: ../midori/midori-websettings.c:264
msgid "Text beside icons"
msgstr "Text sota les icones"
-#: ../midori/midori-websettings.c:282
+#: ../midori/midori-websettings.c:279
+msgid "Automatic (GNOME or environment)"
+msgstr "Automàtic (GNOME o entorn)"
+
+#: ../midori/midori-websettings.c:280
+msgid "HTTP proxy server"
+msgstr "Servidor intermediari de HTTP"
+
+#: ../midori/midori-websettings.c:281
+msgid "No proxy server"
+msgstr "Sense servidor intermediari"
+
+#: ../midori/midori-websettings.c:296
msgid "All cookies"
msgstr "Totes les galetes"
-#: ../midori/midori-websettings.c:283
+#: ../midori/midori-websettings.c:297
msgid "Session cookies"
msgstr "Galetes de sessió"
-#: ../midori/midori-websettings.c:284 ../panels/midori-addons.c:98
-#: ../katze/katze-utils.c:663
+#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667
msgid "None"
msgstr "Cap"
-#: ../midori/midori-websettings.c:300
+#: ../midori/midori-websettings.c:314
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:301
+#: ../midori/midori-websettings.c:315
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:302
+#: ../midori/midori-websettings.c:316
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:303
+#: ../midori/midori-websettings.c:317
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:356
+#: ../midori/midori-websettings.c:370
msgid "Remember last window size"
msgstr "Recorda la mida de la darrera finestra"
-#: ../midori/midori-websettings.c:357
+#: ../midori/midori-websettings.c:371
msgid "Whether to save the last window size"
msgstr "Si voleu desar la mida de la finestra"
-#: ../midori/midori-websettings.c:365
+#: ../midori/midori-websettings.c:379
msgid "Last window width"
msgstr "Amplada de la darrera finestra"
-#: ../midori/midori-websettings.c:366
+#: ../midori/midori-websettings.c:380
msgid "The last saved window width"
msgstr "L'amplada emmagatzemada de la darrera finestra"
-#: ../midori/midori-websettings.c:374
+#: ../midori/midori-websettings.c:388
msgid "Last window height"
msgstr "Alçada de la darrera finestra"
-#: ../midori/midori-websettings.c:375
+#: ../midori/midori-websettings.c:389
msgid "The last saved window height"
msgstr "L'alçada emmagatzemada de la darrera finestra"
-#: ../midori/midori-websettings.c:400
+#: ../midori/midori-websettings.c:414
msgid "Last panel position"
msgstr "Posició del darrer panell"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:415
msgid "The last saved panel position"
msgstr "La posició emmagatzemada del darrer panell"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:424
msgid "Last panel page"
msgstr "Darrera pàgina del panell"
-#: ../midori/midori-websettings.c:411
+#: ../midori/midori-websettings.c:425
msgid "The last saved panel page"
msgstr "La darrera pàgina del panell emmagatzemada"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:433
msgid "Last Web search"
msgstr "Darrera cerca a la Web"
-#: ../midori/midori-websettings.c:420
+#: ../midori/midori-websettings.c:434
msgid "The last saved Web search"
msgstr "La darrera cerca a la Web emmagatzemada"
-#: ../midori/midori-websettings.c:429
+#: ../midori/midori-websettings.c:443
msgid "Show Menubar"
msgstr "Mostra la barra de menú"
-#: ../midori/midori-websettings.c:430
+#: ../midori/midori-websettings.c:444
msgid "Whether to show the menubar"
msgstr "Si es mostrarà la barra de menú"
-#: ../midori/midori-websettings.c:438
+#: ../midori/midori-websettings.c:452
msgid "Show Navigationbar"
msgstr "Mostra la barra de navegació"
-#: ../midori/midori-websettings.c:439
+#: ../midori/midori-websettings.c:453
msgid "Whether to show the navigationbar"
msgstr "Si es mostrarà la barra de navegació"
-#: ../midori/midori-websettings.c:447
+#: ../midori/midori-websettings.c:461
msgid "Show Bookmarkbar"
msgstr "Mostra la barra d'adreces d'interès"
-#: ../midori/midori-websettings.c:448
+#: ../midori/midori-websettings.c:462
msgid "Whether to show the bookmarkbar"
msgstr "Si es mostra la barra d'adreces d'interès"
-#: ../midori/midori-websettings.c:456
+#: ../midori/midori-websettings.c:470
msgid "Show Panel"
msgstr "Mostra el quadre"
-#: ../midori/midori-websettings.c:457
+#: ../midori/midori-websettings.c:471
msgid "Whether to show the panel"
msgstr "Si s'ha de mostrar el panell"
-#: ../midori/midori-websettings.c:472
+#: ../midori/midori-websettings.c:486
msgid "Show Transferbar"
msgstr "Mostra barra de fransferències"
-#: ../midori/midori-websettings.c:473
+#: ../midori/midori-websettings.c:487
msgid "Whether to show the transferbar"
msgstr "Si es mostrarà la barra de transferències"
-#: ../midori/midori-websettings.c:481
+#: ../midori/midori-websettings.c:495
msgid "Show Statusbar"
msgstr "Mostra la barra d'estat"
-#: ../midori/midori-websettings.c:482
+#: ../midori/midori-websettings.c:496
msgid "Whether to show the statusbar"
msgstr "Si es mostrarà la barra d'estat"
-#: ../midori/midori-websettings.c:491
+#: ../midori/midori-websettings.c:505
msgid "Toolbar Style:"
msgstr "Estil de la barra d'eines:"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:506
msgid "The style of the toolbar"
msgstr "L'estil de la barra d'eines"
-#: ../midori/midori-websettings.c:508
+#: ../midori/midori-websettings.c:522
msgid "Show progress in location entry"
msgstr "Mostrar el progrés a la caixa d'entrada de la localització"
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:523
msgid "Whether to show loading progress in the location entry"
msgstr "Si voleu mostrar el progrés de la càrrega en la caixa d'entrada de la localització"
-#: ../midori/midori-websettings.c:524
+#: ../midori/midori-websettings.c:538
msgid "Search engines in location completion"
msgstr "Motors de cerca per a completar la cerca"
-#: ../midori/midori-websettings.c:525
+#: ../midori/midori-websettings.c:539
msgid "Whether to show search engines in the location completion"
msgstr "Si es mostraran els motors de cerca a l'hora de completar la cerca"
-#: ../midori/midori-websettings.c:533
+#: ../midori/midori-websettings.c:547
msgid "Toolbar Items"
msgstr "Elements de la barra d'eines"
-#: ../midori/midori-websettings.c:534
+#: ../midori/midori-websettings.c:548
msgid "The items to show on the toolbar"
msgstr "Els elements que es mostraran a la barra d'eines"
-#: ../midori/midori-websettings.c:542
+#: ../midori/midori-websettings.c:556
msgid "Compact Sidepanel"
msgstr "Panell lateral compacte"
-#: ../midori/midori-websettings.c:543
+#: ../midori/midori-websettings.c:557
msgid "Whether to make the sidepanel compact"
msgstr "Si s'ha de compactar el panell lateral"
-#: ../midori/midori-websettings.c:558
+#: ../midori/midori-websettings.c:572
msgid "Show operating controls of the panel"
msgstr "Mostrar els controls d'operació del panell"
-#: ../midori/midori-websettings.c:559
+#: ../midori/midori-websettings.c:573
msgid "Whether to show the operating controls of the panel"
msgstr "Si s'ha de mostrar els controls d'operació del panell"
-#: ../midori/midori-websettings.c:574
+#: ../midori/midori-websettings.c:588
msgid "Align sidepanel on the right"
msgstr "La barra d'estat està a la dreta"
-#: ../midori/midori-websettings.c:575
+#: ../midori/midori-websettings.c:589
msgid "Whether to align the sidepanel on the right"
msgstr "Si s'ha d'alinear el panell lateral a la dreta"
-#: ../midori/midori-websettings.c:590
+#: ../midori/midori-websettings.c:604
msgid "Open panels in separate windows"
msgstr "Obre els quadres en finestres separades"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:605
msgid "Whether to always open panels in separate windows"
msgstr "Si s'ha d'obrir els quadres en finestres separades"
-#: ../midori/midori-websettings.c:600
+#: ../midori/midori-websettings.c:614
msgid "When Midori starts:"
msgstr "Quan Midori s'inicia:"
-#: ../midori/midori-websettings.c:601
+#: ../midori/midori-websettings.c:615
msgid "What to do when Midori starts"
msgstr "Què fer quan Midori s'iniciï"
-#: ../midori/midori-websettings.c:610
+#: ../midori/midori-websettings.c:624
msgid "Homepage:"
msgstr "Pàgina d'inici:"
-#: ../midori/midori-websettings.c:611
+#: ../midori/midori-websettings.c:625
msgid "The homepage"
msgstr "La pàgina d'inici"
-#: ../midori/midori-websettings.c:626
+#: ../midori/midori-websettings.c:640
msgid "Show crash dialog"
msgstr "Mostra el diàleg de fallades"
-#: ../midori/midori-websettings.c:627
+#: ../midori/midori-websettings.c:641
msgid "Show a dialog after Midori crashed"
msgstr "Mostra un diàleg quan Midori falli"
#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:643
+#: ../midori/midori-websettings.c:657
msgid "Show speed dial in new tabs"
msgstr "Mostrar el marcador ràpid a les noves pestanyes"
-#: ../midori/midori-websettings.c:644
+#: ../midori/midori-websettings.c:658
msgid "Show speed dial in newly opened tabs"
msgstr "Mostrar el marcatge ràpid a les noves pestanyes obertes"
-#: ../midori/midori-websettings.c:652
+#: ../midori/midori-websettings.c:666
msgid "Save downloaded files to:"
msgstr "Desar els fitxers descarregats a:"
-#: ../midori/midori-websettings.c:653
+#: ../midori/midori-websettings.c:667
msgid "The folder downloaded files are saved to"
msgstr "El directori on s'emmagatzemaran els fitxers descarregats"
-#: ../midori/midori-websettings.c:674
+#: ../midori/midori-websettings.c:688
msgid "Ask for the destination folder"
msgstr "Demanar per la carpeta destí"
-#: ../midori/midori-websettings.c:675
+#: ../midori/midori-websettings.c:689
msgid "Whether to ask for the destination folder when downloading a file"
msgstr "Si cal demanar una carpeta destí quan es descarregui un fitxer"
-#: ../midori/midori-websettings.c:694
+#: ../midori/midori-websettings.c:708
msgid "Notify when a transfer has been completed"
msgstr "Informa quan una transferència hagi finalitzat"
-#: ../midori/midori-websettings.c:695
+#: ../midori/midori-websettings.c:709
msgid "Whether to show a notification when a transfer has been completed"
msgstr "Si es mostra una notificació quan acabi una transferència"
-#: ../midori/midori-websettings.c:707
+#: ../midori/midori-websettings.c:721
msgid "Download Manager"
msgstr "Gestor de descàrregues"
-#: ../midori/midori-websettings.c:708
+#: ../midori/midori-websettings.c:722
msgid "An external download manager"
msgstr "Un gestor de descàrregues extern"
-#: ../midori/midori-websettings.c:716
+#: ../midori/midori-websettings.c:730
msgid "Text Editor"
msgstr "Editor de text"
-#: ../midori/midori-websettings.c:717
+#: ../midori/midori-websettings.c:731
msgid "An external text editor"
msgstr "Un editor de text extern"
-#: ../midori/midori-websettings.c:732
+#: ../midori/midori-websettings.c:746
msgid "News Aggregator"
msgstr "Acumulador de notícies"
-#: ../midori/midori-websettings.c:733
+#: ../midori/midori-websettings.c:747
msgid "An external news aggregator"
msgstr "Un acumulador de notícies extern"
-#: ../midori/midori-websettings.c:741
+#: ../midori/midori-websettings.c:755
msgid "Location entry Search"
msgstr "Ubicació que s'ha de cercar"
-#: ../midori/midori-websettings.c:742
+#: ../midori/midori-websettings.c:756
msgid "The search to perform inside the location entry"
msgstr "La cerca a executar dins l'entrada de la localització"
-#: ../midori/midori-websettings.c:750
+#: ../midori/midori-websettings.c:764
msgid "Preferred Encoding"
msgstr "La codificació preferida"
-#: ../midori/midori-websettings.c:751
+#: ../midori/midori-websettings.c:765
msgid "The preferred character encoding"
msgstr "Codificació de caràcters preferida"
-#: ../midori/midori-websettings.c:761
+#: ../midori/midori-websettings.c:775
msgid "Always Show Tabbar"
msgstr "Mostra sempre la barra d'eines"
-#: ../midori/midori-websettings.c:762
+#: ../midori/midori-websettings.c:776
msgid "Always show the tabbar"
msgstr "Mostra sempre la barra des pestanyes "
-#: ../midori/midori-websettings.c:770
+#: ../midori/midori-websettings.c:784
msgid "Close Buttons on Tabs"
msgstr "Mostra el botó de tancar a les pestanyes"
-#: ../midori/midori-websettings.c:771
+#: ../midori/midori-websettings.c:785
msgid "Whether tabs have close buttons"
msgstr "Si les pestanyes tenen botó de tancar"
-#: ../midori/midori-websettings.c:779
+#: ../midori/midori-websettings.c:793
msgid "Open new pages in:"
msgstr "Obre les noves pàgines a:"
-#: ../midori/midori-websettings.c:780
+#: ../midori/midori-websettings.c:794
msgid "Where to open new pages"
msgstr "On s'han d'obrir les pàgines noves"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:803
msgid "Open external pages in:"
msgstr "Obre pàgines externes a:"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:804
msgid "Where to open externally opened pages"
msgstr "On s'obren de forma externa les pàgines obertes"
-#: ../midori/midori-websettings.c:799
+#: ../midori/midori-websettings.c:813
msgid "Middle click opens Selection"
msgstr "Fer clic al botó central del ratolí obre la selecció"
-#: ../midori/midori-websettings.c:800
+#: ../midori/midori-websettings.c:814
msgid "Load an address from the selection via middle click"
msgstr "Carregar una adreça des de la selecció mitjançant el botó central del ratolí"
-#: ../midori/midori-websettings.c:808
+#: ../midori/midori-websettings.c:822
msgid "Open tabs in the background"
msgstr "Obre pestanyes al fons"
-#: ../midori/midori-websettings.c:809
+#: ../midori/midori-websettings.c:823
msgid "Whether to open new tabs in the background"
msgstr "Si s'ha d'obrir pestanyes al fons"
-#: ../midori/midori-websettings.c:817
+#: ../midori/midori-websettings.c:831
msgid "Open Tabs next to Current"
msgstr "Obre les pestanyes al costat de l'actual"
-#: ../midori/midori-websettings.c:818
+#: ../midori/midori-websettings.c:832
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr "Si obrir les noves pestanyes al costat de la pestanya actual o de l'última"
-#: ../midori/midori-websettings.c:826
+#: ../midori/midori-websettings.c:840
msgid "Open popups in tabs"
msgstr "Obre els missatges emergents en pestanyes"
-#: ../midori/midori-websettings.c:827
+#: ../midori/midori-websettings.c:841
msgid "Whether to open popup windows in tabs"
msgstr "Si s'han d'obrir els missatges emergents dins pestanyes"
-#: ../midori/midori-websettings.c:837 ../extensions/statusbar-features.c:88
+#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88
msgid "Load images automatically"
msgstr "Carrega les imatges automàticament"
-#: ../midori/midori-websettings.c:838
+#: ../midori/midori-websettings.c:852
msgid "Load and display images automatically"
msgstr "Carrega i mostra les imatges automàticament"
-#: ../midori/midori-websettings.c:845 ../extensions/statusbar-features.c:100
+#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100
msgid "Enable scripts"
msgstr "Habilita els scripts"
-#: ../midori/midori-websettings.c:846
+#: ../midori/midori-websettings.c:860
msgid "Enable embedded scripting languages"
msgstr "Habilita els llenguatges d'script incrustats"
-#: ../midori/midori-websettings.c:853 ../extensions/statusbar-features.c:112
+#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112
msgid "Enable Netscape plugins"
msgstr "Habilita els connectors de netscape"
-#: ../midori/midori-websettings.c:854
+#: ../midori/midori-websettings.c:868
msgid "Enable embedded Netscape plugin objects"
msgstr "Activar els objectes de connexió integrats de Netscape"
-#: ../midori/midori-websettings.c:870
+#: ../midori/midori-websettings.c:884
msgid "Enable HTML5 database support"
msgstr "Habilita la compatibilitat amb bases de dades HTML5"
-#: ../midori/midori-websettings.c:871
+#: ../midori/midori-websettings.c:885
msgid "Whether to enable HTML5 database support"
msgstr "Si s'habilitat la compatibilitat amb bases de dades HTML5"
-#: ../midori/midori-websettings.c:877
+#: ../midori/midori-websettings.c:891
msgid "Enable HTML5 local storage support"
msgstr "Habilita l'emmagatzematge local HTML5"
-#: ../midori/midori-websettings.c:878
+#: ../midori/midori-websettings.c:892
msgid "Whether to enable HTML5 local storage support"
msgstr "Si s'habilita l'emmagatzematge local HTML5"
-#: ../midori/midori-websettings.c:886
+#: ../midori/midori-websettings.c:900
msgid "Enable offline web application cache"
msgstr "Habilita la memòria cau d'aplicació de fora de línia"
-#: ../midori/midori-websettings.c:887
+#: ../midori/midori-websettings.c:901
msgid "Whether to enable offline web application cache"
msgstr "Si s'habilita la memòria cau d'aplicació de fora de línia"
-#: ../midori/midori-websettings.c:912
+#: ../midori/midori-websettings.c:926
msgid "Zoom Text and Images"
msgstr "Ampliar text i imatges"
-#: ../midori/midori-websettings.c:913
+#: ../midori/midori-websettings.c:927
msgid "Whether to zoom text and images"
msgstr "Si s'han d'ampliar text i imatges"
-#: ../midori/midori-websettings.c:928
+#: ../midori/midori-websettings.c:942
msgid "Find inline while typing"
msgstr "Buscar en línia mentre s'escriu"
-#: ../midori/midori-websettings.c:929
+#: ../midori/midori-websettings.c:943
msgid "Whether to automatically find inline while typing"
msgstr "Si es buscarà automàticament a mesura que s'escriu"
-#: ../midori/midori-websettings.c:944
+#: ../midori/midori-websettings.c:958
msgid "Kinetic scrolling"
msgstr "Desplaçament cinètic"
-#: ../midori/midori-websettings.c:945
+#: ../midori/midori-websettings.c:959
msgid "Whether scrolling should kinetically move according to speed"
msgstr "Si el desplaçament hauria de moure's de forma cinètica segons la velocitat"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:967
msgid "Accept cookies"
msgstr "Accepta galetes"
-#: ../midori/midori-websettings.c:954
+#: ../midori/midori-websettings.c:968
msgid "What type of cookies to accept"
msgstr "Quins tipus de galetes s'accepten"
-#: ../midori/midori-websettings.c:970
+#: ../midori/midori-websettings.c:984
msgid "Original cookies only"
msgstr "Només galetes originals"
-#: ../midori/midori-websettings.c:971
+#: ../midori/midori-websettings.c:985
msgid "Accept cookies from the original website only"
msgstr "Accepta només galetes del seu lloc web original"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:993
msgid "Maximum cookie age"
msgstr "Edat màxima de la galeta"
-#: ../midori/midori-websettings.c:980
+#: ../midori/midori-websettings.c:994
msgid "The maximum number of days to save cookies for"
msgstr "El nombre màxim de dies que es guardaran les galetes"
-#: ../midori/midori-websettings.c:997
+#: ../midori/midori-websettings.c:1011
msgid "Remember last visited pages"
msgstr "Recordar les darreres pàgines visitades"
-#: ../midori/midori-websettings.c:998
+#: ../midori/midori-websettings.c:1012
msgid "Whether the last visited pages are saved"
msgstr "Si les darreres pàgines visitades es desaran"
-#: ../midori/midori-websettings.c:1006
+#: ../midori/midori-websettings.c:1020
msgid "Maximum history age"
msgstr "Edat màxima de l'historial"
-#: ../midori/midori-websettings.c:1007
+#: ../midori/midori-websettings.c:1021
msgid "The maximum number of days to save the history for"
msgstr "Caducitat de l'historial"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1029
msgid "Remember last downloaded files"
msgstr "Recordar els darrers fitxers descarregats"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:1030
msgid "Whether the last downloaded files are saved"
msgstr "Si els darrers fitxers descarregats s'han d'emmagatzemar"
-#: ../midori/midori-websettings.c:1026
-msgid "Proxy Server"
+#: ../midori/midori-websettings.c:1047
+msgid "Proxy server"
msgstr "Servidor intermediari"
-#: ../midori/midori-websettings.c:1027
+#: ../midori/midori-websettings.c:1048
+msgid "The type of proxy server to use"
+msgstr "Tipus de servidor intermediari a fer servir"
+
+#: ../midori/midori-websettings.c:1057
+msgid "HTTP Proxy Server"
+msgstr "Servidor intermediari de HTTP"
+
+#: ../midori/midori-websettings.c:1058
msgid "The proxy server used for HTTP connections"
msgstr "El servidor proxy usat per a les connexions HTTP"
-#: ../midori/midori-websettings.c:1042
+#: ../midori/midori-websettings.c:1073
msgid "Detect proxy server automatically"
msgstr "Detecta automàticament el servidor intermediari"
-#: ../midori/midori-websettings.c:1043
+#: ../midori/midori-websettings.c:1074
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"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1059
+#: ../midori/midori-websettings.c:1090
msgid "Identify as"
msgstr "Identifica'l com a"
-#: ../midori/midori-websettings.c:1060
+#: ../midori/midori-websettings.c:1091
msgid "What to identify as to web pages"
msgstr "Què identificar com a pàgines web"
-#: ../midori/midori-websettings.c:1076
+#: ../midori/midori-websettings.c:1107
msgid "Identification string"
msgstr "Cadena de caràcters d'identificació"
-#: ../midori/midori-websettings.c:1077
+#: ../midori/midori-websettings.c:1108
msgid "The application identification string"
msgstr "La cadena d'identificació d'aplicacions"
-#: ../midori/midori-websettings.c:1092
+#: ../midori/midori-websettings.c:1123
msgid "Preferred languages"
msgstr "Idiomes preferits"
-#: ../midori/midori-websettings.c:1093
+#: ../midori/midori-websettings.c:1124
msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
msgstr "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:1108
+#: ../midori/midori-websettings.c:1139
msgid "Clear private data"
msgstr "Esborrar dades privades"
-#: ../midori/midori-websettings.c:1109
+#: ../midori/midori-websettings.c:1140
msgid "The private data selected for deletion"
msgstr "La selecció de dades privades per a esborrar"
@@ -1603,337 +1671,357 @@ msgstr "La selecció de dades privades per a esborrar"
#. 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:956 ../midori/midori-view.c:4185
-#: ../midori/midori-view.c:4189
+#: ../midori/midori-view.c:1242 ../midori/midori-view.c:4509
+#: ../midori/midori-view.c:4513
#, c-format
msgid "Error - %s"
msgstr "Error - %s"
-#: ../midori/midori-view.c:957
+#: ../midori/midori-view.c:1243
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "No s'ha pogut carregar la pàgina «%s»."
-#: ../midori/midori-view.c:962
+#: ../midori/midori-view.c:1245
msgid "Try again"
msgstr "Torneu-ho a provar"
#. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:1002
+#: ../midori/midori-view.c:1264
#, c-format
msgid "Not found - %s"
msgstr "No s'ha trobat «%s»"
-#: ../midori/midori-view.c:1225 ../midori/midori-view.c:2076
+#: ../midori/midori-view.c:1501 ../midori/midori-view.c:2338
#, c-format
msgid "Send a message to %s"
msgstr "Enviar un missatge a %s"
-#: ../midori/midori-view.c:1845 ../midori/midori-view.c:2238
+#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2500
msgid "Inspect _Element"
msgstr "Inspecciona l'_element"
-#: ../midori/midori-view.c:1897 ../midori/midori-view.c:1975
-msgid "Open _Link"
-msgstr "Obre l'_enllaç"
-
-#: ../midori/midori-view.c:1900 ../midori/midori-view.c:1977
+#: ../midori/midori-view.c:2172 ../midori/midori-view.c:2242
msgid "Open Link in New _Tab"
msgstr "Obre l'enllaç en una nova _pestanya"
-#: ../midori/midori-view.c:1904
+#: ../midori/midori-view.c:2176
msgid "Open Link in _Foreground Tab"
msgstr "Obre l'enllaç en una nova pestanya en primer _pla"
-#: ../midori/midori-view.c:1905
+#: ../midori/midori-view.c:2177
msgid "Open Link in _Background Tab"
msgstr "Obre l'enllaç en una nova pestanya _no activa"
-#: ../midori/midori-view.c:1908 ../midori/midori-view.c:1984
+#: ../midori/midori-view.c:2180 ../midori/midori-view.c:2249
msgid "Open Link in New _Window"
msgstr "Obre l'enllaç a una nova _finestra"
-#: ../midori/midori-view.c:1911
+#: ../midori/midori-view.c:2183
msgid "Open Link as Web A_pplication"
msgstr "Obre l'enllaç com si fos una _aplicació web"
-#: ../midori/midori-view.c:1914
+#: ../midori/midori-view.c:2186
msgid "Copy Link de_stination"
msgstr "_Copia la destinació de l'enllaç"
-#: ../midori/midori-view.c:1917 ../midori/midori-view.c:1996
+#: ../midori/midori-view.c:2189 ../midori/midori-view.c:2261
msgid "_Save Link destination"
msgstr "De_sa el destí de l'enllaç"
-#: ../midori/midori-view.c:1918 ../midori/midori-view.c:1990
+#: ../midori/midori-view.c:2190 ../midori/midori-view.c:2255
msgid "_Download Link destination"
msgstr "_Descarrega el destí de l'enllaç"
-#: ../midori/midori-view.c:1922 ../midori/midori-view.c:1958
-#: ../midori/midori-view.c:2001
+#: ../midori/midori-view.c:2194 ../midori/midori-view.c:2224
+#: ../midori/midori-view.c:2266
msgid "Download with Download _Manager"
msgstr "Descarrega amb el _gestor de descàrregues"
-#: ../midori/midori-view.c:1934
+#: ../midori/midori-view.c:2203
msgid "Open _Image in New Tab"
msgstr "Obre la _imatge en una nova pestanya"
-#: ../midori/midori-view.c:1937
-msgid "Open Image in New Wi_ndow"
-msgstr "Obre la imatge en una nova fi_nestra"
-
-#: ../midori/midori-view.c:1940
+#: ../midori/midori-view.c:2206
msgid "Copy Image _Address"
msgstr "Copia l'_adreça de la imatge"
-#: ../midori/midori-view.c:1943
+#: ../midori/midori-view.c:2209
msgid "Save I_mage"
msgstr "Desa la i_matge"
-#: ../midori/midori-view.c:1944
+#: ../midori/midori-view.c:2210
msgid "Download I_mage"
msgstr "Descarrega la i_matge"
-#: ../midori/midori-view.c:1951
+#: ../midori/midori-view.c:2217
msgid "Copy Video _Address"
msgstr "Copia l'_adreça del vídeo"
-#: ../midori/midori-view.c:1954
+#: ../midori/midori-view.c:2220
msgid "Save _Video"
msgstr "Desa el _vídeo"
-#: ../midori/midori-view.c:1954
+#: ../midori/midori-view.c:2220
msgid "Download _Video"
msgstr "Descarrega el _vídeo"
-#: ../midori/midori-view.c:2021
+#: ../midori/midori-view.c:2283
msgid "Search _with"
msgstr "Cerca _amb"
-#: ../midori/midori-view.c:2056 ../midori/midori-view.c:2063
+#: ../midori/midori-view.c:2318 ../midori/midori-view.c:2325
msgid "_Search the Web"
msgstr "_Cerca la Web"
-#: ../midori/midori-view.c:2084
+#: ../midori/midori-view.c:2346
msgid "Open Address in New _Tab"
msgstr "Obre l'adreça en una nova _pestanya"
-#: ../midori/midori-view.c:2370
+#: ../midori/midori-view.c:2643
msgid "Open or download file"
msgstr "Obre o descarrega el fitxer"
-#: ../midori/midori-view.c:2393
+#: ../midori/midori-view.c:2662
#, c-format
msgid "File Type: '%s'"
msgstr "Tipus de fitxer: «%s»"
-#: ../midori/midori-view.c:2396
+#: ../midori/midori-view.c:2665
#, c-format
msgid "File Type: %s ('%s')"
msgstr "Tipus de fitxer: %s («%s»)"
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2400
+#: ../midori/midori-view.c:2669
#, c-format
msgid "Open %s"
msgstr "Obre %s"
-#: ../midori/midori-view.c:2915
+#: ../midori/midori-view.c:3217
#, c-format
msgid "Inspect page - %s"
msgstr "Inspecciona la pàgina «%s»"
-#: ../midori/midori-view.c:3176
+#: ../midori/midori-view.c:3482
msgid "Speed dial"
msgstr "Marcador ràpid"
-#: ../midori/midori-view.c:3177
+#: ../midori/midori-view.c:3483
msgid "Click to add a shortcut"
msgstr "Feu clic per a afegir una drecera"
-#: ../midori/midori-view.c:3178
+#: ../midori/midori-view.c:3484
msgid "Enter shortcut address"
msgstr "Introduïu l'adreça de la drecera"
-#: ../midori/midori-view.c:3179
+#: ../midori/midori-view.c:3485
msgid "Enter shortcut title"
msgstr "Introduïu un títol per a la drecera"
-#: ../midori/midori-view.c:3180
+#: ../midori/midori-view.c:3486
msgid "Are you sure you want to delete this shortcut?"
msgstr "Esteu segur d'esborrar aquesta drecera?"
-#: ../midori/midori-view.c:3216
+#: ../midori/midori-view.c:3487
+msgid "Set number of columns"
+msgstr "Estableix el nombre de columnes"
+
+#: ../midori/midori-view.c:3488
+msgid "Enter number of columns:"
+msgstr "Introduïu el nombre de columnes:"
+
+#: ../midori/midori-view.c:3489
+msgid "Set number of shortcuts"
+msgstr "Estableix el nombre de dreceres"
+
+#: ../midori/midori-view.c:3490
+msgid "Enter number of shortcuts:"
+msgstr "Introduïeu el nombre de dreceres:"
+
+#: ../midori/midori-view.c:3516
#, c-format
msgid "Document cannot be displayed"
msgstr "El document no es pot mostrar"
-#: ../midori/midori-view.c:3239
+#: ../midori/midori-view.c:3539
#, c-format
msgid "No documentation installed"
msgstr "No s'ha instaŀlat la documentació"
-#: ../midori/midori-view.c:3462
+#: ../midori/midori-view.c:3789
msgid "Blank page"
msgstr "Pàgina en blanc"
-#: ../midori/midori-view.c:3722
+#: ../midori/midori-view.c:4049
msgid "_Duplicate Tab"
msgstr "_Duplica la pestanya"
-#: ../midori/midori-view.c:3727
+#: ../midori/midori-view.c:4054
msgid "_Restore Tab"
msgstr "_Restaura la pestanya"
-#: ../midori/midori-view.c:3727
+#: ../midori/midori-view.c:4054
msgid "_Minimize Tab"
msgstr "_Minimitza la pestanya"
-#: ../midori/midori-view.c:3733
+#: ../midori/midori-view.c:4060
msgid "Close ot_her Tabs"
msgstr "Tanca la _resta de pestanyes"
-#: ../midori/midori-view.c:4357
+#: ../midori/midori-view.c:4681
msgid "Print background images"
msgstr "Imprimeix les imatges de fons"
-#: ../midori/midori-view.c:4358
+#: ../midori/midori-view.c:4682
msgid "Whether background images should be printed"
msgstr "Si s'han d'imprimir les imatges de fons"
-#: ../midori/midori-view.c:4410 ../midori/midori-preferences.c:382
+#: ../midori/midori-view.c:4734 ../midori/midori-preferences.c:381
msgid "Features"
msgstr "Característiques"
#. Page "General"
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:298
msgid "General"
msgstr "General"
-#: ../midori/midori-preferences.c:300
+#: ../midori/midori-preferences.c:299
msgid "Startup"
msgstr "Inicialització"
-#: ../midori/midori-preferences.c:315 ../midori/midori-preferences.c:322
+#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321
msgid "Use current page as homepage"
msgstr "Empra la pàgina actual com a pàgina d'inici"
-#: ../midori/midori-preferences.c:332 ../panels/midori-transfers.c:87
+#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Transferències"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:350
+#: ../midori/midori-preferences.c:349
msgid "Appearance"
msgstr "Aparença"
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:350
msgid "Font settings"
msgstr "Paràmetres del tipus de lletra"
-#: ../midori/midori-preferences.c:353
+#: ../midori/midori-preferences.c:352
msgid "Default Font Family"
msgstr "Família de tipus de lletra per defecte"
-#: ../midori/midori-preferences.c:356
+#: ../midori/midori-preferences.c:355
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:359
+#: ../midori/midori-preferences.c:358
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:361
+#: ../midori/midori-preferences.c:360
msgid "Fixed-width Font Family"
msgstr "Família de tipus de lletra d'amplada fixa"
-#: ../midori/midori-preferences.c:364
+#: ../midori/midori-preferences.c:363
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:367
+#: ../midori/midori-preferences.c:366
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:369
+#: ../midori/midori-preferences.c:368
msgid "Minimum Font Size"
msgstr "Mida mínima del tipus de lletra"
-#: ../midori/midori-preferences.c:372
+#: ../midori/midori-preferences.c:371
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:381
+#: ../midori/midori-preferences.c:380
msgid "Behavior"
msgstr "Comportament"
-#: ../midori/midori-preferences.c:394
+#: ../midori/midori-preferences.c:393
msgid "Enforce 96 dots per inch"
msgstr "Força 96 PPP"
-#: ../midori/midori-preferences.c:395
+#: ../midori/midori-preferences.c:394
msgid "Enforce a video dot density of 96 DPI"
msgstr "Força una densitat de punt de 96 PPP"
#: ../midori/midori-preferences.c:414
+msgid "Allow scripts to open popups"
+msgstr "Permetre als scripts obrir finestres emergents"
+
+#: ../midori/midori-preferences.c:415
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Si els scripts poden obrir finestres emergents de forma automàtica"
+
+#: ../midori/midori-preferences.c:419
msgid "Spell Checking"
msgstr "Corrector ortogràfic"
-#: ../midori/midori-preferences.c:417
+#: ../midori/midori-preferences.c:422
msgid "Enable Spell Checking"
msgstr "Habilita el corrector ortogràfic"
-#: ../midori/midori-preferences.c:418
+#: ../midori/midori-preferences.c:423
msgid "Enable spell checking while typing"
msgstr "Activa la comprovació ortogràfica mentre s'escriu"
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:425
msgid "Spelling dictionaries:"
msgstr "Diccionaris:"
#. i18n: The example should be adjusted to contain a good local default
-#: ../midori/midori-preferences.c:424
+#: ../midori/midori-preferences.c:429
msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\""
msgstr "Una llista d'idiomes separats per coma que seran usats per a la correcció ortogràfica, per exemple \"ca_ES,en_GB,de_DE\""
#. Page "Interface"
-#: ../midori/midori-preferences.c:430
+#: ../midori/midori-preferences.c:435
msgid "Interface"
msgstr "Interfície"
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:436
msgid "Navigationbar"
msgstr "Barra de navegació"
-#: ../midori/midori-preferences.c:441
+#: ../midori/midori-preferences.c:446
msgid "Browsing"
msgstr "Navegant"
#. Page "Applications"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:468
msgid "Applications"
msgstr "Aplicacions"
-#: ../midori/midori-preferences.c:464
+#: ../midori/midori-preferences.c:469
msgid "External applications"
msgstr "Aplicacions externes"
#. Page "Network"
-#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481
+#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486
msgid "Network"
msgstr "Xarxa"
+#: ../midori/midori-preferences.c:492
+msgid "Hostname"
+msgstr "Nom del host"
+
#. Page "Privacy"
-#: ../midori/midori-preferences.c:505
+#: ../midori/midori-preferences.c:511
msgid "Privacy"
msgstr "Privacitat"
-#: ../midori/midori-preferences.c:506
+#: ../midori/midori-preferences.c:512
msgid "Web Cookies"
msgstr "Galetes de web"
-#: ../midori/midori-preferences.c:515 ../midori/midori-preferences.c:529
+#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535
msgid "days"
msgstr "dies"
@@ -1965,81 +2053,67 @@ msgstr "Gestiona els ginys de cerca"
msgid "Use as _default"
msgstr "Empra'l per _defecte"
-#: ../midori/sokoke.c:1255
+#: ../midori/sokoke.c:1294
msgid "_Bookmark"
msgstr "_Adreça d'interès"
-#: ../midori/sokoke.c:1257
+#: ../midori/sokoke.c:1296
msgid "Add Boo_kmark"
msgstr "Afegeix adreça d'_interès"
-#: ../midori/sokoke.c:1258
+#: ../midori/sokoke.c:1297
msgid "_Console"
msgstr "_Consola"
-#: ../midori/sokoke.c:1259
+#: ../midori/sokoke.c:1298
msgid "_Extensions"
msgstr "_Extensions"
-#: ../midori/sokoke.c:1260
+#: ../midori/sokoke.c:1299
msgid "_History"
msgstr "_Historial"
-#: ../midori/sokoke.c:1261
+#: ../midori/sokoke.c:1300
msgid "_Homepage"
msgstr "_Pàgina d'inici"
-#: ../midori/sokoke.c:1262
+#: ../midori/sokoke.c:1301
msgid "_Userscripts"
msgstr "Scripts d'_usuari"
-#: ../midori/sokoke.c:1263
+#: ../midori/sokoke.c:1302
msgid "New _Tab"
msgstr "Nova _pestanya"
-#: ../midori/sokoke.c:1264
+#: ../midori/sokoke.c:1303
msgid "_Transfers"
msgstr "_Transferències"
-#: ../midori/sokoke.c:1265
+#: ../midori/sokoke.c:1304
msgid "Netscape p_lugins"
msgstr "_Connectors de Netscape"
-#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144
-msgid "Userscripts"
-msgstr "Scripts d'usuari"
-
-#: ../panels/midori-addons.c:100
-msgid "Userstyles"
-msgstr "Estils d'usuari"
-
-#: ../panels/midori-addons.c:305
-#, c-format
-msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-msgstr "Copia els guions d'usuari a la carpeta %s i copia els estils d'usuari a la carpeta %s."
-
-#: ../panels/midori-addons.c:911
-#, c-format
-msgid "Can't monitor folder '%s': %s"
-msgstr "No es pot seguir la pista de la carpeta «%s»: %s"
+#: ../midori/sokoke.c:1307
+msgid "New _Folder"
+msgstr "Nova _carpeta"
#: ../panels/midori-bookmarks.c:111
msgid "Bookmarks"
msgstr "Adreces d'interès"
-#: ../panels/midori-bookmarks.c:250
+#: ../panels/midori-bookmarks.c:241
msgid "Edit the selected bookmark"
msgstr "Edita l'adreça d'interès seleccionada"
-#: ../panels/midori-bookmarks.c:258
+#: ../panels/midori-bookmarks.c:249
msgid "Delete the selected bookmark"
msgstr "Suprimeix l'adreça d'interès seleccionada"
-#: ../panels/midori-bookmarks.c:278
+#: ../panels/midori-bookmarks.c:262
msgid "Add a new folder"
msgstr "Afegeix una carpeta nova"
-#: ../panels/midori-bookmarks.c:608
+#: ../panels/midori-bookmarks.c:592
msgid "Separator"
msgstr "Separador"
@@ -2047,6 +2121,14 @@ msgstr "Separador"
msgid "Console"
msgstr "Consola"
+#: ../panels/midori-console.c:361
+msgid "Copy _All"
+msgstr "Copia _tot"
+
+#: ../panels/midori-console.c:362
+msgid "Copy All"
+msgstr "Copia tot"
+
#: ../panels/midori-extensions.c:91
msgid "Extensions"
msgstr "Extensions"
@@ -2082,28 +2164,28 @@ msgstr "Ahir"
msgid "Are you sure you want to remove all history items?"
msgstr "Voleu esborrar tots els elements de l’historial?"
-#: ../panels/midori-history.c:438
+#: ../panels/midori-history.c:437
msgid "Bookmark the selected history item"
msgstr "Afegeix l'element seleccionat de l'historial a les adreces d'interès"
-#: ../panels/midori-history.c:447
+#: ../panels/midori-history.c:446
msgid "Delete the selected history item"
msgstr "Esborra l'element de l'historial seleccionat"
-#: ../panels/midori-history.c:455
+#: ../panels/midori-history.c:454
msgid "Clear the entire history"
msgstr "Buida l'historial"
-#: ../panels/midori-history.c:953
+#: ../panels/midori-history.c:952
#: ../extensions/cookie-manager/cookie-manager-page.c:1144
msgid "Filter:"
msgstr "Filtre:"
-#: ../panels/midori-transfers.c:479
+#: ../panels/midori-transfers.c:478
msgid "Open Destination _Folder"
msgstr "_Obre la carpeta destí"
-#: ../panels/midori-transfers.c:482
+#: ../panels/midori-transfers.c:481
msgid "Copy Link Loc_ation"
msgstr "Copia la _localització de l'enllaç"
@@ -2131,30 +2213,30 @@ msgstr "Contrasenya"
msgid "_Remember password"
msgstr "_Recorda la contrasenya"
-#: ../katze/katze-throbber.c:842
+#: ../katze/katze-throbber.c:882
#, 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:855
+#: ../katze/katze-throbber.c:895
#, c-format
msgid "Stock icon '%s' couldn't be loaded"
msgstr "La icona «%s» no s'ha pogut carregar"
-#: ../katze/katze-throbber.c:923
+#: ../katze/katze-throbber.c:963
msgid "Animation frames are broken"
msgstr "Els marcs d'animació no funcionen correctament"
-#: ../katze/katze-utils.c:494 ../katze/katze-utils.c:889
+#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "La propietat «%s» no és vàlida per a %s"
-#: ../katze/katze-utils.c:540 ../katze/katze-utils.c:569
+#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573
msgid "Choose file"
msgstr "Seleccioneu fitxer"
-#: ../katze/katze-utils.c:555
+#: ../katze/katze-utils.c:559
msgid "Choose folder"
msgstr "Seleccioneu carpeta"
@@ -2163,48 +2245,79 @@ msgstr "Seleccioneu carpeta"
msgid "Preferences for %s"
msgstr "Preferències per a %s"
-#: ../extensions/adblock.c:398
+#: ../extensions/adblock.c:415
msgid "Configure Advertisement filters"
msgstr "Configura els filtres de publicitat"
-#: ../extensions/adblock.c:430
+#: ../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 "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:570
+#: ../extensions/adblock.c:587
msgid "Configure _Advertisement filters..."
msgstr "Configura els filtres de _publicitat…"
-#: ../extensions/adblock.c:818
+#: ../extensions/adblock.c:841
msgid "Edit rule"
msgstr "Edita la regla"
-#: ../extensions/adblock.c:831
+#: ../extensions/adblock.c:854
msgid "_Rule:"
msgstr "_Regla:"
-#: ../extensions/adblock.c:885
+#: ../extensions/adblock.c:908
msgid "Bl_ock image"
msgstr "Bl_oca imatge"
-#: ../extensions/adblock.c:890
+#: ../extensions/adblock.c:913
msgid "Bl_ock link"
msgstr "Bl_oca enllaç"
-#: ../extensions/adblock.c:1447
+#: ../extensions/adblock.c:1489
msgid "Advertisement blocker"
msgstr "Bloqueig de publicitat"
-#: ../extensions/adblock.c:1448
+#: ../extensions/adblock.c:1490
msgid "Block advertisements according to a filter list"
msgstr "Bloca els anuncis publicitaris segons una llista de filtres"
-#: ../extensions/colorful-tabs.c:136
+#: ../extensions/addons.c:122
+#, c-format
+msgid "Copy %s to the folder %s."
+msgstr "Copia «%s» a la carpeta «%s»."
+
+#: ../extensions/addons.c:177
+msgid "Userscripts"
+msgstr "Scripts d'usuari"
+
+#: ../extensions/addons.c:179
+msgid "Userstyles"
+msgstr "Estils d'usuari"
+
+#: ../extensions/addons.c:1085
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr "No s'ha pogut desar la configuració de l'extensió «%s»: %s\n"
+
+#: ../extensions/addons.c:1086 ../extensions/addons.c:1253
+msgid "User addons"
+msgstr "Afegitons de l'usuari"
+
+#: ../extensions/addons.c:1210
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "No es pot seguir la pista de la carpeta «%s»: %s"
+
+#: ../extensions/addons.c:1254
+msgid "Support for userscripts and userstyles"
+msgstr "Adment l'ús d'scripts i estils d'usuari"
+
+#: ../extensions/colorful-tabs.c:204
msgid "Colorful Tabs"
msgstr "Pestanyes de colors"
-#: ../extensions/colorful-tabs.c:137
+#: ../extensions/colorful-tabs.c:205
msgid "Tint each tab distinctly"
msgstr "Aplica un color diferent a cadascuna de les pestanyes"
@@ -2303,11 +2416,11 @@ msgstr "_Gestor de galetes"
msgid "List, view and delete cookies"
msgstr "Llista, mostra i borra galetes"
-#: ../extensions/feed-panel/feed-atom.c:237
+#: ../extensions/feed-panel/feed-atom.c:209
msgid "Failed to find required Atom \"entry\" elements in XML data."
msgstr "No s'han pogut trobar elements Atom \"entry\" en les dades XML."
-#: ../extensions/feed-panel/feed-atom.c:343
+#: ../extensions/feed-panel/feed-atom.c:315
msgid "Failed to find required Atom \"feed\" elements in XML data."
msgstr "No s'han pogut trobar elements Atom \"feed\" en les dades XML."
@@ -2318,19 +2431,19 @@ msgctxt "Feed"
msgid "Last updated: %s."
msgstr "Darrera actualització: %s."
-#: ../extensions/feed-panel/feed-panel.c:667
+#: ../extensions/feed-panel/feed-panel.c:671
msgid "Feeds"
msgstr "Canals"
-#: ../extensions/feed-panel/feed-panel.c:720
+#: ../extensions/feed-panel/feed-panel.c:724
msgid "Add new feed"
msgstr "Afegeix un nou canal"
-#: ../extensions/feed-panel/feed-panel.c:727
+#: ../extensions/feed-panel/feed-panel.c:731
msgid "Delete feed"
msgstr "Suprimeix el canal"
-#: ../extensions/feed-panel/feed-panel.c:810
+#: ../extensions/feed-panel/feed-panel.c:814
msgid "_Feeds"
msgstr "_Canals"
@@ -2409,11 +2522,11 @@ msgstr "Els fitxers de recursos no estan instaŀlats"
msgid "Form history filler"
msgstr "Omple el formulari de l'historial"
-#: ../extensions/mouse-gestures.c:288
+#: ../extensions/mouse-gestures.c:303
msgid "Mouse Gestures"
msgstr "Gesticulacions de ratolí"
-#: ../extensions/mouse-gestures.c:289
+#: ../extensions/mouse-gestures.c:304
msgid "Control Midori by moving the mouse"
msgstr "Controla Midori usant el ratolí"
@@ -2466,23 +2579,23 @@ msgstr "Característiques de la la barra d'estat"
msgid "Easily toggle features on web pages on and off"
msgstr "Activa o desactiva fàcilment funcionalitats en planes web"
-#: ../extensions/tab-panel.c:565 ../extensions/tab-panel.c:622
+#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625
msgid "Tab Panel"
msgstr "Quadre de pestanyes"
-#: ../extensions/tab-panel.c:606
+#: ../extensions/tab-panel.c:609
msgid "T_ab Panel"
msgstr "Quadre de _pestanyes"
-#: ../extensions/tab-panel.c:623
+#: ../extensions/tab-panel.c:626
msgid "Show tabs in a vertical panel"
msgstr "Mostra les pestanyes en un quadre vertical"
-#: ../extensions/tab-switcher.c:394
+#: ../extensions/tab-switcher.c:395
msgid "Tab History List"
msgstr "Pestanya amb la llista de l'historial"
-#: ../extensions/tab-switcher.c:395
+#: ../extensions/tab-switcher.c:396
msgid "Allows to switch tabs by choosing from a list sorted by last usage"
msgstr "Permet canviar de pestanya triant-la d'una llista ordenada pel darrer ús"
@@ -2500,7 +2613,7 @@ msgstr "Elements disponibles"
#: ../extensions/toolbar-editor.c:442
msgid "Displayed Items"
-msgstr "Elements Mostrats"
+msgstr "Elements mostrats"
#: ../extensions/toolbar-editor.c:577
msgid "Customize _Toolbar..."
@@ -2518,6 +2631,15 @@ msgstr "Edita fàcilment la distribució de la barra d'eines"
msgid "Cache HTTP communication on disk"
msgstr "Empra el disc com a memòria cau de comunicacions HTTP"
+#~ 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."
+
+#~ msgid "Open _Link"
+#~ msgstr "Obre l'_enllaç"
+
+#~ msgid "Open Image in New Wi_ndow"
+#~ msgstr "Obre la imatge en una nova fi_nestra"
+
#~ msgid "Not available on this platform"
#~ msgstr "No disponible en aquesta plataforma"
diff --git a/po/cs.po b/po/cs.po
index 3e1aef26..e7afbf95 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,13 +2,13 @@
# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER
# This file is distributed under the same license as the home package.
# David Stancl 2009
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: midori 0.2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-03 06:06+0100\n"
-"PO-Revision-Date: 2010-03-03 07:59+0100\n"
+"POT-Creation-Date: 2010-05-24 04:07+0000\n"
+"PO-Revision-Date: 2010-05-04 08:08+0200\n"
"Last-Translator: David Štancl \n"
"Language-Team: Czech < >\n"
"MIME-Version: 1.0\n"
@@ -22,9 +22,9 @@ msgstr ""
msgid "Lightweight web browser"
msgstr "Odlehčený prohlížeč"
-#: ../data/midori.desktop.in.h:2 ../midori/main.c:1307 ../midori/main.c:1538
-#: ../midori/main.c:1546 ../midori/main.c:1562
-#: ../midori/midori-websettings.c:299
+#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664
+#: ../midori/main.c:1672 ../midori/main.c:1688
+#: ../midori/midori-websettings.c:313
msgid "Midori"
msgstr "Midori"
@@ -32,181 +32,198 @@ msgstr "Midori"
msgid "Web Browser"
msgstr "Internetový prohlížeč"
-#: ../midori/main.c:96
+#: ../midori/main.c:102
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Konfigurace nemůže být načtena: %s\n"
-#: ../midori/main.c:145
+#: ../midori/main.c:151
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Hodnota '%s' je pro %s špatná"
-#: ../midori/main.c:152 ../midori/main.c:238
+#: ../midori/main.c:158 ../midori/main.c:244
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Nesprávná hodnota '%s' v konfiguraci"
-#: ../midori/main.c:364 ../extensions/formhistory.c:446
+#: ../midori/main.c:370 ../extensions/formhistory.c:446
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Nepodařilo se otevřít databázi: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:419
+#: ../midori/main.c:425
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Nepodařilo se odstranit staré položky historie: %s\n"
-#: ../midori/main.c:439
+#: ../midori/main.c:445
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Konfigurace nemůže být uložena. %s"
-#: ../midori/main.c:477
+#: ../midori/main.c:483
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Vyhledávací nástroj nemůže být uložen. %s"
-#: ../midori/main.c:496 ../midori/main.c:546 ../midori/main.c:566
+#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572
#, c-format
msgid "The bookmarks couldn't be saved. %s"
msgstr "Záložky nemohou být uloženy. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:596 ../midori/main.c:619
+#: ../midori/main.c:602 ../midori/main.c:625
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Seznam zavřených karet nemůže být uložen. %s"
-#: ../midori/main.c:683 ../midori/main.c:898
+#: ../midori/main.c:684 ../midori/main.c:924
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Sezení nemůže být uloženo. %s"
-#: ../midori/main.c:932
-msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
-msgstr ""
-"Zdá se, že Midori nebylo naposledy řádně ukončeno. Jestliže se to stává "
-"opakovaně, pro odstranění problému zkuste následující možnosti."
+#: ../midori/main.c:868
+msgid "No root certificate file is available. SSL certificates cannot be verified."
+msgstr "Nejsou k dispozici žádné kořenové certifikáty. SSL certifikáty nemohou být ověřovány."
-#: ../midori/main.c:947
+#: ../midori/main.c:958
+msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem."
+msgstr "Zdá se, že Midori nebylo naposledy řádně ukončeno. Jestliže se to stává opakovaně, pro odstranění problému zkuste následující možnosti."
+
+#: ../midori/main.c:973
msgid "Modify _preferences"
msgstr "Změnit _nastavení"
-#: ../midori/main.c:951
+#: ../midori/main.c:977
msgid "Reset the last _session"
msgstr "Vymazat poslední _sezení"
-#: ../midori/main.c:956
+#: ../midori/main.c:982
msgid "Disable all _extensions"
msgstr "Zakázat všechna _rozšíření"
-#: ../midori/main.c:1191 ../midori/main.c:1802
+#: ../midori/main.c:1217 ../midori/main.c:1937
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Sezení nemůže být načteno: %s\n"
-#: ../midori/main.c:1307
+#: ../midori/main.c:1336
msgid "No filename specified"
msgstr "Nebyl zadán název souboru"
-#: ../midori/main.c:1326
+#: ../midori/main.c:1355
msgid "An unknown error occured."
msgstr "Nastala neznámá chyba."
-#: ../midori/main.c:1357
+#: ../midori/main.c:1386
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Snímek uložen do %s\n"
-#: ../midori/main.c:1440
+#: ../midori/main.c:1557
msgid "Run ADDRESS as a web application"
-msgstr "Spustit ADDRESS jako webovou aplikaci"
+msgstr "Spustit ADRESA jako webovou aplikaci"
-#: ../midori/main.c:1440
+#: ../midori/main.c:1557
msgid "ADDRESS"
-msgstr "ADDRESS"
+msgstr "ADRESA"
-#: ../midori/main.c:1443
+#: ../midori/main.c:1560
msgid "Use FOLDER as configuration folder"
-msgstr "Použít FOLDER jako místo pro uložení konfigurace"
+msgstr "Použít SLOŽKA jako místo pro uložení konfigurace"
-#: ../midori/main.c:1443
+#: ../midori/main.c:1560
msgid "FOLDER"
-msgstr "FOLDER"
+msgstr "SLOŽKA"
-#: ../midori/main.c:1446
+#: ../midori/main.c:1563
msgid "Show a diagnostic dialog"
msgstr "Zobrazit dialog po pádu"
-#: ../midori/main.c:1448
+#: ../midori/main.c:1565
msgid "Run the specified filename as javascript"
msgstr "Spustit jako javascript"
-#: ../midori/main.c:1451
+#: ../midori/main.c:1568
msgid "Take a snapshot of the specified URI"
msgstr "Získat snímek požadovaného URI"
-#: ../midori/main.c:1454
+#: ../midori/main.c:1571
msgid "Execute the specified command"
msgstr "Spustit vybraný příkaz"
-#: ../midori/main.c:1456
+#: ../midori/main.c:1573
msgid "Display program version"
msgstr "Zobrazit verzi programu"
-#: ../midori/main.c:1458
+#: ../midori/main.c:1575
msgid "Addresses"
msgstr "Adresy"
-#: ../midori/main.c:1535
+#: ../midori/main.c:1577
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Blokovat adresy (URI) pomocí regulárního výrazu REGVÝRAZ"
+
+#: ../midori/main.c:1577
+msgid "PATTERN"
+msgstr "REGVÝRAZ"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:1581
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Restartovat Midori po VTEŘINY vteřin neaktivity"
+
+#: ../midori/main.c:1581
+msgid "SECONDS"
+msgstr "VTEŘINY"
+
+#: ../midori/main.c:1661
msgid "[Addresses]"
msgstr "[Adresy]"
-#: ../midori/main.c:1563
+#: ../midori/main.c:1689
msgid "Please report comments, suggestions and bugs to:"
msgstr "Komentáře, požadavky a chyby posílejte na:"
-#: ../midori/main.c:1565
+#: ../midori/main.c:1691
msgid "Check for new versions at:"
msgstr "Zkontrolujte, zda není nová verze na "
-#: ../midori/main.c:1653
+#: ../midori/main.c:1788
msgid "The specified configuration folder is invalid."
msgstr "Vybraný konfigurační adresář je neplatný."
-#: ../midori/main.c:1701
+#: ../midori/main.c:1836
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Midori sice již běží, ale neodpovídá.\n"
-#: ../midori/main.c:1756
+#: ../midori/main.c:1891
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Vyhledávací nástroje nemohou být načteny.%s\n"
-#: ../midori/main.c:1785
+#: ../midori/main.c:1920
#, c-format
msgid "The bookmarks couldn't be loaded: %s\n"
msgstr "Záložky nemohou být načteny: %s\n"
-#: ../midori/main.c:1817
+#: ../midori/main.c:1952
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Zavřené karty nemohou být načteny: %s\n"
-#: ../midori/main.c:1831
+#: ../midori/main.c:1966
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Historie nemůže být načtena: %s\n"
-#: ../midori/main.c:1845
+#: ../midori/main.c:1980
msgid "The following errors occured:"
msgstr "Došlo k následujícím chybám:"
-#: ../midori/main.c:1861
+#: ../midori/main.c:1996
msgid "_Ignore"
msgstr "_Ignorovat"
@@ -223,1391 +240,1436 @@ msgstr "Nesprávný formát dokumentu."
msgid "Unrecognized bookmark format."
msgstr "Neznámý formát záložek."
-#: ../midori/midori-array.c:718 ../midori/sokoke.c:1076
+#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115
#, c-format
msgid "Writing failed."
msgstr "Nepodařilo se zapsat."
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5407
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575
+#: ../midori/midori-browser.c:5581
msgid "Reload the current page"
msgstr "Znovu načíst stránku"
-#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578
msgid "Stop loading the current page"
msgstr "Zastavit načítání stránky"
-#: ../midori/midori-browser.c:452
+#: ../midori/midori-browser.c:460
#, c-format
msgid "%d%% loaded"
msgstr "%d%% načteno"
-#: ../midori/midori-browser.c:490
+#: ../midori/midori-browser.c:498
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Nepodařilo se zaktualizovat titulek: %s\n"
-#: ../midori/midori-browser.c:504
+#: ../midori/midori-browser.c:512
#, c-format
msgid "Unexpected action '%s'."
msgstr "Neočekávaná akce '%s'."
-#: ../midori/midori-browser.c:711
+#: ../midori/midori-browser.c:728
msgid "New folder"
msgstr "Nový adresář"
-#: ../midori/midori-browser.c:711
+#: ../midori/midori-browser.c:728
msgid "Edit folder"
msgstr "Upravit adresář"
-#: ../midori/midori-browser.c:713
+#: ../midori/midori-browser.c:730
msgid "New bookmark"
msgstr "Nová záložka"
-#: ../midori/midori-browser.c:713
+#: ../midori/midori-browser.c:730
msgid "Edit bookmark"
msgstr "Upravit záložku"
-#: ../midori/midori-browser.c:744
+#: ../midori/midori-browser.c:761
msgid "_Title:"
msgstr "_Nadpis:"
-#: ../midori/midori-browser.c:757 ../midori/midori-searchaction.c:961
+#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961
msgid "_Description:"
msgstr "_Popis:"
-#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:975
+#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975
#: ../extensions/feed-panel/main.c:376
msgid "_Address:"
msgstr "_Adresa:"
-#: ../midori/midori-browser.c:806 ../midori/midori-browser.c:4567
+#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731
msgid "_Folder:"
msgstr "_Adresář:"
-#: ../midori/midori-browser.c:816 ../midori/midori-browser.c:896
-#: ../midori/midori-browser.c:4572 ../midori/midori-browser.c:4604
+#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928
+#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768
msgid "Toplevel folder"
msgstr "Hlavní adresář"
-#: ../midori/midori-browser.c:845
+#: ../midori/midori-browser.c:864
+msgid "Add to _Speed Dial"
+msgstr "Přidat do rychlého _přístupu"
+
+#: ../midori/midori-browser.c:877
msgid "Show in the tool_bar"
msgstr "Zobrazit v _nástrojové liště"
-#: ../midori/midori-browser.c:860
+#: ../midori/midori-browser.c:892
msgid "Run as _web application"
msgstr "Spustit jako _webovou aplikaci"
-#: ../midori/midori-browser.c:976 ../midori/midori-browser.c:4622
-#: ../midori/midori-browser.c:4651
+#: ../midori/midori-browser.c:986
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Není dost místa pro stažení \"%s\"."
+
+#: ../midori/midori-browser.c:990
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Požadováno je %s, ale k dispozici jen %s."
+
+#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786
+#: ../midori/midori-browser.c:4818
msgid "Save file as"
msgstr "Uložit soubor jako"
-#: ../midori/midori-browser.c:1350 ../panels/midori-transfers.c:271
+#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270
#, c-format
msgid "%s of %s"
msgstr "%s z %s"
-#: ../midori/midori-browser.c:1386
+#: ../midori/midori-browser.c:1456
#, c-format
msgid "The file '%s' has been downloaded."
msgstr "Soubor %s byl stažen."
-#: ../midori/midori-browser.c:1390
+#: ../midori/midori-browser.c:1460
msgid "Transfer completed"
msgstr "Přenos dokončen"
-#: ../midori/midori-browser.c:1530
+#: ../midori/midori-browser.c:1600
msgid "Save file"
msgstr "Uložit soubor"
-#: ../midori/midori-browser.c:2244
+#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919
+msgid "Some files are being downloaded"
+msgstr "Ještě se stahují nějaké soubory."
+
+#: ../midori/midori-browser.c:1923
+msgid "_Quit Midori"
+msgstr "U_končit Midori"
+
+#: ../midori/midori-browser.c:1925
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Jestliže bude Midori ukončeno, stahování se stornuje."
+
+#: ../midori/midori-browser.c:2386
msgid "Open file"
msgstr "Otevřít soubor"
-#: ../midori/midori-browser.c:2320 ../extensions/feed-panel/main.c:364
+#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364
msgid "New feed"
msgstr "Nový kanál"
-#: ../midori/midori-browser.c:2361 ../midori/midori-browser.c:5472
-#: ../panels/midori-bookmarks.c:242
+#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640
+#: ../panels/midori-bookmarks.c:233
msgid "Add a new bookmark"
msgstr "Přidat novou záložku"
-#: ../midori/midori-browser.c:2918 ../panels/midori-history.c:332
+#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332
#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465
#, c-format
msgid "Failed to execute database statement: %s\n"
msgstr "Nepodařilo se spustit databázový příkaz: %s\n"
-#: ../midori/midori-browser.c:2998 ../midori/midori-searchaction.c:484
+#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484
msgid "Empty"
msgstr "Prázdné"
-#: ../midori/midori-browser.c:3618 ../midori/sokoke.c:400
-#: ../midori/sokoke.c:410 ../midori/sokoke.c:438 ../midori/sokoke.c:464
-#: ../midori/sokoke.c:478
+#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398
+#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462
+#: ../midori/sokoke.c:476
msgid "Could not run external program."
msgstr "Nemohu spustit externí program."
-#: ../midori/midori-browser.c:3932 ../midori/midori-browser.c:5864
+#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034
#, 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:4264 ../panels/midori-bookmarks.c:795
-#: ../panels/midori-history.c:751
+#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779
+#: ../panels/midori-history.c:750
msgid "Open all in _Tabs"
msgstr "Otevřít všechny v _kartách"
-#: ../midori/midori-browser.c:4271 ../panels/midori-bookmarks.c:801
-#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545
+#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785
+#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545
msgid "Open in New _Tab"
msgstr "Otevřít v nové _kartě"
-#: ../midori/midori-browser.c:4274 ../panels/midori-bookmarks.c:803
-#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547
+#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787
+#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547
msgid "Open in New _Window"
msgstr "Otevřít v novém _okně"
-#: ../midori/midori-browser.c:4493
+#: ../midori/midori-browser.c:4657
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4494
+#: ../midori/midori-browser.c:4658
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4495
+#: ../midori/midori-browser.c:4659
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4496
+#: ../midori/midori-browser.c:4660
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4497
+#: ../midori/midori-browser.c:4661
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4518 ../panels/midori-bookmarks.c:271
+#: ../midori/midori-browser.c:4682
msgid "Import bookmarks..."
msgstr "Importovat záložky..."
-#: ../midori/midori-browser.c:4521 ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645
msgid "_Import bookmarks"
msgstr "_Importovat záložky"
-#: ../midori/midori-browser.c:4532
+#: ../midori/midori-browser.c:4696
msgid "_Application:"
msgstr "_Aplikace:"
-#: ../midori/midori-browser.c:4559 ../midori/midori-browser.c:5579
-#: ../midori/midori-websettings.c:230 ../midori/midori-websettings.c:304
-#: ../katze/katze-utils.c:687
+#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749
+#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318
+#: ../katze/katze-utils.c:691
msgid "Custom..."
msgstr "Vlastní..."
-#: ../midori/midori-browser.c:4633
+#: ../midori/midori-browser.c:4797
msgid "Failed to import bookmarks"
msgstr "Nepodařilo se naimportovat záložky"
-#: ../midori/midori-browser.c:4666
+#: ../midori/midori-browser.c:4833
msgid "Failed to export bookmarks"
msgstr "Nepodařilo se exportovat záložky"
-#: ../midori/midori-browser.c:4720 ../panels/midori-history.c:141
+#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141
#: ../panels/midori-history.c:171
#, c-format
msgid "Failed to remove history item: %s\n"
msgstr "Nepodařilo se odstranit položku historie: %s\n"
-#: ../midori/midori-browser.c:4826
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-browser.c:4994
msgid "Clear Private Data"
msgstr "Vymazat osobní data"
-#: ../midori/midori-browser.c:4830
+#: ../midori/midori-browser.c:4998
msgid "_Clear private data"
msgstr "_Vymazat osobní data"
-#: ../midori/midori-browser.c:4844
+#: ../midori/midori-browser.c:5012
msgid "Clear the following data:"
msgstr "Vymazat následující data:"
-#: ../midori/midori-browser.c:4855 ../midori/midori-preferences.c:524
+#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530
#: ../panels/midori-history.c:119
msgid "History"
msgstr "Historie"
-#: ../midori/midori-browser.c:4861
+#: ../midori/midori-browser.c:5029
msgid "Cookies"
msgstr "cookies"
-#: ../midori/midori-browser.c:4866
+#: ../midori/midori-browser.c:5034
msgid "'Flash' Cookies"
msgstr "cookies z flashe"
-#: ../midori/midori-browser.c:4871
+#: ../midori/midori-browser.c:5039
msgid "Website icons"
msgstr "Ikony stránek"
-#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1266
+#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305
msgid "_Closed Tabs"
msgstr "_Zavřené karty"
-#: ../midori/midori-browser.c:4881 ../extensions/web-cache.c:464
+#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464
msgid "Web Cache"
msgstr "Keš stránek"
-#: ../midori/midori-browser.c:4889
+#: ../midori/midori-browser.c:5057
msgid "Clear private data when _quitting Midori"
msgstr "_Vymazat osobní data při ukončení Midori"
-#: ../midori/midori-browser.c:4997
+#: ../midori/midori-browser.c:5158
msgid "A lightweight web browser."
msgstr "Odlehčený internetový prohlížeč."
-#: ../midori/midori-browser.c:5013
+#: ../midori/midori-browser.c:5160
+msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version."
+msgstr "Tato knihovna je svobodný software; můžete ji distribuovat anebo měnit podle práv GNU Lesser General Public License jak byla publikována Free Software Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze."
+
+#: ../midori/midori-browser.c:5179
msgid "translator-credits"
msgstr "David Štancl "
-#: ../midori/midori-browser.c:5320
+#: ../midori/midori-browser.c:5488
msgid "_File"
msgstr "_Soubor"
-#: ../midori/midori-browser.c:5322 ../midori/sokoke.c:1267
+#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306
msgid "New _Window"
msgstr "Nové _okno"
-#: ../midori/midori-browser.c:5323
+#: ../midori/midori-browser.c:5491
msgid "Open a new window"
msgstr "Otevřít nové okno"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5494
msgid "Open a new tab"
msgstr "Otevřít novou kartu"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5496
msgid "P_rivate Browsing"
msgstr "Sou_kromé prohlížení"
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5497
msgid "Don't save any private data while browsing"
msgstr "Neukládat při prohlížení žádná data"
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5501
msgid "Open a file"
msgstr "Otevřít soubor"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5504
msgid "Save to a file"
msgstr "Uložit do souboru"
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5506
msgid "Add to Speed _dial"
msgstr "Přidat do rychlého _přístupu"
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5507
msgid "Add shortcut to speed dial"
msgstr "Přidá záložku do rychlého přístupu"
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5509
msgid "Add Shortcut to the _desktop"
msgstr "Přidat záložku na _plochu"
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5510
msgid "Add shortcut to the desktop"
msgstr "Přidá záložku na plochu"
-#: ../midori/midori-browser.c:5344
+#: ../midori/midori-browser.c:5512
msgid "Subscribe to News _feed"
msgstr "Přidat _kanál"
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5513
msgid "Subscribe to this news feed"
msgstr "Přidá tento kanál do odebíraných kanálů"
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5518
msgid "_Close Tab"
msgstr "_Zavřít kartu"
-#: ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:5519
msgid "Close the current tab"
msgstr "Zavřít aktivní kartu"
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:5521
msgid "C_lose Window"
msgstr "Za_vřít okno"
-#: ../midori/midori-browser.c:5354
+#: ../midori/midori-browser.c:5522
msgid "Close this window"
msgstr "Zavřít toto okno"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5525
msgid "Print the current page"
msgstr "Vytisknout aktuální stránku"
-#: ../midori/midori-browser.c:5360
+#: ../midori/midori-browser.c:5528
msgid "Quit the application"
msgstr "Ukončit aplikaci"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5530
msgid "_Edit"
msgstr "_Upravit"
-#: ../midori/midori-browser.c:5366
+#: ../midori/midori-browser.c:5534
msgid "Undo the last modification"
msgstr "Vrátit zpět poslední změnu"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5537
msgid "Redo the last modification"
msgstr "Vrátit poslední změnu"
-#: ../midori/midori-browser.c:5373
+#: ../midori/midori-browser.c:5541
msgid "Cut the selected text"
msgstr "Vystříhnout vybraný text"
-#: ../midori/midori-browser.c:5376 ../midori/midori-browser.c:5379
+#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547
msgid "Copy the selected text"
msgstr "Zkopírovat vybraný text"
-#: ../midori/midori-browser.c:5382
+#: ../midori/midori-browser.c:5550
msgid "Paste text from the clipboard"
msgstr "Vložit text ze schránky"
-#: ../midori/midori-browser.c:5385
+#: ../midori/midori-browser.c:5553
msgid "Delete the selected text"
msgstr "Smazat vybraný text"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5556
msgid "Select all text"
msgstr "Vybrat vše"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5559
msgid "Find a word or phrase in the page"
msgstr "Najít slovo nebo frázi na stránce"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5561
msgid "Find _Next"
msgstr "Najít _další"
-#: ../midori/midori-browser.c:5394
+#: ../midori/midori-browser.c:5562
msgid "Find the next occurrence of a word or phrase"
msgstr "Najít další výskyt slova nebo fráze"
-#: ../midori/midori-browser.c:5396
+#: ../midori/midori-browser.c:5564
msgid "Find _Previous"
msgstr "Najít _předchozí"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5565
msgid "Find the previous occurrence of a word or phrase"
msgstr "Najít předchozí výskyt slova nebo fráze"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5569
msgid "Configure the application preferences"
msgstr "Změnit nastavení aplikace"
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5571
msgid "_View"
msgstr "_Zobrazit"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5572
msgid "_Toolbars"
msgstr "_Lišty"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5584
msgid "Increase the zoom level"
msgstr "Přiblížit"
-#: ../midori/midori-browser.c:5419
+#: ../midori/midori-browser.c:5587
msgid "Decrease the zoom level"
msgstr "Oddálit"
-#: ../midori/midori-browser.c:5422
+#: ../midori/midori-browser.c:5590
msgid "Reset the zoom level"
msgstr "Nastavit původní přiblížení"
-#: ../midori/midori-browser.c:5423
+#: ../midori/midori-browser.c:5591
msgid "_Encoding"
msgstr "_Kódování"
-#: ../midori/midori-browser.c:5425
+#: ../midori/midori-browser.c:5593
msgid "View So_urce"
msgstr "Zobrazit zdrojový _kód"
-#: ../midori/midori-browser.c:5426
+#: ../midori/midori-browser.c:5594
msgid "View the source code of the page"
msgstr "Zobrazí zdrojový kód stránky"
-#: ../midori/midori-browser.c:5429
+#: ../midori/midori-browser.c:5597
msgid "Toggle fullscreen view"
msgstr "Přepnout zobrazení na celou obrazovku"
-#: ../midori/midori-browser.c:5432
+#: ../midori/midori-browser.c:5600
msgid "Scroll _Left"
msgstr "Rolovat v_levo"
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5601
msgid "Scroll to the left"
msgstr "Posunout pohled vlevo"
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5603
msgid "Scroll _Down"
msgstr "Rolovat _dolů"
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5604
msgid "Scroll down"
msgstr "Posunout pohled dolů"
-#: ../midori/midori-browser.c:5438
+#: ../midori/midori-browser.c:5606
msgid "Scroll _Up"
msgstr "Rolovat nahor_u"
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5607
msgid "Scroll up"
msgstr "Posunout pohled nahoru"
-#: ../midori/midori-browser.c:5441
+#: ../midori/midori-browser.c:5609
msgid "Scroll _Right"
msgstr "Rolovat vp_ravo"
-#: ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:5610
msgid "Scroll to the right"
msgstr "Posunout pohled vpravo"
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5613
msgid "_Go"
msgstr "_Přejít"
-#: ../midori/midori-browser.c:5448
+#: ../midori/midori-browser.c:5616
msgid "Go back to the previous page"
msgstr "Přejít zpět (na předchozí stránku)"
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5619
msgid "Go forward to the next page"
msgstr "Přejít vpřed (na následující stránku)"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5455
+#: ../midori/midori-browser.c:5623
msgid "Go to the previous sub-page"
msgstr "Přejít na předchozí podstránku"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5459
+#: ../midori/midori-browser.c:5627
msgid "Go to the next sub-page"
msgstr "Přejít na následující podstránku"
-#: ../midori/midori-browser.c:5462
+#: ../midori/midori-browser.c:5630
msgid "Go to your homepage"
msgstr "Přejít na domovskou stránku"
-#: ../midori/midori-browser.c:5464
+#: ../midori/midori-browser.c:5632
msgid "Empty Trash"
msgstr "Vyprázdnit seznam zavřených karet"
-#: ../midori/midori-browser.c:5465
+#: ../midori/midori-browser.c:5633
msgid "Delete the contents of the trash"
msgstr "Vymaže seznam zavřených karet"
-#: ../midori/midori-browser.c:5467
+#: ../midori/midori-browser.c:5635
msgid "Undo _Close Tab"
msgstr "Vrátit _zavření karty"
-#: ../midori/midori-browser.c:5468
+#: ../midori/midori-browser.c:5636
msgid "Open the last closed tab"
msgstr "Otevře naposledy zavřenou kartu"
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5642
msgid "Add a new _folder"
msgstr "Přidat novou _složku"
-#: ../midori/midori-browser.c:5475
+#: ../midori/midori-browser.c:5643
msgid "Add a new bookmark folder"
msgstr "Přidá novou složku do záložek"
-#: ../midori/midori-browser.c:5480
+#: ../midori/midori-browser.c:5648
msgid "_Export bookmarks"
msgstr "_Exportovat záložky"
-#: ../midori/midori-browser.c:5483 ../midori/midori-searchaction.c:493
+#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493
msgid "_Manage Search Engines"
msgstr "Nastavit _vyhledávací nástroje"
-#: ../midori/midori-browser.c:5484
+#: ../midori/midori-browser.c:5652
msgid "Add, edit and remove search engines..."
msgstr "Přidává, upravuje a maže vyhledávací nástroje..."
-#: ../midori/midori-browser.c:5487
+#: ../midori/midori-browser.c:5655
msgid "_Clear Private Data"
msgstr "_Vymazat osobní data"
-#: ../midori/midori-browser.c:5488
+#: ../midori/midori-browser.c:5656
msgid "Clear private data..."
msgstr "Vymaže osobní data..."
-#: ../midori/midori-browser.c:5492
+#: ../midori/midori-browser.c:5660
msgid "_Inspect Page"
msgstr "Pro_zkoumat stránku"
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5661
msgid "Inspect page details and access developer tools..."
msgstr "Zobrazí stránku ve vývojářském nástroji..."
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5666
msgid "_Previous Tab"
msgstr "_Předchozí karta"
-#: ../midori/midori-browser.c:5499
+#: ../midori/midori-browser.c:5667
msgid "Switch to the previous tab"
msgstr "Přepnout na předchozí kartu"
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5669
msgid "_Next Tab"
msgstr "_Další karta"
-#: ../midori/midori-browser.c:5502
+#: ../midori/midori-browser.c:5670
msgid "Switch to the next tab"
msgstr "Přepnout na další kartu"
-#: ../midori/midori-browser.c:5504
+#: ../midori/midori-browser.c:5672
msgid "Focus _Current Tab"
msgstr "Zaměřit _aktuální kartu"
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5673
msgid "Focus the current tab"
msgstr "Zaměří aktuální kartu"
-#: ../midori/midori-browser.c:5507
+#: ../midori/midori-browser.c:5675
msgid "Open last _session"
msgstr "Otevřít poslední _sezení"
-#: ../midori/midori-browser.c:5508
+#: ../midori/midori-browser.c:5676
msgid "Open the tabs saved in the last session"
msgstr "Otevře karty uložené při posledním sezení"
-#: ../midori/midori-browser.c:5510
+#: ../midori/midori-browser.c:5678
msgid "_Help"
msgstr "_Nápověda"
-#: ../midori/midori-browser.c:5512
+#: ../midori/midori-browser.c:5680
msgid "_Contents"
msgstr "_Obsah"
-#: ../midori/midori-browser.c:5513
+#: ../midori/midori-browser.c:5681
msgid "Show the documentation"
msgstr "Zobrazit dokumentaci"
-#: ../midori/midori-browser.c:5515
+#: ../midori/midori-browser.c:5683
msgid "_Frequent Questions"
msgstr "Časté _otázky"
-#: ../midori/midori-browser.c:5516
+#: ../midori/midori-browser.c:5684
msgid "Show the Frequently Asked Questions"
msgstr "Zobrazí často kladené otázky (FAQ)"
-#: ../midori/midori-browser.c:5518
+#: ../midori/midori-browser.c:5686
msgid "_Report a Bug"
msgstr "Ohlásit chy_bu"
-#: ../midori/midori-browser.c:5519
+#: ../midori/midori-browser.c:5687
msgid "Open Midori's bug tracker"
msgstr "Otevře stránku pro hlášení chyb"
-#: ../midori/midori-browser.c:5522
+#: ../midori/midori-browser.c:5690
msgid "Show information about the program"
msgstr "Zobrazí informace o programu"
-#: ../midori/midori-browser.c:5529
+#: ../midori/midori-browser.c:5698
msgid "_Menubar"
msgstr "_Nabídka"
-#: ../midori/midori-browser.c:5530
+#: ../midori/midori-browser.c:5699
msgid "Show menubar"
msgstr "Zobrazit nabídku"
-#: ../midori/midori-browser.c:5533
+#: ../midori/midori-browser.c:5702
msgid "_Navigationbar"
msgstr "_Navigační lišta"
-#: ../midori/midori-browser.c:5534
+#: ../midori/midori-browser.c:5703
msgid "Show navigationbar"
msgstr "Zobrazit navigační lištu"
-#: ../midori/midori-browser.c:5537
+#: ../midori/midori-browser.c:5706
msgid "Side_panel"
msgstr "Boční _panel"
-#: ../midori/midori-browser.c:5538
+#: ../midori/midori-browser.c:5707
msgid "Show sidepanel"
msgstr "Zobrazit boční panel"
-#: ../midori/midori-browser.c:5541
+#: ../midori/midori-browser.c:5710
msgid "_Bookmarkbar"
msgstr "Lišta _záložek"
-#: ../midori/midori-browser.c:5542
+#: ../midori/midori-browser.c:5711
msgid "Show bookmarkbar"
msgstr "Zobrazit lištu se záložkami"
-#: ../midori/midori-browser.c:5545
+#: ../midori/midori-browser.c:5714
msgid "_Transferbar"
msgstr "Stav _přenosu"
-#: ../midori/midori-browser.c:5546
+#: ../midori/midori-browser.c:5715
msgid "Show transferbar"
msgstr "Zobrazit stav přenosu dat"
-#: ../midori/midori-browser.c:5549
+#: ../midori/midori-browser.c:5718
msgid "_Statusbar"
msgstr "_Stavová lišta"
-#: ../midori/midori-browser.c:5550
+#: ../midori/midori-browser.c:5719
msgid "Show statusbar"
msgstr "Zobrazit stavovou lištu"
-#: ../midori/midori-browser.c:5557
+#: ../midori/midori-browser.c:5727
msgid "_Automatic"
msgstr "_Automatické"
-#: ../midori/midori-browser.c:5560 ../midori/midori-websettings.c:224
+#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221
msgid "Chinese (BIG5)"
msgstr "Čínské (BIG5)"
-#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
-#: ../midori/midori-browser.c:5564
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5734
msgid "Japanese (SHIFT__JIS)"
msgstr "Japonské (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5567 ../midori/midori-websettings.c:226
+#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223
msgid "Korean (EUC-KR)"
msgstr "Korejské (EUC-KR)"
-#: ../midori/midori-browser.c:5570 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224
msgid "Russian (KOI8-R)"
msgstr "Ruské (KOI8-R)"
-#: ../midori/midori-browser.c:5573 ../midori/midori-websettings.c:228
+#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5576 ../midori/midori-websettings.c:229
+#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226
msgid "Western (ISO-8859-1)"
msgstr "Západní (ISO-8859-1)"
-#: ../midori/midori-browser.c:6124
+#: ../midori/midori-browser.c:6294
msgid "_Separator"
msgstr "_Oddělovač"
-#: ../midori/midori-browser.c:6131
+#: ../midori/midori-browser.c:6301
msgid "_Location..."
msgstr "U_místění..."
-#: ../midori/midori-browser.c:6133
+#: ../midori/midori-browser.c:6303
msgid "Open a particular location"
msgstr "Otevřít umístění"
-#: ../midori/midori-browser.c:6157
+#: ../midori/midori-browser.c:6327
msgid "_Web Search..."
msgstr "_Hledat na webu..."
-#: ../midori/midori-browser.c:6159
+#: ../midori/midori-browser.c:6329
msgid "Run a web search"
msgstr "Spustí vyhledávání na webu"
-#: ../midori/midori-browser.c:6180
+#: ../midori/midori-browser.c:6350
msgid "Reopen a previously closed tab or window"
msgstr "Znovu otevřít zavřenou kartu nebo okno"
-#: ../midori/midori-browser.c:6195
+#: ../midori/midori-browser.c:6365
msgid "_Recently visited pages"
msgstr "_Naposledy navštívené stránky"
-#: ../midori/midori-browser.c:6197
+#: ../midori/midori-browser.c:6367
msgid "Reopen pages that you visited earlier"
msgstr "Znovu otevře stránky, které jste již navštívili"
-#: ../midori/midori-browser.c:6212 ../midori/sokoke.c:1256
+#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295
msgid "_Bookmarks"
msgstr "_Záložky"
-#: ../midori/midori-browser.c:6214
+#: ../midori/midori-browser.c:6384
msgid "Show the saved bookmarks"
msgstr "Zobrazit uložené záložky"
-#: ../midori/midori-browser.c:6229
+#: ../midori/midori-browser.c:6399
msgid "_Tools"
msgstr "Ná_stroje"
-#: ../midori/midori-browser.c:6242
+#: ../midori/midori-browser.c:6412
msgid "_Window"
msgstr "_Okno"
-#: ../midori/midori-browser.c:6244
+#: ../midori/midori-browser.c:6414
msgid "Show a list of all open tabs"
msgstr "Zobrazit seznam všech otevřených karet"
-#: ../midori/midori-browser.c:6258
+#: ../midori/midori-browser.c:6428
msgid "_Menu"
msgstr "_Nabídka"
-#: ../midori/midori-browser.c:6260
+#: ../midori/midori-browser.c:6430
msgid "Menu"
msgstr "Nabídka"
#. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:6464
+#: ../midori/midori-browser.c:6634
msgid "_Inline Find:"
msgstr "_Rychlé hledání"
-#: ../midori/midori-browser.c:6495
+#: ../midori/midori-browser.c:6665
msgid "Previous"
msgstr "Předchozí"
-#: ../midori/midori-browser.c:6500
+#: ../midori/midori-browser.c:6670
msgid "Next"
msgstr "Následující"
-#: ../midori/midori-browser.c:6505
+#: ../midori/midori-browser.c:6675
msgid "Match Case"
msgstr "Rozlišovat velikost"
-#: ../midori/midori-browser.c:6514
+#: ../midori/midori-browser.c:6684
msgid "Highlight Matches"
msgstr "Zvýraznit nalezené"
-#: ../midori/midori-browser.c:6526
+#: ../midori/midori-browser.c:6696
msgid "Close Findbar"
msgstr "Zavřít vyhledávací lištu"
-#: ../midori/midori-browser.c:6572 ../panels/midori-transfers.c:142
+#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141
msgid "Clear All"
msgstr "Smazat vše"
-#: ../midori/midori-browser.c:6929
+#: ../midori/midori-browser.c:7100
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Neočekávané nastavení '%s'"
-#: ../midori/midori-locationaction.c:375
+#: ../midori/midori-locationaction.c:377
#, c-format
msgid "Failed to select from history\n"
msgstr "Nepodařilo se načíst údaje z historie\n"
-#: ../midori/midori-locationaction.c:453
+#: ../midori/midori-locationaction.c:459
#, c-format
msgid "Search for %s"
msgstr "Vyhledat %s"
-#: ../midori/midori-locationaction.c:476
+#: ../midori/midori-locationaction.c:482
#, c-format
msgid "Search with %s"
msgstr "Hledat %s"
-#: ../midori/midori-locationaction.c:1188
+#: ../midori/midori-locationaction.c:1197
#, c-format
msgid "Failed to execute database statement\n"
msgstr "Nepodařilo se spustit databázový příkaz\n"
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1245
+#: ../midori/midori-locationaction.c:1254
msgid "Paste and p_roceed"
msgstr "Vložit a s_pustit"
-#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435
+#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434
msgid "Detach chosen panel from the window"
msgstr "Oddělit vybraný panel od okna"
-#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447
-#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
+#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446
+#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642
msgid "Align sidepanel to the right"
msgstr "Umístit boční panel vpravo"
-#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458
+#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457
msgid "Close panel"
msgstr "Zavřít panel"
-#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644
+#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
msgid "Align sidepanel to the left"
msgstr "Umístit boční panel vlevo"
-#: ../midori/midori-panel.c:798
+#: ../midori/midori-panel.c:797
msgid "Hide operating controls"
msgstr "Schovat ovládací prvky"
-#: ../midori/midori-websettings.c:207
+#: ../midori/midori-websettings.c:204
msgid "Show Blank page"
msgstr "zobrazit prázdnou stránku"
-#: ../midori/midori-websettings.c:208
+#: ../midori/midori-websettings.c:205
msgid "Show Homepage"
msgstr "zobrazit domovskou stránku"
-#: ../midori/midori-websettings.c:209
+#: ../midori/midori-websettings.c:206
msgid "Show last open tabs"
msgstr "zobrazit naposledy otevřené karty"
-#: ../midori/midori-websettings.c:225
+#: ../midori/midori-websettings.c:222
msgid "Japanese (SHIFT_JIS)"
msgstr "Japonské (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:245
+#: ../midori/midori-websettings.c:242
msgid "New tab"
msgstr "nové kartě"
-#: ../midori/midori-websettings.c:246
+#: ../midori/midori-websettings.c:243
msgid "New window"
msgstr "novém okně"
-#: ../midori/midori-websettings.c:247
+#: ../midori/midori-websettings.c:244
msgid "Current tab"
msgstr "aktuální kartě"
-#: ../midori/midori-websettings.c:262
+#: ../midori/midori-websettings.c:259
msgid "Default"
msgstr "výchozí"
-#: ../midori/midori-websettings.c:263
+#: ../midori/midori-websettings.c:260
msgid "Icons"
msgstr "ikony"
-#: ../midori/midori-websettings.c:264
+#: ../midori/midori-websettings.c:261
msgid "Small icons"
msgstr "malé ikony"
-#: ../midori/midori-websettings.c:265
+#: ../midori/midori-websettings.c:262
msgid "Text"
msgstr "text"
-#: ../midori/midori-websettings.c:266
+#: ../midori/midori-websettings.c:263
msgid "Icons and text"
msgstr "ikony a text"
-#: ../midori/midori-websettings.c:267
+#: ../midori/midori-websettings.c:264
msgid "Text beside icons"
msgstr "text pod ikonami"
-#: ../midori/midori-websettings.c:282
+#: ../midori/midori-websettings.c:279
+msgid "Automatic (GNOME or environment)"
+msgstr "automaticky (GNOME, nebo jiné prostředí)"
+
+#: ../midori/midori-websettings.c:280
+msgid "HTTP proxy server"
+msgstr "HTTP proxy server"
+
+#: ../midori/midori-websettings.c:281
+msgid "No proxy server"
+msgstr "žádný"
+
+#: ../midori/midori-websettings.c:296
msgid "All cookies"
msgstr "všechna cookies"
-#: ../midori/midori-websettings.c:283
+#: ../midori/midori-websettings.c:297
msgid "Session cookies"
msgstr "cookies sezení"
-#: ../midori/midori-websettings.c:284 ../panels/midori-addons.c:98
-#: ../katze/katze-utils.c:663
+#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667
msgid "None"
msgstr "žádná"
-#: ../midori/midori-websettings.c:300
+#: ../midori/midori-websettings.c:314
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:301
+#: ../midori/midori-websettings.c:315
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:302
+#: ../midori/midori-websettings.c:316
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:303
+#: ../midori/midori-websettings.c:317
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:356
+#: ../midori/midori-websettings.c:370
msgid "Remember last window size"
msgstr "Pamatovat si velikost okna"
-#: ../midori/midori-websettings.c:357
+#: ../midori/midori-websettings.c:371
msgid "Whether to save the last window size"
msgstr "Ukládat rozměry okna?"
-#: ../midori/midori-websettings.c:365
+#: ../midori/midori-websettings.c:379
msgid "Last window width"
msgstr "Šířka okna"
-#: ../midori/midori-websettings.c:366
+#: ../midori/midori-websettings.c:380
msgid "The last saved window width"
msgstr "Naposledy uložená šířka okna"
-#: ../midori/midori-websettings.c:374
+#: ../midori/midori-websettings.c:388
msgid "Last window height"
msgstr "Výška okna"
-#: ../midori/midori-websettings.c:375
+#: ../midori/midori-websettings.c:389
msgid "The last saved window height"
msgstr "Naposledy uložená výška okna"
-#: ../midori/midori-websettings.c:400
+#: ../midori/midori-websettings.c:414
msgid "Last panel position"
msgstr "Poslední pozice panelu"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:415
msgid "The last saved panel position"
msgstr "Uložená poslední pozice panelu"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:424
msgid "Last panel page"
msgstr "Poslední otevřená stránka"
-#: ../midori/midori-websettings.c:411
+#: ../midori/midori-websettings.c:425
msgid "The last saved panel page"
msgstr "Uložená stránka"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:433
msgid "Last Web search"
msgstr "Rychlé hledání na webu"
-#: ../midori/midori-websettings.c:420
+#: ../midori/midori-websettings.c:434
msgid "The last saved Web search"
msgstr "Uložené poslední vyhledávání na webu"
-#: ../midori/midori-websettings.c:429
+#: ../midori/midori-websettings.c:443
msgid "Show Menubar"
msgstr "Zobrazit nabídku"
-#: ../midori/midori-websettings.c:430
+#: ../midori/midori-websettings.c:444
msgid "Whether to show the menubar"
msgstr "Zobrazit nabídku?"
-#: ../midori/midori-websettings.c:438
+#: ../midori/midori-websettings.c:452
msgid "Show Navigationbar"
msgstr "Zobrazit vyhledávání"
-#: ../midori/midori-websettings.c:439
+#: ../midori/midori-websettings.c:453
msgid "Whether to show the navigationbar"
msgstr "Zobrazit lištu vyhledávání?"
-#: ../midori/midori-websettings.c:447
+#: ../midori/midori-websettings.c:461
msgid "Show Bookmarkbar"
msgstr "Zobrazit záložky"
-#: ../midori/midori-websettings.c:448
+#: ../midori/midori-websettings.c:462
msgid "Whether to show the bookmarkbar"
msgstr "Zobrazit lištu se záložkami?"
-#: ../midori/midori-websettings.c:456
+#: ../midori/midori-websettings.c:470
msgid "Show Panel"
msgstr "Zobrazit panel"
-#: ../midori/midori-websettings.c:457
+#: ../midori/midori-websettings.c:471
msgid "Whether to show the panel"
msgstr "Zobrazit panel?"
-#: ../midori/midori-websettings.c:472
+#: ../midori/midori-websettings.c:486
msgid "Show Transferbar"
msgstr "Zobrazit stav přenosu"
-#: ../midori/midori-websettings.c:473
+#: ../midori/midori-websettings.c:487
msgid "Whether to show the transferbar"
msgstr "Zobrazit stav přenosu?"
-#: ../midori/midori-websettings.c:481
+#: ../midori/midori-websettings.c:495
msgid "Show Statusbar"
msgstr "Zobrazit stavový řádek"
-#: ../midori/midori-websettings.c:482
+#: ../midori/midori-websettings.c:496
msgid "Whether to show the statusbar"
msgstr "Zobrazit stavový řádek?"
-#: ../midori/midori-websettings.c:491
+#: ../midori/midori-websettings.c:505
msgid "Toolbar Style:"
msgstr "Styl lišty:"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:506
msgid "The style of the toolbar"
msgstr "Nastaví styl lišty (zobrazení textu a ikon)."
-#: ../midori/midori-websettings.c:508
+#: ../midori/midori-websettings.c:522
msgid "Show progress in location entry"
msgstr "Zobrazit průběh v řádku adresy"
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:523
msgid "Whether to show loading progress in the location entry"
msgstr "Zobrazovat průběh načítání v řádku s adresou?"
-#: ../midori/midori-websettings.c:524
+#: ../midori/midori-websettings.c:538
msgid "Search engines in location completion"
msgstr "Zobrazovat výsledky hledání při zadávání adresy"
-#: ../midori/midori-websettings.c:525
+#: ../midori/midori-websettings.c:539
msgid "Whether to show search engines in the location completion"
msgstr "Zobrazovat výsledky vyhledávání při zadávání adresy?"
-#: ../midori/midori-websettings.c:533
+#: ../midori/midori-websettings.c:547
msgid "Toolbar Items"
msgstr "Položky nástrojové lišty"
-#: ../midori/midori-websettings.c:534
+#: ../midori/midori-websettings.c:548
msgid "The items to show on the toolbar"
msgstr "Položky, které se budou zobrazovat na nástrojové liště"
-#: ../midori/midori-websettings.c:542
+#: ../midori/midori-websettings.c:556
msgid "Compact Sidepanel"
msgstr "Kompaktní boční panel"
-#: ../midori/midori-websettings.c:543
+#: ../midori/midori-websettings.c:557
msgid "Whether to make the sidepanel compact"
msgstr "Má se zobrazit boční panel kompaktně?"
-#: ../midori/midori-websettings.c:558
+#: ../midori/midori-websettings.c:572
msgid "Show operating controls of the panel"
msgstr "Zobrazí seznam nástrojů"
-#: ../midori/midori-websettings.c:559
+#: ../midori/midori-websettings.c:573
msgid "Whether to show the operating controls of the panel"
msgstr "Zda zobrazovat seznam nástrojů"
-#: ../midori/midori-websettings.c:574
+#: ../midori/midori-websettings.c:588
msgid "Align sidepanel on the right"
msgstr "Umístit boční panel vpravo"
-#: ../midori/midori-websettings.c:575
+#: ../midori/midori-websettings.c:589
msgid "Whether to align the sidepanel on the right"
msgstr "Přesunout boční panel na opačnou stranu"
-#: ../midori/midori-websettings.c:590
+#: ../midori/midori-websettings.c:604
msgid "Open panels in separate windows"
msgstr "Otvírat panely v samostatných oknech"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:605
msgid "Whether to always open panels in separate windows"
msgstr "Zda vždy otevřít panel v samostatné okno"
-#: ../midori/midori-websettings.c:600
+#: ../midori/midori-websettings.c:614
msgid "When Midori starts:"
msgstr "Když Midori nastartuje:"
-#: ../midori/midori-websettings.c:601
+#: ../midori/midori-websettings.c:615
msgid "What to do when Midori starts"
msgstr "Co udělat, když je Midori spuštěno"
-#: ../midori/midori-websettings.c:610
+#: ../midori/midori-websettings.c:624
msgid "Homepage:"
msgstr "Domovská stránka:"
-#: ../midori/midori-websettings.c:611
+#: ../midori/midori-websettings.c:625
msgid "The homepage"
msgstr "Domovská stránka"
-#: ../midori/midori-websettings.c:626
+#: ../midori/midori-websettings.c:640
msgid "Show crash dialog"
msgstr "Zobrazit dialog po pádu"
-#: ../midori/midori-websettings.c:627
+#: ../midori/midori-websettings.c:641
msgid "Show a dialog after Midori crashed"
msgstr "Zobrazit dialog po pádu Midori"
#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:643
+#: ../midori/midori-websettings.c:657
msgid "Show speed dial in new tabs"
msgstr "Zobrazit obsah rychlého přístupu v kartách"
-#: ../midori/midori-websettings.c:644
+#: ../midori/midori-websettings.c:658
msgid "Show speed dial in newly opened tabs"
msgstr "Zobrazí obsah rychlého přístupu v nově otevřených kartách"
-#: ../midori/midori-websettings.c:652
+#: ../midori/midori-websettings.c:666
msgid "Save downloaded files to:"
msgstr "Ukládat stažené soubory do:"
-#: ../midori/midori-websettings.c:653
+#: ../midori/midori-websettings.c:667
msgid "The folder downloaded files are saved to"
msgstr "Kam se budou ukládat stažené soubory"
-#: ../midori/midori-websettings.c:674
+#: ../midori/midori-websettings.c:688
msgid "Ask for the destination folder"
msgstr "Zeptat se na cílovou složku"
-#: ../midori/midori-websettings.c:675
+#: ../midori/midori-websettings.c:689
msgid "Whether to ask for the destination folder when downloading a file"
msgstr "Zda se ptát, kam se bude ukládat"
-#: ../midori/midori-websettings.c:694
+#: ../midori/midori-websettings.c:708
msgid "Notify when a transfer has been completed"
msgstr "Upozornit na dokončení přenosu"
-#: ../midori/midori-websettings.c:695
+#: ../midori/midori-websettings.c:709
msgid "Whether to show a notification when a transfer has been completed"
msgstr "Zda zobrazit upozornění při dokončení přenosu"
-#: ../midori/midori-websettings.c:707
+#: ../midori/midori-websettings.c:721
msgid "Download Manager"
msgstr "Správce stahování"
-#: ../midori/midori-websettings.c:708
+#: ../midori/midori-websettings.c:722
msgid "An external download manager"
msgstr "Externí program pro stahování"
-#: ../midori/midori-websettings.c:716
+#: ../midori/midori-websettings.c:730
msgid "Text Editor"
msgstr "Textový editor"
-#: ../midori/midori-websettings.c:717
+#: ../midori/midori-websettings.c:731
msgid "An external text editor"
msgstr "Externí textový editor"
-#: ../midori/midori-websettings.c:732
+#: ../midori/midori-websettings.c:746
msgid "News Aggregator"
msgstr "Čtečka RSS"
-#: ../midori/midori-websettings.c:733
+#: ../midori/midori-websettings.c:747
msgid "An external news aggregator"
msgstr "Externí čtečka zpráv RSS"
-#: ../midori/midori-websettings.c:741
+#: ../midori/midori-websettings.c:755
msgid "Location entry Search"
msgstr "Vyhledávání v adresním řádku"
-#: ../midori/midori-websettings.c:742
+#: ../midori/midori-websettings.c:756
msgid "The search to perform inside the location entry"
msgstr "Vyhledávání použité v řádku s adresou"
-#: ../midori/midori-websettings.c:750
+#: ../midori/midori-websettings.c:764
msgid "Preferred Encoding"
msgstr "Preferované kódování"
-#: ../midori/midori-websettings.c:751
+#: ../midori/midori-websettings.c:765
msgid "The preferred character encoding"
msgstr "Preferované kódování stránek"
-#: ../midori/midori-websettings.c:761
+#: ../midori/midori-websettings.c:775
msgid "Always Show Tabbar"
msgstr "Vždy zobrazovat karty"
-#: ../midori/midori-websettings.c:762
+#: ../midori/midori-websettings.c:776
msgid "Always show the tabbar"
msgstr "Zobrazit karty, i když je jen jedna?"
-#: ../midori/midori-websettings.c:770
+#: ../midori/midori-websettings.c:784
msgid "Close Buttons on Tabs"
msgstr "Ikona zavření karty"
-#: ../midori/midori-websettings.c:771
+#: ../midori/midori-websettings.c:785
msgid "Whether tabs have close buttons"
msgstr "Zobrazovat ikonu pro zavření karty?"
-#: ../midori/midori-websettings.c:779
+#: ../midori/midori-websettings.c:793
msgid "Open new pages in:"
msgstr "Nové stránky otevírat v:"
-#: ../midori/midori-websettings.c:780
+#: ../midori/midori-websettings.c:794
msgid "Where to open new pages"
msgstr "Kde se budou otevírat nové stránky"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:803
msgid "Open external pages in:"
msgstr "Externí stránky otevírat v:"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:804
msgid "Where to open externally opened pages"
msgstr "Kde se budou otevírat externí stránky"
-#: ../midori/midori-websettings.c:799
+#: ../midori/midori-websettings.c:813
msgid "Middle click opens Selection"
msgstr "Kliknutím prostř. tlačítka otevřít vybraný text"
-#: ../midori/midori-websettings.c:800
+#: ../midori/midori-websettings.c:814
msgid "Load an address from the selection via middle click"
msgstr "Prostřední tlačítko myši otevře adresu, která je ve vybraném textu"
-#: ../midori/midori-websettings.c:808
+#: ../midori/midori-websettings.c:822
msgid "Open tabs in the background"
msgstr "Otevírat karty na pozadí"
-#: ../midori/midori-websettings.c:809
+#: ../midori/midori-websettings.c:823
msgid "Whether to open new tabs in the background"
msgstr "Karty se otevírají na pozadí"
-#: ../midori/midori-websettings.c:817
+#: ../midori/midori-websettings.c:831
msgid "Open Tabs next to Current"
msgstr "Otevřít kartu vedle aktivní"
-#: ../midori/midori-websettings.c:818
+#: ../midori/midori-websettings.c:832
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr "Nová karta se otevře vedle aktivní"
-#: ../midori/midori-websettings.c:826
+#: ../midori/midori-websettings.c:840
msgid "Open popups in tabs"
msgstr "Otevírat vyskakovací okna v kartách"
-#: ../midori/midori-websettings.c:827
+#: ../midori/midori-websettings.c:841
msgid "Whether to open popup windows in tabs"
msgstr "Vyskakovací okno se otevře v nové kartě"
-#: ../midori/midori-websettings.c:837 ../extensions/statusbar-features.c:88
+#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88
msgid "Load images automatically"
msgstr "Automaticky načítat obrázky"
-#: ../midori/midori-websettings.c:838
+#: ../midori/midori-websettings.c:852
msgid "Load and display images automatically"
msgstr "Automaticky načítat a zobrazovat obrázky"
-#: ../midori/midori-websettings.c:845 ../extensions/statusbar-features.c:100
+#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100
msgid "Enable scripts"
msgstr "Povolit skripty"
-#: ../midori/midori-websettings.c:846
+#: ../midori/midori-websettings.c:860
msgid "Enable embedded scripting languages"
msgstr "Povolit vložené skriptové jazyky"
-#: ../midori/midori-websettings.c:853 ../extensions/statusbar-features.c:112
+#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112
msgid "Enable Netscape plugins"
msgstr "Povolit pluginy z Netscape (Mozilly)"
-#: ../midori/midori-websettings.c:854
+#: ../midori/midori-websettings.c:868
msgid "Enable embedded Netscape plugin objects"
msgstr "Povolit pluginové objekty prohlížeče Netscape (Mozilla)"
-#: ../midori/midori-websettings.c:870
+#: ../midori/midori-websettings.c:884
msgid "Enable HTML5 database support"
msgstr "Povolit HTML5 databázi"
-#: ../midori/midori-websettings.c:871
+#: ../midori/midori-websettings.c:885
msgid "Whether to enable HTML5 database support"
msgstr "Zda povolit HTML5 databázi"
-#: ../midori/midori-websettings.c:877
+#: ../midori/midori-websettings.c:891
msgid "Enable HTML5 local storage support"
msgstr "Povolit místní úložiště pro HTML5"
-#: ../midori/midori-websettings.c:878
+#: ../midori/midori-websettings.c:892
msgid "Whether to enable HTML5 local storage support"
msgstr "Zda povolit místní úložiště dat pro HTML5"
-#: ../midori/midori-websettings.c:886
+#: ../midori/midori-websettings.c:900
msgid "Enable offline web application cache"
msgstr "Povolit cache pro offline aplikace"
-#: ../midori/midori-websettings.c:887
+#: ../midori/midori-websettings.c:901
msgid "Whether to enable offline web application cache"
msgstr "Zda povolit používání cache pro offline aplikace"
-#: ../midori/midori-websettings.c:912
+#: ../midori/midori-websettings.c:926
msgid "Zoom Text and Images"
msgstr "Zvětšovat text i obrázky"
-#: ../midori/midori-websettings.c:913
+#: ../midori/midori-websettings.c:927
msgid "Whether to zoom text and images"
msgstr "Při přibližování zvětšovat text i obrázky?"
-#: ../midori/midori-websettings.c:928
+#: ../midori/midori-websettings.c:942
msgid "Find inline while typing"
msgstr "Hledat při psaní"
-#: ../midori/midori-websettings.c:929
+#: ../midori/midori-websettings.c:943
msgid "Whether to automatically find inline while typing"
msgstr "Při psaní hledat text?"
-#: ../midori/midori-websettings.c:944
+#: ../midori/midori-websettings.c:958
msgid "Kinetic scrolling"
msgstr "Kinetické rolování"
-#: ../midori/midori-websettings.c:945
+#: ../midori/midori-websettings.c:959
msgid "Whether scrolling should kinetically move according to speed"
msgstr "Zda naklápěním zařízení rolovat"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:967
msgid "Accept cookies"
msgstr "Přijímat cookies:"
-#: ../midori/midori-websettings.c:954
+#: ../midori/midori-websettings.c:968
msgid "What type of cookies to accept"
msgstr "Který typ cookies přijímat"
-#: ../midori/midori-websettings.c:970
+#: ../midori/midori-websettings.c:984
msgid "Original cookies only"
msgstr "Původní"
-#: ../midori/midori-websettings.c:971
+#: ../midori/midori-websettings.c:985
msgid "Accept cookies from the original website only"
msgstr "Z původní stránky"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:993
msgid "Maximum cookie age"
msgstr "Maximální stáří cookies"
-#: ../midori/midori-websettings.c:980
+#: ../midori/midori-websettings.c:994
msgid "The maximum number of days to save cookies for"
msgstr "Maximální počet dní, po které jsou cookies platná."
-#: ../midori/midori-websettings.c:997
+#: ../midori/midori-websettings.c:1011
msgid "Remember last visited pages"
msgstr "Pamatovat si naposledy navštívené stránky"
-#: ../midori/midori-websettings.c:998
+#: ../midori/midori-websettings.c:1012
msgid "Whether the last visited pages are saved"
msgstr "Pamatovat si naposledy navštívené stránky?"
-#: ../midori/midori-websettings.c:1006
+#: ../midori/midori-websettings.c:1020
msgid "Maximum history age"
msgstr "Maximální délka historie"
-#: ../midori/midori-websettings.c:1007
+#: ../midori/midori-websettings.c:1021
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"
+msgstr "Maximální počet dní, po které se bude uchovávat historie navštívených stránek"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1029
msgid "Remember last downloaded files"
msgstr "Pamatovat si naposledy stahované soubory"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:1030
msgid "Whether the last downloaded files are saved"
msgstr "Pamatovat si seznam souborů, které byly stahovány?"
-#: ../midori/midori-websettings.c:1026
-msgid "Proxy Server"
+#: ../midori/midori-websettings.c:1047
+msgid "Proxy server"
msgstr "Proxy server"
-#: ../midori/midori-websettings.c:1027
-msgid "The proxy server used for HTTP connections"
-msgstr "Nastavení proxy serveru pro HTTP spojení"
+#: ../midori/midori-websettings.c:1048
+msgid "The type of proxy server to use"
+msgstr "Jaký typ proxy serveru chcete použít"
-#: ../midori/midori-websettings.c:1042
+#: ../midori/midori-websettings.c:1057
+msgid "HTTP Proxy Server"
+msgstr "HTTP proxy server"
+
+#: ../midori/midori-websettings.c:1058
+msgid "The proxy server used for HTTP connections"
+msgstr "Proxy server, který bude použit pro HTTP spojení"
+
+#: ../midori/midori-websettings.c:1073
msgid "Detect proxy server automatically"
msgstr "Zjistit proxy server automaticky"
-#: ../midori/midori-websettings.c:1043
+#: ../midori/midori-websettings.c:1074
msgid "Whether to detect the proxy server automatically from the environment"
-msgstr "Zjistit nastavení proxy serveru automaticky?"
+msgstr "Zjistit nastavení proxy serveru automaticky (podle prostředí)?"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1059
+#: ../midori/midori-websettings.c:1090
msgid "Identify as"
msgstr "Hlásit se jako"
-#: ../midori/midori-websettings.c:1060
+#: ../midori/midori-websettings.c:1091
msgid "What to identify as to web pages"
msgstr "Jak se hlásit webovým stránkám"
-#: ../midori/midori-websettings.c:1076
+#: ../midori/midori-websettings.c:1107
msgid "Identification string"
msgstr "Identifikační řetězec"
-#: ../midori/midori-websettings.c:1077
+#: ../midori/midori-websettings.c:1108
msgid "The application identification string"
msgstr "Identifikační řetězec aplikace"
-#: ../midori/midori-websettings.c:1092
+#: ../midori/midori-websettings.c:1123
msgid "Preferred languages"
msgstr "Preferované jazyky"
-#: ../midori/midori-websettings.c:1093
-msgid ""
-"A comma separated list of languages preferred for rendering multilingual "
-"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-msgstr ""
-"Čárkou oddělený seznam jazyků pro vícejazyčné weby, např. \"cs\", \"cs,en\", "
-"nebo \"cs-cs;q=1.0, en-en;q=0.667\""
+#: ../midori/midori-websettings.c:1124
+msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+msgstr "Čárkou oddělený seznam jazyků pro vícejazyčné weby, např. \"cs\", \"cs,en\", nebo \"cs-cs;q=1.0, en-en;q=0.667\""
-#: ../midori/midori-websettings.c:1108
+#: ../midori/midori-websettings.c:1139
msgid "Clear private data"
msgstr "_Vymazat osobní data"
-#: ../midori/midori-websettings.c:1109
+#: ../midori/midori-websettings.c:1140
msgid "The private data selected for deletion"
msgstr "Osobní data byla označena ke smazání"
@@ -1615,341 +1677,357 @@ msgstr "Osobní data byla označena ke smazání"
#. 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:956 ../midori/midori-view.c:4190
-#: ../midori/midori-view.c:4194
+#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528
+#: ../midori/midori-view.c:4532
#, c-format
msgid "Error - %s"
msgstr "Chyba - %s"
-#: ../midori/midori-view.c:957
+#: ../midori/midori-view.c:1262
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Stránka '%s' nemůže být načtena."
-#: ../midori/midori-view.c:962
+#: ../midori/midori-view.c:1264
msgid "Try again"
msgstr "Zkusit znovu"
#. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:1002
+#: ../midori/midori-view.c:1283
#, c-format
msgid "Not found - %s"
msgstr "Nenalezeno - %s"
-#: ../midori/midori-view.c:1225 ../midori/midori-view.c:2081
+#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357
#, c-format
msgid "Send a message to %s"
msgstr "Poslat %s zprávu"
-#: ../midori/midori-view.c:1850 ../midori/midori-view.c:2243
+#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519
msgid "Inspect _Element"
msgstr "Prozkoumat _prvek"
-#: ../midori/midori-view.c:1902 ../midori/midori-view.c:1980
-msgid "Open _Link"
-msgstr "Otevřít _odkaz"
-
-#: ../midori/midori-view.c:1905 ../midori/midori-view.c:1982
+#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261
msgid "Open Link in New _Tab"
msgstr "Otevřít odkaz v nové _kartě"
-#: ../midori/midori-view.c:1909
+#: ../midori/midori-view.c:2195
msgid "Open Link in _Foreground Tab"
msgstr "Otevřít odkaz v nové kartě a _zobrazit ji"
-#: ../midori/midori-view.c:1910
+#: ../midori/midori-view.c:2196
msgid "Open Link in _Background Tab"
msgstr "Otevřít odkaz v nové kartě na _pozadí"
-#: ../midori/midori-view.c:1913 ../midori/midori-view.c:1989
+#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268
msgid "Open Link in New _Window"
msgstr "Otevřít odkaz v novém _okně"
-#: ../midori/midori-view.c:1916
+#: ../midori/midori-view.c:2202
msgid "Open Link as Web A_pplication"
msgstr "Otevřít odkaz jako _webovou aplikaci"
-#: ../midori/midori-view.c:1919
+#: ../midori/midori-view.c:2205
msgid "Copy Link de_stination"
msgstr "Zkopírovat _cíl odkazu"
-#: ../midori/midori-view.c:1922 ../midori/midori-view.c:2001
+#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280
msgid "_Save Link destination"
msgstr "_Uložit odkaz"
-#: ../midori/midori-view.c:1923 ../midori/midori-view.c:1995
+#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274
msgid "_Download Link destination"
msgstr "_Stáhnout odkaz"
-#: ../midori/midori-view.c:1927 ../midori/midori-view.c:1963
-#: ../midori/midori-view.c:2006
+#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243
+#: ../midori/midori-view.c:2285
msgid "Download with Download _Manager"
msgstr "Stáhnout za použití Download _manageru"
-#: ../midori/midori-view.c:1939
+#: ../midori/midori-view.c:2222
msgid "Open _Image in New Tab"
msgstr "Otevřít _obrázek v nové kartě"
-#: ../midori/midori-view.c:1942
-msgid "Open Image in New Wi_ndow"
-msgstr "Otevřít _obrázek v novém okně"
-
-#: ../midori/midori-view.c:1945
+#: ../midori/midori-view.c:2225
msgid "Copy Image _Address"
msgstr "Zkopírovat _adresu obrázku"
-#: ../midori/midori-view.c:1948
+#: ../midori/midori-view.c:2228
msgid "Save I_mage"
msgstr "Uložit o_brázek"
-#: ../midori/midori-view.c:1949
+#: ../midori/midori-view.c:2229
msgid "Download I_mage"
msgstr "Stáhnout o_brázek"
-#: ../midori/midori-view.c:1956
+#: ../midori/midori-view.c:2236
msgid "Copy Video _Address"
msgstr "Zkopírovat _adresu videa"
-#: ../midori/midori-view.c:1959
+#: ../midori/midori-view.c:2239
msgid "Save _Video"
msgstr "Uložit _video"
-#: ../midori/midori-view.c:1959
+#: ../midori/midori-view.c:2239
msgid "Download _Video"
msgstr "Stáhnout _video"
-#: ../midori/midori-view.c:2026
+#: ../midori/midori-view.c:2302
msgid "Search _with"
msgstr "Hledat _s"
-#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2068
+#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344
msgid "_Search the Web"
msgstr "_Hledat na webu"
-#: ../midori/midori-view.c:2089
+#: ../midori/midori-view.c:2365
msgid "Open Address in New _Tab"
msgstr "Otevřít adresu v nové _kartě"
-#: ../midori/midori-view.c:2375
+#: ../midori/midori-view.c:2662
msgid "Open or download file"
msgstr "Otevřít nebo stáhnout soubor"
-#: ../midori/midori-view.c:2398
+#: ../midori/midori-view.c:2681
#, c-format
msgid "File Type: '%s'"
msgstr "Typ souboru: '%s'"
-#: ../midori/midori-view.c:2401
+#: ../midori/midori-view.c:2684
#, c-format
msgid "File Type: %s ('%s')"
msgstr "Typ souboru: %s ('%s')"
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2405
+#: ../midori/midori-view.c:2688
#, c-format
msgid "Open %s"
msgstr "Otevřít %s"
-#: ../midori/midori-view.c:2920
+#: ../midori/midori-view.c:3236
#, c-format
msgid "Inspect page - %s"
msgstr "Prohlížení stránky - %s"
-#: ../midori/midori-view.c:3181
+#: ../midori/midori-view.c:3501
msgid "Speed dial"
msgstr "Rychlý přístup"
-#: ../midori/midori-view.c:3182
+#: ../midori/midori-view.c:3502
msgid "Click to add a shortcut"
msgstr "Záložku přidáte kliknutím"
-#: ../midori/midori-view.c:3183
+#: ../midori/midori-view.c:3503
msgid "Enter shortcut address"
msgstr "Vložte adresu záložky"
-#: ../midori/midori-view.c:3184
+#: ../midori/midori-view.c:3504
msgid "Enter shortcut title"
msgstr "Vložte název záložky"
-#: ../midori/midori-view.c:3185
+#: ../midori/midori-view.c:3505
msgid "Are you sure you want to delete this shortcut?"
msgstr "Opravdu chcete smazat tuto záložku?"
-#: ../midori/midori-view.c:3221
+#: ../midori/midori-view.c:3506
+msgid "Set number of columns"
+msgstr "Změnit počet sloupců"
+
+#: ../midori/midori-view.c:3507
+msgid "Enter number of columns:"
+msgstr "Vložte počet sloupců"
+
+#: ../midori/midori-view.c:3508
+msgid "Set number of shortcuts"
+msgstr "Změnit počet záložek"
+
+#: ../midori/midori-view.c:3509
+msgid "Enter number of shortcuts:"
+msgstr "Vložte počet záložek"
+
+#: ../midori/midori-view.c:3535
#, c-format
msgid "Document cannot be displayed"
msgstr "Dokument nemůže být zobrazen"
-#: ../midori/midori-view.c:3244
+#: ../midori/midori-view.c:3558
#, c-format
msgid "No documentation installed"
msgstr "Dokumentace není nainstalována"
-#: ../midori/midori-view.c:3467
+#: ../midori/midori-view.c:3808
msgid "Blank page"
msgstr "Prázdná stránka"
-#: ../midori/midori-view.c:3727
+#: ../midori/midori-view.c:4068
msgid "_Duplicate Tab"
msgstr "Z_dvojit kartu"
-#: ../midori/midori-view.c:3732
+#: ../midori/midori-view.c:4073
msgid "_Restore Tab"
msgstr "_Ukázat titulek"
-#: ../midori/midori-view.c:3732
+#: ../midori/midori-view.c:4073
msgid "_Minimize Tab"
msgstr "_Schovat titulek"
-#: ../midori/midori-view.c:3738
+#: ../midori/midori-view.c:4079
msgid "Close ot_her Tabs"
msgstr "_Zavřít ostatní karty"
-#: ../midori/midori-view.c:4362
+#: ../midori/midori-view.c:4700
msgid "Print background images"
msgstr "Tisknout obrázky na pozadí"
-#: ../midori/midori-view.c:4363
+#: ../midori/midori-view.c:4701
msgid "Whether background images should be printed"
msgstr "Mají být obrázky na pozadí tištěny?"
-#: ../midori/midori-view.c:4415 ../midori/midori-preferences.c:382
+#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381
msgid "Features"
msgstr "Rozšíření"
#. Page "General"
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:298
msgid "General"
msgstr "Obecné"
-#: ../midori/midori-preferences.c:300
+#: ../midori/midori-preferences.c:299
msgid "Startup"
msgstr "Při spuštění"
-#: ../midori/midori-preferences.c:315 ../midori/midori-preferences.c:322
+#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321
msgid "Use current page as homepage"
msgstr "Použít stávající stránku jako domovskou"
-#: ../midori/midori-preferences.c:332 ../panels/midori-transfers.c:87
+#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Přenosy"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:350
+#: ../midori/midori-preferences.c:349
msgid "Appearance"
msgstr "Vzhled"
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:350
msgid "Font settings"
msgstr "Nastavení písma"
-#: ../midori/midori-preferences.c:353
+#: ../midori/midori-preferences.c:352
msgid "Default Font Family"
msgstr "Výchozí font"
-#: ../midori/midori-preferences.c:356
+#: ../midori/midori-preferences.c:355
msgid "The default font family used to display text"
msgstr "Výchozí font pro zobrazení textu"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:358
msgid "The default font size used to display text"
msgstr "Velikost textu"
-#: ../midori/midori-preferences.c:361
+#: ../midori/midori-preferences.c:360
msgid "Fixed-width Font Family"
msgstr "Výchozí font písma se stejnou šířkou"
-#: ../midori/midori-preferences.c:364
+#: ../midori/midori-preferences.c:363
msgid "The font family used to display fixed-width text"
msgstr "Font použitý při zobrazování písma se stejnou šířkou písmen"
-#: ../midori/midori-preferences.c:367
+#: ../midori/midori-preferences.c:366
msgid "The font size used to display fixed-width text"
msgstr "Font použitý při zobrazování písma se stejnou šířkou písmen"
-#: ../midori/midori-preferences.c:369
+#: ../midori/midori-preferences.c:368
msgid "Minimum Font Size"
msgstr "Minimální velikost textu"
-#: ../midori/midori-preferences.c:372
+#: ../midori/midori-preferences.c:371
msgid "The minimum font size used to display text"
msgstr "Minimální velikost textu, která se použije pro zobrazení"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:381
+#: ../midori/midori-preferences.c:380
msgid "Behavior"
msgstr "Chování"
-#: ../midori/midori-preferences.c:394
+#: ../midori/midori-preferences.c:393
msgid "Enforce 96 dots per inch"
msgstr "Vnutit rozlišení 96 bodů/palec"
-#: ../midori/midori-preferences.c:395
+#: ../midori/midori-preferences.c:394
msgid "Enforce a video dot density of 96 DPI"
msgstr "Vnutit rozlišení obrazu 96 bodů na palec"
#: ../midori/midori-preferences.c:414
+msgid "Allow scripts to open popups"
+msgstr "Povolit skriptům otevírat vyskakovací okna"
+
+#: ../midori/midori-preferences.c:415
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Jestli skripty (JavaScript) mohou otevírat vyskakovací okna (popup okna)"
+
+#: ../midori/midori-preferences.c:419
msgid "Spell Checking"
msgstr "Kontrola pravopisu"
-#: ../midori/midori-preferences.c:417
+#: ../midori/midori-preferences.c:422
msgid "Enable Spell Checking"
msgstr "Povolit kontrolu pravopisu"
-#: ../midori/midori-preferences.c:418
+#: ../midori/midori-preferences.c:423
msgid "Enable spell checking while typing"
msgstr "Povolit kontrolu pravopisu při psaní"
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:425
msgid "Spelling dictionaries:"
msgstr "Slovníky pro kontrolu pravopisu:"
#. i18n: The example should be adjusted to contain a good local default
-#: ../midori/midori-preferences.c:424
-msgid ""
-"A comma separated list of languages to be used for spell checking, for "
-"example \"en_GB,de_DE\""
-msgstr ""
-"Čárkou oddělený seznam jazyků použitých pro kontrolu pravopisu, např. "
-"\"cs_CZ,en_GB\""
+#: ../midori/midori-preferences.c:429
+msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\""
+msgstr "Čárkou oddělený seznam jazyků použitých pro kontrolu pravopisu, např. \"cs_CZ,en_GB\""
#. Page "Interface"
-#: ../midori/midori-preferences.c:430
+#: ../midori/midori-preferences.c:435
msgid "Interface"
msgstr "Rozhraní"
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:436
msgid "Navigationbar"
msgstr "Navigační lišta"
-#: ../midori/midori-preferences.c:441
+#: ../midori/midori-preferences.c:446
msgid "Browsing"
msgstr "Prohlížení"
#. Page "Applications"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:468
msgid "Applications"
msgstr "Aplikace"
-#: ../midori/midori-preferences.c:464
+#: ../midori/midori-preferences.c:469
msgid "External applications"
msgstr "Externí aplikace"
#. Page "Network"
-#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481
+#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486
msgid "Network"
msgstr "Síť"
+#: ../midori/midori-preferences.c:492
+msgid "Hostname"
+msgstr "Počítač"
+
#. Page "Privacy"
-#: ../midori/midori-preferences.c:505
+#: ../midori/midori-preferences.c:511
msgid "Privacy"
msgstr "Soukromí"
-#: ../midori/midori-preferences.c:506
+#: ../midori/midori-preferences.c:512
msgid "Web Cookies"
msgstr "Web cookies"
-#: ../midori/midori-preferences.c:515 ../midori/midori-preferences.c:529
+#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535
msgid "days"
msgstr "dny"
@@ -1981,82 +2059,67 @@ msgstr "Upravit vyhledávací nástroje"
msgid "Use as _default"
msgstr "Použít jako _výchozí"
-#: ../midori/sokoke.c:1255
+#: ../midori/sokoke.c:1294
msgid "_Bookmark"
msgstr "_Záložky"
-#: ../midori/sokoke.c:1257
+#: ../midori/sokoke.c:1296
msgid "Add Boo_kmark"
msgstr "_Přidat záložku"
-#: ../midori/sokoke.c:1258
+#: ../midori/sokoke.c:1297
msgid "_Console"
msgstr "_Konzola"
-#: ../midori/sokoke.c:1259
+#: ../midori/sokoke.c:1298
msgid "_Extensions"
msgstr "_Rozšíření"
-#: ../midori/sokoke.c:1260
+#: ../midori/sokoke.c:1299
msgid "_History"
msgstr "_Historie"
-#: ../midori/sokoke.c:1261
+#: ../midori/sokoke.c:1300
msgid "_Homepage"
msgstr "_Domovská stránka"
-#: ../midori/sokoke.c:1262
+#: ../midori/sokoke.c:1301
msgid "_Userscripts"
msgstr "_Uživatelské skripty"
-#: ../midori/sokoke.c:1263
+#: ../midori/sokoke.c:1302
msgid "New _Tab"
msgstr "Nová _karta"
-#: ../midori/sokoke.c:1264
+#: ../midori/sokoke.c:1303
msgid "_Transfers"
msgstr "_Přenosy"
-#: ../midori/sokoke.c:1265
+#: ../midori/sokoke.c:1304
msgid "Netscape p_lugins"
msgstr "Netscape p_luginy"
-#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144
-msgid "Userscripts"
-msgstr "Uživatelské skripty"
-
-#: ../panels/midori-addons.c:100
-msgid "Userstyles"
-msgstr "Uživatelské styly"
-
-#: ../panels/midori-addons.c:305
-#, c-format
-msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-msgstr ""
-"Okopírujte uživatelské skripty do složky %s a uživatelské styly do složky %s."
-
-#: ../panels/midori-addons.c:911
-#, c-format
-msgid "Can't monitor folder '%s': %s"
-msgstr "Nemohu sledovat složku '%s': %s"
+#: ../midori/sokoke.c:1307
+msgid "New _Folder"
+msgstr "Nová _složka"
#: ../panels/midori-bookmarks.c:111
msgid "Bookmarks"
msgstr "Záložky"
-#: ../panels/midori-bookmarks.c:250
+#: ../panels/midori-bookmarks.c:241
msgid "Edit the selected bookmark"
msgstr "Upravit vybranou záložku"
-#: ../panels/midori-bookmarks.c:258
+#: ../panels/midori-bookmarks.c:249
msgid "Delete the selected bookmark"
msgstr "Smazat vybranou záložku"
-#: ../panels/midori-bookmarks.c:278
+#: ../panels/midori-bookmarks.c:262
msgid "Add a new folder"
msgstr "Přidat složku"
-#: ../panels/midori-bookmarks.c:608
+#: ../panels/midori-bookmarks.c:592
msgid "Separator"
msgstr "Oddělovač"
@@ -2064,6 +2127,14 @@ msgstr "Oddělovač"
msgid "Console"
msgstr "Konzola"
+#: ../panels/midori-console.c:361
+msgid "Copy _All"
+msgstr "Kopírovat _vše"
+
+#: ../panels/midori-console.c:362
+msgid "Copy All"
+msgstr "Kopírovat vše"
+
#: ../panels/midori-extensions.c:91
msgid "Extensions"
msgstr "Rozšíření"
@@ -2073,8 +2144,7 @@ msgid "Erroneous clock time"
msgstr "Chyba v nastavení času"
#: ../panels/midori-history.c:274
-msgid ""
-"The clock time lies in the past. Please check the current date and time."
+msgid "The clock time lies in the past. Please check the current date and time."
msgstr "Hodiny jdou pozpátku. Zkontrolujte nastavení data a času."
#: ../panels/midori-history.c:286
@@ -2101,28 +2171,28 @@ msgstr "Včera"
msgid "Are you sure you want to remove all history items?"
msgstr "Opravdu chcete smazat všechny položky historie?"
-#: ../panels/midori-history.c:438
+#: ../panels/midori-history.c:437
msgid "Bookmark the selected history item"
msgstr "Zazáložkovat vybranou položku historie"
-#: ../panels/midori-history.c:447
+#: ../panels/midori-history.c:446
msgid "Delete the selected history item"
msgstr "Smazat vybranou položku historie"
-#: ../panels/midori-history.c:455
+#: ../panels/midori-history.c:454
msgid "Clear the entire history"
msgstr "Smazat celou historii"
-#: ../panels/midori-history.c:953
+#: ../panels/midori-history.c:952
#: ../extensions/cookie-manager/cookie-manager-page.c:1144
msgid "Filter:"
msgstr "Filtr:"
-#: ../panels/midori-transfers.c:479
+#: ../panels/midori-transfers.c:478
msgid "Open Destination _Folder"
msgstr "Otevřít cílovou _složku"
-#: ../panels/midori-transfers.c:482
+#: ../panels/midori-transfers.c:481
msgid "Copy Link Loc_ation"
msgstr "Kopírovat umís_tění"
@@ -2148,30 +2218,30 @@ msgstr "Heslo"
msgid "_Remember password"
msgstr "Zapamatovat si _heslo"
-#: ../katze/katze-throbber.c:842
+#: ../katze/katze-throbber.c:882
#, c-format
msgid "Named icon '%s' couldn't be loaded"
msgstr "Ikona '%s' nemůže být načtena"
-#: ../katze/katze-throbber.c:855
+#: ../katze/katze-throbber.c:895
#, c-format
msgid "Stock icon '%s' couldn't be loaded"
msgstr "Uložená ikona '%s' nemůže být načtena"
-#: ../katze/katze-throbber.c:923
+#: ../katze/katze-throbber.c:963
msgid "Animation frames are broken"
msgstr "Snímky animace jsou porušené"
-#: ../katze/katze-utils.c:494 ../katze/katze-utils.c:889
+#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Vlastnost '%s' je pro %s neplatná"
-#: ../katze/katze-utils.c:540 ../katze/katze-utils.c:569
+#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573
msgid "Choose file"
msgstr "Vybrat soubor"
-#: ../katze/katze-utils.c:555
+#: ../katze/katze-utils.c:559
msgid "Choose folder"
msgstr "Vybrat adresář"
@@ -2180,53 +2250,79 @@ msgstr "Vybrat adresář"
msgid "Preferences for %s"
msgstr "Nastavení pro %s"
-#: ../extensions/adblock.c:398
+#: ../extensions/adblock.c:415
msgid "Configure Advertisement filters"
msgstr "Nastavení filtrů blokování reklamy"
-#: ../extensions/adblock.c:430
+#: ../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 ""
-"Vložte adresu předem připravených filtrů do textového pole a kliknutím na "
-"\"Přidat\" ji přidáte do seznamu. Více připravených filtrů naleznete na "
-"adrese %s."
+msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s."
+msgstr "Vložte adresu předem připravených filtrů do textového pole a kliknutím na \"Přidat\" ji přidáte do seznamu. Více připravených filtrů naleznete na adrese %s."
-#: ../extensions/adblock.c:570
+#: ../extensions/adblock.c:587
msgid "Configure _Advertisement filters..."
msgstr "_Blokování reklamy"
-#: ../extensions/adblock.c:818
+#: ../extensions/adblock.c:841
msgid "Edit rule"
msgstr "Upravit pravidlo"
-#: ../extensions/adblock.c:831
+#: ../extensions/adblock.c:854
msgid "_Rule:"
msgstr "P_ravidlo:"
-#: ../extensions/adblock.c:885
+#: ../extensions/adblock.c:908
msgid "Bl_ock image"
msgstr "Bl_okovat obrázek"
-#: ../extensions/adblock.c:890
+#: ../extensions/adblock.c:913
msgid "Bl_ock link"
msgstr "Bl_okovat odkaz"
-#: ../extensions/adblock.c:1447
+#: ../extensions/adblock.c:1489
msgid "Advertisement blocker"
msgstr "Blokování reklamy"
-#: ../extensions/adblock.c:1448
+#: ../extensions/adblock.c:1490
msgid "Block advertisements according to a filter list"
msgstr "Blokuje reklamu podle filtrů"
-#: ../extensions/colorful-tabs.c:136
+#: ../extensions/addons.c:122
+#, c-format
+msgid "Copy %s to the folder %s."
+msgstr "Kopíruje se %s do složky %s."
+
+#: ../extensions/addons.c:177
+msgid "Userscripts"
+msgstr "Uživatelské skripty"
+
+#: ../extensions/addons.c:179
+msgid "Userstyles"
+msgstr "Uživatelské styly"
+
+#: ../extensions/addons.c:1085
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr "Nastavení rozšíření '%s' nemůže být uloženo: %s\n"
+
+#: ../extensions/addons.c:1086 ../extensions/addons.c:1253
+msgid "User addons"
+msgstr "Uživatelova rozšíření"
+
+#: ../extensions/addons.c:1210
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "Nemohu sledovat složku '%s': %s"
+
+#: ../extensions/addons.c:1254
+msgid "Support for userscripts and userstyles"
+msgstr "Podpora pro userscripts a userstyles."
+
+#: ../extensions/colorful-tabs.c:204
msgid "Colorful Tabs"
msgstr "Obarvené karty"
-#: ../extensions/colorful-tabs.c:137
+#: ../extensions/colorful-tabs.c:205
msgid "Tint each tab distinctly"
msgstr "Obarvit každou kartu zvlášť"
@@ -2240,12 +2336,8 @@ msgid "Delete All"
msgstr "Smazat vše"
#: ../extensions/cookie-manager/cookie-manager-page.c:114
-msgid ""
-"Deletes all shown cookies. If a filter is set, only those cookies are "
-"deleted which match the filter."
-msgstr ""
-"Smaže všechna zobrazená cookies. Jestliže je zapnut filtr, jsou smazána jen "
-"ta cookies, která odpovídají."
+msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter."
+msgstr "Smaže všechna zobrazená cookies. Jestliže je zapnut filtr, jsou smazána jen ta cookies, která odpovídají."
#: ../extensions/cookie-manager/cookie-manager-page.c:129
msgid "Expand All"
@@ -2318,12 +2410,8 @@ msgid "_Collapse All"
msgstr "_Sbalit vše"
#: ../extensions/cookie-manager/cookie-manager-page.c:1149
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Vložte řetězec, podle kterého se budou cookies filtrovat. Filtruje se podle "
-"názvu nebo domény"
+msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter"
+msgstr "Vložte řetězec, podle kterého se budou cookies filtrovat. Filtruje se podle názvu nebo domény"
#: ../extensions/cookie-manager/main.c:40
msgid "_Cookie Manager"
@@ -2333,11 +2421,11 @@ msgstr "Správce _cookies"
msgid "List, view and delete cookies"
msgstr "Seznam, detaily a mazání cookies"
-#: ../extensions/feed-panel/feed-atom.c:237
+#: ../extensions/feed-panel/feed-atom.c:209
msgid "Failed to find required Atom \"entry\" elements in XML data."
msgstr "Chyba při hledání vyžadované položky \"entry\" v XML datech."
-#: ../extensions/feed-panel/feed-atom.c:343
+#: ../extensions/feed-panel/feed-atom.c:315
msgid "Failed to find required Atom \"feed\" elements in XML data."
msgstr "Chyba při hledání vyžadované položky \"feed\" v XML datech."
@@ -2348,19 +2436,19 @@ msgctxt "Feed"
msgid "Last updated: %s."
msgstr "Poslední aktualizace: %s."
-#: ../extensions/feed-panel/feed-panel.c:667
+#: ../extensions/feed-panel/feed-panel.c:671
msgid "Feeds"
msgstr "Kanály"
-#: ../extensions/feed-panel/feed-panel.c:720
+#: ../extensions/feed-panel/feed-panel.c:724
msgid "Add new feed"
msgstr "Přidat nový kanál"
-#: ../extensions/feed-panel/feed-panel.c:727
+#: ../extensions/feed-panel/feed-panel.c:731
msgid "Delete feed"
msgstr "Smazat kanál"
-#: ../extensions/feed-panel/feed-panel.c:810
+#: ../extensions/feed-panel/feed-panel.c:814
msgid "_Feeds"
msgstr "_Kanály"
@@ -2439,11 +2527,11 @@ msgstr "Nejsou nainstalovány soubory se zdrojem"
msgid "Form history filler"
msgstr "Ukládání hodnot ve formuláři"
-#: ../extensions/mouse-gestures.c:288
+#: ../extensions/mouse-gestures.c:303
msgid "Mouse Gestures"
msgstr "Gesta myší"
-#: ../extensions/mouse-gestures.c:289
+#: ../extensions/mouse-gestures.c:304
msgid "Control Midori by moving the mouse"
msgstr "Ovládat Midori pomocí myši"
@@ -2496,37 +2584,33 @@ 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:565 ../extensions/tab-panel.c:622
+#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625
msgid "Tab Panel"
msgstr "Panel karet"
-#: ../extensions/tab-panel.c:606
+#: ../extensions/tab-panel.c:609
msgid "T_ab Panel"
msgstr "Panel _karet"
-#: ../extensions/tab-panel.c:623
+#: ../extensions/tab-panel.c:626
msgid "Show tabs in a vertical panel"
msgstr "Zobrazí karty ve vertikálním panelu"
-#: ../extensions/tab-switcher.c:394
+#: ../extensions/tab-switcher.c:395
msgid "Tab History List"
msgstr "Karta historie"
-#: ../extensions/tab-switcher.c:395
+#: ../extensions/tab-switcher.c:396
msgid "Allows to switch tabs by choosing from a list sorted by last usage"
-msgstr ""
-"Umožňuje přepínat karty výběrem ze seznamu řazeného podle posledního použití"
+msgstr "Umožňuje přepínat karty výběrem ze seznamu řazeného podle posledního použití"
#: ../extensions/toolbar-editor.c:389
msgid "Customize Toolbar"
msgstr "Upravit lištu"
#: ../extensions/toolbar-editor.c:405
-msgid ""
-"Select items to be displayed on the toolbar. Items can be reodered by drag "
-"and drop."
-msgstr ""
-"Vybrané položky se zobrazí na liště. Změnu pořadí provedete přetažením."
+msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop."
+msgstr "Vybrané položky se zobrazí na liště. Změnu pořadí provedete přetažením."
#: ../extensions/toolbar-editor.c:421
msgid "Available Items"
@@ -2552,6 +2636,15 @@ msgstr "Umožňuje jednoduše změnit lištu"
msgid "Cache HTTP communication on disk"
msgstr "Kešuje (ukládá) HTTP komunikaci na disk"
+#~ msgid "Open _Link"
+#~ msgstr "Otevřít _odkaz"
+
+#~ msgid "Open Image in New Wi_ndow"
+#~ msgstr "Otevřít _obrázek v novém okně"
+
+#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s."
+#~ msgstr "Okopírujte uživatelské skripty do složky %s a uživatelské styly do složky %s."
+
#~ msgid "Not available on this platform"
#~ msgstr "Není k dispozici"
diff --git a/po/da.po b/po/da.po
index 9178df92..d7bc28f7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: midori 0.2.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-03 12:06+0100\n"
+"POT-Creation-Date: 2010-05-21 16:07+0000\n"
"PO-Revision-Date: 2010-02-20 00:37+0100\n"
"Last-Translator: Per Kongstad \n"
"Language-Team: Danish \n"
@@ -21,9 +21,9 @@ msgstr ""
msgid "Lightweight web browser"
msgstr "Letvægtig webbrowser"
-#: ../data/midori.desktop.in.h:2 ../midori/main.c:1307 ../midori/main.c:1538
-#: ../midori/main.c:1546 ../midori/main.c:1562
-#: ../midori/midori-websettings.c:299
+#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664
+#: ../midori/main.c:1672 ../midori/main.c:1688
+#: ../midori/midori-websettings.c:313
msgid "Midori"
msgstr "Midori"
@@ -31,177 +31,198 @@ msgstr "Midori"
msgid "Web Browser"
msgstr "Webbrowser"
-#: ../midori/main.c:96
+#: ../midori/main.c:102
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Indstillingen kunne ikke indlæses: %s\n"
-#: ../midori/main.c:145
+#: ../midori/main.c:151
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Værdien '%s' er ikke gyldig til %s"
-#: ../midori/main.c:152 ../midori/main.c:238
+#: ../midori/main.c:158 ../midori/main.c:244
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Ugyldig indstillingsværdi '%s'"
-#: ../midori/main.c:364 ../extensions/formhistory.c:446
+#: ../midori/main.c:370 ../extensions/formhistory.c:446
#, 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:419
+#: ../midori/main.c:425
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Kunne ikke fjerne gamle historikelementer: %s\n"
-#: ../midori/main.c:439
+#: ../midori/main.c:445
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Indstillingen kunne ikke gemmes. %s"
-#: ../midori/main.c:477
+#: ../midori/main.c:483
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Søgemaskinerne kunne ikke gemmes. %s"
-#: ../midori/main.c:496 ../midori/main.c:546 ../midori/main.c:566
+#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572
#, c-format
msgid "The bookmarks couldn't be saved. %s"
msgstr "Bogmærkerne kunne ikke gemmes. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:596 ../midori/main.c:619
+#: ../midori/main.c:602 ../midori/main.c:625
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Papirkurven kunne ikke fyldes. %s"
-#: ../midori/main.c:683 ../midori/main.c:898
+#: ../midori/main.c:684 ../midori/main.c:924
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Sessionen kunne ikke gemmes. %s"
-#: ../midori/main.c:932
+#: ../midori/main.c:868
+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:958
msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem."
msgstr "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:947
+#: ../midori/main.c:973
msgid "Modify _preferences"
msgstr "Ændre _indstillinger"
-#: ../midori/main.c:951
+#: ../midori/main.c:977
msgid "Reset the last _session"
msgstr "Nulstil den sidste _session"
-#: ../midori/main.c:956
+#: ../midori/main.c:982
msgid "Disable all _extensions"
msgstr "Slå alle _udvidelser fra"
-#: ../midori/main.c:1191 ../midori/main.c:1802
+#: ../midori/main.c:1217 ../midori/main.c:1937
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Sessionen kunne ikke indlæses: %s\n"
-#: ../midori/main.c:1307
+#: ../midori/main.c:1336
msgid "No filename specified"
msgstr "Intet filnavn angivet"
-#: ../midori/main.c:1326
+#: ../midori/main.c:1355
msgid "An unknown error occured."
msgstr "En ukendt fejl opstod."
-#: ../midori/main.c:1357
+#: ../midori/main.c:1386
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Øjebliksbillede gem til: %s\n"
-#: ../midori/main.c:1440
+#: ../midori/main.c:1557
msgid "Run ADDRESS as a web application"
msgstr "Kør ADRESSE som et webprogram"
-#: ../midori/main.c:1440
+#: ../midori/main.c:1557
msgid "ADDRESS"
msgstr "ADRESSE"
-#: ../midori/main.c:1443
+#: ../midori/main.c:1560
msgid "Use FOLDER as configuration folder"
msgstr "Brug MAPPE som en indstillingsmappe"
-#: ../midori/main.c:1443
+#: ../midori/main.c:1560
msgid "FOLDER"
msgstr "MAPPE"
-#: ../midori/main.c:1446
+#: ../midori/main.c:1563
msgid "Show a diagnostic dialog"
msgstr "Vis en nedbrudsdialog"
-#: ../midori/main.c:1448
+#: ../midori/main.c:1565
msgid "Run the specified filename as javascript"
msgstr "Kør det angivne filnavn som javascript"
-#: ../midori/main.c:1451
+#: ../midori/main.c:1568
msgid "Take a snapshot of the specified URI"
msgstr "Tag et øjebliksbillede at det angivne URI"
-#: ../midori/main.c:1454
+#: ../midori/main.c:1571
msgid "Execute the specified command"
msgstr "Kør den angivne kommando"
-#: ../midori/main.c:1456
+#: ../midori/main.c:1573
msgid "Display program version"
msgstr "Vis programversion"
-#: ../midori/main.c:1458
+#: ../midori/main.c:1575
msgid "Addresses"
msgstr "Adresser"
-#: ../midori/main.c:1535
+#: ../midori/main.c:1577
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Blokér URI'er i overensstemmelse med regulære udtryks-MØNSTRE"
+
+#: ../midori/main.c:1577
+msgid "PATTERN"
+msgstr "MØNSTRE"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:1581
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:1581
+msgid "SECONDS"
+msgstr "SEKUNDER"
+
+#: ../midori/main.c:1661
msgid "[Addresses]"
msgstr "[Adresser]"
-#: ../midori/main.c:1563
+#: ../midori/main.c:1689
msgid "Please report comments, suggestions and bugs to:"
msgstr "Rapportér venligst kommentarer, forslag og fejl til:"
-#: ../midori/main.c:1565
+#: ../midori/main.c:1691
msgid "Check for new versions at:"
msgstr "Tjek for nye versioner hos:"
-#: ../midori/main.c:1653
+#: ../midori/main.c:1788
msgid "The specified configuration folder is invalid."
msgstr "Den angivne indstillingsmappe er ikke gyldig."
-#: ../midori/main.c:1701
+#: ../midori/main.c:1836
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:1756
+#: ../midori/main.c:1891
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Søgemaskinerne kunne ikke indlæses. %s\n"
-#: ../midori/main.c:1785
+#: ../midori/main.c:1920
#, c-format
msgid "The bookmarks couldn't be loaded: %s\n"
msgstr "Bogmærkerne kunne ikke indlæses: %s\n"
-#: ../midori/main.c:1817
+#: ../midori/main.c:1952
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Papirkurven kunne ikke indlæses: %s\n"
-#: ../midori/main.c:1831
+#: ../midori/main.c:1966
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Historikken kunne ikke indlæses: %s\n"
-#: ../midori/main.c:1845
+#: ../midori/main.c:1980
msgid "The following errors occured:"
msgstr "De følgende fejl opstod:"
-#: ../midori/main.c:1861
+#: ../midori/main.c:1996
msgid "_Ignore"
msgstr "_Ignorér"
@@ -218,251 +239,270 @@ msgstr "Misdannet dokument."
msgid "Unrecognized bookmark format."
msgstr "Ukendt bogmærkeformat."
-#: ../midori/midori-array.c:718 ../midori/sokoke.c:1076
+#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115
#, c-format
msgid "Writing failed."
msgstr "Skrivning fejlede."
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5407
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538
+#: ../midori/midori-browser.c:5544
msgid "Reload the current page"
msgstr "Genindlæs den nuværende side"
-#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541
msgid "Stop loading the current page"
msgstr "Stop indlæsning af nuværende side"
-#: ../midori/midori-browser.c:452
+#: ../midori/midori-browser.c:460
#, c-format
msgid "%d%% loaded"
msgstr "%d%% indlæst"
-#: ../midori/midori-browser.c:490
+#: ../midori/midori-browser.c:498
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Kunne ikke opdatere titel: %s\n"
-#: ../midori/midori-browser.c:504
+#: ../midori/midori-browser.c:512
#, c-format
msgid "Unexpected action '%s'."
msgstr "Uventet handling '%s'."
-#: ../midori/midori-browser.c:711
+#: ../midori/midori-browser.c:728
msgid "New folder"
msgstr "Ny mappe"
-#: ../midori/midori-browser.c:711
+#: ../midori/midori-browser.c:728
msgid "Edit folder"
msgstr "Redigér mappe"
-#: ../midori/midori-browser.c:713
+#: ../midori/midori-browser.c:730
msgid "New bookmark"
msgstr "Nyt bogmærke"
-#: ../midori/midori-browser.c:713
+#: ../midori/midori-browser.c:730
msgid "Edit bookmark"
msgstr "Redigér bogmærke"
-#: ../midori/midori-browser.c:744
+#: ../midori/midori-browser.c:761
msgid "_Title:"
msgstr "_Titel:"
-#: ../midori/midori-browser.c:757 ../midori/midori-searchaction.c:961
+#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961
msgid "_Description:"
msgstr "_Beskrivelse:"
-#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:975
+#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975
#: ../extensions/feed-panel/main.c:376
msgid "_Address:"
msgstr "_Adresse:"
-#: ../midori/midori-browser.c:806 ../midori/midori-browser.c:4567
+#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694
msgid "_Folder:"
msgstr "_Mappe:"
-#: ../midori/midori-browser.c:816 ../midori/midori-browser.c:896
-#: ../midori/midori-browser.c:4572 ../midori/midori-browser.c:4604
+#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928
+#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731
msgid "Toplevel folder"
msgstr "Øverste mappe"
-#: ../midori/midori-browser.c:845
+#: ../midori/midori-browser.c:864
+msgid "Add to _Speed Dial"
+msgstr "Tilføj til hurtig_opkald"
+
+#: ../midori/midori-browser.c:877
msgid "Show in the tool_bar"
msgstr "Vis på vær_ktøjsbjælken"
-#: ../midori/midori-browser.c:860
+#: ../midori/midori-browser.c:892
msgid "Run as _web application"
msgstr "Kør so_m et webprogram"
-#: ../midori/midori-browser.c:976 ../midori/midori-browser.c:4622
-#: ../midori/midori-browser.c:4651
+#: ../midori/midori-browser.c:986
+#, 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:990
+#, 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:1047 ../midori/midori-browser.c:4749
+#: ../midori/midori-browser.c:4781
msgid "Save file as"
msgstr "Gem fil som"
-#: ../midori/midori-browser.c:1350 ../panels/midori-transfers.c:271
+#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270
#, c-format
msgid "%s of %s"
msgstr "%s af %s"
-#: ../midori/midori-browser.c:1386
+#: ../midori/midori-browser.c:1456
#, c-format
msgid "The file '%s' has been downloaded."
msgstr "Filen '%s' er blevet hentet."
-#: ../midori/midori-browser.c:1390
+#: ../midori/midori-browser.c:1460
msgid "Transfer completed"
msgstr "Overførsel gennemført"
-#: ../midori/midori-browser.c:1530
+#: ../midori/midori-browser.c:1600
msgid "Save file"
msgstr "Gem fil"
-#: ../midori/midori-browser.c:2244
+#: ../midori/midori-browser.c:2349
msgid "Open file"
msgstr "Åbn fil"
-#: ../midori/midori-browser.c:2320 ../extensions/feed-panel/main.c:364
+#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364
msgid "New feed"
msgstr "Nyt feed"
-#: ../midori/midori-browser.c:2361 ../midori/midori-browser.c:5472
-#: ../panels/midori-bookmarks.c:242
+#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603
+#: ../panels/midori-bookmarks.c:233
msgid "Add a new bookmark"
msgstr "Tilføj et nyt bogmærke"
-#: ../midori/midori-browser.c:2918 ../panels/midori-history.c:332
+#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332
#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465
#, c-format
msgid "Failed to execute database statement: %s\n"
msgstr "Kunne ikke køre databaseudtryk: %s\n"
-#: ../midori/midori-browser.c:2998 ../midori/midori-searchaction.c:484
+#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484
msgid "Empty"
msgstr "Tom"
-#: ../midori/midori-browser.c:3618 ../midori/sokoke.c:400
-#: ../midori/sokoke.c:410 ../midori/sokoke.c:438 ../midori/sokoke.c:464
-#: ../midori/sokoke.c:478
+#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398
+#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462
+#: ../midori/sokoke.c:476
msgid "Could not run external program."
msgstr "Kunne ikke køre eksternt program."
-#: ../midori/midori-browser.c:3932 ../midori/midori-browser.c:5864
+#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Kunne ikke indsætte nyt historikelement: %s\n"
-#: ../midori/midori-browser.c:4264 ../panels/midori-bookmarks.c:795
-#: ../panels/midori-history.c:751
+#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779
+#: ../panels/midori-history.c:750
msgid "Open all in _Tabs"
msgstr "Åbn alt i _faneblade"
-#: ../midori/midori-browser.c:4271 ../panels/midori-bookmarks.c:801
-#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545
+#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785
+#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545
msgid "Open in New _Tab"
msgstr "Åbn i nyt _faneblad"
-#: ../midori/midori-browser.c:4274 ../panels/midori-bookmarks.c:803
-#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547
+#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787
+#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547
msgid "Open in New _Window"
msgstr "Åbn i nyt _vindue"
-#: ../midori/midori-browser.c:4493
+#: ../midori/midori-browser.c:4620
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4494
+#: ../midori/midori-browser.c:4621
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4495
+#: ../midori/midori-browser.c:4622
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4496
+#: ../midori/midori-browser.c:4623
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4497
+#: ../midori/midori-browser.c:4624
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4518 ../panels/midori-bookmarks.c:271
+#: ../midori/midori-browser.c:4645
msgid "Import bookmarks..."
msgstr "Importér bogmærker..."
-#: ../midori/midori-browser.c:4521 ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608
msgid "_Import bookmarks"
msgstr "_Importér bogmærker"
-#: ../midori/midori-browser.c:4532
+#: ../midori/midori-browser.c:4659
msgid "_Application:"
msgstr "_Program:"
-#: ../midori/midori-browser.c:4559 ../midori/midori-browser.c:5579
-#: ../midori/midori-websettings.c:230 ../midori/midori-websettings.c:304
-#: ../katze/katze-utils.c:687
+#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712
+#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318
+#: ../katze/katze-utils.c:691
msgid "Custom..."
msgstr "Tilpasset..."
-#: ../midori/midori-browser.c:4633
+#: ../midori/midori-browser.c:4760
msgid "Failed to import bookmarks"
msgstr "Kunne ikke importere bogmærker"
-#: ../midori/midori-browser.c:4666
+#: ../midori/midori-browser.c:4796
msgid "Failed to export bookmarks"
msgstr "Kunne ikke eksportere bogmærker"
-#: ../midori/midori-browser.c:4720 ../panels/midori-history.c:141
+#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141
#: ../panels/midori-history.c:171
#, c-format
msgid "Failed to remove history item: %s\n"
msgstr "Kunne ikke fjerne historikelementet: %s\n"
-#: ../midori/midori-browser.c:4826
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-browser.c:4957
msgid "Clear Private Data"
msgstr "Ryd private data"
-#: ../midori/midori-browser.c:4830
+#: ../midori/midori-browser.c:4961
msgid "_Clear private data"
msgstr "_Ryd private data"
-#: ../midori/midori-browser.c:4844
+#: ../midori/midori-browser.c:4975
msgid "Clear the following data:"
msgstr "Ryd de følgende data:"
-#: ../midori/midori-browser.c:4855 ../midori/midori-preferences.c:524
+#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530
#: ../panels/midori-history.c:119
msgid "History"
msgstr "Historik"
-#: ../midori/midori-browser.c:4861
+#: ../midori/midori-browser.c:4992
msgid "Cookies"
msgstr "Cookies"
-#: ../midori/midori-browser.c:4866
+#: ../midori/midori-browser.c:4997
msgid "'Flash' Cookies"
msgstr "'Flash' cookies"
-#: ../midori/midori-browser.c:4871
+#: ../midori/midori-browser.c:5002
msgid "Website icons"
msgstr "Webstedikoner"
-#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1266
+#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305
msgid "_Closed Tabs"
msgstr "_Luk faneblade"
-#: ../midori/midori-browser.c:4881 ../extensions/web-cache.c:464
+#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464
msgid "Web Cache"
msgstr "Webcache"
-#: ../midori/midori-browser.c:4889
+#: ../midori/midori-browser.c:5020
msgid "Clear private data when _quitting Midori"
msgstr "_Ryd private data når Midori afsluttes"
-#: ../midori/midori-browser.c:4997
+#: ../midori/midori-browser.c:5121
msgid "A lightweight web browser."
msgstr "En letvægt-webbrowser."
-#: ../midori/midori-browser.c:5013
+#: ../midori/midori-browser.c:5123
+msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version."
+msgstr "Dette bibliotek er åbent programmel: Du kan frit gendistribuere det og/eller ændre det i overensstemmelse med GNU Lesser General Public License som publiceret af Free Software Foundation: Enten version 2.1 af licensen eller (dit frie valg) en senere version."
+
+#: ../midori/midori-browser.c:5142
msgid "translator-credits"
msgstr ""
"Per Kongstad \n"
@@ -470,1138 +510,1157 @@ msgstr ""
"Dansk-gruppen \n"
"Mere info: http://www.dansk-gruppen.dk"
-#: ../midori/midori-browser.c:5320
+#: ../midori/midori-browser.c:5451
msgid "_File"
msgstr "_Fil"
-#: ../midori/midori-browser.c:5322 ../midori/sokoke.c:1267
+#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306
msgid "New _Window"
msgstr "Nyt _vindue"
-#: ../midori/midori-browser.c:5323
+#: ../midori/midori-browser.c:5454
msgid "Open a new window"
msgstr "Åbn et nyt vindue"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5457
msgid "Open a new tab"
msgstr "Åbn et nyt faneblad"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5459
msgid "P_rivate Browsing"
msgstr "P_rivat browsing"
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5460
msgid "Don't save any private data while browsing"
msgstr "Undlad at gemme private data under browsing"
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5464
msgid "Open a file"
msgstr "Åbn en fil"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5467
msgid "Save to a file"
msgstr "Gem til en fil"
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5469
msgid "Add to Speed _dial"
msgstr "Tilføj til hurtig_opkald"
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5470
msgid "Add shortcut to speed dial"
msgstr "Tilføj genvej til hurtigopkald"
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5472
msgid "Add Shortcut to the _desktop"
msgstr "Tilføj genvej til _skrivebordet"
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5473
msgid "Add shortcut to the desktop"
msgstr "Tilføj genvej til skrivebordet"
-#: ../midori/midori-browser.c:5344
+#: ../midori/midori-browser.c:5475
msgid "Subscribe to News _feed"
msgstr "Abonnér på _nyhedskilder"
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5476
msgid "Subscribe to this news feed"
msgstr "Abonnér på denne nyhedskilde"
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5481
msgid "_Close Tab"
msgstr "_Luk faneblad"
-#: ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:5482
msgid "Close the current tab"
msgstr "Luk nuværende faneblad"
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:5484
msgid "C_lose Window"
msgstr "Lu_k vinduet"
-#: ../midori/midori-browser.c:5354
+#: ../midori/midori-browser.c:5485
msgid "Close this window"
msgstr "Luk dette vindue"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5488
msgid "Print the current page"
msgstr "Udskriv nuværende side"
-#: ../midori/midori-browser.c:5360
+#: ../midori/midori-browser.c:5491
msgid "Quit the application"
msgstr "Afslut programmet"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5493
msgid "_Edit"
msgstr "_Redigér"
-#: ../midori/midori-browser.c:5366
+#: ../midori/midori-browser.c:5497
msgid "Undo the last modification"
msgstr "Fortryd den sidste ændring"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5500
msgid "Redo the last modification"
msgstr "Gentag den sidste ændring"
-#: ../midori/midori-browser.c:5373
+#: ../midori/midori-browser.c:5504
msgid "Cut the selected text"
msgstr "Udklip markeret tekst"
-#: ../midori/midori-browser.c:5376 ../midori/midori-browser.c:5379
+#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510
msgid "Copy the selected text"
msgstr "Kopiér markeret tekst"
-#: ../midori/midori-browser.c:5382
+#: ../midori/midori-browser.c:5513
msgid "Paste text from the clipboard"
msgstr "Indsæt tekst fra klippebordet"
-#: ../midori/midori-browser.c:5385
+#: ../midori/midori-browser.c:5516
msgid "Delete the selected text"
msgstr "Slet markeret tekst"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5519
msgid "Select all text"
msgstr "Markér hele teksten"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5522
msgid "Find a word or phrase in the page"
msgstr "Find et ord eller sætning på siden"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5524
msgid "Find _Next"
msgstr "Find _næste"
-#: ../midori/midori-browser.c:5394
+#: ../midori/midori-browser.c:5525
msgid "Find the next occurrence of a word or phrase"
msgstr "Find næste forekomst af et ord eller sætning"
-#: ../midori/midori-browser.c:5396
+#: ../midori/midori-browser.c:5527
msgid "Find _Previous"
msgstr "Find _forrige"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5528
msgid "Find the previous occurrence of a word or phrase"
msgstr "Find forrige forekomst af et ord eller sætning"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5532
msgid "Configure the application preferences"
msgstr "Indstil programindstillingerne"
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5534
msgid "_View"
msgstr "_Vis"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5535
msgid "_Toolbars"
msgstr "_Værktøjsbjælker"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5547
msgid "Increase the zoom level"
msgstr "Forøg forstørrelsesniveauet"
-#: ../midori/midori-browser.c:5419
+#: ../midori/midori-browser.c:5550
msgid "Decrease the zoom level"
msgstr "Formindsk forstørrelsesniveauet"
-#: ../midori/midori-browser.c:5422
+#: ../midori/midori-browser.c:5553
msgid "Reset the zoom level"
msgstr "Nulstil forstørrelsesniveauet"
-#: ../midori/midori-browser.c:5423
+#: ../midori/midori-browser.c:5554
msgid "_Encoding"
msgstr "_Kodning"
-#: ../midori/midori-browser.c:5425
+#: ../midori/midori-browser.c:5556
msgid "View So_urce"
msgstr "Vis _kilde"
-#: ../midori/midori-browser.c:5426
+#: ../midori/midori-browser.c:5557
msgid "View the source code of the page"
msgstr "Vis kildekode for siden"
-#: ../midori/midori-browser.c:5429
+#: ../midori/midori-browser.c:5560
msgid "Toggle fullscreen view"
msgstr "Slå fuldskærmstilstande til/fra"
-#: ../midori/midori-browser.c:5432
+#: ../midori/midori-browser.c:5563
msgid "Scroll _Left"
msgstr "Rul til _venstre"
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5564
msgid "Scroll to the left"
msgstr "Rul til venstre"
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5566
msgid "Scroll _Down"
msgstr "Rul _ned"
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5567
msgid "Scroll down"
msgstr "Rul ned"
-#: ../midori/midori-browser.c:5438
+#: ../midori/midori-browser.c:5569
msgid "Scroll _Up"
msgstr "Rul _op"
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5570
msgid "Scroll up"
msgstr "Rul op"
-#: ../midori/midori-browser.c:5441
+#: ../midori/midori-browser.c:5572
msgid "Scroll _Right"
msgstr "Rul til _højre"
-#: ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:5573
msgid "Scroll to the right"
msgstr "Rul til højre"
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5576
msgid "_Go"
msgstr "_Gå til"
-#: ../midori/midori-browser.c:5448
+#: ../midori/midori-browser.c:5579
msgid "Go back to the previous page"
msgstr "Gå til forrige side"
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5582
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:5455
+#: ../midori/midori-browser.c:5586
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:5459
+#: ../midori/midori-browser.c:5590
msgid "Go to the next sub-page"
msgstr "Gå til den næste underside"
-#: ../midori/midori-browser.c:5462
+#: ../midori/midori-browser.c:5593
msgid "Go to your homepage"
msgstr "Gå til din hjemmeside"
-#: ../midori/midori-browser.c:5464
+#: ../midori/midori-browser.c:5595
msgid "Empty Trash"
msgstr "Tøm papirkurven"
-#: ../midori/midori-browser.c:5465
+#: ../midori/midori-browser.c:5596
msgid "Delete the contents of the trash"
msgstr "Slet indhold af papirkurven"
-#: ../midori/midori-browser.c:5467
+#: ../midori/midori-browser.c:5598
msgid "Undo _Close Tab"
msgstr "Fortryd lu_k faneblad"
-#: ../midori/midori-browser.c:5468
+#: ../midori/midori-browser.c:5599
msgid "Open the last closed tab"
msgstr "Åbn sidste lukkede faneblad"
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5605
msgid "Add a new _folder"
msgstr "Tilføj en ny _mappe"
-#: ../midori/midori-browser.c:5475
+#: ../midori/midori-browser.c:5606
msgid "Add a new bookmark folder"
msgstr "Tilføj en ny bogmærkemappe"
-#: ../midori/midori-browser.c:5480
+#: ../midori/midori-browser.c:5611
msgid "_Export bookmarks"
msgstr "_Eksportér bogmærker"
-#: ../midori/midori-browser.c:5483 ../midori/midori-searchaction.c:493
+#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493
msgid "_Manage Search Engines"
msgstr "_Håndtér søgemaskiner"
-#: ../midori/midori-browser.c:5484
+#: ../midori/midori-browser.c:5615
msgid "Add, edit and remove search engines..."
msgstr "Tilføj, redigér og fjern søgemaskiner..."
-#: ../midori/midori-browser.c:5487
+#: ../midori/midori-browser.c:5618
msgid "_Clear Private Data"
msgstr "_Ryd private data"
-#: ../midori/midori-browser.c:5488
+#: ../midori/midori-browser.c:5619
msgid "Clear private data..."
msgstr "Ryd private data..."
-#: ../midori/midori-browser.c:5492
+#: ../midori/midori-browser.c:5623
msgid "_Inspect Page"
msgstr "_Undersøg side"
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5624
msgid "Inspect page details and access developer tools..."
msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne..."
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5629
msgid "_Previous Tab"
msgstr "_Forrige faneblad"
-#: ../midori/midori-browser.c:5499
+#: ../midori/midori-browser.c:5630
msgid "Switch to the previous tab"
msgstr "Skift til det forrige faneblad"
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5632
msgid "_Next Tab"
msgstr "_Næste faneblad"
-#: ../midori/midori-browser.c:5502
+#: ../midori/midori-browser.c:5633
msgid "Switch to the next tab"
msgstr "Skift til det næste faneblad"
-#: ../midori/midori-browser.c:5504
+#: ../midori/midori-browser.c:5635
msgid "Focus _Current Tab"
msgstr "Fokus på _nuværende faneblad"
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5636
msgid "Focus the current tab"
msgstr "Fokus på det nuværende faneblad"
-#: ../midori/midori-browser.c:5507
+#: ../midori/midori-browser.c:5638
msgid "Open last _session"
msgstr "Åbn den sidste _session"
-#: ../midori/midori-browser.c:5508
+#: ../midori/midori-browser.c:5639
msgid "Open the tabs saved in the last session"
msgstr "Åbn faneblade gemt i den sidste session"
-#: ../midori/midori-browser.c:5510
+#: ../midori/midori-browser.c:5641
msgid "_Help"
msgstr "_Hjælp"
-#: ../midori/midori-browser.c:5512
+#: ../midori/midori-browser.c:5643
msgid "_Contents"
msgstr "_Indhold"
-#: ../midori/midori-browser.c:5513
+#: ../midori/midori-browser.c:5644
msgid "Show the documentation"
msgstr "Vis dokumentationen"
-#: ../midori/midori-browser.c:5515
+#: ../midori/midori-browser.c:5646
msgid "_Frequent Questions"
msgstr "_Ofte stillede spørgsmål"
-#: ../midori/midori-browser.c:5516
+#: ../midori/midori-browser.c:5647
msgid "Show the Frequently Asked Questions"
msgstr "Vis ofte stillede spørgsmål"
-#: ../midori/midori-browser.c:5518
+#: ../midori/midori-browser.c:5649
msgid "_Report a Bug"
msgstr "_Rapportér en fejl"
-#: ../midori/midori-browser.c:5519
+#: ../midori/midori-browser.c:5650
msgid "Open Midori's bug tracker"
msgstr "Åbn Midoris fejlsystem"
-#: ../midori/midori-browser.c:5522
+#: ../midori/midori-browser.c:5653
msgid "Show information about the program"
msgstr "Vis information om dette program"
-#: ../midori/midori-browser.c:5529
+#: ../midori/midori-browser.c:5661
msgid "_Menubar"
msgstr "_Menubjælke"
-#: ../midori/midori-browser.c:5530
+#: ../midori/midori-browser.c:5662
msgid "Show menubar"
msgstr "Vis menubjælke"
-#: ../midori/midori-browser.c:5533
+#: ../midori/midori-browser.c:5665
msgid "_Navigationbar"
msgstr "_Navigeringsbjælke"
-#: ../midori/midori-browser.c:5534
+#: ../midori/midori-browser.c:5666
msgid "Show navigationbar"
msgstr "Vis navigeringsbjælke"
-#: ../midori/midori-browser.c:5537
+#: ../midori/midori-browser.c:5669
msgid "Side_panel"
msgstr "Side_panel"
-#: ../midori/midori-browser.c:5538
+#: ../midori/midori-browser.c:5670
msgid "Show sidepanel"
msgstr "Vis sidepanel"
-#: ../midori/midori-browser.c:5541
+#: ../midori/midori-browser.c:5673
msgid "_Bookmarkbar"
msgstr "_Bogmærkebjælke"
-#: ../midori/midori-browser.c:5542
+#: ../midori/midori-browser.c:5674
msgid "Show bookmarkbar"
msgstr "Vis bogmærkebjælke"
-#: ../midori/midori-browser.c:5545
+#: ../midori/midori-browser.c:5677
msgid "_Transferbar"
msgstr "_Overførselsstatus"
-#: ../midori/midori-browser.c:5546
+#: ../midori/midori-browser.c:5678
msgid "Show transferbar"
msgstr "Vis overførselsstatus"
-#: ../midori/midori-browser.c:5549
+#: ../midori/midori-browser.c:5681
msgid "_Statusbar"
msgstr "_Statusbjælke"
-#: ../midori/midori-browser.c:5550
+#: ../midori/midori-browser.c:5682
msgid "Show statusbar"
msgstr "Vis statusbjælke"
-#: ../midori/midori-browser.c:5557
+#: ../midori/midori-browser.c:5690
msgid "_Automatic"
msgstr "_Automatisk"
-#: ../midori/midori-browser.c:5560 ../midori/midori-websettings.c:224
+#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221
msgid "Chinese (BIG5)"
msgstr "Kinesisk (BIG5)"
-#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
-#: ../midori/midori-browser.c:5564
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5697
msgid "Japanese (SHIFT__JIS)"
msgstr "Japansk (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5567 ../midori/midori-websettings.c:226
+#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223
msgid "Korean (EUC-KR)"
msgstr "Koreansk (EUC-KR)"
-#: ../midori/midori-browser.c:5570 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224
msgid "Russian (KOI8-R)"
msgstr "Russisk (KOI8-R)"
-#: ../midori/midori-browser.c:5573 ../midori/midori-websettings.c:228
+#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5576 ../midori/midori-websettings.c:229
+#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226
msgid "Western (ISO-8859-1)"
msgstr "Vestlig (ISO-8859-1)"
-#: ../midori/midori-browser.c:6124
+#: ../midori/midori-browser.c:6257
msgid "_Separator"
msgstr "_Separator"
-#: ../midori/midori-browser.c:6131
+#: ../midori/midori-browser.c:6264
msgid "_Location..."
msgstr "_Sted..."
-#: ../midori/midori-browser.c:6133
+#: ../midori/midori-browser.c:6266
msgid "Open a particular location"
msgstr "Åbn et særligt sted"
-#: ../midori/midori-browser.c:6157
+#: ../midori/midori-browser.c:6290
msgid "_Web Search..."
msgstr "_Websøgning..."
-#: ../midori/midori-browser.c:6159
+#: ../midori/midori-browser.c:6292
msgid "Run a web search"
msgstr "Kør en websøgnig"
-#: ../midori/midori-browser.c:6180
+#: ../midori/midori-browser.c:6313
msgid "Reopen a previously closed tab or window"
msgstr "Genåbn et tidligere lukket faneblad eller vindue"
-#: ../midori/midori-browser.c:6195
+#: ../midori/midori-browser.c:6328
msgid "_Recently visited pages"
msgstr "_Nyligt besøgte sider"
-#: ../midori/midori-browser.c:6197
+#: ../midori/midori-browser.c:6330
msgid "Reopen pages that you visited earlier"
msgstr "Genåbn sider som du tidligere har besøgt"
-#: ../midori/midori-browser.c:6212 ../midori/sokoke.c:1256
+#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295
msgid "_Bookmarks"
msgstr "_Bogmærker"
-#: ../midori/midori-browser.c:6214
+#: ../midori/midori-browser.c:6347
msgid "Show the saved bookmarks"
msgstr "Vis de gemte bogmærker"
-#: ../midori/midori-browser.c:6229
+#: ../midori/midori-browser.c:6362
msgid "_Tools"
msgstr "Værk_tøjer"
-#: ../midori/midori-browser.c:6242
+#: ../midori/midori-browser.c:6375
msgid "_Window"
msgstr "Vin_due"
-#: ../midori/midori-browser.c:6244
+#: ../midori/midori-browser.c:6377
msgid "Show a list of all open tabs"
msgstr "Vis en liste med alle åbne faneblade"
-#: ../midori/midori-browser.c:6258
+#: ../midori/midori-browser.c:6391
msgid "_Menu"
msgstr "_Menu"
-#: ../midori/midori-browser.c:6260
+#: ../midori/midori-browser.c:6393
msgid "Menu"
msgstr "Menu"
#. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:6464
+#: ../midori/midori-browser.c:6597
msgid "_Inline Find:"
msgstr "_Indlejret søgning:"
-#: ../midori/midori-browser.c:6495
+#: ../midori/midori-browser.c:6628
msgid "Previous"
msgstr "Forrige"
-#: ../midori/midori-browser.c:6500
+#: ../midori/midori-browser.c:6633
msgid "Next"
msgstr "Næste"
-#: ../midori/midori-browser.c:6505
+#: ../midori/midori-browser.c:6638
msgid "Match Case"
msgstr "Versalfølsom"
-#: ../midori/midori-browser.c:6514
+#: ../midori/midori-browser.c:6647
msgid "Highlight Matches"
msgstr "Fremhæv fundne"
-#: ../midori/midori-browser.c:6526
+#: ../midori/midori-browser.c:6659
msgid "Close Findbar"
msgstr "Luk søgebjælke"
-#: ../midori/midori-browser.c:6572 ../panels/midori-transfers.c:142
+#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141
msgid "Clear All"
msgstr "Ryd alle"
-#: ../midori/midori-browser.c:6929
+#: ../midori/midori-browser.c:7063
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Uventet indstilling '%s'"
-#: ../midori/midori-locationaction.c:375
+#: ../midori/midori-locationaction.c:377
#, c-format
msgid "Failed to select from history\n"
msgstr "Kunne ikke vælge fra historik\n"
-#: ../midori/midori-locationaction.c:453
+#: ../midori/midori-locationaction.c:459
#, c-format
msgid "Search for %s"
msgstr "Søg efter %s"
-#: ../midori/midori-locationaction.c:476
+#: ../midori/midori-locationaction.c:482
#, c-format
msgid "Search with %s"
msgstr "Søg med %s"
-#: ../midori/midori-locationaction.c:1188
+#: ../midori/midori-locationaction.c:1197
#, c-format
msgid "Failed to execute database statement\n"
msgstr "Kunne ikke køre databaseudtryk\n"
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1245
+#: ../midori/midori-locationaction.c:1254
msgid "Paste and p_roceed"
msgstr "Indsæt og f_ortsæt"
-#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435
+#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434
msgid "Detach chosen panel from the window"
msgstr "Frigør valgte panel fra vinduet"
-#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447
-#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
+#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446
+#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642
msgid "Align sidepanel to the right"
msgstr "Opstil sidepanel til højre"
-#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458
+#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457
msgid "Close panel"
msgstr "Luk panel"
-#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644
+#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
msgid "Align sidepanel to the left"
msgstr "Opstil sidepanel til venstre"
-#: ../midori/midori-panel.c:798
+#: ../midori/midori-panel.c:797
msgid "Hide operating controls"
msgstr "Skjul handlingskontroller"
-#: ../midori/midori-websettings.c:207
+#: ../midori/midori-websettings.c:204
msgid "Show Blank page"
msgstr "Vis blank side"
-#: ../midori/midori-websettings.c:208
+#: ../midori/midori-websettings.c:205
msgid "Show Homepage"
msgstr "Vis hjemmeside"
-#: ../midori/midori-websettings.c:209
+#: ../midori/midori-websettings.c:206
msgid "Show last open tabs"
msgstr "Vis sidste åbne faneblade"
-#: ../midori/midori-websettings.c:225
+#: ../midori/midori-websettings.c:222
msgid "Japanese (SHIFT_JIS)"
msgstr "Japansk (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:245
+#: ../midori/midori-websettings.c:242
msgid "New tab"
msgstr "Nyt faneblad"
-#: ../midori/midori-websettings.c:246
+#: ../midori/midori-websettings.c:243
msgid "New window"
msgstr "Nyt vindue"
-#: ../midori/midori-websettings.c:247
+#: ../midori/midori-websettings.c:244
msgid "Current tab"
msgstr "Nuværende faneblad"
-#: ../midori/midori-websettings.c:262
+#: ../midori/midori-websettings.c:259
msgid "Default"
msgstr "Standard"
-#: ../midori/midori-websettings.c:263
+#: ../midori/midori-websettings.c:260
msgid "Icons"
msgstr "Ikoner"
-#: ../midori/midori-websettings.c:264
+#: ../midori/midori-websettings.c:261
msgid "Small icons"
msgstr "Små ikoner"
-#: ../midori/midori-websettings.c:265
+#: ../midori/midori-websettings.c:262
msgid "Text"
msgstr "Tekst"
-#: ../midori/midori-websettings.c:266
+#: ../midori/midori-websettings.c:263
msgid "Icons and text"
msgstr "Ikoner og tekst"
-#: ../midori/midori-websettings.c:267
+#: ../midori/midori-websettings.c:264
msgid "Text beside icons"
msgstr "Tekst ved siden af ikoner"
-#: ../midori/midori-websettings.c:282
+#: ../midori/midori-websettings.c:279
+msgid "Automatic (GNOME or environment)"
+msgstr "Automatisk (GNOME eller miljø)"
+
+#: ../midori/midori-websettings.c:280
+msgid "HTTP proxy server"
+msgstr "HTTP-proxyserver"
+
+#: ../midori/midori-websettings.c:281
+msgid "No proxy server"
+msgstr "Ingen proxyserver"
+
+#: ../midori/midori-websettings.c:296
msgid "All cookies"
msgstr "Alle cookies"
-#: ../midori/midori-websettings.c:283
+#: ../midori/midori-websettings.c:297
msgid "Session cookies"
msgstr "Session-cookies"
-#: ../midori/midori-websettings.c:284 ../panels/midori-addons.c:98
-#: ../katze/katze-utils.c:663
+#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667
msgid "None"
msgstr "Ingen"
-#: ../midori/midori-websettings.c:300
+#: ../midori/midori-websettings.c:314
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:301
+#: ../midori/midori-websettings.c:315
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:302
+#: ../midori/midori-websettings.c:316
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:303
+#: ../midori/midori-websettings.c:317
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:356
+#: ../midori/midori-websettings.c:370
msgid "Remember last window size"
msgstr "Husk sidste vinduesstørrelse"
-#: ../midori/midori-websettings.c:357
+#: ../midori/midori-websettings.c:371
msgid "Whether to save the last window size"
msgstr "Skal sidste vinduesstørrelse gemmes"
-#: ../midori/midori-websettings.c:365
+#: ../midori/midori-websettings.c:379
msgid "Last window width"
msgstr "Sidste vinduesbredde"
-#: ../midori/midori-websettings.c:366
+#: ../midori/midori-websettings.c:380
msgid "The last saved window width"
msgstr "Sidste gemte vinduesbredde"
-#: ../midori/midori-websettings.c:374
+#: ../midori/midori-websettings.c:388
msgid "Last window height"
msgstr "Sidste vindueshøjde"
-#: ../midori/midori-websettings.c:375
+#: ../midori/midori-websettings.c:389
msgid "The last saved window height"
msgstr "Sidste gemte vindueshøjde"
-#: ../midori/midori-websettings.c:400
+#: ../midori/midori-websettings.c:414
msgid "Last panel position"
msgstr "Sidste panelplacering"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:415
msgid "The last saved panel position"
msgstr "Sidste gemte panelplacering"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:424
msgid "Last panel page"
msgstr "Sidste panelside"
-#: ../midori/midori-websettings.c:411
+#: ../midori/midori-websettings.c:425
msgid "The last saved panel page"
msgstr "Sidste gemte panelside"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:433
msgid "Last Web search"
msgstr "Sidste websøgning"
-#: ../midori/midori-websettings.c:420
+#: ../midori/midori-websettings.c:434
msgid "The last saved Web search"
msgstr "Den sidste gemte websøgning"
-#: ../midori/midori-websettings.c:429
+#: ../midori/midori-websettings.c:443
msgid "Show Menubar"
msgstr "Vis menubjælke"
-#: ../midori/midori-websettings.c:430
+#: ../midori/midori-websettings.c:444
msgid "Whether to show the menubar"
msgstr "Om menubjælke vises"
-#: ../midori/midori-websettings.c:438
+#: ../midori/midori-websettings.c:452
msgid "Show Navigationbar"
msgstr "Vis navigeringsbjælke"
-#: ../midori/midori-websettings.c:439
+#: ../midori/midori-websettings.c:453
msgid "Whether to show the navigationbar"
msgstr "Om navigeringsbjælke vises"
-#: ../midori/midori-websettings.c:447
+#: ../midori/midori-websettings.c:461
msgid "Show Bookmarkbar"
msgstr "Vis bogmærkebjælke"
-#: ../midori/midori-websettings.c:448
+#: ../midori/midori-websettings.c:462
msgid "Whether to show the bookmarkbar"
msgstr "Om bogmærkebjælke vises"
-#: ../midori/midori-websettings.c:456
+#: ../midori/midori-websettings.c:470
msgid "Show Panel"
msgstr "Vis panel"
-#: ../midori/midori-websettings.c:457
+#: ../midori/midori-websettings.c:471
msgid "Whether to show the panel"
msgstr "Om panel vises"
-#: ../midori/midori-websettings.c:472
+#: ../midori/midori-websettings.c:486
msgid "Show Transferbar"
msgstr "Vis overførselsstatus"
-#: ../midori/midori-websettings.c:473
+#: ../midori/midori-websettings.c:487
msgid "Whether to show the transferbar"
msgstr "Om overførselsstatus skal vises"
-#: ../midori/midori-websettings.c:481
+#: ../midori/midori-websettings.c:495
msgid "Show Statusbar"
msgstr "Vis statusbjælke"
-#: ../midori/midori-websettings.c:482
+#: ../midori/midori-websettings.c:496
msgid "Whether to show the statusbar"
msgstr "Om statusbjælke vises"
-#: ../midori/midori-websettings.c:491
+#: ../midori/midori-websettings.c:505
msgid "Toolbar Style:"
msgstr "Værktøjsbjælkestil:"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:506
msgid "The style of the toolbar"
msgstr "Stilen for værktøjsbjælke"
-#: ../midori/midori-websettings.c:508
+#: ../midori/midori-websettings.c:522
msgid "Show progress in location entry"
msgstr "Vis fremgang i placeringindgang"
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:523
msgid "Whether to show loading progress in the location entry"
msgstr "Om visning af indlæsningsfremgang i placeringsindgang"
-#: ../midori/midori-websettings.c:524
+#: ../midori/midori-websettings.c:538
msgid "Search engines in location completion"
msgstr "Vis søgemaskiner i adresseudfyldelse"
-#: ../midori/midori-websettings.c:525
+#: ../midori/midori-websettings.c:539
msgid "Whether to show search engines in the location completion"
msgstr "Om søgemaskiner skal vises i adresseudfyldelsen"
-#: ../midori/midori-websettings.c:533
+#: ../midori/midori-websettings.c:547
msgid "Toolbar Items"
msgstr "Værktøjsbjælkes elementer"
-#: ../midori/midori-websettings.c:534
+#: ../midori/midori-websettings.c:548
msgid "The items to show on the toolbar"
msgstr "Elementer der vises på værktøjsbjælken"
-#: ../midori/midori-websettings.c:542
+#: ../midori/midori-websettings.c:556
msgid "Compact Sidepanel"
msgstr "Kompakt sidepanel"
-#: ../midori/midori-websettings.c:543
+#: ../midori/midori-websettings.c:557
msgid "Whether to make the sidepanel compact"
msgstr "Om sidepanelet skal være kompakt"
-#: ../midori/midori-websettings.c:558
+#: ../midori/midori-websettings.c:572
msgid "Show operating controls of the panel"
msgstr "Vis handlingskontroller til panelet"
-#: ../midori/midori-websettings.c:559
+#: ../midori/midori-websettings.c:573
msgid "Whether to show the operating controls of the panel"
msgstr "Om handlingskontroller til panelet skal vises"
-#: ../midori/midori-websettings.c:574
+#: ../midori/midori-websettings.c:588
msgid "Align sidepanel on the right"
msgstr "Opstil sidepanel til højre"
-#: ../midori/midori-websettings.c:575
+#: ../midori/midori-websettings.c:589
msgid "Whether to align the sidepanel on the right"
msgstr "Om sidepanelet skal være opstilles til højre"
-#: ../midori/midori-websettings.c:590
+#: ../midori/midori-websettings.c:604
msgid "Open panels in separate windows"
msgstr "Åbn paneler i separate vinduer"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:605
msgid "Whether to always open panels in separate windows"
msgstr "Om paneler altid skal åbnes i separate vinduer"
-#: ../midori/midori-websettings.c:600
+#: ../midori/midori-websettings.c:614
msgid "When Midori starts:"
msgstr "Når Midori starter:"
-#: ../midori/midori-websettings.c:601
+#: ../midori/midori-websettings.c:615
msgid "What to do when Midori starts"
msgstr "Hvad der skal ske når Midori startes"
-#: ../midori/midori-websettings.c:610
+#: ../midori/midori-websettings.c:624
msgid "Homepage:"
msgstr "Hjemmeside:"
-#: ../midori/midori-websettings.c:611
+#: ../midori/midori-websettings.c:625
msgid "The homepage"
msgstr "Hjemmesiden"
-#: ../midori/midori-websettings.c:626
+#: ../midori/midori-websettings.c:640
msgid "Show crash dialog"
msgstr "Vis nedbrudsdialog"
-#: ../midori/midori-websettings.c:627
+#: ../midori/midori-websettings.c:641
msgid "Show a dialog after Midori crashed"
msgstr "Vis en dialog efter nedbrud af Midori"
#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:643
+#: ../midori/midori-websettings.c:657
msgid "Show speed dial in new tabs"
msgstr "Vis hurtigopkald i nye faneblade"
-#: ../midori/midori-websettings.c:644
+#: ../midori/midori-websettings.c:658
msgid "Show speed dial in newly opened tabs"
msgstr "Vis hurtigopkald i nyligt åbnede faneblade"
-#: ../midori/midori-websettings.c:652
+#: ../midori/midori-websettings.c:666
msgid "Save downloaded files to:"
msgstr "Gem hentede filer til:"
-#: ../midori/midori-websettings.c:653
+#: ../midori/midori-websettings.c:667
msgid "The folder downloaded files are saved to"
msgstr "Mappen hvor nedhentede filer skal gemmes"
-#: ../midori/midori-websettings.c:674
+#: ../midori/midori-websettings.c:688
msgid "Ask for the destination folder"
msgstr "Spørg om målmappen"
-#: ../midori/midori-websettings.c:675
+#: ../midori/midori-websettings.c:689
msgid "Whether to ask for the destination folder when downloading a file"
msgstr "Om der skal spørges om målmappen ved hentning af fil"
-#: ../midori/midori-websettings.c:694
+#: ../midori/midori-websettings.c:708
msgid "Notify when a transfer has been completed"
msgstr "Påmindelse når en overførsel er gennemført"
-#: ../midori/midori-websettings.c:695
+#: ../midori/midori-websettings.c:709
msgid "Whether to show a notification when a transfer has been completed"
msgstr "Om der skal vises en påmindelse, når en overførsel er gennemført"
-#: ../midori/midori-websettings.c:707
+#: ../midori/midori-websettings.c:721
msgid "Download Manager"
msgstr "Håndtering af hentning"
-#: ../midori/midori-websettings.c:708
+#: ../midori/midori-websettings.c:722
msgid "An external download manager"
msgstr "En ekstern håndtering for nedhentning"
-#: ../midori/midori-websettings.c:716
+#: ../midori/midori-websettings.c:730
msgid "Text Editor"
msgstr "Tekstbehandler"
-#: ../midori/midori-websettings.c:717
+#: ../midori/midori-websettings.c:731
msgid "An external text editor"
msgstr "En ekstern tekstbehandler"
-#: ../midori/midori-websettings.c:732
+#: ../midori/midori-websettings.c:746
msgid "News Aggregator"
msgstr "Nyhedssamler"
-#: ../midori/midori-websettings.c:733
+#: ../midori/midori-websettings.c:747
msgid "An external news aggregator"
msgstr "En ekstern nyhedssamler"
-#: ../midori/midori-websettings.c:741
+#: ../midori/midori-websettings.c:755
msgid "Location entry Search"
msgstr "Søg for stedindgang"
-#: ../midori/midori-websettings.c:742
+#: ../midori/midori-websettings.c:756
msgid "The search to perform inside the location entry"
msgstr "Søgningen som skal foretages i placeringsindgang"
-#: ../midori/midori-websettings.c:750
+#: ../midori/midori-websettings.c:764
msgid "Preferred Encoding"
msgstr "Foretrukne tegnsæt"
-#: ../midori/midori-websettings.c:751
+#: ../midori/midori-websettings.c:765
msgid "The preferred character encoding"
msgstr "Foretrukne tegnsæt"
-#: ../midori/midori-websettings.c:761
+#: ../midori/midori-websettings.c:775
msgid "Always Show Tabbar"
msgstr "Vis altid fanebladsbjælke"
-#: ../midori/midori-websettings.c:762
+#: ../midori/midori-websettings.c:776
msgid "Always show the tabbar"
msgstr "Vis altid fanebladsbjælken"
-#: ../midori/midori-websettings.c:770
+#: ../midori/midori-websettings.c:784
msgid "Close Buttons on Tabs"
msgstr "Lukkeknapper på faneblade"
-#: ../midori/midori-websettings.c:771
+#: ../midori/midori-websettings.c:785
msgid "Whether tabs have close buttons"
msgstr "Om faneblade har lukkeknapper"
-#: ../midori/midori-websettings.c:779
+#: ../midori/midori-websettings.c:793
msgid "Open new pages in:"
msgstr "Åbn nye sider i:"
-#: ../midori/midori-websettings.c:780
+#: ../midori/midori-websettings.c:794
msgid "Where to open new pages"
msgstr "Hvor skal nye sider åbnes"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:803
msgid "Open external pages in:"
msgstr "Åbn eksterne sider i:"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:804
msgid "Where to open externally opened pages"
msgstr "Hvor skal eksterne sider åbnes"
-#: ../midori/midori-websettings.c:799
+#: ../midori/midori-websettings.c:813
msgid "Middle click opens Selection"
msgstr "Midterklik åbner for markering"
-#: ../midori/midori-websettings.c:800
+#: ../midori/midori-websettings.c:814
msgid "Load an address from the selection via middle click"
msgstr "Indlæs en adresse fra markeringen med midterklik"
-#: ../midori/midori-websettings.c:808
+#: ../midori/midori-websettings.c:822
msgid "Open tabs in the background"
msgstr "Åbn faneblade i baggrunden"
-#: ../midori/midori-websettings.c:809
+#: ../midori/midori-websettings.c:823
msgid "Whether to open new tabs in the background"
msgstr "Om nye faneblade skal åbnes i baggrunden"
-#: ../midori/midori-websettings.c:817
+#: ../midori/midori-websettings.c:831
msgid "Open Tabs next to Current"
msgstr "Åbn faneblad ved siden af nuværende"
-#: ../midori/midori-websettings.c:818
+#: ../midori/midori-websettings.c:832
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr "Om åbning af faneblade skal ske ved siden af nuværende eller efter sidste faneblad"
-#: ../midori/midori-websettings.c:826
+#: ../midori/midori-websettings.c:840
msgid "Open popups in tabs"
msgstr "Åbn pop op i faneblade"
-#: ../midori/midori-websettings.c:827
+#: ../midori/midori-websettings.c:841
msgid "Whether to open popup windows in tabs"
msgstr "Om pop op-vinduer skal åbnes i faneblade"
-#: ../midori/midori-websettings.c:837 ../extensions/statusbar-features.c:88
+#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88
msgid "Load images automatically"
msgstr "Indlæs billeder automatisk"
-#: ../midori/midori-websettings.c:838
+#: ../midori/midori-websettings.c:852
msgid "Load and display images automatically"
msgstr "Indlæs og vis billeder automatisk"
-#: ../midori/midori-websettings.c:845 ../extensions/statusbar-features.c:100
+#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100
msgid "Enable scripts"
msgstr "Brug skripter"
-#: ../midori/midori-websettings.c:846
+#: ../midori/midori-websettings.c:860
msgid "Enable embedded scripting languages"
msgstr "Slå indlejret skriptsprog til"
-#: ../midori/midori-websettings.c:853 ../extensions/statusbar-features.c:112
+#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112
msgid "Enable Netscape plugins"
msgstr "Slå Netscape-udvidelsesmoduler til"
-#: ../midori/midori-websettings.c:854
+#: ../midori/midori-websettings.c:868
msgid "Enable embedded Netscape plugin objects"
msgstr "Slå indlejrede Netscape-udvidelsesobjekter til"
-#: ../midori/midori-websettings.c:870
+#: ../midori/midori-websettings.c:884
msgid "Enable HTML5 database support"
msgstr "Slå HTML5 databaseunderstøttelse til"
-#: ../midori/midori-websettings.c:871
+#: ../midori/midori-websettings.c:885
msgid "Whether to enable HTML5 database support"
msgstr "Om understøttelse af database til HTML5 skal slås til"
-#: ../midori/midori-websettings.c:877
+#: ../midori/midori-websettings.c:891
msgid "Enable HTML5 local storage support"
msgstr "Slå understøttelse af lokal lagring af HTML5 til"
-#: ../midori/midori-websettings.c:878
+#: ../midori/midori-websettings.c:892
msgid "Whether to enable HTML5 local storage support"
msgstr "Om understøttelse af lokal lagring af HTML5 skal slås til"
-#: ../midori/midori-websettings.c:886
+#: ../midori/midori-websettings.c:900
msgid "Enable offline web application cache"
msgstr "Slå ikke forbundet webprograms mellemlager til"
-#: ../midori/midori-websettings.c:887
+#: ../midori/midori-websettings.c:901
msgid "Whether to enable offline web application cache"
msgstr "Om ikke forbundet webprograms mellemlager skal slås til"
-#: ../midori/midori-websettings.c:912
+#: ../midori/midori-websettings.c:926
msgid "Zoom Text and Images"
msgstr "Zoom tekst og billeder"
-#: ../midori/midori-websettings.c:913
+#: ../midori/midori-websettings.c:927
msgid "Whether to zoom text and images"
msgstr "Om zoom af tekst og billeder"
-#: ../midori/midori-websettings.c:928
+#: ../midori/midori-websettings.c:942
msgid "Find inline while typing"
msgstr "Find indlejret mens du taster"
-#: ../midori/midori-websettings.c:929
+#: ../midori/midori-websettings.c:943
msgid "Whether to automatically find inline while typing"
msgstr "Om indlejret skal findes automatisk, mens du taster"
-#: ../midori/midori-websettings.c:944
+#: ../midori/midori-websettings.c:958
msgid "Kinetic scrolling"
msgstr "Bevægelsesrulning"
-#: ../midori/midori-websettings.c:945
+#: ../midori/midori-websettings.c:959
msgid "Whether scrolling should kinetically move according to speed"
msgstr "Om rulning skal ske med bevægelseshastighed eller ej"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:967
msgid "Accept cookies"
msgstr "Tillad cookies"
-#: ../midori/midori-websettings.c:954
+#: ../midori/midori-websettings.c:968
msgid "What type of cookies to accept"
msgstr "Hvilke typer af cookes skal tillades"
-#: ../midori/midori-websettings.c:970
+#: ../midori/midori-websettings.c:984
msgid "Original cookies only"
msgstr "Kun for originale cookies"
-#: ../midori/midori-websettings.c:971
+#: ../midori/midori-websettings.c:985
msgid "Accept cookies from the original website only"
msgstr "Tillad kun cookies fra original websted"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:993
msgid "Maximum cookie age"
msgstr "Maksimal cookie-levetid"
-#: ../midori/midori-websettings.c:980
+#: ../midori/midori-websettings.c:994
msgid "The maximum number of days to save cookies for"
msgstr "Maksimal antal dage cookies skal gemmes"
-#: ../midori/midori-websettings.c:997
+#: ../midori/midori-websettings.c:1011
msgid "Remember last visited pages"
msgstr "Husk sidste besøgte sider"
-#: ../midori/midori-websettings.c:998
+#: ../midori/midori-websettings.c:1012
msgid "Whether the last visited pages are saved"
msgstr "Om sidste besøgte sider skal gemmes"
-#: ../midori/midori-websettings.c:1006
+#: ../midori/midori-websettings.c:1020
msgid "Maximum history age"
msgstr "Maksimal historik-levetid"
-#: ../midori/midori-websettings.c:1007
+#: ../midori/midori-websettings.c:1021
msgid "The maximum number of days to save the history for"
msgstr "Maksimale antal dage som historik skal gemmes"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1029
msgid "Remember last downloaded files"
msgstr "Husk sidste hentede filer"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:1030
msgid "Whether the last downloaded files are saved"
msgstr "Om sidste hentede filer skal gemmes"
-#: ../midori/midori-websettings.c:1026
-msgid "Proxy Server"
+#: ../midori/midori-websettings.c:1047
+msgid "Proxy server"
msgstr "Proxyserver"
-#: ../midori/midori-websettings.c:1027
+#: ../midori/midori-websettings.c:1048
+msgid "The type of proxy server to use"
+msgstr "Proxyservertypen som skal bruges"
+
+#: ../midori/midori-websettings.c:1057
+msgid "HTTP Proxy Server"
+msgstr "HTTP-proxyserver"
+
+#: ../midori/midori-websettings.c:1058
msgid "The proxy server used for HTTP connections"
msgstr "Proxyserveren som bruges til HTTP-forbindelser"
-#: ../midori/midori-websettings.c:1042
+#: ../midori/midori-websettings.c:1073
msgid "Detect proxy server automatically"
msgstr "Genkend automatisk proxyserver"
-#: ../midori/midori-websettings.c:1043
+#: ../midori/midori-websettings.c:1074
msgid "Whether to detect the proxy server automatically from the environment"
msgstr "Om proxyserveren genkendes automatisk fra miljøet"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1059
+#: ../midori/midori-websettings.c:1090
msgid "Identify as"
msgstr "Identificér som"
-#: ../midori/midori-websettings.c:1060
+#: ../midori/midori-websettings.c:1091
msgid "What to identify as to web pages"
msgstr "Hvad skal genkendes som web-sider"
-#: ../midori/midori-websettings.c:1076
+#: ../midori/midori-websettings.c:1107
msgid "Identification string"
msgstr "Identifikationsstreng"
-#: ../midori/midori-websettings.c:1077
+#: ../midori/midori-websettings.c:1108
msgid "The application identification string"
msgstr "Programmets identifikationsstreng"
-#: ../midori/midori-websettings.c:1092
+#: ../midori/midori-websettings.c:1123
msgid "Preferred languages"
msgstr "Foretrukne sprog"
-#: ../midori/midori-websettings.c:1093
+#: ../midori/midori-websettings.c:1124
msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
msgstr "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:1108
+#: ../midori/midori-websettings.c:1139
msgid "Clear private data"
msgstr "Ryd private data"
-#: ../midori/midori-websettings.c:1109
+#: ../midori/midori-websettings.c:1140
msgid "The private data selected for deletion"
msgstr "De private data valgt til sletning"
@@ -1609,337 +1668,357 @@ msgstr "De private data valgt til sletning"
#. 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:956 ../midori/midori-view.c:4190
-#: ../midori/midori-view.c:4194
+#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528
+#: ../midori/midori-view.c:4532
#, c-format
msgid "Error - %s"
msgstr "Fejl - %s"
-#: ../midori/midori-view.c:957
+#: ../midori/midori-view.c:1262
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Siden '%s' kunne ikke indlæses."
-#: ../midori/midori-view.c:962
+#: ../midori/midori-view.c:1264
msgid "Try again"
msgstr "Prøv igen"
#. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:1002
+#: ../midori/midori-view.c:1283
#, c-format
msgid "Not found - %s"
msgstr "Ikke fundet - %s"
-#: ../midori/midori-view.c:1225 ../midori/midori-view.c:2081
+#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357
#, c-format
msgid "Send a message to %s"
msgstr "Send en besked til %s"
-#: ../midori/midori-view.c:1850 ../midori/midori-view.c:2243
+#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519
msgid "Inspect _Element"
msgstr "Undersøg _element"
-#: ../midori/midori-view.c:1902 ../midori/midori-view.c:1980
-msgid "Open _Link"
-msgstr "Åbn _henvisning"
-
-#: ../midori/midori-view.c:1905 ../midori/midori-view.c:1982
+#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261
msgid "Open Link in New _Tab"
msgstr "Åbn henvisning i nyt _faneblad"
-#: ../midori/midori-view.c:1909
+#: ../midori/midori-view.c:2195
msgid "Open Link in _Foreground Tab"
msgstr "Åbn henvisning i _fanebladet i forgrunden"
-#: ../midori/midori-view.c:1910
+#: ../midori/midori-view.c:2196
msgid "Open Link in _Background Tab"
msgstr "Åbn henvisning i _faneblad i baggrunden"
-#: ../midori/midori-view.c:1913 ../midori/midori-view.c:1989
+#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268
msgid "Open Link in New _Window"
msgstr "Åbn henvisning i nyt _vindue"
-#: ../midori/midori-view.c:1916
+#: ../midori/midori-view.c:2202
msgid "Open Link as Web A_pplication"
msgstr "Åbn henvisning som et _webprogram"
-#: ../midori/midori-view.c:1919
+#: ../midori/midori-view.c:2205
msgid "Copy Link de_stination"
msgstr "Kopiér _henvisningsdestination"
-#: ../midori/midori-view.c:1922 ../midori/midori-view.c:2001
+#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280
msgid "_Save Link destination"
msgstr "_Gem henvisningsadresse"
-#: ../midori/midori-view.c:1923 ../midori/midori-view.c:1995
+#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274
msgid "_Download Link destination"
msgstr "_Hent henvisningsadressen"
-#: ../midori/midori-view.c:1927 ../midori/midori-view.c:1963
-#: ../midori/midori-view.c:2006
+#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243
+#: ../midori/midori-view.c:2285
msgid "Download with Download _Manager"
msgstr "Hent med nedhentnings_håndtering"
-#: ../midori/midori-view.c:1939
+#: ../midori/midori-view.c:2222
msgid "Open _Image in New Tab"
msgstr "Åbn _billede i nyt faneblad"
-#: ../midori/midori-view.c:1942
-msgid "Open Image in New Wi_ndow"
-msgstr "Åbn billede i nyt _vindue"
-
-#: ../midori/midori-view.c:1945
+#: ../midori/midori-view.c:2225
msgid "Copy Image _Address"
msgstr "Kopiér billed_adresse"
-#: ../midori/midori-view.c:1948
+#: ../midori/midori-view.c:2228
msgid "Save I_mage"
msgstr "Gem _billede"
-#: ../midori/midori-view.c:1949
+#: ../midori/midori-view.c:2229
msgid "Download I_mage"
msgstr "Hent bi_llede"
-#: ../midori/midori-view.c:1956
+#: ../midori/midori-view.c:2236
msgid "Copy Video _Address"
msgstr "Kopiér vide_oadresse"
-#: ../midori/midori-view.c:1959
+#: ../midori/midori-view.c:2239
msgid "Save _Video"
msgstr "Gem _video"
-#: ../midori/midori-view.c:1959
+#: ../midori/midori-view.c:2239
msgid "Download _Video"
msgstr "Hent _video"
-#: ../midori/midori-view.c:2026
+#: ../midori/midori-view.c:2302
msgid "Search _with"
msgstr "Søg _med"
-#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2068
+#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344
msgid "_Search the Web"
msgstr "_Søg internettet"
-#: ../midori/midori-view.c:2089
+#: ../midori/midori-view.c:2365
msgid "Open Address in New _Tab"
msgstr "Åbn adresse i nyt _faneblad"
-#: ../midori/midori-view.c:2375
+#: ../midori/midori-view.c:2662
msgid "Open or download file"
msgstr "Åbn eller hent fil"
-#: ../midori/midori-view.c:2398
+#: ../midori/midori-view.c:2681
#, c-format
msgid "File Type: '%s'"
msgstr "Filtype: '%s'"
-#: ../midori/midori-view.c:2401
+#: ../midori/midori-view.c:2684
#, c-format
msgid "File Type: %s ('%s')"
msgstr "Filtype: %s ('%s')"
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2405
+#: ../midori/midori-view.c:2688
#, c-format
msgid "Open %s"
msgstr "Åbn %s"
-#: ../midori/midori-view.c:2920
+#: ../midori/midori-view.c:3236
#, c-format
msgid "Inspect page - %s"
msgstr "Undersøg side - %s"
-#: ../midori/midori-view.c:3181
+#: ../midori/midori-view.c:3501
msgid "Speed dial"
msgstr "Hurtigopkald"
-#: ../midori/midori-view.c:3182
+#: ../midori/midori-view.c:3502
msgid "Click to add a shortcut"
msgstr "Klik for at tilføje en genvej"
-#: ../midori/midori-view.c:3183
+#: ../midori/midori-view.c:3503
msgid "Enter shortcut address"
msgstr "Tast genvejsadresse"
-#: ../midori/midori-view.c:3184
+#: ../midori/midori-view.c:3504
msgid "Enter shortcut title"
msgstr "Tast en genvejstitel"
-#: ../midori/midori-view.c:3185
+#: ../midori/midori-view.c:3505
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:3221
+#: ../midori/midori-view.c:3506
+msgid "Set number of columns"
+msgstr "Indstil antal af kolonner"
+
+#: ../midori/midori-view.c:3507
+msgid "Enter number of columns:"
+msgstr "Angiv antal kolonner:"
+
+#: ../midori/midori-view.c:3508
+msgid "Set number of shortcuts"
+msgstr "Indstil antal af genveje"
+
+#: ../midori/midori-view.c:3509
+msgid "Enter number of shortcuts:"
+msgstr "Angiv antal af genveje:"
+
+#: ../midori/midori-view.c:3535
#, c-format
msgid "Document cannot be displayed"
msgstr "Dokument kan ikke vises"
-#: ../midori/midori-view.c:3244
+#: ../midori/midori-view.c:3558
#, c-format
msgid "No documentation installed"
msgstr "Ingen dokumentation installeret"
-#: ../midori/midori-view.c:3467
+#: ../midori/midori-view.c:3808
msgid "Blank page"
msgstr "Blank side"
-#: ../midori/midori-view.c:3727
+#: ../midori/midori-view.c:4068
msgid "_Duplicate Tab"
msgstr "_Dublér faneblad"
-#: ../midori/midori-view.c:3732
+#: ../midori/midori-view.c:4073
msgid "_Restore Tab"
msgstr "_Gendan faneblad"
-#: ../midori/midori-view.c:3732
+#: ../midori/midori-view.c:4073
msgid "_Minimize Tab"
msgstr "_Minimér faneblad"
-#: ../midori/midori-view.c:3738
+#: ../midori/midori-view.c:4079
msgid "Close ot_her Tabs"
msgstr "Luk a_ndre faneblade"
-#: ../midori/midori-view.c:4362
+#: ../midori/midori-view.c:4700
msgid "Print background images"
msgstr "Udskriv baggrundsbilleder"
-#: ../midori/midori-view.c:4363
+#: ../midori/midori-view.c:4701
msgid "Whether background images should be printed"
msgstr "Om baggrundsbilleder skal udskrives"
-#: ../midori/midori-view.c:4415 ../midori/midori-preferences.c:382
+#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381
msgid "Features"
msgstr "Funktionalitet"
#. Page "General"
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:298
msgid "General"
msgstr "Generel"
-#: ../midori/midori-preferences.c:300
+#: ../midori/midori-preferences.c:299
msgid "Startup"
msgstr "Opstart"
-#: ../midori/midori-preferences.c:315 ../midori/midori-preferences.c:322
+#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321
msgid "Use current page as homepage"
msgstr "Brug nuværende side som hjemmeside"
-#: ../midori/midori-preferences.c:332 ../panels/midori-transfers.c:87
+#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Overførsler"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:350
+#: ../midori/midori-preferences.c:349
msgid "Appearance"
msgstr "Udseende"
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:350
msgid "Font settings"
msgstr "Indstillinger for skrifttype"
-#: ../midori/midori-preferences.c:353
+#: ../midori/midori-preferences.c:352
msgid "Default Font Family"
msgstr "Standard for skrifttypefamilie"
-#: ../midori/midori-preferences.c:356
+#: ../midori/midori-preferences.c:355
msgid "The default font family used to display text"
msgstr "Standard skrifttype til visning af tekst"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:358
msgid "The default font size used to display text"
msgstr "Størrelse af standardskriftstype er brugt til at vise tekst"
-#: ../midori/midori-preferences.c:361
+#: ../midori/midori-preferences.c:360
msgid "Fixed-width Font Family"
msgstr "Fastbredde skrifttype"
-#: ../midori/midori-preferences.c:364
+#: ../midori/midori-preferences.c:363
msgid "The font family used to display fixed-width text"
msgstr "Skrifttypen til visning af fastbredde tekst"
-#: ../midori/midori-preferences.c:367
+#: ../midori/midori-preferences.c:366
msgid "The font size used to display fixed-width text"
msgstr "Skrifttypen til visning af tekst med fastbredde"
-#: ../midori/midori-preferences.c:369
+#: ../midori/midori-preferences.c:368
msgid "Minimum Font Size"
msgstr "Minimal skriftstørrelse"
-#: ../midori/midori-preferences.c:372
+#: ../midori/midori-preferences.c:371
msgid "The minimum font size used to display text"
msgstr "Minimum størrelse af skrifttype til at vise tekst"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:381
+#: ../midori/midori-preferences.c:380
msgid "Behavior"
msgstr "Opførsel"
-#: ../midori/midori-preferences.c:394
+#: ../midori/midori-preferences.c:393
msgid "Enforce 96 dots per inch"
msgstr "Gennemtving 96 dots per tomme"
-#: ../midori/midori-preferences.c:395
+#: ../midori/midori-preferences.c:394
msgid "Enforce a video dot density of 96 DPI"
msgstr "Gennemtving tæthed af videopunkt på 96 DPI"
#: ../midori/midori-preferences.c:414
+msgid "Allow scripts to open popups"
+msgstr "Tillad skripter at åbne pop op."
+
+#: ../midori/midori-preferences.c:415
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Om skripter er tilladt at åbne pop opvinduer automatisk"
+
+#: ../midori/midori-preferences.c:419
msgid "Spell Checking"
msgstr "Stavekontrol"
-#: ../midori/midori-preferences.c:417
+#: ../midori/midori-preferences.c:422
msgid "Enable Spell Checking"
msgstr "Slå stavekontrol til"
-#: ../midori/midori-preferences.c:418
+#: ../midori/midori-preferences.c:423
msgid "Enable spell checking while typing"
msgstr "Slå stavekontrol til mens du taster"
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:425
msgid "Spelling dictionaries:"
msgstr "Stavekontroller:"
#. i18n: The example should be adjusted to contain a good local default
-#: ../midori/midori-preferences.c:424
+#: ../midori/midori-preferences.c:429
msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\""
msgstr "En kommaadskilt liste over sprog til at blive brugt til stavekontrol eksempelvis \"en_GB,de_DE\""
#. Page "Interface"
-#: ../midori/midori-preferences.c:430
+#: ../midori/midori-preferences.c:435
msgid "Interface"
msgstr "Grænseflade"
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:436
msgid "Navigationbar"
msgstr "Navigeringsbjælke"
-#: ../midori/midori-preferences.c:441
+#: ../midori/midori-preferences.c:446
msgid "Browsing"
msgstr "Browsing"
#. Page "Applications"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:468
msgid "Applications"
msgstr "Programmer"
-#: ../midori/midori-preferences.c:464
+#: ../midori/midori-preferences.c:469
msgid "External applications"
msgstr "Eksterne programmer"
#. Page "Network"
-#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481
+#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486
msgid "Network"
msgstr "Netværk"
+#: ../midori/midori-preferences.c:492
+msgid "Hostname"
+msgstr "Værtsnavn"
+
#. Page "Privacy"
-#: ../midori/midori-preferences.c:505
+#: ../midori/midori-preferences.c:511
msgid "Privacy"
msgstr "Beskyttelse af privatliv"
-#: ../midori/midori-preferences.c:506
+#: ../midori/midori-preferences.c:512
msgid "Web Cookies"
msgstr "Web-cookies"
-#: ../midori/midori-preferences.c:515 ../midori/midori-preferences.c:529
+#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535
msgid "days"
msgstr "dage"
@@ -1971,81 +2050,67 @@ msgstr "Håndtér søgemaskiner"
msgid "Use as _default"
msgstr "Brug som _standard"
-#: ../midori/sokoke.c:1255
+#: ../midori/sokoke.c:1294
msgid "_Bookmark"
msgstr "_Bogmærke"
-#: ../midori/sokoke.c:1257
+#: ../midori/sokoke.c:1296
msgid "Add Boo_kmark"
msgstr "_Tilføj bogmærke"
-#: ../midori/sokoke.c:1258
+#: ../midori/sokoke.c:1297
msgid "_Console"
msgstr "_Konsol"
-#: ../midori/sokoke.c:1259
+#: ../midori/sokoke.c:1298
msgid "_Extensions"
msgstr "_Udvidelser"
-#: ../midori/sokoke.c:1260
+#: ../midori/sokoke.c:1299
msgid "_History"
msgstr "Hi_storik"
-#: ../midori/sokoke.c:1261
+#: ../midori/sokoke.c:1300
msgid "_Homepage"
msgstr "_Hjemmeside"
-#: ../midori/sokoke.c:1262
+#: ../midori/sokoke.c:1301
msgid "_Userscripts"
msgstr "Brugerskri_pter"
-#: ../midori/sokoke.c:1263
+#: ../midori/sokoke.c:1302
msgid "New _Tab"
msgstr "Nyt _faneblad"
-#: ../midori/sokoke.c:1264
+#: ../midori/sokoke.c:1303
msgid "_Transfers"
msgstr "_Overførsler"
-#: ../midori/sokoke.c:1265
+#: ../midori/sokoke.c:1304
msgid "Netscape p_lugins"
msgstr "Netscape-u_dvidelsesmoduler"
-#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144
-msgid "Userscripts"
-msgstr "Brugerskripter"
-
-#: ../panels/midori-addons.c:100
-msgid "Userstyles"
-msgstr "Brugerstile"
-
-#: ../panels/midori-addons.c:305
-#, c-format
-msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-msgstr "Kopiér brugerskripter til mappen %s og kopiér brugerstile til mappen %s."
-
-#: ../panels/midori-addons.c:911
-#, c-format
-msgid "Can't monitor folder '%s': %s"
-msgstr "Kan ikke overvåge mappe '%s': %s"
+#: ../midori/sokoke.c:1307
+msgid "New _Folder"
+msgstr "Ny __mappe"
#: ../panels/midori-bookmarks.c:111
msgid "Bookmarks"
msgstr "Bogmærker"
-#: ../panels/midori-bookmarks.c:250
+#: ../panels/midori-bookmarks.c:241
msgid "Edit the selected bookmark"
msgstr "Redigér det valgte bogmærke"
-#: ../panels/midori-bookmarks.c:258
+#: ../panels/midori-bookmarks.c:249
msgid "Delete the selected bookmark"
msgstr "Slet det valgte bogmærke"
-#: ../panels/midori-bookmarks.c:278
+#: ../panels/midori-bookmarks.c:262
msgid "Add a new folder"
msgstr "Tilføj en ny mappe"
-#: ../panels/midori-bookmarks.c:608
+#: ../panels/midori-bookmarks.c:592
msgid "Separator"
msgstr "Separator"
@@ -2053,6 +2118,14 @@ msgstr "Separator"
msgid "Console"
msgstr "Konsol"
+#: ../panels/midori-console.c:361
+msgid "Copy _All"
+msgstr "Kopiér _alt"
+
+#: ../panels/midori-console.c:362
+msgid "Copy All"
+msgstr "Kopiér alt"
+
#: ../panels/midori-extensions.c:91
msgid "Extensions"
msgstr "Udvidelser"
@@ -2088,28 +2161,28 @@ msgstr "I går"
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:438
+#: ../panels/midori-history.c:437
msgid "Bookmark the selected history item"
msgstr "Bogmærk det valgte historikelement"
-#: ../panels/midori-history.c:447
+#: ../panels/midori-history.c:446
msgid "Delete the selected history item"
msgstr "Slet det valgte historikelement"
-#: ../panels/midori-history.c:455
+#: ../panels/midori-history.c:454
msgid "Clear the entire history"
msgstr "Ryd hele historikken"
-#: ../panels/midori-history.c:953
+#: ../panels/midori-history.c:952
#: ../extensions/cookie-manager/cookie-manager-page.c:1144
msgid "Filter:"
msgstr "Filter:"
-#: ../panels/midori-transfers.c:479
+#: ../panels/midori-transfers.c:478
msgid "Open Destination _Folder"
msgstr "Åbn mål_mappen"
-#: ../panels/midori-transfers.c:482
+#: ../panels/midori-transfers.c:481
msgid "Copy Link Loc_ation"
msgstr "Kopiér henvisnings_sted"
@@ -2137,30 +2210,30 @@ msgstr "Adgangskode"
msgid "_Remember password"
msgstr "_Husk adgangskode"
-#: ../katze/katze-throbber.c:842
+#: ../katze/katze-throbber.c:882
#, c-format
msgid "Named icon '%s' couldn't be loaded"
msgstr "Angivet ikon '%s' blev ikke indlæst"
-#: ../katze/katze-throbber.c:855
+#: ../katze/katze-throbber.c:895
#, c-format
msgid "Stock icon '%s' couldn't be loaded"
msgstr "Lagerikon '%s' kunne ikke indlæses"
-#: ../katze/katze-throbber.c:923
+#: ../katze/katze-throbber.c:963
msgid "Animation frames are broken"
msgstr "Animeringsrammer er ødelagt"
-#: ../katze/katze-utils.c:494 ../katze/katze-utils.c:889
+#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Egenskab '%s' er ikke gyldig for %s"
-#: ../katze/katze-utils.c:540 ../katze/katze-utils.c:569
+#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573
msgid "Choose file"
msgstr "Vælg fil"
-#: ../katze/katze-utils.c:555
+#: ../katze/katze-utils.c:559
msgid "Choose folder"
msgstr "Vælg mappe"
@@ -2169,48 +2242,79 @@ msgstr "Vælg mappe"
msgid "Preferences for %s"
msgstr "Indstillinger for %s"
-#: ../extensions/adblock.c:398
+#: ../extensions/adblock.c:415
msgid "Configure Advertisement filters"
msgstr "Indstil reklamefiltre"
-#: ../extensions/adblock.c:430
+#: ../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 "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:570
+#: ../extensions/adblock.c:587
msgid "Configure _Advertisement filters..."
msgstr "Indstil _reklamefiltre..."
-#: ../extensions/adblock.c:818
+#: ../extensions/adblock.c:841
msgid "Edit rule"
msgstr "Redigér regel"
-#: ../extensions/adblock.c:831
+#: ../extensions/adblock.c:854
msgid "_Rule:"
msgstr "_Regel:"
-#: ../extensions/adblock.c:885
+#: ../extensions/adblock.c:908
msgid "Bl_ock image"
msgstr "Bl_okér billede"
-#: ../extensions/adblock.c:890
+#: ../extensions/adblock.c:913
msgid "Bl_ock link"
msgstr "Bl_okér henvisning"
-#: ../extensions/adblock.c:1447
+#: ../extensions/adblock.c:1489
msgid "Advertisement blocker"
msgstr "Blokering af reklamer"
-#: ../extensions/adblock.c:1448
+#: ../extensions/adblock.c:1490
msgid "Block advertisements according to a filter list"
msgstr "Blokér reklamer i henhold til en filterliste"
-#: ../extensions/colorful-tabs.c:136
+#: ../extensions/addons.c:122
+#, c-format
+msgid "Copy %s to the folder %s."
+msgstr "Kopiér %s til mappen %s."
+
+#: ../extensions/addons.c:177
+msgid "Userscripts"
+msgstr "Brugerskripter"
+
+#: ../extensions/addons.c:179
+msgid "Userstyles"
+msgstr "Brugerstile"
+
+#: ../extensions/addons.c:1085
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr "Indstillingen af udvidelsesmodulet '%s' kunne ikke gemmes: %s\n"
+
+#: ../extensions/addons.c:1086 ../extensions/addons.c:1253
+msgid "User addons"
+msgstr "Brug udvidelsesm,oduler"
+
+#: ../extensions/addons.c:1210
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "Kan ikke overvåge mappe '%s': %s"
+
+#: ../extensions/addons.c:1254
+msgid "Support for userscripts and userstyles"
+msgstr "Understøttelse af brugerskripter og brugerstile"
+
+#: ../extensions/colorful-tabs.c:204
msgid "Colorful Tabs"
msgstr "Farvefulde faneblade"
-#: ../extensions/colorful-tabs.c:137
+#: ../extensions/colorful-tabs.c:205
msgid "Tint each tab distinctly"
msgstr "Ton hvert faneblad tydeligt"
@@ -2309,11 +2413,11 @@ msgstr "_Cookiehåndtering"
msgid "List, view and delete cookies"
msgstr "Vis, gennemse og slet cookies"
-#: ../extensions/feed-panel/feed-atom.c:237
+#: ../extensions/feed-panel/feed-atom.c:209
msgid "Failed to find required Atom \"entry\" elements in XML data."
msgstr "Kunne ikke finde anmodede Atom \"post\"-elementerne i XML-data."
-#: ../extensions/feed-panel/feed-atom.c:343
+#: ../extensions/feed-panel/feed-atom.c:315
msgid "Failed to find required Atom \"feed\" elements in XML data."
msgstr "Kunne ikke finde anmodede Atom \"feed\"-elementerne i XML-data."
@@ -2324,19 +2428,19 @@ msgctxt "Feed"
msgid "Last updated: %s."
msgstr "Sidst opdateret: %s."
-#: ../extensions/feed-panel/feed-panel.c:667
+#: ../extensions/feed-panel/feed-panel.c:671
msgid "Feeds"
msgstr "Feeds"
-#: ../extensions/feed-panel/feed-panel.c:720
+#: ../extensions/feed-panel/feed-panel.c:724
msgid "Add new feed"
msgstr "Tilføj nyt feed"
-#: ../extensions/feed-panel/feed-panel.c:727
+#: ../extensions/feed-panel/feed-panel.c:731
msgid "Delete feed"
msgstr "Slet feed"
-#: ../extensions/feed-panel/feed-panel.c:810
+#: ../extensions/feed-panel/feed-panel.c:814
msgid "_Feeds"
msgstr "_Feeds"
@@ -2415,11 +2519,11 @@ msgstr "Resourcefiler er ikke installeret"
msgid "Form history filler"
msgstr "Historikfylder til formular"
-#: ../extensions/mouse-gestures.c:288
+#: ../extensions/mouse-gestures.c:303
msgid "Mouse Gestures"
msgstr "Musebevægelser"
-#: ../extensions/mouse-gestures.c:289
+#: ../extensions/mouse-gestures.c:304
msgid "Control Midori by moving the mouse"
msgstr "Styr Midori ved at flytte musen"
@@ -2472,23 +2576,23 @@ msgstr "Status funktioner"
msgid "Easily toggle features on web pages on and off"
msgstr "Slå nemt netsiders funktioner til/fra"
-#: ../extensions/tab-panel.c:565 ../extensions/tab-panel.c:622
+#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625
msgid "Tab Panel"
msgstr "Fanebladpanel"
-#: ../extensions/tab-panel.c:606
+#: ../extensions/tab-panel.c:609
msgid "T_ab Panel"
msgstr "Faneblad_panel"
-#: ../extensions/tab-panel.c:623
+#: ../extensions/tab-panel.c:626
msgid "Show tabs in a vertical panel"
msgstr "Vis faneblade i et lodret panel"
-#: ../extensions/tab-switcher.c:394
+#: ../extensions/tab-switcher.c:395
msgid "Tab History List"
msgstr "Fanebladshistorik"
-#: ../extensions/tab-switcher.c:395
+#: ../extensions/tab-switcher.c:396
msgid "Allows to switch tabs by choosing from a list sorted by last usage"
msgstr "Tillad at skifte faneblade ved at vælge fra en liste sorteret efter seneste brug"
@@ -2524,6 +2628,15 @@ msgstr "Redigér nemt layout af værktøjsbjælken"
msgid "Cache HTTP communication on disk"
msgstr "Cache HTTP-kommunikation på disk"
+#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s."
+#~ msgstr "Kopiér brugerskripter til mappen %s og kopiér brugerstile til mappen %s."
+
+#~ msgid "Open _Link"
+#~ msgstr "Åbn _henvisning"
+
+#~ msgid "Open Image in New Wi_ndow"
+#~ msgstr "Åbn billede i nyt _vindue"
+
#~ msgid "Not available on this platform"
#~ msgstr "Ikke tilgængeligt på denne platform"
diff --git a/po/de.po b/po/de.po
index 02878d5e..990a3201 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,12 +6,13 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: midori 0.2.3\n"
+"Project-Id-Version: midori 0.2.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 19:02+0100\n"
+"POT-Creation-Date: 2010-05-24 12:49+0200\n"
"PO-Revision-Date: 2009-04-30 00:15+0100\n"
"Last-Translator: Christian Dywan \n"
"Language-Team: German \n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -21,9 +22,9 @@ msgstr ""
msgid "Lightweight web browser"
msgstr "Schlanker Internetbetrachter"
-#: ../data/midori.desktop.in.h:2 ../midori/main.c:1310 ../midori/main.c:1541
-#: ../midori/main.c:1549 ../midori/main.c:1565
-#: ../midori/midori-websettings.c:299
+#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664
+#: ../midori/main.c:1672 ../midori/main.c:1688
+#: ../midori/midori-websettings.c:313
msgid "Midori"
msgstr "Midori"
@@ -31,59 +32,64 @@ msgstr "Midori"
msgid "Web Browser"
msgstr "Internetbetrachter"
-#: ../midori/main.c:96
+#: ../midori/main.c:102
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Die Konfiguration konnte nicht geladen werden: %s\n"
-#: ../midori/main.c:145
+#: ../midori/main.c:151
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Wert »%s« ist ungültig für %s"
-#: ../midori/main.c:152 ../midori/main.c:238
+#: ../midori/main.c:158 ../midori/main.c:244
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Ungültiger Einstellungswert »%s«"
-#: ../midori/main.c:364 ../extensions/formhistory.c:446
+#: ../midori/main.c:370 ../extensions/formhistory.c:446
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Datenbank konnte nicht geöffnet werden: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:419
+#: ../midori/main.c:425
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n"
-#: ../midori/main.c:439
+#: ../midori/main.c:445
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Die Konfiguration konnte nicht geladen werden. %s"
-#: ../midori/main.c:477
+#: ../midori/main.c:483
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Die Suchmaschinen konnten nicht geladen werden. %s"
-#: ../midori/main.c:496 ../midori/main.c:546 ../midori/main.c:566
+#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572
#, c-format
msgid "The bookmarks couldn't be saved. %s"
msgstr "Die Lesezeichen konnten nicht geladen werden. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:596 ../midori/main.c:619
+#: ../midori/main.c:602 ../midori/main.c:625
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Der Papierkorb konnte nicht gespeichert werden. %s"
-#: ../midori/main.c:683 ../midori/main.c:898
+#: ../midori/main.c:684 ../midori/main.c:924
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Die Sitzung konnte nicht geladen werden. %s"
-#: ../midori/main.c:932
+#: ../midori/main.c:868
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+
+#: ../midori/main.c:958
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -91,121 +97,138 @@ msgstr ""
"Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. "
"Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt."
-#: ../midori/main.c:947
+#: ../midori/main.c:973
msgid "Modify _preferences"
msgstr "_Einstellungen bearbeiten"
-#: ../midori/main.c:951
+#: ../midori/main.c:977
msgid "Reset the last _session"
msgstr "Die letzte _Sitzung zurücksetzen"
-#: ../midori/main.c:956
+#: ../midori/main.c:982
msgid "Disable all _extensions"
msgstr "Alle Er_weiterungen ausschalten"
-#: ../midori/main.c:1191 ../midori/main.c:1805
+#: ../midori/main.c:1217 ../midori/main.c:1937
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Die Sitzung konnte nicht geladen werden: %s\n"
-#: ../midori/main.c:1310
+#: ../midori/main.c:1336
msgid "No filename specified"
msgstr "Kein Dateiname angegeben"
-#: ../midori/main.c:1329
+#: ../midori/main.c:1355
msgid "An unknown error occured."
msgstr "Ein unbekannter Fehler ist aufgetreten."
-#: ../midori/main.c:1360
+#: ../midori/main.c:1386
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Schnappschuss gespeichert: %s\n"
-#: ../midori/main.c:1443
+#: ../midori/main.c:1557
msgid "Run ADDRESS as a web application"
msgstr "ADRESSE als Internetanwendung starten"
-#: ../midori/main.c:1443
+#: ../midori/main.c:1557
msgid "ADDRESS"
msgstr "ADRESSE"
-#: ../midori/main.c:1446
+#: ../midori/main.c:1560
msgid "Use FOLDER as configuration folder"
msgstr "ORDNER als Konfigurationsordner benutzen"
-#: ../midori/main.c:1446
+#: ../midori/main.c:1560
msgid "FOLDER"
msgstr "ORDNER"
-#: ../midori/main.c:1449
+#: ../midori/main.c:1563
msgid "Show a diagnostic dialog"
msgstr "Diagnosedialog anzeigen"
-#: ../midori/main.c:1451
+#: ../midori/main.c:1565
msgid "Run the specified filename as javascript"
msgstr "Angegebenen Dateinamen als Javaskript ausführen"
-#: ../midori/main.c:1454
+#: ../midori/main.c:1568
msgid "Take a snapshot of the specified URI"
msgstr "Schnappschuss der angegebenen URI aufnehmen"
-#: ../midori/main.c:1457
+#: ../midori/main.c:1571
msgid "Execute the specified command"
msgstr "Den angegebenen Befehl ausführen"
-#: ../midori/main.c:1459
+#: ../midori/main.c:1573
msgid "Display program version"
msgstr "Programmversion anzeigen"
-#: ../midori/main.c:1461
+#: ../midori/main.c:1575
msgid "Addresses"
msgstr "Adressen"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1577
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "URIs anhand des regulären Ausdrucks MUSTER blockieren"
+
+#: ../midori/main.c:1577
+msgid "PATTERN"
+msgstr "MUSTER"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:1581
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Midori nach SEKUNDEN Sekunden Untätigkeit zurücksetzen"
+
+#: ../midori/main.c:1581
+msgid "SECONDS"
+msgstr "SEKUNDEN"
+
+#: ../midori/main.c:1661
msgid "[Addresses]"
msgstr "[Adressen]"
-#: ../midori/main.c:1566
+#: ../midori/main.c:1689
msgid "Please report comments, suggestions and bugs to:"
msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:"
-#: ../midori/main.c:1568
+#: ../midori/main.c:1691
msgid "Check for new versions at:"
msgstr "Informieren Sie sich über neue Versionen unter:"
-#: ../midori/main.c:1656
+#: ../midori/main.c:1788
msgid "The specified configuration folder is invalid."
msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden."
-#: ../midori/main.c:1704
+#: ../midori/main.c:1836
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n"
-#: ../midori/main.c:1759
+#: ../midori/main.c:1891
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n"
-#: ../midori/main.c:1788
+#: ../midori/main.c:1920
#, c-format
msgid "The bookmarks couldn't be loaded: %s\n"
msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n"
-#: ../midori/main.c:1820
+#: ../midori/main.c:1952
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Der Papierkorb konnte nicht geladen werden: %s\n"
-#: ../midori/main.c:1834
+#: ../midori/main.c:1966
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Der Verlauf konnte nicht geladen werden: %s\n"
-#: ../midori/main.c:1848
+#: ../midori/main.c:1980
msgid "The following errors occured:"
msgstr "Folgende Fehler sind aufgetreten:"
-#: ../midori/main.c:1864
+#: ../midori/main.c:1996
msgid "_Ignore"
msgstr "_Ignorieren"
@@ -222,1381 +245,1439 @@ msgstr "Fehlerhaftes Dokument"
msgid "Unrecognized bookmark format."
msgstr "Unbekanntes Lesezeichenformat."
-#: ../midori/midori-array.c:718 ../midori/sokoke.c:1076
+#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115
#, c-format
msgid "Writing failed."
msgstr "Schreiben fehlgeschlagen."
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5407
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575
+#: ../midori/midori-browser.c:5581
msgid "Reload the current page"
msgstr "Diese Seite neu laden"
-#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578
msgid "Stop loading the current page"
msgstr "Laden dieser Seite abbrechen"
-#: ../midori/midori-browser.c:452
+#: ../midori/midori-browser.c:460
#, c-format
msgid "%d%% loaded"
msgstr "%d%% geladen"
-#: ../midori/midori-browser.c:490
+#: ../midori/midori-browser.c:498
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Titel konnte nicht aktualisiert werden: %s\n"
-#: ../midori/midori-browser.c:504
+#: ../midori/midori-browser.c:512
#, c-format
msgid "Unexpected action '%s'."
msgstr "Unerwartete Aktion »%s«."
-#: ../midori/midori-browser.c:711
+#: ../midori/midori-browser.c:728
msgid "New folder"
msgstr "Neuer Ordner"
-#: ../midori/midori-browser.c:711
+#: ../midori/midori-browser.c:728
msgid "Edit folder"
msgstr "Ordner bearbeiten"
-#: ../midori/midori-browser.c:713
+#: ../midori/midori-browser.c:730
msgid "New bookmark"
msgstr "Neues Lesezeichen"
-#: ../midori/midori-browser.c:713
+#: ../midori/midori-browser.c:730
msgid "Edit bookmark"
msgstr "Lesezeichen bearbeiten"
-#: ../midori/midori-browser.c:744
+#: ../midori/midori-browser.c:761
msgid "_Title:"
msgstr "_Titel:"
-#: ../midori/midori-browser.c:757 ../midori/midori-searchaction.c:961
+#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961
msgid "_Description:"
msgstr "_Beschreibung:"
-#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:975
+#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975
#: ../extensions/feed-panel/main.c:376
msgid "_Address:"
msgstr "_Adresse:"
-#: ../midori/midori-browser.c:806 ../midori/midori-browser.c:4567
+#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731
msgid "_Folder:"
msgstr "_Ordner:"
-#: ../midori/midori-browser.c:816 ../midori/midori-browser.c:896
-#: ../midori/midori-browser.c:4572 ../midori/midori-browser.c:4604
+#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928
+#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768
msgid "Toplevel folder"
msgstr "Oberster Ordner"
-#: ../midori/midori-browser.c:845
+#: ../midori/midori-browser.c:864
+msgid "Add to _Speed Dial"
+msgstr "Zu Schnell_wahl hinzufügen"
+
+#: ../midori/midori-browser.c:877
msgid "Show in the tool_bar"
msgstr "In der Werkzeug_leiste anzeigen"
-#: ../midori/midori-browser.c:860
+#: ../midori/midori-browser.c:892
msgid "Run as _web application"
msgstr "Als _Internetanwendung starten"
-#: ../midori/midori-browser.c:976 ../midori/midori-browser.c:4622
-#: ../midori/midori-browser.c:4651
+#: ../midori/midori-browser.c:986
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Der freie Speichersplatz reicht nicht aus, um «%s» herunterzuladen."
+
+#: ../midori/midori-browser.c:990
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Die Datei benötigt %s, aber nur %s sind übrig."
+
+#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786
+#: ../midori/midori-browser.c:4818
msgid "Save file as"
msgstr "Datei speichern unter"
-#: ../midori/midori-browser.c:1350 ../panels/midori-transfers.c:271
+#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270
#, c-format
msgid "%s of %s"
msgstr "%s von %s"
-#: ../midori/midori-browser.c:1386
+#: ../midori/midori-browser.c:1456
#, c-format
msgid "The file '%s' has been downloaded."
msgstr "Die Datei »%s« wurde heruntergeladen."
-#: ../midori/midori-browser.c:1390
+#: ../midori/midori-browser.c:1460
msgid "Transfer completed"
msgstr "Übertragung abgeschlossen"
-#: ../midori/midori-browser.c:1530
+#: ../midori/midori-browser.c:1600
msgid "Save file"
msgstr "Datei speichern"
-#: ../midori/midori-browser.c:2244
+#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919
+msgid "Some files are being downloaded"
+msgstr "Einige Dateien werden gerade heruntergeladen."
+
+#: ../midori/midori-browser.c:1923
+msgid "_Quit Midori"
+msgstr "Midori _beenden"
+
+#: ../midori/midori-browser.c:1925
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "Die Übertragungen werden abgebrochen wenn Midori beendet wird."
+
+#: ../midori/midori-browser.c:2386
msgid "Open file"
msgstr "Datei öffnen"
-#: ../midori/midori-browser.c:2320 ../extensions/feed-panel/main.c:364
+#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364
msgid "New feed"
msgstr "Neue Nachrichtenquelle"
-#: ../midori/midori-browser.c:2361 ../midori/midori-browser.c:5472
-#: ../panels/midori-bookmarks.c:242
+#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640
+#: ../panels/midori-bookmarks.c:233
msgid "Add a new bookmark"
msgstr "Ein neues Lesezeichen hinzufügen"
-#: ../midori/midori-browser.c:2918 ../panels/midori-history.c:332
+#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332
#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465
#, c-format
msgid "Failed to execute database statement: %s\n"
msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n"
-#: ../midori/midori-browser.c:2998 ../midori/midori-searchaction.c:484
+#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484
msgid "Empty"
msgstr "Leer"
-#: ../midori/midori-browser.c:3618 ../midori/sokoke.c:400
-#: ../midori/sokoke.c:410 ../midori/sokoke.c:438 ../midori/sokoke.c:464
-#: ../midori/sokoke.c:478
+#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398
+#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462
+#: ../midori/sokoke.c:476
msgid "Could not run external program."
msgstr "Konnte externes Programm nicht ausführen."
-#: ../midori/midori-browser.c:3932 ../midori/midori-browser.c:5864
+#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n"
-#: ../midori/midori-browser.c:4264 ../panels/midori-bookmarks.c:795
-#: ../panels/midori-history.c:751
+#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779
+#: ../panels/midori-history.c:750
msgid "Open all in _Tabs"
msgstr "Alle in neuen _Reitern öffnen"
-#: ../midori/midori-browser.c:4271 ../panels/midori-bookmarks.c:801
-#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545
+#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785
+#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545
msgid "Open in New _Tab"
msgstr "In neuem _Reiter öffnen"
-#: ../midori/midori-browser.c:4274 ../panels/midori-bookmarks.c:803
-#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547
+#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787
+#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547
msgid "Open in New _Window"
msgstr "In neuem _Fenster öffnen"
-#: ../midori/midori-browser.c:4493
+#: ../midori/midori-browser.c:4657
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4494
+#: ../midori/midori-browser.c:4658
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4495
+#: ../midori/midori-browser.c:4659
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4496
+#: ../midori/midori-browser.c:4660
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4497
+#: ../midori/midori-browser.c:4661
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4518 ../panels/midori-bookmarks.c:271
+#: ../midori/midori-browser.c:4682
msgid "Import bookmarks..."
msgstr "Lesezeichen importieren..."
-#: ../midori/midori-browser.c:4521 ../midori/midori-browser.c:5477
+#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645
msgid "_Import bookmarks"
msgstr "Lesezeichen _importieren"
-#: ../midori/midori-browser.c:4532
+#: ../midori/midori-browser.c:4696
msgid "_Application:"
msgstr "_Anwendung:"
-#: ../midori/midori-browser.c:4559 ../midori/midori-browser.c:5579
-#: ../midori/midori-websettings.c:230 ../midori/midori-websettings.c:304
-#: ../katze/katze-utils.c:687
+#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749
+#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318
+#: ../katze/katze-utils.c:691
msgid "Custom..."
msgstr "Benutzerdefiniert…"
-#: ../midori/midori-browser.c:4633
+#: ../midori/midori-browser.c:4797
msgid "Failed to import bookmarks"
msgstr "Fehler beim Importieren der Lesezeichen"
-#: ../midori/midori-browser.c:4666
+#: ../midori/midori-browser.c:4833
msgid "Failed to export bookmarks"
msgstr "Fehler beim Exportieren der Lesezeichen"
-#: ../midori/midori-browser.c:4720 ../panels/midori-history.c:141
+#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141
#: ../panels/midori-history.c:171
#, c-format
msgid "Failed to remove history item: %s\n"
msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n"
-#: ../midori/midori-browser.c:4826
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-browser.c:4994
msgid "Clear Private Data"
msgstr "Private Daten löschen"
-#: ../midori/midori-browser.c:4830
+#: ../midori/midori-browser.c:4998
msgid "_Clear private data"
msgstr "_Private Daten löschen"
-#: ../midori/midori-browser.c:4844
+#: ../midori/midori-browser.c:5012
msgid "Clear the following data:"
msgstr "Folgende Daten löschen:"
-#: ../midori/midori-browser.c:4855 ../midori/midori-preferences.c:524
+#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530
#: ../panels/midori-history.c:119
msgid "History"
msgstr "Verlauf"
-#: ../midori/midori-browser.c:4861
+#: ../midori/midori-browser.c:5029
msgid "Cookies"
msgstr "Benutzerprofile/ Cookies"
-#: ../midori/midori-browser.c:4866
+#: ../midori/midori-browser.c:5034
msgid "'Flash' Cookies"
msgstr "»Flash« Cookies"
-#: ../midori/midori-browser.c:4871
+#: ../midori/midori-browser.c:5039
msgid "Website icons"
msgstr "Symbole von Internetseiten"
-#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1266
+#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305
msgid "_Closed Tabs"
msgstr "Ges_chlossene Reiter"
-#: ../midori/midori-browser.c:4881 ../extensions/web-cache.c:464
+#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464
msgid "Web Cache"
msgstr "Zwischenspeicher"
-#: ../midori/midori-browser.c:4889
+#: ../midori/midori-browser.c:5057
msgid "Clear private data when _quitting Midori"
msgstr "Private Daten beim _Beenden von Midori löschen"
-#: ../midori/midori-browser.c:4997
+#: ../midori/midori-browser.c:5158
msgid "A lightweight web browser."
msgstr "Ein schlanker Internetbetrachter."
-#: ../midori/midori-browser.c:5013
+#: ../midori/midori-browser.c:5160
+msgid ""
+"This library is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU Lesser General Public License as published by the "
+"Free Software Foundation; either version 2.1 of the License, or (at your "
+"option) any later version."
+msgstr ""
+"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der "
+"GNU Lesser General Public License, wie von der Free Software Foundation "
+"veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version "
+"2.1 der Lizenz oder (wahlweise) jeder späteren Version."
+
+#: ../midori/midori-browser.c:5179
msgid "translator-credits"
msgstr ""
"Enrico Tröger \n"
"Christian Dywan "
-#: ../midori/midori-browser.c:5320
+#: ../midori/midori-browser.c:5488
msgid "_File"
msgstr "_Datei"
-#: ../midori/midori-browser.c:5322 ../midori/sokoke.c:1267
+#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306
msgid "New _Window"
msgstr "Neues _Fenster"
-#: ../midori/midori-browser.c:5323
+#: ../midori/midori-browser.c:5491
msgid "Open a new window"
msgstr "Ein neues Fenster öffnen"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5494
msgid "Open a new tab"
msgstr "Einen neuen Reiter öffnen"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5496
msgid "P_rivate Browsing"
msgstr "_Privat navigieren"
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5497
msgid "Don't save any private data while browsing"
msgstr "Keinerlei private Daten während des Navigierens speichern"
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5501
msgid "Open a file"
msgstr "Eine Datei öffnen"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5504
msgid "Save to a file"
msgstr "In Datei speichern"
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5506
msgid "Add to Speed _dial"
msgstr "Zu Schnell_wahl hinzufügen"
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5507
msgid "Add shortcut to speed dial"
msgstr "Eine Verknüpfung zur Schnellwahl hinzufügen"
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5509
msgid "Add Shortcut to the _desktop"
msgstr "Verknüpfung auf dem _Schreibtisch"
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5510
msgid "Add shortcut to the desktop"
msgstr "Eine Verknüpfung auf dem Schreibtisch hinzufügen"
-#: ../midori/midori-browser.c:5344
+#: ../midori/midori-browser.c:5512
msgid "Subscribe to News _feed"
msgstr "Nachrichten_quelle abonnieren"
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5513
msgid "Subscribe to this news feed"
msgstr "Diese Nachrichtenquelle abonnieren"
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5518
msgid "_Close Tab"
msgstr "Reiter s_chließen"
-#: ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:5519
msgid "Close the current tab"
msgstr "Den aktuellen Reiter schließen"
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:5521
msgid "C_lose Window"
msgstr "_Fenster schließen"
-#: ../midori/midori-browser.c:5354
+#: ../midori/midori-browser.c:5522
msgid "Close this window"
msgstr "Dieses Fenster schließen"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5525
msgid "Print the current page"
msgstr "Aktuelle Seite ausdrucken"
-#: ../midori/midori-browser.c:5360
+#: ../midori/midori-browser.c:5528
msgid "Quit the application"
msgstr "Programm beenden"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5530
msgid "_Edit"
msgstr "_Bearbeiten"
-#: ../midori/midori-browser.c:5366
+#: ../midori/midori-browser.c:5534
msgid "Undo the last modification"
msgstr "Letzte Änderung rückgängig machen"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5537
msgid "Redo the last modification"
msgstr "Die letzte Ä_nderung rückgängig machen"
-#: ../midori/midori-browser.c:5373
+#: ../midori/midori-browser.c:5541
msgid "Cut the selected text"
msgstr "Markierten Text ausschneiden"
-#: ../midori/midori-browser.c:5376 ../midori/midori-browser.c:5379
+#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547
msgid "Copy the selected text"
msgstr "Markierten Text kopieren"
-#: ../midori/midori-browser.c:5382
+#: ../midori/midori-browser.c:5550
msgid "Paste text from the clipboard"
msgstr "Text aus der Zwischenablage einfügen"
-#: ../midori/midori-browser.c:5385
+#: ../midori/midori-browser.c:5553
msgid "Delete the selected text"
msgstr "Markierten Text löschen"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5556
msgid "Select all text"
msgstr "Gesamten Text auswählen"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5559
msgid "Find a word or phrase in the page"
msgstr "Finde ein Wort oder einen Satz auf der Seite"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5561
msgid "Find _Next"
msgstr "_Nächstes suchen"
-#: ../midori/midori-browser.c:5394
+#: ../midori/midori-browser.c:5562
msgid "Find the next occurrence of a word or phrase"
msgstr "Finde das nächste Auftreten eines Wortes oder Satzes"
-#: ../midori/midori-browser.c:5396
+#: ../midori/midori-browser.c:5564
msgid "Find _Previous"
msgstr "_Vorheriges suchen"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5565
msgid "Find the previous occurrence of a word or phrase"
msgstr "Finde das voherige Auftreten eines Wortes oder Satzes"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5569
msgid "Configure the application preferences"
msgstr "Anwedungseinstellungen anpassen"
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5571
msgid "_View"
msgstr "_Ansicht"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5572
msgid "_Toolbars"
msgstr "_Werkzeugleisten"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5584
msgid "Increase the zoom level"
msgstr "Erhöhe die Vergrößerungsstufe"
-#: ../midori/midori-browser.c:5419
+#: ../midori/midori-browser.c:5587
msgid "Decrease the zoom level"
msgstr "Verringere die Vergrößerungsstufe"
-#: ../midori/midori-browser.c:5422
+#: ../midori/midori-browser.c:5590
msgid "Reset the zoom level"
msgstr "Setzte die Vergrößerungsstufe zurück"
-#: ../midori/midori-browser.c:5423
+#: ../midori/midori-browser.c:5591
msgid "_Encoding"
msgstr "_Zeichensatz"
-#: ../midori/midori-browser.c:5425
+#: ../midori/midori-browser.c:5593
msgid "View So_urce"
msgstr "_Quelltext anzeigen"
-#: ../midori/midori-browser.c:5426
+#: ../midori/midori-browser.c:5594
msgid "View the source code of the page"
msgstr "Zeige den Quelltext der Seite an"
-#: ../midori/midori-browser.c:5429
+#: ../midori/midori-browser.c:5597
msgid "Toggle fullscreen view"
msgstr "Vollbildmodus ein-/ ausschalten"
-#: ../midori/midori-browser.c:5432
+#: ../midori/midori-browser.c:5600
msgid "Scroll _Left"
-msgstr ""
+msgstr "Nach _links rollen"
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5601
msgid "Scroll to the left"
msgstr "Nach links rollen"
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5603
msgid "Scroll _Down"
msgstr "_Herunter rollen"
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5604
msgid "Scroll down"
msgstr "Herunter rollen"
-#: ../midori/midori-browser.c:5438
+#: ../midori/midori-browser.c:5606
msgid "Scroll _Up"
msgstr "H_och rollen"
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5607
msgid "Scroll up"
msgstr "Hoch rollen"
-#: ../midori/midori-browser.c:5441
+#: ../midori/midori-browser.c:5609
msgid "Scroll _Right"
msgstr "Nach _rechts rollen"
-#: ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:5610
msgid "Scroll to the right"
msgstr "Nach rechts rollen"
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5613
msgid "_Go"
msgstr "_Gehe zu"
-#: ../midori/midori-browser.c:5448
+#: ../midori/midori-browser.c:5616
msgid "Go back to the previous page"
msgstr "Gehe zur voherigen Seite zurück"
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5619
msgid "Go forward to the next page"
msgstr "Gehe weiter zur nächsten Seite"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5455
+#: ../midori/midori-browser.c:5623
msgid "Go to the previous sub-page"
msgstr "Gehe zur voherigen Unterseite zurück"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5459
+#: ../midori/midori-browser.c:5627
msgid "Go to the next sub-page"
msgstr "Gehe weiter zur nächsten Unterseite"
-#: ../midori/midori-browser.c:5462
+#: ../midori/midori-browser.c:5630
msgid "Go to your homepage"
msgstr "Gehe zu Deiner Startseite"
-#: ../midori/midori-browser.c:5464
+#: ../midori/midori-browser.c:5632
msgid "Empty Trash"
msgstr "Papierkorb leeren"
-#: ../midori/midori-browser.c:5465
+#: ../midori/midori-browser.c:5633
msgid "Delete the contents of the trash"
msgstr "Inhalt des Papierkorbs löschen"
-#: ../midori/midori-browser.c:5467
+#: ../midori/midori-browser.c:5635
msgid "Undo _Close Tab"
msgstr "Reiter _zurückholen"
-#: ../midori/midori-browser.c:5468
+#: ../midori/midori-browser.c:5636
msgid "Open the last closed tab"
msgstr "Zuletzt geschlossenen Reiter öffnen"
-#: ../midori/midori-browser.c:5474
+#: ../midori/midori-browser.c:5642
msgid "Add a new _folder"
msgstr "Einen neuen _Ordner hinzufügen"
-#: ../midori/midori-browser.c:5475
+#: ../midori/midori-browser.c:5643
msgid "Add a new bookmark folder"
msgstr "Einen neuen Lesezeichenordner hinzufügen"
-#: ../midori/midori-browser.c:5480
+#: ../midori/midori-browser.c:5648
msgid "_Export bookmarks"
msgstr "Lesezeichen _exportieren"
-#: ../midori/midori-browser.c:5483 ../midori/midori-searchaction.c:493
+#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493
msgid "_Manage Search Engines"
msgstr "_Suchmaschinen verwalten"
-#: ../midori/midori-browser.c:5484
+#: ../midori/midori-browser.c:5652
msgid "Add, edit and remove search engines..."
msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…"
-#: ../midori/midori-browser.c:5487
+#: ../midori/midori-browser.c:5655
msgid "_Clear Private Data"
msgstr "_Private Daten löschen"
-#: ../midori/midori-browser.c:5488
+#: ../midori/midori-browser.c:5656
msgid "Clear private data..."
msgstr "Private Daten löschen..."
-#: ../midori/midori-browser.c:5492
+#: ../midori/midori-browser.c:5660
msgid "_Inspect Page"
msgstr "Seite _untersuchen"
-#: ../midori/midori-browser.c:5493
+#: ../midori/midori-browser.c:5661
msgid "Inspect page details and access developer tools..."
msgstr "Einzelheiten der Seite untersuchen und Entwicklerwerkzeuge benutzen..."
-#: ../midori/midori-browser.c:5498
+#: ../midori/midori-browser.c:5666
msgid "_Previous Tab"
msgstr "_Vorheriger Reiter"
-#: ../midori/midori-browser.c:5499
+#: ../midori/midori-browser.c:5667
msgid "Switch to the previous tab"
msgstr "Zum voherigen Reiter wechseln"
-#: ../midori/midori-browser.c:5501
+#: ../midori/midori-browser.c:5669
msgid "_Next Tab"
msgstr "_Nächster Reiter"
-#: ../midori/midori-browser.c:5502
+#: ../midori/midori-browser.c:5670
msgid "Switch to the next tab"
msgstr "Zum nächsten Reiter wechseln"
-#: ../midori/midori-browser.c:5504
+#: ../midori/midori-browser.c:5672
msgid "Focus _Current Tab"
msgstr "_Aktuellen Reiter fokusieren"
-#: ../midori/midori-browser.c:5505
+#: ../midori/midori-browser.c:5673
msgid "Focus the current tab"
msgstr "Den aktuellen Reiter fokussieren"
-#: ../midori/midori-browser.c:5507
+#: ../midori/midori-browser.c:5675
msgid "Open last _session"
msgstr "Die letzte _Sitzung öffnen"
-#: ../midori/midori-browser.c:5508
+#: ../midori/midori-browser.c:5676
msgid "Open the tabs saved in the last session"
msgstr "In der letzten Sitzung geöffnete Reiter öffnen"
-#: ../midori/midori-browser.c:5510
+#: ../midori/midori-browser.c:5678
msgid "_Help"
msgstr "_Hilfe"
-#: ../midori/midori-browser.c:5512
+#: ../midori/midori-browser.c:5680
msgid "_Contents"
msgstr "_Inhalt"
-#: ../midori/midori-browser.c:5513
+#: ../midori/midori-browser.c:5681
msgid "Show the documentation"
msgstr "Zeige die Dokumentation"
-#: ../midori/midori-browser.c:5515
+#: ../midori/midori-browser.c:5683
msgid "_Frequent Questions"
msgstr "_Häufige Fragen"
-#: ../midori/midori-browser.c:5516
+#: ../midori/midori-browser.c:5684
msgid "Show the Frequently Asked Questions"
msgstr "Häufig gestellte Fragen anzeigen"
-#: ../midori/midori-browser.c:5518
+#: ../midori/midori-browser.c:5686
msgid "_Report a Bug"
msgstr "Fehler _berichten"
-#: ../midori/midori-browser.c:5519
+#: ../midori/midori-browser.c:5687
msgid "Open Midori's bug tracker"
msgstr "Midoris Fehlerverfolgung öffnen"
-#: ../midori/midori-browser.c:5522
+#: ../midori/midori-browser.c:5690
msgid "Show information about the program"
msgstr "Zeige Informationen über das Programm"
-#: ../midori/midori-browser.c:5529
+#: ../midori/midori-browser.c:5698
msgid "_Menubar"
msgstr "_Menüleiste"
-#: ../midori/midori-browser.c:5530
+#: ../midori/midori-browser.c:5699
msgid "Show menubar"
msgstr "Menüleiste anzeigen"
-#: ../midori/midori-browser.c:5533
+#: ../midori/midori-browser.c:5702
msgid "_Navigationbar"
msgstr "_Navigationsleiste"
-#: ../midori/midori-browser.c:5534
+#: ../midori/midori-browser.c:5703
msgid "Show navigationbar"
msgstr "Navigationsleiste anzeigen"
-#: ../midori/midori-browser.c:5537
+#: ../midori/midori-browser.c:5706
msgid "Side_panel"
msgstr "Seiten_leiste"
-#: ../midori/midori-browser.c:5538
+#: ../midori/midori-browser.c:5707
msgid "Show sidepanel"
msgstr "Seitenleiste anzeigen"
-#: ../midori/midori-browser.c:5541
+#: ../midori/midori-browser.c:5710
msgid "_Bookmarkbar"
msgstr "_Lesezeichenleiste"
-#: ../midori/midori-browser.c:5542
+#: ../midori/midori-browser.c:5711
msgid "Show bookmarkbar"
msgstr "Lesezeichenleiste anzeigen"
-#: ../midori/midori-browser.c:5545
+#: ../midori/midori-browser.c:5714
msgid "_Transferbar"
msgstr "_Übertragungsleiste"
-#: ../midori/midori-browser.c:5546
+#: ../midori/midori-browser.c:5715
msgid "Show transferbar"
msgstr "Übertragungsleiste anzeigen"
-#: ../midori/midori-browser.c:5549
+#: ../midori/midori-browser.c:5718
msgid "_Statusbar"
msgstr "_Statusleiste"
-#: ../midori/midori-browser.c:5550
+#: ../midori/midori-browser.c:5719
msgid "Show statusbar"
msgstr "Statusleiste anzeigen"
-#: ../midori/midori-browser.c:5557
+#: ../midori/midori-browser.c:5727
msgid "_Automatic"
msgstr "_Automatisch"
-#: ../midori/midori-browser.c:5560 ../midori/midori-websettings.c:224
+#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221
msgid "Chinese (BIG5)"
msgstr "Chinesisch (BIG5)"
-#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
-#: ../midori/midori-browser.c:5564
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5734
msgid "Japanese (SHIFT__JIS)"
msgstr "Japanisch (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5567 ../midori/midori-websettings.c:226
+#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223
msgid "Korean (EUC-KR)"
msgstr "Koreanisch (EUC-KR)"
-#: ../midori/midori-browser.c:5570 ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224
msgid "Russian (KOI8-R)"
msgstr "Russisch (KOI8-R)"
-#: ../midori/midori-browser.c:5573 ../midori/midori-websettings.c:228
+#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5576 ../midori/midori-websettings.c:229
+#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226
msgid "Western (ISO-8859-1)"
msgstr "Westlich (ISO-8859-1)"
-#: ../midori/midori-browser.c:6124
+#: ../midori/midori-browser.c:6294
msgid "_Separator"
msgstr "_Trennlinie"
-#: ../midori/midori-browser.c:6131
+#: ../midori/midori-browser.c:6301
msgid "_Location..."
msgstr "_Ort…"
-#: ../midori/midori-browser.c:6133
+#: ../midori/midori-browser.c:6303
msgid "Open a particular location"
msgstr "Öffne einen bestimmten Ort"
-#: ../midori/midori-browser.c:6157
+#: ../midori/midori-browser.c:6327
msgid "_Web Search..."
msgstr "Im _Netz suchen…"
-#: ../midori/midori-browser.c:6159
+#: ../midori/midori-browser.c:6329
msgid "Run a web search"
msgstr "Starte eine Suche im Netz"
-#: ../midori/midori-browser.c:6180
+#: ../midori/midori-browser.c:6350
msgid "Reopen a previously closed tab or window"
msgstr "Reiter oder Fenster zurückholen"
-#: ../midori/midori-browser.c:6195
+#: ../midori/midori-browser.c:6365
msgid "_Recently visited pages"
msgstr "_Zuletzt besuchte Seiten"
-#: ../midori/midori-browser.c:6197
+#: ../midori/midori-browser.c:6367
msgid "Reopen pages that you visited earlier"
msgstr "Bereits besuchte Seiten erneut öffnen"
-#: ../midori/midori-browser.c:6212 ../midori/sokoke.c:1256
+#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295
msgid "_Bookmarks"
msgstr "_Lesezeichen"
-#: ../midori/midori-browser.c:6214
+#: ../midori/midori-browser.c:6384
msgid "Show the saved bookmarks"
msgstr "Die gespeicherten Lesezeichen anzeigen"
-#: ../midori/midori-browser.c:6229
+#: ../midori/midori-browser.c:6399
msgid "_Tools"
msgstr "_Extras"
-#: ../midori/midori-browser.c:6242
+#: ../midori/midori-browser.c:6412
msgid "_Window"
msgstr "_Fenster"
-#: ../midori/midori-browser.c:6244
+#: ../midori/midori-browser.c:6414
msgid "Show a list of all open tabs"
msgstr "Zeige eine Übersicht aller offenen Reiter"
-#: ../midori/midori-browser.c:6258
+#: ../midori/midori-browser.c:6428
msgid "_Menu"
msgstr "_Menü"
-#: ../midori/midori-browser.c:6260
+#: ../midori/midori-browser.c:6430
msgid "Menu"
msgstr "Menü"
#. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:6464
+#: ../midori/midori-browser.c:6634
msgid "_Inline Find:"
msgstr "_Inkrementelle Suche:"
-#: ../midori/midori-browser.c:6495
+#: ../midori/midori-browser.c:6665
msgid "Previous"
msgstr "Zurück"
-#: ../midori/midori-browser.c:6500
+#: ../midori/midori-browser.c:6670
msgid "Next"
msgstr "Weiter"
-#: ../midori/midori-browser.c:6505
+#: ../midori/midori-browser.c:6675
msgid "Match Case"
msgstr "Groß-/ Kleinschreibung"
-#: ../midori/midori-browser.c:6514
+#: ../midori/midori-browser.c:6684
msgid "Highlight Matches"
msgstr "Treffer hervorheben"
-#: ../midori/midori-browser.c:6526
+#: ../midori/midori-browser.c:6696
msgid "Close Findbar"
msgstr "Suchleiste schließen"
-#: ../midori/midori-browser.c:6572 ../panels/midori-transfers.c:142
+#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141
msgid "Clear All"
msgstr "Alle entfernen"
-#: ../midori/midori-browser.c:6929
+#: ../midori/midori-browser.c:7100
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Unerwartete Einstellung »%s«"
-#: ../midori/midori-locationaction.c:376
+#: ../midori/midori-locationaction.c:377
#, c-format
msgid "Failed to select from history\n"
msgstr "Auswahl aus Verlauf schlug fehl\n"
-#: ../midori/midori-locationaction.c:454
+#: ../midori/midori-locationaction.c:459
#, c-format
msgid "Search for %s"
msgstr "Nach %s suchen"
-#: ../midori/midori-locationaction.c:477
+#: ../midori/midori-locationaction.c:482
#, c-format
msgid "Search with %s"
msgstr "Suchen mit %s"
-#: ../midori/midori-locationaction.c:1191
+#: ../midori/midori-locationaction.c:1197
#, c-format
msgid "Failed to execute database statement\n"
msgstr "Datenbankabfrage konnte nicht ausgeführt werden\n"
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1248
+#: ../midori/midori-locationaction.c:1254
msgid "Paste and p_roceed"
msgstr "Einfügen und _fortfahren"
-#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435
+#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434
msgid "Detach chosen panel from the window"
msgstr "Gewählte Leiste vom Fenster ablösen"
-#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447
-#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
+#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446
+#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642
msgid "Align sidepanel to the right"
msgstr "Seitenleiste rechts anordnen"
-#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458
+#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457
msgid "Close panel"
msgstr "Leiste schließen"
-#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644
+#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
msgid "Align sidepanel to the left"
msgstr "Seitenleiste links anordnen"
-#: ../midori/midori-panel.c:798
+#: ../midori/midori-panel.c:797
msgid "Hide operating controls"
msgstr "Bedienelemente anzeigen"
-#: ../midori/midori-websettings.c:207
+#: ../midori/midori-websettings.c:204
msgid "Show Blank page"
msgstr "Leere Seite anzeigen"
-#: ../midori/midori-websettings.c:208
+#: ../midori/midori-websettings.c:205
msgid "Show Homepage"
msgstr "Startseite anzeigen"
-#: ../midori/midori-websettings.c:209
+#: ../midori/midori-websettings.c:206
msgid "Show last open tabs"
msgstr "Zuletzt geöffnete Reiter anzeigen"
-#: ../midori/midori-websettings.c:225
+#: ../midori/midori-websettings.c:222
msgid "Japanese (SHIFT_JIS)"
msgstr "Japanisch (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:245
+#: ../midori/midori-websettings.c:242
msgid "New tab"
msgstr "Neuer Reiter"
-#: ../midori/midori-websettings.c:246
+#: ../midori/midori-websettings.c:243
msgid "New window"
msgstr "Neues Fenster"
-#: ../midori/midori-websettings.c:247
+#: ../midori/midori-websettings.c:244
msgid "Current tab"
msgstr "Aktueller Reiter"
-#: ../midori/midori-websettings.c:262
+#: ../midori/midori-websettings.c:259
msgid "Default"
msgstr "Standard"
-#: ../midori/midori-websettings.c:263
+#: ../midori/midori-websettings.c:260
msgid "Icons"
msgstr "Symbole"
-#: ../midori/midori-websettings.c:264
+#: ../midori/midori-websettings.c:261
msgid "Small icons"
msgstr "Kleine Symbole"
-#: ../midori/midori-websettings.c:265
+#: ../midori/midori-websettings.c:262
msgid "Text"
msgstr "Text"
-#: ../midori/midori-websettings.c:266
+#: ../midori/midori-websettings.c:263
msgid "Icons and text"
msgstr "Symbole und Text"
-#: ../midori/midori-websettings.c:267
+#: ../midori/midori-websettings.c:264
msgid "Text beside icons"
msgstr "Text neben Symbolen"
-#: ../midori/midori-websettings.c:282
+#: ../midori/midori-websettings.c:279
+msgid "Automatic (GNOME or environment)"
+msgstr "Automatisch (GNOME oder Umgebung)"
+
+#: ../midori/midori-websettings.c:280
+msgid "HTTP proxy server"
+msgstr "HTTP-Zwischenrechner"
+
+#: ../midori/midori-websettings.c:281
+msgid "No proxy server"
+msgstr "Kein Zwischenrechner"
+
+#: ../midori/midori-websettings.c:296
msgid "All cookies"
msgstr "Alle Profildateien"
-#: ../midori/midori-websettings.c:283
+#: ../midori/midori-websettings.c:297
msgid "Session cookies"
msgstr "Sitzungsprofile"
-#: ../midori/midori-websettings.c:284 ../panels/midori-addons.c:98
-#: ../katze/katze-utils.c:663
+#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667
msgid "None"
msgstr "Keine"
-#: ../midori/midori-websettings.c:300
+#: ../midori/midori-websettings.c:314
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:301
+#: ../midori/midori-websettings.c:315
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:302
+#: ../midori/midori-websettings.c:316
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:303
+#: ../midori/midori-websettings.c:317
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:356
+#: ../midori/midori-websettings.c:370
msgid "Remember last window size"
msgstr "Letzte Fenstergröße merken"
-#: ../midori/midori-websettings.c:357
+#: ../midori/midori-websettings.c:371
msgid "Whether to save the last window size"
msgstr "Die letzte Fenstergröße speichern oder nicht"
-#: ../midori/midori-websettings.c:365
+#: ../midori/midori-websettings.c:379
msgid "Last window width"
msgstr "Letzte Fensterbreite"
-#: ../midori/midori-websettings.c:366
+#: ../midori/midori-websettings.c:380
msgid "The last saved window width"
msgstr "Die zuletzt gespeicherte Fensterbreite"
-#: ../midori/midori-websettings.c:374
+#: ../midori/midori-websettings.c:388
msgid "Last window height"
msgstr "Letzte Fensterhöhe"
-#: ../midori/midori-websettings.c:375
+#: ../midori/midori-websettings.c:389
msgid "The last saved window height"
msgstr "Die zuletzt gespeicherte Fensterhöhe"
-#: ../midori/midori-websettings.c:400
+#: ../midori/midori-websettings.c:414
msgid "Last panel position"
msgstr "Letzte Leistenposition"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:415
msgid "The last saved panel position"
msgstr "Die zuletzt gespeicherte Leistenposition"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:424
msgid "Last panel page"
msgstr "Letzte Leistenseite"
-#: ../midori/midori-websettings.c:411
+#: ../midori/midori-websettings.c:425
msgid "The last saved panel page"
msgstr "Die zuletzt gespeicherte Leistenseite"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:433
msgid "Last Web search"
msgstr "Letzte Suche im Netz"
-#: ../midori/midori-websettings.c:420
+#: ../midori/midori-websettings.c:434
msgid "The last saved Web search"
msgstr "Die zuletzt gespeicherte Suche im Netz"
-#: ../midori/midori-websettings.c:429
+#: ../midori/midori-websettings.c:443
msgid "Show Menubar"
msgstr "Menüleiste anzeigen"
-#: ../midori/midori-websettings.c:430
+#: ../midori/midori-websettings.c:444
msgid "Whether to show the menubar"
msgstr "Die Menüleiste anzeigen oder verbergen"
-#: ../midori/midori-websettings.c:438
+#: ../midori/midori-websettings.c:452
msgid "Show Navigationbar"
msgstr "Navigationsleiste anzeigen"
-#: ../midori/midori-websettings.c:439
+#: ../midori/midori-websettings.c:453
msgid "Whether to show the navigationbar"
msgstr "Die Navigationsleiste anzeigen oder verbergen"
-#: ../midori/midori-websettings.c:447
+#: ../midori/midori-websettings.c:461
msgid "Show Bookmarkbar"
msgstr "Lesezeichenleiste anzeigen"
-#: ../midori/midori-websettings.c:448
+#: ../midori/midori-websettings.c:462
msgid "Whether to show the bookmarkbar"
msgstr "Die Lesezeichenleiste anzeigen oder verbergen"
-#: ../midori/midori-websettings.c:456
+#: ../midori/midori-websettings.c:470
msgid "Show Panel"
msgstr "Leiste anzeigen"
-#: ../midori/midori-websettings.c:457
+#: ../midori/midori-websettings.c:471
msgid "Whether to show the panel"
msgstr "Die Leiste anzeigen oder verbergen"
-#: ../midori/midori-websettings.c:472
+#: ../midori/midori-websettings.c:486
msgid "Show Transferbar"
msgstr "Übertragungsleiste anzeigen"
-#: ../midori/midori-websettings.c:473
+#: ../midori/midori-websettings.c:487
msgid "Whether to show the transferbar"
msgstr "Die Übertragungsleiste anzeigen oder verbergen"
-#: ../midori/midori-websettings.c:481
+#: ../midori/midori-websettings.c:495
msgid "Show Statusbar"
msgstr "Statusleiste anzeigen"
-#: ../midori/midori-websettings.c:482
+#: ../midori/midori-websettings.c:496
msgid "Whether to show the statusbar"
msgstr "Die Statusleiste anzeigen oder verbergen"
-#: ../midori/midori-websettings.c:491
+#: ../midori/midori-websettings.c:505
msgid "Toolbar Style:"
msgstr "Werkzeugleistenstil:"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:506
msgid "The style of the toolbar"
msgstr "Der Stil der Werkzeugleiste"
-#: ../midori/midori-websettings.c:508
+#: ../midori/midori-websettings.c:522
msgid "Show progress in location entry"
msgstr "Fortschritt im Adressfeld anzeigen"
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:523
msgid "Whether to show loading progress in the location entry"
msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen"
-#: ../midori/midori-websettings.c:524
+#: ../midori/midori-websettings.c:538
msgid "Search engines in location completion"
msgstr "Suchmaschinen in Vervollständigung"
-#: ../midori/midori-websettings.c:525
+#: ../midori/midori-websettings.c:539
msgid "Whether to show search engines in the location completion"
msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen"
-#: ../midori/midori-websettings.c:533
+#: ../midori/midori-websettings.c:547
msgid "Toolbar Items"
msgstr "Werkzeugleistenelemente"
-#: ../midori/midori-websettings.c:534
+#: ../midori/midori-websettings.c:548
msgid "The items to show on the toolbar"
msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente"
-#: ../midori/midori-websettings.c:542
+#: ../midori/midori-websettings.c:556
msgid "Compact Sidepanel"
msgstr "Kompakte Seitenleiste"
-#: ../midori/midori-websettings.c:543
+#: ../midori/midori-websettings.c:557
msgid "Whether to make the sidepanel compact"
msgstr "Die Seitenleiste anzeigen oder verbergen"
-#: ../midori/midori-websettings.c:558
+#: ../midori/midori-websettings.c:572
msgid "Show operating controls of the panel"
msgstr "Bedienelemente der Leiste anzeigen"
-#: ../midori/midori-websettings.c:559
+#: ../midori/midori-websettings.c:573
msgid "Whether to show the operating controls of the panel"
msgstr "Die Bedienelemente der Leiste anzeigen oder verbergen"
-#: ../midori/midori-websettings.c:574
+#: ../midori/midori-websettings.c:588
msgid "Align sidepanel on the right"
msgstr "Seitenleiste rechts anordnen"
-#: ../midori/midori-websettings.c:575
+#: ../midori/midori-websettings.c:589
msgid "Whether to align the sidepanel on the right"
msgstr "Die Seitenleiste auf der rechten Seite anordnen"
-#: ../midori/midori-websettings.c:590
+#: ../midori/midori-websettings.c:604
msgid "Open panels in separate windows"
msgstr "Leisten in eigenen Fenstern öffnen"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:605
msgid "Whether to always open panels in separate windows"
msgstr "Ob Seitenleisten immer in eigenen Fenstern geöffnet werden sollen"
-#: ../midori/midori-websettings.c:600
+#: ../midori/midori-websettings.c:614
msgid "When Midori starts:"
msgstr "Beim Starten von Midori:"
-#: ../midori/midori-websettings.c:601
+#: ../midori/midori-websettings.c:615
msgid "What to do when Midori starts"
msgstr "Was beim Starten von Midori passieren soll"
-#: ../midori/midori-websettings.c:610
+#: ../midori/midori-websettings.c:624
msgid "Homepage:"
msgstr "Startseite:"
-#: ../midori/midori-websettings.c:611
+#: ../midori/midori-websettings.c:625
msgid "The homepage"
msgstr "Die Startseite"
-#: ../midori/midori-websettings.c:626
+#: ../midori/midori-websettings.c:640
msgid "Show crash dialog"
msgstr "Absturzdialog anzeigen"
-#: ../midori/midori-websettings.c:627
+#: ../midori/midori-websettings.c:641
msgid "Show a dialog after Midori crashed"
msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist"
#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:643
+#: ../midori/midori-websettings.c:657
msgid "Show speed dial in new tabs"
msgstr "Schnellwahl in neuen Reitern anzeigen"
-#: ../midori/midori-websettings.c:644
+#: ../midori/midori-websettings.c:658
msgid "Show speed dial in newly opened tabs"
msgstr "Schnellwahl in neu geöffneten Reitern anzeigen"
-#: ../midori/midori-websettings.c:652
+#: ../midori/midori-websettings.c:666
msgid "Save downloaded files to:"
msgstr "Heruntergeladene Dateien speichern:"
-#: ../midori/midori-websettings.c:653
+#: ../midori/midori-websettings.c:667
msgid "The folder downloaded files are saved to"
msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden"
-#: ../midori/midori-websettings.c:674
+#: ../midori/midori-websettings.c:688
msgid "Ask for the destination folder"
msgstr "Nach dem Zielordner fragen"
-#: ../midori/midori-websettings.c:675
+#: ../midori/midori-websettings.c:689
msgid "Whether to ask for the destination folder when downloading a file"
msgstr "Beim Herunterladen einer Datei nach dem Zielordner fragen"
-#: ../midori/midori-websettings.c:694
+#: ../midori/midori-websettings.c:708
msgid "Notify when a transfer has been completed"
msgstr "Benachrichtigen bei Abschluss der Übertragung"
-#: ../midori/midori-websettings.c:695
+#: ../midori/midori-websettings.c:709
msgid "Whether to show a notification when a transfer has been completed"
msgstr ""
"Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde"
-#: ../midori/midori-websettings.c:707
+#: ../midori/midori-websettings.c:721
msgid "Download Manager"
msgstr "Übertragungsmanager"
-#: ../midori/midori-websettings.c:708
+#: ../midori/midori-websettings.c:722
msgid "An external download manager"
msgstr "Ein externer Übertragungsmanager"
-#: ../midori/midori-websettings.c:716
+#: ../midori/midori-websettings.c:730
msgid "Text Editor"
msgstr "Texteditor"
-#: ../midori/midori-websettings.c:717
+#: ../midori/midori-websettings.c:731
msgid "An external text editor"
msgstr "Ein externer Texteditor"
-#: ../midori/midori-websettings.c:732
+#: ../midori/midori-websettings.c:746
msgid "News Aggregator"
msgstr "Nachrichtenaggregator"
-#: ../midori/midori-websettings.c:733
+#: ../midori/midori-websettings.c:747
msgid "An external news aggregator"
msgstr "Ein externer Nachrichtenaggregator"
-#: ../midori/midori-websettings.c:741
+#: ../midori/midori-websettings.c:755
msgid "Location entry Search"
msgstr "Adressfeldsuche"
-#: ../midori/midori-websettings.c:742
+#: ../midori/midori-websettings.c:756
msgid "The search to perform inside the location entry"
msgstr "Die Suche, die über das Adressfeld ausgeführt wird"
-#: ../midori/midori-websettings.c:750
+#: ../midori/midori-websettings.c:764
msgid "Preferred Encoding"
msgstr "Bevorzugter Zeichensatz"
-#: ../midori/midori-websettings.c:751
+#: ../midori/midori-websettings.c:765
msgid "The preferred character encoding"
msgstr "Der bevorzugte Zeichensatz"
-#: ../midori/midori-websettings.c:761
+#: ../midori/midori-websettings.c:775
msgid "Always Show Tabbar"
msgstr "Reiterleiste immer anzeigen"
-#: ../midori/midori-websettings.c:762
+#: ../midori/midori-websettings.c:776
msgid "Always show the tabbar"
msgstr "Die Reiterleiste immer anzeigen"
-#: ../midori/midori-websettings.c:770
+#: ../midori/midori-websettings.c:784
msgid "Close Buttons on Tabs"
msgstr "Schließenschaltflächen auf Reitern"
-#: ../midori/midori-websettings.c:771
+#: ../midori/midori-websettings.c:785
msgid "Whether tabs have close buttons"
msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen"
-#: ../midori/midori-websettings.c:779
+#: ../midori/midori-websettings.c:793
msgid "Open new pages in:"
msgstr "Öffne neue Seiten in:"
-#: ../midori/midori-websettings.c:780
+#: ../midori/midori-websettings.c:794
msgid "Where to open new pages"
msgstr "Wo neue Seiten geöffnet werden sollen"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:803
msgid "Open external pages in:"
msgstr "Öffne Seiten von außerhalb in:"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:804
msgid "Where to open externally opened pages"
msgstr "Wo Seiten von außerhalb geöffnet werden sollen"
-#: ../midori/midori-websettings.c:799
+#: ../midori/midori-websettings.c:813
msgid "Middle click opens Selection"
msgstr "Mittelklick öffnet Markierung"
-#: ../midori/midori-websettings.c:800
+#: ../midori/midori-websettings.c:814
msgid "Load an address from the selection via middle click"
msgstr "Lade eine markierte Adresse mit der mittleren Maustaste"
-#: ../midori/midori-websettings.c:808
+#: ../midori/midori-websettings.c:822
msgid "Open tabs in the background"
msgstr "Reiter im Hintergrund öffnen"
-#: ../midori/midori-websettings.c:809
+#: ../midori/midori-websettings.c:823
msgid "Whether to open new tabs in the background"
msgstr "Neue Reiter im Hintergrund öffnen"
-#: ../midori/midori-websettings.c:817
+#: ../midori/midori-websettings.c:831
msgid "Open Tabs next to Current"
msgstr "Reiter neben aktuellem öffnen"
-#: ../midori/midori-websettings.c:818
+#: ../midori/midori-websettings.c:832
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen"
-#: ../midori/midori-websettings.c:826
+#: ../midori/midori-websettings.c:840
msgid "Open popups in tabs"
msgstr "Aufklappfenster in Reitern öffnen"
-#: ../midori/midori-websettings.c:827
+#: ../midori/midori-websettings.c:841
msgid "Whether to open popup windows in tabs"
msgstr "Aufklappfenster in neuen Reitern öffnen"
-#: ../midori/midori-websettings.c:837 ../extensions/statusbar-features.c:88
+#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88
msgid "Load images automatically"
msgstr "Bilder automatisch laden"
-#: ../midori/midori-websettings.c:838
+#: ../midori/midori-websettings.c:852
msgid "Load and display images automatically"
msgstr "Bilder automatisch laden und anzeigen"
-#: ../midori/midori-websettings.c:845 ../extensions/statusbar-features.c:100
+#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100
msgid "Enable scripts"
msgstr "Skripte einschalten"
-#: ../midori/midori-websettings.c:846
+#: ../midori/midori-websettings.c:860
msgid "Enable embedded scripting languages"
msgstr "Eingebettete Skriptsprachen einschalten"
-#: ../midori/midori-websettings.c:853 ../extensions/statusbar-features.c:112
+#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112
msgid "Enable Netscape plugins"
msgstr "Netscape-Module einschalten"
-#: ../midori/midori-websettings.c:854
+#: ../midori/midori-websettings.c:868
msgid "Enable embedded Netscape plugin objects"
msgstr "Eingebettete Netscape-Module einschalten"
-#: ../midori/midori-websettings.c:870
+#: ../midori/midori-websettings.c:884
msgid "Enable HTML5 database support"
msgstr "HTML5-Datenbanken einschalten"
-#: ../midori/midori-websettings.c:871
+#: ../midori/midori-websettings.c:885
msgid "Whether to enable HTML5 database support"
msgstr "Unterstützung für HTML5-Datenbank einschalten"
-#: ../midori/midori-websettings.c:877
+#: ../midori/midori-websettings.c:891
msgid "Enable HTML5 local storage support"
msgstr "HTML5-Lokalspeicher einschalten"
-#: ../midori/midori-websettings.c:878
+#: ../midori/midori-websettings.c:892
msgid "Whether to enable HTML5 local storage support"
msgstr "Unterstützung für HTML5-Lokalspeicher einschalten"
-#: ../midori/midori-websettings.c:886
+#: ../midori/midori-websettings.c:900
msgid "Enable offline web application cache"
msgstr "HTML5-Anwendungsspeicher einschalten"
-#: ../midori/midori-websettings.c:887
+#: ../midori/midori-websettings.c:901
msgid "Whether to enable offline web application cache"
msgstr "HTML5-Zwischenspeicher für Internetanwendungen einschalten"
-#: ../midori/midori-websettings.c:912
+#: ../midori/midori-websettings.c:926
msgid "Zoom Text and Images"
msgstr "Text und Bilder vergrößern"
-#: ../midori/midori-websettings.c:913
+#: ../midori/midori-websettings.c:927
msgid "Whether to zoom text and images"
msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen"
-#: ../midori/midori-websettings.c:928
+#: ../midori/midori-websettings.c:942
msgid "Find inline while typing"
msgstr "Inkrementelle Suche beim Eintippen"
-#: ../midori/midori-websettings.c:929
+#: ../midori/midori-websettings.c:943
msgid "Whether to automatically find inline while typing"
msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll"
-#: ../midori/midori-websettings.c:944
+#: ../midori/midori-websettings.c:958
msgid "Kinetic scrolling"
msgstr "Sanfter Bildlauf"
-#: ../midori/midori-websettings.c:945
+#: ../midori/midori-websettings.c:959
msgid "Whether scrolling should kinetically move according to speed"
msgstr "Ob der Bildlauf sanft schneller und langsamer wird"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:967
msgid "Accept cookies"
msgstr "Cookies annehmen"
-#: ../midori/midori-websettings.c:954
+#: ../midori/midori-websettings.c:968
msgid "What type of cookies to accept"
msgstr "Welche Art von Profildateien (Cookies) angenommen werden"
-#: ../midori/midori-websettings.c:970
+#: ../midori/midori-websettings.c:984
msgid "Original cookies only"
msgstr "Nur ursprüngliche Profildateien"
-#: ../midori/midori-websettings.c:971
+#: ../midori/midori-websettings.c:985
msgid "Accept cookies from the original website only"
msgstr "Nur Profildateien von der ursprünglichen Seite annehmen"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:993
msgid "Maximum cookie age"
msgstr "Maximales Alter von Cookiedaten"
-#: ../midori/midori-websettings.c:980
+#: ../midori/midori-websettings.c:994
msgid "The maximum number of days to save cookies for"
msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden"
-#: ../midori/midori-websettings.c:997
+#: ../midori/midori-websettings.c:1011
msgid "Remember last visited pages"
msgstr "Zuletzt besuchte Seiten merken"
-#: ../midori/midori-websettings.c:998
+#: ../midori/midori-websettings.c:1012
msgid "Whether the last visited pages are saved"
msgstr "Die zuletzt besuchten Seiten speichern"
-#: ../midori/midori-websettings.c:1006
+#: ../midori/midori-websettings.c:1020
msgid "Maximum history age"
msgstr "Maximales Verlaufsalter"
-#: ../midori/midori-websettings.c:1007
+#: ../midori/midori-websettings.c:1021
msgid "The maximum number of days to save the history for"
msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gespeichert wird"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1029
msgid "Remember last downloaded files"
msgstr "Zuletzt heruntergeladene Dateien merken"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:1030
msgid "Whether the last downloaded files are saved"
msgstr "Die zuletzt heruntegeladenen Dateien speichern"
-#: ../midori/midori-websettings.c:1026
-msgid "Proxy Server"
+#: ../midori/midori-websettings.c:1047
+msgid "Proxy server"
msgstr "Zwischenrechner (Proxy)"
-#: ../midori/midori-websettings.c:1027
+#: ../midori/midori-websettings.c:1048
+msgid "The type of proxy server to use"
+msgstr "Die Art des zu verwendenden Zwischenrechners"
+
+#: ../midori/midori-websettings.c:1057
+msgid "HTTP Proxy Server"
+msgstr "HTTP-Zwischenrechner"
+
+#: ../midori/midori-websettings.c:1058
msgid "The proxy server used for HTTP connections"
msgstr "Der Zwischenrechner für HTTP-Verbindungen"
-#: ../midori/midori-websettings.c:1042
+#: ../midori/midori-websettings.c:1073
msgid "Detect proxy server automatically"
msgstr "Proxyrechner automatisch erkennen"
-#: ../midori/midori-websettings.c:1043
+#: ../midori/midori-websettings.c:1074
msgid "Whether to detect the proxy server automatically from the environment"
msgstr "Zwischenrechner automatisch über die Umgebung erkennen"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1059
+#: ../midori/midori-websettings.c:1090
msgid "Identify as"
msgstr "Ausgeben als"
-#: ../midori/midori-websettings.c:1060
+#: ../midori/midori-websettings.c:1091
msgid "What to identify as to web pages"
msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll"
-#: ../midori/midori-websettings.c:1076
+#: ../midori/midori-websettings.c:1107
msgid "Identification string"
msgstr "Identifikationskennung"
-#: ../midori/midori-websettings.c:1077
+#: ../midori/midori-websettings.c:1108
msgid "The application identification string"
msgstr "Die Identifikationskennung der Anwedung"
-#: ../midori/midori-websettings.c:1092
+#: ../midori/midori-websettings.c:1123
msgid "Preferred languages"
msgstr "Bevorzugte Sprachen"
-#: ../midori/midori-websettings.c:1093
+#: ../midori/midori-websettings.c:1124
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1605,11 +1686,11 @@ msgstr ""
"Darstellung mehrsprachiger Interneiten benutzt wird, zum Beispiel »de«, »ru,"
"nl« oder »en-us;q=1.0, fr-fr;q=0.667«"
-#: ../midori/midori-websettings.c:1108
+#: ../midori/midori-websettings.c:1139
msgid "Clear private data"
msgstr "Private Daten löschen"
-#: ../midori/midori-websettings.c:1109
+#: ../midori/midori-websettings.c:1140
msgid "The private data selected for deletion"
msgstr "Zum Löschen ausgewählte private Daten"
@@ -1617,297 +1698,313 @@ msgstr "Zum Löschen ausgewählte private Daten"
#. so reloading via Javascript works but not via API calls.
#. Error pages are special, we want to try loading the destination
#. again, not the error page which isn't even a proper page
-#: ../midori/midori-view.c:956 ../midori/midori-view.c:4190
-#: ../midori/midori-view.c:4194
+#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528
+#: ../midori/midori-view.c:4532
#, c-format
msgid "Error - %s"
msgstr "Fehler - %s"
-#: ../midori/midori-view.c:957
+#: ../midori/midori-view.c:1262
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Die Seite »%s« konnte nicht geladen werden."
-#: ../midori/midori-view.c:962
+#: ../midori/midori-view.c:1264
msgid "Try again"
msgstr "Erneut versuchen"
#. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:1002
+#: ../midori/midori-view.c:1283
#, c-format
msgid "Not found - %s"
msgstr "Nicht gefunden - %s"
-#: ../midori/midori-view.c:1225 ../midori/midori-view.c:2081
+#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357
#, c-format
msgid "Send a message to %s"
msgstr "Nachricht an %s schicken"
-#: ../midori/midori-view.c:1850 ../midori/midori-view.c:2243
+#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519
msgid "Inspect _Element"
msgstr "Element _untersuchen"
-#: ../midori/midori-view.c:1902 ../midori/midori-view.c:1980
-msgid "Open _Link"
-msgstr "Ver_weis öffnen"
-
-#: ../midori/midori-view.c:1905 ../midori/midori-view.c:1982
+#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261
msgid "Open Link in New _Tab"
msgstr "Verweis in neuem _Reiter öffnen"
-#: ../midori/midori-view.c:1909
+#: ../midori/midori-view.c:2195
msgid "Open Link in _Foreground Tab"
msgstr "Verweis in _Vordergrund-Reiter öffnen"
-#: ../midori/midori-view.c:1910
+#: ../midori/midori-view.c:2196
msgid "Open Link in _Background Tab"
msgstr "Verweis in _Hintergrund-Reiter öffnen"
-#: ../midori/midori-view.c:1913 ../midori/midori-view.c:1989
+#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268
msgid "Open Link in New _Window"
msgstr "Verweis in neuem _Fenster öffnen"
-#: ../midori/midori-view.c:1916
+#: ../midori/midori-view.c:2202
msgid "Open Link as Web A_pplication"
msgstr "Verweis als _Internetanwendung öffnen"
-#: ../midori/midori-view.c:1919
+#: ../midori/midori-view.c:2205
msgid "Copy Link de_stination"
msgstr "Verweisziel k_opieren"
-#: ../midori/midori-view.c:1922 ../midori/midori-view.c:2001
+#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280
msgid "_Save Link destination"
msgstr "Verweisziel _speichern"
-#: ../midori/midori-view.c:1923 ../midori/midori-view.c:1995
+#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274
msgid "_Download Link destination"
msgstr "Verweisziel herunter_laden"
-#: ../midori/midori-view.c:1927 ../midori/midori-view.c:1963
-#: ../midori/midori-view.c:2006
+#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243
+#: ../midori/midori-view.c:2285
msgid "Download with Download _Manager"
msgstr "Mit Übertragungs_manager herunterladen"
-#: ../midori/midori-view.c:1939
+#: ../midori/midori-view.c:2222
msgid "Open _Image in New Tab"
msgstr "_Bild in neuem Reiter öffnen"
-#: ../midori/midori-view.c:1942
-msgid "Open Image in New Wi_ndow"
-msgstr "Bild in neuem Fe_nster öffnen"
-
-#: ../midori/midori-view.c:1945
+#: ../midori/midori-view.c:2225
msgid "Copy Image _Address"
msgstr "Bild_adresse kopieren"
-#: ../midori/midori-view.c:1948
+#: ../midori/midori-view.c:2228
msgid "Save I_mage"
msgstr "Bi_ld speichern"
-#: ../midori/midori-view.c:1949
+#: ../midori/midori-view.c:2229
msgid "Download I_mage"
msgstr "Bild herunterla_den"
-#: ../midori/midori-view.c:1956
+#: ../midori/midori-view.c:2236
msgid "Copy Video _Address"
msgstr "Video_adresse kopieren"
-#: ../midori/midori-view.c:1959
+#: ../midori/midori-view.c:2239
msgid "Save _Video"
msgstr "_Video speichern"
-#: ../midori/midori-view.c:1959
+#: ../midori/midori-view.c:2239
msgid "Download _Video"
msgstr "_Video herunterladen"
-#: ../midori/midori-view.c:2026
+#: ../midori/midori-view.c:2302
msgid "Search _with"
msgstr "Suchen _mit"
-#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2068
+#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344
msgid "_Search the Web"
msgstr "Im Netz _suchen"
-#: ../midori/midori-view.c:2089
+#: ../midori/midori-view.c:2365
msgid "Open Address in New _Tab"
msgstr "Adresse in neuem _Reiter öffnen"
-#: ../midori/midori-view.c:2375
+#: ../midori/midori-view.c:2662
msgid "Open or download file"
msgstr "Datei öffnen oder herunterladen"
-#: ../midori/midori-view.c:2398
+#: ../midori/midori-view.c:2681
#, c-format
msgid "File Type: '%s'"
msgstr "Dateityp: »%s«"
-#: ../midori/midori-view.c:2401
+#: ../midori/midori-view.c:2684
#, c-format
msgid "File Type: %s ('%s')"
msgstr "Dateityp: %s (»%s«)"
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2405
+#: ../midori/midori-view.c:2688
#, c-format
msgid "Open %s"
msgstr "%s öffnen"
-#: ../midori/midori-view.c:2920
+#: ../midori/midori-view.c:3236
#, c-format
msgid "Inspect page - %s"
msgstr "Seite untersuchen - %s"
-#: ../midori/midori-view.c:3181
+#: ../midori/midori-view.c:3501
msgid "Speed dial"
msgstr "Schnellwahl"
-#: ../midori/midori-view.c:3182
+#: ../midori/midori-view.c:3502
msgid "Click to add a shortcut"
msgstr "Klicken um eine Verknüpfung hinzuzufügen"
-#: ../midori/midori-view.c:3183
+#: ../midori/midori-view.c:3503
msgid "Enter shortcut address"
msgstr "Ziel der Verknüpfung eingeben"
-#: ../midori/midori-view.c:3184
+#: ../midori/midori-view.c:3504
msgid "Enter shortcut title"
msgstr "Titel der Verknüpfung eingeben"
-#: ../midori/midori-view.c:3185
+#: ../midori/midori-view.c:3505
msgid "Are you sure you want to delete this shortcut?"
msgstr "Sind Sie sicher, dass Sie diese Verknüpfung löschen wollen?"
-#: ../midori/midori-view.c:3221
+#: ../midori/midori-view.c:3506
+msgid "Set number of columns"
+msgstr "Anzahl Spalten ändern"
+
+#: ../midori/midori-view.c:3507
+msgid "Enter number of columns:"
+msgstr "Anzahl an Spalten eingeben:"
+
+#: ../midori/midori-view.c:3508
+msgid "Set number of shortcuts"
+msgstr "Anzahl Verknüpfungen ändern"
+
+#: ../midori/midori-view.c:3509
+msgid "Enter number of shortcuts:"
+msgstr "Anzahl an Verknüpfungen eingeben:"
+
+#: ../midori/midori-view.c:3535
#, c-format
msgid "Document cannot be displayed"
msgstr "Dokument kann nicht angezeigt werden"
-#: ../midori/midori-view.c:3244
+#: ../midori/midori-view.c:3558
#, c-format
msgid "No documentation installed"
msgstr "Keine Dokumentation installiert"
-#: ../midori/midori-view.c:3467
+#: ../midori/midori-view.c:3808
msgid "Blank page"
msgstr "Leere Seite"
-#: ../midori/midori-view.c:3727
+#: ../midori/midori-view.c:4068
msgid "_Duplicate Tab"
msgstr "Reiter _verdoppeln"
-#: ../midori/midori-view.c:3732
+#: ../midori/midori-view.c:4073
msgid "_Restore Tab"
msgstr "Reiter _wiederherstellen"
-#: ../midori/midori-view.c:3732
+#: ../midori/midori-view.c:4073
msgid "_Minimize Tab"
msgstr "Reiter _minimieren"
-#: ../midori/midori-view.c:3738
+#: ../midori/midori-view.c:4079
msgid "Close ot_her Tabs"
msgstr "Ande_re Reiter schließen"
-#: ../midori/midori-view.c:4362
+#: ../midori/midori-view.c:4700
msgid "Print background images"
msgstr "Hintergrundbilder drucken"
-#: ../midori/midori-view.c:4363
+#: ../midori/midori-view.c:4701
msgid "Whether background images should be printed"
msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht"
-#: ../midori/midori-view.c:4415 ../midori/midori-preferences.c:382
+#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381
msgid "Features"
msgstr "Inhalte"
#. Page "General"
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:298
msgid "General"
msgstr "Allgemein"
-#: ../midori/midori-preferences.c:300
+#: ../midori/midori-preferences.c:299
msgid "Startup"
msgstr "Programmstart"
-#: ../midori/midori-preferences.c:315 ../midori/midori-preferences.c:322
+#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321
msgid "Use current page as homepage"
msgstr "Aktuelle Seite als Startseite benutzen"
-#: ../midori/midori-preferences.c:332 ../panels/midori-transfers.c:87
+#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Übertragungen"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:350
+#: ../midori/midori-preferences.c:349
msgid "Appearance"
msgstr "Erscheinungsbild"
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:350
msgid "Font settings"
msgstr "Schrifteinstellungen"
-#: ../midori/midori-preferences.c:353
+#: ../midori/midori-preferences.c:352
msgid "Default Font Family"
msgstr "Standardschriftart"
-#: ../midori/midori-preferences.c:356
+#: ../midori/midori-preferences.c:355
msgid "The default font family used to display text"
msgstr "Die Standardschriftgröße, in der Text angezeigt wird"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:358
msgid "The default font size used to display text"
msgstr "Die Standardschriftgröße, in der Text angezeigt wird"
-#: ../midori/midori-preferences.c:361
+#: ../midori/midori-preferences.c:360
msgid "Fixed-width Font Family"
msgstr "Dicktengleiche Schriftart"
-#: ../midori/midori-preferences.c:364
+#: ../midori/midori-preferences.c:363
msgid "The font family used to display fixed-width text"
msgstr "Die Schriftart, in der dicktengleicher Text angezeigt wird"
-#: ../midori/midori-preferences.c:367
+#: ../midori/midori-preferences.c:366
msgid "The font size used to display fixed-width text"
msgstr "Die Schriftgröße, in der dicktengleicher Text angezeigt wird"
-#: ../midori/midori-preferences.c:369
+#: ../midori/midori-preferences.c:368
msgid "Minimum Font Size"
msgstr "Mindestschriftgröße"
-#: ../midori/midori-preferences.c:372
+#: ../midori/midori-preferences.c:371
msgid "The minimum font size used to display text"
msgstr "Die Mindestschriftgröße, in der Text angezeigt wird"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:381
+#: ../midori/midori-preferences.c:380
msgid "Behavior"
msgstr "Verhalten"
-#: ../midori/midori-preferences.c:394
+#: ../midori/midori-preferences.c:393
msgid "Enforce 96 dots per inch"
msgstr "96 Punkte pro Zoll erzwingen"
-#: ../midori/midori-preferences.c:395
+#: ../midori/midori-preferences.c:394
msgid "Enforce a video dot density of 96 DPI"
msgstr "Eine Punktdichte von 96 DPI erzwingen"
#: ../midori/midori-preferences.c:414
+msgid "Allow scripts to open popups"
+msgstr "Skripte können Aufklappfenster öffnen"
+
+#: ../midori/midori-preferences.c:415
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Skripte können selbstständig neue Fenster öffnen"
+
+#: ../midori/midori-preferences.c:419
msgid "Spell Checking"
msgstr "Rechtschreibprüfung"
-#: ../midori/midori-preferences.c:417
+#: ../midori/midori-preferences.c:422
msgid "Enable Spell Checking"
msgstr "Rechtschreibprüfung einschalten"
-#: ../midori/midori-preferences.c:418
+#: ../midori/midori-preferences.c:423
msgid "Enable spell checking while typing"
msgstr "Rechtschreibprüfung beim Eintippen einschalten"
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:425
msgid "Spelling dictionaries:"
msgstr "Rechtschreibwörterbücher"
#. i18n: The example should be adjusted to contain a good local default
-#: ../midori/midori-preferences.c:424
+#: ../midori/midori-preferences.c:429
msgid ""
"A comma separated list of languages to be used for spell checking, for "
"example \"en_GB,de_DE\""
@@ -1916,42 +2013,46 @@ msgstr ""
"Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«"
#. Page "Interface"
-#: ../midori/midori-preferences.c:430
+#: ../midori/midori-preferences.c:435
msgid "Interface"
msgstr "Oberfläche"
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:436
msgid "Navigationbar"
msgstr "Navigationsleiste"
-#: ../midori/midori-preferences.c:441
+#: ../midori/midori-preferences.c:446
msgid "Browsing"
msgstr "Navigation"
#. Page "Applications"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:468
msgid "Applications"
msgstr "Anwendungen"
-#: ../midori/midori-preferences.c:464
+#: ../midori/midori-preferences.c:469
msgid "External applications"
msgstr "Externe Anwendungen"
#. Page "Network"
-#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481
+#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486
msgid "Network"
msgstr "Netzwerk"
+#: ../midori/midori-preferences.c:492
+msgid "Hostname"
+msgstr "Rechnername"
+
#. Page "Privacy"
-#: ../midori/midori-preferences.c:505
+#: ../midori/midori-preferences.c:511
msgid "Privacy"
msgstr "Privatssphäre"
-#: ../midori/midori-preferences.c:506
+#: ../midori/midori-preferences.c:512
msgid "Web Cookies"
msgstr "Benutzerprofile"
-#: ../midori/midori-preferences.c:515 ../midori/midori-preferences.c:529
+#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535
msgid "days"
msgstr "Tage"
@@ -1983,83 +2084,67 @@ msgstr "Suchmaschinen verwalten"
msgid "Use as _default"
msgstr "Als _Standard"
-#: ../midori/sokoke.c:1255
+#: ../midori/sokoke.c:1294
msgid "_Bookmark"
msgstr "_Lesezeichen"
-#: ../midori/sokoke.c:1257
+#: ../midori/sokoke.c:1296
msgid "Add Boo_kmark"
msgstr "Lesezeichen _hinzufügen"
-#: ../midori/sokoke.c:1258
+#: ../midori/sokoke.c:1297
msgid "_Console"
msgstr "_Konsole"
-#: ../midori/sokoke.c:1259
+#: ../midori/sokoke.c:1298
msgid "_Extensions"
msgstr "_Erweiterungen"
-#: ../midori/sokoke.c:1260
+#: ../midori/sokoke.c:1299
msgid "_History"
msgstr "_Verlauf"
-#: ../midori/sokoke.c:1261
+#: ../midori/sokoke.c:1300
msgid "_Homepage"
msgstr "_Startseite"
-#: ../midori/sokoke.c:1262
+#: ../midori/sokoke.c:1301
msgid "_Userscripts"
msgstr "_Benutzerskripte"
-#: ../midori/sokoke.c:1263
+#: ../midori/sokoke.c:1302
msgid "New _Tab"
msgstr "Neuer _Reiter"
-#: ../midori/sokoke.c:1264
+#: ../midori/sokoke.c:1303
msgid "_Transfers"
msgstr "Über_tragungen"
-#: ../midori/sokoke.c:1265
+#: ../midori/sokoke.c:1304
msgid "Netscape p_lugins"
msgstr "Netscape-Module"
-#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144
-msgid "Userscripts"
-msgstr "Benutzerskripte"
-
-#: ../panels/midori-addons.c:100
-msgid "Userstyles"
-msgstr "Benutzerstile"
-
-#: ../panels/midori-addons.c:305
-#, c-format
-msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-msgstr ""
-"Kopieren Sie Benutzerskripte in den Ordner »%s« und Benutzerstile in den "
-"Ordner »%s«."
-
-#: ../panels/midori-addons.c:911
-#, c-format
-msgid "Can't monitor folder '%s': %s"
-msgstr "Der Ordner »%s« kann nicht überwacht werden: %s"
+#: ../midori/sokoke.c:1307
+msgid "New _Folder"
+msgstr "Neuer _Ordner"
#: ../panels/midori-bookmarks.c:111
msgid "Bookmarks"
msgstr "Lesezeichen"
-#: ../panels/midori-bookmarks.c:250
+#: ../panels/midori-bookmarks.c:241
msgid "Edit the selected bookmark"
msgstr "Markiertes Lesezeichen bearbeiten"
-#: ../panels/midori-bookmarks.c:258
+#: ../panels/midori-bookmarks.c:249
msgid "Delete the selected bookmark"
msgstr "Markiertes Lesezeichen löschen"
-#: ../panels/midori-bookmarks.c:278
+#: ../panels/midori-bookmarks.c:262
msgid "Add a new folder"
msgstr "Einen neuen Ordner hinzufügen"
-#: ../panels/midori-bookmarks.c:608
+#: ../panels/midori-bookmarks.c:592
msgid "Separator"
msgstr "Trennlinie"
@@ -2067,6 +2152,14 @@ msgstr "Trennlinie"
msgid "Console"
msgstr "Konsole"
+#: ../panels/midori-console.c:361
+msgid "Copy _All"
+msgstr "_Alle kopieren"
+
+#: ../panels/midori-console.c:362
+msgid "Copy All"
+msgstr "Alle kopieren"
+
#: ../panels/midori-extensions.c:91
msgid "Extensions"
msgstr "Erweiterungen"
@@ -2105,28 +2198,28 @@ msgstr "Gestern"
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:438
+#: ../panels/midori-history.c:437
msgid "Bookmark the selected history item"
msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen"
-#: ../panels/midori-history.c:447
+#: ../panels/midori-history.c:446
msgid "Delete the selected history item"
msgstr "Ausgewählten Verlaufseintrag löschen"
-#: ../panels/midori-history.c:455
+#: ../panels/midori-history.c:454
msgid "Clear the entire history"
msgstr "Den gesamten Verlauf löschen"
-#: ../panels/midori-history.c:953
+#: ../panels/midori-history.c:952
#: ../extensions/cookie-manager/cookie-manager-page.c:1144
msgid "Filter:"
msgstr "Filter:"
-#: ../panels/midori-transfers.c:479
+#: ../panels/midori-transfers.c:478
msgid "Open Destination _Folder"
msgstr "Zielordner ö_ffnen"
-#: ../panels/midori-transfers.c:482
+#: ../panels/midori-transfers.c:481
msgid "Copy Link Loc_ation"
msgstr "Verweisziel ko_pieren"
@@ -2154,30 +2247,30 @@ msgstr "Kennwort"
msgid "_Remember password"
msgstr "Kennwort _merken"
-#: ../katze/katze-throbber.c:842
+#: ../katze/katze-throbber.c:882
#, c-format
msgid "Named icon '%s' couldn't be loaded"
msgstr "Das benannte Symbol »%s« konnte nicht geladen werden"
-#: ../katze/katze-throbber.c:855
+#: ../katze/katze-throbber.c:895
#, c-format
msgid "Stock icon '%s' couldn't be loaded"
msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden"
-#: ../katze/katze-throbber.c:923
+#: ../katze/katze-throbber.c:963
msgid "Animation frames are broken"
msgstr "Animationsbilder sind fehlerhaft"
-#: ../katze/katze-utils.c:494 ../katze/katze-utils.c:889
+#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Eigenschaft »%s« ist ungültig für %s"
-#: ../katze/katze-utils.c:540 ../katze/katze-utils.c:569
+#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573
msgid "Choose file"
msgstr "Datei wählen"
-#: ../katze/katze-utils.c:555
+#: ../katze/katze-utils.c:559
msgid "Choose folder"
msgstr "Dateispeicherordner auswählen"
@@ -2186,11 +2279,11 @@ msgstr "Dateispeicherordner auswählen"
msgid "Preferences for %s"
msgstr "Einstellungen für %s"
-#: ../extensions/adblock.c:398
+#: ../extensions/adblock.c:415
msgid "Configure Advertisement filters"
msgstr "Werbefilter einstellen"
-#: ../extensions/adblock.c:430
+#: ../extensions/adblock.c:447
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2200,39 +2293,70 @@ msgstr ""
"ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere "
"Listen finden Sie auf %s."
-#: ../extensions/adblock.c:570
+#: ../extensions/adblock.c:587
msgid "Configure _Advertisement filters..."
msgstr "Werbefilter einstellen..."
-#: ../extensions/adblock.c:818
+#: ../extensions/adblock.c:841
msgid "Edit rule"
msgstr "Regel bearbeiten"
-#: ../extensions/adblock.c:831
+#: ../extensions/adblock.c:854
msgid "_Rule:"
msgstr "_Regel:"
-#: ../extensions/adblock.c:885
+#: ../extensions/adblock.c:908
msgid "Bl_ock image"
msgstr "Bild bloc_kieren"
-#: ../extensions/adblock.c:890
+#: ../extensions/adblock.c:913
msgid "Bl_ock link"
msgstr "Verweis blo_ckieren"
-#: ../extensions/adblock.c:1447
+#: ../extensions/adblock.c:1489
msgid "Advertisement blocker"
msgstr "Werbeblocker"
-#: ../extensions/adblock.c:1448
+#: ../extensions/adblock.c:1490
msgid "Block advertisements according to a filter list"
msgstr "Werbung an Hand einer Filterliste blockieren"
-#: ../extensions/colorful-tabs.c:138
+#: ../extensions/addons.c:122
+#, c-format
+msgid "Copy %s to the folder %s."
+msgstr "%2s in den Ordner %1s kopieren."
+
+#: ../extensions/addons.c:177
+msgid "Userscripts"
+msgstr "Benutzerskripte"
+
+#: ../extensions/addons.c:179
+msgid "Userstyles"
+msgstr "Benutzerstile"
+
+#: ../extensions/addons.c:1085
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr "Die Konfiguration der Erweiterung »%s« konnte nicht geladen werden: %s\n"
+
+#: ../extensions/addons.c:1086 ../extensions/addons.c:1253
+msgid "User addons"
+msgstr "Benutzererweiterungen"
+
+#: ../extensions/addons.c:1210
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "Der Ordner »%s« kann nicht überwacht werden: %s"
+
+#: ../extensions/addons.c:1254
+msgid "Support for userscripts and userstyles"
+msgstr "Unterstützung für Benutzerskripte und -stile"
+
+#: ../extensions/colorful-tabs.c:204
msgid "Colorful Tabs"
msgstr "Farbige Reiter"
-#: ../extensions/colorful-tabs.c:139
+#: ../extensions/colorful-tabs.c:205
msgid "Tint each tab distinctly"
msgstr "Alle Reiter unterschiedlich einfärben"
@@ -2340,12 +2464,12 @@ msgstr "_Cookieverwaltung"
msgid "List, view and delete cookies"
msgstr "Profildateien auflisten, anzeigen und löschen"
-#: ../extensions/feed-panel/feed-atom.c:237
+#: ../extensions/feed-panel/feed-atom.c:209
msgid "Failed to find required Atom \"entry\" elements in XML data."
msgstr ""
"Die für Atom benötigten \"entry\"-Elemente wurden im XML nicht gefunden."
-#: ../extensions/feed-panel/feed-atom.c:343
+#: ../extensions/feed-panel/feed-atom.c:315
msgid "Failed to find required Atom \"feed\" elements in XML data."
msgstr ""
"Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden."
@@ -2357,19 +2481,19 @@ msgctxt "Feed"
msgid "Last updated: %s."
msgstr "Zuletzt aktualisiert: %s."
-#: ../extensions/feed-panel/feed-panel.c:667
+#: ../extensions/feed-panel/feed-panel.c:671
msgid "Feeds"
msgstr "Nachrichtenquellen"
-#: ../extensions/feed-panel/feed-panel.c:720
+#: ../extensions/feed-panel/feed-panel.c:724
msgid "Add new feed"
msgstr "Eine neue Nachrichtenquelle hinzufügen"
-#: ../extensions/feed-panel/feed-panel.c:727
+#: ../extensions/feed-panel/feed-panel.c:731
msgid "Delete feed"
msgstr "Nachrichtenquelle löschen"
-#: ../extensions/feed-panel/feed-panel.c:810
+#: ../extensions/feed-panel/feed-panel.c:814
msgid "_Feeds"
msgstr "_Nachrichtenquellen (Feeds)"
@@ -2450,11 +2574,11 @@ msgstr "Konfigurationsdateien nicht installiert"
msgid "Form history filler"
msgstr "Formularvervollständigung"
-#: ../extensions/mouse-gestures.c:288
+#: ../extensions/mouse-gestures.c:303
msgid "Mouse Gestures"
msgstr "Mausgesten"
-#: ../extensions/mouse-gestures.c:289
+#: ../extensions/mouse-gestures.c:304
msgid "Control Midori by moving the mouse"
msgstr "Steuere Midori durch Bewegen der Maus"
@@ -2507,23 +2631,23 @@ msgstr "Funktionen in der Statusleiste"
msgid "Easily toggle features on web pages on and off"
msgstr "Funktionen auf Internetseiten leicht an- und abstellen"
-#: ../extensions/tab-panel.c:565 ../extensions/tab-panel.c:622
+#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625
msgid "Tab Panel"
msgstr "Reiterleiste"
-#: ../extensions/tab-panel.c:606
+#: ../extensions/tab-panel.c:609
msgid "T_ab Panel"
msgstr "_Reiterleiste"
-#: ../extensions/tab-panel.c:623
+#: ../extensions/tab-panel.c:626
msgid "Show tabs in a vertical panel"
msgstr "Reiter in einer senkrechten Leiste anzeigen"
-#: ../extensions/tab-switcher.c:394
+#: ../extensions/tab-switcher.c:395
msgid "Tab History List"
msgstr "Verlaufsgestützte Reiterliste"
-#: ../extensions/tab-switcher.c:395
+#: ../extensions/tab-switcher.c:396
msgid "Allows to switch tabs by choosing from a list sorted by last usage"
msgstr "Reiter anhand einer nach Nutzung sortierten Liste wechseln"
@@ -2563,6 +2687,18 @@ msgstr "Werkzeugleisten leicht anpassen"
msgid "Cache HTTP communication on disk"
msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern"
+#~ msgid "Open _Link"
+#~ msgstr "Ver_weis öffnen"
+
+#~ msgid "Open Image in New Wi_ndow"
+#~ msgstr "Bild in neuem Fe_nster öffnen"
+
+#~ 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«."
+
#~ msgid "Failed to get current time: %s\n"
#~ msgstr "Die aktuelle Uhrzeit konnte nicht ermittelt werden: %s\n"
diff --git a/po/el.po b/po/el.po
index 8c605b45..69b68350 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,29 +6,26 @@ msgid ""
msgstr ""
"Project-Id-Version: midori git version\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-22 14:54+0200\n"
-"PO-Revision-Date: 2010-02-22 19:03+0200\n"
+"POT-Creation-Date: 2010-04-09 04:06+0000\n"
+"PO-Revision-Date: 2010-03-09 19:56+0200\n"
"Last-Translator: Evaggelos Balaskas \n"
"Language-Team: Greek \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Language: Greek\n"
-"X-Poedit-Country: GREECE\n"
"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Country: GREECE\n"
+"X-Generator: Lokalize 0.2\n"
#: ../data/midori.desktop.in.h:1
msgid "Lightweight web browser"
msgstr "Ελαφρύς περιηγητής ιστού"
-#: ../data/midori.desktop.in.h:2
-#: ../midori/main.c:1301
-#: ../midori/main.c:1532
-#: ../midori/main.c:1540
-#: ../midori/main.c:1556
-#: ../midori/midori-websettings.c:299
+#: ../data/midori.desktop.in.h:2 ../midori/main.c:1319 ../midori/main.c:1647
+#: ../midori/main.c:1655 ../midori/main.c:1671
+#: ../midori/midori-websettings.c:318
msgid "Midori"
msgstr "Μιντόρι"
@@ -36,184 +33,194 @@ msgstr "Μιντόρι"
msgid "Web Browser"
msgstr "Περιηγητής Ιστού"
-#: ../midori/main.c:96
+#: ../midori/main.c:103
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Οι ρυθμίσεις δεν μπορούν να φορτωθούν: %s\n"
-#: ../midori/main.c:145
+#: ../midori/main.c:152
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Η τιμή '%s' δεν είναι έγκυρη για το %s"
-#: ../midori/main.c:152
-#: ../midori/main.c:238
+#: ../midori/main.c:159 ../midori/main.c:245
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Μη έγκυρη τιμή ρύθμισης '%s'"
-#: ../midori/main.c:364
-#: ../extensions/formhistory.c:446
+#: ../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:413
+#: ../midori/main.c:426
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Αποτυχία στην διαγραφή των παλιών αντικειμένων από το ιστορικό: %s\n"
-#: ../midori/main.c:433
+#: ../midori/main.c:446
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Οι ρυθμίσεις δεν μπορούν να αποθηκευτούν. %s"
-#: ../midori/main.c:471
+#: ../midori/main.c:484
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να αποθηκευτούν. %s"
-#: ../midori/main.c:490
-#: ../midori/main.c:540
-#: ../midori/main.c:560
+#: ../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:590
-#: ../midori/main.c:613
+#: ../midori/main.c:603 ../midori/main.c:626
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Τα απορρίμματα δεν μπόρεσαν να αποθηκευτούν. %s"
-#: ../midori/main.c:677
-#: ../midori/main.c:892
+#: ../midori/main.c:690 ../midori/main.c:907
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Η συνεδρία δεν μπόρεσε να αποθηκευτεί. %s"
-#: ../midori/main.c:926
+#: ../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."
msgstr "Το Μιντόρι φαίνεται ότι κρέμασε την τελευταία φορά που άνοιξε. Εάν αυτό συνεχίζει επανειλημμένα δοκιμάστε μία από τις παρακάτω επιλογές για να επιλύσετε το πρόβλημα."
-#: ../midori/main.c:941
+#: ../midori/main.c:956
msgid "Modify _preferences"
msgstr "Τροποποίηση _προτιμήσεων"
-#: ../midori/main.c:945
+#: ../midori/main.c:960
msgid "Reset the last _session"
msgstr "Επαναφορά της τελευταίας σ_υνεδρίας"
-#: ../midori/main.c:950
+#: ../midori/main.c:965
msgid "Disable all _extensions"
msgstr "Απενεργοποίηση όλων των επ_εκτάσεων"
-#: ../midori/main.c:1185
-#: ../midori/main.c:1796
+#: ../midori/main.c:1200 ../midori/main.c:1920
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n"
-#: ../midori/main.c:1301
+#: ../midori/main.c:1319
msgid "No filename specified"
msgstr "Δεν ορίστηκε όνομα αρχείου"
-#: ../midori/main.c:1320
+#: ../midori/main.c:1338
msgid "An unknown error occured."
msgstr "Συνέβη ένα άγνωστο σφάλμα."
-#: ../midori/main.c:1351
+#: ../midori/main.c:1369
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Το στιγμιότυπο αποθηκεύτηκε στο: %s\n"
-#: ../midori/main.c:1434
+#: ../midori/main.c:1540
msgid "Run ADDRESS as a web application"
msgstr "Άνοιγμα της διεύθυνσης ως διαδικτυακή εφαρμογή"
-#: ../midori/main.c:1434
+#: ../midori/main.c:1540
msgid "ADDRESS"
msgstr "Διεύθυνση"
-#: ../midori/main.c:1437
+#: ../midori/main.c:1543
msgid "Use FOLDER as configuration folder"
msgstr "Χρήση φακέλου ως φάκελος ρύθμισης"
-#: ../midori/main.c:1437
+#: ../midori/main.c:1543
msgid "FOLDER"
msgstr "ΦΑΚΕΛΟΣ"
-#: ../midori/main.c:1440
+#: ../midori/main.c:1546
msgid "Show a diagnostic dialog"
msgstr "Εμφάνιση του διαλόγου διάγνωσης"
-#: ../midori/main.c:1442
+#: ../midori/main.c:1548
msgid "Run the specified filename as javascript"
msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript"
-#: ../midori/main.c:1445
+#: ../midori/main.c:1551
msgid "Take a snapshot of the specified URI"
msgstr "Αποθήκευση του συγκεκριμένου URI"
-#: ../midori/main.c:1448
+#: ../midori/main.c:1554
msgid "Execute the specified command"
msgstr "Εκτέλεση της συγκεκριμένης εντολής"
-#: ../midori/main.c:1450
+#: ../midori/main.c:1556
msgid "Display program version"
msgstr "Προβολή έκδοσης προγράμματος"
-#: ../midori/main.c:1452
+#: ../midori/main.c:1558
msgid "Addresses"
msgstr "Διευθύνσεις"
-#: ../midori/main.c:1529
+#: ../midori/main.c:1560
+msgid "Block URIs according to regular expression PATTERN"
+msgstr ""
+
+#: ../midori/main.c:1560
+msgid "PATTERN"
+msgstr "ΜΟΤΙΒΟ"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:1564
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+
+#: ../midori/main.c:1564
+msgid "SECONDS"
+msgstr "ΔΕΥΤΕΡΟΛΕΠΤΑ"
+
+#: ../midori/main.c:1644
msgid "[Addresses]"
msgstr "[Διευθύνσεις"
-#: ../midori/main.c:1557
+#: ../midori/main.c:1672
msgid "Please report comments, suggestions and bugs to:"
msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:"
-#: ../midori/main.c:1559
+#: ../midori/main.c:1674
msgid "Check for new versions at:"
msgstr "Έλεγχος για νέα έκδοση στο:"
-#: ../midori/main.c:1647
+#: ../midori/main.c:1771
msgid "The specified configuration folder is invalid."
msgstr "Η συγκεκριμένη ρύθμιση φακέλου είναι άκυρη."
-#: ../midori/main.c:1695
+#: ../midori/main.c:1819
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Ένα στιγμιότυπο του Μιντόρι τρέχει ήδη αλλά δεν ανταποκρίνεται.\n"
-#: ../midori/main.c:1750
+#: ../midori/main.c:1874
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να φορτωθούν. %s\n"
-#: ../midori/main.c:1779
+#: ../midori/main.c:1903
#, c-format
msgid "The bookmarks couldn't be loaded: %s\n"
msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n"
-#: ../midori/main.c:1811
+#: ../midori/main.c:1935
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Τα απορρίμματα δεν μπόρεσαν να φορτωθούν: %s\n"
-#: ../midori/main.c:1825
+#: ../midori/main.c:1949
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Το ιστορικό δεν μπόρεσε να φορτωθεί: %s\n"
-#: ../midori/main.c:1839
+#: ../midori/main.c:1963
msgid "The following errors occured:"
msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:"
-#: ../midori/main.c:1855
+#: ../midori/main.c:1979
msgid "_Ignore"
msgstr "Α_γνόησε"
@@ -221,8 +228,7 @@ msgstr "Α_γνόησε"
msgid "File not found."
msgstr "Το αρχείο δεν βρέθηκε."
-#: ../midori/midori-array.c:462
-#: ../midori/midori-array.c:485
+#: ../midori/midori-array.c:462 ../midori/midori-array.c:485
#: ../midori/midori-array.c:495
msgid "Malformed document."
msgstr "Κακοσχηματισμένο έγγραφο."
@@ -231,20 +237,17 @@ msgstr "Κακοσχηματισμένο έγγραφο."
msgid "Unrecognized bookmark format."
msgstr "Άγνωστος τύπος συνδέσμου."
-#: ../midori/midori-array.c:718
-#: ../midori/sokoke.c:1076
+#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120
#, c-format
msgid "Writing failed."
msgstr "Αποτυχία εγγραφής."
-#: ../midori/midori-browser.c:331
-#: ../midori/midori-browser.c:5318
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5427
+#: ../midori/midori-browser.c:5433
msgid "Reload the current page"
msgstr "Ανανέωση της τρέχουσας σελίδας"
-#: ../midori/midori-browser.c:341
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5430
msgid "Stop loading the current page"
msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας"
@@ -283,26 +286,21 @@ msgstr "Επεξεργασία σελιδοδείκτη"
msgid "_Title:"
msgstr "_Τίτλος:"
-#: ../midori/midori-browser.c:757
-#: ../midori/midori-searchaction.c:961
+#: ../midori/midori-browser.c:757 ../midori/midori-searchaction.c:961
msgid "_Description:"
msgstr "_Περιγραφή:"
-#: ../midori/midori-browser.c:776
-#: ../midori/midori-searchaction.c:975
+#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:975
#: ../extensions/feed-panel/main.c:376
msgid "_Address:"
msgstr "_Διεύθυνση:"
-#: ../midori/midori-browser.c:806
-#: ../midori/midori-browser.c:4508
+#: ../midori/midori-browser.c:806 ../midori/midori-browser.c:4582
msgid "_Folder:"
msgstr "_Φάκελος:"
-#: ../midori/midori-browser.c:816
-#: ../midori/midori-browser.c:896
-#: ../midori/midori-browser.c:4513
-#: ../midori/midori-browser.c:4545
+#: ../midori/midori-browser.c:816 ../midori/midori-browser.c:896
+#: ../midori/midori-browser.c:4587 ../midori/midori-browser.c:4619
msgid "Toplevel folder"
msgstr "Αρχικός φάκελος"
@@ -314,13 +312,12 @@ msgstr "Εμφάνιση στην εργαλειο_θήκη"
msgid "Run as _web application"
msgstr "Εκτέλεση ως _διαδικτυακή εφαρμογή"
-#: ../midori/midori-browser.c:976
-#: ../midori/midori-browser.c:4563
+#: ../midori/midori-browser.c:976 ../midori/midori-browser.c:4637
+#: ../midori/midori-browser.c:4669
msgid "Save file as"
msgstr "Αποθήκευση αρχείου ως"
-#: ../midori/midori-browser.c:1350
-#: ../panels/midori-transfers.c:271
+#: ../midori/midori-browser.c:1350 ../panels/midori-transfers.c:271
#, c-format
msgid "%s of %s"
msgstr "%s από %s"
@@ -338,703 +335,713 @@ msgstr "Η μεταφορά ολοκληρώθηκε"
msgid "Save file"
msgstr "Αποθήκευση αρχείου"
-#: ../midori/midori-browser.c:2244
+#: ../midori/midori-browser.c:2253
msgid "Open file"
msgstr "Άνοιγμα αρχείου"
-#: ../midori/midori-browser.c:2320
-#: ../extensions/feed-panel/main.c:364
+#: ../midori/midori-browser.c:2329 ../extensions/feed-panel/main.c:364
msgid "New feed"
msgstr "Νέα ροή"
-#: ../midori/midori-browser.c:2361
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:2370 ../midori/midori-browser.c:5492
#: ../panels/midori-bookmarks.c:242
msgid "Add a new bookmark"
msgstr "Προσθήκη ενός νέου σελιδοδείκτη"
-#: ../midori/midori-browser.c:2918
-#: ../panels/midori-history.c:329
-#: ../extensions/formhistory.c:461
-#: ../extensions/formhistory.c:465
+#: ../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 "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s\n"
-#: ../midori/midori-browser.c:2998
-#: ../midori/midori-searchaction.c:484
+#: ../midori/midori-browser.c:3007 ../midori/midori-searchaction.c:484
msgid "Empty"
msgstr "Άδειο"
-#: ../midori/midori-browser.c:3613
-#: ../midori/sokoke.c:400
-#: ../midori/sokoke.c:410
-#: ../midori/sokoke.c:438
-#: ../midori/sokoke.c:464
-#: ../midori/sokoke.c:478
+#: ../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."
msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα."
-#: ../midori/midori-browser.c:4205
-#: ../panels/midori-bookmarks.c:795
-#: ../panels/midori-history.c:748
+#: ../midori/midori-browser.c:3942 ../midori/midori-browser.c:5886
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s\n"
+
+#: ../midori/midori-browser.c:4275 ../panels/midori-bookmarks.c:795
+#: ../panels/midori-history.c:751
msgid "Open all in _Tabs"
msgstr "Άνοιγμα όλων σε _καρτέλες"
-#: ../midori/midori-browser.c:4212
-#: ../panels/midori-bookmarks.c:801
-#: ../panels/midori-history.c:754
-#: ../extensions/feed-panel/feed-panel.c:545
+#: ../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 "Άνοιγμα σε νέα_καρτέλα"
-#: ../midori/midori-browser.c:4215
-#: ../panels/midori-bookmarks.c:803
-#: ../panels/midori-history.c:756
-#: ../extensions/feed-panel/feed-panel.c:547
+#: ../midori/midori-browser.c:4285 ../panels/midori-bookmarks.c:803
+#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547
msgid "Open in New _Window"
msgstr "Άνοιγμα σε νέο _παράθυρο"
-#: ../midori/midori-browser.c:4434
+#: ../midori/midori-browser.c:4508
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4435
+#: ../midori/midori-browser.c:4509
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4436
+#: ../midori/midori-browser.c:4510
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4437
+#: ../midori/midori-browser.c:4511
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4438
+#: ../midori/midori-browser.c:4512
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4459
-#: ../panels/midori-bookmarks.c:271
+#: ../midori/midori-browser.c:4533 ../panels/midori-bookmarks.c:271
msgid "Import bookmarks..."
msgstr "Εισαγωγή συνδέσμων..."
-#: ../midori/midori-browser.c:4462
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:4536 ../midori/midori-browser.c:5497
msgid "_Import bookmarks"
msgstr "_Εισαγωγή συνδέσμων..."
-#: ../midori/midori-browser.c:4473
+#: ../midori/midori-browser.c:4547
msgid "_Application:"
msgstr "_Εφαρμογή:"
-#: ../midori/midori-browser.c:4500
-#: ../midori/midori-browser.c:5473
-#: ../midori/midori-websettings.c:230
-#: ../midori/midori-websettings.c:304
-#: ../katze/katze-utils.c:687
+#: ../midori/midori-browser.c:4574 ../midori/midori-browser.c:5601
+#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323
+#: ../katze/katze-utils.c:688
msgid "Custom..."
msgstr "Προσαρμογή..."
-#: ../midori/midori-browser.c:4574
+#: ../midori/midori-browser.c:4648
msgid "Failed to import bookmarks"
msgstr "Αποτυχία εισαγωγής συνδέσμων"
-#: ../midori/midori-browser.c:4631
-#: ../panels/midori-history.c:141
+#: ../midori/midori-browser.c:4684
+msgid "Failed to export bookmarks"
+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"
msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n"
-#: ../midori/midori-browser.c:4737
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-browser.c:4845
msgid "Clear Private Data"
msgstr "Καθαρισμός προσωπικών δεδομένων"
-#: ../midori/midori-browser.c:4741
+#: ../midori/midori-browser.c:4849
msgid "_Clear private data"
msgstr "_Καθαρισμός προσωπικών δεδομένων"
-#: ../midori/midori-browser.c:4755
+#: ../midori/midori-browser.c:4863
msgid "Clear the following data:"
msgstr "Καθαρισμός των παρακάτω δεδομένων:"
-#: ../midori/midori-browser.c:4766
-#: ../midori/midori-preferences.c:524
+#: ../midori/midori-browser.c:4874 ../midori/midori-preferences.c:530
#: ../panels/midori-history.c:119
msgid "History"
msgstr "Ιστορικό"
-#: ../midori/midori-browser.c:4772
+#: ../midori/midori-browser.c:4880
msgid "Cookies"
msgstr "Cookies"
-#: ../midori/midori-browser.c:4777
+#: ../midori/midori-browser.c:4885
msgid "'Flash' Cookies"
msgstr "Άδειασμα των cookies"
-#: ../midori/midori-browser.c:4782
+#: ../midori/midori-browser.c:4890
msgid "Website icons"
msgstr "Εικονίδια ιστότοπων"
-#: ../midori/midori-browser.c:4787
-#: ../midori/sokoke.c:1266
+#: ../midori/midori-browser.c:4895 ../midori/sokoke.c:1310
msgid "_Closed Tabs"
msgstr "_Κλειστές καρτέλες"
-#: ../midori/midori-browser.c:4792
-#: ../extensions/web-cache.c:464
+#: ../midori/midori-browser.c:4900 ../extensions/web-cache.c:464
msgid "Web Cache"
msgstr "Προσωρινής μνήμης ιστού"
-#: ../midori/midori-browser.c:4800
+#: ../midori/midori-browser.c:4908
msgid "Clear private data when _quitting Midori"
msgstr "Καθαρισμός προσωπικών δεδομένων κατά τον _τερματισμό του Midori"
-#: ../midori/midori-browser.c:4908
+#: ../midori/midori-browser.c:5016
msgid "A lightweight web browser."
msgstr "Ένας ελαφρύς περιηγητής ιστού"
-#: ../midori/midori-browser.c:4924
+#: ../midori/midori-browser.c:5032
msgid "translator-credits"
msgstr "Ευάγγελος Μπαλάσκας 2008,2009"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5340
msgid "_File"
msgstr "_Αρχείο"
-#: ../midori/midori-browser.c:5233
-#: ../midori/sokoke.c:1267
+#: ../midori/midori-browser.c:5342 ../midori/sokoke.c:1311
msgid "New _Window"
msgstr "Νέο _παράθυρο"
-#: ../midori/midori-browser.c:5234
+#: ../midori/midori-browser.c:5343
msgid "Open a new window"
msgstr "Άνοιγμα ενός νέου παραθύρου"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5346
msgid "Open a new tab"
msgstr "Άνοιγμα μίας νέας καρτέλας"
-#: ../midori/midori-browser.c:5239
+#: ../midori/midori-browser.c:5348
msgid "P_rivate Browsing"
msgstr "Π_ροσωπική περιήγηση"
-#: ../midori/midori-browser.c:5240
+#: ../midori/midori-browser.c:5349
msgid "Don't save any private data while browsing"
msgstr "Να μην γίνει αποθήκευση προσωπικών δεδομένων κατά την περιήγηση"
-#: ../midori/midori-browser.c:5244
+#: ../midori/midori-browser.c:5353
msgid "Open a file"
msgstr "Άνοιγμα αρχείου"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5356
msgid "Save to a file"
msgstr "Αποθήκευση σε αρχείου"
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5358
msgid "Add to Speed _dial"
msgstr "Προσθήκη σε γρήγορη σ_ύνδεση"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5359
msgid "Add shortcut to speed dial"
msgstr "Προσθήκη συντόμευσης σε γρήγορη σύνδεση"
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5361
msgid "Add Shortcut to the _desktop"
msgstr "Προσθήκη συντόμευσης στην _επιφάνεια εργασίας"
-#: ../midori/midori-browser.c:5253
+#: ../midori/midori-browser.c:5362
msgid "Add shortcut to the desktop"
msgstr "Προσθήκη συντόμευσης στην _επιφάνεια"
-#: ../midori/midori-browser.c:5255
+#: ../midori/midori-browser.c:5364
msgid "Subscribe to News _feed"
msgstr "Εγγραφή σε _ροή νέων"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5365
msgid "Subscribe to this news feed"
msgstr "Εγγραφή στην ροή νέων"
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5370
msgid "_Close Tab"
msgstr "_Κλείσιμο καρτέλας"
-#: ../midori/midori-browser.c:5262
+#: ../midori/midori-browser.c:5371
msgid "Close the current tab"
msgstr "Κλείσιμο της τρέχουσας καρτέλας"
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5373
msgid "C_lose Window"
msgstr "Κ_λείσιμο παραθύρου"
-#: ../midori/midori-browser.c:5265
+#: ../midori/midori-browser.c:5374
msgid "Close this window"
msgstr "Κλείσιμο αυτού του παραθύρου"
-#: ../midori/midori-browser.c:5268
+#: ../midori/midori-browser.c:5377
msgid "Print the current page"
msgstr "Εκτύπωση της τρέχουσας σελίδας"
-#: ../midori/midori-browser.c:5271
+#: ../midori/midori-browser.c:5380
msgid "Quit the application"
msgstr "Έξοδος από την εφαρμογή"
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5382
msgid "_Edit"
msgstr "_Επεξεργασία"
-#: ../midori/midori-browser.c:5277
+#: ../midori/midori-browser.c:5386
msgid "Undo the last modification"
msgstr "Αναίρεση της τελευταίας τροποποίησης"
-#: ../midori/midori-browser.c:5280
+#: ../midori/midori-browser.c:5389
msgid "Redo the last modification"
msgstr "Επανάληψη της τελευταίας τροποποίησης"
-#: ../midori/midori-browser.c:5284
+#: ../midori/midori-browser.c:5393
msgid "Cut the selected text"
msgstr "Αποκοπή επιλεγμένου κειμένου"
-#: ../midori/midori-browser.c:5287
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5396 ../midori/midori-browser.c:5399
msgid "Copy the selected text"
msgstr "Αντιγραφή επιλεγμένου κειμένου"
-#: ../midori/midori-browser.c:5293
+#: ../midori/midori-browser.c:5402
msgid "Paste text from the clipboard"
msgstr "Επικόλληση κειμένου από το πρόχειρο"
-#: ../midori/midori-browser.c:5296
+#: ../midori/midori-browser.c:5405
msgid "Delete the selected text"
msgstr "Διαγραφή του επιλεγμένου κειμένου"
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5408
msgid "Select all text"
msgstr "Επιλογή όλου του κειμένου"
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5411
msgid "Find a word or phrase in the page"
msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα"
-#: ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:5413
msgid "Find _Next"
msgstr "Εύρεση επ_όμενο"
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5414
msgid "Find the next occurrence of a word or phrase"
msgstr "Εύρεση της επόμενης ύπαρξης της λέξης ή της φράσης"
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:5416
msgid "Find _Previous"
msgstr "Εύρεση _προηγούμενο"
-#: ../midori/midori-browser.c:5308
+#: ../midori/midori-browser.c:5417
msgid "Find the previous occurrence of a word or phrase"
msgstr "Εύρεση της προηγούμενης ύπαρξης της λέξης ή της φράσης"
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5421
msgid "Configure the application preferences"
msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής"
-#: ../midori/midori-browser.c:5314
+#: ../midori/midori-browser.c:5423
msgid "_View"
msgstr "_Εμφάνιση"
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5424
msgid "_Toolbars"
msgstr "_Εργαλειοθήκες"
-#: ../midori/midori-browser.c:5327
+#: ../midori/midori-browser.c:5436
msgid "Increase the zoom level"
msgstr "Αύξηση του επίπεδου εστίασης"
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5439
msgid "Decrease the zoom level"
msgstr "Μείωση του επιπέδου εστίασης"
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5442
msgid "Reset the zoom level"
msgstr "Επαναφορά του επιπέδου εστίασης"
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5443
msgid "_Encoding"
msgstr "_Κωδικοποίηση"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5445
msgid "View So_urce"
msgstr "Προβολή κ_ώδικα"
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5446
msgid "View the source code of the page"
msgstr "Προβολή του πηγαίου κώδικα αυτής της σελίδας"
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5449
msgid "Toggle fullscreen view"
msgstr "Εναλλαγή σε πλήρη οθόνη"
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5452
+msgid "Scroll _Left"
+msgstr "Μετακίνηση _αριστερά"
+
+#: ../midori/midori-browser.c:5453
+msgid "Scroll to the left"
+msgstr "Μετακίνηση προς αριστερά"
+
+#: ../midori/midori-browser.c:5455
+msgid "Scroll _Down"
+msgstr "Μετακίνηση _κάτω"
+
+#: ../midori/midori-browser.c:5456
+msgid "Scroll down"
+msgstr "Μετακίνηση κάτω"
+
+#: ../midori/midori-browser.c:5458
+msgid "Scroll _Up"
+msgstr "Μετακίνηση _επάνω"
+
+#: ../midori/midori-browser.c:5459
+msgid "Scroll up"
+msgstr "Μετακίνηση _επάνω"
+
+#: ../midori/midori-browser.c:5461
+msgid "Scroll _Right"
+msgstr "Μετακίνηση _δεξιά"
+
+#: ../midori/midori-browser.c:5462
+msgid "Scroll to the right"
+msgstr "Μετακίνηση προς τα δεξιά"
+
+#: ../midori/midori-browser.c:5465
msgid "_Go"
msgstr "_Μετάβαση"
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5468
msgid "Go back to the previous page"
msgstr "Μετάβαση στην προηγούμενη σελίδα"
-#: ../midori/midori-browser.c:5348
+#: ../midori/midori-browser.c:5471
msgid "Go forward to the next page"
msgstr "Μετάβαση στην επόμενη σελίδα"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5352
+#: ../midori/midori-browser.c:5475
msgid "Go to the previous sub-page"
msgstr "Μετάβαση στην προηγούμενη υπό-σελίδα"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5479
msgid "Go to the next sub-page"
msgstr "Μετάβαση στην επόμενη υπό-σελίδα"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5482
msgid "Go to your homepage"
msgstr "Μετάβαση στην αρχική σελίδα"
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5484
msgid "Empty Trash"
msgstr "Άδειασμα απορριμμάτων"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5485
msgid "Delete the contents of the trash"
msgstr "Διαγραφή των περιεχομένων των απορριμμάτων"
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5487
msgid "Undo _Close Tab"
msgstr "Αναίρεση κλ_είσιμο καρτέλας"
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5488
msgid "Open the last closed tab"
msgstr "Άνοιγμα της τελευταίας καρτέλας που έκλεισε"
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5494
msgid "Add a new _folder"
msgstr "Προσθήκη ενός νέου φ_ακέλου"
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5495
msgid "Add a new bookmark folder"
msgstr "Προσθήκη ενός νέου φακέλου σελιδοδεικτών"
-#: ../midori/midori-browser.c:5377
-#: ../midori/midori-searchaction.c:493
+#: ../midori/midori-browser.c:5500
+msgid "_Export bookmarks"
+msgstr "_Εξαγωγή συνδέσμων"
+
+#: ../midori/midori-browser.c:5503 ../midori/midori-searchaction.c:493
msgid "_Manage Search Engines"
msgstr "_Διαχείριση των μηχανών αναζήτησης"
-#: ../midori/midori-browser.c:5378
+#: ../midori/midori-browser.c:5504
msgid "Add, edit and remove search engines..."
msgstr "Προσθήκη, επεξεργασία και διαγραφή των μηχανών αναζήτησης..."
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5507
msgid "_Clear Private Data"
msgstr "_Καθαρισμός προσωπικών δεδομένων"
-#: ../midori/midori-browser.c:5382
+#: ../midori/midori-browser.c:5508
msgid "Clear private data..."
msgstr "Καθαρισμός προσωπικών δεδομένων..."
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5512
msgid "_Inspect Page"
msgstr "_Εξέταση σελίδας"
-#: ../midori/midori-browser.c:5387
+#: ../midori/midori-browser.c:5513
msgid "Inspect page details and access developer tools..."
msgstr "Εξέταση λεπτομερειών σελίδας και πρόσβαση σε διαχειριστικά εργαλεία ..."
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5518
msgid "_Previous Tab"
msgstr "_Προηγούμενη καρτέλα"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5519
msgid "Switch to the previous tab"
msgstr "Μετάβαση στην προηγούμενη καρτέλα"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5521
msgid "_Next Tab"
msgstr "Επόμε_νη καρτέλα"
-#: ../midori/midori-browser.c:5396
+#: ../midori/midori-browser.c:5522
msgid "Switch to the next tab"
msgstr "Μετάβαση στην επόμενη καρτέλα"
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5524
msgid "Focus _Current Tab"
msgstr "Εστίαση στην _ισχύουσα καρτέλα"
-#: ../midori/midori-browser.c:5399
+#: ../midori/midori-browser.c:5525
msgid "Focus the current tab"
msgstr "Εστίαση στην ισχύουσα καρτέλα"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5527
msgid "Open last _session"
msgstr "Επαναφορά της τελευταίας _συνεδρίας"
-#: ../midori/midori-browser.c:5402
+#: ../midori/midori-browser.c:5528
msgid "Open the tabs saved in the last session"
msgstr "Άνοιγμα των καρτελών που αποθηκεύτηκαν κατά την τελευταία συνεδρία"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5530
msgid "_Help"
msgstr "_Βοήθεια"
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5532
msgid "_Contents"
msgstr "_Περιεχόμενα"
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5533
msgid "Show the documentation"
msgstr "Εμφάνιση της τεκμηρίωσης"
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5535
msgid "_Frequent Questions"
msgstr "Σ_υχνές ερωτήσεις"
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5536
msgid "Show the Frequently Asked Questions"
msgstr "Εμφάνιση των πιο συχνά ερωτηθέντων ερωτήσεων"
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5538
msgid "_Report a Bug"
msgstr "Α_ναφορά σφάλματος"
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5539
msgid "Open Midori's bug tracker"
msgstr "Άνοιγμα καταγραφής σφαλμάτων midori"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5542
msgid "Show information about the program"
msgstr "Εμφάνιση πληροφοριών σχετικά με την εφαρμογή"
-#: ../midori/midori-browser.c:5423
+#: ../midori/midori-browser.c:5550
msgid "_Menubar"
msgstr "_Μπάρα μενού"
-#: ../midori/midori-browser.c:5424
+#: ../midori/midori-browser.c:5551
msgid "Show menubar"
msgstr "Προβολή μπάρας μενού"
-#: ../midori/midori-browser.c:5427
+#: ../midori/midori-browser.c:5554
msgid "_Navigationbar"
msgstr "_Μπάρα περιήγησης"
-#: ../midori/midori-browser.c:5428
+#: ../midori/midori-browser.c:5555
msgid "Show navigationbar"
msgstr "Εμφάνιση περιήγησης"
-#: ../midori/midori-browser.c:5431
+#: ../midori/midori-browser.c:5558
msgid "Side_panel"
msgstr "Πλαϊνό _πλαίσιο"
-#: ../midori/midori-browser.c:5432
+#: ../midori/midori-browser.c:5559
msgid "Show sidepanel"
msgstr "Εμφάνιση πλαϊνού πλαισίου"
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5562
msgid "_Bookmarkbar"
msgstr "_Μπάρα σελιδοδείκτη"
-#: ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5563
msgid "Show bookmarkbar"
msgstr "Εμφάνιση μπάρα σελιδοδείκτη"
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5566
msgid "_Transferbar"
msgstr "_Μπάρα μεταφορών"
-#: ../midori/midori-browser.c:5440
+#: ../midori/midori-browser.c:5567
msgid "Show transferbar"
msgstr "Εμφάνιση μπάρα μεταφορών"
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5570
msgid "_Statusbar"
msgstr "_Γραμμή κατάστασης"
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:5571
msgid "Show statusbar"
msgstr "Εμφάνιση γραμμής κατάστασης"
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5579
msgid "_Automatic"
msgstr "_Αυτόματα"
-#: ../midori/midori-browser.c:5454
-#: ../midori/midori-websettings.c:224
+#: ../midori/midori-browser.c:5582 ../midori/midori-websettings.c:226
msgid "Chinese (BIG5)"
msgstr "Κινέζικα (BIG5)"
-#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
-#: ../midori/midori-browser.c:5458
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5586
msgid "Japanese (SHIFT__JIS)"
msgstr "Ιαπωνικά (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5461
-#: ../midori/midori-websettings.c:226
+#: ../midori/midori-browser.c:5589 ../midori/midori-websettings.c:228
msgid "Korean (EUC-KR)"
msgstr "Κορεάτικα (EUC-KR)"
-#: ../midori/midori-browser.c:5464
-#: ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5592 ../midori/midori-websettings.c:229
msgid "Russian (KOI8-R)"
msgstr "Ρωσικά (KOI8-R)"
-#: ../midori/midori-browser.c:5467
-#: ../midori/midori-websettings.c:228
+#: ../midori/midori-browser.c:5595 ../midori/midori-websettings.c:230
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5470
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-browser.c:5598 ../midori/midori-websettings.c:231
msgid "Western (ISO-8859-1)"
msgstr "Δυτικά (ISO-8859-1)"
-#: ../midori/midori-browser.c:5753
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s\n"
-
-#: ../midori/midori-browser.c:6013
+#: ../midori/midori-browser.c:6146
msgid "_Separator"
msgstr "_Διαχωριστής"
-#: ../midori/midori-browser.c:6020
+#: ../midori/midori-browser.c:6153
msgid "_Location..."
msgstr "_Τοποθεσία:"
-#: ../midori/midori-browser.c:6022
+#: ../midori/midori-browser.c:6155
msgid "Open a particular location"
msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας"
-#: ../midori/midori-browser.c:6046
+#: ../midori/midori-browser.c:6179
msgid "_Web Search..."
msgstr "_Αναζήτηση ιστού..."
-#: ../midori/midori-browser.c:6048
+#: ../midori/midori-browser.c:6181
msgid "Run a web search"
msgstr "Εκκίνηση μίας αναζήτησης ιστού"
-#: ../midori/midori-browser.c:6069
+#: ../midori/midori-browser.c:6202
msgid "Reopen a previously closed tab or window"
msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει"
-#: ../midori/midori-browser.c:6084
+#: ../midori/midori-browser.c:6217
msgid "_Recently visited pages"
msgstr "_Πρόσφατες επισκεφθείσες σελίδες"
-#: ../midori/midori-browser.c:6086
+#: ../midori/midori-browser.c:6219
msgid "Reopen pages that you visited earlier"
msgstr "Ξανα-άνοιγμα σελίδων που επισκεφτήκατε νωρίτερα"
-#: ../midori/midori-browser.c:6101
-#: ../midori/sokoke.c:1256
+#: ../midori/midori-browser.c:6234 ../midori/sokoke.c:1300
msgid "_Bookmarks"
msgstr "_Σελιδοδείκτες"
-#: ../midori/midori-browser.c:6103
+#: ../midori/midori-browser.c:6236
msgid "Show the saved bookmarks"
msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών"
-#: ../midori/midori-browser.c:6118
+#: ../midori/midori-browser.c:6251
msgid "_Tools"
msgstr "_Εργαλεία"
-#: ../midori/midori-browser.c:6131
+#: ../midori/midori-browser.c:6264
msgid "_Window"
msgstr "_Παράθυρο"
-#: ../midori/midori-browser.c:6133
+#: ../midori/midori-browser.c:6266
msgid "Show a list of all open tabs"
msgstr "Εμφάνιση μίας λίστας με όλες τις ανοιχτές καρτέλες"
-#: ../midori/midori-browser.c:6147
+#: ../midori/midori-browser.c:6280
msgid "_Menu"
msgstr "_Μενού"
-#: ../midori/midori-browser.c:6149
+#: ../midori/midori-browser.c:6282
msgid "Menu"
msgstr "Μενού"
#. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:6353
+#: ../midori/midori-browser.c:6486
msgid "_Inline Find:"
msgstr "Ε_νσωματωμένη αναζήτηση:"
-#: ../midori/midori-browser.c:6384
+#: ../midori/midori-browser.c:6517
msgid "Previous"
msgstr "Προηγούμενο"
-#: ../midori/midori-browser.c:6389
+#: ../midori/midori-browser.c:6522
msgid "Next"
msgstr "Επόμενο"
-#: ../midori/midori-browser.c:6394
+#: ../midori/midori-browser.c:6527
msgid "Match Case"
msgstr "Ταίριασμα πεζών"
-#: ../midori/midori-browser.c:6403
+#: ../midori/midori-browser.c:6536
msgid "Highlight Matches"
msgstr "Τονισμός των ταιριασμάτων"
-#: ../midori/midori-browser.c:6415
+#: ../midori/midori-browser.c:6548
msgid "Close Findbar"
msgstr "Κλείσιμο μπάρας εύρεσης"
-#: ../midori/midori-browser.c:6461
-#: ../panels/midori-transfers.c:142
+#: ../midori/midori-browser.c:6594 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Καθαρισμός όλων"
-#: ../midori/midori-browser.c:6818
+#: ../midori/midori-browser.c:6952
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Αναπάντεχη ρύθμιση '%s'"
-#: ../midori/midori-locationaction.c:369
+#: ../midori/midori-locationaction.c:377
#, c-format
msgid "Failed to select from history\n"
msgstr "Αποτυχία επιλογής ιστορικό: \n"
#: ../midori/midori-locationaction.c:459
#, c-format
+msgid "Search for %s"
+msgstr "Αναζήτηση για %s"
+
+#: ../midori/midori-locationaction.c:482
+#, c-format
msgid "Search with %s"
msgstr "Αναζήτηση με %s"
-#: ../midori/midori-locationaction.c:1171
+#: ../midori/midori-locationaction.c:1197
#, c-format
msgid "Failed to execute database statement\n"
msgstr "Αποτυχία εκτέλεσης δήλωσης βάσης δεδομένων\n"
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1228
+#: ../midori/midori-locationaction.c:1254
msgid "Paste and p_roceed"
msgstr "Επικόλληση και σ_υνέχεια"
-#: ../midori/midori-panel.c:433
-#: ../midori/midori-panel.c:435
+#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435
msgid "Detach chosen panel from the window"
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:445 ../midori/midori-panel.c:447
+#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
msgid "Align sidepanel to the right"
msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα δεξιά"
-#: ../midori/midori-panel.c:457
-#: ../midori/midori-panel.c:458
+#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458
msgid "Close panel"
msgstr "Κλείσιμο πλαισίου"
-#: ../midori/midori-panel.c:641
-#: ../midori/midori-panel.c:644
+#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644
msgid "Align sidepanel to the left"
msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα αριστερά"
@@ -1042,579 +1049,599 @@ msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα αρι
msgid "Hide operating controls"
msgstr "Απόκρυψη στοιχείων λειτουργίας"
-#: ../midori/midori-websettings.c:207
+#: ../midori/midori-websettings.c:209
msgid "Show Blank page"
msgstr "Εμφάνιση κενής σελίδας"
-#: ../midori/midori-websettings.c:208
+#: ../midori/midori-websettings.c:210
msgid "Show Homepage"
msgstr "Εμφάνιση αρχικής σελίδας"
-#: ../midori/midori-websettings.c:209
+#: ../midori/midori-websettings.c:211
msgid "Show last open tabs"
msgstr "Εμφάνιση των τελευταίων ανοιχτών καρτελών"
-#: ../midori/midori-websettings.c:225
+#: ../midori/midori-websettings.c:227
msgid "Japanese (SHIFT_JIS)"
msgstr "Ιαπωνικά (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:245
+#: ../midori/midori-websettings.c:247
msgid "New tab"
msgstr "Νέα καρτέλα"
-#: ../midori/midori-websettings.c:246
+#: ../midori/midori-websettings.c:248
msgid "New window"
msgstr "Νέο παράθυρο"
-#: ../midori/midori-websettings.c:247
+#: ../midori/midori-websettings.c:249
msgid "Current tab"
msgstr "Τρέχον καρτέλα"
-#: ../midori/midori-websettings.c:262
+#: ../midori/midori-websettings.c:264
msgid "Default"
msgstr "Προκαθορισμένο"
-#: ../midori/midori-websettings.c:263
+#: ../midori/midori-websettings.c:265
msgid "Icons"
msgstr "Εικονίδια"
-#: ../midori/midori-websettings.c:264
+#: ../midori/midori-websettings.c:266
msgid "Small icons"
msgstr "Μικρά εικονίδια"
-#: ../midori/midori-websettings.c:265
+#: ../midori/midori-websettings.c:267
msgid "Text"
msgstr "Κείμενο"
-#: ../midori/midori-websettings.c:266
+#: ../midori/midori-websettings.c:268
msgid "Icons and text"
msgstr "Εικονίδια με κείμενο"
-#: ../midori/midori-websettings.c:267
+#: ../midori/midori-websettings.c:269
msgid "Text beside icons"
msgstr "Κείμενο δίπλα στα εικονίδια"
-#: ../midori/midori-websettings.c:282
+#: ../midori/midori-websettings.c:284
+msgid "Automatic (GNOME or environment)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:285
+#, fuzzy
+msgid "HTTP proxy server"
+msgstr "Διακομιστής μεσολάβησης"
+
+#: ../midori/midori-websettings.c:286
+#, fuzzy
+msgid "No proxy server"
+msgstr "Διακομιστής μεσολάβησης"
+
+#: ../midori/midori-websettings.c:301
msgid "All cookies"
msgstr "Όλα τα cookies"
-#: ../midori/midori-websettings.c:283
+#: ../midori/midori-websettings.c:302
msgid "Session cookies"
msgstr "Cookies συνεδρίας"
-#: ../midori/midori-websettings.c:284
-#: ../panels/midori-addons.c:98
-#: ../katze/katze-utils.c:663
+#: ../midori/midori-websettings.c:303 ../panels/midori-addons.c:98
+#: ../katze/katze-utils.c:664
msgid "None"
msgstr "Κανένα"
-#: ../midori/midori-websettings.c:300
+#: ../midori/midori-websettings.c:319
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:301
+#: ../midori/midori-websettings.c:320
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:302
+#: ../midori/midori-websettings.c:321
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:303
+#: ../midori/midori-websettings.c:322
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:356
+#: ../midori/midori-websettings.c:375
msgid "Remember last window size"
msgstr "Απομνημόνευση μεγέθους τελευταίου παραθύρου"
-#: ../midori/midori-websettings.c:357
+#: ../midori/midori-websettings.c:376
msgid "Whether to save the last window size"
msgstr "Εάν θα αποθηκεύεται το μέγεθος του τελευταίου παραθύρου"
-#: ../midori/midori-websettings.c:365
+#: ../midori/midori-websettings.c:384
msgid "Last window width"
msgstr "Πλάτος τελευταίου παραθύρου"
-#: ../midori/midori-websettings.c:366
+#: ../midori/midori-websettings.c:385
msgid "The last saved window width"
msgstr "Το τελευταίο αποθηκευμένο πλάτος παραθύρου"
-#: ../midori/midori-websettings.c:374
+#: ../midori/midori-websettings.c:393
msgid "Last window height"
msgstr "Ύψος τελευταίου παραθύρου"
-#: ../midori/midori-websettings.c:375
+#: ../midori/midori-websettings.c:394
msgid "The last saved window height"
msgstr "Το τελευταίο ύψος αποθηκευμένου παραθύρου"
-#: ../midori/midori-websettings.c:400
+#: ../midori/midori-websettings.c:419
msgid "Last panel position"
msgstr "Η τελευταία θέση πλαισίου"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:420
msgid "The last saved panel position"
msgstr "Η τελευταία αποθηκευμένη θέση πλαισίου"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:429
msgid "Last panel page"
msgstr "Η τελευταία σελίδα πλαισίου"
-#: ../midori/midori-websettings.c:411
+#: ../midori/midori-websettings.c:430
msgid "The last saved panel page"
msgstr "Η τελευταία αποθηκευμένη σελίδα πλαισίου"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:438
msgid "Last Web search"
msgstr "Τελευταία αναζήτηση ιστού"
-#: ../midori/midori-websettings.c:420
+#: ../midori/midori-websettings.c:439
msgid "The last saved Web search"
msgstr "Η τελευταία αποθηκευμένη αναζήτηση ιστού"
-#: ../midori/midori-websettings.c:429
+#: ../midori/midori-websettings.c:448
msgid "Show Menubar"
msgstr "Εμφάνιση γραμμής μενού"
-#: ../midori/midori-websettings.c:430
+#: ../midori/midori-websettings.c:449
msgid "Whether to show the menubar"
msgstr "Εάν θα φαίνεται η μπάρα του μενού"
-#: ../midori/midori-websettings.c:438
+#: ../midori/midori-websettings.c:457
msgid "Show Navigationbar"
msgstr "Εμφάνιση της γραμμής πλοήγησης"
-#: ../midori/midori-websettings.c:439
+#: ../midori/midori-websettings.c:458
msgid "Whether to show the navigationbar"
msgstr "Εάν θα φαίνεται η γραμμή πλοήγησης"
-#: ../midori/midori-websettings.c:447
+#: ../midori/midori-websettings.c:466
msgid "Show Bookmarkbar"
msgstr "Εμφάνιση μπάρας σελιδοδεικτών"
-#: ../midori/midori-websettings.c:448
+#: ../midori/midori-websettings.c:467
msgid "Whether to show the bookmarkbar"
msgstr "Εάν θα φαίνεται η μπάρα των σελιδοδεικτών"
-#: ../midori/midori-websettings.c:456
+#: ../midori/midori-websettings.c:475
msgid "Show Panel"
msgstr "Εμφάνιση πλαισίου"
-#: ../midori/midori-websettings.c:457
+#: ../midori/midori-websettings.c:476
msgid "Whether to show the panel"
msgstr "Εάν θα φαίνεται το πλαίσιο"
-#: ../midori/midori-websettings.c:472
+#: ../midori/midori-websettings.c:491
msgid "Show Transferbar"
msgstr "Εμφάνιση μπάρας μεταφορών"
-#: ../midori/midori-websettings.c:473
+#: ../midori/midori-websettings.c:492
msgid "Whether to show the transferbar"
msgstr "Εάν θα φαίνεται η μπάρα μεταφορών"
-#: ../midori/midori-websettings.c:481
+#: ../midori/midori-websettings.c:500
msgid "Show Statusbar"
msgstr "Εμφάνιση γραμμής κατάστασης"
-#: ../midori/midori-websettings.c:482
+#: ../midori/midori-websettings.c:501
msgid "Whether to show the statusbar"
msgstr "Εάν θα φαίνεται η γραμμή κατάστασης"
-#: ../midori/midori-websettings.c:491
+#: ../midori/midori-websettings.c:510
msgid "Toolbar Style:"
msgstr "Στυλ εργαλειοθήκης:"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:511
msgid "The style of the toolbar"
msgstr "Το στυλ της εργαλειοθήκης"
-#: ../midori/midori-websettings.c:508
+#: ../midori/midori-websettings.c:527
msgid "Show progress in location entry"
msgstr "Να εμφανίζεται η πρόοδος στην τοποθεσίας εισαγωγής"
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:528
msgid "Whether to show loading progress in the location entry"
msgstr "Εάν θα εμφανίζεται η πρόοδος φόρτωσης στην τοποθεσία εισαγωγής"
-#: ../midori/midori-websettings.c:524
+#: ../midori/midori-websettings.c:543
msgid "Search engines in location completion"
msgstr "Μηχανές αναζήτησης στην τοποθεσία συμπλήρωσης"
-#: ../midori/midori-websettings.c:525
+#: ../midori/midori-websettings.c:544
msgid "Whether to show search engines in the location completion"
msgstr "Εάν θα φαίνονται οι μηχανές αναζήτησης στην τοποθεσία συμπλήρωσης"
-#: ../midori/midori-websettings.c:533
+#: ../midori/midori-websettings.c:552
msgid "Toolbar Items"
msgstr "Αντικείμενα εργαλειοθήκης"
-#: ../midori/midori-websettings.c:534
+#: ../midori/midori-websettings.c:553
msgid "The items to show on the toolbar"
msgstr "Τι αντικείμενα να εμφανίζονται στην εργαλειοθήκη"
-#: ../midori/midori-websettings.c:542
+#: ../midori/midori-websettings.c:561
msgid "Compact Sidepanel"
msgstr "Σύμπτυξη πλαϊνού πλαισίου"
-#: ../midori/midori-websettings.c:543
+#: ../midori/midori-websettings.c:562
msgid "Whether to make the sidepanel compact"
msgstr "Εάν θα γίνει σύμπτυξη του πλαϊνού πλαισίου"
-#: ../midori/midori-websettings.c:558
+#: ../midori/midori-websettings.c:577
msgid "Show operating controls of the panel"
msgstr "Εμφάνιση των στοιχείων λειτουργίας στο ταμπλό"
-#: ../midori/midori-websettings.c:559
+#: ../midori/midori-websettings.c:578
msgid "Whether to show the operating controls of the panel"
msgstr "Εάν θα φαίνονται τα στοιχεία λειτουργίας στο ταμπλό"
-#: ../midori/midori-websettings.c:574
+#: ../midori/midori-websettings.c:593
msgid "Align sidepanel on the right"
msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα δεξιά"
-#: ../midori/midori-websettings.c:575
+#: ../midori/midori-websettings.c:594
msgid "Whether to align the sidepanel on the right"
msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό πλαίσιο στα δεξιά"
-#: ../midori/midori-websettings.c:590
+#: ../midori/midori-websettings.c:609
msgid "Open panels in separate windows"
msgstr "Άνοιγμα ταμπλών σε ξεχωριστά παράθυρα"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:610
msgid "Whether to always open panels in separate windows"
msgstr "Εάν θα ανοίγουν πάντα τα ταμπλό σε ξεχωριστά παράθυρα"
-#: ../midori/midori-websettings.c:600
+#: ../midori/midori-websettings.c:619
msgid "When Midori starts:"
msgstr "Κατά την εκκίνηση του midori:"
-#: ../midori/midori-websettings.c:601
+#: ../midori/midori-websettings.c:620
msgid "What to do when Midori starts"
msgstr "Κατά την εκκίνηση του midori να φορτώνει:"
-#: ../midori/midori-websettings.c:610
+#: ../midori/midori-websettings.c:629
msgid "Homepage:"
msgstr "Αρχική σελίδα:"
-#: ../midori/midori-websettings.c:611
+#: ../midori/midori-websettings.c:630
msgid "The homepage"
msgstr "Η αρχική σελίδα"
-#: ../midori/midori-websettings.c:626
+#: ../midori/midori-websettings.c:645
msgid "Show crash dialog"
msgstr "Εμφάνιση παραθύρου αποτυχίας"
-#: ../midori/midori-websettings.c:627
+#: ../midori/midori-websettings.c:646
msgid "Show a dialog after Midori crashed"
msgstr "Εμφάνιση διαλόγου μετά από αποτυχία"
#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:643
+#: ../midori/midori-websettings.c:662
msgid "Show speed dial in new tabs"
msgstr "Εμφάνιση γρήγορης σύνδεσης σε νέες καρτέλες"
-#: ../midori/midori-websettings.c:644
+#: ../midori/midori-websettings.c:663
msgid "Show speed dial in newly opened tabs"
msgstr "Εμφάνιση γρήγορης σύνδεσης στις νέες ανοιχτές καρτέλες"
-#: ../midori/midori-websettings.c:652
+#: ../midori/midori-websettings.c:671
msgid "Save downloaded files to:"
msgstr "Αποθήκευση των αρχείων που κατέβηκαν στο:"
-#: ../midori/midori-websettings.c:653
+#: ../midori/midori-websettings.c:672
msgid "The folder downloaded files are saved to"
msgstr "Ο κατάλογος στον οποίο αποθηκεύονται τα αρχεία που κατεβαίνουν"
-#: ../midori/midori-websettings.c:674
+#: ../midori/midori-websettings.c:693
msgid "Ask for the destination folder"
msgstr "Ερώτηση για τον κατάλογο αποθήκευσης"
-#: ../midori/midori-websettings.c:675
+#: ../midori/midori-websettings.c:694
msgid "Whether to ask for the destination folder when downloading a file"
msgstr "Εάν θα ρωτάει για τον κατάλογο αποθήκευσης όταν κατεβαίνει ένα αρχείο"
-#: ../midori/midori-websettings.c:694
+#: ../midori/midori-websettings.c:713
msgid "Notify when a transfer has been completed"
msgstr "Ειδοποίηση όταν μία μεταφορά έχει ολοκληρωθεί"
-#: ../midori/midori-websettings.c:695
+#: ../midori/midori-websettings.c:714
msgid "Whether to show a notification when a transfer has been completed"
msgstr "Εάν θα εμφανίζεται μία ειδοποίηση όταν ολοκληρωθεί μία μεταφορά"
-#: ../midori/midori-websettings.c:707
+#: ../midori/midori-websettings.c:726
msgid "Download Manager"
msgstr "Διαχειριστής μεταφορών"
-#: ../midori/midori-websettings.c:708
+#: ../midori/midori-websettings.c:727
msgid "An external download manager"
msgstr "Εξωτερικός διαχειριστής μεταφορών"
-#: ../midori/midori-websettings.c:716
+#: ../midori/midori-websettings.c:735
msgid "Text Editor"
msgstr "Κειμενογράφος"
-#: ../midori/midori-websettings.c:717
+#: ../midori/midori-websettings.c:736
msgid "An external text editor"
msgstr "Εξωτερικός κειμενογράφος"
-#: ../midori/midori-websettings.c:732
+#: ../midori/midori-websettings.c:751
msgid "News Aggregator"
msgstr "Διαχειριστής νέων"
-#: ../midori/midori-websettings.c:733
+#: ../midori/midori-websettings.c:752
msgid "An external news aggregator"
msgstr "Εξωτερικός διαχειριστής νέων"
-#: ../midori/midori-websettings.c:741
+#: ../midori/midori-websettings.c:760
msgid "Location entry Search"
msgstr "Διεύθυνση για αναζήτηση"
-#: ../midori/midori-websettings.c:742
+#: ../midori/midori-websettings.c:761
msgid "The search to perform inside the location entry"
msgstr "Η αναζήτηση να πραγματοποιηθεί εσωτερικά της τοποθεσίας εισαγωγής"
-#: ../midori/midori-websettings.c:750
+#: ../midori/midori-websettings.c:769
msgid "Preferred Encoding"
msgstr "Προτιμώμενη κωδικοποίηση"
-#: ../midori/midori-websettings.c:751
+#: ../midori/midori-websettings.c:770
msgid "The preferred character encoding"
msgstr "Η προτιμώμενη κωδικοποίηση χαρακτήρων"
-#: ../midori/midori-websettings.c:761
+#: ../midori/midori-websettings.c:780
msgid "Always Show Tabbar"
msgstr "Εμφάνιση πάντα της γραμμής καρτελών"
-#: ../midori/midori-websettings.c:762
+#: ../midori/midori-websettings.c:781
msgid "Always show the tabbar"
msgstr "Εμφάνιση πάντα της μπάρας με τις καρτέλες"
-#: ../midori/midori-websettings.c:770
+#: ../midori/midori-websettings.c:789
msgid "Close Buttons on Tabs"
msgstr "Κουμπιά κλεισίματος στις καρτέλες"
-#: ../midori/midori-websettings.c:771
+#: ../midori/midori-websettings.c:790
msgid "Whether tabs have close buttons"
msgstr "Εάν οι καρτέλες θα έχουν κουμπί κλεισίματος"
-#: ../midori/midori-websettings.c:779
+#: ../midori/midori-websettings.c:798
msgid "Open new pages in:"
msgstr "Άνοιγμα νέων σελίδων σε:"
-#: ../midori/midori-websettings.c:780
+#: ../midori/midori-websettings.c:799
msgid "Where to open new pages"
msgstr "Που να ανοίγουν οι νέες σελίδες"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:808
msgid "Open external pages in:"
msgstr "Άνοιγμα εξωτερικών σελίδων σε:"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:809
msgid "Where to open externally opened pages"
msgstr "Που να ανοίγουν οι εξωτερικές ανοιγμένες σελίδες"
-#: ../midori/midori-websettings.c:799
+#: ../midori/midori-websettings.c:818
msgid "Middle click opens Selection"
msgstr "Το μεσαίο κλικ ανοίγει την Επιλογή"
-#: ../midori/midori-websettings.c:800
+#: ../midori/midori-websettings.c:819
msgid "Load an address from the selection via middle click"
msgstr "Φόρτωση μίας διεύθυνσης από την επιλογή μέσω του μεσαίου κλικ"
-#: ../midori/midori-websettings.c:808
+#: ../midori/midori-websettings.c:827
msgid "Open tabs in the background"
msgstr "Άνοιγμα των καρτελών στο παρασκήνιο"
-#: ../midori/midori-websettings.c:809
+#: ../midori/midori-websettings.c:828
msgid "Whether to open new tabs in the background"
msgstr "Εάν θα ανοίγονται νέες καρτέλες στο παρασκήνιο"
-#: ../midori/midori-websettings.c:817
+#: ../midori/midori-websettings.c:836
msgid "Open Tabs next to Current"
msgstr "Άνοιγμα των καρτελών δίπλα στο τρέχων"
-#: ../midori/midori-websettings.c:818
+#: ../midori/midori-websettings.c:837
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr "Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την τελευταία"
-#: ../midori/midori-websettings.c:826
+#: ../midori/midori-websettings.c:845
msgid "Open popups in tabs"
msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες"
-#: ../midori/midori-websettings.c:827
+#: ../midori/midori-websettings.c:846
msgid "Whether to open popup windows in tabs"
msgstr "Εάν θα ανοίγονται τα αναδυόμενα παράθυρα σε καρτέλες"
-#: ../midori/midori-websettings.c:837
-#: ../extensions/statusbar-features.c:88
+#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88
msgid "Load images automatically"
msgstr "Αυτόματη φόρτωση εικόνων"
-#: ../midori/midori-websettings.c:838
+#: ../midori/midori-websettings.c:857
msgid "Load and display images automatically"
msgstr "Αυτόματη φόρτωση και εμφάνιση εικόνων"
-#: ../midori/midori-websettings.c:845
-#: ../extensions/statusbar-features.c:100
+#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100
msgid "Enable scripts"
msgstr "Ενεργοποίηση σεναρίων"
-#: ../midori/midori-websettings.c:846
+#: ../midori/midori-websettings.c:865
msgid "Enable embedded scripting languages"
msgstr "Ενεργοποίηση ενσωματωμένων γλωσσών κειμένου"
-#: ../midori/midori-websettings.c:853
-#: ../extensions/statusbar-features.c:112
+#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112
msgid "Enable Netscape plugins"
msgstr "Ενεργοποίηση αρθρωμάτων netscape"
-#: ../midori/midori-websettings.c:854
+#: ../midori/midori-websettings.c:873
msgid "Enable embedded Netscape plugin objects"
msgstr "Ενεργοποίηση ενσωματωμένων αρθρωμάτων netscape"
-#: ../midori/midori-websettings.c:870
+#: ../midori/midori-websettings.c:889
msgid "Enable HTML5 database support"
msgstr "Ενεργοποίηση υποστήριξης βάσης δεδομένων HTML5"
-#: ../midori/midori-websettings.c:871
+#: ../midori/midori-websettings.c:890
msgid "Whether to enable HTML5 database support"
msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5"
-#: ../midori/midori-websettings.c:877
+#: ../midori/midori-websettings.c:896
msgid "Enable HTML5 local storage support"
msgstr "Ενεργοποίηση τοπικής υποστήριξης αποθήκευσης HTML5"
-#: ../midori/midori-websettings.c:878
+#: ../midori/midori-websettings.c:897
msgid "Whether to enable HTML5 local storage support"
msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5"
-#: ../midori/midori-websettings.c:886
+#: ../midori/midori-websettings.c:905
msgid "Enable offline web application cache"
msgstr "Ενεργοποίηση προσωρινής μνήμης δικτυακή εφαρμογής εκτός σύνδεσης"
-#: ../midori/midori-websettings.c:887
+#: ../midori/midori-websettings.c:906
msgid "Whether to enable offline web application cache"
msgstr "Εάν θα ενεργοποιηθεί η προσωρινή μνήμη της εφαρμογής εκτός σύνδεσης"
-#: ../midori/midori-websettings.c:912
+#: ../midori/midori-websettings.c:931
msgid "Zoom Text and Images"
msgstr "Εστίαση κειμένου και εικόνων"
-#: ../midori/midori-websettings.c:913
+#: ../midori/midori-websettings.c:932
msgid "Whether to zoom text and images"
msgstr "Εάν θα εστιάζεται το κείμενο και οι εικόνες"
-#: ../midori/midori-websettings.c:928
+#: ../midori/midori-websettings.c:947
msgid "Find inline while typing"
msgstr "Ενσωματωμένη εύρεση κατά την πληκτρολόγηση"
-#: ../midori/midori-websettings.c:929
+#: ../midori/midori-websettings.c:948
msgid "Whether to automatically find inline while typing"
msgstr "Εάν θα γίνεται αυτόματη ενσωματωμένη αναζήτηση κατά την πληκτρολόγηση"
-#: ../midori/midori-websettings.c:944
+#: ../midori/midori-websettings.c:963
msgid "Kinetic scrolling"
msgstr "Κινητική κύλιση"
-#: ../midori/midori-websettings.c:945
+#: ../midori/midori-websettings.c:964
msgid "Whether scrolling should kinetically move according to speed"
msgstr "Εάν η κύλιση θα κινείται ανάλογα με την ταχύτητα "
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:972
msgid "Accept cookies"
msgstr "Αποδοχή cookies"
-#: ../midori/midori-websettings.c:954
+#: ../midori/midori-websettings.c:973
msgid "What type of cookies to accept"
msgstr "Τι τύπο cookies να γίνονται αποδεκτά"
-#: ../midori/midori-websettings.c:970
+#: ../midori/midori-websettings.c:989
msgid "Original cookies only"
msgstr "Μόνο πρωτότυπα cookies"
-#: ../midori/midori-websettings.c:971
+#: ../midori/midori-websettings.c:990
msgid "Accept cookies from the original website only"
msgstr "Αποδοχή cookies μόνο από πρωτότυπους ιστότοπους"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:998
msgid "Maximum cookie age"
msgstr "Μέγιστος χρόνος cookie"
-#: ../midori/midori-websettings.c:980
+#: ../midori/midori-websettings.c:999
msgid "The maximum number of days to save cookies for"
msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση των cookies"
-#: ../midori/midori-websettings.c:997
+#: ../midori/midori-websettings.c:1016
msgid "Remember last visited pages"
msgstr "Απομνημόνευση των τελευταίων επισκεπτόμενων σελίδων"
-#: ../midori/midori-websettings.c:998
+#: ../midori/midori-websettings.c:1017
msgid "Whether the last visited pages are saved"
msgstr "Εάν θα αποθηκεύονται οι τελευταίες επισκεπτόμενες σελίδες"
-#: ../midori/midori-websettings.c:1006
+#: ../midori/midori-websettings.c:1025
msgid "Maximum history age"
msgstr "Μέγιστο χρόνος ιστορικού"
-#: ../midori/midori-websettings.c:1007
+#: ../midori/midori-websettings.c:1026
msgid "The maximum number of days to save the history for"
msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση του ιστορικού"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1034
msgid "Remember last downloaded files"
msgstr "Απομνημόνευση των τελευταίων αρχείων που κατέβηκαν"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:1035
msgid "Whether the last downloaded files are saved"
msgstr "Εάν θα αποθηκεύονται τα τελευταία αρχεία που κατέβηκαν"
-#: ../midori/midori-websettings.c:1026
-msgid "Proxy Server"
+#: ../midori/midori-websettings.c:1052
+#, fuzzy
+msgid "Proxy server"
msgstr "Διακομιστής μεσολάβησης"
-#: ../midori/midori-websettings.c:1027
+#: ../midori/midori-websettings.c:1053
+msgid "The type of proxy server to use"
+msgstr ""
+
+#: ../midori/midori-websettings.c:1062
+#, fuzzy
+msgid "HTTP Proxy Server"
+msgstr "Διακομιστής μεσολάβησης"
+
+#: ../midori/midori-websettings.c:1063
msgid "The proxy server used for HTTP connections"
msgstr "Ο μεσολαβητής χρησιμοποιείται για http συνδέσεις"
-#: ../midori/midori-websettings.c:1042
+#: ../midori/midori-websettings.c:1078
msgid "Detect proxy server automatically"
msgstr "Αυτόματη εύρεση διακομιστή μεσολάβησης"
-#: ../midori/midori-websettings.c:1043
+#: ../midori/midori-websettings.c:1079
msgid "Whether to detect the proxy server automatically from the environment"
msgstr "Εάν θα εντοπίζεται αυτόματα από το περιβάλλον ο διακομιστής μεσολάβησης"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1059
+#: ../midori/midori-websettings.c:1095
msgid "Identify as"
msgstr "Αναγνώριση ως"
-#: ../midori/midori-websettings.c:1060
+#: ../midori/midori-websettings.c:1096
msgid "What to identify as to web pages"
msgstr "Με τι να αναγνωρίζεται στις σελίδες ιστού"
-#: ../midori/midori-websettings.c:1076
+#: ../midori/midori-websettings.c:1112
msgid "Identification string"
msgstr "Αλφαριθμητικό αναγνώρισης"
-#: ../midori/midori-websettings.c:1077
+#: ../midori/midori-websettings.c:1113
msgid "The application identification string"
msgstr "Το αλφαριθμητικό αναγνώρισης της εφαρμογής"
-#: ../midori/midori-websettings.c:1092
+#: ../midori/midori-websettings.c:1128
msgid "Preferred languages"
msgstr "Προτιμώμενες γλώσσες"
-#: ../midori/midori-websettings.c:1093
+#: ../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\""
msgstr "Μία διαχωρισμένη λίστα των προτιμώμενων γλωσσών με κόμμα για επεξεργασία των πολυγλωσσικών ιστοσελίδων, για παράδειγμα \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-#: ../midori/midori-websettings.c:1108
+#: ../midori/midori-websettings.c:1144
msgid "Clear private data"
msgstr "Καθαρισμός προσωπικών δεδομένων"
-#: ../midori/midori-websettings.c:1109
+#: ../midori/midori-websettings.c:1145
msgid "The private data selected for deletion"
msgstr "Τα προσωπικά δεδομένα που επιλέχθηκαν για διαγραφή"
@@ -1622,352 +1649,351 @@ msgstr "Τα προσωπικά δεδομένα που επιλέχθηκαν
#. so reloading via Javascript works but not via API calls.
#. Error pages are special, we want to try loading the destination
#. again, not the error page which isn't even a proper page
-#: ../midori/midori-view.c:956
-#: ../midori/midori-view.c:4183
-#: ../midori/midori-view.c:4187
+#: ../midori/midori-view.c:1128 ../midori/midori-view.c:4407
+#: ../midori/midori-view.c:4411
#, c-format
msgid "Error - %s"
msgstr "Σφάλμα- %s"
-#: ../midori/midori-view.c:957
+#: ../midori/midori-view.c:1129
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Η σελίδα '%s' δεν μπορεί να φορτωθεί."
-#: ../midori/midori-view.c:962
+#: ../midori/midori-view.c:1134
msgid "Try again"
msgstr "Δοκιμάστε ξανά"
#. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:1002
+#: ../midori/midori-view.c:1175
#, c-format
msgid "Not found - %s"
msgstr "Δεν βρέθηκε - %s"
-#: ../midori/midori-view.c:1225
-#: ../midori/midori-view.c:2074
+#: ../midori/midori-view.c:1397 ../midori/midori-view.c:2253
#, c-format
msgid "Send a message to %s"
msgstr "Αποστολή μηνύματος στο: %s"
-#: ../midori/midori-view.c:1843
-#: ../midori/midori-view.c:2236
+#: ../midori/midori-view.c:2022 ../midori/midori-view.c:2415
msgid "Inspect _Element"
msgstr "Εξέταση _στοιχείου"
-#: ../midori/midori-view.c:1895
-#: ../midori/midori-view.c:1973
+#: ../midori/midori-view.c:2074 ../midori/midori-view.c:2152
msgid "Open _Link"
msgstr "Άνοιγμα _συνδέσμου"
-#: ../midori/midori-view.c:1898
-#: ../midori/midori-view.c:1975
+#: ../midori/midori-view.c:2077 ../midori/midori-view.c:2154
msgid "Open Link in New _Tab"
msgstr "Άνοιγμα συνδέσμου σε νέα κ_αρτέλα"
-#: ../midori/midori-view.c:1902
+#: ../midori/midori-view.c:2081
msgid "Open Link in _Foreground Tab"
msgstr "Άνοιγμα συνδέσμου σε νέα καρτέλα στο π_ροσκήνιο"
-#: ../midori/midori-view.c:1903
+#: ../midori/midori-view.c:2082
msgid "Open Link in _Background Tab"
msgstr "Άνοιγμα συνδέσμου σε καρτέλα στο _παρασκήνιο"
-#: ../midori/midori-view.c:1906
-#: ../midori/midori-view.c:1982
+#: ../midori/midori-view.c:2085 ../midori/midori-view.c:2161
msgid "Open Link in New _Window"
msgstr "Άνοιγμα συνδέσμου σε νέο _παράθυρο"
-#: ../midori/midori-view.c:1909
+#: ../midori/midori-view.c:2088
msgid "Open Link as Web A_pplication"
msgstr "Άνοιγμα ως δικτυακή εφ_αρμογή"
-#: ../midori/midori-view.c:1912
+#: ../midori/midori-view.c:2091
msgid "Copy Link de_stination"
msgstr "Αντιγραφή συνδέσμου πρ_οορισμού"
-#: ../midori/midori-view.c:1915
-#: ../midori/midori-view.c:1994
+#: ../midori/midori-view.c:2094 ../midori/midori-view.c:2173
msgid "_Save Link destination"
msgstr "Απ_οθήκευση συνδέσμου προορισμού"
-#: ../midori/midori-view.c:1916
-#: ../midori/midori-view.c:1988
+#: ../midori/midori-view.c:2095 ../midori/midori-view.c:2167
msgid "_Download Link destination"
msgstr "Κ_ατέβασμα συνδέσμου προορισμού"
-#: ../midori/midori-view.c:1920
-#: ../midori/midori-view.c:1956
-#: ../midori/midori-view.c:1999
+#: ../midori/midori-view.c:2099 ../midori/midori-view.c:2135
+#: ../midori/midori-view.c:2178
msgid "Download with Download _Manager"
msgstr "Κατέβασμα με τον διαχειριστή μεταφορών"
-#: ../midori/midori-view.c:1932
+#: ../midori/midori-view.c:2111
msgid "Open _Image in New Tab"
msgstr "Άνοιγμα ει_κόνας σε νέα καρτέλα"
-#: ../midori/midori-view.c:1935
+#: ../midori/midori-view.c:2114
msgid "Open Image in New Wi_ndow"
msgstr "Άνοιγμα εικόνας σε νέο πα_ράθυρο"
-#: ../midori/midori-view.c:1938
+#: ../midori/midori-view.c:2117
msgid "Copy Image _Address"
msgstr "Αντιγραφή _διεύθυνσης εικόνας"
-#: ../midori/midori-view.c:1941
+#: ../midori/midori-view.c:2120
msgid "Save I_mage"
msgstr "Αποθήκευση ει_κόνας"
-#: ../midori/midori-view.c:1942
+#: ../midori/midori-view.c:2121
msgid "Download I_mage"
msgstr "Αποθήκευση ει_κόνας"
-#: ../midori/midori-view.c:1949
+#: ../midori/midori-view.c:2128
msgid "Copy Video _Address"
msgstr "Αντιγραφή _διεύθυνσης βίντεο"
-#: ../midori/midori-view.c:1952
+#: ../midori/midori-view.c:2131
msgid "Save _Video"
msgstr "Αποθήκευση _βίντεο"
-#: ../midori/midori-view.c:1952
+#: ../midori/midori-view.c:2131
msgid "Download _Video"
msgstr "Αποθήκευση _βίντεο"
-#: ../midori/midori-view.c:2019
+#: ../midori/midori-view.c:2198
msgid "Search _with"
msgstr "Αναζήτηση _με"
-#: ../midori/midori-view.c:2054
-#: ../midori/midori-view.c:2061
+#: ../midori/midori-view.c:2233 ../midori/midori-view.c:2240
msgid "_Search the Web"
msgstr "_Αναζήτηση στον ιστό"
-#: ../midori/midori-view.c:2082
+#: ../midori/midori-view.c:2261
msgid "Open Address in New _Tab"
msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα"
-#: ../midori/midori-view.c:2368
+#: ../midori/midori-view.c:2547
msgid "Open or download file"
msgstr "Άνοιγμα ή κατέβασμα αρχείου"
-#: ../midori/midori-view.c:2391
+#: ../midori/midori-view.c:2570
#, c-format
msgid "File Type: '%s'"
msgstr "Τύπος αρχείου: '%s'"
-#: ../midori/midori-view.c:2394
+#: ../midori/midori-view.c:2573
#, c-format
msgid "File Type: %s ('%s')"
msgstr "Τύπος αρχείου: %s ('%s')"
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2398
+#: ../midori/midori-view.c:2577
#, c-format
msgid "Open %s"
msgstr "Άνοιγμα %s"
-#: ../midori/midori-view.c:2913
+#: ../midori/midori-view.c:3107
#, c-format
msgid "Inspect page - %s"
msgstr "Εξέταση σελίδα -%s"
-#: ../midori/midori-view.c:3174
+#: ../midori/midori-view.c:3368
msgid "Speed dial"
msgstr "Γρήγορη σύνδεση"
-#: ../midori/midori-view.c:3175
+#: ../midori/midori-view.c:3369
msgid "Click to add a shortcut"
msgstr "Κάντε click για προσθήκη συντόμευσης"
-#: ../midori/midori-view.c:3176
+#: ../midori/midori-view.c:3370
msgid "Enter shortcut address"
msgstr "Εισάγεται διεύθυνση συντόμευσης"
-#: ../midori/midori-view.c:3177
+#: ../midori/midori-view.c:3371
msgid "Enter shortcut title"
msgstr "Εισάγετε τίτλο συντόμευσης"
-#: ../midori/midori-view.c:3178
+#: ../midori/midori-view.c:3372
msgid "Are you sure you want to delete this shortcut?"
msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την συντόμευση;"
-#: ../midori/midori-view.c:3214
+#: ../midori/midori-view.c:3409
#, c-format
msgid "Document cannot be displayed"
msgstr "Το αρχείο δεν μπορεί να εμφανιστεί"
-#: ../midori/midori-view.c:3237
+#: ../midori/midori-view.c:3432
#, c-format
msgid "No documentation installed"
msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση"
-#: ../midori/midori-view.c:3460
+#: ../midori/midori-view.c:3682
msgid "Blank page"
msgstr "Κενή σελίδα"
-#: ../midori/midori-view.c:3720
+#: ../midori/midori-view.c:3942
msgid "_Duplicate Tab"
msgstr "_Διπλότυπη καρτέλα"
-#: ../midori/midori-view.c:3725
+#: ../midori/midori-view.c:3947
msgid "_Restore Tab"
msgstr "_Επαναφορά καρτέλας"
-#: ../midori/midori-view.c:3725
+#: ../midori/midori-view.c:3947
msgid "_Minimize Tab"
msgstr "_Ελαχιστοποίηση καρτέλας"
-#: ../midori/midori-view.c:3731
+#: ../midori/midori-view.c:3953
msgid "Close ot_her Tabs"
msgstr "Κλείσιμο άλλ_ων καρτελών"
-#: ../midori/midori-view.c:4355
+#: ../midori/midori-view.c:4579
msgid "Print background images"
msgstr "Εκτύπωση εικόνων παρασκηνίου"
-#: ../midori/midori-view.c:4356
+#: ../midori/midori-view.c:4580
msgid "Whether background images should be printed"
msgstr "Εάν θα τυπώνονται οι εικόνες παρασκηνίου"
-#: ../midori/midori-view.c:4408
-#: ../midori/midori-preferences.c:382
+#: ../midori/midori-view.c:4632 ../midori/midori-preferences.c:381
msgid "Features"
msgstr "Χαρακτηριστικά"
#. Page "General"
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:298
msgid "General"
msgstr "Γενικά"
-#: ../midori/midori-preferences.c:300
+#: ../midori/midori-preferences.c:299
msgid "Startup"
msgstr "Εκκίνηση"
-#: ../midori/midori-preferences.c:315
-#: ../midori/midori-preferences.c:322
+#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321
msgid "Use current page as homepage"
msgstr "Τρέχουσα σελίδα ως αρχική"
-#: ../midori/midori-preferences.c:332
-#: ../panels/midori-transfers.c:87
+#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Μεταφορές"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:350
+#: ../midori/midori-preferences.c:349
msgid "Appearance"
msgstr "Εμφάνιση"
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:350
msgid "Font settings"
msgstr "Ρυθμίσεις γραμματοσειράς"
-#: ../midori/midori-preferences.c:353
+#: ../midori/midori-preferences.c:352
msgid "Default Font Family"
msgstr "Προεπιλεγμένη οικογένεια γραμματοσειράς"
-#: ../midori/midori-preferences.c:356
+#: ../midori/midori-preferences.c:355
msgid "The default font family used to display text"
msgstr "Η προκαθορισμένη οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση του κειμένου"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:358
msgid "The default font size used to display text"
msgstr "Το προκαθορισμένο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου"
-#: ../midori/midori-preferences.c:361
+#: ../midori/midori-preferences.c:360
msgid "Fixed-width Font Family"
msgstr "Σταθερού-μεγέθους οικογένεια γραμματοσειράς"
-#: ../midori/midori-preferences.c:364
+#: ../midori/midori-preferences.c:363
msgid "The font family used to display fixed-width text"
msgstr "Η οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση σταθερού μεγέθους κειμένου"
-#: ../midori/midori-preferences.c:367
+#: ../midori/midori-preferences.c:366
msgid "The font size used to display fixed-width text"
msgstr "Το μέγεθος της γραμματοσειράς που χρησιμοποιείται για την εμφάνιση κειμένου σταθερού μεγέθους"
-#: ../midori/midori-preferences.c:369
+#: ../midori/midori-preferences.c:368
msgid "Minimum Font Size"
msgstr "Ελάχιστο μέγεθος γραμματοσειράς"
-#: ../midori/midori-preferences.c:372
+#: ../midori/midori-preferences.c:371
msgid "The minimum font size used to display text"
msgstr "Το ελάχιστο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:381
+#: ../midori/midori-preferences.c:380
msgid "Behavior"
msgstr "Συμπεριφορά"
-#: ../midori/midori-preferences.c:394
+#: ../midori/midori-preferences.c:393
msgid "Enforce 96 dots per inch"
msgstr "Επιβολή 96 dots ανά ίντσα"
-#: ../midori/midori-preferences.c:395
+#: ../midori/midori-preferences.c:394
msgid "Enforce a video dot density of 96 DPI"
msgstr "Επιβολή της πυκνότητας βίντεο dot στα 96DPI"
#: ../midori/midori-preferences.c:414
+msgid "Allow scripts to open popups"
+msgstr ""
+
+#: ../midori/midori-preferences.c:415
+#, fuzzy
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Εάν θα ανοίγονται τα αναδυόμενα παράθυρα σε καρτέλες"
+
+#: ../midori/midori-preferences.c:419
msgid "Spell Checking"
msgstr "Ορθογραφία πληκτρολόγησης"
-#: ../midori/midori-preferences.c:417
+#: ../midori/midori-preferences.c:422
msgid "Enable Spell Checking"
msgstr "Ενεργοποίηση ορθογραφίας"
-#: ../midori/midori-preferences.c:418
+#: ../midori/midori-preferences.c:423
msgid "Enable spell checking while typing"
msgstr "Ενεργοποίηση ορθογραφίας κατά την πληκτρολόγηση"
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:425
msgid "Spelling dictionaries:"
msgstr "Λεξικά συλλαβισμού:"
#. i18n: The example should be adjusted to contain a good local default
-#: ../midori/midori-preferences.c:424
+#: ../midori/midori-preferences.c:429
msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\""
msgstr "Μία διαχωρισμένη λίστα με τις γλώσσες που μπορείτε να χρησιμοποιήσετε κατά την ορθογραφία πληκτρολόγησης, για παράδειγμα \"en_GB,de_DE\""
#. Page "Interface"
-#: ../midori/midori-preferences.c:430
+#: ../midori/midori-preferences.c:435
msgid "Interface"
msgstr "Διεπαφή"
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:436
msgid "Navigationbar"
msgstr "Γραμμή πλοήγησης"
-#: ../midori/midori-preferences.c:441
+#: ../midori/midori-preferences.c:446
msgid "Browsing"
msgstr "Περιήγηση"
#. Page "Applications"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:468
msgid "Applications"
msgstr "Εφαρμογές"
-#: ../midori/midori-preferences.c:464
+#: ../midori/midori-preferences.c:469
msgid "External applications"
msgstr "Εξωτερικές εφαρμογές"
#. Page "Network"
-#: ../midori/midori-preferences.c:480
-#: ../midori/midori-preferences.c:481
+#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486
msgid "Network"
msgstr "Δίκτυο"
+#: ../midori/midori-preferences.c:492
+#, fuzzy
+msgid "Hostname"
+msgstr "Όνομα χρήσης"
+
#. Page "Privacy"
-#: ../midori/midori-preferences.c:505
+#: ../midori/midori-preferences.c:511
msgid "Privacy"
msgstr "Προσωπικό απόρρητο"
-#: ../midori/midori-preferences.c:506
+#: ../midori/midori-preferences.c:512
msgid "Web Cookies"
msgstr "Cookies ιστού"
-#: ../midori/midori-preferences.c:515
-#: ../midori/midori-preferences.c:529
+#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535
msgid "days"
msgstr "ημέρες"
@@ -1999,48 +2025,47 @@ msgstr "Διαχείριση των μηχανών αναζήτησης"
msgid "Use as _default"
msgstr "Χρήση ως _προκαθορισμένο"
-#: ../midori/sokoke.c:1255
+#: ../midori/sokoke.c:1299
msgid "_Bookmark"
msgstr "_Σελιδοδείκτης"
-#: ../midori/sokoke.c:1257
+#: ../midori/sokoke.c:1301
msgid "Add Boo_kmark"
msgstr "Προσθήκη σ_ελιδοδείκτη"
-#: ../midori/sokoke.c:1258
+#: ../midori/sokoke.c:1302
msgid "_Console"
msgstr "_Τερματικό"
-#: ../midori/sokoke.c:1259
+#: ../midori/sokoke.c:1303
msgid "_Extensions"
msgstr "_Επεκτάσεις"
-#: ../midori/sokoke.c:1260
+#: ../midori/sokoke.c:1304
msgid "_History"
msgstr "_Ιστορικό"
-#: ../midori/sokoke.c:1261
+#: ../midori/sokoke.c:1305
msgid "_Homepage"
msgstr "_Αρχική σελίδα"
-#: ../midori/sokoke.c:1262
+#: ../midori/sokoke.c:1306
msgid "_Userscripts"
msgstr "_Σενάρια χρήστη"
-#: ../midori/sokoke.c:1263
+#: ../midori/sokoke.c:1307
msgid "New _Tab"
msgstr "Νέα _καρτέλα"
-#: ../midori/sokoke.c:1264
+#: ../midori/sokoke.c:1308
msgid "_Transfers"
msgstr "_Μεταφορές"
-#: ../midori/sokoke.c:1265
+#: ../midori/sokoke.c:1309
msgid "Netscape p_lugins"
msgstr "Α_ρθρωμάτων netscape"
-#: ../panels/midori-addons.c:99
-#: ../panels/midori-addons.c:144
+#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144
msgid "Userscripts"
msgstr "Σενάρια χρηστών"
@@ -2086,50 +2111,50 @@ msgstr "Τερματικό"
msgid "Extensions"
msgstr "Επεκτάσεις"
-#: ../panels/midori-history.c:270
+#: ../panels/midori-history.c:273
msgid "Erroneous clock time"
msgstr "Εσφαλμένη τιμή ώρας"
-#: ../panels/midori-history.c:271
+#: ../panels/midori-history.c:274
msgid "The clock time lies in the past. Please check the current date and time."
msgstr "Η τιμή της ώρας είναι παρελθοντική. Παρακαλώ ελέγξτε την τρέχουσα ημερομηνία και ώρα."
-#: ../panels/midori-history.c:283
+#: ../panels/midori-history.c:286
msgid "A week ago"
msgstr "Μια βδομάδα πριν"
-#: ../panels/midori-history.c:285
+#: ../panels/midori-history.c:288
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d μέρα πριν"
msgstr[1] "%d μέρες πριν"
-#: ../panels/midori-history.c:288
+#: ../panels/midori-history.c:291
msgid "Today"
msgstr "Σήμερα"
-#: ../panels/midori-history.c:290
+#: ../panels/midori-history.c:293
msgid "Yesterday"
msgstr "Χθες"
-#: ../panels/midori-history.c:375
+#: ../panels/midori-history.c:378
msgid "Are you sure you want to remove all history items?"
msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;"
-#: ../panels/midori-history.c:435
+#: ../panels/midori-history.c:438
msgid "Bookmark the selected history item"
msgstr "Σελιδοποίηση του επιλεγμένου αντικειμένου του ιστορικού"
-#: ../panels/midori-history.c:444
+#: ../panels/midori-history.c:447
msgid "Delete the selected history item"
msgstr "Διαγραφή του επιλεγμένου αντικειμένου από το ιστορικό"
-#: ../panels/midori-history.c:452
+#: ../panels/midori-history.c:455
msgid "Clear the entire history"
msgstr "Καθαρισμός ολόκληρου του ιστορικού"
-#: ../panels/midori-history.c:950
+#: ../panels/midori-history.c:953
#: ../extensions/cookie-manager/cookie-manager-page.c:1144
msgid "Filter:"
msgstr "Φίλτρο:"
@@ -2180,18 +2205,16 @@ msgstr "Το εικονίδιο Stock '%s' δεν μπορεί να φορτωθ
msgid "Animation frames are broken"
msgstr "Τα κινούμενα γραφικά πλαίσια δεν λειτουργούν"
-#: ../katze/katze-utils.c:494
-#: ../katze/katze-utils.c:889
+#: ../katze/katze-utils.c:495 ../katze/katze-utils.c:890
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Η ιδιότητα '%s' δεν είναι έγκυρη για το %s"
-#: ../katze/katze-utils.c:540
-#: ../katze/katze-utils.c:569
+#: ../katze/katze-utils.c:541 ../katze/katze-utils.c:570
msgid "Choose file"
msgstr "Επιλογή αρχείου"
-#: ../katze/katze-utils.c:555
+#: ../katze/katze-utils.c:556
msgid "Choose folder"
msgstr "Επιλογή φακέλου"
@@ -2200,48 +2223,48 @@ msgstr "Επιλογή φακέλου"
msgid "Preferences for %s"
msgstr "Προτιμήσεις για %s"
-#: ../extensions/adblock.c:398
+#: ../extensions/adblock.c:409
msgid "Configure Advertisement filters"
msgstr "Ρύθμιση φίλτρων διαφημίσεων"
-#: ../extensions/adblock.c:430
+#: ../extensions/adblock.c:441
#, 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:570
+#: ../extensions/adblock.c:581
msgid "Configure _Advertisement filters..."
msgstr "Ρύθμιση φίλτρων δ_ιαφημίσεων..."
-#: ../extensions/adblock.c:818
+#: ../extensions/adblock.c:832
msgid "Edit rule"
msgstr "Επεξεργασία κανόνα"
-#: ../extensions/adblock.c:831
+#: ../extensions/adblock.c:845
msgid "_Rule:"
msgstr "_Κανόνας:"
-#: ../extensions/adblock.c:885
+#: ../extensions/adblock.c:899
msgid "Bl_ock image"
msgstr "Φρ_αγή εικόνας"
-#: ../extensions/adblock.c:890
+#: ../extensions/adblock.c:904
msgid "Bl_ock link"
msgstr "Φρ_αγή συνδέσμου"
-#: ../extensions/adblock.c:1447
+#: ../extensions/adblock.c:1466
msgid "Advertisement blocker"
msgstr "Εμποδιστής διαφημίσεων"
-#: ../extensions/adblock.c:1448
+#: ../extensions/adblock.c:1467
msgid "Block advertisements according to a filter list"
msgstr "Μπλόκαρε διαφημίσεις σύμφωνα με μία λίστα με φίλτρα"
-#: ../extensions/colorful-tabs.c:136
+#: ../extensions/colorful-tabs.c:204
msgid "Colorful Tabs"
msgstr "Χρωματιστές καρτέλες"
-#: ../extensions/colorful-tabs.c:137
+#: ../extensions/colorful-tabs.c:205
msgid "Tint each tab distinctly"
msgstr "Ευκρινές αποχρώσεις σε κάθε καρτέλα"
@@ -2340,11 +2363,11 @@ msgstr "_Διαχειριστής cookie"
msgid "List, view and delete cookies"
msgstr "Λίστα, εμφάνιση και διαγραφή cookies"
-#: ../extensions/feed-panel/feed-atom.c:237
+#: ../extensions/feed-panel/feed-atom.c:209
msgid "Failed to find required Atom \"entry\" elements in XML data."
msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"entry\" στα δεδομένα XML."
-#: ../extensions/feed-panel/feed-atom.c:343
+#: ../extensions/feed-panel/feed-atom.c:315
msgid "Failed to find required Atom \"feed\" elements in XML data."
msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"feed\" στα δεδομένα XML."
@@ -2355,19 +2378,19 @@ msgctxt "Feed"
msgid "Last updated: %s."
msgstr "Τελευταία ενημέρωση: %s."
-#: ../extensions/feed-panel/feed-panel.c:667
+#: ../extensions/feed-panel/feed-panel.c:671
msgid "Feeds"
msgstr "Ροές νέων"
-#: ../extensions/feed-panel/feed-panel.c:720
+#: ../extensions/feed-panel/feed-panel.c:724
msgid "Add new feed"
msgstr "Προσθήκη ενός νέας ροής"
-#: ../extensions/feed-panel/feed-panel.c:727
+#: ../extensions/feed-panel/feed-panel.c:731
msgid "Delete feed"
msgstr "Διαγραφή ροής"
-#: ../extensions/feed-panel/feed-panel.c:810
+#: ../extensions/feed-panel/feed-panel.c:814
msgid "_Feeds"
msgstr "_Ροές"
@@ -2455,8 +2478,7 @@ msgid "Control Midori by moving the mouse"
msgstr "Χειρισμός του midori μετακινώντας το ποντίκι"
#. i18n: A panel showing a user specified web page
-#: ../extensions/page-holder.c:129
-#: ../extensions/page-holder.c:177
+#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177
msgid "Pageholder"
msgstr "Αποθήκευση Σελίδων"
@@ -2504,24 +2526,23 @@ msgstr "Γραμμή κατάστασης χαρακτηριστικών"
msgid "Easily toggle features on web pages on and off"
msgstr "Εύκολη εναλλαγή χαρακτηριστικών στις ιστοσελίδες ενεργοποίηση και απενεργοποίηση"
-#: ../extensions/tab-panel.c:565
-#: ../extensions/tab-panel.c:622
+#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625
msgid "Tab Panel"
msgstr "Πλαίσιο καρτέλας"
-#: ../extensions/tab-panel.c:606
+#: ../extensions/tab-panel.c:609
msgid "T_ab Panel"
msgstr "Πλαίσιο κ_αρτέλας"
-#: ../extensions/tab-panel.c:623
+#: ../extensions/tab-panel.c:626
msgid "Show tabs in a vertical panel"
msgstr "Εμφάνιση καρτελών στο κάθετο πλαίσιο"
-#: ../extensions/tab-switcher.c:394
+#: ../extensions/tab-switcher.c:395
msgid "Tab History List"
msgstr "Καρτέλα λίστας ιστορικού"
-#: ../extensions/tab-switcher.c:395
+#: ../extensions/tab-switcher.c:396
msgid "Allows to switch tabs by choosing from a list sorted by last usage"
msgstr "Να επιτρέπεται η εναλλαγή καρτελών επιλέγοντας από την ταξινομημένη λίστα της τελευταίας χρήσης."
@@ -2556,4 +2577,3 @@ msgstr "Εύκολη επεξεργασία της εμφάνισης της ε
#: ../extensions/web-cache.c:465
msgid "Cache HTTP communication on disk"
msgstr "Προσωρινή μνήμη επικοινωνίας HTTP στο δίσκο"
-
diff --git a/po/es.po b/po/es.po
index 8879bd6c..cc5f562b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,1851 +6,2102 @@
# Christian Dywan 2008
# Elega 2009
# Guillermo Iguarán 2009
-#
+# Abel Martín 2010
+#
msgid ""
msgstr ""
"Project-Id-Version: midori 0.1.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-29 23:58+0200\n"
-"PO-Revision-Date: 2009-08-17 01:46-0300\n"
-"Last-Translator: elega \n"
+"POT-Creation-Date: 2010-04-21 16:06+0000\n"
+"PO-Revision-Date: 2010-03-29 13:40+0100\n"
+"Last-Translator: Abel Martín \n"
"Language-Team: GALPon MiniNo \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"
#: ../data/midori.desktop.in.h:1
msgid "Lightweight web browser"
-msgstr "Navegador ligero"
+msgstr "Navegador web ligero"
-#: ../data/midori.desktop.in.h:2
-#: ../midori/main.c:1343
-#: ../midori/main.c:1517
-#: ../midori/main.c:1525
-#: ../midori/main.c:1536
-#: ../midori/midori-websettings.c:287
+#: ../data/midori.desktop.in.h:2 ../midori/main.c:1342 ../midori/main.c:1670
+#: ../midori/main.c:1678 ../midori/main.c:1694
+#: ../midori/midori-websettings.c:318
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:3
msgid "Web Browser"
-msgstr "Navegador"
+msgstr "Navegador web"
-#: ../midori/main.c:96
+#: ../midori/main.c:103
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "No se pudo cargar la configuración: %s\n"
-#: ../midori/main.c:151
+#: ../midori/main.c:152
#, c-format
msgid "Value '%s' is invalid for %s"
-msgstr "El valor «%s» no es válido para %s"
+msgstr "El valor '%s' no es válido para %s"
-#: ../midori/main.c:158
-#: ../midori/main.c:238
+#: ../midori/main.c:159 ../midori/main.c:245
#, c-format
msgid "Invalid configuration value '%s'"
-msgstr "Valor de configuración inválido «%s»"
+msgstr "Valor de configuración inválido '%s'"
-#: ../midori/main.c:350
+#: ../midori/main.c:371 ../extensions/formhistory.c:446
#, c-format
msgid "Failed to open database: %s\n"
-msgstr "No se ha podido abrir la base de datos: %s\n"
-
-#: ../midori/main.c:382
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "No se ha podido ejecutar sentencia en base de datos: %s\n"
-
-#: ../midori/main.c:436
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "No se ha podido quitar los elementos del historial: %s\n"
-
-#: ../midori/main.c:460
-#, c-format
-msgid "Failed to clear history: %s\n"
-msgstr "No se ha podido vaciar el historial: %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 "No se ha podido añadir un elemento al historial: %s\n"
+msgstr "Fallo al abrir la base de datos: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:712
+#: ../midori/main.c:426
#, c-format
msgid "Failed to remove old history items: %s\n"
-msgstr "No se ha podido quitar elementos antiguos del historial: %s\n"
+msgstr "Fallo al quitar elementos antiguos del historial: %s\n"
-#: ../midori/main.c:741
+#: ../midori/main.c:446
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "No se pudo guardar la configuración. %s"
-#: ../midori/main.c:779
+#: ../midori/main.c:484
#, c-format
msgid "The search engines couldn't be saved. %s"
-msgstr "No se pudo guardar los motores de búsqueda. %s"
+msgstr "No se pudieron guardar los motores de búsqueda. %s"
-#: ../midori/main.c:798
-#: ../midori/main.c:826
-#: ../midori/main.c:855
+#: ../midori/main.c:503 ../midori/main.c:553 ../midori/main.c:573
#, c-format
msgid "The bookmarks couldn't be saved. %s"
msgstr "No se pudieron guardar los marcadores. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:878
-#: ../midori/main.c:901
+#: ../midori/main.c:603 ../midori/main.c:626
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "No se pudo guardar la papelera. %s"
-#: ../midori/main.c:974
+#: ../midori/main.c:690 ../midori/main.c:930
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "No se pudo guardar la sesión. %s"
-#: ../midori/main.c:1101
+#: ../midori/main.c:874
+msgid "No root certificate file is available. SSL certificates cannot be verified."
+msgstr "No hay ningún archivo de cerficado raíz disponible. Los certificados SSL no se pueden verificar."
+
+#: ../midori/main.c:964
msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem."
msgstr "Parece que Midori se cerró insperadamente la última vez. Si esto sucede repetidamente, pruebe una de las siguientes opciones para resolver el problema."
-#: ../midori/main.c:1116
+#: ../midori/main.c:979
msgid "Modify _preferences"
msgstr "Modificar _preferencias"
-#: ../midori/main.c:1120
+#: ../midori/main.c:983
msgid "Reset the last _session"
msgstr "Restaurar la última _sesión"
-#: ../midori/main.c:1125
+#: ../midori/main.c:988
msgid "Disable all _extensions"
msgstr "Deshabilitar todas las _extensiones"
-#: ../midori/main.c:1343
-msgid "No filename specified"
-msgstr "No se especificó el nombre del archivo"
-
-#: ../midori/main.c:1366
-msgid "An unknown error occured."
-msgstr "Se produjo un error desconocido."
-
-#: ../midori/main.c:1398
-#, c-format
-msgid "Snapshot saved to: %s\n"
-msgstr "Captura guardada en: %s\n"
-
-#: ../midori/main.c:1447
-msgid "Run ADDRESS as a web application"
-msgstr "Ejecutar DIRECCIÓN como una aplicación de internet"
-
-#: ../midori/main.c:1447
-msgid "ADDRESS"
-msgstr "DIRECCIÓN"
-
-#: ../midori/main.c:1449
-msgid "Use FOLDER as configuration folder"
-msgstr "Utilizar CARPETA como carpeta de configuración"
-
-#: ../midori/main.c:1449
-msgid "FOLDER"
-msgstr "CARPETA"
-
-#: ../midori/main.c:1451
-msgid "Run the specified filename as javascript"
-msgstr "Ejecute el nombre de archivo especificado como javascript"
-
-#: ../midori/main.c:1454
-msgid "Take a snapshot of the specified URI"
-msgstr "Tomar una captura de la URL especificada"
-
-#: ../midori/main.c:1457
-msgid "Execute the specified command"
-msgstr "Ejecutar el comando especificado"
-
-#: ../midori/main.c:1459
-msgid "Display program version"
-msgstr "Mostrar la versión del programa"
-
-#: ../midori/main.c:1461
-msgid "Addresses"
-msgstr "Direcciones"
-
-#: ../midori/main.c:1514
-msgid "[Addresses]"
-msgstr "[Direcciones]"
-
-#: ../midori/main.c:1537
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Por favor envíe comentarios, sugerencias y errores a:"
-
-#: ../midori/main.c:1539
-msgid "Check for new versions at:"
-msgstr "Buscar nuevas versiones en:"
-
-#: ../midori/main.c:1619
-msgid "The specified configuration folder is invalid."
-msgstr "La carpeta de configuración especificada no es válida."
-
-#: ../midori/main.c:1655
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr "Una instancia de Midori ya se está ejecutando pero no responde.\n"
-
-#: ../midori/main.c:1715
-#, c-format
-msgid "The search engines couldn't be loaded. %s\n"
-msgstr "No se pudieron cargar los motores de búsqueda. %s\n"
-
-#: ../midori/main.c:1727
-#, c-format
-msgid "The bookmarks couldn't be loaded: %s\n"
-msgstr "Los marcadores no pudieron ser cargados: %s\n"
-
-#: ../midori/main.c:1742
+#: ../midori/main.c:1223 ../midori/main.c:1943
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "No se pudo cargar la sesión: %s\n"
-#: ../midori/main.c:1755
+#: ../midori/main.c:1342
+msgid "No filename specified"
+msgstr "No se especificó el nombre del archivo"
+
+#: ../midori/main.c:1361
+msgid "An unknown error occured."
+msgstr "Se produjo un error desconocido."
+
+#: ../midori/main.c:1392
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Captura guardada en: %s\n"
+
+#: ../midori/main.c:1563
+msgid "Run ADDRESS as a web application"
+msgstr "Ejecutar DIRECCIÓN como una aplicación web"
+
+#: ../midori/main.c:1563
+msgid "ADDRESS"
+msgstr "DIRECCIÓN"
+
+#: ../midori/main.c:1566
+msgid "Use FOLDER as configuration folder"
+msgstr "Utilizar CARPETA como carpeta de configuración"
+
+#: ../midori/main.c:1566
+msgid "FOLDER"
+msgstr "CARPETA"
+
+#: ../midori/main.c:1569
+msgid "Show a diagnostic dialog"
+msgstr "Mostrar diálogo de diagnóstico"
+
+#: ../midori/main.c:1571
+msgid "Run the specified filename as javascript"
+msgstr "Ejecute el nombre de archivo especificado como javascript"
+
+#: ../midori/main.c:1574
+msgid "Take a snapshot of the specified URI"
+msgstr "Tomar una captura de la URL especificada"
+
+#: ../midori/main.c:1577
+msgid "Execute the specified command"
+msgstr "Ejecutar el comando especificado"
+
+#: ../midori/main.c:1579
+msgid "Display program version"
+msgstr "Mostrar la versión del programa"
+
+#: ../midori/main.c:1581
+msgid "Addresses"
+msgstr "Direcciones"
+
+#: ../midori/main.c:1583
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Bloquear URIs según PATRÓN de expresión regular"
+
+#: ../midori/main.c:1583
+msgid "PATTERN"
+msgstr "PATTERN"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:1587
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Restablecer Midori después de SEGUNDOS segundos de inactividad"
+
+#: ../midori/main.c:1587
+msgid "SECONDS"
+msgstr "SEGUNDOS"
+
+#: ../midori/main.c:1667
+msgid "[Addresses]"
+msgstr "[Direcciones]"
+
+#: ../midori/main.c:1695
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Por favor envíe comentarios, sugerencias y errores a:"
+
+#: ../midori/main.c:1697
+msgid "Check for new versions at:"
+msgstr "Buscar nuevas versiones en:"
+
+#: ../midori/main.c:1794
+msgid "The specified configuration folder is invalid."
+msgstr "La carpeta de configuración especificada no es válida."
+
+#: ../midori/main.c:1842
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Una instancia de Midori ya se está ejecutando pero no responde.\n"
+
+#: ../midori/main.c:1897
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "No se pudieron cargar los motores de búsqueda. %s\n"
+
+#: ../midori/main.c:1926
+#, c-format
+msgid "The bookmarks couldn't be loaded: %s\n"
+msgstr "No se pudieron cargar los marcadores: %s\n"
+
+#: ../midori/main.c:1958
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "No se pudo cargar la papelera: %s\n"
-#: ../midori/main.c:1768
+#: ../midori/main.c:1972
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "No se pudo cargar el historial: %s\n"
-#: ../midori/main.c:1780
+#: ../midori/main.c:1986
msgid "The following errors occured:"
msgstr "Se produjeron los siguientes errores:"
-#: ../midori/main.c:1796
+#: ../midori/main.c:2002
msgid "_Ignore"
msgstr "_Ignorar"
-#: ../midori/midori-array.c:250
+#: ../midori/midori-array.c:428
msgid "File not found."
msgstr "Archivo no encontrado."
-#: ../midori/midori-array.c:258
-#: ../midori/midori-array.c:267
+#: ../midori/midori-array.c:462 ../midori/midori-array.c:485
+#: ../midori/midori-array.c:495
msgid "Malformed document."
msgstr "Documento defectuoso."
-#: ../midori/midori-array.c:429
-#: ../midori/sokoke.c:694
+#: ../midori/midori-array.c:504
+msgid "Unrecognized bookmark format."
+msgstr "Formato de marcador no reconocido."
+
+#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120
#, c-format
msgid "Writing failed."
msgstr "Falló la escritura."
-#: ../midori/midori-browser.c:307
-#: ../midori/midori-browser.c:4229
-#: ../midori/midori-browser.c:4235
+#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5439
msgid "Reload the current page"
msgstr "Recargar la página actual"
-#: ../midori/midori-browser.c:318
-#: ../midori/midori-browser.c:4232
+#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5436
msgid "Stop loading the current page"
-msgstr "Detener la carga de la página"
+msgstr "Detener la carga de la página actual"
-#: ../midori/midori-browser.c:409
+#: ../midori/midori-browser.c:457
#, c-format
msgid "%d%% loaded"
msgstr "%d%% cargado"
-#: ../midori/midori-browser.c:434
+#: ../midori/midori-browser.c:495
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "Fallo al actualizar el título: %s\n"
+
+#: ../midori/midori-browser.c:509
#, c-format
msgid "Unexpected action '%s'."
-msgstr "Acción inesperada «%s»."
+msgstr "Acción inesperada '%s'."
-#: ../midori/midori-browser.c:616
+#: ../midori/midori-browser.c:716
msgid "New folder"
msgstr "Nueva carpeta"
-#: ../midori/midori-browser.c:616
+#: ../midori/midori-browser.c:716
msgid "Edit folder"
msgstr "Editar carpeta"
-#: ../midori/midori-browser.c:618
+#: ../midori/midori-browser.c:718
msgid "New bookmark"
msgstr "Nuevo marcador"
-#: ../midori/midori-browser.c:618
+#: ../midori/midori-browser.c:718
msgid "Edit bookmark"
msgstr "Editar marcador"
-#: ../midori/midori-browser.c:648
+#: ../midori/midori-browser.c:749
msgid "_Title:"
msgstr "_Título:"
-#: ../midori/midori-browser.c:661
-#: ../midori/midori-searchaction.c:952
+#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961
msgid "_Description:"
msgstr "_Descripción:"
-#: ../midori/midori-browser.c:680
-#: ../midori/midori-searchaction.c:966
-#: ../extensions/feed-panel/main.c:343
+#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975
+#: ../extensions/feed-panel/main.c:376
msgid "_Address:"
msgstr "_Dirección:"
-#: ../midori/midori-browser.c:699
+#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4588
msgid "_Folder:"
msgstr "_Carpeta:"
-#: ../midori/midori-browser.c:704
-#: ../midori/midori-browser.c:745
+#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901
+#: ../midori/midori-browser.c:4593 ../midori/midori-browser.c:4625
msgid "Toplevel folder"
msgstr "Carpeta de nivel superior"
-#: ../midori/midori-browser.c:821
+#: ../midori/midori-browser.c:850
+msgid "Show in the tool_bar"
+msgstr "Mostrar en la _barra de herramientas"
+
+#: ../midori/midori-browser.c:865
+msgid "Run as _web application"
+msgstr "Ejecutar como aplicación _web"
+
+#: ../midori/midori-browser.c:981 ../midori/midori-browser.c:4643
+#: ../midori/midori-browser.c:4675
msgid "Save file as"
msgstr "Guardar archivo como"
-#: ../midori/midori-browser.c:1172
+#: ../midori/midori-browser.c:1355 ../panels/midori-transfers.c:271
+#, c-format
+msgid "%s of %s"
+msgstr "%s de %s"
+
+#: ../midori/midori-browser.c:1391
#, c-format
msgid "The file '%s' has been downloaded."
msgstr "El archivo '%s' ha sido descargado."
-#: ../midori/midori-browser.c:1176
+#: ../midori/midori-browser.c:1395
msgid "Transfer completed"
msgstr "Transferencia completa"
-#: ../midori/midori-browser.c:1317
+#: ../midori/midori-browser.c:1535
msgid "Save file"
msgstr "Guardar archivo"
-#: ../midori/midori-browser.c:1984
+#: ../midori/midori-browser.c:2258
msgid "Open file"
msgstr "Abrir archivo"
-#: ../midori/midori-browser.c:3430
-#: ../panels/midori-bookmarks.c:781
-#: ../panels/midori-history.c:812
+#: ../midori/midori-browser.c:2334 ../extensions/feed-panel/main.c:364
+msgid "New feed"
+msgstr "Nuevo canal"
+
+#: ../midori/midori-browser.c:2375 ../midori/midori-browser.c:5498
+#: ../panels/midori-bookmarks.c:242
+msgid "Add a new bookmark"
+msgstr "Añadir un nuevo marcador"
+
+#: ../midori/midori-browser.c:2933 ../panels/midori-history.c:332
+#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465
+#, c-format
+msgid "Failed to execute database statement: %s\n"
+msgstr "No se ha podido ejecutar sentencia en base de datos: %s\n"
+
+#: ../midori/midori-browser.c:3013 ../midori/midori-searchaction.c:484
+msgid "Empty"
+msgstr "Vacío"
+
+#: ../midori/midori-browser.c:3634 ../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."
+msgstr "No se pudo ejecutar la aplicación externa."
+
+#: ../midori/midori-browser.c:3948 ../midori/midori-browser.c:5892
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Fallo al insertar un nuevo elemento en el historial: %s\n"
+
+#: ../midori/midori-browser.c:4281 ../panels/midori-bookmarks.c:795
+#: ../panels/midori-history.c:751
msgid "Open all in _Tabs"
msgstr "Abrir todo en _pestañas"
-#: ../midori/midori-browser.c:3437
-#: ../panels/midori-bookmarks.c:787
-#: ../panels/midori-history.c:818
-#: ../extensions/feed-panel/feed-panel.c:542
+#: ../midori/midori-browser.c:4288 ../panels/midori-bookmarks.c:801
+#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545
msgid "Open in New _Tab"
msgstr "Abrir en una nueva _pestaña "
-#: ../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:4291 ../panels/midori-bookmarks.c:803
+#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547
msgid "Open in New _Window"
msgstr "Abrir en una nueva _ventana"
-#: ../midori/midori-browser.c:3750
+#: ../midori/midori-browser.c:4514
+msgid "Arora"
+msgstr "Arora"
+
+#: ../midori/midori-browser.c:4515
+msgid "Kazehakase"
+msgstr "Kazehakase"
+
+#: ../midori/midori-browser.c:4516
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4517
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4518
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4539 ../panels/midori-bookmarks.c:271
+msgid "Import bookmarks..."
+msgstr "Importar marcadores..."
+
+#: ../midori/midori-browser.c:4542 ../midori/midori-browser.c:5503
+msgid "_Import bookmarks"
+msgstr "_Importar marcadores"
+
+#: ../midori/midori-browser.c:4553
+msgid "_Application:"
+msgstr "_Aplicación:"
+
+#: ../midori/midori-browser.c:4580 ../midori/midori-browser.c:5607
+#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323
+#: ../katze/katze-utils.c:688
+msgid "Custom..."
+msgstr "Personalizado..."
+
+#: ../midori/midori-browser.c:4654
+msgid "Failed to import bookmarks"
+msgstr "Fallo al importar marcadores"
+
+#: ../midori/midori-browser.c:4690
+msgid "Failed to export bookmarks"
+msgstr "Fallo al exportar marcadores"
+
+#: ../midori/midori-browser.c:4744 ../panels/midori-history.c:141
+#: ../panels/midori-history.c:171
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "No se han podido quitar los elementos del historial: %s\n"
+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-browser.c:4851
msgid "Clear Private Data"
msgstr "Borrar datos privados"
-#: ../midori/midori-browser.c:3754
+#: ../midori/midori-browser.c:4855
msgid "_Clear private data"
msgstr "_Borrar datos privados"
-#: ../midori/midori-browser.c:3767
+#: ../midori/midori-browser.c:4869
msgid "Clear the following data:"
msgstr "Borrar los siguientes datos:"
-#: ../midori/midori-browser.c:3777
-#: ../midori/midori-preferences.c:671
-#: ../panels/midori-history.c:108
+#: ../midori/midori-browser.c:4880 ../midori/midori-preferences.c:530
+#: ../panels/midori-history.c:119
msgid "History"
msgstr "Historial"
-#: ../midori/midori-browser.c:3782
+#: ../midori/midori-browser.c:4886
msgid "Cookies"
-msgstr "Huellas / Cookies"
+msgstr "Cookies"
-#: ../midori/midori-browser.c:3787
+#: ../midori/midori-browser.c:4891
msgid "'Flash' Cookies"
-msgstr "'Flash' Huellas"
+msgstr "Cookies 'Flash'"
-#: ../midori/midori-browser.c:3792
+#: ../midori/midori-browser.c:4896
msgid "Website icons"
-msgstr "Íconos de sitios de internet"
+msgstr "Íconos de sitios web"
-#: ../midori/midori-browser.c:3797
-#: ../midori/sokoke.c:868
+#: ../midori/midori-browser.c:4901 ../midori/sokoke.c:1310
msgid "_Closed Tabs"
msgstr "_Pestañas cerradas"
-#: ../midori/midori-browser.c:3805
+#: ../midori/midori-browser.c:4906 ../extensions/web-cache.c:464
+msgid "Web Cache"
+msgstr "Caché web"
+
+#: ../midori/midori-browser.c:4914
msgid "Clear private data when _quitting Midori"
msgstr "Borrar datos privados al _salir de Midori"
-#: ../midori/midori-browser.c:3889
+#: ../midori/midori-browser.c:5016
msgid "A lightweight web browser."
-msgstr "Un navegador muy ligero"
+msgstr "Un navegador web ligero"
-#: ../midori/midori-browser.c:3897
+#: ../midori/midori-browser.c:5018
+msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version."
+msgstr "Esta librería es software libre; puede redistribuirla y/o modificarla bajo los términos de la Licencia Pública General Reducida GNU tal y como es publicada por la Free Software Foundation; bien versión 2.1 de la licencia o (según su criterio) cualquier versión posterior."
+
+#: ../midori/midori-browser.c:5037
msgid "translator-credits"
msgstr ""
"Miguel Anxo Bouzada \n"
"Antonio Sanchez \n"
"Christian Dywan \n"
"Elega \n"
-"Guillermo Iguarán "
+"Guillermo Iguarán \n"
+"Abel Martín "
-#: ../midori/midori-browser.c:4163
+#: ../midori/midori-browser.c:5346
msgid "_File"
msgstr "_Archivo"
-#: ../midori/midori-browser.c:4165
-#: ../midori/sokoke.c:869
+#: ../midori/midori-browser.c:5348 ../midori/sokoke.c:1311
msgid "New _Window"
msgstr "Nueva _ventana"
-#: ../midori/midori-browser.c:4166
+#: ../midori/midori-browser.c:5349
msgid "Open a new window"
msgstr "Abrir una nueva ventana"
-#: ../midori/midori-browser.c:4169
+#: ../midori/midori-browser.c:5352
msgid "Open a new tab"
msgstr "Abrir una nueva pestaña"
-#: ../midori/midori-browser.c:4172
-msgid "Open a file"
-msgstr "Abrir un archivo"
-
-#: ../midori/midori-browser.c:4175
-msgid "Save to a file"
-msgstr "Guardar en un archivo"
-
-#: ../midori/midori-browser.c:4177
-msgid "Add to Speed _dial"
-msgstr "Añadir a marcación rápida"
-
-#: ../midori/midori-browser.c:4178
-msgid "Add shortcut to speed dial"
-msgstr "Añadir acceso directo a marcación rápida"
-
-#: ../midori/midori-browser.c:4180
-msgid "_Close Tab"
-msgstr "_Cerrar pestaña"
-
-#: ../midori/midori-browser.c:4181
-msgid "Close the current tab"
-msgstr "Cerrar la pestaña actual"
-
-#: ../midori/midori-browser.c:4183
-msgid "C_lose Window"
-msgstr "_Cerrar ventana"
-
-#: ../midori/midori-browser.c:4184
-msgid "Close this window"
-msgstr "Cerrar ésta ventana"
-
-#: ../midori/midori-browser.c:4187
-msgid "Print the current page"
-msgstr "Imprimir la página actual"
-
-#: ../midori/midori-browser.c:4190
-msgid "Quit the application"
-msgstr "Salir de la aplicación"
-
-#: ../midori/midori-browser.c:4192
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../midori/midori-browser.c:4195
-msgid "Cut the selected text"
-msgstr "Cortar el texto seleccionado"
-
-#: ../midori/midori-browser.c:4198
-#: ../midori/midori-browser.c:4201
-msgid "Copy the selected text"
-msgstr "Copiar el texto seleccionado"
-
-#: ../midori/midori-browser.c:4204
-msgid "Paste text from the clipboard"
-msgstr "Pegar texto del portapapeles"
-
-#: ../midori/midori-browser.c:4207
-msgid "Delete the selected text"
-msgstr "Borrar el texto seleccionado"
-
-#: ../midori/midori-browser.c:4210
-msgid "Select all text"
-msgstr "Seleccionar todo el texto"
-
-#: ../midori/midori-browser.c:4213
-msgid "Find a word or phrase in the page"
-msgstr "Buscar una palabra o frase en la página"
-
-#: ../midori/midori-browser.c:4215
-msgid "Find _Next"
-msgstr "Buscar _siguiente"
-
-#: ../midori/midori-browser.c:4216
-msgid "Find the next occurrence of a word or phrase"
-msgstr "Buscar la siguiente aparición de una palabra o una frase"
-
-#: ../midori/midori-browser.c:4218
-msgid "Find _Previous"
-msgstr "Buscar _anterior"
-
-#: ../midori/midori-browser.c:4219
-msgid "Find the previous occurrence of a word or phrase"
-msgstr "Buscar la anterior aparición de una palabra o una frase"
-
-#: ../midori/midori-browser.c:4223
-msgid "Configure the application preferences"
-msgstr "Configurar las preferencias de la aplicación"
-
-#: ../midori/midori-browser.c:4225
-msgid "_View"
-msgstr "_Ver"
-
-#: ../midori/midori-browser.c:4226
-msgid "_Toolbars"
-msgstr "_Barra de herramientas"
-
-#: ../midori/midori-browser.c:4238
-msgid "Increase the zoom level"
-msgstr "Aumentar el nivel de zoom"
-
-#: ../midori/midori-browser.c:4241
-msgid "Decrease the zoom level"
-msgstr "Disminuir el nivel de zoom"
-
-#: ../midori/midori-browser.c:4244
-msgid "Reset the zoom level"
-msgstr "Restablecer el nivel de zoom"
-
-#: ../midori/midori-browser.c:4245
-msgid "_Encoding"
-msgstr "_Codificación"
-
-#: ../midori/midori-browser.c:4247
-msgid "View So_urce"
-msgstr "Ver _código fuente"
-
-#: ../midori/midori-browser.c:4248
-msgid "View the source code of the page"
-msgstr "Ver el código fuente de la página"
-
-#: ../midori/midori-browser.c:4250
-msgid "View Selection Source"
-msgstr "Ver código fuente de la selección"
-
-#: ../midori/midori-browser.c:4251
-msgid "View the source code of the selection"
-msgstr "Ver el código fuente de la selección"
-
-#: ../midori/midori-browser.c:4255
-msgid "Toggle fullscreen view"
-msgstr "Activar/desactivar pantalla completa"
-
-#: ../midori/midori-browser.c:4257
-msgid "_Go"
-msgstr "_Ir"
-
-#: ../midori/midori-browser.c:4260
-msgid "Go back to the previous page"
-msgstr "Retroceder una página"
-
-#: ../midori/midori-browser.c:4263
-msgid "Go forward to the next page"
-msgstr "Avanzar una página"
-
-#: ../midori/midori-browser.c:4266
-msgid "Go to your homepage"
-msgstr "Abrir página de inicio"
-
-#: ../midori/midori-browser.c:4268
-msgid "Empty Trash"
-msgstr "Vaciar la papelera"
-
-#: ../midori/midori-browser.c:4269
-msgid "Delete the contents of the trash"
-msgstr "Borrar el contenido de la papelera"
-
-#: ../midori/midori-browser.c:4271
-msgid "Undo _Close Tab"
-msgstr "Des_hacer el cierre de pestaña"
-
-#: ../midori/midori-browser.c:4272
-msgid "Open the last closed tab"
-msgstr "Abrir la última pestaña cerrada"
-
-#: ../midori/midori-browser.c:4276
-#: ../panels/midori-bookmarks.c:231
-msgid "Add a new bookmark"
-msgstr "Añadir un nuevo marcador"
-
-#: ../midori/midori-browser.c:4278
-msgid "Add a new _folder"
-msgstr "Añadir una nueva _carpeta"
-
-#: ../midori/midori-browser.c:4279
-msgid "Add a new bookmark folder"
-msgstr "Añadir un nuevo marcador"
-
-#: ../midori/midori-browser.c:4281
-#: ../midori/midori-searchaction.c:497
-msgid "_Manage Search Engines"
-msgstr "_Administrar motores de búsqueda"
-
-#: ../midori/midori-browser.c:4282
-msgid "Add, edit and remove search engines..."
-msgstr "Añadir, editar y quitar motores de búsqueda..."
-
-#: ../midori/midori-browser.c:4285
-msgid "_Clear Private Data"
-msgstr "_Borrar datos privados"
-
-#: ../midori/midori-browser.c:4286
-msgid "Clear private data..."
-msgstr "Borrar datos privados"
-
-#: ../midori/midori-browser.c:4290
-msgid "_Previous Tab"
-msgstr "_Pestaña anterior"
-
-#: ../midori/midori-browser.c:4291
-msgid "Switch to the previous tab"
-msgstr "Cambiar a la pestaña anterior"
-
-#: ../midori/midori-browser.c:4293
-msgid "_Next Tab"
-msgstr "_Pestaña siguiente"
-
-#: ../midori/midori-browser.c:4294
-msgid "Switch to the next tab"
-msgstr "Cambiar a la pestaña siguiente"
-
-#: ../midori/midori-browser.c:4296
-msgid "_Help"
-msgstr "_Ayuda"
-
-#: ../midori/midori-browser.c:4298
-msgid "_Contents"
-msgstr "_Contenido"
-
-#: ../midori/midori-browser.c:4299
-msgid "Show the documentation"
-msgstr "Mostrar la documentación"
-
-#: ../midori/midori-browser.c:4301
-msgid "_Frequent Questions"
-msgstr "_Preguntas frecuentes"
-
-#: ../midori/midori-browser.c:4302
-msgid "Show the Frequently Asked Questions"
-msgstr "Mostrar las preguntas más frecuentes"
-
-#: ../midori/midori-browser.c:4304
-msgid "_Report a Bug"
-msgstr "_Reportar un error"
-
-#: ../midori/midori-browser.c:4305
-msgid "Open Midori's bug tracker"
-msgstr "Abrir el rastreador de errores de Midori"
-
-#: ../midori/midori-browser.c:4308
-msgid "Show information about the program"
-msgstr "Mostrar información sobre el programa"
-
-#: ../midori/midori-browser.c:4315
+#: ../midori/midori-browser.c:5354
msgid "P_rivate Browsing"
msgstr "_Navegación privada"
-#: ../midori/midori-browser.c:4316
+#: ../midori/midori-browser.c:5355
msgid "Don't save any private data while browsing"
msgstr "No guardar datos durante la navegación privada"
-#: ../midori/midori-browser.c:4321
+#: ../midori/midori-browser.c:5359
+msgid "Open a file"
+msgstr "Abrir un archivo"
+
+#: ../midori/midori-browser.c:5362
+msgid "Save to a file"
+msgstr "Guardar en un archivo"
+
+#: ../midori/midori-browser.c:5364
+msgid "Add to Speed _dial"
+msgstr "Añadir a marcación rápida"
+
+#: ../midori/midori-browser.c:5365
+msgid "Add shortcut to speed dial"
+msgstr "Añadir acceso directo a marcación rápida"
+
+#: ../midori/midori-browser.c:5367
+msgid "Add Shortcut to the _desktop"
+msgstr "Añadir acceso directo en el _escritorio"
+
+#: ../midori/midori-browser.c:5368
+msgid "Add shortcut to the desktop"
+msgstr "Añadir acceso directo en el escritorio"
+
+#: ../midori/midori-browser.c:5370
+msgid "Subscribe to News _feed"
+msgstr "Suscribirse a _canal de noticias"
+
+#: ../midori/midori-browser.c:5371
+msgid "Subscribe to this news feed"
+msgstr "Suscribirse a este canal de noticias"
+
+#: ../midori/midori-browser.c:5376
+msgid "_Close Tab"
+msgstr "_Cerrar pestaña"
+
+#: ../midori/midori-browser.c:5377
+msgid "Close the current tab"
+msgstr "Cerrar la pestaña actual"
+
+#: ../midori/midori-browser.c:5379
+msgid "C_lose Window"
+msgstr "_Cerrar ventana"
+
+#: ../midori/midori-browser.c:5380
+msgid "Close this window"
+msgstr "Cerrar ésta ventana"
+
+#: ../midori/midori-browser.c:5383
+msgid "Print the current page"
+msgstr "Imprimir la página actual"
+
+#: ../midori/midori-browser.c:5386
+msgid "Quit the application"
+msgstr "Salir de la aplicación"
+
+#: ../midori/midori-browser.c:5388
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../midori/midori-browser.c:5392
+msgid "Undo the last modification"
+msgstr "Deshacer la última modificación"
+
+#: ../midori/midori-browser.c:5395
+msgid "Redo the last modification"
+msgstr "Rehacer la última modificación"
+
+#: ../midori/midori-browser.c:5399
+msgid "Cut the selected text"
+msgstr "Cortar el texto seleccionado"
+
+#: ../midori/midori-browser.c:5402 ../midori/midori-browser.c:5405
+msgid "Copy the selected text"
+msgstr "Copiar el texto seleccionado"
+
+#: ../midori/midori-browser.c:5408
+msgid "Paste text from the clipboard"
+msgstr "Pegar texto del portapapeles"
+
+#: ../midori/midori-browser.c:5411
+msgid "Delete the selected text"
+msgstr "Borrar el texto seleccionado"
+
+#: ../midori/midori-browser.c:5414
+msgid "Select all text"
+msgstr "Seleccionar todo el texto"
+
+#: ../midori/midori-browser.c:5417
+msgid "Find a word or phrase in the page"
+msgstr "Buscar una palabra o frase en la página"
+
+#: ../midori/midori-browser.c:5419
+msgid "Find _Next"
+msgstr "Buscar _siguiente"
+
+#: ../midori/midori-browser.c:5420
+msgid "Find the next occurrence of a word or phrase"
+msgstr "Buscar la siguiente aparición de una palabra o una frase"
+
+#: ../midori/midori-browser.c:5422
+msgid "Find _Previous"
+msgstr "Buscar _anterior"
+
+#: ../midori/midori-browser.c:5423
+msgid "Find the previous occurrence of a word or phrase"
+msgstr "Buscar la anterior aparición de una palabra o una frase"
+
+#: ../midori/midori-browser.c:5427
+msgid "Configure the application preferences"
+msgstr "Configurar las preferencias de la aplicación"
+
+#: ../midori/midori-browser.c:5429
+msgid "_View"
+msgstr "_Ver"
+
+#: ../midori/midori-browser.c:5430
+msgid "_Toolbars"
+msgstr "_Barra de herramientas"
+
+#: ../midori/midori-browser.c:5442
+msgid "Increase the zoom level"
+msgstr "Aumentar el nivel de zoom"
+
+#: ../midori/midori-browser.c:5445
+msgid "Decrease the zoom level"
+msgstr "Disminuir el nivel de zoom"
+
+#: ../midori/midori-browser.c:5448
+msgid "Reset the zoom level"
+msgstr "Restablecer el nivel de zoom"
+
+#: ../midori/midori-browser.c:5449
+msgid "_Encoding"
+msgstr "_Codificación"
+
+#: ../midori/midori-browser.c:5451
+msgid "View So_urce"
+msgstr "Ver _código fuente"
+
+#: ../midori/midori-browser.c:5452
+msgid "View the source code of the page"
+msgstr "Ver el código fuente de la página"
+
+#: ../midori/midori-browser.c:5455
+msgid "Toggle fullscreen view"
+msgstr "Activar/desactivar pantalla completa"
+
+#: ../midori/midori-browser.c:5458
+msgid "Scroll _Left"
+msgstr "Desplazar hacia la _izquierda"
+
+#: ../midori/midori-browser.c:5459
+msgid "Scroll to the left"
+msgstr "Desplazar hacia la izquierda"
+
+#: ../midori/midori-browser.c:5461
+msgid "Scroll _Down"
+msgstr "Desplazar hacia a_bajo"
+
+#: ../midori/midori-browser.c:5462
+msgid "Scroll down"
+msgstr "Desplazar hacia abajo"
+
+#: ../midori/midori-browser.c:5464
+msgid "Scroll _Up"
+msgstr "Desplazar hacia a_rriba"
+
+#: ../midori/midori-browser.c:5465
+msgid "Scroll up"
+msgstr "Desplazar hacia arriba"
+
+#: ../midori/midori-browser.c:5467
+msgid "Scroll _Right"
+msgstr "Desplazar hacia la _derecha"
+
+#: ../midori/midori-browser.c:5468
+msgid "Scroll to the right"
+msgstr "Desplazar hacia la derecha"
+
+#: ../midori/midori-browser.c:5471
+msgid "_Go"
+msgstr "_Ir"
+
+#: ../midori/midori-browser.c:5474
+msgid "Go back to the previous page"
+msgstr "Retroceder una página"
+
+#: ../midori/midori-browser.c:5477
+msgid "Go forward to the next page"
+msgstr "Avanzar una página"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5481
+msgid "Go to the previous sub-page"
+msgstr "Ir a la sub-página anterior"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5485
+msgid "Go to the next sub-page"
+msgstr "Ir a la sub-página siguiente"
+
+#: ../midori/midori-browser.c:5488
+msgid "Go to your homepage"
+msgstr "Abrir página de inicio"
+
+#: ../midori/midori-browser.c:5490
+msgid "Empty Trash"
+msgstr "Vaciar la papelera"
+
+#: ../midori/midori-browser.c:5491
+msgid "Delete the contents of the trash"
+msgstr "Borrar el contenido de la papelera"
+
+#: ../midori/midori-browser.c:5493
+msgid "Undo _Close Tab"
+msgstr "Des_hacer el cierre de pestaña"
+
+#: ../midori/midori-browser.c:5494
+msgid "Open the last closed tab"
+msgstr "Abrir la última pestaña cerrada"
+
+#: ../midori/midori-browser.c:5500
+msgid "Add a new _folder"
+msgstr "Añadir una nueva _carpeta"
+
+#: ../midori/midori-browser.c:5501
+msgid "Add a new bookmark folder"
+msgstr "Añadir un nuevo marcador"
+
+#: ../midori/midori-browser.c:5506
+msgid "_Export bookmarks"
+msgstr "_Exportar marcadores"
+
+#: ../midori/midori-browser.c:5509 ../midori/midori-searchaction.c:493
+msgid "_Manage Search Engines"
+msgstr "_Administrar motores de búsqueda"
+
+#: ../midori/midori-browser.c:5510
+msgid "Add, edit and remove search engines..."
+msgstr "Añadir, editar y quitar motores de búsqueda..."
+
+#: ../midori/midori-browser.c:5513
+msgid "_Clear Private Data"
+msgstr "_Borrar datos privados"
+
+#: ../midori/midori-browser.c:5514
+msgid "Clear private data..."
+msgstr "Borrar datos privados"
+
+#: ../midori/midori-browser.c:5518
+msgid "_Inspect Page"
+msgstr "_Inspeccionar página"
+
+#: ../midori/midori-browser.c:5519
+msgid "Inspect page details and access developer tools..."
+msgstr "Inspeccionar detalles de página y acceder a herramientas de desarrollo..."
+
+#: ../midori/midori-browser.c:5524
+msgid "_Previous Tab"
+msgstr "_Pestaña anterior"
+
+#: ../midori/midori-browser.c:5525
+msgid "Switch to the previous tab"
+msgstr "Cambiar a la pestaña anterior"
+
+#: ../midori/midori-browser.c:5527
+msgid "_Next Tab"
+msgstr "_Pestaña siguiente"
+
+#: ../midori/midori-browser.c:5528
+msgid "Switch to the next tab"
+msgstr "Cambiar a la pestaña siguiente"
+
+#: ../midori/midori-browser.c:5530
+msgid "Focus _Current Tab"
+msgstr "Foco en la pestaña a_ctual"
+
+#: ../midori/midori-browser.c:5531
+msgid "Focus the current tab"
+msgstr "Foco en la pestaña actual"
+
+#: ../midori/midori-browser.c:5533
+msgid "Open last _session"
+msgstr "Abrir la última _sesión"
+
+#: ../midori/midori-browser.c:5534
+msgid "Open the tabs saved in the last session"
+msgstr "Abrir las pestañas guardadas en la última sesión"
+
+#: ../midori/midori-browser.c:5536
+msgid "_Help"
+msgstr "_Ayuda"
+
+#: ../midori/midori-browser.c:5538
+msgid "_Contents"
+msgstr "_Contenido"
+
+#: ../midori/midori-browser.c:5539
+msgid "Show the documentation"
+msgstr "Mostrar la documentación"
+
+#: ../midori/midori-browser.c:5541
+msgid "_Frequent Questions"
+msgstr "_Preguntas frecuentes"
+
+#: ../midori/midori-browser.c:5542
+msgid "Show the Frequently Asked Questions"
+msgstr "Mostrar las preguntas más frecuentes"
+
+#: ../midori/midori-browser.c:5544
+msgid "_Report a Bug"
+msgstr "_Reportar un error"
+
+#: ../midori/midori-browser.c:5545
+msgid "Open Midori's bug tracker"
+msgstr "Abrir el rastreador de errores de Midori"
+
+#: ../midori/midori-browser.c:5548
+msgid "Show information about the program"
+msgstr "Mostrar información sobre el programa"
+
+#: ../midori/midori-browser.c:5556
msgid "_Menubar"
msgstr "_Barra de menú"
-#: ../midori/midori-browser.c:4322
+#: ../midori/midori-browser.c:5557
msgid "Show menubar"
msgstr "Mostrar la barra de menú"
-#: ../midori/midori-browser.c:4325
+#: ../midori/midori-browser.c:5560
msgid "_Navigationbar"
msgstr "_Barra de navegación"
-#: ../midori/midori-browser.c:4326
+#: ../midori/midori-browser.c:5561
msgid "Show navigationbar"
msgstr "Mostrar la barra de navegación"
-#: ../midori/midori-browser.c:4329
+#: ../midori/midori-browser.c:5564
msgid "Side_panel"
msgstr "_Panel lateral"
-#: ../midori/midori-browser.c:4330
+#: ../midori/midori-browser.c:5565
msgid "Show sidepanel"
msgstr "Mostrar el panel lateral"
-#: ../midori/midori-browser.c:4333
+#: ../midori/midori-browser.c:5568
msgid "_Bookmarkbar"
msgstr "_Barra de marcadores"
-#: ../midori/midori-browser.c:4334
+#: ../midori/midori-browser.c:5569
msgid "Show bookmarkbar"
msgstr "Mostrar la barra de marcadores"
-#: ../midori/midori-browser.c:4337
+#: ../midori/midori-browser.c:5572
msgid "_Transferbar"
msgstr "_Barra de transferencias"
-#: ../midori/midori-browser.c:4338
+#: ../midori/midori-browser.c:5573
msgid "Show transferbar"
msgstr "Mostrar la barra de transferencias"
-#: ../midori/midori-browser.c:4341
+#: ../midori/midori-browser.c:5576
msgid "_Statusbar"
msgstr "_Barra de estado"
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:5577
msgid "Show statusbar"
msgstr "Mostrar la barra de estado"
-#: ../midori/midori-browser.c:4349
+#: ../midori/midori-browser.c:5585
msgid "_Automatic"
msgstr "_Automático"
-#: ../midori/midori-browser.c:4352
-#: ../midori/midori-websettings.c:214
+#: ../midori/midori-browser.c:5588 ../midori/midori-websettings.c:226
msgid "Chinese (BIG5)"
msgstr "Chino (BIG5)"
-#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
-#: ../midori/midori-browser.c:4356
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5592
msgid "Japanese (SHIFT__JIS)"
msgstr "Japonés (SHIFT__JIS)"
-#: ../midori/midori-browser.c:4359
-#: ../midori/midori-websettings.c:216
+#: ../midori/midori-browser.c:5595 ../midori/midori-websettings.c:228
+msgid "Korean (EUC-KR)"
+msgstr "Koreano (EUC-KR)"
+
+#: ../midori/midori-browser.c:5598 ../midori/midori-websettings.c:229
msgid "Russian (KOI8-R)"
msgstr "Ruso (KOI8-R)"
-#: ../midori/midori-browser.c:4362
-#: ../midori/midori-websettings.c:217
+#: ../midori/midori-browser.c:5601 ../midori/midori-websettings.c:230
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:4365
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-browser.c:5604 ../midori/midori-websettings.c:231
msgid "Western (ISO-8859-1)"
msgstr "Occidental (ISO-8859-1)"
-#: ../midori/midori-browser.c:4368
-#: ../midori/midori-websettings.c:219
-#: ../midori/midori-websettings.c:291
-msgid "Custom..."
-msgstr "Personalizado..."
-
-#: ../midori/midori-browser.c:4806
+#: ../midori/midori-browser.c:6152
msgid "_Separator"
msgstr "_Separador"
-#: ../midori/midori-browser.c:4813
+#: ../midori/midori-browser.c:6159
msgid "_Location..."
msgstr "_Ubicación..."
-#: ../midori/midori-browser.c:4815
+#: ../midori/midori-browser.c:6161
msgid "Open a particular location"
msgstr "Abrir una dirección en particular"
-#: ../midori/midori-browser.c:4839
+#: ../midori/midori-browser.c:6185
msgid "_Web Search..."
-msgstr "_Buscar en internet..."
+msgstr "_Buscar en la web..."
-#: ../midori/midori-browser.c:4841
+#: ../midori/midori-browser.c:6187
msgid "Run a web search"
-msgstr "Realizar una búsqueda en internet"
+msgstr "Realizar una búsqueda en la web"
-#: ../midori/midori-browser.c:4862
+#: ../midori/midori-browser.c:6208
msgid "Reopen a previously closed tab or window"
msgstr "Abrir ventanas o pestañas cerradas"
-#: ../midori/midori-browser.c:4877
+#: ../midori/midori-browser.c:6223
msgid "_Recently visited pages"
msgstr "_Últimas páginas visitadas"
-#: ../midori/midori-browser.c:4879
+#: ../midori/midori-browser.c:6225
msgid "Reopen pages that you visited earlier"
msgstr "Abre las páginas que usted visitó anteriormente"
-#: ../midori/midori-browser.c:4894
-#: ../midori/sokoke.c:857
+#: ../midori/midori-browser.c:6240 ../midori/sokoke.c:1300
msgid "_Bookmarks"
msgstr "_Marcadores"
-#: ../midori/midori-browser.c:4896
+#: ../midori/midori-browser.c:6242
msgid "Show the saved bookmarks"
msgstr "Mostrar los marcadores guardados."
-#: ../midori/midori-browser.c:4911
+#: ../midori/midori-browser.c:6257
msgid "_Tools"
msgstr "_Herramientas"
-#: ../midori/midori-browser.c:4923
+#: ../midori/midori-browser.c:6270
msgid "_Window"
msgstr "_Ventanas"
-#: ../midori/midori-browser.c:4925
+#: ../midori/midori-browser.c:6272
msgid "Show a list of all open tabs"
msgstr "Mostrar una lista de todas las pestañas abiertas"
-#: ../midori/midori-browser.c:4939
+#: ../midori/midori-browser.c:6286
msgid "_Menu"
msgstr "_Menú"
-#: ../midori/midori-browser.c:4941
+#: ../midori/midori-browser.c:6288
msgid "Menu"
msgstr "_Menú"
#. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:5127
+#: ../midori/midori-browser.c:6492
msgid "_Inline Find:"
msgstr "_Buscar:"
-#: ../midori/midori-browser.c:5152
+#: ../midori/midori-browser.c:6523
msgid "Previous"
msgstr "Anterior"
-#: ../midori/midori-browser.c:5157
+#: ../midori/midori-browser.c:6528
msgid "Next"
msgstr "Siguiente"
-#: ../midori/midori-browser.c:5162
+#: ../midori/midori-browser.c:6533
msgid "Match Case"
msgstr "Coincidir mayúsculas "
-#: ../midori/midori-browser.c:5170
+#: ../midori/midori-browser.c:6542
msgid "Highlight Matches"
msgstr "Destacar coincidencias"
-#: ../midori/midori-browser.c:5180
+#: ../midori/midori-browser.c:6554
msgid "Close Findbar"
msgstr "Cerrar la barra de búsqueda"
-#: ../midori/midori-browser.c:5215
-#: ../extensions/cookie-manager/cookie-manager-page.c:109
-msgid "Delete All"
-msgstr "Eliminar todo"
+#: ../midori/midori-browser.c:6600 ../panels/midori-transfers.c:142
+msgid "Clear All"
+msgstr "Limpiar todo"
-#: ../midori/midori-browser.c:5552
+#: ../midori/midori-browser.c:6958
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Ajuste no esperado «%s»"
-#: ../midori/midori-locationaction.c:901
+#: ../midori/midori-locationaction.c:377
+#, c-format
+msgid "Failed to select from history\n"
+msgstr "Fallo al seleccionar del historial\n"
+
+#: ../midori/midori-locationaction.c:459
+#, c-format
+msgid "Search for %s"
+msgstr "Buscar %s"
+
+#: ../midori/midori-locationaction.c:482
#, c-format
msgid "Search with %s"
msgstr "Buscar con %s"
-#: ../midori/midori-panel.c:382
-#: ../midori/midori-panel.c:384
+#: ../midori/midori-locationaction.c:1197
+#, c-format
+msgid "Failed to execute database statement\n"
+msgstr "Fallo al ejecutar sentencia de base de datos\n"
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1254
+msgid "Paste and p_roceed"
+msgstr "Pegar y c_ontinuar"
+
+#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435
msgid "Detach chosen panel from the window"
msgstr "Separar el panel elegido de la ventana"
-#: ../midori/midori-panel.c:394
-#: ../midori/midori-panel.c:396
-#: ../midori/midori-panel.c:577
-#: ../midori/midori-panel.c:580
+#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447
+#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
msgid "Align sidepanel to the right"
msgstr "Alinear el panel a la derecha"
-#: ../midori/midori-panel.c:406
-#: ../midori/midori-panel.c:407
+#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458
msgid "Close panel"
msgstr "Cerrar panel"
-#: ../midori/midori-panel.c:578
-#: ../midori/midori-panel.c:581
+#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644
msgid "Align sidepanel to the left"
msgstr "Alinear el panel a la izquierda"
-#: ../midori/midori-panel.c:704
-msgid "Show panel _titles"
-msgstr "Mostrar el panel de _títulos"
+#: ../midori/midori-panel.c:798
+msgid "Hide operating controls"
+msgstr "Ocultar _controles de operación"
-#: ../midori/midori-panel.c:712
-msgid "Show operating _controls"
-msgstr "Mostar los _controles de operación"
-
-#: ../midori/midori-panel.c:783
-msgid "Options"
-msgstr "Opciones"
-
-#: ../midori/midori-websettings.c:197
+#: ../midori/midori-websettings.c:209
msgid "Show Blank page"
msgstr "Mostrar página en blanco"
-#: ../midori/midori-websettings.c:198
+#: ../midori/midori-websettings.c:210
msgid "Show Homepage"
msgstr "Mostar página de inicio"
-#: ../midori/midori-websettings.c:199
+#: ../midori/midori-websettings.c:211
msgid "Show last open tabs"
msgstr "Mostrar las últimas pestañas abiertas"
-#: ../midori/midori-websettings.c:215
+#: ../midori/midori-websettings.c:227
msgid "Japanese (SHIFT_JIS)"
msgstr "Japonés (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:234
+#: ../midori/midori-websettings.c:247
msgid "New tab"
msgstr "Nueva pestaña"
-#: ../midori/midori-websettings.c:235
+#: ../midori/midori-websettings.c:248
msgid "New window"
msgstr "Nueva ventana"
-#: ../midori/midori-websettings.c:236
+#: ../midori/midori-websettings.c:249
msgid "Current tab"
msgstr "Pestaña actual"
-#: ../midori/midori-websettings.c:251
+#: ../midori/midori-websettings.c:264
msgid "Default"
msgstr "Predeterminado"
-#: ../midori/midori-websettings.c:252
+#: ../midori/midori-websettings.c:265
msgid "Icons"
msgstr "Íconos"
-#: ../midori/midori-websettings.c:253
+#: ../midori/midori-websettings.c:266
+msgid "Small icons"
+msgstr "Iconos pequeños"
+
+#: ../midori/midori-websettings.c:267
msgid "Text"
msgstr "Texto"
-#: ../midori/midori-websettings.c:254
+#: ../midori/midori-websettings.c:268
msgid "Icons and text"
msgstr "Iconos y texto"
-#: ../midori/midori-websettings.c:255
+#: ../midori/midori-websettings.c:269
msgid "Text beside icons"
msgstr "Texto al lado de los íconos"
-#: ../midori/midori-websettings.c:270
+#: ../midori/midori-websettings.c:284
+msgid "Automatic (GNOME or environment)"
+msgstr "Automático (GNOME o entorno)"
+
+#: ../midori/midori-websettings.c:285
+msgid "HTTP proxy server"
+msgstr "Servidor proxy HTTP"
+
+#: ../midori/midori-websettings.c:286
+msgid "No proxy server"
+msgstr "Sin servidor proxy"
+
+#: ../midori/midori-websettings.c:301
msgid "All cookies"
-msgstr "Todas las huellas"
+msgstr "Todas las cookies"
-#: ../midori/midori-websettings.c:271
+#: ../midori/midori-websettings.c:302
msgid "Session cookies"
-msgstr "Huellas de la sesión"
+msgstr "Cookies de la sesión"
-#: ../midori/midori-websettings.c:272
-#: ../panels/midori-addons.c:94
-#: ../extensions/shortcuts.c:93
+#: ../midori/midori-websettings.c:303 ../panels/midori-addons.c:98
+#: ../katze/katze-utils.c:664
msgid "None"
msgstr "Ninguna"
-#: ../midori/midori-websettings.c:288
+#: ../midori/midori-websettings.c:319
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:289
+#: ../midori/midori-websettings.c:320
+msgid "iPhone"
+msgstr "iPhone"
+
+#: ../midori/midori-websettings.c:321
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:290
+#: ../midori/midori-websettings.c:322
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:343
+#: ../midori/midori-websettings.c:375
msgid "Remember last window size"
msgstr "Recordar el tamaño de la última ventana"
-#: ../midori/midori-websettings.c:344
+#: ../midori/midori-websettings.c:376
msgid "Whether to save the last window size"
msgstr "Si se desea recordar el tamaño de la última ventana"
-#: ../midori/midori-websettings.c:352
+#: ../midori/midori-websettings.c:384
msgid "Last window width"
msgstr "Última anchura de la ventana"
-#: ../midori/midori-websettings.c:353
+#: ../midori/midori-websettings.c:385
msgid "The last saved window width"
msgstr "Última anchura de la ventana guardada"
-#: ../midori/midori-websettings.c:361
+#: ../midori/midori-websettings.c:393
msgid "Last window height"
msgstr "Última altura de la ventana"
-#: ../midori/midori-websettings.c:362
+#: ../midori/midori-websettings.c:394
msgid "The last saved window height"
msgstr "Última altura guardada de la ventana "
-#: ../midori/midori-websettings.c:387
+#: ../midori/midori-websettings.c:419
msgid "Last panel position"
msgstr "Última posición del panel"
-#: ../midori/midori-websettings.c:388
+#: ../midori/midori-websettings.c:420
msgid "The last saved panel position"
msgstr "Ultima posición guardada del panel"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:397
+#: ../midori/midori-websettings.c:429
msgid "Last panel page"
msgstr "Última página del panel"
-#: ../midori/midori-websettings.c:398
+#: ../midori/midori-websettings.c:430
msgid "The last saved panel page"
msgstr "Última página guardada del panel"
-#: ../midori/midori-websettings.c:406
+#: ../midori/midori-websettings.c:438
msgid "Last Web search"
-msgstr "Última búsqueda en internet"
+msgstr "Última búsqueda web"
-#: ../midori/midori-websettings.c:407
+#: ../midori/midori-websettings.c:439
msgid "The last saved Web search"
-msgstr "Última búsqueda de internet guardada"
+msgstr "Última búsqueda web guardada"
-#: ../midori/midori-websettings.c:416
+#: ../midori/midori-websettings.c:448
msgid "Show Menubar"
msgstr "Mostrar barra de menú"
-#: ../midori/midori-websettings.c:417
+#: ../midori/midori-websettings.c:449
msgid "Whether to show the menubar"
msgstr "Si se desea mostrar la barra de menú"
-#: ../midori/midori-websettings.c:425
+#: ../midori/midori-websettings.c:457
msgid "Show Navigationbar"
msgstr "Mostrar la barra de navegación"
-#: ../midori/midori-websettings.c:426
+#: ../midori/midori-websettings.c:458
msgid "Whether to show the navigationbar"
msgstr "Si se desea mostrar la barra de navegación"
-#: ../midori/midori-websettings.c:434
+#: ../midori/midori-websettings.c:466
msgid "Show Bookmarkbar"
msgstr "Mostrar la barra de marcadores"
-#: ../midori/midori-websettings.c:435
+#: ../midori/midori-websettings.c:467
msgid "Whether to show the bookmarkbar"
msgstr "Si se desea mostrar la barra de marcadores"
-#: ../midori/midori-websettings.c:443
+#: ../midori/midori-websettings.c:475
msgid "Show Panel"
msgstr "Mostrar el panel"
-#: ../midori/midori-websettings.c:444
+#: ../midori/midori-websettings.c:476
msgid "Whether to show the panel"
msgstr "Si se desea mostrar el panel"
-#: ../midori/midori-websettings.c:459
+#: ../midori/midori-websettings.c:491
msgid "Show Transferbar"
msgstr "Mostrar la barra de transferencias"
-#: ../midori/midori-websettings.c:460
+#: ../midori/midori-websettings.c:492
msgid "Whether to show the transferbar"
msgstr "Si se desea mostrar la barra de transferencias"
-#: ../midori/midori-websettings.c:468
+#: ../midori/midori-websettings.c:500
msgid "Show Statusbar"
msgstr "Mostrar la barra de estado"
-#: ../midori/midori-websettings.c:469
+#: ../midori/midori-websettings.c:501
msgid "Whether to show the statusbar"
msgstr "Si se desea mostrar la barra de estado"
-#: ../midori/midori-websettings.c:478
+#: ../midori/midori-websettings.c:510
msgid "Toolbar Style:"
msgstr "Estilo de la barra de tareas:"
-#: ../midori/midori-websettings.c:479
+#: ../midori/midori-websettings.c:511
msgid "The style of the toolbar"
msgstr "Estilo de la barra de herramientas"
-#: ../midori/midori-websettings.c:495
+#: ../midori/midori-websettings.c:527
msgid "Show progress in location entry"
msgstr "Mostrar progreso en la barra de direcciones"
-#: ../midori/midori-websettings.c:496
+#: ../midori/midori-websettings.c:528
msgid "Whether to show loading progress in the location entry"
msgstr "Si se desea mostrar el progreso de carga en el lugar de entrada"
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:543
msgid "Search engines in location completion"
msgstr "Motores de búsqueda en completamiento"
-#: ../midori/midori-websettings.c:512
+#: ../midori/midori-websettings.c:544
msgid "Whether to show search engines in the location completion"
msgstr "Si se desea mostrar los motores de búsqueda en completamento de dirección"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:552
msgid "Toolbar Items"
msgstr "Elementos de la barra de herramientas"
-#: ../midori/midori-websettings.c:521
+#: ../midori/midori-websettings.c:553
msgid "The items to show on the toolbar"
msgstr "Los elementos a mostrar en la barra de herramientas"
-#: ../midori/midori-websettings.c:529
+#: ../midori/midori-websettings.c:561
msgid "Compact Sidepanel"
msgstr "Panel lateral compacto"
-#: ../midori/midori-websettings.c:530
+#: ../midori/midori-websettings.c:562
msgid "Whether to make the sidepanel compact"
msgstr "Si se desea hacer compacto el panel lateral"
-#: ../midori/midori-websettings.c:545
+#: ../midori/midori-websettings.c:577
msgid "Show operating controls of the panel"
msgstr "Mostrar los controles de operación en el panel"
-#: ../midori/midori-websettings.c:546
+#: ../midori/midori-websettings.c:578
msgid "Whether to show the operating controls of the panel"
msgstr "Si se desea mostrar los controles de operación en el panel"
-#: ../midori/midori-websettings.c:561
+#: ../midori/midori-websettings.c:593
msgid "Align sidepanel on the right"
msgstr "Alinear el panel a la derecha"
-#: ../midori/midori-websettings.c:562
+#: ../midori/midori-websettings.c:594
msgid "Whether to align the sidepanel on the right"
msgstr "Alinear el panel lateral a la derecha"
-#: ../midori/midori-websettings.c:571
+#: ../midori/midori-websettings.c:609
+msgid "Open panels in separate windows"
+msgstr "Abrir paneles en ventanas separadas"
+
+#: ../midori/midori-websettings.c:610
+msgid "Whether to always open panels in separate windows"
+msgstr "Configura si los paneles se abren en ventanas separadas"
+
+#: ../midori/midori-websettings.c:619
msgid "When Midori starts:"
msgstr "Cuando Midori inicia:"
-#: ../midori/midori-websettings.c:572
+#: ../midori/midori-websettings.c:620
msgid "What to do when Midori starts"
msgstr "Qué hacer al inicio de Midori"
-#: ../midori/midori-websettings.c:581
+#: ../midori/midori-websettings.c:629
msgid "Homepage:"
msgstr "Página de inicio:"
-#: ../midori/midori-websettings.c:582
+#: ../midori/midori-websettings.c:630
msgid "The homepage"
msgstr "Página de inicio"
-#: ../midori/midori-websettings.c:597
+#: ../midori/midori-websettings.c:645
msgid "Show crash dialog"
msgstr "Mostrar diálogo de cuelgue"
-#: ../midori/midori-websettings.c:598
+#: ../midori/midori-websettings.c:646
msgid "Show a dialog after Midori crashed"
msgstr "Mostrar un dialogo despues de que Midori se cuelgue"
#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:614
+#: ../midori/midori-websettings.c:662
msgid "Show speed dial in new tabs"
msgstr "Mostrar marcación rápida en nuevas pestañas"
-#: ../midori/midori-websettings.c:615
+#: ../midori/midori-websettings.c:663
msgid "Show speed dial in newly opened tabs"
msgstr "Mostrar marcación rápida en la pestaña abierta recientemente"
-#: ../midori/midori-websettings.c:623
+#: ../midori/midori-websettings.c:671
msgid "Save downloaded files to:"
msgstr "Guardar los archivos descargados en:"
-#: ../midori/midori-websettings.c:624
+#: ../midori/midori-websettings.c:672
msgid "The folder downloaded files are saved to"
msgstr "Carpeta donde se guardan los archivos descargados"
-#: ../midori/midori-websettings.c:643
+#: ../midori/midori-websettings.c:693
msgid "Ask for the destination folder"
msgstr "Preguntar por la carpeta de destino"
-#: ../midori/midori-websettings.c:644
+#: ../midori/midori-websettings.c:694
msgid "Whether to ask for the destination folder when downloading a file"
msgstr "Si se desea seleccionar la carpeta de destino cuando se descarga un archivo"
-#: ../midori/midori-websettings.c:663
+#: ../midori/midori-websettings.c:713
msgid "Notify when a transfer has been completed"
msgstr "Notificarme sobre las transferencias completas"
-#: ../midori/midori-websettings.c:664
+#: ../midori/midori-websettings.c:714
msgid "Whether to show a notification when a transfer has been completed"
msgstr "Si se desea mostrar una notificación cuando se ha completado la transferencia"
-#: ../midori/midori-websettings.c:676
+#: ../midori/midori-websettings.c:726
msgid "Download Manager"
msgstr "Gestor de descargas"
-#: ../midori/midori-websettings.c:677
+#: ../midori/midori-websettings.c:727
msgid "An external download manager"
msgstr "Gestor de descargas externo"
-#: ../midori/midori-websettings.c:685
+#: ../midori/midori-websettings.c:735
msgid "Text Editor"
msgstr "Editor de texto"
-#: ../midori/midori-websettings.c:686
+#: ../midori/midori-websettings.c:736
msgid "An external text editor"
msgstr "Editor de textos externo"
-#: ../midori/midori-websettings.c:701
+#: ../midori/midori-websettings.c:751
msgid "News Aggregator"
msgstr "Agregador de noticias"
-#: ../midori/midori-websettings.c:702
+#: ../midori/midori-websettings.c:752
msgid "An external news aggregator"
msgstr "Un agregador de noticias externo"
-#: ../midori/midori-websettings.c:710
+#: ../midori/midori-websettings.c:760
msgid "Location entry Search"
msgstr "Búsqueda en la barra"
-#: ../midori/midori-websettings.c:711
+#: ../midori/midori-websettings.c:761
msgid "The search to perform inside the location entry"
msgstr "Hacer una búsqueda a partir del contenido de la barra de direcciones"
-#: ../midori/midori-websettings.c:719
+#: ../midori/midori-websettings.c:769
msgid "Preferred Encoding"
msgstr "Codificación preferida"
-#: ../midori/midori-websettings.c:720
+#: ../midori/midori-websettings.c:770
msgid "The preferred character encoding"
msgstr "Codificación de caracteres preferida"
-#: ../midori/midori-websettings.c:730
+#: ../midori/midori-websettings.c:780
msgid "Always Show Tabbar"
msgstr "Siempre mostrar la barra de pestañas"
-#: ../midori/midori-websettings.c:731
+#: ../midori/midori-websettings.c:781
msgid "Always show the tabbar"
msgstr "Siempre mostrar la barra de pestañas"
-#: ../midori/midori-websettings.c:739
+#: ../midori/midori-websettings.c:789
msgid "Close Buttons on Tabs"
msgstr "Botón de cerrar en las pestañas"
-#: ../midori/midori-websettings.c:740
+#: ../midori/midori-websettings.c:790
msgid "Whether tabs have close buttons"
msgstr "Si se desea que las pestañas tengan el botón de cerrar"
-#: ../midori/midori-websettings.c:748
+#: ../midori/midori-websettings.c:798
msgid "Open new pages in:"
msgstr "Abrir las páginas nuevas en:"
-#: ../midori/midori-websettings.c:749
+#: ../midori/midori-websettings.c:799
msgid "Where to open new pages"
msgstr "Donde abrir las páginas nuevas"
-#: ../midori/midori-websettings.c:758
+#: ../midori/midori-websettings.c:808
msgid "Open external pages in:"
msgstr "Abrir las páginas externas en:"
-#: ../midori/midori-websettings.c:759
+#: ../midori/midori-websettings.c:809
msgid "Where to open externally opened pages"
msgstr "Donde abrir las páginas externas"
-#: ../midori/midori-websettings.c:768
+#: ../midori/midori-websettings.c:818
msgid "Middle click opens Selection"
msgstr "Clic del medio abre la selección"
-#: ../midori/midori-websettings.c:769
+#: ../midori/midori-websettings.c:819
msgid "Load an address from the selection via middle click"
msgstr "Cargar una dirección desde la selección a través del botón del medio del ratón"
-#: ../midori/midori-websettings.c:777
+#: ../midori/midori-websettings.c:827
msgid "Open tabs in the background"
msgstr "Abrir pestañas en segundo plano"
-#: ../midori/midori-websettings.c:778
+#: ../midori/midori-websettings.c:828
msgid "Whether to open new tabs in the background"
msgstr "Si se desea que las nuevas pestañas se abran en segundo plano"
-#: ../midori/midori-websettings.c:786
+#: ../midori/midori-websettings.c:836
msgid "Open Tabs next to Current"
msgstr "Abrir pestañas junto a la actual"
-#: ../midori/midori-websettings.c:787
+#: ../midori/midori-websettings.c:837
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr "Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o después de la última"
-#: ../midori/midori-websettings.c:795
+#: ../midori/midori-websettings.c:845
msgid "Open popups in tabs"
msgstr "Abrir emergentes en pestañas"
-#: ../midori/midori-websettings.c:796
+#: ../midori/midori-websettings.c:846
msgid "Whether to open popup windows in tabs"
msgstr "Si se desea abrir las ventanas emergentes en pestañas"
-#: ../midori/midori-websettings.c:812
+#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88
+msgid "Load images automatically"
+msgstr "Cargar imágenes automáticamente"
+
+#: ../midori/midori-websettings.c:857
+msgid "Load and display images automatically"
+msgstr "Cargar y mostrar imágenes automáticamente"
+
+#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100
+msgid "Enable scripts"
+msgstr "Habilitar scripts"
+
+#: ../midori/midori-websettings.c:865
+msgid "Enable embedded scripting languages"
+msgstr "Habilitar script de lenguajes embebidos"
+
+#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112
+msgid "Enable Netscape plugins"
+msgstr "Habilitar complementos Netscape"
+
+#: ../midori/midori-websettings.c:873
+msgid "Enable embedded Netscape plugin objects"
+msgstr "Habilitar el complemento de objetos embebidos Netscape"
+
+#: ../midori/midori-websettings.c:889
+msgid "Enable HTML5 database support"
+msgstr "Activar soporte de base de datos HTML5"
+
+#: ../midori/midori-websettings.c:890
+msgid "Whether to enable HTML5 database support"
+msgstr "Configura si se activa el soporte de base de datos de HTML5"
+
+#: ../midori/midori-websettings.c:896
+msgid "Enable HTML5 local storage support"
+msgstr "Activar soporte de almacenamiento local HTML5"
+
+#: ../midori/midori-websettings.c:897
+msgid "Whether to enable HTML5 local storage support"
+msgstr "Configura si se activa el soporte de almacenamiento local de HTML5"
+
+#: ../midori/midori-websettings.c:905
+msgid "Enable offline web application cache"
+msgstr "Activar caché local de aplicación web"
+
+#: ../midori/midori-websettings.c:906
+msgid "Whether to enable offline web application cache"
+msgstr "Configura si se activa el caché local de aplicación web"
+
+#: ../midori/midori-websettings.c:931
msgid "Zoom Text and Images"
msgstr "Ampliar textos e imágenes"
-#: ../midori/midori-websettings.c:813
+#: ../midori/midori-websettings.c:932
msgid "Whether to zoom text and images"
msgstr "Si se desea ampliar texto e imágenes"
-#: ../midori/midori-websettings.c:828
+#: ../midori/midori-websettings.c:947
msgid "Find inline while typing"
msgstr "Buscar en el texto al escribir"
-#: ../midori/midori-websettings.c:829
+#: ../midori/midori-websettings.c:948
msgid "Whether to automatically find inline while typing"
-msgstr "Si se desea buscar automáticamente en el texto al comenzar a tipear"
+msgstr "Si se desea buscar automáticamente en el texto al comenzar a escribir"
-#: ../midori/midori-websettings.c:837
+#: ../midori/midori-websettings.c:963
+msgid "Kinetic scrolling"
+msgstr "Desplazamiento dinámico"
+
+#: ../midori/midori-websettings.c:964
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr "Configura si el desplazamiento debe realizarse de forma acorde a la velocidad"
+
+#: ../midori/midori-websettings.c:972
msgid "Accept cookies"
-msgstr "Aceptar huellas"
+msgstr "Aceptar cookies"
-#: ../midori/midori-websettings.c:838
+#: ../midori/midori-websettings.c:973
msgid "What type of cookies to accept"
-msgstr "Qué tipos de huellas van a ser aceptadas"
+msgstr "Qué tipos de cookies son aceptadas"
-#: ../midori/midori-websettings.c:847
+#: ../midori/midori-websettings.c:989
msgid "Original cookies only"
-msgstr "Sólo huellas originales"
+msgstr "Sólo cookies originales"
-#: ../midori/midori-websettings.c:848
+#: ../midori/midori-websettings.c:990
msgid "Accept cookies from the original website only"
-msgstr "Sólo se aceptan las huellas del sitio de internet original"
+msgstr "Sólo se aceptan las cookies del sitio web original"
-#: ../midori/midori-websettings.c:856
+#: ../midori/midori-websettings.c:998
msgid "Maximum cookie age"
-msgstr "Duración máxima de las huellas"
+msgstr "Duración máxima de las cookies"
-#: ../midori/midori-websettings.c:857
+#: ../midori/midori-websettings.c:999
msgid "The maximum number of days to save cookies for"
-msgstr "Número máximo de días para conservar las huellas"
+msgstr "Número máximo de días para conservar las cookies"
-#: ../midori/midori-websettings.c:867
+#: ../midori/midori-websettings.c:1016
msgid "Remember last visited pages"
msgstr "Recordar las últimas páginas visitadas"
-#: ../midori/midori-websettings.c:868
+#: ../midori/midori-websettings.c:1017
msgid "Whether the last visited pages are saved"
msgstr "Si se desea que las últimas páginas visitadas sean recordadas"
-#: ../midori/midori-websettings.c:876
+#: ../midori/midori-websettings.c:1025
msgid "Maximum history age"
msgstr "Duración máxima del historial"
-#: ../midori/midori-websettings.c:877
+#: ../midori/midori-websettings.c:1026
msgid "The maximum number of days to save the history for"
msgstr "Número máximo de días para conservar el historial"
-#: ../midori/midori-websettings.c:885
-msgid "Remember last form inputs"
-msgstr "Recordar lo que se haya ingresado en formularios"
-
-#: ../midori/midori-websettings.c:886
-msgid "Whether the last form inputs are saved"
-msgstr "Si se desea que las últimas entradas de formulario sean recordadas"
-
-#: ../midori/midori-websettings.c:894
+#: ../midori/midori-websettings.c:1034
msgid "Remember last downloaded files"
msgstr "Recordar los últimos archivos descargados"
-#: ../midori/midori-websettings.c:895
+#: ../midori/midori-websettings.c:1035
msgid "Whether the last downloaded files are saved"
msgstr "Si se desea que los archivos descargados sean recordados"
-#: ../midori/midori-websettings.c:905
-msgid "Proxy Server"
+#: ../midori/midori-websettings.c:1052
+msgid "Proxy server"
msgstr "Servidor proxy"
-#: ../midori/midori-websettings.c:906
+#: ../midori/midori-websettings.c:1053
+msgid "The type of proxy server to use"
+msgstr "El tipo de servidor a usar"
+
+#: ../midori/midori-websettings.c:1062
+msgid "HTTP Proxy Server"
+msgstr "Servidor proxy HTTP"
+
+#: ../midori/midori-websettings.c:1063
msgid "The proxy server used for HTTP connections"
msgstr "Servidor proxy utilizado para conexiones HTTP"
-#: ../midori/midori-websettings.c:921
+#: ../midori/midori-websettings.c:1078
msgid "Detect proxy server automatically"
msgstr "Detectar automáticamente el servidor proxy"
-#: ../midori/midori-websettings.c:922
+#: ../midori/midori-websettings.c:1079
msgid "Whether to detect the proxy server automatically from the environment"
-msgstr "Si se desea detectar automáticamente el servidor proxy desde el entorno"
+msgstr "Si se desea detectar automáticamente el servidor proxy del entorno"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:938
+#: ../midori/midori-websettings.c:1095
msgid "Identify as"
msgstr "Identificar como:"
-#: ../midori/midori-websettings.c:939
+#: ../midori/midori-websettings.c:1096
msgid "What to identify as to web pages"
-msgstr "Identificar como páginas de internet"
+msgstr "Identificar como páginas web"
-#: ../midori/midori-websettings.c:955
+#: ../midori/midori-websettings.c:1112
msgid "Identification string"
msgstr "Cadena de identificación"
-#: ../midori/midori-websettings.c:956
+#: ../midori/midori-websettings.c:1113
msgid "The application identification string"
msgstr "Aplicación de identificación de cadenas"
-#: ../midori/midori-websettings.c:964
-msgid "Cache size"
-msgstr "Tamaño del caché"
+#: ../midori/midori-websettings.c:1128
+msgid "Preferred languages"
+msgstr "Idiomas preferidos"
-#: ../midori/midori-websettings.c:965
-msgid "The allowed size of the cache"
-msgstr "Tamaño asignado a la memoria caché"
+#: ../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\""
+msgstr "Una lista separada por comas de idioma preferidos para procesar páginas multi-idiomas, como por ejemplo \"de\", \"ru,nl\" o \"en-us;q=1.0, fr-fr;q=0.667\""
-#: ../midori/midori-websettings.c:980
+#: ../midori/midori-websettings.c:1144
msgid "Clear private data"
msgstr "Borrar datos privados"
-#: ../midori/midori-websettings.c:981
+#: ../midori/midori-websettings.c:1145
msgid "The private data selected for deletion"
msgstr "Los datos privados seleccionados para su eliminación"
-#: ../midori/midori-view.c:781
-#, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "No se pudo cargar la página «%s»."
-
#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly,
#. so reloading via Javascript works but not via API calls.
-#: ../midori/midori-view.c:783
-#: ../midori/midori-view.c:3013
-#: ../extensions/feed-panel/main.c:112
-msgid "Error"
-msgstr "Error"
-
-#: ../midori/midori-view.c:786
-msgid "Try again"
-msgstr "Inténtelo nuevamente"
-
-#. i18n: The title of the 404 - Not found error page
#. Error pages are special, we want to try loading the destination
#. again, not the error page which isn't even a proper page
-#: ../midori/midori-view.c:818
-#: ../midori/midori-view.c:3017
+#: ../midori/midori-view.c:1187 ../midori/midori-view.c:4452
+#: ../midori/midori-view.c:4456
+#, c-format
+msgid "Error - %s"
+msgstr "Error - %s"
+
+#: ../midori/midori-view.c:1188
+#, c-format
+msgid "The page '%s' couldn't be loaded."
+msgstr "No se pudo cargar la página '%s'."
+
+#: ../midori/midori-view.c:1193
+msgid "Try again"
+msgstr "Inténtelo de nuevo"
+
+#. i18n: The title of the 404 - Not found error page
+#: ../midori/midori-view.c:1234
#, c-format
msgid "Not found - %s"
msgstr "No se ha encontrado - %s"
-#: ../midori/midori-view.c:1205
-msgid "Open _Link"
-msgstr "Abrir _enlace"
+#: ../midori/midori-view.c:1456 ../midori/midori-view.c:2276
+#, c-format
+msgid "Send a message to %s"
+msgstr "Enviar un mensaje a %s"
-#: ../midori/midori-view.c:1207
+#: ../midori/midori-view.c:2058 ../midori/midori-view.c:2438
+msgid "Inspect _Element"
+msgstr "Inspeccionar _elemento"
+
+#: ../midori/midori-view.c:2110 ../midori/midori-view.c:2180
msgid "Open Link in New _Tab"
msgstr "Abrir enlace en nueva _pestaña"
-#: ../midori/midori-view.c:1224
+#: ../midori/midori-view.c:2114
+msgid "Open Link in _Foreground Tab"
+msgstr "Abrir enlace en pestaña en _primer plano"
+
+#: ../midori/midori-view.c:2115
+msgid "Open Link in _Background Tab"
+msgstr "Abrir enlace en pestaña en _segundo plano"
+
+#: ../midori/midori-view.c:2118 ../midori/midori-view.c:2187
msgid "Open Link in New _Window"
msgstr "Abrir enlace en nueva _ventana"
-#: ../midori/midori-view.c:1230
-msgid "_Download Link destination"
-msgstr "_Descargar enlace"
+#: ../midori/midori-view.c:2121
+msgid "Open Link as Web A_pplication"
+msgstr "Abrir enlace como a_plicación web"
-#: ../midori/midori-view.c:1236
+#: ../midori/midori-view.c:2124
+msgid "Copy Link de_stination"
+msgstr "Copiar de_stino del enlace"
+
+#: ../midori/midori-view.c:2127 ../midori/midori-view.c:2199
msgid "_Save Link destination"
msgstr "_Guardar enlace"
-#: ../midori/midori-view.c:1245
-msgid "Download with Download _Manager"
-msgstr "Descargar con el gestor de descargas"
+#: ../midori/midori-view.c:2128 ../midori/midori-view.c:2193
+msgid "_Download Link destination"
+msgstr "_Descargar enlace"
-#: ../midori/midori-view.c:1274
+#: ../midori/midori-view.c:2132 ../midori/midori-view.c:2162
+#: ../midori/midori-view.c:2204
+msgid "Download with Download _Manager"
+msgstr "Descargar con el _gestor de descargas"
+
+#: ../midori/midori-view.c:2141
+msgid "Open _Image in New Tab"
+msgstr "Abrir _imagen en nueva pestaña"
+
+#: ../midori/midori-view.c:2144
+msgid "Copy Image _Address"
+msgstr "Copiar _dirección de imagen"
+
+#: ../midori/midori-view.c:2147
+msgid "Save I_mage"
+msgstr "Guardar i_magen"
+
+#: ../midori/midori-view.c:2148
+msgid "Download I_mage"
+msgstr "Descargar i_magen"
+
+#: ../midori/midori-view.c:2155
+msgid "Copy Video _Address"
+msgstr "Copiar _dirección de vídeo"
+
+#: ../midori/midori-view.c:2158
+msgid "Save _Video"
+msgstr "Guardar _vídeo"
+
+#: ../midori/midori-view.c:2158
+msgid "Download _Video"
+msgstr "Descargar _vídeo"
+
+#: ../midori/midori-view.c:2221
msgid "Search _with"
msgstr "Buscar _con"
-#: ../midori/midori-view.c:1306
+#: ../midori/midori-view.c:2256 ../midori/midori-view.c:2263
msgid "_Search the Web"
-msgstr "_Buscar en internet"
+msgstr "_Buscar en la web"
-#: ../midori/midori-view.c:1316
+#: ../midori/midori-view.c:2284
msgid "Open Address in New _Tab"
msgstr "Abrir dirección en una nueva _pestaña "
-#: ../midori/midori-view.c:1494
+#: ../midori/midori-view.c:2588
msgid "Open or download file"
msgstr "Abrir o descargar archivo"
-#: ../midori/midori-view.c:1511
+#: ../midori/midori-view.c:2611
#, c-format
msgid "File Type: '%s'"
msgstr "Tipo de archivo: '%s'"
-#: ../midori/midori-view.c:1514
+#: ../midori/midori-view.c:2614
#, c-format
msgid "File Type: %s ('%s')"
msgstr "Tipo de archivo: %s ('%s')"
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:1518
+#: ../midori/midori-view.c:2618
#, c-format
msgid "Open %s"
msgstr "Abrir %s"
-#: ../midori/midori-view.c:1957
+#: ../midori/midori-view.c:3152
#, c-format
msgid "Inspect page - %s"
msgstr "Inspeccionar la página - %s"
-#: ../midori/midori-view.c:2147
+#: ../midori/midori-view.c:3413
msgid "Speed dial"
msgstr "Marcación rápida"
-#: ../midori/midori-view.c:2148
+#: ../midori/midori-view.c:3414
msgid "Click to add a shortcut"
msgstr "Haga clic aquí para añadir un acceso directo"
-#: ../midori/midori-view.c:2149
+#: ../midori/midori-view.c:3415
msgid "Enter shortcut address"
msgstr "Introduzca la dirección del acceso directo"
-#: ../midori/midori-view.c:2150
+#: ../midori/midori-view.c:3416
msgid "Enter shortcut title"
msgstr "Introduzca el título del acceso directo"
-#: ../midori/midori-view.c:2151
+#: ../midori/midori-view.c:3417
msgid "Are you sure you want to delete this shortcut?"
-msgstr "¿Está seguro que desea eliminar éste acceso directo?"
+msgstr "¿Está seguro que desea eliminar este acceso directo?"
-#: ../midori/midori-view.c:2181
+#: ../midori/midori-view.c:3454
#, c-format
msgid "Document cannot be displayed"
msgstr "El documento no puede ser mostrado"
-#: ../midori/midori-view.c:2198
+#: ../midori/midori-view.c:3477
#, c-format
msgid "No documentation installed"
-msgstr "No se dispone de documentación instalada"
+msgstr "No hay documentación instalada"
-#: ../midori/midori-view.c:2323
+#: ../midori/midori-view.c:3727
msgid "Blank page"
msgstr "Página en blanco"
-#: ../midori/midori-view.c:2551
-#: ../midori/sokoke.c:865
-msgid "New _Tab"
-msgstr "Nueva _pestaña"
-
-#: ../midori/midori-view.c:2565
+#: ../midori/midori-view.c:3987
msgid "_Duplicate Tab"
msgstr "_Duplicar pestaña"
-#: ../midori/midori-view.c:2570
+#: ../midori/midori-view.c:3992
msgid "_Restore Tab"
msgstr "_Restaurar pestaña"
-#: ../midori/midori-view.c:2570
+#: ../midori/midori-view.c:3992
msgid "_Minimize Tab"
msgstr "_Minimizar pestaña"
-#: ../midori/midori-preferences.c:91
-#, c-format
-msgid "Preferences for %s"
-msgstr "Preferencias de %s"
+#: ../midori/midori-view.c:3998
+msgid "Close ot_her Tabs"
+msgstr "Cerrar las o_tras pestañas"
+
+#: ../midori/midori-view.c:4624
+msgid "Print background images"
+msgstr "Imprimir imágenes de fondo"
+
+#: ../midori/midori-view.c:4625
+msgid "Whether background images should be printed"
+msgstr "Si se deberían imprimir las imágenes de fondo"
+
+#: ../midori/midori-view.c:4677 ../midori/midori-preferences.c:381
+msgid "Features"
+msgstr "Características"
#. Page "General"
-#: ../midori/midori-preferences.c:398
+#: ../midori/midori-preferences.c:298
msgid "General"
msgstr "General"
-#: ../midori/midori-preferences.c:399
+#: ../midori/midori-preferences.c:299
msgid "Startup"
msgstr "Inicio"
-#: ../midori/midori-preferences.c:415
+#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321
msgid "Use current page as homepage"
msgstr "Usar la página actual como página de inicio"
-#: ../midori/midori-preferences.c:425
-#: ../panels/midori-transfers.c:88
+#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Transferencias"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:440
+#: ../midori/midori-preferences.c:349
msgid "Appearance"
msgstr "Apariencia"
-#: ../midori/midori-preferences.c:441
+#: ../midori/midori-preferences.c:350
msgid "Font settings"
-msgstr "Configuración de las fuentes"
+msgstr "Configuración de tipo de letra"
-#: ../midori/midori-preferences.c:443
+#: ../midori/midori-preferences.c:352
msgid "Default Font Family"
-msgstr "Fuente por defecto"
+msgstr "Tipo de letra predeterminado"
-#: ../midori/midori-preferences.c:447
+#: ../midori/midori-preferences.c:355
msgid "The default font family used to display text"
-msgstr "Tamaño de fuente predeterminado utilizado para mostrar texto"
+msgstr "Tamaño de letra predeterminado utilizado para mostrar texto"
-#: ../midori/midori-preferences.c:450
+#: ../midori/midori-preferences.c:358
msgid "The default font size used to display text"
-msgstr "Tamaño de fuente predeterminado utilizado para mostrar texto"
+msgstr "Tamaño de letra predeterminado utilizado para mostrar texto"
-#: ../midori/midori-preferences.c:453
+#: ../midori/midori-preferences.c:360
msgid "Fixed-width Font Family"
-msgstr "Fuente de ancho fijo"
+msgstr "Tipo de letra de ancho fijo"
-#: ../midori/midori-preferences.c:457
+#: ../midori/midori-preferences.c:363
msgid "The font family used to display fixed-width text"
-msgstr "Fuente utilizada para mostrar el texto de ancho fijo"
+msgstr "Tipo de letra utilizado para mostrar el texto de ancho fijo"
-#: ../midori/midori-preferences.c:460
+#: ../midori/midori-preferences.c:366
msgid "The font size used to display fixed-width text"
-msgstr "Tamaño de fuente utilizada para mostrar el texto de ancho fijo"
+msgstr "Tamaño de letra utilizado para mostrar el texto de ancho fijo"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:368
msgid "Minimum Font Size"
msgstr "Tamaño mínimo de fuente"
-#: ../midori/midori-preferences.c:466
+#: ../midori/midori-preferences.c:371
msgid "The minimum font size used to display text"
msgstr "Mínimo tamaño de fuente utilizado para mostrar texto"
-#: ../midori/midori-preferences.c:473
-msgid "Encoding"
-msgstr "Codificación"
-
-#: ../midori/midori-preferences.c:476
-msgid "The character encoding to use by default"
-msgstr "Codificación de caracteres a utilizar por defecto"
-
#. Page "Behavior"
-#: ../midori/midori-preferences.c:483
+#: ../midori/midori-preferences.c:380
msgid "Behavior"
msgstr "Comportamiento"
-#: ../midori/midori-preferences.c:484
-msgid "Features"
-msgstr "Características"
-
-#: ../midori/midori-preferences.c:487
-#: ../extensions/statusbar-features.c:88
-msgid "Load images automatically"
-msgstr "Cargar imágenes automáticamente"
-
-#: ../midori/midori-preferences.c:488
-msgid "Load and display images automatically"
-msgstr "Cargar y mostrar imágenes automáticamente"
-
-#: ../midori/midori-preferences.c:491
-msgid "Shrink images automatically"
-msgstr "Reducir imágenes automáticamente"
-
-#: ../midori/midori-preferences.c:492
-msgid "Automatically shrink standalone images to fit"
-msgstr "Reducir imágenes automáticamente independientemente si caben"
-
-#: ../midori/midori-preferences.c:495
-msgid "Print background images"
-msgstr "Imprimir imágenes de fondo"
-
-#: ../midori/midori-preferences.c:496
-msgid "Whether background images should be printed"
-msgstr "Si se desea imprimir las imágenes de fondo"
-
-#: ../midori/midori-preferences.c:499
-msgid "Resizable text areas"
-msgstr "Áreas de texto dimensionables"
-
-#: ../midori/midori-preferences.c:500
-msgid "Whether text areas are resizable"
-msgstr "Si se desea que las áreas de texto sean dimensionables"
-
-#: ../midori/midori-preferences.c:503
-#: ../extensions/statusbar-features.c:100
-msgid "Enable scripts"
-msgstr "Habilitar scripts"
-
-#: ../midori/midori-preferences.c:504
-msgid "Enable embedded scripting languages"
-msgstr "Habilitar script de lenguajes embebidos"
-
-#: ../midori/midori-preferences.c:507
-#: ../extensions/statusbar-features.c:112
-msgid "Enable Netscape plugins"
-msgstr "Habilitar complementos Netscape"
-
-#: ../midori/midori-preferences.c:508
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Habilitar el complemento de objetos embebidos Netscape"
-
-#: ../midori/midori-preferences.c:511
+#: ../midori/midori-preferences.c:393
msgid "Enforce 96 dots per inch"
msgstr "Aplicar 96 puntos por pulgada"
-#: ../midori/midori-preferences.c:512
+#: ../midori/midori-preferences.c:394
msgid "Enforce a video dot density of 96 DPI"
-msgstr "Aplicar una densidad de puntos de video de 96 DPI"
+msgstr "Aplicar densidad de puntos de video de 96 DPI"
-#: ../midori/midori-preferences.c:515
-msgid "Enable developer tools"
-msgstr "Habilitar herramientas de desarrollo"
+#: ../midori/midori-preferences.c:414
+msgid "Allow scripts to open popups"
+msgstr "Permitir ventanas emergentes de scripts"
-#: ../midori/midori-preferences.c:516
-msgid "Enable special extensions for developers"
-msgstr "Habilitar extensiones especiales para desarrolladores"
+#: ../midori/midori-preferences.c:415
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Configura si se permite que los scripts puedan abrir ventanas emergentes automáticamente"
-#: ../midori/midori-preferences.c:523
+#: ../midori/midori-preferences.c:419
msgid "Spell Checking"
msgstr "Corrector ortográfico"
-#: ../midori/midori-preferences.c:526
+#: ../midori/midori-preferences.c:422
msgid "Enable Spell Checking"
-msgstr "Habilitar el corrector ortográfico"
+msgstr "Habilitar corrección ortográfica"
-#: ../midori/midori-preferences.c:527
+#: ../midori/midori-preferences.c:423
msgid "Enable spell checking while typing"
-msgstr "Habilitar el corrector ortográfico al escribir"
+msgstr "Habilitar corrección ortográfica mientras se escribe"
+
+#: ../midori/midori-preferences.c:425
+msgid "Spelling dictionaries:"
+msgstr "Diccionarios ortográficos:"
#. i18n: The example should be adjusted to contain a good local default
-#: ../midori/midori-preferences.c:531
+#: ../midori/midori-preferences.c:429
msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\""
msgstr "Lista de idiomas separados con comas que se utilizarán para la corrección ortográfica, por ejemplo \"en_GB,de_DE\""
#. Page "Interface"
-#: ../midori/midori-preferences.c:536
+#: ../midori/midori-preferences.c:435
msgid "Interface"
msgstr "Interfaz"
-#: ../midori/midori-preferences.c:537
+#: ../midori/midori-preferences.c:436
msgid "Navigationbar"
msgstr "Barra de navegación"
-#: ../midori/midori-preferences.c:548
+#: ../midori/midori-preferences.c:446
msgid "Browsing"
msgstr "Navegación"
#. Page "Applications"
-#: ../midori/midori-preferences.c:574
+#: ../midori/midori-preferences.c:468
msgid "Applications"
msgstr "Aplicaciones"
-#: ../midori/midori-preferences.c:575
+#: ../midori/midori-preferences.c:469
msgid "External applications"
msgstr "Aplicaciones externas"
#. Page "Network"
-#: ../midori/midori-preferences.c:621
-#: ../midori/midori-preferences.c:622
+#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486
msgid "Network"
msgstr "Red"
-#: ../midori/midori-preferences.c:649
-msgid "MB"
-msgstr "MB"
+#: ../midori/midori-preferences.c:492
+msgid "Hostname"
+msgstr "Nombre de host"
#. Page "Privacy"
-#: ../midori/midori-preferences.c:654
+#: ../midori/midori-preferences.c:511
msgid "Privacy"
msgstr "Privacidad"
-#: ../midori/midori-preferences.c:655
+#: ../midori/midori-preferences.c:512
msgid "Web Cookies"
-msgstr "Huellas"
+msgstr "Cookies web"
-#: ../midori/midori-preferences.c:668
-#: ../midori/midori-preferences.c:678
+#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535
msgid "days"
msgstr "días"
-#: ../midori/midori-searchaction.c:488
-#: ../katze/katze-arrayaction.c:335
-msgid "Empty"
-msgstr "Vacío"
-
-#: ../midori/midori-searchaction.c:908
+#: ../midori/midori-searchaction.c:917
msgid "Add search engine"
-msgstr "Añadir un motor de búsqueda"
+msgstr "Añadir motor de búsqueda"
-#: ../midori/midori-searchaction.c:908
+#: ../midori/midori-searchaction.c:917
msgid "Edit search engine"
msgstr "Editar motor de búsqueda"
-#: ../midori/midori-searchaction.c:936
+#: ../midori/midori-searchaction.c:945
msgid "_Name:"
msgstr "_Nombre:"
-#: ../midori/midori-searchaction.c:980
+#: ../midori/midori-searchaction.c:989
msgid "_Icon:"
-msgstr "_Ícono"
+msgstr "_Icono"
-#: ../midori/midori-searchaction.c:994
+#: ../midori/midori-searchaction.c:1003
msgid "_Token:"
msgstr "_Abreviatura:"
-#: ../midori/midori-searchaction.c:1213
+#: ../midori/midori-searchaction.c:1234
msgid "Manage Search Engines"
msgstr "Administrar los motores de búsqueda"
-#: ../midori/midori-searchaction.c:1312
+#: ../midori/midori-searchaction.c:1335
msgid "Use as _default"
msgstr "_Predeterminado"
-#: ../midori/sokoke.c:162
-#: ../midori/sokoke.c:174
-msgid "Could not run external program."
-msgstr "No se pudo ejecutar la aplicación externa."
-
-#: ../midori/sokoke.c:856
+#: ../midori/sokoke.c:1299
msgid "_Bookmark"
msgstr "_Marcador"
-#: ../midori/sokoke.c:858
+#: ../midori/sokoke.c:1301
msgid "Add Boo_kmark"
msgstr "Añadir _marcadores"
-#: ../midori/sokoke.c:859
+#: ../midori/sokoke.c:1302
msgid "_Console"
msgstr "_Consola"
-#: ../midori/sokoke.c:860
+#: ../midori/sokoke.c:1303
msgid "_Extensions"
msgstr "_Extensiones"
-#: ../midori/sokoke.c:861
+#: ../midori/sokoke.c:1304
msgid "_History"
msgstr "_Historial"
-#: ../midori/sokoke.c:862
+#: ../midori/sokoke.c:1305
msgid "_Homepage"
msgstr "_Página de inicio"
-#: ../midori/sokoke.c:863
+#: ../midori/sokoke.c:1306
msgid "_Userscripts"
msgstr "_Scripts de usuario"
-#: ../midori/sokoke.c:864
-msgid "User_styles"
-msgstr "_Estilos de usuario"
+#: ../midori/sokoke.c:1307
+msgid "New _Tab"
+msgstr "Nueva _pestaña"
-#: ../midori/sokoke.c:866
+#: ../midori/sokoke.c:1308
msgid "_Transfers"
msgstr "_Transferencias"
-#: ../midori/sokoke.c:867
+#: ../midori/sokoke.c:1309
msgid "Netscape p_lugins"
-msgstr "C_omplementos Netscape"
+msgstr "C_omplementos de Netscape"
-#: ../panels/midori-addons.c:95
-#: ../panels/midori-addons.c:141
+#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144
msgid "Userscripts"
msgstr "Scripts de usuario"
-#: ../panels/midori-addons.c:96
-#: ../panels/midori-addons.c:143
+#: ../panels/midori-addons.c:100
msgid "Userstyles"
msgstr "Estilos de usuario"
-#: ../panels/midori-bookmarks.c:108
+#: ../panels/midori-addons.c:305
+#, c-format
+msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s."
+msgstr "Copiar scripts de usuario en la carpeta %s y copiar estilos de usuario en la carpeta %s."
+
+#: ../panels/midori-addons.c:911
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "No se puede monitorizar el directorio '%s': %s"
+
+#: ../panels/midori-bookmarks.c:111
msgid "Bookmarks"
msgstr "Marcadores"
-#: ../panels/midori-bookmarks.c:239
+#: ../panels/midori-bookmarks.c:250
msgid "Edit the selected bookmark"
msgstr "Editar el marcador seleccionado"
-#: ../panels/midori-bookmarks.c:247
+#: ../panels/midori-bookmarks.c:258
msgid "Delete the selected bookmark"
msgstr "Borrar el marcador seleccionado"
-#: ../panels/midori-bookmarks.c:260
+#: ../panels/midori-bookmarks.c:278
msgid "Add a new folder"
msgstr "Añadir una nueva carpeta"
-#: ../panels/midori-bookmarks.c:592
+#: ../panels/midori-bookmarks.c:608
msgid "Separator"
msgstr "Separador"
@@ -1862,50 +2113,53 @@ msgstr "Consola"
msgid "Extensions"
msgstr "Extensiones"
-#: ../panels/midori-history.c:162
-msgid "Are you sure you want to remove all history items?"
-msgstr "¿Estás seguro de que quieres quitar todos los elementos del historial?"
+#: ../panels/midori-history.c:273
+msgid "Erroneous clock time"
+msgstr "Hora del reloj errónea"
-#: ../panels/midori-history.c:217
-msgid "Bookmark the selected history item"
-msgstr "Añadir a marcadores el elemento seleccionado del historial"
+#: ../panels/midori-history.c:274
+msgid "The clock time lies in the past. Please check the current date and time."
+msgstr "La hora del reloj está en el pasado. Por favor, compruebe la fecha y la hora."
-#: ../panels/midori-history.c:226
-msgid "Delete the selected history item"
-msgstr "Borrar del historial el elemento seleccionado"
-
-#: ../panels/midori-history.c:234
-msgid "Clear the entire history"
-msgstr "Vaciar el historial completo"
-
-#: ../panels/midori-history.c:601
+#: ../panels/midori-history.c:286
msgid "A week ago"
msgstr "Hace una semana"
-#: ../panels/midori-history.c:606
+#: ../panels/midori-history.c:288
#, 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:614
+#: ../panels/midori-history.c:291
msgid "Today"
msgstr "Hoy"
-#: ../panels/midori-history.c:616
+#: ../panels/midori-history.c:293
msgid "Yesterday"
msgstr "Ayer"
-#: ../panels/midori-plugins.c:87
-#: ../extensions/statusbar-features.c:108
-msgid "Netscape plugins"
-msgstr "Complementos Netscape"
+#: ../panels/midori-history.c:378
+msgid "Are you sure you want to remove all history items?"
+msgstr "¿Está seguro de que desea borrar todos los elementos del historial?"
-#: ../panels/midori-transfers.c:271
-#, c-format
-msgid "%s of %s"
-msgstr "%s de %s"
+#: ../panels/midori-history.c:438
+msgid "Bookmark the selected history item"
+msgstr "Añadir a marcadores el elemento seleccionado del historial"
+
+#: ../panels/midori-history.c:447
+msgid "Delete the selected history item"
+msgstr "Borrar el elemento seleccionado del historial"
+
+#: ../panels/midori-history.c:455
+msgid "Clear the entire history"
+msgstr "Vaciar todo el historial"
+
+#: ../panels/midori-history.c:953
+#: ../extensions/cookie-manager/cookie-manager-page.c:1144
+msgid "Filter:"
+msgstr "Filtro:"
#: ../panels/midori-transfers.c:479
msgid "Open Destination _Folder"
@@ -1913,119 +2167,147 @@ msgstr "Abrir la _carpeta de destino"
#: ../panels/midori-transfers.c:482
msgid "Copy Link Loc_ation"
-msgstr "Copiar _enlace"
+msgstr "Copiar destino del _enlace"
-#: ../katze/katze-http-auth.c:97
+#: ../katze/katze-http-auth.c:214
msgid "Authentication Required"
msgstr "Se requiere autentificación"
-#: ../katze/katze-http-auth.c:113
+#: ../katze/katze-http-auth.c:230
msgid ""
"A username and a password are required\n"
"to open this location:"
msgstr ""
-"Nombre de usuario y contraseña son requeridos\n"
+"Un nombre de usuario y contraseña son necesarios\n"
"para abrir ésta ubicación:"
-#: ../katze/katze-http-auth.c:127
+#: ../katze/katze-http-auth.c:244
msgid "Username"
msgstr "Nombre de usuario"
-#: ../katze/katze-http-auth.c:138
+#: ../katze/katze-http-auth.c:257
msgid "Password"
msgstr "Contraseña"
-#: ../katze/katze-throbber.c:828
+#: ../katze/katze-http-auth.c:272
+msgid "_Remember password"
+msgstr "_Recordar contraseña"
+
+#: ../katze/katze-throbber.c:842
#, c-format
msgid "Named icon '%s' couldn't be loaded"
msgstr "No se pudo cargar el ícono llamado «%s»"
-#: ../katze/katze-throbber.c:841
+#: ../katze/katze-throbber.c:855
#, c-format
msgid "Stock icon '%s' couldn't be loaded"
msgstr "No se pudo cargar el ícono stock «%s»"
-#: ../katze/katze-throbber.c:907
+#: ../katze/katze-throbber.c:923
msgid "Animation frames are broken"
msgstr "Los cuadros de animación están rotos"
-#: ../katze/katze-utils.c:200
-#: ../katze/katze-utils.c:407
+#: ../katze/katze-utils.c:495 ../katze/katze-utils.c:890
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "La propiedad «%s» no es válida para %s"
-#: ../katze/katze-utils.c:235
-#: ../katze/katze-utils.c:264
+#: ../katze/katze-utils.c:541 ../katze/katze-utils.c:570
msgid "Choose file"
msgstr "Elegir archivo"
-#: ../katze/katze-utils.c:250
+#: ../katze/katze-utils.c:556
msgid "Choose folder"
msgstr "Elegir carpeta"
-#: ../extensions/adblock.c:167
+#: ../katze/katze-preferences.c:95
+#, c-format
+msgid "Preferences for %s"
+msgstr "Preferencias de %s"
+
+#: ../extensions/adblock.c:409
msgid "Configure Advertisement filters"
msgstr "Configurar los filtros de publicidad"
-#: ../extensions/adblock.c:304
+#: ../extensions/adblock.c:441
+#, c-format
+msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s."
+msgstr "Escriba la dirección de una lista de filtros preconfigurados en el cuadro de texto y haga clic en \"Añadir\" para añadirlo a la lista. Puede encontrar más listas en %s."
+
+#: ../extensions/adblock.c:581
msgid "Configure _Advertisement filters..."
msgstr "Configurar filtros de p_ublicidad..."
-#: ../extensions/adblock.c:562
+#: ../extensions/adblock.c:835
+msgid "Edit rule"
+msgstr "Editar regla"
+
+#: ../extensions/adblock.c:848
+msgid "_Rule:"
+msgstr "_Regla:"
+
+#: ../extensions/adblock.c:902
+msgid "Bl_ock image"
+msgstr "Bl_oquear imagen"
+
+#: ../extensions/adblock.c:907
+msgid "Bl_ock link"
+msgstr "Bl_oquear enlace"
+
+#: ../extensions/adblock.c:1481
msgid "Advertisement blocker"
msgstr "Bloqueador de publicidad"
-#: ../extensions/adblock.c:563
+#: ../extensions/adblock.c:1482
msgid "Block advertisements according to a filter list"
msgstr "Bloquear publicidad de acuerdo a una lista de filtros"
-#: ../extensions/colorful-tabs.c:115
-msgid "Tint tabs distinctly"
-msgstr "Pestañas de distintos colores"
-
-#: ../extensions/colorful-tabs.c:151
+#: ../extensions/colorful-tabs.c:204
msgid "Colorful Tabs"
msgstr "Pestañas de colores"
-#: ../extensions/colorful-tabs.c:152
+#: ../extensions/colorful-tabs.c:205
msgid "Tint each tab distinctly"
msgstr "Colorear pestañas de distintos colores"
-#: ../extensions/cookie-manager/cookie-manager-page.c:79
+#: ../extensions/cookie-manager/cookie-manager-page.c:82
#: ../extensions/cookie-manager/main.c:56
msgid "Cookie Manager"
-msgstr "Gestor de huellas"
+msgstr "Gestor de cookies"
-#: ../extensions/cookie-manager/cookie-manager-page.c:111
+#: ../extensions/cookie-manager/cookie-manager-page.c:112
+msgid "Delete All"
+msgstr "Eliminar todo"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:114
msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter."
-msgstr "Elimina todas las huellas. Si se establece un filtro, sólo se eliminarán las \"huellas\" que coincidan con el filtro."
+msgstr "Elimina todas las cookies. Si se establece un filtro, sólo se eliminarán las \"cookies\" que coincidan con el filtro."
-#: ../extensions/cookie-manager/cookie-manager-page.c:126
+#: ../extensions/cookie-manager/cookie-manager-page.c:129
msgid "Expand All"
msgstr "Expandir todo"
-#: ../extensions/cookie-manager/cookie-manager-page.c:133
+#: ../extensions/cookie-manager/cookie-manager-page.c:136
msgid "Collapse All"
msgstr "Contraer todo"
-#: ../extensions/cookie-manager/cookie-manager-page.c:460
+#: ../extensions/cookie-manager/cookie-manager-page.c:578
msgid "Do you really want to delete all cookies?"
-msgstr "¿Está seguro que desea eliminar todas las huellas?"
+msgstr "¿Está seguro que desea eliminar todas las cookies?"
-#: ../extensions/cookie-manager/cookie-manager-page.c:462
+#: ../extensions/cookie-manager/cookie-manager-page.c:580
msgid "Question"
msgstr "Pregunta"
-#: ../extensions/cookie-manager/cookie-manager-page.c:471
+#: ../extensions/cookie-manager/cookie-manager-page.c:589
msgid "Only cookies which match the filter will be deleted."
-msgstr "Sólo se eliminarán las huellas visibles que coinciden con el filtro."
+msgstr "Sólo se eliminarán las cookies visibles que coinciden con el filtro."
-#: ../extensions/cookie-manager/cookie-manager-page.c:539
+#: ../extensions/cookie-manager/cookie-manager-page.c:677
msgid "At the end of the session"
msgstr "Al final de la sesión"
-#: ../extensions/cookie-manager/cookie-manager-page.c:542
+#: ../extensions/cookie-manager/cookie-manager-page.c:680
#, c-format
msgid ""
"Host: %s\n"
@@ -2042,49 +2324,54 @@ msgstr ""
"Seguro: %s\n"
"Expira: %s"
-#: ../extensions/cookie-manager/cookie-manager-page.c:548
+#: ../extensions/cookie-manager/cookie-manager-page.c:686
msgid "Yes"
msgstr "Si"
-#: ../extensions/cookie-manager/cookie-manager-page.c:548
+#: ../extensions/cookie-manager/cookie-manager-page.c:686
msgid "No"
msgstr "No"
-#: ../extensions/cookie-manager/cookie-manager-page.c:811
+#: ../extensions/cookie-manager/cookie-manager-page.c:700
+#, c-format
+msgid ""
+"Domain: %s\n"
+"Cookies: %d"
+msgstr ""
+"Dominio: %s\n"
+"Cookies: %d"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1030
msgid "Name"
msgstr "Nombre"
-#: ../extensions/cookie-manager/cookie-manager-page.c:862
+#: ../extensions/cookie-manager/cookie-manager-page.c:1083
msgid "_Expand All"
msgstr "_Expandir todo"
-#: ../extensions/cookie-manager/cookie-manager-page.c:870
+#: ../extensions/cookie-manager/cookie-manager-page.c:1091
msgid "_Collapse All"
msgstr "_Contraer todo"
-#: ../extensions/cookie-manager/cookie-manager-page.c:923
-msgid "Filter:"
-msgstr "Filtro:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:928
+#: ../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 "Introduzca una cadena de filtro para mostrar sólo las huellas cuyo nombre o dominio coincide con el filtro ingresado"
+msgstr "Introduzca una cadena de filtro para mostrar sólo las cookies cuyo nombre o dominio coincide con el filtro ingresado"
#: ../extensions/cookie-manager/main.c:40
msgid "_Cookie Manager"
-msgstr "_Gestor de huellas"
+msgstr "_Gestor de cookies"
#: ../extensions/cookie-manager/main.c:57
msgid "List, view and delete cookies"
-msgstr "Listar, ver y eliminar huellas"
+msgstr "Listar, ver y eliminar cookies"
-#: ../extensions/feed-panel/feed-atom.c:242
+#: ../extensions/feed-panel/feed-atom.c:209
msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr "No se ha podido encontrar los elementos necesarios Atom \"entry\" en los datos XML."
+msgstr "No se han podido encontrar elementos necesarios de tipo \"entry\" Atom en los datos XML."
-#: ../extensions/feed-panel/feed-atom.c:348
+#: ../extensions/feed-panel/feed-atom.c:315
msgid "Failed to find required Atom \"feed\" elements in XML data."
-msgstr "No se ha podido encontrar los elementos necesarios Atom \"feed\" en los datos XML."
+msgstr "No se ha podido encontrar los elementos necesarios de tipo \"feed\" Atom en los datos XML."
#. i18n: The local date a feed was last updated
#: ../extensions/feed-panel/feed-panel.c:399
@@ -2093,40 +2380,40 @@ msgctxt "Feed"
msgid "Last updated: %s."
msgstr "Última actualización: %s."
-#: ../extensions/feed-panel/feed-panel.c:664
+#: ../extensions/feed-panel/feed-panel.c:671
msgid "Feeds"
msgstr "Canales"
-#: ../extensions/feed-panel/feed-panel.c:717
+#: ../extensions/feed-panel/feed-panel.c:724
msgid "Add new feed"
msgstr "Añadir nuevo canal"
-#: ../extensions/feed-panel/feed-panel.c:724
+#: ../extensions/feed-panel/feed-panel.c:731
msgid "Delete feed"
msgstr "Eliminar canal"
-#: ../extensions/feed-panel/feed-panel.c:807
+#: ../extensions/feed-panel/feed-panel.c:814
msgid "_Feeds"
msgstr "_Canales"
-#: ../extensions/feed-panel/feed-parse.c:185
+#: ../extensions/feed-panel/feed-parse.c:192
#, c-format
msgid "Failed to find root element in feed XML data."
msgstr "No se ha podido encontrar el elemento raíz en el canal de información XML."
-#: ../extensions/feed-panel/feed-parse.c:225
+#: ../extensions/feed-panel/feed-parse.c:232
#, c-format
msgid "Unsupported feed format."
msgstr "Formato de canal no soportado."
-#: ../extensions/feed-panel/feed-parse.c:255
+#: ../extensions/feed-panel/feed-parse.c:262
#, c-format
msgid "Failed to parse XML feed: %s"
msgstr "No se ha podido analizar el canal XML: %s"
#: ../extensions/feed-panel/feed-rss.c:46
msgid "Failed to find \"channel\" element in RSS XML data."
-msgstr "No se ha podido encontrar el elemento \"channel\" en lo datos XML del RSS"
+msgstr "No se ha podido encontrar el elemento de tipo \"channel\" en lo datos XML del RSS"
#: ../extensions/feed-panel/feed-rss.c:51
msgid "Unsupported RSS version found."
@@ -2140,59 +2427,84 @@ msgstr "No se ha podido encontrar los elementos necesarios RSS \"item\" en los d
msgid "Failed to find required RSS \"channel\" elements in XML data."
msgstr "No se ha podido encontrar los elementos necesarios RSS \"channel\" en los datos XML."
-#: ../extensions/feed-panel/main.c:114
+#: ../extensions/feed-panel/main.c:132
+msgid "Error"
+msgstr "Error"
+
+#: ../extensions/feed-panel/main.c:134
#, c-format
msgid "Feed '%s' already exists"
msgstr "El canal '%s' ya existe"
-#: ../extensions/feed-panel/main.c:191
+#: ../extensions/feed-panel/main.c:211
#, c-format
msgid "Error loading feed '%s'"
msgstr "Error al cargar el canal '%s'"
-#: ../extensions/feed-panel/main.c:331
-msgid "New feed"
-msgstr "Nuevo canal"
-
-#: ../extensions/feed-panel/main.c:489
+#: ../extensions/feed-panel/main.c:522
msgid "Feed Panel"
msgstr "Panel de canales"
-#: ../extensions/feed-panel/main.c:490
+#: ../extensions/feed-panel/main.c:523
msgid "Read Atom/ RSS feeds"
msgstr "Lector de canales Atom/RSS"
-#: ../extensions/mouse-gestures/main.c:236
+#: ../extensions/formhistory.c:144
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr "Fallo al añadir valor de formulario: %s\n"
+
+#: ../extensions/formhistory.c:510
+msgid "Stores history of entered form data"
+msgstr "Almacena el historial de datos introducidos en formularios"
+
+#: ../extensions/formhistory.c:514
+#, c-format
+msgid "Not available: %s"
+msgstr "No disponible: %s"
+
+#: ../extensions/formhistory.c:515
+msgid "Resource files not installed"
+msgstr "Archivos de recursos no instalados"
+
+#: ../extensions/formhistory.c:521
+msgid "Form history filler"
+msgstr "Completador de historial de formularios"
+
+#: ../extensions/mouse-gestures.c:288
msgid "Mouse Gestures"
msgstr "Gestos de ratón"
-#: ../extensions/mouse-gestures/main.c:237
+#: ../extensions/mouse-gestures.c:289
msgid "Control Midori by moving the mouse"
msgstr "Controlar Midori moviendo el ratón"
#. i18n: A panel showing a user specified web page
-#: ../extensions/page-holder.c:129
-#: ../extensions/page-holder.c:177
+#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177
msgid "Pageholder"
-msgstr "Anclar página"
+msgstr "Álbum de páginas"
#: ../extensions/page-holder.c:161
msgid "_Pageholder"
-msgstr "_Anclar página"
+msgstr "Álbum de _páginas"
-#: ../extensions/shortcuts.c:172
+#: ../extensions/page-holder.c:178
+msgid "Keep one or multiple pages open in parallel to your tabs"
+msgstr "Mantener una o múltiples páginas abiertas en paralelo junto con las pestañas"
+
+#: ../extensions/shortcuts.c:170
msgid "Customize Keyboard shortcuts"
msgstr "Personalizar los atajos del teclado"
-#: ../extensions/shortcuts.c:264
+#: ../extensions/shortcuts.c:276
msgid "Customize Sh_ortcuts..."
msgstr "Personalizar los ac_cesos directos..."
-#: ../extensions/shortcuts.c:303
+#: ../extensions/shortcuts.c:315
msgid "Shortcuts"
msgstr "Accesos directos"
-#: ../extensions/shortcuts.c:304
+#: ../extensions/shortcuts.c:316
msgid "View and edit keyboard shortcuts"
msgstr "Ver y editar los atajos de teclado"
@@ -2204,115 +2516,216 @@ msgstr "Imágenes"
msgid "Scripts"
msgstr "Scripts"
+#: ../extensions/statusbar-features.c:108
+msgid "Netscape plugins"
+msgstr "Complementos de Netscape"
+
#: ../extensions/statusbar-features.c:149
msgid "Statusbar Features"
msgstr "Barra de funcionalidades"
#: ../extensions/statusbar-features.c:150
msgid "Easily toggle features on web pages on and off"
-msgstr "Alternar fácilmente las características de páginas web dentro y fuera"
+msgstr "Activar y desactivar fácilmente las características de páginas web"
-#: ../extensions/tab-panel.c:383
-#: ../extensions/tab-panel.c:443
+#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625
msgid "Tab Panel"
msgstr "Panel de pestañas"
-#: ../extensions/tab-panel.c:427
+#: ../extensions/tab-panel.c:609
msgid "T_ab Panel"
msgstr "Panel de p_estañas"
-#: ../extensions/tab-panel.c:444
+#: ../extensions/tab-panel.c:626
msgid "Show tabs in a vertical panel"
msgstr "Mostrar las pestañas en un panel vertical"
-#: ../extensions/toolbar-editor.c:391
+#: ../extensions/tab-switcher.c:395
+msgid "Tab History List"
+msgstr "Lista de historial de pestañas"
+
+#: ../extensions/tab-switcher.c:396
+msgid "Allows to switch tabs by choosing from a list sorted by last usage"
+msgstr "Permite cambiar de pestaña eligiéndola de una lista ordenada por último uso"
+
+#: ../extensions/toolbar-editor.c:389
msgid "Customize Toolbar"
msgstr "Personalizar la barra de tareas"
-#: ../extensions/toolbar-editor.c:407
+#: ../extensions/toolbar-editor.c:405
msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop."
msgstr "Seleccione los elementos que se mostrarán en la barra de herramientas. Los elementos pueden ser reordenados arrastrando y soltando."
-#: ../extensions/toolbar-editor.c:423
+#: ../extensions/toolbar-editor.c:421
msgid "Available Items"
msgstr "Elementos disponibles"
-#: ../extensions/toolbar-editor.c:444
+#: ../extensions/toolbar-editor.c:442
msgid "Displayed Items"
msgstr "Elementos utilizados"
-#: ../extensions/toolbar-editor.c:579
+#: ../extensions/toolbar-editor.c:577
msgid "Customize _Toolbar..."
msgstr "Personalizar la barra de _tareas..."
-#: ../extensions/toolbar-editor.c:611
+#: ../extensions/toolbar-editor.c:608
msgid "Toolbar Editor"
msgstr "Editor de la barra de herramientas"
-#: ../extensions/toolbar-editor.c:612
+#: ../extensions/toolbar-editor.c:609
msgid "Easily edit the toolbar layout"
msgstr "Editar fácilmente el diseño de la barra de herramienta"
+#: ../extensions/web-cache.c:465
+msgid "Cache HTTP communication on disk"
+msgstr "Cachear tráfico HTTP en disco"
+
+#~ msgid "Open _Link"
+#~ msgstr "Abrir en_lace"
+
+#~ msgid "Open Image in New Wi_ndow"
+#~ msgstr "Abrir imagen en nueve ve_ntana"
+
+#~ msgid "View Selection Source"
+#~ msgstr "Ver código fuente de la selección"
+
+#~ msgid "View the source code of the selection"
+#~ msgstr "Ver el código fuente de la selección"
+
+#~ msgid "Show panel _titles"
+#~ msgstr "Mostrar el panel de _títulos"
+
+#~ msgid "Options"
+#~ msgstr "Opciones"
+
+#~ msgid "Remember last form inputs"
+#~ msgstr "Recordar lo que se haya ingresado en formularios"
+
+#~ msgid "Whether the last form inputs are saved"
+#~ msgstr "Si se desea que las últimas entradas de formulario sean recordadas"
+
+#~ msgid "Cache size"
+#~ msgstr "Tamaño del caché"
+
+#~ msgid "The allowed size of the cache"
+#~ msgstr "Tamaño asignado a la memoria caché"
+
+#~ msgid "Encoding"
+#~ msgstr "Codificación"
+
+#~ msgid "The character encoding to use by default"
+#~ msgstr "Codificación de caracteres a utilizar por defecto"
+
+#~ msgid "Shrink images automatically"
+#~ msgstr "Reducir imágenes automáticamente"
+
+#~ msgid "Automatically shrink standalone images to fit"
+#~ msgstr "Reducir imágenes automáticamente independientemente si caben"
+
+#~ msgid "Resizable text areas"
+#~ msgstr "Áreas de texto dimensionables"
+
+#~ msgid "Whether text areas are resizable"
+#~ msgstr "Si se desea que las áreas de texto sean dimensionables"
+
+#~ msgid "Enable developer tools"
+#~ msgstr "Habilitar herramientas de desarrollo"
+
+#~ msgid "Enable special extensions for developers"
+#~ msgstr "Habilitar extensiones especiales para desarrolladores"
+
+#~ msgid "MB"
+#~ msgstr "MB"
+
+#~ msgid "User_styles"
+#~ msgstr "_Estilos de usuario"
+
+#~ msgid "Tint tabs distinctly"
+#~ msgstr "Pestañas de distintos colores"
+
#~ msgid "_Closed Tabs and Windows"
#~ msgstr "_Pestañas y ventanas cerradas"
+
#~ msgid "Last open pages"
#~ msgstr "Últimas páginas visitadas"
+
#~ msgid "Both"
#~ msgstr "Ambos"
+
#~ msgid "Both horizontal"
#~ msgstr "Ambos en horizontal"
+
#~ msgid "Load on Startup"
#~ msgstr "Al iniciar Midori cargar:"
-#~ msgid "Download Folder"
-#~ msgstr "Carpeta de descargas"
+
#~ msgid "Configure _Toolbar..."
#~ msgstr "Configurar la _Barra de tareas"
+
#~ msgid "_Quick Find"
#~ msgstr "Búsqueda _rápida"
+
#~ msgid "Quickly jump to a word or phrase"
#~ msgstr "Saltar rápidamente a una palabra o una frase"
-#~ msgid "Whether to detach the chosen panel from the window"
-#~ msgstr "Separar el panel de la ventana"
+
#~ msgid "Search"
#~ msgstr "Buscar"
+
#~ msgid "Warning: You are using a superuser account!"
#~ msgstr "Advertencia: Usted está utilizando una cuenta de superusuario!"
+
#~ msgid "_Enable"
#~ msgstr "_Activar"
+
#~ msgid "Enable"
#~ msgstr "Activar"
+
#~ msgid "_Disable"
#~ msgstr "_Desactivar"
+
#~ msgid "Disable"
#~ msgstr "Desactivar"
+
#~ msgid "%d days ago"
#~ msgstr "Hace %d días"
+
#~ msgid "P_lugins"
#~ msgstr "C_omplementos"
+
#~ msgid "Plugins"
#~ msgstr "Complementos"
+
#~ msgid "Source"
#~ msgstr "Código fuente"
+
#~ msgid "_Icon (name or file):"
#~ msgstr "_Icono (nombre o archivo):"
+
#~ msgid "%s has no property '%s'"
#~ msgstr "%s no tiene la propiedad «%s»"
+
#~ msgid "%s cannot be assigned to %s.%s"
#~ msgstr "%s no puede ser asignado a %s.%s"
+
#~ msgid "%s.%s cannot be accessed"
#~ msgstr "%s.%s no se puede acceder"
+
#~ msgid "Manage search engines"
#~ msgstr "Administrar los motores de búsqueda"
+
#~ msgid "URIs"
#~ msgstr "URIs"
+
#~ msgid "[URIs]"
#~ msgstr "[URIs]"
+
#~ msgid "_URL:"
#~ msgstr "_URL "
+
#~ msgid "Root"
#~ msgstr "Raíz"
+
#~ msgid "HTTP Proxy"
#~ msgstr "HTTP Proxy"
+
#~ msgid "Open URL in New _Tab"
#~ msgstr "Abrir URL en una pestaña _nueva"
-
diff --git a/po/fi.po b/po/fi.po
index ea932e92..8507853c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,1410 +1,2621 @@
-# Finnish translations for midori package.
-# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER
+# Finnish translations for Midori.
+# Copyright (C) 2007-2010 Christian Dywan
# This file is distributed under the same license as the midori package.
# Elias Julkunen , 2008
+# Jari Rahkonen , 2010
#
msgid ""
msgstr ""
"Project-Id-Version: midori 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-06 05:25+0100\n"
-"PO-Revision-Date: 2008-12-20 20:16+0200\n"
-"Last-Translator: Elias Julkunen \n"
-"Language-Team: Finnish \n"
+"POT-Creation-Date: 2010-04-14 16:07+0000\n"
+"PO-Revision-Date: 2010-04-14 19:49+0300\n"
+"Last-Translator: Jari Rahkonen \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"
-#: ../midori.desktop.in.h:1
+#: ../data/midori.desktop.in.h:1
msgid "Lightweight web browser"
msgstr "Kevyt verkkoselain"
-#: ../midori.desktop.in.h:2
-#: ../midori/main.c:1338
-#: ../midori/main.c:1347
-#: ../midori/main.c:1370
-#: ../midori/main.c:1394
+#: ../data/midori.desktop.in.h:2 ../midori/main.c:1339 ../midori/main.c:1667
+#: ../midori/main.c:1675 ../midori/main.c:1691
+#: ../midori/midori-websettings.c:318
msgid "Midori"
msgstr "Midori"
-#: ../midori.desktop.in.h:3
+#: ../data/midori.desktop.in.h:3
msgid "Web Browser"
msgstr "Verkkoselain"
-#: ../midori/main.c:86
-msgid "_Bookmark"
-msgstr "_Kirjanmerkki"
-
-#: ../midori/main.c:87
-#: ../midori/midori-browser.c:3744
-msgid "_Bookmarks"
-msgstr "_Kirjanmerkit"
-
-#: ../midori/main.c:88
-msgid "_Add Bookmark"
-msgstr "_Lisää kirjanmerkki"
-
-#: ../midori/main.c:89
-msgid "_Console"
-msgstr "_Konsoli"
-
-#: ../midori/main.c:90
-msgid "_Extensions"
-msgstr "_Liitännäiset"
-
-#: ../midori/main.c:91
-msgid "_History"
-msgstr "_Historia"
-
-#: ../midori/main.c:92
-msgid "_Homepage"
-msgstr "_Kotisivu"
-
-#: ../midori/main.c:93
-msgid "_Userscripts"
-msgstr "Käyttäjän _skriptit"
-
-#: ../midori/main.c:94
-msgid "User_styles"
-msgstr "Käyttäjän _tyylit"
-
-#: ../midori/main.c:95
-msgid "New _Tab"
-msgstr "Uusi _välilehti"
-
-#: ../midori/main.c:96
-msgid "_Transfers"
-msgstr "_Siirrot"
-
-#: ../midori/main.c:97
-msgid "_Closed Tabs and Windows"
-msgstr "_Suljetut välilehdet ja ikkunat"
-
-#: ../midori/main.c:98
-msgid "New _Window"
-msgstr "Uusi _ikkuna"
-
-#: ../midori/main.c:143
+#: ../midori/main.c:103
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
-msgstr "Asetuksia ei voitu ladata: %s\n"
+msgstr "Asetusten lataus epäonnistui: %s\n"
-#: ../midori/main.c:198
+#: ../midori/main.c:152
#, c-format
msgid "Value '%s' is invalid for %s"
-msgstr "Arvo ”%s” ei kelpaa kohteelle %s"
+msgstr "\"%s\" ei kelpaa asetuksen %s arvoksi"
-#: ../midori/main.c:205
-#: ../midori/main.c:275
+#: ../midori/main.c:159 ../midori/main.c:245
#, c-format
msgid "Invalid configuration value '%s'"
-msgstr "Epäkelpo asetusarvo ”%s”"
+msgstr "Asetusarvo \"%s\" ei kelpaa"
-#: ../midori/main.c:532
-msgid "File not found."
-msgstr "Tiedostoa ei löytynyt"
-
-#: ../midori/main.c:540
-#: ../midori/main.c:549
-msgid "Malformed document."
-msgstr "Virheellinen dokumentti."
-
-#: ../midori/main.c:571
-#: ../midori/main.c:603
+#: ../midori/main.c:371 ../extensions/formhistory.c:446
#, c-format
msgid "Failed to open database: %s\n"
-msgstr "Tietokantaa ei voitu avata: %s\n"
-
-#: ../midori/main.c:657
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Historiatietuetta ei voitu poistaa: %s\n"
-
-#: ../midori/main.c:681
-#, c-format
-msgid "Failed to clear history: %s\n"
-msgstr "Historiaa ei voitu tyhjentää: %s\n"
-
-#: ../midori/main.c:714
-#: ../midori/main.c:728
-#, c-format
-msgid "Failed to add history item: %s\n"
-msgstr "Historiatietuetta ei voitu lisätä: %s\n"
+msgstr "Tietokannan avaus epäonnistui: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:844
+#: ../midori/main.c:426
#, c-format
msgid "Failed to remove old history items: %s\n"
-msgstr "Vanhoja historiatietueita ei voitfu poistaa: %s\n"
+msgstr "Vanhojen sivuhistorian kohteiden poistaminen epäonnistui: %s\n"
+
+#: ../midori/main.c:446
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "Asetusten tallennus epäonnistui. %s"
+
+#: ../midori/main.c:484
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "Hakukoneiden tallennus epäonnistui. %s"
+
+#: ../midori/main.c:503 ../midori/main.c:553 ../midori/main.c:573
+#, c-format
+msgid "The bookmarks couldn't be saved. %s"
+msgstr "Kirjanmerkkien tallennus epäonnistui. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/main.c:603 ../midori/main.c:626
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "Roskakorin tallennus epäonnistui. %s"
+
+#: ../midori/main.c:690 ../midori/main.c:927
+#, c-format
+msgid "The session couldn't be saved. %s"
+msgstr "Istunnon tallennus epäonnistui. %s"
+
+#: ../midori/main.c:872
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"Juurisertifikaattia ei löydy. SSL-sertifikaatteja ei voi todentaa."
+
+#: ../midori/main.c:961
+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."
#: ../midori/main.c:976
-#: ../midori/sokoke.c:459
+msgid "Modify _preferences"
+msgstr "Muokkaa _asetuksia"
+
+#: ../midori/main.c:980
+msgid "Reset the last _session"
+msgstr "Palauta _edellinen istunto"
+
+#: ../midori/main.c:985
+msgid "Disable all _extensions"
+msgstr "Poista liitä_nnäiset käytöstä"
+
+#: ../midori/main.c:1220 ../midori/main.c:1940
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "Istunnon lataus epäonnistui: %s\n"
+
+#: ../midori/main.c:1339
+msgid "No filename specified"
+msgstr "Tiedostonimeä ei annettu"
+
+#: ../midori/main.c:1358
+msgid "An unknown error occured."
+msgstr "Tapahtui tuntematon virhe."
+
+#: ../midori/main.c:1389
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "Kuva tallennettu osoitteeseen: %s\n"
+
+#: ../midori/main.c:1560
+msgid "Run ADDRESS as a web application"
+msgstr "Suorita OSOITE web-sovelluksena"
+
+#: ../midori/main.c:1560
+msgid "ADDRESS"
+msgstr "OSOITE"
+
+#: ../midori/main.c:1563
+msgid "Use FOLDER as configuration folder"
+msgstr "Lataa asetukset kohteesta KANSIO"
+
+#: ../midori/main.c:1563
+msgid "FOLDER"
+msgstr "KANSIO"
+
+#: ../midori/main.c:1566
+msgid "Show a diagnostic dialog"
+msgstr "Näytä vianetsintädialogi"
+
+#: ../midori/main.c:1568
+msgid "Run the specified filename as javascript"
+msgstr "Suorita annettu tiedostonimi javascriptinä"
+
+#: ../midori/main.c:1571
+msgid "Take a snapshot of the specified URI"
+msgstr "Kaappaa kuva kohteen URI sisällöstä"
+
+#: ../midori/main.c:1574
+msgid "Execute the specified command"
+msgstr "Suorita määritetty komento"
+
+#: ../midori/main.c:1576
+msgid "Display program version"
+msgstr "Näytä sovelluksen versio"
+
+#: ../midori/main.c:1578
+msgid "Addresses"
+msgstr "Osoitteet"
+
+#: ../midori/main.c:1580
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Estä säännöllistä LAUSEKEtta vastaavat URIt"
+
+#: ../midori/main.c:1580
+msgid "PATTERN"
+msgstr "LAUSEKE"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:1584
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Palaa alkutilaan, kun käyttämättä SEKUNNIT sekuntia"
+
+#: ../midori/main.c:1584
+msgid "SECONDS"
+msgstr "SEKUNNIT"
+
+#: ../midori/main.c:1664
+msgid "[Addresses]"
+msgstr "[Osoitteet]"
+
+#: ../midori/main.c:1692
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Kommentit, ehdotukset ja vikailmoitukset osoitteeseen:"
+
+#: ../midori/main.c:1694
+msgid "Check for new versions at:"
+msgstr "Uudet versiot löydät osoitteesta:"
+
+#: ../midori/main.c:1791
+msgid "The specified configuration folder is invalid."
+msgstr "Määritetty asetuskansio ei kelpaa."
+
+#: ../midori/main.c:1839
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "Midori on jo käynnissä, muttei vastaa.\n"
+
+#: ../midori/main.c:1894
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "Hakukoneiden lataus epäonnistui. %s\n"
+
+#: ../midori/main.c:1923
+#, c-format
+msgid "The bookmarks couldn't be loaded: %s\n"
+msgstr "Kirjanmerkkien lataus epäonnistui: %s\n"
+
+#: ../midori/main.c:1955
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "Roskakorin lataus epäonnistui: %s\n"
+
+#: ../midori/main.c:1969
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "Historian lataus epäonnistui: %s\n"
+
+#: ../midori/main.c:1983
+msgid "The following errors occured:"
+msgstr "Seuraavat virheet tapahtuivat:"
+
+#: ../midori/main.c:1999
+msgid "_Ignore"
+msgstr "_Ohita"
+
+#: ../midori/midori-array.c:428
+msgid "File not found."
+msgstr "Tiedostoa ei löytynyt."
+
+#: ../midori/midori-array.c:462 ../midori/midori-array.c:485
+#: ../midori/midori-array.c:495
+msgid "Malformed document."
+msgstr "Virheellinen asiakirja."
+
+#: ../midori/midori-array.c:504
+msgid "Unrecognized bookmark format."
+msgstr "Tunnistamaton kirjanmerkin muoto."
+
+#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120
#, c-format
msgid "Writing failed."
msgstr "Kirjoitus epäonnistui."
-#: ../midori/main.c:1000
-#: ../midori/midori-preferences.c:350
-msgid "Transfers"
-msgstr "Siirrot"
-
-#: ../midori/main.c:1040
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "Istuntoa ei voitu tallentaa. %s"
-
-#: ../midori/main.c:1297
-msgid "Run the specified filename as javascript"
-msgstr "Suorita annettu tiedostonimi javascriptinä"
-
-#: ../midori/main.c:1299
-msgid "Display program version"
-msgstr "Näytä sovelluksen versio"
-
-#: ../midori/main.c:1301
-msgid "URIs"
-msgstr "URI-osoitteet"
-
-#: ../midori/main.c:1335
-msgid "[URIs]"
-msgstr "[URI-osoitteet]"
-
-#: ../midori/main.c:1371
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Voit lähettää kommentteja, ehdotuksia ja tietoa ohjelmavirheistä osoitteeseen:"
-
-#: ../midori/main.c:1373
-msgid "Check for new versions at:"
-msgstr "Kaäy katsomassa uusia versioita osoittesta:"
-
-#: ../midori/main.c:1394
-msgid "No filename specified"
-msgstr "Tiedostonimeä ei annettu"
-
-#: ../midori/main.c:1411
-#, c-format
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr "Midori on jo käynnissä, muttei vastaa.\n"
-
-#: ../midori/main.c:1447
-#, c-format
-msgid "The bookmarks couldn't be loaded: %s\n"
-msgstr "Kirjanmerkkejä ei voitu ladata: %s\n"
-
-#: ../midori/main.c:1463
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "Istuntoa ei voitu ladata: %s\n"
-
-#: ../midori/main.c:1477
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
-msgstr "Roskakoria ei voitu ladata: %s\n"
-
-#: ../midori/main.c:1491
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
-msgstr "Historiaa ei voitu ladata: %s\n"
-
-#: ../midori/main.c:1504
-msgid "The following errors occured:"
-msgstr "Seuraavat virheet tapahtuivat:"
-
-#: ../midori/main.c:1520
-msgid "_Ignore"
-msgstr "_Ohita"
-
-#: ../midori/main.c:1688
-#, c-format
-msgid "The search engines couldn't be saved. %s"
-msgstr "Hakukoneita ei voitu tallentaa. %s"
-
-#: ../midori/main.c:1698
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Kirjanmerkkejä ei voitu tallentaa. %s"
-
-#: ../midori/main.c:1707
-#, c-format
-msgid "The trash couldn't be saved. %s"
-msgstr "Roskakoria ei voitu tallentaa. %s"
-
-#: ../midori/main.c:1715
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "Asetuksia ei voitu tallentaa. %s"
-
-#: ../midori/midori-browser.c:249
-#: ../midori/midori-browser.c:3130
-#: ../midori/midori-browser.c:3136
+#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5430
+#: ../midori/midori-browser.c:5436
msgid "Reload the current page"
msgstr "Lataa nykyinen sivu uudelleen"
-#: ../midori/midori-browser.c:261
-#: ../midori/midori-browser.c:3133
+#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5433
msgid "Stop loading the current page"
msgstr "Keskeytä nykyisen sivun lataaminen"
-#: ../midori/midori-browser.c:319
+#: ../midori/midori-browser.c:454
#, c-format
msgid "%d%% loaded"
msgstr "%d %% ladattu"
-#: ../midori/midori-browser.c:342
+#: ../midori/midori-browser.c:492
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "Otsikon päivitys epäonnistui: %s\n"
+
+#: ../midori/midori-browser.c:506
#, c-format
msgid "Unexpected action '%s'."
-msgstr "Odottamaton toimenpide ”%s”."
+msgstr "Odottamaton toimenpide \"%s\"."
-#: ../midori/midori-browser.c:508
+#: ../midori/midori-browser.c:713
+msgid "New folder"
+msgstr "Uusi kansio"
+
+#: ../midori/midori-browser.c:713
+msgid "Edit folder"
+msgstr "Muokkaa kansiota"
+
+#: ../midori/midori-browser.c:715
msgid "New bookmark"
msgstr "Uusi kirjanmerkki"
-#: ../midori/midori-browser.c:508
+#: ../midori/midori-browser.c:715
msgid "Edit bookmark"
msgstr "Muokkaa kirjanmerkkiä"
-#: ../midori/midori-browser.c:530
+#: ../midori/midori-browser.c:746
msgid "_Title:"
msgstr "_Nimi:"
-#: ../midori/midori-browser.c:543
-#: ../midori/midori-searchaction.c:841
+#: ../midori/midori-browser.c:759 ../midori/midori-searchaction.c:961
msgid "_Description:"
-msgstr "_Kuvaus:"
+msgstr "Ku_vaus:"
-#: ../midori/midori-browser.c:562
-#: ../midori/midori-searchaction.c:855
-msgid "_URL:"
-msgstr "_URL-osoite:"
+#: ../midori/midori-browser.c:778 ../midori/midori-searchaction.c:975
+#: ../extensions/feed-panel/main.c:376
+msgid "_Address:"
+msgstr "_Osoite:"
-#: ../midori/midori-browser.c:578
+#: ../midori/midori-browser.c:808 ../midori/midori-browser.c:4585
msgid "_Folder:"
msgstr "_Kansio:"
-#: ../midori/midori-browser.c:582
-msgid "Root"
-msgstr "Juuri"
+#: ../midori/midori-browser.c:818 ../midori/midori-browser.c:898
+#: ../midori/midori-browser.c:4590 ../midori/midori-browser.c:4622
+msgid "Toplevel folder"
+msgstr "Ylätason kansio"
-#: ../midori/midori-browser.c:668
+#: ../midori/midori-browser.c:847
+msgid "Show in the tool_bar"
+msgstr "Näytä työkal_upalkissa"
+
+#: ../midori/midori-browser.c:862
+msgid "Run as _web application"
+msgstr "Suorita _web-sovelluksena"
+
+#: ../midori/midori-browser.c:978 ../midori/midori-browser.c:4640
+#: ../midori/midori-browser.c:4672
msgid "Save file as"
msgstr "Tallenna tiedosto nimellä"
-#: ../midori/midori-browser.c:1248
+#: ../midori/midori-browser.c:1352 ../panels/midori-transfers.c:271
+#, c-format
+msgid "%s of %s"
+msgstr "%s/%s"
+
+#: ../midori/midori-browser.c:1388
+#, c-format
+msgid "The file '%s' has been downloaded."
+msgstr "Tiedoston \"%s\" lataus on valmis."
+
+#: ../midori/midori-browser.c:1392
+msgid "Transfer completed"
+msgstr "Tiedosto siirretty"
+
+#: ../midori/midori-browser.c:1532
+msgid "Save file"
+msgstr "Tallenna tiedosto"
+
+#: ../midori/midori-browser.c:2255
msgid "Open file"
msgstr "Avaa tiedosto"
-#: ../midori/midori-browser.c:2328
-msgid "Open in New _Tab"
-msgstr "Avaa uudessa _välilehdessä"
+#: ../midori/midori-browser.c:2331 ../extensions/feed-panel/main.c:364
+msgid "New feed"
+msgstr "Uusi syöte"
-#: ../midori/midori-browser.c:2330
-msgid "Open in New _Window"
-msgstr "Avaa uudessa _ikkunassa"
-
-#: ../midori/midori-browser.c:2601
-msgid "Separator"
-msgstr "Erotin"
-
-#: ../midori/midori-browser.c:2712
-#, c-format
-msgid "A week ago"
-msgstr "Viikko sitten"
-
-#: ../midori/midori-browser.c:2718
-#, c-format
-msgid "%d days ago"
-msgstr "%d päivää sitten"
-
-#: ../midori/midori-browser.c:2725
-msgid "Today"
-msgstr "Tänään"
-
-#: ../midori/midori-browser.c:2727
-msgid "Yesterday"
-msgstr "Eilen"
-
-#: ../midori/midori-browser.c:2816
-msgid "A lightweight web browser."
-msgstr "Kevyt verkkoselain"
-
-#: ../midori/midori-browser.c:2824
-msgid "translator-credits"
-msgstr "Elias Julkunen "
-
-#: ../midori/midori-browser.c:2958
-msgid "Are you sure you want to remove all history items?"
-msgstr "Haluatko varmasti tyhjentää koko historian?"
-
-#: ../midori/midori-browser.c:3064
-msgid "_File"
-msgstr "_Tiedosto"
-
-#: ../midori/midori-browser.c:3067
-msgid "Open a new window"
-msgstr "Avaa uusi ikkuna"
-
-#: ../midori/midori-browser.c:3070
-msgid "Open a new tab"
-msgstr "Avaa uusi välilehti"
-
-#: ../midori/midori-browser.c:3073
-msgid "Open a file"
-msgstr "Avaa tiedosto"
-
-#: ../midori/midori-browser.c:3076
-msgid "Save to a file"
-msgstr "Tallenna tiedostoon"
-
-#: ../midori/midori-browser.c:3078
-msgid "_Close Tab"
-msgstr "Sulje _välilehti"
-
-#: ../midori/midori-browser.c:3079
-msgid "Close the current tab"
-msgstr "Sulje nykyinen välilehti"
-
-#: ../midori/midori-browser.c:3081
-msgid "C_lose Window"
-msgstr "Sulje _ikkuna"
-
-#: ../midori/midori-browser.c:3082
-msgid "Close this window"
-msgstr "Sulje tämä ikkuna"
-
-#: ../midori/midori-browser.c:3085
-msgid "Print the current page"
-msgstr "Tulosta nykyinen sivu"
-
-#: ../midori/midori-browser.c:3088
-msgid "Quit the application"
-msgstr "Poistu sovelluksesta"
-
-#: ../midori/midori-browser.c:3090
-msgid "_Edit"
-msgstr "_Muokkaa"
-
-#: ../midori/midori-browser.c:3093
-msgid "Cut the selected text"
-msgstr "Leikkaa valittu teksti"
-
-#: ../midori/midori-browser.c:3096
-#: ../midori/midori-browser.c:3099
-msgid "Copy the selected text"
-msgstr "Kopioi valittu teksti"
-
-#: ../midori/midori-browser.c:3102
-msgid "Paste text from the clipboard"
-msgstr "Liitä teksti leikepöydältä"
-
-#: ../midori/midori-browser.c:3105
-msgid "Delete the selected text"
-msgstr "Poista valittu teksti"
-
-#: ../midori/midori-browser.c:3108
-msgid "Select all text"
-msgstr "Valitse kaikki tekstit"
-
-#: ../midori/midori-browser.c:3111
-msgid "Find a word or phrase in the page"
-msgstr "Etsi sana tai lause sivulta"
-
-#: ../midori/midori-browser.c:3113
-msgid "Find _Next"
-msgstr "Etsi _seuraava"
-
-#: ../midori/midori-browser.c:3114
-msgid "Find the next occurrence of a word or phrase"
-msgstr "Etsi seuraavan sanan tai lauseen esiintymä"
-
-#: ../midori/midori-browser.c:3116
-msgid "Find _Previous"
-msgstr "Etsi _edellinen"
-
-#: ../midori/midori-browser.c:3117
-msgid "Find the previous occurrence of a word or phrase"
-msgstr "Etsi edellisen sanan tai lauseen esiintymä"
-
-#: ../midori/midori-browser.c:3120
-msgid "_Quick Find"
-msgstr "_Pikahaku"
-
-#: ../midori/midori-browser.c:3121
-msgid "Quickly jump to a word or phrase"
-msgstr "Hyppää nopeasti sanaan tai lauseeseen"
-
-#: ../midori/midori-browser.c:3124
-msgid "Configure the application preferences"
-msgstr "Muokkaa sovelluksen asetuksia"
-
-#: ../midori/midori-browser.c:3126
-msgid "_View"
-msgstr "_Näytä"
-
-#: ../midori/midori-browser.c:3127
-msgid "_Toolbars"
-msgstr "_Työkalupalkit"
-
-#: ../midori/midori-browser.c:3139
-msgid "Increase the zoom level"
-msgstr "Suurenna"
-
-#: ../midori/midori-browser.c:3142
-msgid "Decrease the zoom level"
-msgstr "Pienennä"
-
-#: ../midori/midori-browser.c:3145
-msgid "Reset the zoom level"
-msgstr "Palauta suurennustaso"
-
-#: ../midori/midori-browser.c:3147
-#: ../midori/midori-view.c:998
-msgid "View _Source"
-msgstr "Näytä _lähdekoodi"
-
-#: ../midori/midori-browser.c:3148
-msgid "View the source code of the page"
-msgstr "Näytä sivun lähdekoodi"
-
-#: ../midori/midori-browser.c:3150
-msgid "View Selection Source"
-msgstr "Näytä valinnan lähdekoodi"
-
-#: ../midori/midori-browser.c:3151
-msgid "View the source code of the selection"
-msgstr "Näytä valinnan lähdekoodi"
-
-#: ../midori/midori-browser.c:3155
-msgid "Toggle fullscreen view"
-msgstr "Vaihda kokonäyttötilan välillä"
-
-#: ../midori/midori-browser.c:3157
-msgid "_Go"
-msgstr "_Siirry"
-
-#: ../midori/midori-browser.c:3160
-msgid "Go back to the previous page"
-msgstr "Siirry takaisin edelliselle sivulle"
-
-#: ../midori/midori-browser.c:3163
-msgid "Go forward to the next page"
-msgstr "Siirry eteenpäin seuraavalle sivulle"
-
-#: ../midori/midori-browser.c:3166
-msgid "Go to your homepage"
-msgstr "Siirry kotisivulle"
-
-#: ../midori/midori-browser.c:3168
-msgid "Empty Trash"
-msgstr "Tyhjennä roskakori"
-
-#: ../midori/midori-browser.c:3169
-msgid "Delete the contents of the trash"
-msgstr "Poista roskakorin sisältö"
-
-#: ../midori/midori-browser.c:3171
-#: ../midori/midori-view.c:970
-msgid "Undo Close Tab"
-msgstr "Kumoa välilehden sulkeminen"
-
-#: ../midori/midori-browser.c:3172
-msgid "Open the last closed tab"
-msgstr "Avaa viimeisin suljettu välilehti"
-
-#: ../midori/midori-browser.c:3176
+#: ../midori/midori-browser.c:2372 ../midori/midori-browser.c:5495
+#: ../panels/midori-bookmarks.c:242
msgid "Add a new bookmark"
msgstr "Lisää uusi kirjanmerkki"
-#: ../midori/midori-browser.c:3179
-msgid "Edit the selected bookmark"
-msgstr "Muokkaa valittua kirjanmerkkiä"
+#: ../midori/midori-browser.c:2930 ../panels/midori-history.c:332
+#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465
+#, c-format
+msgid "Failed to execute database statement: %s\n"
+msgstr "Tietokantakäskyn suoritus epäonnistui: %s\n"
-#: ../midori/midori-browser.c:3182
-msgid "Delete the selected bookmark"
-msgstr "Poista valittu kirjanmerkki"
+#: ../midori/midori-browser.c:3010 ../midori/midori-searchaction.c:484
+msgid "Empty"
+msgstr "Tyhjä"
-#: ../midori/midori-browser.c:3185
-msgid "Delete the selected history item"
-msgstr "Poista valittu historiatietue"
+#: ../midori/midori-browser.c:3631 ../midori/sokoke.c:403
+#: ../midori/sokoke.c:413 ../midori/sokoke.c:441 ../midori/sokoke.c:467
+#: ../midori/sokoke.c:481
+msgid "Could not run external program."
+msgstr "Ulkoisen ohjelman suoritus epäonnistui."
-#: ../midori/midori-browser.c:3188
-msgid "Clear the entire history"
-msgstr "Tyhjennä koko historia"
+#: ../midori/midori-browser.c:3945 ../midori/midori-browser.c:5889
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "Kohteen lisääminen sivuhistoriaan epäonnistui: %s\n"
-#: ../midori/midori-browser.c:3191
-msgid "Bookmark the selected history item"
-msgstr "Lisää valittu histoariatietue kirjanmerkkeihin"
+#: ../midori/midori-browser.c:4278 ../panels/midori-bookmarks.c:795
+#: ../panels/midori-history.c:751
+msgid "Open all in _Tabs"
+msgstr "Avaa kaikki välile_hdissä"
-#: ../midori/midori-browser.c:3193
-msgid "_Tools"
-msgstr "_Työkalut"
+#: ../midori/midori-browser.c:4285 ../panels/midori-bookmarks.c:801
+#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545
+msgid "Open in New _Tab"
+msgstr "Avaa uudessa _välilehdessä"
-#: ../midori/midori-browser.c:3195
-#: ../midori/midori-searchaction.c:465
-msgid "_Manage Search Engines"
-msgstr "_Hallitse hakukoneita"
+#: ../midori/midori-browser.c:4288 ../panels/midori-bookmarks.c:803
+#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547
+msgid "Open in New _Window"
+msgstr "Avaa uudessa _ikkunassa"
-#: ../midori/midori-browser.c:3196
-msgid "Add, edit and remove search engines..."
-msgstr "Lisää, muokkaa ja poista hakukoneita..."
+#: ../midori/midori-browser.c:4511
+msgid "Arora"
+msgstr "Arora"
-#: ../midori/midori-browser.c:3200
-msgid "_Previous Tab"
-msgstr "_Edellinen välilehti"
+#: ../midori/midori-browser.c:4512
+msgid "Kazehakase"
+msgstr "Kazehakase"
-#: ../midori/midori-browser.c:3201
-msgid "Switch to the previous tab"
-msgstr "Vaihda edelliseen välilehteen"
+#: ../midori/midori-browser.c:4513
+msgid "Opera"
+msgstr "Opera"
-#: ../midori/midori-browser.c:3203
-msgid "_Next Tab"
-msgstr "_Seuraava välilehti"
+#: ../midori/midori-browser.c:4514
+msgid "Konqueror"
+msgstr "Konqueror"
-#: ../midori/midori-browser.c:3204
-msgid "Switch to the next tab"
-msgstr "Vaihda seuraavaan välilehteen"
+#: ../midori/midori-browser.c:4515
+msgid "Epiphany"
+msgstr "Epiphany"
-#: ../midori/midori-browser.c:3206
-msgid "_Help"
-msgstr "_Ohje"
+#: ../midori/midori-browser.c:4536 ../panels/midori-bookmarks.c:271
+msgid "Import bookmarks..."
+msgstr "Tuo kirjanmerkit..."
-#: ../midori/midori-browser.c:3208
-msgid "_Contents"
-msgstr "_Sisältö"
+#: ../midori/midori-browser.c:4539 ../midori/midori-browser.c:5500
+msgid "_Import bookmarks"
+msgstr "_Tuo kirjanmerkit"
-#: ../midori/midori-browser.c:3209
-msgid "Show the documentation"
-msgstr "Näyttä dokumentaatio"
+#: ../midori/midori-browser.c:4550
+msgid "_Application:"
+msgstr "_Sovellus:"
-#: ../midori/midori-browser.c:3211
-msgid "_Frequent questions"
-msgstr "_Usein kysytyt kysymykset"
+#: ../midori/midori-browser.c:4577 ../midori/midori-browser.c:5604
+#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323
+#: ../katze/katze-utils.c:688
+msgid "Custom..."
+msgstr "Mukautettu..."
-#: ../midori/midori-browser.c:3212
-msgid "Show the Frequently Asked Questions"
-msgstr "Näytä usein kysytyt kysymykset"
+#: ../midori/midori-browser.c:4651
+msgid "Failed to import bookmarks"
+msgstr "Kirjanmerkkien tuonti epäonnistui"
-#: ../midori/midori-browser.c:3214
-msgid "_Report a bug"
-msgstr "_Ilmoita ohjelmavirheestä"
+#: ../midori/midori-browser.c:4687
+msgid "Failed to export bookmarks"
+msgstr "Kirjanmerkkien vienti epäonnistui"
-#: ../midori/midori-browser.c:3215
-msgid "Open Midori's bug tracker"
-msgstr "Avaa Midorin ohjelmavirhehallinta"
+#: ../midori/midori-browser.c:4741 ../panels/midori-history.c:141
+#: ../panels/midori-history.c:171
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Kohteen poistaminen sivuhistoriasta epäonnistui: %s\n"
-#: ../midori/midori-browser.c:3218
-msgid "Show information about the program"
-msgstr "Näytää tietoja sovelluksesta"
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-browser.c:4848
+msgid "Clear Private Data"
+msgstr "Poista yksityisyystietoja"
-#: ../midori/midori-browser.c:3225
-msgid "P_rivate Browsing"
-msgstr "_Yksityinen selaaminen"
+#: ../midori/midori-browser.c:4852
+msgid "_Clear private data"
+msgstr "_Poista yksityisyystietoja"
-#: ../midori/midori-browser.c:3226
-msgid "Don't save any private data while browsing"
-msgstr "Ei tallenna mitään yksityisyystietoja selatessa"
+#: ../midori/midori-browser.c:4866
+msgid "Clear the following data:"
+msgstr "Poista seuraavat tiedot:"
-#: ../midori/midori-browser.c:3231
-msgid "_Menubar"
-msgstr "_Valikkopalkki"
-
-#: ../midori/midori-browser.c:3232
-msgid "Show menubar"
-msgstr "Näytä valikkopalkki"
-
-#: ../midori/midori-browser.c:3235
-msgid "_Navigationbar"
-msgstr "_Navigointipalkki"
-
-#: ../midori/midori-browser.c:3236
-msgid "Show navigationbar"
-msgstr "Näytä navigointipalkki"
-
-#: ../midori/midori-browser.c:3239
-msgid "Side_panel"
-msgstr "_Sivupaneeli"
-
-#: ../midori/midori-browser.c:3240
-msgid "Show sidepanel"
-msgstr "Näytä sivupaneeli"
-
-#: ../midori/midori-browser.c:3243
-msgid "_Bookmarkbar"
-msgstr "_Kirjanmerkkipalkki"
-
-#: ../midori/midori-browser.c:3244
-msgid "Show bookmarkbar"
-msgstr "Näytä kirjanmerkkipalkki"
-
-#: ../midori/midori-browser.c:3247
-msgid "_Transferbar"
-msgstr "_Siirtopalkki"
-
-#: ../midori/midori-browser.c:3248
-msgid "Show transferbar"
-msgstr "Näytä siirtopalkki"
-
-#: ../midori/midori-browser.c:3251
-msgid "_Statusbar"
-msgstr "_Tilapalkki"
-
-#: ../midori/midori-browser.c:3252
-msgid "Show statusbar"
-msgstr "Näytä tilapalkki"
-
-#: ../midori/midori-browser.c:3669
-msgid "_Location..."
-msgstr "_Sijainti..."
-
-#: ../midori/midori-browser.c:3671
-msgid "Open a particular location"
-msgstr "Avaa tarkka sijainti"
-
-#: ../midori/midori-browser.c:3695
-msgid "_Web Search..."
-msgstr "_WWW-haku"
-
-#: ../midori/midori-browser.c:3697
-msgid "Run a web search"
-msgstr "Suorita WWW-haku"
-
-#: ../midori/midori-browser.c:3716
-msgid "Reopen a previously closed tab or window"
-msgstr "Avaa uudelleen aikaisemmin suljettu välilehti tai ikkuna"
-
-#: ../midori/midori-browser.c:3729
-msgid "_Recently visited pages"
-msgstr "_Usein vieraillut sivut"
-
-#: ../midori/midori-browser.c:3731
-msgid "Reopen pages that you visited earlier"
-msgstr "Avaa uudelleen sivut, joilla vierailit aikaisemmin"
-
-#: ../midori/midori-browser.c:3746
-msgid "Show the saved bookmarks"
-msgstr "Näytä tallennetut kirjanmerkit"
-
-#: ../midori/midori-browser.c:3759
-msgid "_Window"
-msgstr "_Ikkuna"
-
-#: ../midori/midori-browser.c:3761
-msgid "Show a list of all open tabs"
-msgstr "Näytä luettelo kaikista avoimista välilehdistä"
-
-#: ../midori/midori-browser.c:3883
-msgid "Bookmarks"
-msgstr "Kirjanmerkit"
-
-#: ../midori/midori-browser.c:3926
-#: ../midori/midori-preferences.c:517
+#: ../midori/midori-browser.c:4877 ../midori/midori-preferences.c:530
+#: ../panels/midori-history.c:119
msgid "History"
msgstr "Historia"
-#. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:3969
-msgid "_Inline find:"
-msgstr "_Haku:"
+#: ../midori/midori-browser.c:4883
+msgid "Cookies"
+msgstr "Evästeet"
-#: ../midori/midori-browser.c:4004
-msgid "Match Case"
-msgstr "Kirjainkoko merkitsee"
+#: ../midori/midori-browser.c:4888
+msgid "'Flash' Cookies"
+msgstr "Flash-evästeet"
-#: ../midori/midori-browser.c:4012
-msgid "Highlight Matches"
-msgstr "Korosta osumat"
+#: ../midori/midori-browser.c:4893
+msgid "Website icons"
+msgstr "Sivustojen kuvakkeet"
-#: ../midori/midori-browser.c:4021
-msgid "Close Findbar"
-msgstr "Sulje hakupalkki"
+#: ../midori/midori-browser.c:4898 ../midori/sokoke.c:1310
+msgid "_Closed Tabs"
+msgstr "Suljetut _välilehdet"
-#: ../midori/midori-browser.c:4262
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "Odottamaton asetus ”%s”"
+#: ../midori/midori-browser.c:4903 ../extensions/web-cache.c:464
+msgid "Web Cache"
+msgstr "Välimuisti"
-#: ../midori/midori-panel.c:223
-#: ../midori/midori-panel.c:224
-msgid "Close panel"
-msgstr "Sulje paneeli"
+#: ../midori/midori-browser.c:4911
+msgid "Clear private data when _quitting Midori"
+msgstr "Poista yksityisyystietoja, kun _Midori suljetaan"
-#: ../midori/midori-websettings.c:131
-#: ../midori/midori-view.c:1635
-msgid "Blank page"
-msgstr "Tyhjä sivu"
+#: ../midori/midori-browser.c:5013
+msgid "A lightweight web browser."
+msgstr "Kevyt verkkoselain"
-#: ../midori/midori-websettings.c:132
-#: ../midori/midori-websettings.c:387
-msgid "Homepage"
-msgstr "Kotisivu"
+#: ../midori/midori-browser.c:5015
+msgid ""
+"This library is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU Lesser General Public License as published by the "
+"Free Software Foundation; either version 2.1 of the License, or (at your "
+"option) any later version."
+msgstr ""
+"Tämä kirjasto on vapaa. Saat levittää ja/tai muokata sitä Free Software "
+"Foundationin julkaiseman GNU LGPL -lisenssin version 2.1 tai (halutessasi) "
+"uudemman ehtojen rajoissa."
-#: ../midori/midori-websettings.c:133
-msgid "Last open pages"
-msgstr "Viimeisimmät avoinna olleet sivut"
+#: ../midori/midori-browser.c:5034
+msgid "translator-credits"
+msgstr ""
+"Elias Julkunen \n"
+"Jari Rahkonen "
-#: ../midori/midori-websettings.c:148
+#: ../midori/midori-browser.c:5343
+msgid "_File"
+msgstr "_Tiedosto"
+
+#: ../midori/midori-browser.c:5345 ../midori/sokoke.c:1311
+msgid "New _Window"
+msgstr "Uusi i_kkuna"
+
+#: ../midori/midori-browser.c:5346
+msgid "Open a new window"
+msgstr "Avaa uusi ikkuna"
+
+#: ../midori/midori-browser.c:5349
+msgid "Open a new tab"
+msgstr "Avaa uusi välilehti"
+
+#: ../midori/midori-browser.c:5351
+msgid "P_rivate Browsing"
+msgstr "_Yksityinen selaaminen"
+
+#: ../midori/midori-browser.c:5352
+msgid "Don't save any private data while browsing"
+msgstr "Älä tallenna yksityisyystietoja selatessa"
+
+#: ../midori/midori-browser.c:5356
+msgid "Open a file"
+msgstr "Avaa tiedosto"
+
+#: ../midori/midori-browser.c:5359
+msgid "Save to a file"
+msgstr "Tallenna tiedostoon"
+
+#: ../midori/midori-browser.c:5361
+msgid "Add to Speed _dial"
+msgstr "Lisää pikavali_ntaan"
+
+#: ../midori/midori-browser.c:5362
+msgid "Add shortcut to speed dial"
+msgstr "Lisää sivu pikavalintaruutuun"
+
+#: ../midori/midori-browser.c:5364
+msgid "Add Shortcut to the _desktop"
+msgstr "Luo pikak_uvake työpöydälle"
+
+#: ../midori/midori-browser.c:5365
+msgid "Add shortcut to the desktop"
+msgstr "Luo pikakuvake työpöydälle"
+
+#: ../midori/midori-browser.c:5367
+msgid "Subscribe to News _feed"
+msgstr "_Tilaa uutissyöte"
+
+#: ../midori/midori-browser.c:5368
+msgid "Subscribe to this news feed"
+msgstr "Tilaa tämä uutissyöte"
+
+#: ../midori/midori-browser.c:5373
+msgid "_Close Tab"
+msgstr "Sulje _välilehti"
+
+#: ../midori/midori-browser.c:5374
+msgid "Close the current tab"
+msgstr "Sulje avoin välilehti"
+
+#: ../midori/midori-browser.c:5376
+msgid "C_lose Window"
+msgstr "Sulje i_kkuna"
+
+#: ../midori/midori-browser.c:5377
+msgid "Close this window"
+msgstr "Sulje tämä ikkuna"
+
+#: ../midori/midori-browser.c:5380
+msgid "Print the current page"
+msgstr "Tulosta nykyinen sivu"
+
+#: ../midori/midori-browser.c:5383
+msgid "Quit the application"
+msgstr "Poistu sovelluksesta"
+
+#: ../midori/midori-browser.c:5385
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: ../midori/midori-browser.c:5389
+msgid "Undo the last modification"
+msgstr "Peru viimeisin muutos"
+
+#: ../midori/midori-browser.c:5392
+msgid "Redo the last modification"
+msgstr "Toista viimeisin muutos"
+
+#: ../midori/midori-browser.c:5396
+msgid "Cut the selected text"
+msgstr "Leikkaa valittu teksti"
+
+#: ../midori/midori-browser.c:5399 ../midori/midori-browser.c:5402
+msgid "Copy the selected text"
+msgstr "Kopioi valittu teksti"
+
+#: ../midori/midori-browser.c:5405
+msgid "Paste text from the clipboard"
+msgstr "Liitä teksti leikepöydältä"
+
+#: ../midori/midori-browser.c:5408
+msgid "Delete the selected text"
+msgstr "Poista valittu teksti"
+
+#: ../midori/midori-browser.c:5411
+msgid "Select all text"
+msgstr "Valitse kaikki teksti"
+
+#: ../midori/midori-browser.c:5414
+msgid "Find a word or phrase in the page"
+msgstr "Etsi sanaa tai merkkijonoa sivulta"
+
+#: ../midori/midori-browser.c:5416
+msgid "Find _Next"
+msgstr "Etsi _seuraava"
+
+#: ../midori/midori-browser.c:5417
+msgid "Find the next occurrence of a word or phrase"
+msgstr "Etsi sanan tai merkkijonon seuraava esiintymä"
+
+#: ../midori/midori-browser.c:5419
+msgid "Find _Previous"
+msgstr "Etsi _edellinen"
+
+#: ../midori/midori-browser.c:5420
+msgid "Find the previous occurrence of a word or phrase"
+msgstr "Etsi sanan tai merkkijonon edellinen esiintymä"
+
+#: ../midori/midori-browser.c:5424
+msgid "Configure the application preferences"
+msgstr "Muokkaa sovelluksen asetuksia"
+
+#: ../midori/midori-browser.c:5426
+msgid "_View"
+msgstr "_Näytä"
+
+#: ../midori/midori-browser.c:5427
+msgid "_Toolbars"
+msgstr "_Työkalupalkit"
+
+#: ../midori/midori-browser.c:5439
+msgid "Increase the zoom level"
+msgstr "Suurenna"
+
+#: ../midori/midori-browser.c:5442
+msgid "Decrease the zoom level"
+msgstr "Pienennä"
+
+#: ../midori/midori-browser.c:5445
+msgid "Reset the zoom level"
+msgstr "Palauta suurennustaso"
+
+#: ../midori/midori-browser.c:5446
+msgid "_Encoding"
+msgstr "_Merkistö"
+
+#: ../midori/midori-browser.c:5448
+msgid "View So_urce"
+msgstr "Näytä lä_hdekoodi"
+
+#: ../midori/midori-browser.c:5449
+msgid "View the source code of the page"
+msgstr "Näytä sivun lähdekoodi"
+
+#: ../midori/midori-browser.c:5452
+msgid "Toggle fullscreen view"
+msgstr "Kokoruututila päälle/pois"
+
+#: ../midori/midori-browser.c:5455
+msgid "Scroll _Left"
+msgstr "Vieritä _vasempaan"
+
+#: ../midori/midori-browser.c:5456
+msgid "Scroll to the left"
+msgstr "Vieritä näkymää vasempaan"
+
+#: ../midori/midori-browser.c:5458
+msgid "Scroll _Down"
+msgstr "Vieritä _alas"
+
+#: ../midori/midori-browser.c:5459
+msgid "Scroll down"
+msgstr "Vieritä näkymää alaspäin"
+
+#: ../midori/midori-browser.c:5461
+msgid "Scroll _Up"
+msgstr "Vieritä yl_ös"
+
+#: ../midori/midori-browser.c:5462
+msgid "Scroll up"
+msgstr "Vieritä näkymää ylöspäin"
+
+#: ../midori/midori-browser.c:5464
+msgid "Scroll _Right"
+msgstr "Vieritä oikeaan"
+
+#: ../midori/midori-browser.c:5465
+msgid "Scroll to the right"
+msgstr "Vieritä näkymää oikeaan"
+
+#: ../midori/midori-browser.c:5468
+msgid "_Go"
+msgstr "_Siirry"
+
+#: ../midori/midori-browser.c:5471
+msgid "Go back to the previous page"
+msgstr "Siirry takaisin edelliselle sivulle"
+
+#: ../midori/midori-browser.c:5474
+msgid "Go forward to the next page"
+msgstr "Siirry eteenpäin seuraavalle sivulle"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5478
+msgid "Go to the previous sub-page"
+msgstr "Siirry edelliselle alasivulle"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5482
+msgid "Go to the next sub-page"
+msgstr "Siirry seuraavalle alasivulle"
+
+#: ../midori/midori-browser.c:5485
+msgid "Go to your homepage"
+msgstr "Siirry kotisivullesi"
+
+#: ../midori/midori-browser.c:5487
+msgid "Empty Trash"
+msgstr "Tyhjennä roskakori"
+
+#: ../midori/midori-browser.c:5488
+msgid "Delete the contents of the trash"
+msgstr "Poista roskakorin sisältö"
+
+#: ../midori/midori-browser.c:5490
+msgid "Undo _Close Tab"
+msgstr "Palauta _välilehti"
+
+#: ../midori/midori-browser.c:5491
+msgid "Open the last closed tab"
+msgstr "Avaa viimeksi suljettu välilehti"
+
+#: ../midori/midori-browser.c:5497
+msgid "Add a new _folder"
+msgstr "Luo uusi _kansio"
+
+#: ../midori/midori-browser.c:5498
+msgid "Add a new bookmark folder"
+msgstr "Luo uusi kirjanmerkkikansio"
+
+#: ../midori/midori-browser.c:5503
+msgid "_Export bookmarks"
+msgstr "_Vie kirjanmerkkejä"
+
+#: ../midori/midori-browser.c:5506 ../midori/midori-searchaction.c:493
+msgid "_Manage Search Engines"
+msgstr "_Hallitse hakukoneita"
+
+#: ../midori/midori-browser.c:5507
+msgid "Add, edit and remove search engines..."
+msgstr "Lisää, muokkaa ja poista hakukoneita..."
+
+#: ../midori/midori-browser.c:5510
+msgid "_Clear Private Data"
+msgstr "_Poista yksityisyystietoja"
+
+#: ../midori/midori-browser.c:5511
+msgid "Clear private data..."
+msgstr "Poista yksityisyystietoja..."
+
+#: ../midori/midori-browser.c:5515
+msgid "_Inspect Page"
+msgstr "_Tutki sivua"
+
+#: ../midori/midori-browser.c:5516
+msgid "Inspect page details and access developer tools..."
+msgstr "Tutki sivun ominaisuuksia ja käytä kehitystyökaluja..."
+
+#: ../midori/midori-browser.c:5521
+msgid "_Previous Tab"
+msgstr "_Edellinen välilehti"
+
+#: ../midori/midori-browser.c:5522
+msgid "Switch to the previous tab"
+msgstr "Vaihda edelliselle välilehdelle"
+
+#: ../midori/midori-browser.c:5524
+msgid "_Next Tab"
+msgstr "_Seuraava välilehti"
+
+#: ../midori/midori-browser.c:5525
+msgid "Switch to the next tab"
+msgstr "Vaihda seuraavalle välilehdelle"
+
+#: ../midori/midori-browser.c:5527
+msgid "Focus _Current Tab"
+msgstr "Koh_dista avoimeen välilehteen"
+
+#: ../midori/midori-browser.c:5528
+msgid "Focus the current tab"
+msgstr "Kohdista avoimeen välilehteen"
+
+#: ../midori/midori-browser.c:5530
+msgid "Open last _session"
+msgstr "Avaa _edellinen istunto"
+
+#: ../midori/midori-browser.c:5531
+msgid "Open the tabs saved in the last session"
+msgstr "Avaa edellisellä käyttökerralla tallennetut sivut"
+
+#: ../midori/midori-browser.c:5533
+msgid "_Help"
+msgstr "_Ohje"
+
+#: ../midori/midori-browser.c:5535
+msgid "_Contents"
+msgstr "_Sisältö"
+
+#: ../midori/midori-browser.c:5536
+msgid "Show the documentation"
+msgstr "Näytä dokumentaatio"
+
+#: ../midori/midori-browser.c:5538
+msgid "_Frequent Questions"
+msgstr "_Usein kysytyt kysymykset"
+
+#: ../midori/midori-browser.c:5539
+msgid "Show the Frequently Asked Questions"
+msgstr "Näytä usein kysytyt kysymykset"
+
+#: ../midori/midori-browser.c:5541
+msgid "_Report a Bug"
+msgstr "Il_moita ohjelmavirheestä"
+
+#: ../midori/midori-browser.c:5542
+msgid "Open Midori's bug tracker"
+msgstr "Avaa Midorin vikojen seurantajärjestelmä"
+
+#: ../midori/midori-browser.c:5545
+msgid "Show information about the program"
+msgstr "Näytä tietoja sovelluksesta"
+
+#: ../midori/midori-browser.c:5553
+msgid "_Menubar"
+msgstr "_Valikkopalkki"
+
+#: ../midori/midori-browser.c:5554
+msgid "Show menubar"
+msgstr "Näytä valikkopalkki"
+
+#: ../midori/midori-browser.c:5557
+msgid "_Navigationbar"
+msgstr "_Navigointipalkki"
+
+#: ../midori/midori-browser.c:5558
+msgid "Show navigationbar"
+msgstr "Näytä navigointipalkki"
+
+#: ../midori/midori-browser.c:5561
+msgid "Side_panel"
+msgstr "_Sivupaneeli"
+
+#: ../midori/midori-browser.c:5562
+msgid "Show sidepanel"
+msgstr "Näytä sivupaneeli"
+
+#: ../midori/midori-browser.c:5565
+msgid "_Bookmarkbar"
+msgstr "_Kirjanmerkkipalkki"
+
+#: ../midori/midori-browser.c:5566
+msgid "Show bookmarkbar"
+msgstr "Näytä kirjanmerkkipalkki"
+
+#: ../midori/midori-browser.c:5569
+msgid "_Transferbar"
+msgstr "_Latauspalkki"
+
+#: ../midori/midori-browser.c:5570
+msgid "Show transferbar"
+msgstr "Näytä latauspalkki"
+
+#: ../midori/midori-browser.c:5573
+msgid "_Statusbar"
+msgstr "_Tilapalkki"
+
+#: ../midori/midori-browser.c:5574
+msgid "Show statusbar"
+msgstr "Näytä tilapalkki"
+
+#: ../midori/midori-browser.c:5582
+msgid "_Automatic"
+msgstr "_Automaattinen"
+
+#: ../midori/midori-browser.c:5585 ../midori/midori-websettings.c:226
msgid "Chinese (BIG5)"
msgstr "Kiinalainen (BIG5)"
-#: ../midori/midori-websettings.c:149
-msgid "Japanese (SHIFT_JIS)"
-msgstr "Japanilainen (SHIFT_JIS)"
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5589
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japanilainen (SHIFT__JIS)"
-#: ../midori/midori-websettings.c:150
+#: ../midori/midori-browser.c:5592 ../midori/midori-websettings.c:228
+msgid "Korean (EUC-KR)"
+msgstr "Korealainen (EUC-KR)"
+
+#: ../midori/midori-browser.c:5595 ../midori/midori-websettings.c:229
msgid "Russian (KOI8-R)"
msgstr "Venäläinen (KOI8-R)"
-#: ../midori/midori-websettings.c:151
+#: ../midori/midori-browser.c:5598 ../midori/midori-websettings.c:230
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-websettings.c:152
+#: ../midori/midori-browser.c:5601 ../midori/midori-websettings.c:231
msgid "Western (ISO-8859-1)"
-msgstr "Läntinen (ISO-8859-1)"
+msgstr "Länsimainen (ISO-8859-1)"
-#: ../midori/midori-websettings.c:153
-msgid "Custom..."
-msgstr "Muokattu..."
+#: ../midori/midori-browser.c:6149
+msgid "_Separator"
+msgstr "_Erotin"
-#: ../midori/midori-websettings.c:168
+#: ../midori/midori-browser.c:6156
+msgid "_Location..."
+msgstr "_Sijainti..."
+
+#: ../midori/midori-browser.c:6158
+msgid "Open a particular location"
+msgstr "Avaa tarkka sijainti"
+
+#: ../midori/midori-browser.c:6182
+msgid "_Web Search..."
+msgstr "_Verkkohaku"
+
+#: ../midori/midori-browser.c:6184
+msgid "Run a web search"
+msgstr "Hae verkkosivua"
+
+#: ../midori/midori-browser.c:6205
+msgid "Reopen a previously closed tab or window"
+msgstr "Avaa uudelleen aikaisemmin suljettu välilehti tai ikkuna"
+
+#: ../midori/midori-browser.c:6220
+msgid "_Recently visited pages"
+msgstr "_Usein vieraillut sivut"
+
+#: ../midori/midori-browser.c:6222
+msgid "Reopen pages that you visited earlier"
+msgstr "Avaa uudelleen sivut, joilla vierailit aikaisemmin"
+
+#: ../midori/midori-browser.c:6237 ../midori/sokoke.c:1300
+msgid "_Bookmarks"
+msgstr "_Kirjanmerkit"
+
+#: ../midori/midori-browser.c:6239
+msgid "Show the saved bookmarks"
+msgstr "Näytä tallennetut kirjanmerkit"
+
+#: ../midori/midori-browser.c:6254
+msgid "_Tools"
+msgstr "_Työkalut"
+
+#: ../midori/midori-browser.c:6267
+msgid "_Window"
+msgstr "I_kkuna"
+
+#: ../midori/midori-browser.c:6269
+msgid "Show a list of all open tabs"
+msgstr "Näytä luettelo kaikista avoimista välilehdistä"
+
+#: ../midori/midori-browser.c:6283
+msgid "_Menu"
+msgstr "_Valikko"
+
+#: ../midori/midori-browser.c:6285
+msgid "Menu"
+msgstr "Valikko"
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../midori/midori-browser.c:6489
+msgid "_Inline Find:"
+msgstr "_Hakupalkki:"
+
+#: ../midori/midori-browser.c:6520
+msgid "Previous"
+msgstr "_Edellinen"
+
+#: ../midori/midori-browser.c:6525
+msgid "Next"
+msgstr "Seu_raava"
+
+#: ../midori/midori-browser.c:6530
+msgid "Match Case"
+msgstr "Huomioi kirjainkoko"
+
+#: ../midori/midori-browser.c:6539
+msgid "Highlight Matches"
+msgstr "Korosta osumat"
+
+#: ../midori/midori-browser.c:6551
+msgid "Close Findbar"
+msgstr "Sulje hakupalkki"
+
+#: ../midori/midori-browser.c:6597 ../panels/midori-transfers.c:142
+msgid "Clear All"
+msgstr "Tyhjennä"
+
+#: ../midori/midori-browser.c:6955
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "Odottamaton asetus \"%s\""
+
+#: ../midori/midori-locationaction.c:377
+#, c-format
+msgid "Failed to select from history\n"
+msgstr "Valinta historiasta epäonnistui\n"
+
+#: ../midori/midori-locationaction.c:459
+#, c-format
+msgid "Search for %s"
+msgstr "Etsi verkosta: %s"
+
+#: ../midori/midori-locationaction.c:482
+#, c-format
+msgid "Search with %s"
+msgstr "Käytä hakua %s"
+
+#: ../midori/midori-locationaction.c:1197
+#, c-format
+msgid "Failed to execute database statement\n"
+msgstr "Tietokantakomennon suoritus epäonnistui\n"
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1254
+msgid "Paste and p_roceed"
+msgstr "_Liitä ja siirry"
+
+#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435
+msgid "Detach chosen panel from the window"
+msgstr "Irrota valittu paneeli ikkunasta"
+
+#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447
+#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
+msgid "Align sidepanel to the right"
+msgstr "Sivupaneeli oikealla"
+
+#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458
+msgid "Close panel"
+msgstr "Sulje paneeli"
+
+#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644
+msgid "Align sidepanel to the left"
+msgstr "Sivupaneeli vasemmalla"
+
+#: ../midori/midori-panel.c:798
+msgid "Hide operating controls"
+msgstr "Piilota käyttöpainikkeet"
+
+#: ../midori/midori-websettings.c:209
+msgid "Show Blank page"
+msgstr "Näytä tyhjä sivu"
+
+#: ../midori/midori-websettings.c:210
+msgid "Show Homepage"
+msgstr "Näytä kotisivu"
+
+#: ../midori/midori-websettings.c:211
+msgid "Show last open tabs"
+msgstr "Näytä viimeksi avoimet välilehdet"
+
+#: ../midori/midori-websettings.c:227
+msgid "Japanese (SHIFT_JIS)"
+msgstr "Japanilainen (SHIFT_JIS)"
+
+#: ../midori/midori-websettings.c:247
msgid "New tab"
msgstr "Uusi välilehti"
-#: ../midori/midori-websettings.c:169
+#: ../midori/midori-websettings.c:248
msgid "New window"
msgstr "Uusi ikkuna"
-#: ../midori/midori-websettings.c:170
+#: ../midori/midori-websettings.c:249
msgid "Current tab"
msgstr "Nykyinen välilehti"
-#: ../midori/midori-websettings.c:185
+#: ../midori/midori-websettings.c:264
msgid "Default"
msgstr "Oletus"
-#: ../midori/midori-websettings.c:186
+#: ../midori/midori-websettings.c:265
msgid "Icons"
msgstr "Kuvakkeet"
-#: ../midori/midori-websettings.c:187
+#: ../midori/midori-websettings.c:266
+msgid "Small icons"
+msgstr "Pienet kuvakkeet"
+
+#: ../midori/midori-websettings.c:267
msgid "Text"
msgstr "Teksti"
-#: ../midori/midori-websettings.c:188
-msgid "Both"
-msgstr "Molemmat"
+#: ../midori/midori-websettings.c:268
+msgid "Icons and text"
+msgstr "Kuvakkeet ja teksti"
-#: ../midori/midori-websettings.c:189
-msgid "Both horizontal"
-msgstr "Molemmat vaakasuorassa"
+#: ../midori/midori-websettings.c:269
+msgid "Text beside icons"
+msgstr "Teksti kuvakkeiden vierellä"
-#: ../midori/midori-websettings.c:204
+#: ../midori/midori-websettings.c:284
+msgid "Automatic (GNOME or environment)"
+msgstr "Automaattinen (GNOME tai ympäristö)"
+
+#: ../midori/midori-websettings.c:285
+msgid "HTTP proxy server"
+msgstr "HTTP-välipalvelin"
+
+#: ../midori/midori-websettings.c:286
+msgid "No proxy server"
+msgstr "Ei välipalvelinta"
+
+#: ../midori/midori-websettings.c:301
msgid "All cookies"
msgstr "Kaikki evästeet"
-#: ../midori/midori-websettings.c:205
+#: ../midori/midori-websettings.c:302
msgid "Session cookies"
msgstr "Istunnon evästeet"
-#: ../midori/midori-websettings.c:206
-#: ../panels/midori-addons.c:97
+#: ../midori/midori-websettings.c:303 ../panels/midori-addons.c:98
+#: ../katze/katze-utils.c:664
msgid "None"
msgstr "Ei mitään"
-#: ../midori/midori-websettings.c:246
+#: ../midori/midori-websettings.c:319
+msgid "Safari"
+msgstr "Safari"
+
+#: ../midori/midori-websettings.c:320
+msgid "iPhone"
+msgstr "iPhone"
+
+#: ../midori/midori-websettings.c:321
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../midori/midori-websettings.c:322
+msgid "Internet Explorer"
+msgstr "Internet Explorer"
+
+#: ../midori/midori-websettings.c:375
msgid "Remember last window size"
-msgstr "Muista viimeisin ikkunan koko"
+msgstr "Muista ikkunan koko"
-#: ../midori/midori-websettings.c:247
+#: ../midori/midori-websettings.c:376
msgid "Whether to save the last window size"
-msgstr "Tallennetaanko viimeisin ikkunan koko"
+msgstr "Tallennetaanko ikkunan koko lopetettaessa"
-#: ../midori/midori-websettings.c:255
+#: ../midori/midori-websettings.c:384
msgid "Last window width"
-msgstr "Viimeisin ikkunan leveys"
+msgstr "Edellinen ikkunan leveys"
-#: ../midori/midori-websettings.c:256
+#: ../midori/midori-websettings.c:385
msgid "The last saved window width"
-msgstr "Viimeisin tallennettu ikkunan leveys"
+msgstr "Viimeisin tallennettu Ikkunan leveys"
-#: ../midori/midori-websettings.c:264
+#: ../midori/midori-websettings.c:393
msgid "Last window height"
-msgstr "Viimeisin ikkunan korkeus"
+msgstr "Edellinen ikkunan korkeus"
-#: ../midori/midori-websettings.c:265
+#: ../midori/midori-websettings.c:394
msgid "The last saved window height"
msgstr "Viimeisin tallennettu ikkunan korkeus"
-#: ../midori/midori-websettings.c:273
+#: ../midori/midori-websettings.c:419
msgid "Last panel position"
-msgstr "Viimeisin paneelin paikka"
+msgstr "Edellinen paneelin sijainti"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:420
msgid "The last saved panel position"
msgstr "Viimeisin tallennettu paneelin paikka"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:283
+#: ../midori/midori-websettings.c:429
msgid "Last panel page"
-msgstr "Viimeisin paneelin sivu"
+msgstr "Edellinen paneelin sivu"
-#: ../midori/midori-websettings.c:284
+#: ../midori/midori-websettings.c:430
msgid "The last saved panel page"
msgstr "Viimeisin tallennettu paneelin sivu"
-#: ../midori/midori-websettings.c:292
+#: ../midori/midori-websettings.c:438
msgid "Last Web search"
msgstr "Viimeisin verkkohaku"
-#: ../midori/midori-websettings.c:293
+#: ../midori/midori-websettings.c:439
msgid "The last saved Web search"
msgstr "Viimeisin tallennettu verkkohaku"
-#: ../midori/midori-websettings.c:302
+#: ../midori/midori-websettings.c:448
msgid "Show Menubar"
msgstr "Näytä valikkopalkki"
-#: ../midori/midori-websettings.c:303
+#: ../midori/midori-websettings.c:449
msgid "Whether to show the menubar"
msgstr "Näytetäänkö valikkopalkki"
-#: ../midori/midori-websettings.c:311
+#: ../midori/midori-websettings.c:457
msgid "Show Navigationbar"
msgstr "Näytä navigointipalkki"
-#: ../midori/midori-websettings.c:312
+#: ../midori/midori-websettings.c:458
msgid "Whether to show the navigationbar"
msgstr "Näytetäänkö navigointipalkki"
-#: ../midori/midori-websettings.c:320
+#: ../midori/midori-websettings.c:466
msgid "Show Bookmarkbar"
msgstr "Näytä kirjanmerkkipalkki"
-#: ../midori/midori-websettings.c:321
+#: ../midori/midori-websettings.c:467
msgid "Whether to show the bookmarkbar"
msgstr "Näytetäänkö kirjanmerkkipalkki"
-#: ../midori/midori-websettings.c:329
+#: ../midori/midori-websettings.c:475
msgid "Show Panel"
msgstr "Näytä paneeli"
-#: ../midori/midori-websettings.c:330
+#: ../midori/midori-websettings.c:476
msgid "Whether to show the panel"
msgstr "Näytetäänkö paneeli"
-#: ../midori/midori-websettings.c:338
+#: ../midori/midori-websettings.c:491
+msgid "Show Transferbar"
+msgstr "Näytä latauspalkki"
+
+#: ../midori/midori-websettings.c:492
+msgid "Whether to show the transferbar"
+msgstr "Näytetäänkö latauspalkki"
+
+#: ../midori/midori-websettings.c:500
msgid "Show Statusbar"
msgstr "Näytä tilapalkki"
-#: ../midori/midori-websettings.c:339
+#: ../midori/midori-websettings.c:501
msgid "Whether to show the statusbar"
msgstr "Näytetäänkö tilapalkki"
-#: ../midori/midori-websettings.c:348
-msgid "Toolbar Style"
-msgstr "Työkalupalkin tyyli"
+#: ../midori/midori-websettings.c:510
+msgid "Toolbar Style:"
+msgstr "Työkalupalkin tyyli:"
-#: ../midori/midori-websettings.c:349
+#: ../midori/midori-websettings.c:511
msgid "The style of the toolbar"
-msgstr "Työkalupalkin tyyli"
+msgstr "Työkalupalkin painikkeiden tyyli"
-#: ../midori/midori-websettings.c:358
+#: ../midori/midori-websettings.c:527
+msgid "Show progress in location entry"
+msgstr "Näytä eteneminen osoitekentässä"
+
+#: ../midori/midori-websettings.c:528
+msgid "Whether to show loading progress in the location entry"
+msgstr "Näytetäänkö latauksen eteneminen osoitekentässä"
+
+#: ../midori/midori-websettings.c:543
+msgid "Search engines in location completion"
+msgstr "Osoitteen täydennyksen hakukoneet"
+
+#: ../midori/midori-websettings.c:544
+msgid "Whether to show search engines in the location completion"
+msgstr "Näytetäänkö hakukoneet osoitteen täydennysvaihtoehdoissa"
+
+#: ../midori/midori-websettings.c:552
msgid "Toolbar Items"
msgstr "Työkakupalkin painikkeet"
-#: ../midori/midori-websettings.c:359
+#: ../midori/midori-websettings.c:553
msgid "The items to show on the toolbar"
msgstr "Työkalupalkissa näytettävät painikkeet"
-#: ../midori/midori-websettings.c:367
+#: ../midori/midori-websettings.c:561
msgid "Compact Sidepanel"
-msgstr "Kompakti sivupaneeli"
+msgstr "Tiivis sivupaneeli"
-#: ../midori/midori-websettings.c:368
+#: ../midori/midori-websettings.c:562
msgid "Whether to make the sidepanel compact"
-msgstr "Tehdäänkö sivupaneelista kompakti"
+msgstr "Tiivistetäänkö sivupaneelia"
-#: ../midori/midori-websettings.c:377
-msgid "Load on Startup"
-msgstr "Lataa käynnistettäessä"
+#: ../midori/midori-websettings.c:577
+msgid "Show operating controls of the panel"
+msgstr "Näytä paneelin käyttöpainikkeet"
-#: ../midori/midori-websettings.c:378
-msgid "What to load on startup"
-msgstr "Mitä ladataan käynnistyksessä"
+#: ../midori/midori-websettings.c:578
+msgid "Whether to show the operating controls of the panel"
+msgstr "Näytetäänkö paneelissa sen käyttöpanikkeet"
-#: ../midori/midori-websettings.c:388
+#: ../midori/midori-websettings.c:593
+msgid "Align sidepanel on the right"
+msgstr "Sijoita sivupaneeli oikealle"
+
+#: ../midori/midori-websettings.c:594
+msgid "Whether to align the sidepanel on the right"
+msgstr "Sijoitetaanko sivupaneeli ikkunan oikeaan reunaan"
+
+#: ../midori/midori-websettings.c:609
+msgid "Open panels in separate windows"
+msgstr "Avaa paneelit omissa ikkunoissaan"
+
+#: ../midori/midori-websettings.c:610
+msgid "Whether to always open panels in separate windows"
+msgstr "Avataanko paneelit aina erillisiksi ikkunoiksi"
+
+#: ../midori/midori-websettings.c:619
+msgid "When Midori starts:"
+msgstr "Kun Midori käynnistyy:"
+
+#: ../midori/midori-websettings.c:620
+msgid "What to do when Midori starts"
+msgstr "Mitä tehdään, kun Midori käynnistyy"
+
+#: ../midori/midori-websettings.c:629
+msgid "Homepage:"
+msgstr "Kotisivu:"
+
+#: ../midori/midori-websettings.c:630
msgid "The homepage"
msgstr "Kotisivu"
-#: ../midori/midori-websettings.c:396
-msgid "Download Folder"
-msgstr "Latauskansio"
+#: ../midori/midori-websettings.c:645
+msgid "Show crash dialog"
+msgstr "Näytä kaatumisdialogi"
-#: ../midori/midori-websettings.c:397
+#: ../midori/midori-websettings.c:646
+msgid "Show a dialog after Midori crashed"
+msgstr "Näytä dialogi, jos Midori on kaatunut"
+
+#. i18n: Speed dial, webpage shortcuts, named for the phone function
+#: ../midori/midori-websettings.c:662
+msgid "Show speed dial in new tabs"
+msgstr "Näytä pikavalinta uusissa välilehdissä"
+
+#: ../midori/midori-websettings.c:663
+msgid "Show speed dial in newly opened tabs"
+msgstr "Näytä pikavalinta, kun uusia välilehtiä avataan"
+
+#: ../midori/midori-websettings.c:671
+msgid "Save downloaded files to:"
+msgstr "Tiedostojen tallennuskohde:"
+
+#: ../midori/midori-websettings.c:672
msgid "The folder downloaded files are saved to"
-msgstr "Kansio, jonne ladatut tiedostot tallennetaan"
+msgstr "Kansio, johon ladatut tiedostot tallennetaan"
-#: ../midori/midori-websettings.c:405
+#: ../midori/midori-websettings.c:693
+msgid "Ask for the destination folder"
+msgstr "Kysy kohdekansiota"
+
+#: ../midori/midori-websettings.c:694
+msgid "Whether to ask for the destination folder when downloading a file"
+msgstr "Kysytäänkö kohdekansiota, kun tiedosto ladataan"
+
+#: ../midori/midori-websettings.c:713
+msgid "Notify when a transfer has been completed"
+msgstr "Ilmoita latauksen valmistumisesta"
+
+#: ../midori/midori-websettings.c:714
+msgid "Whether to show a notification when a transfer has been completed"
+msgstr "Näytä huomautus. kun tiedoston lataus tulee valmiiksi"
+
+#: ../midori/midori-websettings.c:726
msgid "Download Manager"
-msgstr "Latauksien hallinta"
+msgstr "Lataussovellus"
-#: ../midori/midori-websettings.c:406
+#: ../midori/midori-websettings.c:727
msgid "An external download manager"
-msgstr "Ulkoinen latauksien hallinta"
+msgstr "Ulkoinen latauksien hallintasovellus"
-#: ../midori/midori-websettings.c:414
+#: ../midori/midori-websettings.c:735
msgid "Text Editor"
msgstr "Tekstieditori"
-#: ../midori/midori-websettings.c:415
+#: ../midori/midori-websettings.c:736
msgid "An external text editor"
msgstr "Ulkoinen tekstieditori"
-#: ../midori/midori-websettings.c:423
+#: ../midori/midori-websettings.c:751
+msgid "News Aggregator"
+msgstr "Uutistenlukija"
+
+#: ../midori/midori-websettings.c:752
+msgid "An external news aggregator"
+msgstr "Ulkoinen uutissyötteiden lukuohjelma"
+
+#: ../midori/midori-websettings.c:760
msgid "Location entry Search"
-msgstr ""
+msgstr "Osoitekentän haku"
-#: ../midori/midori-websettings.c:424
+#: ../midori/midori-websettings.c:761
msgid "The search to perform inside the location entry"
-msgstr ""
+msgstr "Osoitekentässä käytettävä hakukone"
-#: ../midori/midori-websettings.c:432
+#: ../midori/midori-websettings.c:769
msgid "Preferred Encoding"
-msgstr "Käytettävä merkkikoodaus"
+msgstr "Oletusmerkistö"
-#: ../midori/midori-websettings.c:433
+#: ../midori/midori-websettings.c:770
msgid "The preferred character encoding"
-msgstr "Oletuksena käytettävä merkkikoodaus"
+msgstr "Oletusarvoisesti käytettävä merkistökoodaus"
-#: ../midori/midori-websettings.c:443
+#: ../midori/midori-websettings.c:780
msgid "Always Show Tabbar"
msgstr "Näytä aina välilehtipalkki"
-#: ../midori/midori-websettings.c:444
+#: ../midori/midori-websettings.c:781
msgid "Always show the tabbar"
-msgstr "Näytä aina välilehtipalkki"
+msgstr "Näytä välilehtipalkki aina"
-#: ../midori/midori-websettings.c:452
+#: ../midori/midori-websettings.c:789
msgid "Close Buttons on Tabs"
msgstr "Sulkemispainikkeet välilehdissä"
-#: ../midori/midori-websettings.c:453
+#: ../midori/midori-websettings.c:790
msgid "Whether tabs have close buttons"
msgstr "Onko välilehdissä sulkemispainikkeet"
-#: ../midori/midori-websettings.c:462
-msgid "Open new pages in"
-msgstr "Avaa uudet sivut"
+#: ../midori/midori-websettings.c:798
+msgid "Open new pages in:"
+msgstr "Avaa uudet sivut:"
-#: ../midori/midori-websettings.c:463
+#: ../midori/midori-websettings.c:799
msgid "Where to open new pages"
msgstr "Miten uudet sivut avataan"
-#: ../midori/midori-websettings.c:473
-msgid "Open external pages in"
-msgstr "Avaa ulkoiset sivut"
+#: ../midori/midori-websettings.c:808
+msgid "Open external pages in:"
+msgstr "Avaa ulkoiset sivut:"
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:809
msgid "Where to open externally opened pages"
msgstr "Miten ulkoisesti avatut sivut avataan"
-#: ../midori/midori-websettings.c:483
+#: ../midori/midori-websettings.c:818
msgid "Middle click opens Selection"
-msgstr "Keskinapsautus avaa valinnan"
+msgstr "Keskipainike avaa valinnan"
-#: ../midori/midori-websettings.c:484
-msgid "Load an URL from the selection via middle click"
-msgstr "Lataa URL-osoitteen valinnasta keskinapsautuksella"
+#: ../midori/midori-websettings.c:819
+msgid "Load an address from the selection via middle click"
+msgstr "Lataa valittuna olevan osoitteen hiiren keskipainikkeella"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:827
msgid "Open tabs in the background"
msgstr "Avaa välilehdet taustalla"
-#: ../midori/midori-websettings.c:493
+#: ../midori/midori-websettings.c:828
msgid "Whether to open new tabs in the background"
msgstr "Avataanko uudet välilehdet taustalla"
-#: ../midori/midori-websettings.c:501
+#: ../midori/midori-websettings.c:836
msgid "Open Tabs next to Current"
-msgstr "Avaa välilehdet nykyisestä seuraavaksi"
+msgstr "Avaa välilehdet nykyisen vierelle"
-#: ../midori/midori-websettings.c:502
+#: ../midori/midori-websettings.c:837
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"
+msgstr ""
+"Avataanko uudet välilehdet nykyistä välilehteä seuraavaksi vai viimeiseksi"
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:845
msgid "Open popups in tabs"
-msgstr "Avaa ponnahdusikkunat välilehdissä"
+msgstr "Avaa ponnahdusikkunat välilehdille"
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:846
msgid "Whether to open popup windows in tabs"
-msgstr "Avataanko ponnahdusikkunat välilehdissä"
+msgstr "Avataanko ponnahdusikkunat välilehdille"
-#: ../midori/midori-websettings.c:537
+#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88
+msgid "Load images automatically"
+msgstr "Lataa kuvat automaattisesti"
+
+#: ../midori/midori-websettings.c:857
+msgid "Load and display images automatically"
+msgstr "Lataa ja näytä kuvat automaattisesti"
+
+#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100
+msgid "Enable scripts"
+msgstr "Salli skriptit"
+
+#: ../midori/midori-websettings.c:865
+msgid "Enable embedded scripting languages"
+msgstr "Salli upotetut skriptauskielet"
+
+#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112
+msgid "Enable Netscape plugins"
+msgstr "Salli Netscape-liitännäiset"
+
+#: ../midori/midori-websettings.c:873
+msgid "Enable embedded Netscape plugin objects"
+msgstr "Lataa upotetut Netscapen liitännäisobjektit"
+
+#: ../midori/midori-websettings.c:889
+msgid "Enable HTML5 database support"
+msgstr "Ota käyttöön HTML5:n tietokantatuki"
+
+#: ../midori/midori-websettings.c:890
+msgid "Whether to enable HTML5 database support"
+msgstr "Otetaanko HTML5-merkkauksen tietokantatuki käyttöön"
+
+#: ../midori/midori-websettings.c:896
+msgid "Enable HTML5 local storage support"
+msgstr "Ota käyttöön HTML5:n paikallinen tallennus"
+
+#: ../midori/midori-websettings.c:897
+msgid "Whether to enable HTML5 local storage support"
+msgstr "Otetaanko HTML5:n paikallisen tallennuksen tuki käyttöön"
+
+#: ../midori/midori-websettings.c:905
+msgid "Enable offline web application cache"
+msgstr "Tallenna verkkosovellukset paikallisesti"
+
+#: ../midori/midori-websettings.c:906
+msgid "Whether to enable offline web application cache"
+msgstr "Tallennetaanko verkkosovellukset paikalliseen välimuistiin"
+
+#: ../midori/midori-websettings.c:931
+msgid "Zoom Text and Images"
+msgstr "Suurenna tekstiä ja kuvia"
+
+#: ../midori/midori-websettings.c:932
+msgid "Whether to zoom text and images"
+msgstr "Suurennetaanko sekä tekstiä että kuvia"
+
+#: ../midori/midori-websettings.c:947
+msgid "Find inline while typing"
+msgstr "Etsi sivulta kirjoittaessa"
+
+#: ../midori/midori-websettings.c:948
+msgid "Whether to automatically find inline while typing"
+msgstr "Etsitäänkö kirjoitettua tekstiä automaattisesti sivulta"
+
+#: ../midori/midori-websettings.c:963
+msgid "Kinetic scrolling"
+msgstr "Kineettinen vieritys"
+
+#: ../midori/midori-websettings.c:964
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr "Vieritetäänkö sivua kineettisesti vieritysnopeuden mukaan"
+
+#: ../midori/midori-websettings.c:972
msgid "Accept cookies"
msgstr "Salli evästeet"
-#: ../midori/midori-websettings.c:538
+#: ../midori/midori-websettings.c:973
msgid "What type of cookies to accept"
msgstr "Minkälaiset evästeet sallitaan"
-#: ../midori/midori-websettings.c:547
+#: ../midori/midori-websettings.c:989
msgid "Original cookies only"
msgstr "Alkuperäiset evästeet"
-#: ../midori/midori-websettings.c:548
+#: ../midori/midori-websettings.c:990
msgid "Accept cookies from the original website only"
msgstr "Sallii vain alkuperäisen sivuston evästeet"
-#: ../midori/midori-websettings.c:556
+#: ../midori/midori-websettings.c:998
msgid "Maximum cookie age"
msgstr "Evästeiden enimmäisikä"
-#: ../midori/midori-websettings.c:557
+#: ../midori/midori-websettings.c:999
msgid "The maximum number of days to save cookies for"
-msgstr "Evästetietojen säilytysaika päivinä"
+msgstr "Evästetietojen enimmäissäilytysaika päivinä"
-#: ../midori/midori-websettings.c:567
+#: ../midori/midori-websettings.c:1016
msgid "Remember last visited pages"
msgstr "Muista sivut, joilla on vierailtu"
-#: ../midori/midori-websettings.c:568
+#: ../midori/midori-websettings.c:1017
msgid "Whether the last visited pages are saved"
-msgstr "Tallennetaanko sivut, joilla on vierailtu"
+msgstr "Tallennetaanko sivut, joilla on vierailtu viimeksi"
-#: ../midori/midori-websettings.c:576
+#: ../midori/midori-websettings.c:1025
msgid "Maximum history age"
msgstr "Historian enimmäisikä"
-#: ../midori/midori-websettings.c:577
+#: ../midori/midori-websettings.c:1026
msgid "The maximum number of days to save the history for"
-msgstr "Historiatietojen säilytysaika päivinä"
+msgstr "Montako päivää sivuja säilytetään sivuhistoriassa "
-#: ../midori/midori-websettings.c:585
-msgid "Remember last form inputs"
-msgstr "Muista lomakkeisiin annetut tiedot"
-
-#: ../midori/midori-websettings.c:586
-msgid "Whether the last form inputs are saved"
-msgstr "Tallennetaanko lomakkeisiin annetut tiedot"
-
-#: ../midori/midori-websettings.c:594
+#: ../midori/midori-websettings.c:1034
msgid "Remember last downloaded files"
msgstr "Muista ladatut tiedostot"
-#: ../midori/midori-websettings.c:595
+#: ../midori/midori-websettings.c:1035
msgid "Whether the last downloaded files are saved"
msgstr "Tallennetaanko ladattujen tiedostojen lista"
-#: ../midori/midori-websettings.c:605
-msgid "HTTP Proxy"
-msgstr "HTTP-välityspalvelin"
+#: ../midori/midori-websettings.c:1052
+msgid "Proxy server"
+msgstr "Välipalvelin"
-#: ../midori/midori-websettings.c:606
-msgid "The proxy used for HTTP connections"
-msgstr "HTTP-yhteyksille käytettävä välityspalvelin"
+#: ../midori/midori-websettings.c:1053
+msgid "The type of proxy server to use"
+msgstr "Käytettävän välipalvelimen tyyppi"
-#: ../midori/midori-websettings.c:614
-msgid "Cache size"
-msgstr "Välimuistin koko"
+#: ../midori/midori-websettings.c:1062
+msgid "HTTP Proxy Server"
+msgstr "HTTP-välipalvelin"
-#: ../midori/midori-websettings.c:615
-msgid "The allowed size of the cache"
-msgstr "Välimuistin enimmäiskoko"
+#: ../midori/midori-websettings.c:1063
+msgid "The proxy server used for HTTP connections"
+msgstr "HTTP-yhteyksille käytettävä välipalvelin"
+
+#: ../midori/midori-websettings.c:1078
+msgid "Detect proxy server automatically"
+msgstr "Tunnista välipalvelin automaattisesti"
+
+#: ../midori/midori-websettings.c:1079
+msgid "Whether to detect the proxy server automatically from the environment"
+msgstr "Tunnistetaanko välipalvelin automaattisesti ympäristömuuttujista"
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-websettings.c:1095
+msgid "Identify as"
+msgstr "Tunnistautuminen"
+
+#: ../midori/midori-websettings.c:1096
+msgid "What to identify as to web pages"
+msgstr "Mitä selain ilmoittaa itsestään verkkoselaimille"
+
+#: ../midori/midori-websettings.c:1112
+msgid "Identification string"
+msgstr "Tunnistautumismerkkijono"
+
+#: ../midori/midori-websettings.c:1113
+msgid "The application identification string"
+msgstr "Sovelluksen tunnistautumismerkkijono"
+
+#: ../midori/midori-websettings.c:1128
+msgid "Preferred languages"
+msgstr "Ensisijaiset kielet"
+
+#: ../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\""
+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:1144
+msgid "Clear private data"
+msgstr "Poista yksityisyystietoja"
+
+#: ../midori/midori-websettings.c:1145
+msgid "The private data selected for deletion"
+msgstr "Poistettavaksi valitut yksityisyystiedot"
+
+#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly,
+#. so reloading via Javascript works but not via API calls.
+#. Error pages are special, we want to try loading the destination
+#. again, not the error page which isn't even a proper page
+#: ../midori/midori-view.c:1185 ../midori/midori-view.c:4450
+#: ../midori/midori-view.c:4454
+#, c-format
+msgid "Error - %s"
+msgstr "Virhe - %s"
+
+#: ../midori/midori-view.c:1186
+#, c-format
+msgid "The page '%s' couldn't be loaded."
+msgstr "Sivun \"%s\" lataus epäonnistui."
+
+#: ../midori/midori-view.c:1191
+msgid "Try again"
+msgstr "Yritä uudelleen"
#. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:632
+#: ../midori/midori-view.c:1232
#, c-format
msgid "Not found - %s"
msgstr "Ei löydy - %s"
-#: ../midori/midori-view.c:902
-msgid "Open Link in New _Tab"
-msgstr "Avaa linkki uudessa _välilehdessä"
+#: ../midori/midori-view.c:1454 ../midori/midori-view.c:2274
+#, c-format
+msgid "Send a message to %s"
+msgstr "Lähetä viesti osoitteeseen %s"
-#: ../midori/midori-view.c:925
+#: ../midori/midori-view.c:2056 ../midori/midori-view.c:2436
+msgid "Inspect _Element"
+msgstr "Tutki _elementtiä"
+
+#: ../midori/midori-view.c:2108 ../midori/midori-view.c:2178
+msgid "Open Link in New _Tab"
+msgstr "Avaa linkki uudelle _välilehdelle"
+
+#: ../midori/midori-view.c:2112
+msgid "Open Link in _Foreground Tab"
+msgstr "Avaa linkki välilehdelle _etualalla"
+
+#: ../midori/midori-view.c:2113
+msgid "Open Link in _Background Tab"
+msgstr "Avaa linkki välilehdelle t_austalla"
+
+#: ../midori/midori-view.c:2116 ../midori/midori-view.c:2185
+msgid "Open Link in New _Window"
+msgstr "Avaa linkki uudessa i_kkunassa"
+
+#: ../midori/midori-view.c:2119
+msgid "Open Link as Web A_pplication"
+msgstr "Avaa linkki _verkkosovelluksena"
+
+#: ../midori/midori-view.c:2122
+msgid "Copy Link de_stination"
+msgstr "K_opioi linkin kohde"
+
+#: ../midori/midori-view.c:2125 ../midori/midori-view.c:2197
msgid "_Save Link destination"
msgstr "_Tallenna linkin kohde"
-#: ../midori/midori-view.c:933
+#: ../midori/midori-view.c:2126 ../midori/midori-view.c:2191
msgid "_Download Link destination"
msgstr "_Lataa linkin kohde"
-#: ../midori/midori-view.c:955
-msgid "Open URL in New _Tab"
-msgstr "Avaa URL-osoite uudessa _välilehdessä"
+#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2160
+#: ../midori/midori-view.c:2202
+msgid "Download with Download _Manager"
+msgstr "Lataa latau_ssovelluksella"
-#: ../midori/midori-view.c:1365
+#: ../midori/midori-view.c:2139
+msgid "Open _Image in New Tab"
+msgstr "Avaa kuva uudelle _välilehdelle"
+
+#: ../midori/midori-view.c:2142
+msgid "Copy Image _Address"
+msgstr "Kopioi kuvan _osoite"
+
+#: ../midori/midori-view.c:2145
+msgid "Save I_mage"
+msgstr "Tallenna _kuva"
+
+#: ../midori/midori-view.c:2146
+msgid "Download I_mage"
+msgstr "Lataa _kuva"
+
+#: ../midori/midori-view.c:2153
+msgid "Copy Video _Address"
+msgstr "Kopioi videon _osoite"
+
+#: ../midori/midori-view.c:2156
+msgid "Save _Video"
+msgstr "Tallenna _video"
+
+#: ../midori/midori-view.c:2156
+msgid "Download _Video"
+msgstr "Lataa _video"
+
+#: ../midori/midori-view.c:2219
+msgid "Search _with"
+msgstr "_Etsi sanalla"
+
+#: ../midori/midori-view.c:2254 ../midori/midori-view.c:2261
+msgid "_Search the Web"
+msgstr "_Hae verkosta"
+
+#: ../midori/midori-view.c:2282
+msgid "Open Address in New _Tab"
+msgstr "Avaa osoite uudelle _välilehdelle"
+
+#: ../midori/midori-view.c:2586
+msgid "Open or download file"
+msgstr "Avaa tai lataa tiedosto"
+
+#: ../midori/midori-view.c:2609
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Tiedostotyyppi: \"%s\""
+
+#: ../midori/midori-view.c:2612
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Tiedostotyyppi: %s (\"%s\")"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:2616
+#, c-format
+msgid "Open %s"
+msgstr "Avaa %s"
+
+#: ../midori/midori-view.c:3150
#, c-format
msgid "Inspect page - %s"
-msgstr "Tutkii sivua - %s"
+msgstr "Tutki sivua - %s"
-#: ../midori/midori-view.c:1503
-msgid "Source"
-msgstr "Lähdekoodi"
+#: ../midori/midori-view.c:3411
+msgid "Speed dial"
+msgstr "Pikavalinta"
-#: ../midori/midori-view.c:1527
+#: ../midori/midori-view.c:3412
+msgid "Click to add a shortcut"
+msgstr "Lisää pikavalinta napsauttamalla"
+
+#: ../midori/midori-view.c:3413
+msgid "Enter shortcut address"
+msgstr "Syötä pikavalinnan osoite"
+
+#: ../midori/midori-view.c:3414
+msgid "Enter shortcut title"
+msgstr "Lisää pikavalinnan otsake"
+
+#: ../midori/midori-view.c:3415
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Haluatko varmasti postaa pikavalinnan?"
+
+#: ../midori/midori-view.c:3452
+#, c-format
+msgid "Document cannot be displayed"
+msgstr "Asiakirjaa ei voi näyttää"
+
+#: ../midori/midori-view.c:3475
#, c-format
msgid "No documentation installed"
msgstr "Dokumentaatiota ei ole asennettu"
-#: ../midori/midori-preferences.c:87
-#, c-format
-msgid "Preferences for %s"
-msgstr "Kohteen %s asetukset"
+#: ../midori/midori-view.c:3725
+msgid "Blank page"
+msgstr "Tyhjä sivu"
-#. Page "General"
-#: ../midori/midori-preferences.c:338
-msgid "General"
-msgstr "Yleiset"
+#: ../midori/midori-view.c:3985
+msgid "_Duplicate Tab"
+msgstr "_Monista välilehti"
-#: ../midori/midori-preferences.c:339
-msgid "Startup"
-msgstr "Käynnistys"
+#: ../midori/midori-view.c:3990
+msgid "_Restore Tab"
+msgstr "_Palauta välilehti"
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:386
-msgid "Appearance"
-msgstr "Ulkoasu"
+#: ../midori/midori-view.c:3990
+msgid "_Minimize Tab"
+msgstr "Pi_enennä välilehti"
-#: ../midori/midori-preferences.c:387
-msgid "Font settings"
-msgstr "Kirjasinasetukset"
+#: ../midori/midori-view.c:3996
+msgid "Close ot_her Tabs"
+msgstr "Sulje _muut välilehdet"
-#: ../midori/midori-preferences.c:389
-msgid "Default Font Family"
-msgstr "Oletuskirjasinperhe"
+#: ../midori/midori-view.c:4622
+msgid "Print background images"
+msgstr "Tulosta taustakuvat"
-#: ../midori/midori-preferences.c:397
-msgid "Minimum Font Size"
-msgstr "Kirjasimen vähimmäiskoko"
+#: ../midori/midori-view.c:4623
+msgid "Whether background images should be printed"
+msgstr "Tulosta myös verkkosivujen taustakuvat"
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:407
-msgid "Behavior"
-msgstr "Käyttäytyminen"
-
-#: ../midori/midori-preferences.c:408
+#: ../midori/midori-view.c:4675 ../midori/midori-preferences.c:381
msgid "Features"
msgstr "Ominaisuudet"
-#: ../midori/midori-preferences.c:411
-#: ../extensions/statusbar-features.c:32
-msgid "Load images automatically"
-msgstr "Lataa kuvat automaattisesti"
+#. Page "General"
+#: ../midori/midori-preferences.c:298
+msgid "General"
+msgstr "Yleiset"
+
+#: ../midori/midori-preferences.c:299
+msgid "Startup"
+msgstr "Käynnistys"
+
+#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321
+msgid "Use current page as homepage"
+msgstr "Aseta nykyinen sivu kotisivuksi"
+
+#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87
+msgid "Transfers"
+msgstr "Lataukset"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:349
+msgid "Appearance"
+msgstr "Ulkoasu"
+
+#: ../midori/midori-preferences.c:350
+msgid "Font settings"
+msgstr "Kirjasinasetukset"
+
+#: ../midori/midori-preferences.c:352
+msgid "Default Font Family"
+msgstr "Oletuskirjasin"
+
+#: ../midori/midori-preferences.c:355
+msgid "The default font family used to display text"
+msgstr "Tekstin esittämiseen oletusarvoisesti käytettävä kirjasin"
+
+#: ../midori/midori-preferences.c:358
+msgid "The default font size used to display text"
+msgstr "Tekstin esittämiseen käytettävän kirjasimen oletuskoko"
+
+#: ../midori/midori-preferences.c:360
+msgid "Fixed-width Font Family"
+msgstr "Tasavälinen kirjasin"
+
+#: ../midori/midori-preferences.c:363
+msgid "The font family used to display fixed-width text"
+msgstr "Tasavälisen tekstin esittämiseen käytettävä kirjasin"
+
+#: ../midori/midori-preferences.c:366
+msgid "The font size used to display fixed-width text"
+msgstr "Tasavälisen tekstin oletuskirjasinkoko"
+
+#: ../midori/midori-preferences.c:368
+msgid "Minimum Font Size"
+msgstr "Kirjasimen vähimmäiskoko"
+
+#: ../midori/midori-preferences.c:371
+msgid "The minimum font size used to display text"
+msgstr "Pienin tekstin esittämiseen käytettävä koko"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:380
+msgid "Behavior"
+msgstr "Käytös"
+
+#: ../midori/midori-preferences.c:393
+msgid "Enforce 96 dots per inch"
+msgstr "Pakota 96 pistettä tuumalle"
+
+#: ../midori/midori-preferences.c:394
+msgid "Enforce a video dot density of 96 DPI"
+msgstr "Pakota näytön pistetarkkuudeksi 96 DPI"
#: ../midori/midori-preferences.c:414
-msgid "Shrink images automatically"
-msgstr "Pienennä kuvat automaattisesti"
+msgid "Allow scripts to open popups"
+msgstr "Salli skriptien ponnahdusikkunat"
-#: ../midori/midori-preferences.c:417
-msgid "Print background images"
-msgstr "Näytä taustakuvat"
+#: ../midori/midori-preferences.c:415
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Avaa ponnahdusikkunat skripteistä automaattisesti"
-#: ../midori/midori-preferences.c:420
-msgid "Resizable text areas"
-msgstr "Tekstialueiden kokoa voidaan muuttaa"
+#: ../midori/midori-preferences.c:419
+msgid "Spell Checking"
+msgstr "Oikoluku"
+
+#: ../midori/midori-preferences.c:422
+msgid "Enable Spell Checking"
+msgstr "Ota oikoluku käyttöön"
#: ../midori/midori-preferences.c:423
-#: ../extensions/statusbar-features.c:39
-msgid "Enable scripts"
-msgstr "Salli skriptit"
+msgid "Enable spell checking while typing"
+msgstr "Käytä oikolukua kirjoittaessa"
-#: ../midori/midori-preferences.c:426
-#: ../extensions/statusbar-features.c:46
-msgid "Enable plugins"
-msgstr "Salli liitännäiset"
+#: ../midori/midori-preferences.c:425
+msgid "Spelling dictionaries:"
+msgstr "Oikolukusanastot:"
+#. i18n: The example should be adjusted to contain a good local default
#: ../midori/midori-preferences.c:429
-msgid "Enable developer tools"
-msgstr "Ota kehittäjän työkalut käyttöön"
+msgid ""
+"A comma separated list of languages to be used for spell checking, for "
+"example \"en_GB,de_DE\""
+msgstr ""
+"Pilkuin erotettu lista kielistä, joita käytetään oikolukemiseen. Esimerkiksi "
+"\"fi_FI,sv_SE,en_EN\""
#. Page "Interface"
-#: ../midori/midori-preferences.c:437
+#: ../midori/midori-preferences.c:435
msgid "Interface"
msgstr "Käyttöliittymä"
-#: ../midori/midori-preferences.c:438
+#: ../midori/midori-preferences.c:436
msgid "Navigationbar"
msgstr "Navigointipalkki"
-#: ../midori/midori-preferences.c:453
+#: ../midori/midori-preferences.c:446
msgid "Browsing"
msgstr "Selaaminen"
-#: ../midori/midori-preferences.c:480
-#: ../midori/midori-preferences.c:481
+#. Page "Applications"
+#: ../midori/midori-preferences.c:468
+msgid "Applications"
+msgstr "Sovellukset"
+
+#: ../midori/midori-preferences.c:469
+msgid "External applications"
+msgstr "Ulkoiset sovellukset"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486
msgid "Network"
msgstr "Verkko"
#: ../midori/midori-preferences.c:492
-msgid "MB"
-msgstr "MB"
+msgid "Hostname"
+msgstr "Isäntänimi"
#. Page "Privacy"
-#: ../midori/midori-preferences.c:498
+#: ../midori/midori-preferences.c:511
msgid "Privacy"
msgstr "Yksityisyys"
-#: ../midori/midori-preferences.c:500
+#: ../midori/midori-preferences.c:512
msgid "Web Cookies"
-msgstr "Verkkoevästeet"
+msgstr "Evästeet"
-#: ../midori/midori-preferences.c:513
-#: ../midori/midori-preferences.c:524
+#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535
msgid "days"
-msgstr "päivää"
+msgstr "vrk"
-#: ../midori/midori-searchaction.c:456
-#: ../katze/katze-arrayaction.c:273
-msgid "Empty"
-msgstr "Tyhjä"
-
-#: ../midori/midori-searchaction.c:797
+#: ../midori/midori-searchaction.c:917
msgid "Add search engine"
msgstr "Lisää hakukone"
-#: ../midori/midori-searchaction.c:797
+#: ../midori/midori-searchaction.c:917
msgid "Edit search engine"
msgstr "Muokkaa hakukonetta"
-#: ../midori/midori-searchaction.c:825
+#: ../midori/midori-searchaction.c:945
msgid "_Name:"
msgstr "_Nimi:"
-#: ../midori/midori-searchaction.c:869
-msgid "_Icon (name or file):"
-msgstr "_Kuvake (nimi tai tiedosto):"
+#: ../midori/midori-searchaction.c:989
+msgid "_Icon:"
+msgstr "_Kuvake:"
-#: ../midori/midori-searchaction.c:883
+#: ../midori/midori-searchaction.c:1003
msgid "_Token:"
msgstr "_Merkki:"
-#: ../midori/midori-searchaction.c:1060
-msgid "Manage search engines"
+#: ../midori/midori-searchaction.c:1234
+msgid "Manage Search Engines"
msgstr "Hallitse hakukoneita"
-#: ../midori/sokoke.c:63
-#: ../midori/sokoke.c:75
-msgid "Could not run external program."
-msgstr "Ulkoista ohjelmaa ei voitu suorittaa"
+#: ../midori/midori-searchaction.c:1335
+msgid "Use as _default"
+msgstr "Aseta _oletukseksi"
-#: ../midori/sokoke.c:282
-msgid "Warning: You are using a superuser account!"
-msgstr "Varoitus: Käytät pääkäyttäjän tiliä!"
+#: ../midori/sokoke.c:1299
+msgid "_Bookmark"
+msgstr "_Kirjanmerkki"
-#: ../midori/gjs.c:514
-msgid "An unknown error occured."
-msgstr "Tapahtui tuntematon virhe."
+#: ../midori/sokoke.c:1301
+msgid "Add Boo_kmark"
+msgstr "Luo ki_rjanmerkki"
-#: ../midori/gjs.c:742
-#: ../midori/gjs.c:832
-#, c-format
-msgid "%s has no property '%s'"
-msgstr "Asialla %s ei ole ominaisuutta ”%s”"
+#: ../midori/sokoke.c:1302
+msgid "_Console"
+msgstr "K_onsoli"
-#: ../midori/gjs.c:878
-#, c-format
-msgid "%s cannot be assigned to %s.%s"
-msgstr ""
+#: ../midori/sokoke.c:1303
+msgid "_Extensions"
+msgstr "_Liitännäiset"
-#: ../midori/gjs.c:888
-#, c-format
-msgid "%s.%s cannot be accessed"
-msgstr ""
+#: ../midori/sokoke.c:1304
+msgid "_History"
+msgstr "_Historia"
-#: ../panels/midori-addons.c:98
-#: ../panels/midori-addons.c:144
+#: ../midori/sokoke.c:1305
+msgid "_Homepage"
+msgstr "_Kotisivu"
+
+#: ../midori/sokoke.c:1306
+msgid "_Userscripts"
+msgstr "Käyttäjän _skriptit"
+
+#: ../midori/sokoke.c:1307
+msgid "New _Tab"
+msgstr "Uusi _välilehti"
+
+#: ../midori/sokoke.c:1308
+msgid "_Transfers"
+msgstr "_Lataukset"
+
+#: ../midori/sokoke.c:1309
+msgid "Netscape p_lugins"
+msgstr "_Netscape-liitännäiset"
+
+#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144
msgid "Userscripts"
msgstr "Käyttäjän skriptit"
-#: ../panels/midori-addons.c:99
-#: ../panels/midori-addons.c:146
+#: ../panels/midori-addons.c:100
msgid "Userstyles"
msgstr "Käyttäjän tyylit"
-#: ../panels/midori-addons.c:1006
-#: ../panels/midori-extensions.c:144
-msgid "_Enable"
-msgstr "_Ota käyttöön"
+#: ../panels/midori-addons.c:305
+#, c-format
+msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s."
+msgstr "Kopioi käyttäjän skriptit kansioon %s ja käyttäjän tyylit kansioon %s."
-#: ../panels/midori-addons.c:1015
-#: ../panels/midori-extensions.c:153
-msgid "_Disable"
-msgstr "_Poista käytöstä"
+#: ../panels/midori-addons.c:911
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "Kansiota \"%s\" ei voi valvoa: %s"
+
+#: ../panels/midori-bookmarks.c:111
+msgid "Bookmarks"
+msgstr "Kirjanmerkit"
+
+#: ../panels/midori-bookmarks.c:250
+msgid "Edit the selected bookmark"
+msgstr "Muokkaa valittua kirjanmerkkiä"
+
+#: ../panels/midori-bookmarks.c:258
+msgid "Delete the selected bookmark"
+msgstr "Poista valittu kirjanmerkki"
+
+#: ../panels/midori-bookmarks.c:278
+msgid "Add a new folder"
+msgstr "Lisää uusi kansio"
+
+#: ../panels/midori-bookmarks.c:608
+msgid "Separator"
+msgstr "Erotin"
#: ../panels/midori-console.c:87
msgid "Console"
msgstr "Konsoli"
-#: ../panels/midori-extensions.c:87
+#: ../panels/midori-extensions.c:91
msgid "Extensions"
msgstr "Liitännäiset"
-#: ../katze/katze-throbber.c:828
+#: ../panels/midori-history.c:273
+msgid "Erroneous clock time"
+msgstr "Virheellinen kellonaika"
+
+#: ../panels/midori-history.c:274
+msgid ""
+"The clock time lies in the past. Please check the current date and time."
+msgstr "Kello ei ole ajassa. Tarkista kellonaika ja päiväys."
+
+#: ../panels/midori-history.c:286
+msgid "A week ago"
+msgstr "Viikko sitten"
+
+#: ../panels/midori-history.c:288
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d päivä sitten"
+msgstr[1] "%d päivää sitten"
+
+#: ../panels/midori-history.c:291
+msgid "Today"
+msgstr "Tänään"
+
+#: ../panels/midori-history.c:293
+msgid "Yesterday"
+msgstr "Eilen"
+
+#: ../panels/midori-history.c:378
+msgid "Are you sure you want to remove all history items?"
+msgstr "Haluatko varmasti tyhjentää koko sivuhistorian?"
+
+#: ../panels/midori-history.c:438
+msgid "Bookmark the selected history item"
+msgstr "Luo kirjanmerkki sivuhistorian kohteeseen"
+
+#: ../panels/midori-history.c:447
+msgid "Delete the selected history item"
+msgstr "Poista valittu kohde sivuhistoriasta"
+
+#: ../panels/midori-history.c:455
+msgid "Clear the entire history"
+msgstr "Tyhjennä koko sivuhistoria"
+
+#: ../panels/midori-history.c:953
+#: ../extensions/cookie-manager/cookie-manager-page.c:1144
+msgid "Filter:"
+msgstr "Suodata:"
+
+#: ../panels/midori-transfers.c:479
+msgid "Open Destination _Folder"
+msgstr "Avaa _kohdekansio"
+
+#: ../panels/midori-transfers.c:482
+msgid "Copy Link Loc_ation"
+msgstr "Kopioi linkin ko_hde"
+
+#: ../katze/katze-http-auth.c:214
+msgid "Authentication Required"
+msgstr "Ole hyvä ja tunnistaudu"
+
+#: ../katze/katze-http-auth.c:230
+msgid ""
+"A username and a password are required\n"
+"to open this location:"
+msgstr ""
+"Sijainnin avaamiseen tarvitaan\n"
+"käyttäjätunnus ja salasana:"
+
+#: ../katze/katze-http-auth.c:244
+msgid "Username"
+msgstr "Tunnus"
+
+#: ../katze/katze-http-auth.c:257
+msgid "Password"
+msgstr "Salasana"
+
+#: ../katze/katze-http-auth.c:272
+msgid "_Remember password"
+msgstr "_Muista salasana"
+
+#: ../katze/katze-throbber.c:842
#, c-format
msgid "Named icon '%s' couldn't be loaded"
-msgstr "Nimettyä kuvaketta ”%s” ei voitu ladata"
+msgstr "Nimetyn kuvakkeen \"%s\" lataus epäonnistui"
-#: ../katze/katze-throbber.c:841
+#: ../katze/katze-throbber.c:855
#, c-format
msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Vakiokuvaketta ”%s” ei voitu ladata"
+msgstr "Vakiokuvakkeen \"%s\" lataus epäonnistui"
-#: ../katze/katze-throbber.c:907
+#: ../katze/katze-throbber.c:923
msgid "Animation frames are broken"
-msgstr "Animaatiokehykset ovat rikki"
+msgstr "Animaation kuvissa on vikaa"
-#: ../katze/katze-utils.c:154
-#: ../katze/katze-utils.c:352
+#: ../katze/katze-utils.c:495 ../katze/katze-utils.c:890
#, c-format
msgid "Property '%s' is invalid for %s"
-msgstr "Ominaisuus ”%s” on epäkelpo kohteelle %s"
+msgstr "Ominaisuus \"%s\" ei kelpaa kohteelle %s"
-#: ../katze/katze-utils.c:178
-#: ../katze/katze-utils.c:217
+#: ../katze/katze-utils.c:541 ../katze/katze-utils.c:570
msgid "Choose file"
msgstr "Valitse tiedosto"
-#: ../katze/katze-utils.c:198
+#: ../katze/katze-utils.c:556
msgid "Choose folder"
msgstr "Valitse kansio"
+#: ../katze/katze-preferences.c:95
+#, c-format
+msgid "Preferences for %s"
+msgstr "????Kohteen %s asetukset"
+
+#: ../extensions/adblock.c:409
+msgid "Configure Advertisement filters"
+msgstr "Säädä mainossuodattimia"
+
+#: ../extensions/adblock.c:441
+#, 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."
+
+#: ../extensions/adblock.c:581
+msgid "Configure _Advertisement filters..."
+msgstr "Säädä _mainossuodattimia..."
+
+#: ../extensions/adblock.c:835
+msgid "Edit rule"
+msgstr "Muokkaa sääntöä"
+
+#: ../extensions/adblock.c:848
+msgid "_Rule:"
+msgstr "_Nimi:"
+
+#: ../extensions/adblock.c:902
+msgid "Bl_ock image"
+msgstr "_Estä kuva"
+
+#: ../extensions/adblock.c:907
+msgid "Bl_ock link"
+msgstr "_Estä linkki"
+
+#: ../extensions/adblock.c:1481
+msgid "Advertisement blocker"
+msgstr "Mainosten estäjä"
+
+#: ../extensions/adblock.c:1482
+msgid "Block advertisements according to a filter list"
+msgstr "Estä mainosten lataaminen suodatinlistan avulla"
+
+#: ../extensions/colorful-tabs.c:204
+msgid "Colorful Tabs"
+msgstr "Värikkäät välilehdet"
+
+#: ../extensions/colorful-tabs.c:205
+msgid "Tint each tab distinctly"
+msgstr "Sävytä välilehdet eri väreillä"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:82
+#: ../extensions/cookie-manager/main.c:56
+msgid "Cookie Manager"
+msgstr "Evästeiden hallinta"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:112
+msgid "Delete All"
+msgstr "Poista kaikki"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:114
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"Poista näkyvät evästeet. Jos suodatin on asetettu, poistetaan ainoastaan "
+"suodatinta vastaavat evästeet."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:129
+msgid "Expand All"
+msgstr "Laajenna kaikki"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:136
+msgid "Collapse All"
+msgstr "Supista kaikki"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:578
+msgid "Do you really want to delete all cookies?"
+msgstr "Haluatko varmasti poistaa kaikki evästeet?"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:580
+msgid "Question"
+msgstr "Kysymys"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:589
+msgid "Only cookies which match the filter will be deleted."
+msgstr "Vain suodatinta vastaavat kuvakkeet poistetaan."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:677
+msgid "At the end of the session"
+msgstr "Istunnon lopuksi"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#, c-format
+msgid ""
+"Host: %s\n"
+"Name: %s\n"
+"Value: %s\n"
+"Path: %s\n"
+"Secure: %s\n"
+"Expires: %s"
+msgstr ""
+"Palvelin: %s\n"
+"Nimi: %s\n"
+"Arvo: %s\n"
+"Polku: %s\n"
+"Suojattu: %s\n"
+"Vanhentuu: %s"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:686
+msgid "Yes"
+msgstr "Kyllä"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:686
+msgid "No"
+msgstr "Ei"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:700
+#, c-format
+msgid ""
+"Domain: %s\n"
+"Cookies: %d"
+msgstr ""
+"Verkkotunnus: %s\n"
+"Evästeet: %d"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1030
+msgid "Name"
+msgstr "Nimi:"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1083
+msgid "_Expand All"
+msgstr "_Laajenna kaikki"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1091
+msgid "_Collapse All"
+msgstr "_Supista kaikki"
+
+#: ../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/main.c:40
+msgid "_Cookie Manager"
+msgstr "_Evästeiden hallinta"
+
+#: ../extensions/cookie-manager/main.c:57
+msgid "List, view and delete cookies"
+msgstr "Selaa, katsele ja poista evästeitä"
+
+#: ../extensions/feed-panel/feed-atom.c:209
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr "XML ei sisällä tarvittavia Atom \"entry\"-elementtejä."
+
+#: ../extensions/feed-panel/feed-atom.c:315
+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:399
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr "Päivitetty: %s."
+
+#: ../extensions/feed-panel/feed-panel.c:671
+msgid "Feeds"
+msgstr "Syötteet"
+
+#: ../extensions/feed-panel/feed-panel.c:724
+msgid "Add new feed"
+msgstr "Lisää syöte"
+
+#: ../extensions/feed-panel/feed-panel.c:731
+msgid "Delete feed"
+msgstr "Poista syöte"
+
+#: ../extensions/feed-panel/feed-panel.c:814
+msgid "_Feeds"
+msgstr "Syött_eet"
+
+#: ../extensions/feed-panel/feed-parse.c:192
+#, c-format
+msgid "Failed to find root element in feed XML data."
+msgstr "Syötteen XML ei sisällä juurielementtiä."
+
+#: ../extensions/feed-panel/feed-parse.c:232
+#, c-format
+msgid "Unsupported feed format."
+msgstr "Syöttemuotoa ei tueta."
+
+#: ../extensions/feed-panel/feed-parse.c:262
+#, 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
+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
+msgid "Unsupported RSS version found."
+msgstr "RSS-syötteen versiota ei tueta."
+
+#: ../extensions/feed-panel/feed-rss.c:148
+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
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr "XML ei sisällä tarvittavia RSS \"channel\"-elementtejä."
+
+#: ../extensions/feed-panel/main.c:132
+msgid "Error"
+msgstr "Virhe"
+
+#: ../extensions/feed-panel/main.c:134
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr "Syöte \"%s\" on jo olemassa"
+
+#: ../extensions/feed-panel/main.c:211
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr "Virhe ladattaessa syötettä \"%s\"."
+
+#: ../extensions/feed-panel/main.c:522
+msgid "Feed Panel"
+msgstr "Syötepaneeli"
+
+#: ../extensions/feed-panel/main.c:523
+msgid "Read Atom/ RSS feeds"
+msgstr "Lue Atom/RSS-syötteitä"
+
+#: ../extensions/formhistory.c:144
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr "Lomakkeen arvon lisääminen epäonnistui: %s\n"
+
+#: ../extensions/formhistory.c:510
+msgid "Stores history of entered form data"
+msgstr "Muistaa syötetyt lomaketiedot"
+
+#: ../extensions/formhistory.c:514
+#, c-format
+msgid "Not available: %s"
+msgstr "Ei saatavilla: %s"
+
+#: ../extensions/formhistory.c:515
+msgid "Resource files not installed"
+msgstr "Resurssitiedostoja ei ole asennettu"
+
+#: ../extensions/formhistory.c:521
+msgid "Form history filler"
+msgstr "Lomakehistorian täyttäjä"
+
+#: ../extensions/mouse-gestures.c:288
+msgid "Mouse Gestures"
+msgstr "Hiirieleet"
+
+#: ../extensions/mouse-gestures.c:289
+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:109
-#: ../extensions/page-holder.c:144
+#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177
msgid "Pageholder"
-msgstr "Sivupidike"
+msgstr "Sivusäilö"
-#: ../extensions/page-holder.c:128
+#: ../extensions/page-holder.c:161
msgid "_Pageholder"
-msgstr "_Sivupidike"
+msgstr "_Sivusäilö"
-#: ../extensions/statusbar-features.c:30
+#: ../extensions/page-holder.c:178
+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
+msgid "Customize Keyboard shortcuts"
+msgstr "Muokkaa pikanäppäimiä"
+
+#: ../extensions/shortcuts.c:276
+msgid "Customize Sh_ortcuts..."
+msgstr "Muokkaa pika_näppäimiä,,,"
+
+#: ../extensions/shortcuts.c:315
+msgid "Shortcuts"
+msgstr "Pikanäppäimet"
+
+#: ../extensions/shortcuts.c:316
+msgid "View and edit keyboard shortcuts"
+msgstr "Näytä ja muokkaa toimintojen pikanäppäimiä"
+
+#: ../extensions/statusbar-features.c:84
msgid "Images"
msgstr "Kuvat"
-#: ../extensions/statusbar-features.c:37
+#: ../extensions/statusbar-features.c:96
msgid "Scripts"
msgstr "Skriptit"
-#: ../extensions/statusbar-features.c:44
-msgid "Plugins"
-msgstr "Liitännäiset"
+#: ../extensions/statusbar-features.c:108
+msgid "Netscape plugins"
+msgstr "Netscape-liitännäiset"
-#~ msgid "Open in Page_holder..."
-#~ msgstr "Avaa _sivun pitäjässä"
-#~ msgid "Open the current page in the pageholder"
-#~ msgstr "Avaa nykyinen sivu sivun pitäjässä"
-#~ msgid "Open the selected bookmark in a new tab"
-#~ msgstr "Avaa valittu kirjanmerkki uudessa välilehdessä"
-#~ msgid "Open the selected bookmark in a new window"
-#~ msgstr "Avaa valittu kirjanmerkki uudessa ikkunassa"
-#~ msgid "Open the selected history item in a new tab"
-#~ msgstr "Avaa valittu historiatietue uudessa välilehdessä"
-#~ msgid "Last pageholder URI"
-#~ msgstr "Viimeisin sivupidike URL-osoite"
-#~ msgid "The URI last opened in the pageholder"
-#~ msgstr "Viimeisin avoinna ollut URL-osoite sivupipidike"
-#~ msgid "Download Link with Download _Manager"
-#~ msgstr "Lataa linkin kohde _latauksien hallinnalla"
+#: ../extensions/statusbar-features.c:149
+msgid "Statusbar Features"
+msgstr "Tilapalkin ominaisuudet"
+#: ../extensions/statusbar-features.c:150
+msgid "Easily toggle features on web pages on and off"
+msgstr "Hallitse verkkosivujen käyttämiä ominaisuuksia vaivattomasti"
+
+#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625
+msgid "Tab Panel"
+msgstr "Välilehtipaneeli"
+
+#: ../extensions/tab-panel.c:609
+msgid "T_ab Panel"
+msgstr "_Välilehtipaneeli"
+
+#: ../extensions/tab-panel.c:626
+msgid "Show tabs in a vertical panel"
+msgstr "Näytä välilehdet pystypaneelissa"
+
+#: ../extensions/tab-switcher.c:395
+msgid "Tab History List"
+msgstr "Välilehtihistoria"
+
+#: ../extensions/tab-switcher.c:396
+msgid "Allows to switch tabs by choosing from a list sorted by last usage"
+msgstr "Vaihda välilehteä edellisen käytön mukaan järjestetyn listan avulla"
+
+#: ../extensions/toolbar-editor.c:389
+msgid "Customize Toolbar"
+msgstr "Mukauta työkalupalkkia"
+
+#: ../extensions/toolbar-editor.c:405
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reodered by drag "
+"and drop."
+msgstr ""
+"Valitse työkalupalkissa näkyvät kohteet. Voit järjestää kohteita raahaamalla "
+"ja pudottamalla."
+
+#: ../extensions/toolbar-editor.c:421
+msgid "Available Items"
+msgstr "Käytettävissä"
+
+#: ../extensions/toolbar-editor.c:442
+msgid "Displayed Items"
+msgstr "Käytössä"
+
+#: ../extensions/toolbar-editor.c:577
+msgid "Customize _Toolbar..."
+msgstr "Mukauta työ_kalupalkkia..."
+
+#: ../extensions/toolbar-editor.c:608
+msgid "Toolbar Editor"
+msgstr "Työkalupalkin muokkain"
+
+#: ../extensions/toolbar-editor.c:609
+msgid "Easily edit the toolbar layout"
+msgstr "Muokkaa työkalupalkin asettelua vaivattomasti"
+
+#: ../extensions/web-cache.c:465
+msgid "Cache HTTP communication on disk"
+msgstr "Välimuistita HTTP-liikenne levylle"
+
+#~ msgid "Open _Link"
+#~ msgstr "Avaa li_nkki"
+
+#~ msgid "Open Image in New Wi_ndow"
+#~ msgstr "Avaa kuva uuteen ikku_naan"
+
+#~ msgid "REGEX"
+#~ msgstr "LAUSEKE"
diff --git a/po/fr.po b/po/fr.po
index 0083aab9..fd13213d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,18 +4,18 @@
# Christian Dywan 2008-2009
# Adrien Nader 2008
# Robert-André Mauchin 2008
-# Pascal Gervais 2009
+# Pascal Gervais 2009-2010
# Jérôme Geulfucci 2009
# Stéphane Marguet 2009-2010
# Patrick Douart 2010
#
msgid ""
msgstr ""
-"Project-Id-Version: midori 0.2.0\n"
+"Project-Id-Version: midori 0.2.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-11 12:06+0100\n"
-"PO-Revision-Date: 2010-02-11 15:20+0100\n"
-"Last-Translator: Douart Patrick \n"
+"POT-Creation-Date: 2010-05-10 12:45-0400\n"
+"PO-Revision-Date: 2010-05-10 13:07-0400\n"
+"Last-Translator: Pascal Gervais \n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@@ -26,12 +26,9 @@ msgstr ""
msgid "Lightweight web browser"
msgstr "Navigateur Internet léger"
-#: ../data/midori.desktop.in.h:2
-#: ../midori/main.c:1280
-#: ../midori/main.c:1511
-#: ../midori/main.c:1519
-#: ../midori/main.c:1535
-#: ../midori/midori-websettings.c:299
+#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664
+#: ../midori/main.c:1672 ../midori/main.c:1688
+#: ../midori/midori-websettings.c:318
msgid "Midori"
msgstr "Midori"
@@ -39,187 +36,210 @@ msgstr "Midori"
msgid "Web Browser"
msgstr "Navigateur Internet"
-#: ../midori/main.c:96
+#: ../midori/main.c:102
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "La configuration n'a pu être chargée : %s\n"
-#: ../midori/main.c:145
+#: ../midori/main.c:151
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "La valeur « %s » n'est pas valide pour %s"
-#: ../midori/main.c:152
-#: ../midori/main.c:238
+#: ../midori/main.c:158 ../midori/main.c:244
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Valeur de paramètre non valide « %s »"
-#: ../midori/main.c:364
-#: ../extensions/formhistory.c:442
+#: ../midori/main.c:370 ../extensions/formhistory.c:446
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Impossible d'ouvrir la base de données : %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:413
+#: ../midori/main.c:425
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Impossible de supprimer les anciens éléments de l'historique : %s\n"
-#: ../midori/main.c:441
+#: ../midori/main.c:445
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "La configuration n'a pas pu être enregistrée. %s"
-#: ../midori/main.c:479
+#: ../midori/main.c:483
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Les moteurs de recherche n'ont pas pu être enregistrés. %s"
-#: ../midori/main.c:498
-#: ../midori/main.c:548
-#: ../midori/main.c:568
+#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572
#, c-format
msgid "The bookmarks couldn't be saved. %s"
msgstr "Les signets n'ont pas pu être enregistrés. %s"
# pas très content
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:598
-#: ../midori/main.c:621
+#: ../midori/main.c:602 ../midori/main.c:625
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "La corbeille n'a pas pu être enregistrée. %s"
-#: ../midori/main.c:685
-#: ../midori/main.c:888
+#: ../midori/main.c:684 ../midori/main.c:924
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "La session n'a pas pu être enregistrée. %s"
-#: ../midori/main.c:922
-msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem."
-msgstr "Midori semble s'être interrompu de façon inattendue lors de la dernière utilisation. Si cela se produit de façon répétée, essayez l'une des options suivantes pour résoudre le problème."
+#: ../midori/main.c:868
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"Aucun fichier de certificat racine disponible. Les certificats SSL ne "
+"peuvent être vérifiés."
-#: ../midori/main.c:937
+#: ../midori/main.c:958
+msgid ""
+"Midori seems to have crashed the last time it was opened. If this happened "
+"repeatedly, try one of the following options to solve the problem."
+msgstr ""
+"Midori semble s'être interrompu de façon inattendue lors de la dernière "
+"utilisation. Si cela se produit de façon répétée, essayez l'une des options "
+"suivantes pour résoudre le problème."
+
+#: ../midori/main.c:973
msgid "Modify _preferences"
msgstr "Modifier les _préférences"
-#: ../midori/main.c:941
+#: ../midori/main.c:977
msgid "Reset the last _session"
msgstr "Réinitialiser la dernière _session"
-#: ../midori/main.c:946
+#: ../midori/main.c:982
msgid "Disable all _extensions"
msgstr "Désactiver toutes les _extensions"
-#: ../midori/main.c:1166
-#: ../midori/main.c:1775
+#: ../midori/main.c:1217 ../midori/main.c:1937
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "La session n'a pas pu être chargée : %s\n"
-#: ../midori/main.c:1280
+#: ../midori/main.c:1336
msgid "No filename specified"
msgstr "Aucun nom de fichier spécifié"
-#: ../midori/main.c:1299
+#: ../midori/main.c:1355
msgid "An unknown error occured."
msgstr "Une erreur inconnue est survenue."
-#: ../midori/main.c:1330
+#: ../midori/main.c:1386
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Capture enregistrée sous: %s\n"
-#: ../midori/main.c:1413
+#: ../midori/main.c:1557
msgid "Run ADDRESS as a web application"
msgstr "Lancer l'ADRESSE comme une application internet"
-#: ../midori/main.c:1413
+#: ../midori/main.c:1557
msgid "ADDRESS"
msgstr "ADRESSE"
-#: ../midori/main.c:1416
+#: ../midori/main.c:1560
msgid "Use FOLDER as configuration folder"
msgstr "Utiliser DOSSIER comme dossier de configuration"
-#: ../midori/main.c:1416
+#: ../midori/main.c:1560
msgid "FOLDER"
msgstr "DOSSIER"
-#: ../midori/main.c:1419
+#: ../midori/main.c:1563
msgid "Show a diagnostic dialog"
msgstr "Afficher une fenêtre de diagnostic"
-#: ../midori/main.c:1421
+#: ../midori/main.c:1565
msgid "Run the specified filename as javascript"
msgstr "Lancer le fichier spécifié en tant que javascript"
-#: ../midori/main.c:1424
+#: ../midori/main.c:1568
msgid "Take a snapshot of the specified URI"
msgstr "Prendre une capture de l'URI spécifiée"
-#: ../midori/main.c:1427
+#: ../midori/main.c:1571
msgid "Execute the specified command"
msgstr "Exécuter la commande spécifiée"
-#: ../midori/main.c:1429
+#: ../midori/main.c:1573
msgid "Display program version"
msgstr "Afficher la version du programme"
-#: ../midori/main.c:1431
+#: ../midori/main.c:1575
msgid "Addresses"
msgstr "Adresses"
-#: ../midori/main.c:1508
+#: ../midori/main.c:1577
+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:1577
+msgid "PATTERN"
+msgstr "MODÈLE"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:1581
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Réinitialiser Midori après SECONDES secondes d'inactivité"
+
+#: ../midori/main.c:1581
+msgid "SECONDS"
+msgstr "SECONDES"
+
+#: ../midori/main.c:1661
msgid "[Addresses]"
msgstr "[Adresses]"
-#: ../midori/main.c:1536
+#: ../midori/main.c:1689
msgid "Please report comments, suggestions and bugs to:"
-msgstr "Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :"
+msgstr ""
+"Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1691
msgid "Check for new versions at:"
msgstr "Vérifier l'existence de nouvelles versions à :"
-#: ../midori/main.c:1626
+#: ../midori/main.c:1788
msgid "The specified configuration folder is invalid."
msgstr "Le dossier de configuration specifié n'est pas valide."
-#: ../midori/main.c:1674
+#: ../midori/main.c:1836
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n"
-#: ../midori/main.c:1729
+#: ../midori/main.c:1891
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Les moteurs de recherche n'ont pas pu être chargés. %s\n"
-#: ../midori/main.c:1758
+#: ../midori/main.c:1920
#, c-format
msgid "The bookmarks couldn't be loaded: %s\n"
msgstr "Les signets n'ont pas pu être chargés : %s\n"
# pas très content
-#: ../midori/main.c:1790
+#: ../midori/main.c:1952
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "La corbeille n'a pas pu être chargée : %s\n"
# pas très content
-#: ../midori/main.c:1804
+#: ../midori/main.c:1966
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "L'historique n'a pas pu être chargé : %s\n"
-#: ../midori/main.c:1818
+#: ../midori/main.c:1980
msgid "The following errors occured:"
msgstr "Les erreurs suivantes sont survenues :"
-#: ../midori/main.c:1834
+#: ../midori/main.c:1996
msgid "_Ignore"
msgstr "_Ignorer"
@@ -227,8 +247,7 @@ msgstr "_Ignorer"
msgid "File not found."
msgstr "Fichier non trouvé."
-#: ../midori/midori-array.c:462
-#: ../midori/midori-array.c:485
+#: ../midori/midori-array.c:462 ../midori/midori-array.c:485
#: ../midori/midori-array.c:495
msgid "Malformed document."
msgstr "Document mal formé."
@@ -237,258 +256,275 @@ msgstr "Document mal formé."
msgid "Unrecognized bookmark format."
msgstr "Format de signets inconnus."
-#: ../midori/midori-array.c:718
-#: ../midori/sokoke.c:1009
+#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115
#, c-format
msgid "Writing failed."
msgstr "L'écriture a échoué."
-#: ../midori/midori-browser.c:325
-#: ../midori/midori-browser.c:5203
-#: ../midori/midori-browser.c:5209
+#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5511
+#: ../midori/midori-browser.c:5517
msgid "Reload the current page"
msgstr "Actualiser la page courante"
-#: ../midori/midori-browser.c:335
-#: ../midori/midori-browser.c:5206
+#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5514
msgid "Stop loading the current page"
msgstr "Arrêter le chargement de la page courante"
-#: ../midori/midori-browser.c:446
+#: ../midori/midori-browser.c:457
#, c-format
msgid "%d%% loaded"
msgstr "%d%% chargés"
-#: ../midori/midori-browser.c:484
+#: ../midori/midori-browser.c:495
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Impossible de mettre à jour le titre: %s\n"
-#: ../midori/midori-browser.c:498
+#: ../midori/midori-browser.c:509
#, c-format
msgid "Unexpected action '%s'."
msgstr "Action inattendue « %s »."
-#: ../midori/midori-browser.c:704
+#: ../midori/midori-browser.c:716
msgid "New folder"
msgstr "Nouveau dossier"
-#: ../midori/midori-browser.c:704
+#: ../midori/midori-browser.c:716
msgid "Edit folder"
msgstr "Modifier le dossier"
-#: ../midori/midori-browser.c:706
+#: ../midori/midori-browser.c:718
msgid "New bookmark"
msgstr "Nouveau signet"
-#: ../midori/midori-browser.c:706
+#: ../midori/midori-browser.c:718
msgid "Edit bookmark"
msgstr "Modifier le signet"
-#: ../midori/midori-browser.c:736
+#: ../midori/midori-browser.c:749
msgid "_Title:"
msgstr "_Titre :"
-#: ../midori/midori-browser.c:749
-#: ../midori/midori-searchaction.c:961
+#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961
msgid "_Description:"
msgstr "_Description :"
-#: ../midori/midori-browser.c:768
-#: ../midori/midori-searchaction.c:975
+#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975
#: ../extensions/feed-panel/main.c:376
msgid "_Address:"
msgstr "_Adresse :"
# manque un raccourcis Alt+X
-#: ../midori/midori-browser.c:798
-#: ../midori/midori-browser.c:4435
+#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4667
msgid "_Folder:"
msgstr "_Dossier :"
-#: ../midori/midori-browser.c:808
-#: ../midori/midori-browser.c:888
-#: ../midori/midori-browser.c:4440
-#: ../midori/midori-browser.c:4472
+#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901
+#: ../midori/midori-browser.c:4672 ../midori/midori-browser.c:4704
msgid "Toplevel folder"
msgstr "Dossier supérieur"
-#: ../midori/midori-browser.c:837
+#: ../midori/midori-browser.c:850
msgid "Show in the tool_bar"
msgstr "Afficher dans la _barre d'outils"
-#: ../midori/midori-browser.c:852
+#: ../midori/midori-browser.c:865
msgid "Run as _web application"
-msgstr "Lancer comme une application internet"
+msgstr "Lancer comme une application _internet"
-#: ../midori/midori-browser.c:968
-#: ../midori/midori-browser.c:4490
+#: ../midori/midori-browser.c:959
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Il n'y a pas assez d'espace libre pour télécharger \"%s\"."
+
+#: ../midori/midori-browser.c:963
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Le fichier à besoin de %s, mais seulement %s est disponible."
+
+#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4722
+#: ../midori/midori-browser.c:4754
msgid "Save file as"
msgstr "Enregistrer le fichier sous"
-#: ../midori/midori-browser.c:1342
-#: ../panels/midori-transfers.c:271
+#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271
#, c-format
msgid "%s of %s"
msgstr "%s de %s"
-#: ../midori/midori-browser.c:1378
+#: ../midori/midori-browser.c:1429
#, c-format
msgid "The file '%s' has been downloaded."
msgstr "Le fichier « %s » a été téléchargé."
-#: ../midori/midori-browser.c:1382
+#: ../midori/midori-browser.c:1433
msgid "Transfer completed"
msgstr "Transfert terminé"
-#: ../midori/midori-browser.c:1522
+#: ../midori/midori-browser.c:1573
msgid "Save file"
msgstr "Enregistrer le fichier"
-#: ../midori/midori-browser.c:2236
+#: ../midori/midori-browser.c:2322
msgid "Open file"
msgstr "Ouvrir le fichier"
-#: ../midori/midori-browser.c:2312
-#: ../extensions/feed-panel/main.c:364
+#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:364
msgid "New feed"
msgstr "Nouveau flux"
-#: ../midori/midori-browser.c:2353
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:2439 ../midori/midori-browser.c:5576
#: ../panels/midori-bookmarks.c:242
msgid "Add a new bookmark"
msgstr "Ajouter un nouveau signet"
-#: ../midori/midori-browser.c:2927
-#: ../midori/midori-searchaction.c:484
+#: ../midori/midori-browser.c:3012 ../panels/midori-history.c:332
+#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465
+#, c-format
+msgid "Failed to execute database statement: %s\n"
+msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n"
+
+#: ../midori/midori-browser.c:3092 ../midori/midori-searchaction.c:484
msgid "Empty"
msgstr "Vide"
-#: ../midori/midori-browser.c:3542
-#: ../midori/sokoke.c:333
-#: ../midori/sokoke.c:343
-#: ../midori/sokoke.c:371
-#: ../midori/sokoke.c:397
-#: ../midori/sokoke.c:411
+#: ../midori/midori-browser.c:3713 ../midori/sokoke.c:398
+#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462
+#: ../midori/sokoke.c:476
msgid "Could not run external program."
msgstr "Impossible de lancer le programme externe."
-#: ../midori/midori-browser.c:4134
-#: ../panels/midori-bookmarks.c:795
-#: ../panels/midori-history.c:748
+#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:5970
+#, 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:4360 ../panels/midori-bookmarks.c:795
+#: ../panels/midori-history.c:751
msgid "Open all in _Tabs"
msgstr "Tout ouvrir dans des _onglets"
-#: ../midori/midori-browser.c:4141
-#: ../panels/midori-bookmarks.c:801
-#: ../panels/midori-history.c:754
-#: ../extensions/feed-panel/feed-panel.c:545
+#: ../midori/midori-browser.c:4367 ../panels/midori-bookmarks.c:801
+#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545
msgid "Open in New _Tab"
msgstr "Ouvrir dans un nouvel _onglet"
-#: ../midori/midori-browser.c:4144
-#: ../panels/midori-bookmarks.c:803
-#: ../panels/midori-history.c:756
-#: ../extensions/feed-panel/feed-panel.c:547
+#: ../midori/midori-browser.c:4370 ../panels/midori-bookmarks.c:803
+#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547
msgid "Open in New _Window"
msgstr "Ouvrir dans une nouvelle _fenêtre"
-#: ../midori/midori-browser.c:4363
+#: ../midori/midori-browser.c:4593
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4364
+#: ../midori/midori-browser.c:4594
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4595
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4366
+#: ../midori/midori-browser.c:4596
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4367
+#: ../midori/midori-browser.c:4597
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4387
-#: ../panels/midori-bookmarks.c:271
+#: ../midori/midori-browser.c:4618 ../panels/midori-bookmarks.c:271
msgid "Import bookmarks..."
msgstr "Importer des signets..."
-#: ../midori/midori-browser.c:4390
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:4621 ../midori/midori-browser.c:5581
msgid "_Import bookmarks"
msgstr "_Importer des signets"
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4632
msgid "_Application:"
msgstr "_Application :"
-#: ../midori/midori-browser.c:4427
-#: ../midori/midori-browser.c:5358
-#: ../midori/midori-websettings.c:230
-#: ../midori/midori-websettings.c:304
-#: ../katze/katze-utils.c:682
+#: ../midori/midori-browser.c:4659 ../midori/midori-browser.c:5685
+#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323
+#: ../katze/katze-utils.c:691
msgid "Custom..."
msgstr "Personnalisé..."
-#: ../midori/midori-browser.c:4501
+#: ../midori/midori-browser.c:4733
msgid "Failed to import bookmarks"
msgstr "Impossible d'importer les signets"
-#: ../midori/midori-browser.c:4650
+#: ../midori/midori-browser.c:4769
+msgid "Failed to export bookmarks"
+msgstr "Impossible d'exporter les signets"
+
+#: ../midori/midori-browser.c:4823 ../panels/midori-history.c:141
+#: ../panels/midori-history.c:171
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Impossible de supprimer l'élément de l'historique : %s\n"
+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-browser.c:4930
msgid "Clear Private Data"
msgstr "Effacer les informations privées"
-#: ../midori/midori-browser.c:4654
+#: ../midori/midori-browser.c:4934
msgid "_Clear private data"
msgstr "_Effacer les informations privées"
-#: ../midori/midori-browser.c:4667
+#: ../midori/midori-browser.c:4948
msgid "Clear the following data:"
msgstr "Effacer les informations suivantes :"
-#: ../midori/midori-browser.c:4677
-#: ../midori/midori-preferences.c:524
+#: ../midori/midori-browser.c:4959 ../midori/midori-preferences.c:530
#: ../panels/midori-history.c:119
msgid "History"
msgstr "Historique"
-#: ../midori/midori-browser.c:4682
+#: ../midori/midori-browser.c:4965
msgid "Cookies"
msgstr "Fichiers témoins / Cookies"
-#: ../midori/midori-browser.c:4687
+#: ../midori/midori-browser.c:4970
msgid "'Flash' Cookies"
msgstr "Cookies « Flash »"
-#: ../midori/midori-browser.c:4692
+#: ../midori/midori-browser.c:4975
msgid "Website icons"
msgstr "Icônes des pages Internet"
-#: ../midori/midori-browser.c:4697
-#: ../midori/sokoke.c:1199
+#: ../midori/midori-browser.c:4980 ../midori/sokoke.c:1305
msgid "_Closed Tabs"
msgstr "Onglets _fermés"
-#: ../midori/midori-browser.c:4702
-#: ../extensions/web-cache.c:458
+#: ../midori/midori-browser.c:4985 ../extensions/web-cache.c:464
msgid "Web Cache"
msgstr "Cache internet"
-#: ../midori/midori-browser.c:4710
+#: ../midori/midori-browser.c:4993
msgid "Clear private data when _quitting Midori"
msgstr "Effacer les informations privées en _quittant Midori"
-#: ../midori/midori-browser.c:4818
+#: ../midori/midori-browser.c:5094
msgid "A lightweight web browser."
msgstr "Un navigateur Internet léger."
-#: ../midori/midori-browser.c:4834
+#: ../midori/midori-browser.c:5096
+msgid ""
+"This library is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU Lesser General Public License as published by the "
+"Free Software Foundation; either version 2.1 of the License, or (at your "
+"option) any later version."
+msgstr ""
+"Cette bibliothèque est un logiciel libre, vous pouvez le redistribuer et/ou "
+"le modifier selon les termes de la GNU Lesser General Public License telle "
+"que publiée par la Free Software Foundation; soit la version 2.1 de la "
+"licence ou, à votre choix, toutes versions ultérieures."
+
+#: ../midori/midori-browser.c:5115
msgid "translator-credits"
msgstr ""
"Christian Dywan \n"
@@ -497,1124 +533,1178 @@ msgstr ""
"Pascal Gervais \n"
"Jérôme Geulfucci "
-#: ../midori/midori-browser.c:5116
+#: ../midori/midori-browser.c:5424
msgid "_File"
msgstr "_Fichier"
-#: ../midori/midori-browser.c:5118
-#: ../midori/sokoke.c:1200
+#: ../midori/midori-browser.c:5426 ../midori/sokoke.c:1306
msgid "New _Window"
msgstr "Nouvelle _fenêtre"
-#: ../midori/midori-browser.c:5119
+#: ../midori/midori-browser.c:5427
msgid "Open a new window"
msgstr "Ouvrir une nouvelle fenêtre"
-#: ../midori/midori-browser.c:5122
+#: ../midori/midori-browser.c:5430
msgid "Open a new tab"
msgstr "Ouvrir un nouvel onglet"
-#: ../midori/midori-browser.c:5124
+#: ../midori/midori-browser.c:5432
msgid "P_rivate Browsing"
msgstr "Navigation en mode _privé"
-#: ../midori/midori-browser.c:5125
+#: ../midori/midori-browser.c:5433
msgid "Don't save any private data while browsing"
msgstr "Ne pas enregistrer de données privées durant la navigation"
-#: ../midori/midori-browser.c:5129
+#: ../midori/midori-browser.c:5437
msgid "Open a file"
msgstr "Ouvrir un fichier"
-#: ../midori/midori-browser.c:5132
+#: ../midori/midori-browser.c:5440
msgid "Save to a file"
msgstr "Enregistrer dans un fichier"
-#: ../midori/midori-browser.c:5134
+#: ../midori/midori-browser.c:5442
msgid "Add to Speed _dial"
msgstr "Ajouter à la page d'appel rapi_de"
-#: ../midori/midori-browser.c:5135
+#: ../midori/midori-browser.c:5443
msgid "Add shortcut to speed dial"
msgstr "Ajouter un raccourci à la page d'appel rapide"
-#: ../midori/midori-browser.c:5137
+#: ../midori/midori-browser.c:5445
msgid "Add Shortcut to the _desktop"
msgstr "Ajouter un raccourci sur le _bureau"
-#: ../midori/midori-browser.c:5138
+#: ../midori/midori-browser.c:5446
msgid "Add shortcut to the desktop"
msgstr "Ajouter un raccourci sur le bureau"
-#: ../midori/midori-browser.c:5140
+#: ../midori/midori-browser.c:5448
msgid "Subscribe to News _feed"
msgstr "Souscrire au flux de _nouvelles"
-#: ../midori/midori-browser.c:5141
+#: ../midori/midori-browser.c:5449
msgid "Subscribe to this news feed"
msgstr "Souscrire à ce flux de _nouvelles"
-#: ../midori/midori-browser.c:5146
+#: ../midori/midori-browser.c:5454
msgid "_Close Tab"
msgstr "Fe_rmer l'onglet"
-#: ../midori/midori-browser.c:5147
+#: ../midori/midori-browser.c:5455
msgid "Close the current tab"
msgstr "Fermer l'onglet actuel"
-#: ../midori/midori-browser.c:5149
+#: ../midori/midori-browser.c:5457
msgid "C_lose Window"
msgstr "Fer_mer la fenêtre"
-#: ../midori/midori-browser.c:5150
+#: ../midori/midori-browser.c:5458
msgid "Close this window"
msgstr "Fermer cette fenêtre"
-#: ../midori/midori-browser.c:5153
+#: ../midori/midori-browser.c:5461
msgid "Print the current page"
msgstr "Imprimer la page actuelle"
-#: ../midori/midori-browser.c:5156
+#: ../midori/midori-browser.c:5464
msgid "Quit the application"
msgstr "Quitter le programme"
-#: ../midori/midori-browser.c:5158
+#: ../midori/midori-browser.c:5466
msgid "_Edit"
msgstr "É_dition"
-#: ../midori/midori-browser.c:5162
+#: ../midori/midori-browser.c:5470
msgid "Undo the last modification"
msgstr "Annuler la dernière modification"
-#: ../midori/midori-browser.c:5165
+#: ../midori/midori-browser.c:5473
msgid "Redo the last modification"
msgstr "Refaire la dernière modification"
-#: ../midori/midori-browser.c:5169
+#: ../midori/midori-browser.c:5477
msgid "Cut the selected text"
msgstr "Couper le texte sélectionné"
-#: ../midori/midori-browser.c:5172
-#: ../midori/midori-browser.c:5175
+#: ../midori/midori-browser.c:5480 ../midori/midori-browser.c:5483
msgid "Copy the selected text"
msgstr "Copier le texte sélectionné"
-#: ../midori/midori-browser.c:5178
+#: ../midori/midori-browser.c:5486
msgid "Paste text from the clipboard"
msgstr "Coller le texte à partir du presse-papiers"
-#: ../midori/midori-browser.c:5181
+#: ../midori/midori-browser.c:5489
msgid "Delete the selected text"
msgstr "Supprimer le texte sélectionné"
-#: ../midori/midori-browser.c:5184
+#: ../midori/midori-browser.c:5492
msgid "Select all text"
msgstr "Sélectionner tout le texte"
-#: ../midori/midori-browser.c:5187
+#: ../midori/midori-browser.c:5495
msgid "Find a word or phrase in the page"
msgstr "Rechercher un mot ou une phrase dans la page"
-#: ../midori/midori-browser.c:5189
+#: ../midori/midori-browser.c:5497
msgid "Find _Next"
msgstr "Rechercher le sui_vant"
-#: ../midori/midori-browser.c:5190
+#: ../midori/midori-browser.c:5498
msgid "Find the next occurrence of a word or phrase"
msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase"
-#: ../midori/midori-browser.c:5192
+#: ../midori/midori-browser.c:5500
msgid "Find _Previous"
msgstr "Rechercher le _précédent"
-#: ../midori/midori-browser.c:5193
+#: ../midori/midori-browser.c:5501
msgid "Find the previous occurrence of a word or phrase"
msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase"
-#: ../midori/midori-browser.c:5197
+#: ../midori/midori-browser.c:5505
msgid "Configure the application preferences"
msgstr "Configurer les préférences de l'application"
-#: ../midori/midori-browser.c:5199
+#: ../midori/midori-browser.c:5507
msgid "_View"
msgstr "_Affichage"
-#: ../midori/midori-browser.c:5200
+#: ../midori/midori-browser.c:5508
msgid "_Toolbars"
msgstr "_Barre d'outils"
-#: ../midori/midori-browser.c:5212
+#: ../midori/midori-browser.c:5520
msgid "Increase the zoom level"
msgstr "Augmenter le niveau d'agrandissement"
-#: ../midori/midori-browser.c:5215
+#: ../midori/midori-browser.c:5523
msgid "Decrease the zoom level"
msgstr "Diminuer le niveau d'agrandissement"
-#: ../midori/midori-browser.c:5218
+#: ../midori/midori-browser.c:5526
msgid "Reset the zoom level"
msgstr "Réinitialiser le niveau d'agrandissement"
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5527
msgid "_Encoding"
msgstr "_Encodage"
-#: ../midori/midori-browser.c:5221
+#: ../midori/midori-browser.c:5529
msgid "View So_urce"
msgstr "Afficher le code so_urce"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5530
msgid "View the source code of the page"
msgstr "Affiche le code source de la page"
-#: ../midori/midori-browser.c:5225
+#: ../midori/midori-browser.c:5533
msgid "Toggle fullscreen view"
msgstr "Activer/désactiver le plein écran"
-#: ../midori/midori-browser.c:5227
+#: ../midori/midori-browser.c:5536
+msgid "Scroll _Left"
+msgstr "Défilement à _gauche"
+
+#: ../midori/midori-browser.c:5537
+msgid "Scroll to the left"
+msgstr "Défilement vers la gauche"
+
+#: ../midori/midori-browser.c:5539
+msgid "Scroll _Down"
+msgstr "Défilement en _bas"
+
+#: ../midori/midori-browser.c:5540
+msgid "Scroll down"
+msgstr "Défilement vers le bas"
+
+#: ../midori/midori-browser.c:5542
+msgid "Scroll _Up"
+msgstr "Défilement en _haut"
+
+#: ../midori/midori-browser.c:5543
+msgid "Scroll up"
+msgstr "Défilement vers le haut"
+
+#: ../midori/midori-browser.c:5545
+msgid "Scroll _Right"
+msgstr "Défilement à _droite"
+
+#: ../midori/midori-browser.c:5546
+msgid "Scroll to the right"
+msgstr "Défilement vers la droite"
+
+#: ../midori/midori-browser.c:5549
msgid "_Go"
msgstr "A_ller"
-#: ../midori/midori-browser.c:5230
+#: ../midori/midori-browser.c:5552
msgid "Go back to the previous page"
msgstr "Aller à la page précédente"
-#: ../midori/midori-browser.c:5233
+#: ../midori/midori-browser.c:5555
msgid "Go forward to the next page"
msgstr "Aller à la page suivante"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5559
msgid "Go to the previous sub-page"
msgstr "Aller à la sous-page précédente"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5563
msgid "Go to the next sub-page"
msgstr "Aller à la sous-page suivante"
-#: ../midori/midori-browser.c:5244
+#: ../midori/midori-browser.c:5566
msgid "Go to your homepage"
msgstr "Aller à la page d'accueil"
-#: ../midori/midori-browser.c:5246
+#: ../midori/midori-browser.c:5568
msgid "Empty Trash"
msgstr "Vider la corbeille"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5569
msgid "Delete the contents of the trash"
msgstr "Supprimer le contenu de la corbeille"
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5571
msgid "Undo _Close Tab"
msgstr "A_nnuler la fermeture de l'onglet"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5572
msgid "Open the last closed tab"
msgstr "Ouvrir le dernier onglet fermé"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5578
msgid "Add a new _folder"
msgstr "Ajouter un nouveau _dossier"
-#: ../midori/midori-browser.c:5257
+#: ../midori/midori-browser.c:5579
msgid "Add a new bookmark folder"
msgstr "Ajouter un nouveau dossier de signets"
-#: ../midori/midori-browser.c:5262
-#: ../midori/midori-searchaction.c:493
+#: ../midori/midori-browser.c:5584
+msgid "_Export bookmarks"
+msgstr "_Exporter des signets"
+
+#: ../midori/midori-browser.c:5587 ../midori/midori-searchaction.c:493
msgid "_Manage Search Engines"
msgstr "_Gestion des moteurs de recherche"
-#: ../midori/midori-browser.c:5263
+#: ../midori/midori-browser.c:5588
msgid "Add, edit and remove search engines..."
msgstr "Ajouter, modifier et supprimer des moteurs de recherche..."
-#: ../midori/midori-browser.c:5266
+#: ../midori/midori-browser.c:5591
msgid "_Clear Private Data"
msgstr "_Effacer les informations privées"
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5592
msgid "Clear private data..."
msgstr "Effacer les informations privées..."
-#: ../midori/midori-browser.c:5271
+#: ../midori/midori-browser.c:5596
msgid "_Inspect Page"
msgstr "_Inspecter la page"
-#: ../midori/midori-browser.c:5272
+#: ../midori/midori-browser.c:5597
msgid "Inspect page details and access developer tools..."
msgstr "Inspecter les détails de la page et accéder aux outils développeur..."
-#: ../midori/midori-browser.c:5277
+#: ../midori/midori-browser.c:5602
msgid "_Previous Tab"
msgstr "Onglet _précédent"
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5603
msgid "Switch to the previous tab"
msgstr "Bascule vers l'onglet précédent"
-#: ../midori/midori-browser.c:5280
+#: ../midori/midori-browser.c:5605
msgid "_Next Tab"
msgstr "Onglet _suivant"
-#: ../midori/midori-browser.c:5281
+#: ../midori/midori-browser.c:5606
msgid "Switch to the next tab"
msgstr "Bascule vers l'onglet suivant"
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5608
msgid "Focus _Current Tab"
msgstr "_Focaliser l'onglet actuel"
-#: ../midori/midori-browser.c:5284
+#: ../midori/midori-browser.c:5609
msgid "Focus the current tab"
msgstr "Focaliser l'onglet actuel"
-#: ../midori/midori-browser.c:5286
+#: ../midori/midori-browser.c:5611
msgid "Open last _session"
msgstr "Ouvrir la _dernière session"
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5612
msgid "Open the tabs saved in the last session"
msgstr "Ouvrir les onglets enregistrés dans la dernière session"
-#: ../midori/midori-browser.c:5289
+#: ../midori/midori-browser.c:5614
msgid "_Help"
msgstr "Aid_e"
-#: ../midori/midori-browser.c:5291
+#: ../midori/midori-browser.c:5616
msgid "_Contents"
msgstr "_Sommaire"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5617
msgid "Show the documentation"
msgstr "Afficher la documentation"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5619
msgid "_Frequent Questions"
msgstr "_Questions fréquentes"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5620
msgid "Show the Frequently Asked Questions"
msgstr "Afficher la foire aux questions"
-#: ../midori/midori-browser.c:5297
+#: ../midori/midori-browser.c:5622
msgid "_Report a Bug"
msgstr "Signaler une _anomalie"
-#: ../midori/midori-browser.c:5298
+#: ../midori/midori-browser.c:5623
msgid "Open Midori's bug tracker"
msgstr "Ouvrir l'outil de suivi d'anomalies de Midori"
-#: ../midori/midori-browser.c:5301
+#: ../midori/midori-browser.c:5626
msgid "Show information about the program"
msgstr "Afficher les informations sur le programme"
-#: ../midori/midori-browser.c:5308
+#: ../midori/midori-browser.c:5634
msgid "_Menubar"
msgstr "Barre de _menu"
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:5635
msgid "Show menubar"
msgstr "Afficher la barre de menu"
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5638
msgid "_Navigationbar"
msgstr "Barre de _navigation"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5639
msgid "Show navigationbar"
msgstr "Afficher la barre de navigation"
-#: ../midori/midori-browser.c:5316
+#: ../midori/midori-browser.c:5642
msgid "Side_panel"
msgstr "Panneau la_téral"
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5643
msgid "Show sidepanel"
msgstr "Afficher le panneau latéral"
-#: ../midori/midori-browser.c:5320
+#: ../midori/midori-browser.c:5646
msgid "_Bookmarkbar"
msgstr "Barre des _signets"
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5647
msgid "Show bookmarkbar"
msgstr "Afficher la barre des signets"
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5650
msgid "_Transferbar"
msgstr "Barre des _transferts"
-#: ../midori/midori-browser.c:5325
+#: ../midori/midori-browser.c:5651
msgid "Show transferbar"
msgstr "Afficher la barre des transferts"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5654
msgid "_Statusbar"
msgstr "Barre d'ét_at"
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5655
msgid "Show statusbar"
msgstr "Afficher la barre d'état"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5663
msgid "_Automatic"
msgstr "_Automatique"
-#: ../midori/midori-browser.c:5339
-#: ../midori/midori-websettings.c:224
+#: ../midori/midori-browser.c:5666 ../midori/midori-websettings.c:226
msgid "Chinese (BIG5)"
msgstr "Chinois (BIG5)"
-#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
-#: ../midori/midori-browser.c:5343
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5670
msgid "Japanese (SHIFT__JIS)"
msgstr "Japonais (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5346
-#: ../midori/midori-websettings.c:226
+#: ../midori/midori-browser.c:5673 ../midori/midori-websettings.c:228
msgid "Korean (EUC-KR)"
msgstr "Coréen (EUC-KR)"
-#: ../midori/midori-browser.c:5349
-#: ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5676 ../midori/midori-websettings.c:229
msgid "Russian (KOI8-R)"
msgstr "Russe (KOI8-R)"
-#: ../midori/midori-browser.c:5352
-#: ../midori/midori-websettings.c:228
+#: ../midori/midori-browser.c:5679 ../midori/midori-websettings.c:230
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5355
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-browser.c:5682 ../midori/midori-websettings.c:231
msgid "Western (ISO-8859-1)"
msgstr "Occidental (ISO-8859-1)"
-#: ../midori/midori-browser.c:5638
-#, 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:5909
+#: ../midori/midori-browser.c:6230
msgid "_Separator"
msgstr "_Séparateur"
-#: ../midori/midori-browser.c:5916
+#: ../midori/midori-browser.c:6237
msgid "_Location..."
msgstr "_Emplacement..."
-#: ../midori/midori-browser.c:5918
+#: ../midori/midori-browser.c:6239
msgid "Open a particular location"
msgstr "Ouvrir un emplacement particulier"
-#: ../midori/midori-browser.c:5942
+#: ../midori/midori-browser.c:6263
msgid "_Web Search..."
msgstr "Recherche _Internet..."
-#: ../midori/midori-browser.c:5944
+#: ../midori/midori-browser.c:6265
msgid "Run a web search"
msgstr "Lancer une recherche sur Internet"
-#: ../midori/midori-browser.c:5965
+#: ../midori/midori-browser.c:6286
msgid "Reopen a previously closed tab or window"
msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé"
-#: ../midori/midori-browser.c:5980
+#: ../midori/midori-browser.c:6301
msgid "_Recently visited pages"
msgstr "Pages _récemment visitées"
-#: ../midori/midori-browser.c:5982
+#: ../midori/midori-browser.c:6303
msgid "Reopen pages that you visited earlier"
msgstr "Rouvrir des pages précédemment visitées"
-#: ../midori/midori-browser.c:5997
-#: ../midori/sokoke.c:1189
+#: ../midori/midori-browser.c:6318 ../midori/sokoke.c:1295
msgid "_Bookmarks"
msgstr "_Signets"
-#: ../midori/midori-browser.c:5999
+#: ../midori/midori-browser.c:6320
msgid "Show the saved bookmarks"
msgstr "Afficher les signets sauvegardés"
-#: ../midori/midori-browser.c:6014
+#: ../midori/midori-browser.c:6335
msgid "_Tools"
msgstr "_Outils"
-#: ../midori/midori-browser.c:6027
+#: ../midori/midori-browser.c:6348
msgid "_Window"
msgstr "Fe_nêtre"
-#: ../midori/midori-browser.c:6029
+#: ../midori/midori-browser.c:6350
msgid "Show a list of all open tabs"
msgstr "Afficher une liste de tous les onglets ouverts"
-#: ../midori/midori-browser.c:6043
+#: ../midori/midori-browser.c:6364
msgid "_Menu"
msgstr "_Menu"
-#: ../midori/midori-browser.c:6045
+#: ../midori/midori-browser.c:6366
msgid "Menu"
msgstr "Menu"
#. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:6249
+#: ../midori/midori-browser.c:6570
msgid "_Inline Find:"
msgstr "_Recherche rapide :"
-#: ../midori/midori-browser.c:6280
+#: ../midori/midori-browser.c:6601
msgid "Previous"
msgstr "Précedent"
-#: ../midori/midori-browser.c:6285
+#: ../midori/midori-browser.c:6606
msgid "Next"
msgstr "Suivant"
-#: ../midori/midori-browser.c:6290
+#: ../midori/midori-browser.c:6611
msgid "Match Case"
msgstr "Sensible à la casse"
-#: ../midori/midori-browser.c:6299
+#: ../midori/midori-browser.c:6620
msgid "Highlight Matches"
msgstr "Surligner les résultats"
-#: ../midori/midori-browser.c:6311
+#: ../midori/midori-browser.c:6632
msgid "Close Findbar"
msgstr "Fermer la barre de recherche"
-#: ../midori/midori-browser.c:6357
-#: ../panels/midori-transfers.c:142
+#: ../midori/midori-browser.c:6678 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Effacer tout"
-#: ../midori/midori-browser.c:6714
+#: ../midori/midori-browser.c:7036
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Paramètre inattendu « %s »"
-#: ../midori/midori-locationaction.c:370
+#: ../midori/midori-locationaction.c:377
#, c-format
-msgid "Failed to select from history: %s\n"
-msgstr "Impossible de choisir dans l'historique : %s\n"
+msgid "Failed to select from history\n"
+msgstr "Impossible de sélectionner de l'historique\n"
#: ../midori/midori-locationaction.c:459
#, c-format
+msgid "Search for %s"
+msgstr "Rechercher %s"
+
+#: ../midori/midori-locationaction.c:482
+#, c-format
msgid "Search with %s"
msgstr "Rechercher avec %s"
-#: ../midori/midori-locationaction.c:1171
-#: ../panels/midori-history.c:329
-#: ../extensions/formhistory.c:457
-#: ../extensions/formhistory.c:461
+#: ../midori/midori-locationaction.c:1197
#, 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"
+msgid "Failed to execute database statement\n"
+msgstr "Impossible d'exécuter l'instruction de base de données\n"
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1229
+#: ../midori/midori-locationaction.c:1254
msgid "Paste and p_roceed"
msgstr "Coller et continue_r"
-#: ../midori/midori-panel.c:432
-#: ../midori/midori-panel.c:434
+#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435
msgid "Detach chosen panel from the window"
msgstr "Détacher le panneau choisi de la fenêtre"
-#: ../midori/midori-panel.c:444
-#: ../midori/midori-panel.c:446
-#: ../midori/midori-panel.c:639
-#: ../midori/midori-panel.c:642
+#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447
+#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
msgid "Align sidepanel to the right"
msgstr "Aligner le panneau latéral sur la droite"
-#: ../midori/midori-panel.c:456
-#: ../midori/midori-panel.c:457
+#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458
msgid "Close panel"
msgstr "Fermer le panneau"
-#: ../midori/midori-panel.c:640
-#: ../midori/midori-panel.c:643
+#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644
msgid "Align sidepanel to the left"
msgstr "Aligner le panneau latéral sur la gauche"
-#: ../midori/midori-panel.c:797
+#: ../midori/midori-panel.c:798
msgid "Hide operating controls"
msgstr "Cacher les contrôles"
-#: ../midori/midori-websettings.c:207
+#: ../midori/midori-websettings.c:209
msgid "Show Blank page"
msgstr "Afficher une Page vierge"
-#: ../midori/midori-websettings.c:208
+#: ../midori/midori-websettings.c:210
msgid "Show Homepage"
msgstr "Afficher la page d'accueil"
-#: ../midori/midori-websettings.c:209
+#: ../midori/midori-websettings.c:211
msgid "Show last open tabs"
msgstr "Afficher les derniers onglets ouverts"
-#: ../midori/midori-websettings.c:225
+#: ../midori/midori-websettings.c:227
msgid "Japanese (SHIFT_JIS)"
msgstr "Japonais (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:245
+#: ../midori/midori-websettings.c:247
msgid "New tab"
msgstr "Nouvel onglet"
-#: ../midori/midori-websettings.c:246
+#: ../midori/midori-websettings.c:248
msgid "New window"
msgstr "Nouvelle fenêtre"
-#: ../midori/midori-websettings.c:247
+#: ../midori/midori-websettings.c:249
msgid "Current tab"
msgstr "Onglet actuel"
-#: ../midori/midori-websettings.c:262
+#: ../midori/midori-websettings.c:264
msgid "Default"
msgstr "Par défaut"
-#: ../midori/midori-websettings.c:263
+#: ../midori/midori-websettings.c:265
msgid "Icons"
msgstr "Icônes"
-#: ../midori/midori-websettings.c:264
+#: ../midori/midori-websettings.c:266
msgid "Small icons"
msgstr "Petites icônes"
-#: ../midori/midori-websettings.c:265
+#: ../midori/midori-websettings.c:267
msgid "Text"
msgstr "Texte"
-#: ../midori/midori-websettings.c:266
+#: ../midori/midori-websettings.c:268
msgid "Icons and text"
msgstr "Icônes et texte"
-#: ../midori/midori-websettings.c:267
+#: ../midori/midori-websettings.c:269
msgid "Text beside icons"
msgstr "Texte à côté des icônes"
-#: ../midori/midori-websettings.c:282
+#: ../midori/midori-websettings.c:284
+msgid "Automatic (GNOME or environment)"
+msgstr "Automatique (GNOME ou de l'environnement)"
+
+#: ../midori/midori-websettings.c:285
+msgid "HTTP proxy server"
+msgstr "Serveur mandataire HTTP"
+
+#: ../midori/midori-websettings.c:286
+msgid "No proxy server"
+msgstr "Pas de serveur mandataire"
+
+#: ../midori/midori-websettings.c:301
msgid "All cookies"
msgstr "Tous les fichiers témoins"
-#: ../midori/midori-websettings.c:283
+#: ../midori/midori-websettings.c:302
msgid "Session cookies"
msgstr "Témoins de session"
-#: ../midori/midori-websettings.c:284
-#: ../panels/midori-addons.c:98
-#: ../katze/katze-utils.c:658
+#: ../midori/midori-websettings.c:303 ../katze/katze-utils.c:667
msgid "None"
msgstr "Aucun"
-#: ../midori/midori-websettings.c:300
+#: ../midori/midori-websettings.c:319
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:301
+#: ../midori/midori-websettings.c:320
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:302
+#: ../midori/midori-websettings.c:321
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:303
+#: ../midori/midori-websettings.c:322
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:356
+#: ../midori/midori-websettings.c:375
msgid "Remember last window size"
msgstr "Se souvenir de la taille de la fenêtre"
-#: ../midori/midori-websettings.c:357
+#: ../midori/midori-websettings.c:376
msgid "Whether to save the last window size"
msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre"
-#: ../midori/midori-websettings.c:365
+#: ../midori/midori-websettings.c:384
msgid "Last window width"
msgstr "Dernière largeur de la fenêtre"
-#: ../midori/midori-websettings.c:366
+#: ../midori/midori-websettings.c:385
msgid "The last saved window width"
msgstr "La dernière largeur enregistrée de la fenêtre"
-#: ../midori/midori-websettings.c:374
+#: ../midori/midori-websettings.c:393
msgid "Last window height"
msgstr "Dernière hauteur de la fenêtre"
-#: ../midori/midori-websettings.c:375
+#: ../midori/midori-websettings.c:394
msgid "The last saved window height"
msgstr "La dernière hauteur enregistrée de la fenêtre"
-#: ../midori/midori-websettings.c:400
+#: ../midori/midori-websettings.c:419
msgid "Last panel position"
msgstr "Dernière position du panneau"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:420
msgid "The last saved panel position"
msgstr "La dernière position enregistrée du panneau"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:429
msgid "Last panel page"
msgstr "Dernière page du panneau"
-#: ../midori/midori-websettings.c:411
+#: ../midori/midori-websettings.c:430
msgid "The last saved panel page"
msgstr "La dernière page enregistrée du panneau"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:438
msgid "Last Web search"
msgstr "Dernière recherche sur Internet"
-#: ../midori/midori-websettings.c:420
+#: ../midori/midori-websettings.c:439
msgid "The last saved Web search"
msgstr "La dernière recherche sur Internet enregistrée"
-#: ../midori/midori-websettings.c:429
+#: ../midori/midori-websettings.c:448
msgid "Show Menubar"
msgstr "Afficher la barre de menu"
-#: ../midori/midori-websettings.c:430
+#: ../midori/midori-websettings.c:449
msgid "Whether to show the menubar"
msgstr "Indique s'il faut afficher la barre de menu"
-#: ../midori/midori-websettings.c:438
+#: ../midori/midori-websettings.c:457
msgid "Show Navigationbar"
msgstr "Afficher la barre de navigation"
-#: ../midori/midori-websettings.c:439
+#: ../midori/midori-websettings.c:458
msgid "Whether to show the navigationbar"
msgstr "Indique s'il faut afficher la barre de navigation"
-#: ../midori/midori-websettings.c:447
+#: ../midori/midori-websettings.c:466
msgid "Show Bookmarkbar"
msgstr "Afficher la barre des _signets"
-#: ../midori/midori-websettings.c:448
+#: ../midori/midori-websettings.c:467
msgid "Whether to show the bookmarkbar"
msgstr "Indique s'il faut afficher la barre des signets"
-#: ../midori/midori-websettings.c:456
+#: ../midori/midori-websettings.c:475
msgid "Show Panel"
msgstr "Afficher le panneau"
-#: ../midori/midori-websettings.c:457
+#: ../midori/midori-websettings.c:476
msgid "Whether to show the panel"
msgstr "Indique s'il faut afficher le panneau"
-#: ../midori/midori-websettings.c:472
+#: ../midori/midori-websettings.c:491
msgid "Show Transferbar"
msgstr "Afficher la barre des transferts"
-#: ../midori/midori-websettings.c:473
+#: ../midori/midori-websettings.c:492
msgid "Whether to show the transferbar"
msgstr "Indique s'il faut afficher la barre des transferts"
-#: ../midori/midori-websettings.c:481
+#: ../midori/midori-websettings.c:500
msgid "Show Statusbar"
msgstr "Afficher la barre d'état"
-#: ../midori/midori-websettings.c:482
+#: ../midori/midori-websettings.c:501
msgid "Whether to show the statusbar"
msgstr "Indique s'il faut afficher la barre d'état"
-#: ../midori/midori-websettings.c:491
+#: ../midori/midori-websettings.c:510
msgid "Toolbar Style:"
msgstr "Style de la barre d'outils"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:511
msgid "The style of the toolbar"
msgstr "Le style de la barre d'outils"
-#: ../midori/midori-websettings.c:508
+#: ../midori/midori-websettings.c:527
msgid "Show progress in location entry"
msgstr "Progression dans la barre d'adresse"
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:528
msgid "Whether to show loading progress in the location entry"
msgstr "Indique s'il faut afficher la progression dans la barre d'adresse"
-#: ../midori/midori-websettings.c:524
+#: ../midori/midori-websettings.c:543
msgid "Search engines in location completion"
msgstr "Moteurs de recherche dans la complétion"
-#: ../midori/midori-websettings.c:525
+#: ../midori/midori-websettings.c:544
msgid "Whether to show search engines in the location completion"
-msgstr "Indique s'il faut afficher les moteurs de recherche dans les résultats de complétion de la barre d'adresse"
+msgstr ""
+"Indique s'il faut afficher les moteurs de recherche dans les résultats de "
+"complétion de la barre d'adresse"
-#: ../midori/midori-websettings.c:533
+#: ../midori/midori-websettings.c:552
msgid "Toolbar Items"
msgstr "Éléments de la barre d'outils"
-#: ../midori/midori-websettings.c:534
+#: ../midori/midori-websettings.c:553
msgid "The items to show on the toolbar"
msgstr "Les éléments à afficher dans la barre d'outils"
-#: ../midori/midori-websettings.c:542
+#: ../midori/midori-websettings.c:561
msgid "Compact Sidepanel"
msgstr "Panneau latéral compact"
-#: ../midori/midori-websettings.c:543
+#: ../midori/midori-websettings.c:562
msgid "Whether to make the sidepanel compact"
msgstr "Indique s'il faut mettre le panneau latéral compact"
-#: ../midori/midori-websettings.c:558
+#: ../midori/midori-websettings.c:577
msgid "Show operating controls of the panel"
msgstr "Afficher les élements de contrôle du panneau"
-#: ../midori/midori-websettings.c:559
+#: ../midori/midori-websettings.c:578
msgid "Whether to show the operating controls of the panel"
msgstr "Indique s'il faut afficher les élements de contrôle du panneau"
-#: ../midori/midori-websettings.c:574
+#: ../midori/midori-websettings.c:593
msgid "Align sidepanel on the right"
msgstr "Aligner le panneau latéral sur la droite"
-#: ../midori/midori-websettings.c:575
+#: ../midori/midori-websettings.c:594
msgid "Whether to align the sidepanel on the right"
msgstr "Indique s'il faut aligner le panneau latéral sur la droite"
-#: ../midori/midori-websettings.c:590
+#: ../midori/midori-websettings.c:609
msgid "Open panels in separate windows"
-msgstr "Ouvrir les panneaux dans une nouvelle fenêtre séparée"
+msgstr "Ouvrir les panneaux dans une fenêtre séparée"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:610
msgid "Whether to always open panels in separate windows"
-msgstr "Indique s'il faut ouvrir les panneaux dans une fenêtre séparée"
+msgstr ""
+"Indique s'il faut toujours ouvrir les panneaux dans des fenêtres séparées"
-#: ../midori/midori-websettings.c:600
+#: ../midori/midori-websettings.c:619
msgid "When Midori starts:"
msgstr "Au lancement de Midori :"
-#: ../midori/midori-websettings.c:601
+#: ../midori/midori-websettings.c:620
msgid "What to do when Midori starts"
msgstr "Que faire au lancement de Midori"
-#: ../midori/midori-websettings.c:610
+#: ../midori/midori-websettings.c:629
msgid "Homepage:"
msgstr "Page d'accueil :"
-#: ../midori/midori-websettings.c:611
+#: ../midori/midori-websettings.c:630
msgid "The homepage"
msgstr "La page d'accueil"
-#: ../midori/midori-websettings.c:626
+#: ../midori/midori-websettings.c:645
msgid "Show crash dialog"
msgstr "Fenêtre de fermeture inattendue"
-#: ../midori/midori-websettings.c:627
+#: ../midori/midori-websettings.c:646
msgid "Show a dialog after Midori crashed"
msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori"
#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:643
+#: ../midori/midori-websettings.c:662
msgid "Show speed dial in new tabs"
msgstr "Appel rapide dans les nouveaux onglets"
-#: ../midori/midori-websettings.c:644
+#: ../midori/midori-websettings.c:663
msgid "Show speed dial in newly opened tabs"
msgstr "Afficher la page d'appel rapide dans les nouveaux onglets"
-#: ../midori/midori-websettings.c:652
+#: ../midori/midori-websettings.c:671
msgid "Save downloaded files to:"
msgstr "Enregistrer les téléchargements sous :"
-#: ../midori/midori-websettings.c:653
+#: ../midori/midori-websettings.c:672
msgid "The folder downloaded files are saved to"
msgstr "Le dossier où enregistrer les fichiers téléchargés"
-#: ../midori/midori-websettings.c:674
+#: ../midori/midori-websettings.c:693
msgid "Ask for the destination folder"
msgstr "Demander le dossier de destination"
-#: ../midori/midori-websettings.c:675
-msgid "Whether to ask for the destination folder when downloading a file"
-msgstr "Indique s'il faut demander le dossier de destination quand un fichier est téléchargé."
-
#: ../midori/midori-websettings.c:694
+msgid "Whether to ask for the destination folder when downloading a file"
+msgstr ""
+"Indique s'il faut demander le dossier de destination quand un fichier est "
+"téléchargé."
+
+#: ../midori/midori-websettings.c:713
msgid "Notify when a transfer has been completed"
msgstr "Signaler la fin des transferts"
-#: ../midori/midori-websettings.c:695
+#: ../midori/midori-websettings.c:714
msgid "Whether to show a notification when a transfer has been completed"
msgstr "Indique s'il faut signaler la fin d'un transfert par une notification"
-#: ../midori/midori-websettings.c:707
+#: ../midori/midori-websettings.c:726
msgid "Download Manager"
msgstr "Gestionnaire de téléchargements"
-#: ../midori/midori-websettings.c:708
+#: ../midori/midori-websettings.c:727
msgid "An external download manager"
msgstr "Un gestionnaire de téléchargements externe"
-#: ../midori/midori-websettings.c:716
+#: ../midori/midori-websettings.c:735
msgid "Text Editor"
msgstr "Éditeur de texte"
-#: ../midori/midori-websettings.c:717
+#: ../midori/midori-websettings.c:736
msgid "An external text editor"
msgstr "Un éditeur de texte externe"
-#: ../midori/midori-websettings.c:732
+#: ../midori/midori-websettings.c:751
msgid "News Aggregator"
msgstr "Agrégateur de flux"
-#: ../midori/midori-websettings.c:733
+#: ../midori/midori-websettings.c:752
msgid "An external news aggregator"
msgstr "Un agrégateur de flux externe"
-#: ../midori/midori-websettings.c:741
+#: ../midori/midori-websettings.c:760
msgid "Location entry Search"
msgstr "Recherche depuis la barre d'adresse"
-#: ../midori/midori-websettings.c:742
+#: ../midori/midori-websettings.c:761
msgid "The search to perform inside the location entry"
msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse"
-#: ../midori/midori-websettings.c:750
+#: ../midori/midori-websettings.c:769
msgid "Preferred Encoding"
msgstr "Encodage favori"
-#: ../midori/midori-websettings.c:751
+#: ../midori/midori-websettings.c:770
msgid "The preferred character encoding"
msgstr "Encodage favori des caractères"
-#: ../midori/midori-websettings.c:761
+#: ../midori/midori-websettings.c:780
msgid "Always Show Tabbar"
msgstr "Toujours afficher la barre d'onglets"
-#: ../midori/midori-websettings.c:762
+#: ../midori/midori-websettings.c:781
msgid "Always show the tabbar"
msgstr "Toujours afficher la barre d'onglets"
-#: ../midori/midori-websettings.c:770
+#: ../midori/midori-websettings.c:789
msgid "Close Buttons on Tabs"
msgstr "Boutons de fermeture sur les onglets"
-#: ../midori/midori-websettings.c:771
+#: ../midori/midori-websettings.c:790
msgid "Whether tabs have close buttons"
msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets"
-#: ../midori/midori-websettings.c:779
+#: ../midori/midori-websettings.c:798
msgid "Open new pages in:"
msgstr "Ouvrir les nouvelles pages dans :"
-#: ../midori/midori-websettings.c:780
+#: ../midori/midori-websettings.c:799
msgid "Where to open new pages"
msgstr "Lieu où les nouvelles pages doivent être ouvertes"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:808
msgid "Open external pages in:"
msgstr "Ouvrir les pages externes dans :"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:809
msgid "Where to open externally opened pages"
msgstr "Lieu où les pages externes doivent être ouvertes"
-#: ../midori/midori-websettings.c:799
+#: ../midori/midori-websettings.c:818
msgid "Middle click opens Selection"
msgstr "Un clic milieu ouvre la sélection"
-#: ../midori/midori-websettings.c:800
+#: ../midori/midori-websettings.c:819
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"
+msgstr ""
+"Charger l'addresse de la sélection avec un clic du bouton central de la "
+"souris"
-#: ../midori/midori-websettings.c:808
+#: ../midori/midori-websettings.c:827
msgid "Open tabs in the background"
msgstr "Ouvrir les onglets en arrière-plan"
-#: ../midori/midori-websettings.c:809
+#: ../midori/midori-websettings.c:828
msgid "Whether to open new tabs in the background"
msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan"
-#: ../midori/midori-websettings.c:817
+#: ../midori/midori-websettings.c:836
msgid "Open Tabs next to Current"
msgstr "Ouvrir les onglets à côté de l'actuel"
-#: ../midori/midori-websettings.c:818
+#: ../midori/midori-websettings.c:837
msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actuel ou après le dernier"
+msgstr ""
+"Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actuel ou "
+"après le dernier"
-#: ../midori/midori-websettings.c:826
+#: ../midori/midori-websettings.c:845
msgid "Open popups in tabs"
msgstr "Ouvrir les fenêtre intempestives dans des onglets"
-#: ../midori/midori-websettings.c:827
+#: ../midori/midori-websettings.c:846
msgid "Whether to open popup windows in tabs"
-msgstr "Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des onglets"
+msgstr ""
+"Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des onglets"
-#: ../midori/midori-websettings.c:837
-#: ../extensions/statusbar-features.c:88
+#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88
msgid "Load images automatically"
msgstr "Charger les images automatiquement"
-#: ../midori/midori-websettings.c:838
+#: ../midori/midori-websettings.c:857
msgid "Load and display images automatically"
msgstr "Charger et afficher les images automatiquement"
-#: ../midori/midori-websettings.c:845
-#: ../extensions/statusbar-features.c:100
+#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100
msgid "Enable scripts"
msgstr "Activer les scripts"
-#: ../midori/midori-websettings.c:846
+#: ../midori/midori-websettings.c:865
msgid "Enable embedded scripting languages"
msgstr "Active la prise en charge interne des scripts"
-#: ../midori/midori-websettings.c:853
-#: ../extensions/statusbar-features.c:112
+#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112
msgid "Enable Netscape plugins"
msgstr "Activer les greffons Netscape"
-#: ../midori/midori-websettings.c:854
+#: ../midori/midori-websettings.c:873
msgid "Enable embedded Netscape plugin objects"
msgstr "Active la prise en charge interne des greffons Netscape"
-#: ../midori/midori-websettings.c:870
+#: ../midori/midori-websettings.c:889
msgid "Enable HTML5 database support"
-msgstr "Activer le support de HTML5"
+msgstr "Activer le support de base de données HTML5"
-#: ../midori/midori-websettings.c:871
+#: ../midori/midori-websettings.c:890
msgid "Whether to enable HTML5 database support"
-msgstr "Impossible d'activer le support de HTML5"
+msgstr "Indique s'il faut activer le support de base de données de HTML5"
-#: ../midori/midori-websettings.c:877
+#: ../midori/midori-websettings.c:896
msgid "Enable HTML5 local storage support"
msgstr "Activer le support de stockage local de HTML5"
-#: ../midori/midori-websettings.c:878
+#: ../midori/midori-websettings.c:897
msgid "Whether to enable HTML5 local storage support"
-msgstr "Impossible d'activer le support de stockage local de HTML5"
+msgstr "Indique s'il faut activer le support de stockage local de HTML5"
-#: ../midori/midori-websettings.c:886
+#: ../midori/midori-websettings.c:905
msgid "Enable offline web application cache"
msgstr "Activer le cache d'applications web hors ligne"
-#: ../midori/midori-websettings.c:887
+#: ../midori/midori-websettings.c:906
msgid "Whether to enable offline web application cache"
-msgstr "Activer le cache des applications web hors ligne"
+msgstr "Indique s'il faut activer le cache des applications web hors ligne"
-#: ../midori/midori-websettings.c:912
+#: ../midori/midori-websettings.c:931
msgid "Zoom Text and Images"
msgstr "Agrandir le texte et les images"
-#: ../midori/midori-websettings.c:913
+#: ../midori/midori-websettings.c:932
msgid "Whether to zoom text and images"
msgstr "Indique s'il faut agrandir le texte et les images"
-#: ../midori/midori-websettings.c:928
+#: ../midori/midori-websettings.c:947
msgid "Find inline while typing"
msgstr "Chercher pendant la saisie"
-#: ../midori/midori-websettings.c:929
+#: ../midori/midori-websettings.c:948
msgid "Whether to automatically find inline while typing"
-msgstr "Indique s'il faut chercher automatiquement dans la page pendant la saisie"
+msgstr ""
+"Indique s'il faut chercher automatiquement dans la page pendant la saisie"
-#: ../midori/midori-websettings.c:944
+#: ../midori/midori-websettings.c:963
msgid "Kinetic scrolling"
msgstr "Défilement cinétique"
-#: ../midori/midori-websettings.c:945
+#: ../midori/midori-websettings.c:964
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"
+msgstr ""
+"Indique si le défilement doit se déplacer cinétiquement en fonction de la "
+"vitesse"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:972
msgid "Accept cookies"
msgstr "Accepter les cookies"
-#: ../midori/midori-websettings.c:954
+#: ../midori/midori-websettings.c:973
msgid "What type of cookies to accept"
msgstr "Type de fichiers témoins (cookies) à accepter"
-#: ../midori/midori-websettings.c:970
+#: ../midori/midori-websettings.c:989
msgid "Original cookies only"
msgstr "Uniquement les cookies d'origine"
-#: ../midori/midori-websettings.c:971
+#: ../midori/midori-websettings.c:990
msgid "Accept cookies from the original website only"
msgstr "Accepter les fichiers témoins du site d'origine uniquement"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:998
msgid "Maximum cookie age"
msgstr "Âge maximal des cookies"
-#: ../midori/midori-websettings.c:980
+#: ../midori/midori-websettings.c:999
msgid "The maximum number of days to save cookies for"
-msgstr "Le nombre maximal de jours durant lesquels conserver les fichiers témoins"
+msgstr ""
+"Le nombre maximal de jours durant lesquels conserver les fichiers témoins"
-#: ../midori/midori-websettings.c:997
+#: ../midori/midori-websettings.c:1016
msgid "Remember last visited pages"
msgstr "Se souvenir des dernières pages visitées"
-#: ../midori/midori-websettings.c:998
+#: ../midori/midori-websettings.c:1017
msgid "Whether the last visited pages are saved"
msgstr "Indique s'il faut enregistrer les dernières pages visitées"
-#: ../midori/midori-websettings.c:1006
+#: ../midori/midori-websettings.c:1025
msgid "Maximum history age"
msgstr "Âge maximal de l'historique"
-#: ../midori/midori-websettings.c:1007
+#: ../midori/midori-websettings.c:1026
msgid "The maximum number of days to save the history for"
msgstr "Le nombre maximal de jours durant lesquels conserver l'historique"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1034
msgid "Remember last downloaded files"
msgstr "Se souvenir des derniers fichiers téléchargés"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:1035
msgid "Whether the last downloaded files are saved"
-msgstr "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés"
+msgstr ""
+"Indique s'il faut enregistrer la liste des derniers fichiers téléchargés"
-#: ../midori/midori-websettings.c:1026
-msgid "Proxy Server"
+#: ../midori/midori-websettings.c:1052
+msgid "Proxy server"
msgstr "Serveur mandataire"
-#: ../midori/midori-websettings.c:1027
+#: ../midori/midori-websettings.c:1053
+msgid "The type of proxy server to use"
+msgstr "Le type de serveur mandataire à utiliser"
+
+#: ../midori/midori-websettings.c:1062
+msgid "HTTP Proxy Server"
+msgstr "Serveur mandataire HTTP"
+
+#: ../midori/midori-websettings.c:1063
msgid "The proxy server used for HTTP connections"
msgstr "Le serveur mandataire (proxy) pour les connexions HTTP"
-#: ../midori/midori-websettings.c:1042
+#: ../midori/midori-websettings.c:1078
msgid "Detect proxy server automatically"
msgstr "Détecter le serveur mandataire automatiquement"
-#: ../midori/midori-websettings.c:1043
+#: ../midori/midori-websettings.c:1079
msgid "Whether to detect the proxy server automatically from the environment"
-msgstr "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement"
+msgstr ""
+"Indique s'il faut détecter le serveur mandataire (proxy) automatiquement"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1059
+#: ../midori/midori-websettings.c:1095
msgid "Identify as"
msgstr "S'identifier comme"
-#: ../midori/midori-websettings.c:1060
+#: ../midori/midori-websettings.c:1096
msgid "What to identify as to web pages"
msgstr "Comment s'identifier sur les pages Internet"
-#: ../midori/midori-websettings.c:1076
+#: ../midori/midori-websettings.c:1112
msgid "Identification string"
msgstr "Chaîne d'identification"
-#: ../midori/midori-websettings.c:1077
+#: ../midori/midori-websettings.c:1113
msgid "The application identification string"
msgstr "La chaîne d'identification de l'application"
-#: ../midori/midori-websettings.c:1092
+#: ../midori/midori-websettings.c:1128
msgid "Preferred languages"
msgstr "Langages préférés"
-#: ../midori/midori-websettings.c:1093
-msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-msgstr "Une liste des langues préférées séparées par une virgule pour le rendu des pages multilingues, par exemple \"de\", \"fr,en\" ou \"en-us;q=1.0, fr-fr;q=0.667\""
+#: ../midori/midori-websettings.c: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\""
+msgstr ""
+"Une liste des langues préférées séparées par une virgule pour le rendu des "
+"pages multilingues, par exemple \"de\", \"fr,en\" ou \"en-us;q=1.0, fr-fr;"
+"q=0.667\""
-#: ../midori/midori-websettings.c:1108
+#: ../midori/midori-websettings.c:1144
msgid "Clear private data"
msgstr "Effacer les informations privées"
-#: ../midori/midori-websettings.c:1109
+#: ../midori/midori-websettings.c:1145
msgid "The private data selected for deletion"
msgstr "Les informations privées sélectionnées pour la suppression"
@@ -1622,352 +1712,348 @@ msgstr "Les informations privées sélectionnées pour la suppression"
#. 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:956
-#: ../midori/midori-view.c:4160
-#: ../midori/midori-view.c:4164
+#: ../midori/midori-view.c:1190 ../midori/midori-view.c:4489
+#: ../midori/midori-view.c:4493
#, c-format
msgid "Error - %s"
msgstr "Erreur - %s"
-#: ../midori/midori-view.c:957
+#: ../midori/midori-view.c:1191
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "La page « %s » n'a pu être chargée."
-#: ../midori/midori-view.c:962
+#: ../midori/midori-view.c:1196
msgid "Try again"
msgstr "Essayer une autre fois"
#. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:1000
+#: ../midori/midori-view.c:1237
#, c-format
msgid "Not found - %s"
msgstr "Non trouvé - %s"
-#: ../midori/midori-view.c:1218
-#: ../midori/midori-view.c:2067
+#: ../midori/midori-view.c:1474 ../midori/midori-view.c:2311
#, c-format
msgid "Send a message to %s"
msgstr "Envoyer un message à %s"
-#: ../midori/midori-view.c:1836
-#: ../midori/midori-view.c:2229
+#: ../midori/midori-view.c:2093 ../midori/midori-view.c:2473
msgid "Inspect _Element"
-msgstr "Inspecter _Elément"
+msgstr "Inspecter l'élé_ment"
-#: ../midori/midori-view.c:1888
-#: ../midori/midori-view.c:1966
-msgid "Open _Link"
-msgstr "Ouvrir le _lien"
-
-#: ../midori/midori-view.c:1891
-#: ../midori/midori-view.c:1968
+#: ../midori/midori-view.c:2145 ../midori/midori-view.c:2215
msgid "Open Link in New _Tab"
msgstr "Ouvrir le lien dans un nouvel _onglet"
-#: ../midori/midori-view.c:1895
+#: ../midori/midori-view.c:2149
msgid "Open Link in _Foreground Tab"
-msgstr "Ouvrir le lien en avant plan"
+msgstr "Ouvrir le lien en a_vant plan"
-#: ../midori/midori-view.c:1896
+#: ../midori/midori-view.c:2150
msgid "Open Link in _Background Tab"
-msgstr "Ouvrir le lien en arrière plan"
+msgstr "Ouvrir le lien en a_rrière plan"
-#: ../midori/midori-view.c:1899
-#: ../midori/midori-view.c:1975
+#: ../midori/midori-view.c:2153 ../midori/midori-view.c:2222
msgid "Open Link in New _Window"
msgstr "Ouvrir le lien dans une nouvelle _fenêtre"
-#: ../midori/midori-view.c:1902
+#: ../midori/midori-view.c:2156
msgid "Open Link as Web A_pplication"
-msgstr "Ouvrir le lien comme une a_pplication internet"
+msgstr "Ouvrir le lien comme une appli_cation internet"
-#: ../midori/midori-view.c:1905
+#: ../midori/midori-view.c:2159
msgid "Copy Link de_stination"
msgstr "Copier l'adre_sse du lien"
-#: ../midori/midori-view.c:1908
-#: ../midori/midori-view.c:1987
+#: ../midori/midori-view.c:2162 ../midori/midori-view.c:2234
msgid "_Save Link destination"
msgstr "_Enregistrer la cible du lien"
-#: ../midori/midori-view.c:1909
-#: ../midori/midori-view.c:1981
+#: ../midori/midori-view.c:2163 ../midori/midori-view.c:2228
msgid "_Download Link destination"
msgstr "_Télécharger la cible du lien"
-#: ../midori/midori-view.c:1913
-#: ../midori/midori-view.c:1949
-#: ../midori/midori-view.c:1992
+#: ../midori/midori-view.c:2167 ../midori/midori-view.c:2197
+#: ../midori/midori-view.c:2239
msgid "Download with Download _Manager"
msgstr "Télécharger avec le _gestionnaire de téléchargements"
-#: ../midori/midori-view.c:1925
+#: ../midori/midori-view.c:2176
msgid "Open _Image in New Tab"
-msgstr "Ouvrir l'image dans un nou_vel onglet"
+msgstr "Ouvrir l'image dans un _nouvel onglet"
-#: ../midori/midori-view.c:1928
-msgid "Open Image in New Wi_ndow"
-msgstr "Ouvrir l'image dans une nouvelle fe_nêtre"
-
-#: ../midori/midori-view.c:1931
+#: ../midori/midori-view.c:2179
msgid "Copy Image _Address"
msgstr "Copier l'_adresse de l'image"
-#: ../midori/midori-view.c:1934
+#: ../midori/midori-view.c:2182
msgid "Save I_mage"
msgstr "Enregistrer l'i_mage"
-#: ../midori/midori-view.c:1935
+#: ../midori/midori-view.c:2183
msgid "Download I_mage"
-msgstr "Télécharger l'i_mage"
+msgstr "Téléc_harger l'image"
-#: ../midori/midori-view.c:1942
+#: ../midori/midori-view.c:2190
msgid "Copy Video _Address"
msgstr "Copier l'_adresse de la vidéo"
-#: ../midori/midori-view.c:1945
+#: ../midori/midori-view.c:2193
msgid "Save _Video"
msgstr "Enregistrer la _vidéo"
-#: ../midori/midori-view.c:1945
+#: ../midori/midori-view.c:2193
msgid "Download _Video"
msgstr "Télécharger la _vidéo"
-#: ../midori/midori-view.c:2012
+#: ../midori/midori-view.c:2256
msgid "Search _with"
msgstr "Rechercher _avec"
-#: ../midori/midori-view.c:2047
-#: ../midori/midori-view.c:2054
+#: ../midori/midori-view.c:2291 ../midori/midori-view.c:2298
msgid "_Search the Web"
msgstr "_Rechercher sur Internet"
-#: ../midori/midori-view.c:2075
+#: ../midori/midori-view.c:2319
msgid "Open Address in New _Tab"
msgstr "Ouvrir l'adresse dans un nouvel _onglet"
-#: ../midori/midori-view.c:2361
+#: ../midori/midori-view.c:2616
msgid "Open or download file"
msgstr "Ouvrir ou télécharger le fichier"
-#: ../midori/midori-view.c:2384
+#: ../midori/midori-view.c:2635
#, c-format
msgid "File Type: '%s'"
msgstr "Type de fichier : « %s »"
-#: ../midori/midori-view.c:2387
+#: ../midori/midori-view.c:2638
#, c-format
msgid "File Type: %s ('%s')"
msgstr "Type de fichier : %s (« %s »)"
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2391
+#: ../midori/midori-view.c:2642
#, c-format
msgid "Open %s"
msgstr "Ouvrir %s"
-#: ../midori/midori-view.c:2906
+#: ../midori/midori-view.c:3190
#, c-format
msgid "Inspect page - %s"
msgstr "Analyser la page - %s"
-#: ../midori/midori-view.c:3163
+#: ../midori/midori-view.c:3455
msgid "Speed dial"
msgstr "Appel rapide"
-#: ../midori/midori-view.c:3164
+#: ../midori/midori-view.c:3456
msgid "Click to add a shortcut"
msgstr "Cliquez pour ajouter un raccourci"
-#: ../midori/midori-view.c:3165
+#: ../midori/midori-view.c:3457
msgid "Enter shortcut address"
msgstr "Entrez l'adresse du raccourci"
-#: ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:3458
msgid "Enter shortcut title"
msgstr "Entrez le titre du raccourci"
-#: ../midori/midori-view.c:3167
+#: ../midori/midori-view.c:3459
msgid "Are you sure you want to delete this shortcut?"
msgstr "Ètes-vous certain de vouloir supprimer ce raccourci ?"
-#: ../midori/midori-view.c:3201
+#: ../midori/midori-view.c:3496
#, c-format
msgid "Document cannot be displayed"
msgstr "Le document ne peut être affiché"
-#: ../midori/midori-view.c:3218
+#: ../midori/midori-view.c:3519
#, c-format
msgid "No documentation installed"
msgstr "Pas de documentation installée"
-#: ../midori/midori-view.c:3437
+#: ../midori/midori-view.c:3769
msgid "Blank page"
msgstr "Page vierge"
-#: ../midori/midori-view.c:3697
+#: ../midori/midori-view.c:4029
msgid "_Duplicate Tab"
msgstr "_Dupliquer l'onglet"
-#: ../midori/midori-view.c:3702
+#: ../midori/midori-view.c:4034
msgid "_Restore Tab"
msgstr "_Restorer l'onglet"
-#: ../midori/midori-view.c:3702
+#: ../midori/midori-view.c:4034
msgid "_Minimize Tab"
msgstr "_Minimiser l'onglet"
-#: ../midori/midori-view.c:3708
+#: ../midori/midori-view.c:4040
msgid "Close ot_her Tabs"
-msgstr "Fermer les autres onglets"
+msgstr "Fermer les _autres onglets"
-#: ../midori/midori-view.c:4332
+#: ../midori/midori-view.c:4661
msgid "Print background images"
msgstr "Imprimer les images d'arrière-plan"
-#: ../midori/midori-view.c:4333
+#: ../midori/midori-view.c:4662
msgid "Whether background images should be printed"
msgstr "Indique s'il faut imprimer les images d'arrière-plan"
-#: ../midori/midori-view.c:4385
-#: ../midori/midori-preferences.c:382
+#: ../midori/midori-view.c:4714 ../midori/midori-preferences.c:381
msgid "Features"
msgstr "Fonctionnalités"
#. Page "General"
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:298
msgid "General"
msgstr "Général"
-#: ../midori/midori-preferences.c:300
+#: ../midori/midori-preferences.c:299
msgid "Startup"
msgstr "Démarrage"
-#: ../midori/midori-preferences.c:315
-#: ../midori/midori-preferences.c:322
+#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321
msgid "Use current page as homepage"
msgstr "Utiliser la page courante comme page d'accueil"
-#: ../midori/midori-preferences.c:332
-#: ../panels/midori-transfers.c:87
+#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Transferts"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:350
+#: ../midori/midori-preferences.c:349
msgid "Appearance"
msgstr "Apparence"
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:350
msgid "Font settings"
msgstr "Paramètres des polices"
-#: ../midori/midori-preferences.c:353
+#: ../midori/midori-preferences.c:352
msgid "Default Font Family"
msgstr "Police par défaut"
-#: ../midori/midori-preferences.c:356
+#: ../midori/midori-preferences.c:355
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:359
+#: ../midori/midori-preferences.c:358
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:361
+#: ../midori/midori-preferences.c:360
msgid "Fixed-width Font Family"
msgstr "Police à largeur fixe"
-#: ../midori/midori-preferences.c:364
+#: ../midori/midori-preferences.c:363
msgid "The font family used to display fixed-width text"
msgstr "Famille de la police utilisée pour afficher les textes à largeur fixe"
-#: ../midori/midori-preferences.c:367
+#: ../midori/midori-preferences.c:366
msgid "The font size used to display fixed-width text"
-msgstr "La taille de la police utilisée pour afficher les textes à largeur fixe"
+msgstr ""
+"La taille de la police utilisée pour afficher les textes à largeur fixe"
-#: ../midori/midori-preferences.c:369
+#: ../midori/midori-preferences.c:368
msgid "Minimum Font Size"
msgstr "Taille minimale de la police"
-#: ../midori/midori-preferences.c:372
+#: ../midori/midori-preferences.c:371
msgid "The minimum font size used to display text"
msgstr "La taille minimale de la police utilisée pour afficher les textes"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:381
+#: ../midori/midori-preferences.c:380
msgid "Behavior"
msgstr "Comportement"
-#: ../midori/midori-preferences.c:394
+#: ../midori/midori-preferences.c:393
msgid "Enforce 96 dots per inch"
msgstr "Forcer 96 points par pouce"
-#: ../midori/midori-preferences.c:395
+#: ../midori/midori-preferences.c:394
msgid "Enforce a video dot density of 96 DPI"
msgstr "Force une densité visuelle de 96 DPI"
#: ../midori/midori-preferences.c:414
+msgid "Allow scripts to open popups"
+msgstr "Autorisés les scripts à ouvrir des popups"
+
+#: ../midori/midori-preferences.c:415
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+"Indique si les scripts sont autorisés à ouvrir des fenêtres intempestives "
+"(popups) automatiquement"
+
+#: ../midori/midori-preferences.c:419
msgid "Spell Checking"
msgstr "Vérificateur d'orthographe"
-#: ../midori/midori-preferences.c:417
+#: ../midori/midori-preferences.c:422
msgid "Enable Spell Checking"
msgstr "Activer la vérification de l'orthographe"
-#: ../midori/midori-preferences.c:418
+#: ../midori/midori-preferences.c:423
msgid "Enable spell checking while typing"
msgstr "Activer la vérification de l'orthographe lors de la saisie"
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:425
msgid "Spelling dictionaries:"
msgstr "Dictionnaires d'orthographe :"
#. i18n: The example should be adjusted to contain a good local default
-#: ../midori/midori-preferences.c:424
-msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\""
-msgstr "Une liste de langues séparées par des virgules, utilisées par le vérificateur d'ortographe. Par example « fr_FR,de_DE,en_US »"
+#: ../midori/midori-preferences.c:429
+msgid ""
+"A comma separated list of languages to be used for spell checking, for "
+"example \"en_GB,de_DE\""
+msgstr ""
+"Une liste de langues séparées par des virgules, utilisées par le "
+"vérificateur d'ortographe. Par example « fr_FR,de_DE,en_US »"
#. Page "Interface"
-#: ../midori/midori-preferences.c:430
+#: ../midori/midori-preferences.c:435
msgid "Interface"
msgstr "Interface"
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:436
msgid "Navigationbar"
msgstr "Barre de navigation"
-#: ../midori/midori-preferences.c:441
+#: ../midori/midori-preferences.c:446
msgid "Browsing"
msgstr "Navigation"
#. Page "Applications"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:468
msgid "Applications"
msgstr "Applications"
-#: ../midori/midori-preferences.c:464
+#: ../midori/midori-preferences.c:469
msgid "External applications"
msgstr "Applications externes"
#. Page "Network"
-#: ../midori/midori-preferences.c:480
-#: ../midori/midori-preferences.c:481
+#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486
msgid "Network"
msgstr "Réseau"
+#: ../midori/midori-preferences.c:492
+msgid "Hostname"
+msgstr "Nom de l'hôte"
+
#. Page "Privacy"
-#: ../midori/midori-preferences.c:505
+#: ../midori/midori-preferences.c:511
msgid "Privacy"
msgstr "Vie privée"
-#: ../midori/midori-preferences.c:506
+#: ../midori/midori-preferences.c:512
msgid "Web Cookies"
msgstr "Fichiers témoins"
-#: ../midori/midori-preferences.c:515
-#: ../midori/midori-preferences.c:529
+#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535
msgid "days"
msgstr "jours"
@@ -1999,65 +2085,46 @@ msgstr "Gestion des moteurs de recherche"
msgid "Use as _default"
msgstr "Par dé_faut"
-#: ../midori/sokoke.c:1188
+#: ../midori/sokoke.c:1294
msgid "_Bookmark"
msgstr "_Signet"
-#: ../midori/sokoke.c:1190
+#: ../midori/sokoke.c:1296
msgid "Add Boo_kmark"
msgstr "Ajouter un s_ignet"
-#: ../midori/sokoke.c:1191
+#: ../midori/sokoke.c:1297
msgid "_Console"
msgstr "_Console"
-#: ../midori/sokoke.c:1192
+#: ../midori/sokoke.c:1298
msgid "_Extensions"
msgstr "_Extensions"
-#: ../midori/sokoke.c:1193
+#: ../midori/sokoke.c:1299
msgid "_History"
msgstr "_Historique"
-#: ../midori/sokoke.c:1194
+#: ../midori/sokoke.c:1300
msgid "_Homepage"
msgstr "Page d'a_ccueil"
-#: ../midori/sokoke.c:1195
+#: ../midori/sokoke.c:1301
msgid "_Userscripts"
msgstr "Scripts _utilisateur"
-#: ../midori/sokoke.c:1196
+#: ../midori/sokoke.c:1302
msgid "New _Tab"
msgstr "Nouvel o_nglet"
-#: ../midori/sokoke.c:1197
+#: ../midori/sokoke.c:1303
msgid "_Transfers"
msgstr "_Transferts"
-#: ../midori/sokoke.c:1198
+#: ../midori/sokoke.c:1304
msgid "Netscape p_lugins"
msgstr "Greffons _Netscape"
-#: ../panels/midori-addons.c:99
-#: ../panels/midori-addons.c:144
-msgid "Userscripts"
-msgstr "Scripts utilisateur"
-
-#: ../panels/midori-addons.c:100
-msgid "Userstyles"
-msgstr "Styles utilisateur"
-
-#: ../panels/midori-addons.c:305
-#, c-format
-msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s."
-msgstr "Copier le scripts utilisateur dans le dossier %s et les styles utilisateurs dans le dossier %s."
-
-#: ../panels/midori-addons.c:911
-#, c-format
-msgid "Can't monitor folder '%s': %s"
-msgstr "Ne peut contrôler le dossier « %s » : %s"
-
#: ../panels/midori-bookmarks.c:111
msgid "Bookmarks"
msgstr "Signets"
@@ -2086,57 +2153,54 @@ msgstr "Console"
msgid "Extensions"
msgstr "Extensions"
-#: ../panels/midori-history.c:141
-#: ../panels/midori-history.c:171
-#, 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:270
+#: ../panels/midori-history.c:273
msgid "Erroneous clock time"
msgstr "Temps d'horloge incorrect"
-#: ../panels/midori-history.c:271
-msgid "The clock time lies in the past. Please check the current date and time."
-msgstr "L'heure de l'horloge se trouve dans le passé. S'il vous plaît, vérifiez la date et l'heure."
+#: ../panels/midori-history.c:274
+msgid ""
+"The clock time lies in the past. Please check the current date and time."
+msgstr ""
+"L'heure de l'horloge se trouve dans le passé. S'il vous plaît, vérifiez la "
+"date et l'heure."
-#: ../panels/midori-history.c:283
+#: ../panels/midori-history.c:286
msgid "A week ago"
msgstr "Il y a une semaine"
-#: ../panels/midori-history.c:285
+#: ../panels/midori-history.c:288
#, 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:288
+#: ../panels/midori-history.c:291
msgid "Today"
msgstr "Aujourd'hui"
-#: ../panels/midori-history.c:290
+#: ../panels/midori-history.c:293
msgid "Yesterday"
msgstr "Hier"
-#: ../panels/midori-history.c:375
+#: ../panels/midori-history.c:378
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:435
+#: ../panels/midori-history.c:438
msgid "Bookmark the selected history item"
msgstr "Ajouter un signet pour l'élément sélectionné dans l'historique"
-#: ../panels/midori-history.c:444
+#: ../panels/midori-history.c:447
msgid "Delete the selected history item"
msgstr "Supprimer l'élément sélectionné dans l'historique"
-#: ../panels/midori-history.c:452
+#: ../panels/midori-history.c:455
msgid "Clear the entire history"
msgstr "Effacer tout l'historique"
# manque un raccourcis Alt+X
-#: ../panels/midori-history.c:950
+#: ../panels/midori-history.c:953
#: ../extensions/cookie-manager/cookie-manager-page.c:1144
msgid "Filter:"
msgstr "Filtre :"
@@ -2173,32 +2237,30 @@ msgstr "Mot de passe"
msgid "_Remember password"
msgstr "Se _souvenir du mot de passe"
-#: ../katze/katze-throbber.c:831
+#: ../katze/katze-throbber.c:882
#, 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:844
+#: ../katze/katze-throbber.c:895
#, 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:912
+#: ../katze/katze-throbber.c:963
msgid "Animation frames are broken"
msgstr "Les trames d'animation sont corrompues"
-#: ../katze/katze-utils.c:489
-#: ../katze/katze-utils.c:884
+#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "La propriété « %s » n'est pas valide pour %s"
-#: ../katze/katze-utils.c:535
-#: ../katze/katze-utils.c:564
+#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573
msgid "Choose file"
msgstr "Choisissez un fichier"
-#: ../katze/katze-utils.c:550
+#: ../katze/katze-utils.c:559
msgid "Choose folder"
msgstr "Choisissez un dossier"
@@ -2207,48 +2269,85 @@ msgstr "Choisissez un dossier"
msgid "Preferences for %s"
msgstr "Préférences pour %s"
-#: ../extensions/adblock.c:398
+#: ../extensions/adblock.c:413
msgid "Configure Advertisement filters"
msgstr "Configurer les filtres de publicité"
-#: ../extensions/adblock.c:430
+#: ../extensions/adblock.c:445
#, c-format
-msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s."
-msgstr "Tapez l'adresse d'une liste de filtre préconfigurés dans l'entrée de texte et cliquez sur « Ajouter » pour l'ajouter à la liste. Vous trouverez plus de listes à %s."
+msgid ""
+"Type the address of a preconfigured filter list in the text entry and click "
+"\"Add\" to add it to the list. You can find more lists at %s."
+msgstr ""
+"Tapez l'adresse d'une liste de filtre préconfigurés dans l'entrée de texte "
+"et cliquez sur « Ajouter » pour l'ajouter à la liste. Vous trouverez plus de "
+"listes à %s."
-#: ../extensions/adblock.c:570
+#: ../extensions/adblock.c:585
msgid "Configure _Advertisement filters..."
msgstr "Configurer les filtres de _publicité"
-#: ../extensions/adblock.c:818
+#: ../extensions/adblock.c:839
msgid "Edit rule"
msgstr "Modifier les règles"
-#: ../extensions/adblock.c:831
+#: ../extensions/adblock.c:852
msgid "_Rule:"
msgstr "_Regles :"
-#: ../extensions/adblock.c:885
+#: ../extensions/adblock.c:906
msgid "Bl_ock image"
-msgstr "Blocs d'images"
+msgstr "_Bloquer l'image"
-#: ../extensions/adblock.c:890
+#: ../extensions/adblock.c:911
msgid "Bl_ock link"
-msgstr "Mode « sélection par bl_oc »"
+msgstr "B_loquer le lien"
-#: ../extensions/adblock.c:1447
+#: ../extensions/adblock.c:1485
msgid "Advertisement blocker"
msgstr "Bloqueur de publicités"
-#: ../extensions/adblock.c:1448
+#: ../extensions/adblock.c:1486
msgid "Block advertisements according to a filter list"
msgstr "Bloquer les publicités en fonction d'une liste de filtres"
-#: ../extensions/colorful-tabs.c:136
+#: ../extensions/addons.c:122
+#, c-format
+msgid "Copy %s to the folder %s."
+msgstr "Copier %s dans le dossier %s"
+
+#: ../extensions/addons.c:177
+msgid "Userscripts"
+msgstr "Scripts utilisateur"
+
+#: ../extensions/addons.c:179
+msgid "Userstyles"
+msgstr "Styles utilisateur"
+
+#: ../extensions/addons.c:1085
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr ""
+"La configuration de l'extension « %s » n'a pas pu être enregistrée: %s\n"
+
+#: ../extensions/addons.c:1086 ../extensions/addons.c:1253
+msgid "User addons"
+msgstr "Extensions utilisateur"
+
+#: ../extensions/addons.c:1210
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "Ne peut contrôler le dossier « %s » : %s"
+
+#: ../extensions/addons.c:1254
+msgid "Support for userscripts and userstyles"
+msgstr "Support des scripts et styles utilisateur"
+
+#: ../extensions/colorful-tabs.c:204
msgid "Colorful Tabs"
msgstr "Onglets colorés"
-#: ../extensions/colorful-tabs.c:137
+#: ../extensions/colorful-tabs.c:205
msgid "Tint each tab distinctly"
msgstr "Donner une couleur distincte à chaque onglet"
@@ -2262,8 +2361,12 @@ msgid "Delete All"
msgstr "Supprimer tous"
#: ../extensions/cookie-manager/cookie-manager-page.c:114
-msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter."
-msgstr "Supprimer tous les témoins visibles. Si un filtre est appliqué, seuls les fichiers témoins correspondant au filtre seront effacés."
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"Supprimer tous les témoins visibles. Si un filtre est appliqué, seuls les "
+"fichiers témoins correspondant au filtre seront effacés."
#: ../extensions/cookie-manager/cookie-manager-page.c:129
msgid "Expand All"
@@ -2336,8 +2439,12 @@ msgid "_Collapse All"
msgstr "_Masquer tous"
#: ../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 "Entrer un filtre pour n'afficher que les cookies dont le nom ou le domaine correspondent au filtre entré."
+msgid ""
+"Enter a filter string to show only cookies whose name or domain field match "
+"the entered filter"
+msgstr ""
+"Entrer un filtre pour n'afficher que les cookies dont le nom ou le domaine "
+"correspondent au filtre entré."
#: ../extensions/cookie-manager/main.c:40
msgid "_Cookie Manager"
@@ -2347,13 +2454,16 @@ msgstr "Gestionnaire de _cookies"
msgid "List, view and delete cookies"
msgstr "Lister, afficher et supprimer les fichiers témoins"
-#: ../extensions/feed-panel/feed-atom.c:237
+#: ../extensions/feed-panel/feed-atom.c:209
msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr "Impossible de trouver les éléments ATOM \"entry\" requis dans les données XML."
+msgstr ""
+"Impossible de trouver les éléments ATOM \"entry\" requis dans les données "
+"XML."
-#: ../extensions/feed-panel/feed-atom.c:343
+#: ../extensions/feed-panel/feed-atom.c:315
msgid "Failed to find required Atom \"feed\" elements in XML data."
-msgstr "Impossible de trouver les éléments ATOM \"feed\" requis dans les données XML."
+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:399
@@ -2362,19 +2472,19 @@ msgctxt "Feed"
msgid "Last updated: %s."
msgstr "Dernière mise à jour : %s."
-#: ../extensions/feed-panel/feed-panel.c:667
+#: ../extensions/feed-panel/feed-panel.c:671
msgid "Feeds"
msgstr "Flux"
-#: ../extensions/feed-panel/feed-panel.c:720
+#: ../extensions/feed-panel/feed-panel.c:724
msgid "Add new feed"
msgstr "Ajouter un nouveau flux"
-#: ../extensions/feed-panel/feed-panel.c:727
+#: ../extensions/feed-panel/feed-panel.c:731
msgid "Delete feed"
msgstr "Supprimer un flux"
-#: ../extensions/feed-panel/feed-panel.c:810
+#: ../extensions/feed-panel/feed-panel.c:814
msgid "_Feeds"
msgstr "_Flux"
@@ -2395,7 +2505,8 @@ msgstr "Impossible d'analyser le flux XML: %s"
#: ../extensions/feed-panel/feed-rss.c:46
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."
+msgstr ""
+"Impossible de trouver l'élément \"channel\" dans les données XML du flux RSS."
#: ../extensions/feed-panel/feed-rss.c:51
msgid "Unsupported RSS version found."
@@ -2403,11 +2514,14 @@ msgstr "La version trouvée du flux RSS n'est pas prise en charge."
#: ../extensions/feed-panel/feed-rss.c:148
msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr "Impossible de trouver les éléments \"item\" requis dans les données XML."
+msgstr ""
+"Impossible de trouver les éléments \"item\" requis dans les données XML."
#: ../extensions/feed-panel/feed-rss.c:248
msgid "Failed to find required RSS \"channel\" elements in XML data."
-msgstr "Impossible de trouver les éléments RSS \"channel\" requis dans les données XML."
+msgstr ""
+"Impossible de trouver les éléments RSS \"channel\" requis dans les données "
+"XML."
#: ../extensions/feed-panel/main.c:132
msgid "Error"
@@ -2431,39 +2545,38 @@ msgstr "Panneau de flux"
msgid "Read Atom/ RSS feeds"
msgstr "Lire des flux Atom et RSS"
-#: ../extensions/formhistory.c:140
+#: ../extensions/formhistory.c:144
#, c-format
msgid "Failed to add form value: %s\n"
msgstr "Impossible d'ajouter la valeur de formulaire : %s\n"
-#: ../extensions/formhistory.c:506
+#: ../extensions/formhistory.c:510
msgid "Stores history of entered form data"
msgstr "Stocke l'historique des saisies de formulaire"
-#: ../extensions/formhistory.c:510
+#: ../extensions/formhistory.c:514
#, c-format
msgid "Not available: %s"
msgstr "Non disponible : %s"
-#: ../extensions/formhistory.c:511
+#: ../extensions/formhistory.c:515
msgid "Resource files not installed"
msgstr "Fichiers ressources non installés"
-#: ../extensions/formhistory.c:517
+#: ../extensions/formhistory.c:521
msgid "Form history filler"
msgstr "Autocomplétion des formulaires"
-#: ../extensions/mouse-gestures.c:288
+#: ../extensions/mouse-gestures.c:303
msgid "Mouse Gestures"
msgstr "Mouvements de souris"
-#: ../extensions/mouse-gestures.c:289
+#: ../extensions/mouse-gestures.c:304
msgid "Control Midori by moving the mouse"
msgstr "Contrôler Midori par des mouvements de la souris"
#. i18n: A panel showing a user specified web page
-#: ../extensions/page-holder.c:129
-#: ../extensions/page-holder.c:177
+#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177
msgid "Pageholder"
msgstr "Cadre de pages"
@@ -2509,35 +2622,39 @@ msgstr "Fonctionnalités dans la barre d'état"
#: ../extensions/statusbar-features.c:150
msgid "Easily toggle features on web pages on and off"
-msgstr "Activer et désactiver facilement des fonctionnalités sur les pages Internet"
+msgstr ""
+"Activer et désactiver facilement des fonctionnalités sur les pages Internet"
-#: ../extensions/tab-panel.c:565
-#: ../extensions/tab-panel.c:622
+#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625
msgid "Tab Panel"
msgstr "Panneau d'onglets"
-#: ../extensions/tab-panel.c:606
+#: ../extensions/tab-panel.c:609
msgid "T_ab Panel"
msgstr "P_anneau d'onglets"
-#: ../extensions/tab-panel.c:623
+#: ../extensions/tab-panel.c:626
msgid "Show tabs in a vertical panel"
msgstr "Afficher les onglets dans un panneau vertical"
-#: ../extensions/tab-switcher.c:394
+#: ../extensions/tab-switcher.c:395
msgid "Tab History List"
msgstr "Liste de l'historique des onglets"
-#: ../extensions/tab-switcher.c:395
+#: ../extensions/tab-switcher.c:396
msgid "Allows to switch tabs by choosing from a list sorted by last usage"
-msgstr "Permettre de changer d'onglet en choisissant dans une liste triée par dernière utilisation"
+msgstr ""
+"Permettre de changer d'onglet en choisissant dans une liste triée par "
+"dernière utilisation"
#: ../extensions/toolbar-editor.c:389
msgid "Customize Toolbar"
msgstr "Personnaliser la barre d'outils"
#: ../extensions/toolbar-editor.c:405
-msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop."
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reodered by drag "
+"and drop."
msgstr ""
"Sélectionnez les éléments à afficher sur la barre d'outils.\n"
"Ils peuvent être réorganisés par glisser-déposer."
@@ -2562,10 +2679,22 @@ msgstr "Éditeur de barre d'outils"
msgid "Easily edit the toolbar layout"
msgstr "Éditer facilement la disposition de la barre d'outils"
-#: ../extensions/web-cache.c:459
+#: ../extensions/web-cache.c:465
msgid "Cache HTTP communication on disk"
msgstr "Mettre en cache les communication HTTP sur le disque"
+#~ msgid "Open _Link"
+#~ msgstr "Ouvrir le _lien"
+
+#~ msgid "Open Image in New Wi_ndow"
+#~ msgstr "Ouvrir l'image dans une nouvelle fe_nêtre"
+
+#~ msgid ""
+#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s."
+#~ msgstr ""
+#~ "Copier le scripts utilisateur dans le dossier %s et les styles "
+#~ "utilisateurs dans le dossier %s."
+
#~ msgid "Failed to get current time: %s\n"
#~ msgstr "Impossible d'obtenir l'heure actuelle : %s\n"
diff --git a/po/gl.po b/po/gl.po
index fc590854..0fb7cb62 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,18 +2,18 @@
# Copyright (C) 2008, 2009 Miguel Anxo Bouzada.
# Copyright (C) 2009, 2010 Leandro Regueiro.
# This file is distributed under the same license as the Xfce package.
-#
+#
# Miguel Anxo Bouzada 2008, 2009.
# Leandro Regueiro , 2009, 2010.
-#
+#
# Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas
# colaborar connosco, podes atopar máis información en
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: midori-0.1.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-08 12:06+0100\n"
+"POT-Creation-Date: 2010-05-04 10:07+0000\n"
"PO-Revision-Date: 2010-02-08 21:51+0100\n"
"Last-Translator: Leandro Regueiro \n"
"Language-Team: Galician \n"
@@ -26,12 +26,9 @@ msgstr ""
msgid "Lightweight web browser"
msgstr "Navegador web lixeiro"
-#: ../data/midori.desktop.in.h:2
-#: ../midori/main.c:1277
-#: ../midori/main.c:1485
-#: ../midori/main.c:1493
-#: ../midori/main.c:1509
-#: ../midori/midori-websettings.c:299
+#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664
+#: ../midori/main.c:1672 ../midori/main.c:1688
+#: ../midori/midori-websettings.c:318
msgid "Midori"
msgstr "Midori"
@@ -39,184 +36,198 @@ msgstr "Midori"
msgid "Web Browser"
msgstr "Navegador web"
-#: ../midori/main.c:96
+#: ../midori/main.c:102
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Non se puido cargar a configuración: %s\n"
-#: ../midori/main.c:145
+#: ../midori/main.c:151
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "O valor «%s» non é válido para %s"
-#: ../midori/main.c:152
-#: ../midori/main.c:238
+#: ../midori/main.c:158 ../midori/main.c:244
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "O valor de configuración «%s» non é válido"
-#: ../midori/main.c:364
-#: ../extensions/formhistory.c:442
+#: ../midori/main.c:370 ../extensions/formhistory.c:446
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Fallou ao abrir a base de datos: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:413
+#: ../midori/main.c:425
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Fallou ao eliminar elementos antigos do historial: %s\n"
-#: ../midori/main.c:441
+#: ../midori/main.c:445
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Non se puido gardar a configuración. %s"
-#: ../midori/main.c:479
+#: ../midori/main.c:483
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Non se puideron gardar os motores de busca. %s"
-#: ../midori/main.c:498
-#: ../midori/main.c:548
-#: ../midori/main.c:568
+#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572
#, c-format
msgid "The bookmarks couldn't be saved. %s"
msgstr "Non se puideron gardar os marcadores. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:598
-#: ../midori/main.c:621
+#: ../midori/main.c:602 ../midori/main.c:625
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Non se puido gardar o lixo. %s"
-#: ../midori/main.c:685
-#: ../midori/main.c:888
+#: ../midori/main.c:684 ../midori/main.c:924
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Non se puido gardar a sesión. %s"
-#: ../midori/main.c:922
+#: ../midori/main.c:868
+msgid "No root certificate file is available. SSL certificates cannot be verified."
+msgstr "Non hai ningún ficheiro de certificado raíz dispoñible. Non se pode verificar os certificados SSL."
+
+#: ../midori/main.c:958
msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem."
msgstr "Parece que Midori pechou inesperadamente a última vez. Se isto xa ocorreu varias veces, probe unha das seguintes opcións para resolver o problema."
-#: ../midori/main.c:937
+#: ../midori/main.c:973
msgid "Modify _preferences"
msgstr "Modificar as _preferencias"
-#: ../midori/main.c:941
+#: ../midori/main.c:977
msgid "Reset the last _session"
msgstr "Restablecer a última _sesión"
-#: ../midori/main.c:946
+#: ../midori/main.c:982
msgid "Disable all _extensions"
msgstr "Desactivar tódalas _extensións"
-#: ../midori/main.c:1166
-#: ../midori/main.c:1748
+#: ../midori/main.c:1217 ../midori/main.c:1937
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Non se puido cargar a sesión: %s\n"
-#: ../midori/main.c:1277
+#: ../midori/main.c:1336
msgid "No filename specified"
msgstr "Nome de ficheiro sen especificar"
-#: ../midori/main.c:1296
+#: ../midori/main.c:1355
msgid "An unknown error occured."
msgstr "Produciuse un erro descoñecido:"
-#: ../midori/main.c:1327
+#: ../midori/main.c:1386
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Captura gardada en: %s\n"
-#: ../midori/main.c:1387
+#: ../midori/main.c:1557
msgid "Run ADDRESS as a web application"
msgstr "Executar ENDEREZO como un aplicativo web"
-#: ../midori/main.c:1387
+#: ../midori/main.c:1557
msgid "ADDRESS"
msgstr "ENDEREZO"
-#: ../midori/main.c:1390
+#: ../midori/main.c:1560
msgid "Use FOLDER as configuration folder"
msgstr "Usar CARTAFOL como cartafol de configuración"
-#: ../midori/main.c:1390
+#: ../midori/main.c:1560
msgid "FOLDER"
msgstr "CARTAFOL"
-#: ../midori/main.c:1393
+#: ../midori/main.c:1563
msgid "Show a diagnostic dialog"
msgstr "Mostrar un diálogo de diagnóstico"
-#: ../midori/main.c:1395
+#: ../midori/main.c:1565
msgid "Run the specified filename as javascript"
msgstr "Execute o nome de ficheiro especificado como JavaScript"
-#: ../midori/main.c:1398
+#: ../midori/main.c:1568
msgid "Take a snapshot of the specified URI"
msgstr "Facer unha captura do URI específicado"
-#: ../midori/main.c:1401
+#: ../midori/main.c:1571
msgid "Execute the specified command"
msgstr "Executar o comando especificado"
-#: ../midori/main.c:1403
+#: ../midori/main.c:1573
msgid "Display program version"
msgstr "Mostrar a versión do programa"
-#: ../midori/main.c:1405
+#: ../midori/main.c:1575
msgid "Addresses"
msgstr "Enderezos"
-#: ../midori/main.c:1482
+#: ../midori/main.c:1577
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "Bloquear os URIs de acordo ca expresión regular PATRÓN"
+
+#: ../midori/main.c:1577
+msgid "PATTERN"
+msgstr "PATRÓN"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:1581
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr "Restabelecer Midori despois de SEGUNDOS segundos de inactividade"
+
+#: ../midori/main.c:1581
+msgid "SECONDS"
+msgstr "SEGUNDOS"
+
+#: ../midori/main.c:1661
msgid "[Addresses]"
msgstr "[Enderezos]"
-#: ../midori/main.c:1510
+#: ../midori/main.c:1689
msgid "Please report comments, suggestions and bugs to:"
msgstr "Por favor, envíe comentarios, suxestións e erros a:"
-#: ../midori/main.c:1512
+#: ../midori/main.c:1691
msgid "Check for new versions at:"
msgstr "Comprobar se existen novas versións en:"
-#: ../midori/main.c:1598
+#: ../midori/main.c:1788
msgid "The specified configuration folder is invalid."
msgstr "O cartafol de configuración especificado non é correcto."
-#: ../midori/main.c:1647
+#: ../midori/main.c:1836
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Xa se está a executar outra instancia de Midori pero non responde.\n"
-#: ../midori/main.c:1702
+#: ../midori/main.c:1891
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Non se puideron cargar os motores de busca. %s\n"
-#: ../midori/main.c:1731
+#: ../midori/main.c:1920
#, c-format
msgid "The bookmarks couldn't be loaded: %s\n"
msgstr "Non se puideron cargar os marcadores: %s\n"
-#: ../midori/main.c:1763
+#: ../midori/main.c:1952
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Non se puido cargar o lixo: %s\n"
-#: ../midori/main.c:1777
+#: ../midori/main.c:1966
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Non se puido cargar o historial: %s\n"
-#: ../midori/main.c:1791
+#: ../midori/main.c:1980
msgid "The following errors occured:"
msgstr "Producíronse os seguintes erros:"
-#: ../midori/main.c:1807
+#: ../midori/main.c:1996
msgid "_Ignore"
msgstr "_Ignorar"
@@ -224,8 +235,7 @@ msgstr "_Ignorar"
msgid "File not found."
msgstr "Non se atopou o ficheiro."
-#: ../midori/midori-array.c:462
-#: ../midori/midori-array.c:485
+#: ../midori/midori-array.c:462 ../midori/midori-array.c:485
#: ../midori/midori-array.c:495
msgid "Malformed document."
msgstr "Documento malformado."
@@ -234,263 +244,266 @@ msgstr "Documento malformado."
msgid "Unrecognized bookmark format."
msgstr "Formato de marcador non recoñecido."
-#: ../midori/midori-array.c:718
-#: ../midori/sokoke.c:1031
+#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120
#, c-format
msgid "Writing failed."
msgstr "Fallou a escritura."
-#: ../midori/midori-browser.c:324
-#: ../midori/midori-browser.c:5194
-#: ../midori/midori-browser.c:5200
+#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5489
+#: ../midori/midori-browser.c:5495
msgid "Reload the current page"
msgstr "Recargar a páxina actual"
-#: ../midori/midori-browser.c:334
-#: ../midori/midori-browser.c:5197
+#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5492
msgid "Stop loading the current page"
msgstr "Deter a carga da páxina"
-#: ../midori/midori-browser.c:445
+#: ../midori/midori-browser.c:457
#, c-format
msgid "%d%% loaded"
msgstr "%d%% cargada"
-#: ../midori/midori-browser.c:483
+#: ../midori/midori-browser.c:495
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Produciuse un erro ao actualizar o título: %s\n"
-#: ../midori/midori-browser.c:497
+#: ../midori/midori-browser.c:509
#, c-format
msgid "Unexpected action '%s'."
msgstr "Acción inesperada «%s»"
-#: ../midori/midori-browser.c:703
+#: ../midori/midori-browser.c:716
msgid "New folder"
msgstr "Cartafol novo"
-#: ../midori/midori-browser.c:703
+#: ../midori/midori-browser.c:716
msgid "Edit folder"
msgstr "Editar cartafol"
-#: ../midori/midori-browser.c:705
+#: ../midori/midori-browser.c:718
msgid "New bookmark"
msgstr "Novo marcador"
-#: ../midori/midori-browser.c:705
+#: ../midori/midori-browser.c:718
msgid "Edit bookmark"
msgstr "Editar o marcador"
-#: ../midori/midori-browser.c:735
+#: ../midori/midori-browser.c:749
msgid "_Title:"
msgstr "_Título:"
-#: ../midori/midori-browser.c:748
-#: ../midori/midori-searchaction.c:967
+#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961
msgid "_Description:"
msgstr "_Descrición"
-#: ../midori/midori-browser.c:767
-#: ../midori/midori-searchaction.c:981
+#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975
#: ../extensions/feed-panel/main.c:376
msgid "_Address:"
msgstr "_Enderezo:"
-#: ../midori/midori-browser.c:797
-#: ../midori/midori-browser.c:4426
+#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4644
msgid "_Folder:"
msgstr "_Cartafol:"
-#: ../midori/midori-browser.c:807
-#: ../midori/midori-browser.c:887
-#: ../midori/midori-browser.c:4431
-#: ../midori/midori-browser.c:4463
+#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901
+#: ../midori/midori-browser.c:4649 ../midori/midori-browser.c:4681
msgid "Toplevel folder"
msgstr "Cartafol principal"
-#: ../midori/midori-browser.c:836
+#: ../midori/midori-browser.c:850
msgid "Show in the tool_bar"
msgstr "Mostrar na _barra de ferramentas"
-#: ../midori/midori-browser.c:851
+#: ../midori/midori-browser.c:865
msgid "Run as _web application"
msgstr "Executar como aplicativo _web"
-#: ../midori/midori-browser.c:967
-#: ../midori/midori-browser.c:4481
+#: ../midori/midori-browser.c:959
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Non hai espazo libre dabondo para descargar \"%s\"."
+
+#: ../midori/midori-browser.c:963
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "O ficheiro precisa %s pero só quedan %s."
+
+#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4699
+#: ../midori/midori-browser.c:4731
msgid "Save file as"
msgstr "Gardar o ficheiro como"
-#: ../midori/midori-browser.c:1341
-#: ../panels/midori-transfers.c:271
+#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271
#, c-format
msgid "%s of %s"
msgstr "%s de %s"
-#: ../midori/midori-browser.c:1377
+#: ../midori/midori-browser.c:1429
#, c-format
msgid "The file '%s' has been downloaded."
msgstr "Descargouse o ficheiro '%s'."
-#: ../midori/midori-browser.c:1381
+#: ../midori/midori-browser.c:1433
msgid "Transfer completed"
msgstr "Transferencia completada"
-#: ../midori/midori-browser.c:1521
+#: ../midori/midori-browser.c:1573
msgid "Save file"
msgstr "Gardar ficheiro"
-#: ../midori/midori-browser.c:2235
+#: ../midori/midori-browser.c:2297
msgid "Open file"
msgstr "Abrir ficheiro"
-#: ../midori/midori-browser.c:2311
-#: ../extensions/feed-panel/main.c:364
+#: ../midori/midori-browser.c:2373 ../extensions/feed-panel/main.c:364
msgid "New feed"
msgstr "Nova fonte"
-#: ../midori/midori-browser.c:2352
-#: ../midori/midori-browser.c:5245
-#: ../panels/midori-bookmarks.c:243
+#: ../midori/midori-browser.c:2414 ../midori/midori-browser.c:5554
+#: ../panels/midori-bookmarks.c:242
msgid "Add a new bookmark"
msgstr "Engadir novo marcador"
-#: ../midori/midori-browser.c:2926
-#: ../midori/midori-searchaction.c:490
+#: ../midori/midori-browser.c:2989 ../panels/midori-history.c:332
+#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465
+#, c-format
+msgid "Failed to execute database statement: %s\n"
+msgstr "Fallou ao executar a declaración na base de datos: %s\n"
+
+#: ../midori/midori-browser.c:3069 ../midori/midori-searchaction.c:484
msgid "Empty"
msgstr "Baleiro"
-#: ../midori/midori-browser.c:3539
-#: ../midori/sokoke.c:333
-#: ../midori/sokoke.c:343
-#: ../midori/sokoke.c:371
-#: ../midori/sokoke.c:397
-#: ../midori/sokoke.c:411
+#: ../midori/midori-browser.c:3690 ../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."
msgstr "Non se puido executar o programa externo."
-#: ../midori/midori-browser.c:3789
-#: ../midori/midori-locationaction.c:465
+#: ../midori/midori-browser.c:4004 ../midori/midori-browser.c:5948
#, c-format
-msgid "Search with %s"
-msgstr "Buscar con %s"
+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:4125
-#: ../panels/midori-bookmarks.c:796
-#: ../panels/midori-history.c:704
+#: ../midori/midori-browser.c:4337 ../panels/midori-bookmarks.c:795
+#: ../panels/midori-history.c:751
msgid "Open all in _Tabs"
msgstr "Abrir todo en _lapelas"
-#: ../midori/midori-browser.c:4132
-#: ../panels/midori-bookmarks.c:802
-#: ../panels/midori-history.c:710
-#: ../extensions/feed-panel/feed-panel.c:545
+#: ../midori/midori-browser.c:4344 ../panels/midori-bookmarks.c:801
+#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545
msgid "Open in New _Tab"
msgstr "Abrir nunha nova _lapela"
-#: ../midori/midori-browser.c:4135
-#: ../panels/midori-bookmarks.c:804
-#: ../panels/midori-history.c:712
-#: ../extensions/feed-panel/feed-panel.c:547
+#: ../midori/midori-browser.c:4347 ../panels/midori-bookmarks.c:803
+#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547
msgid "Open in New _Window"
msgstr "Abrir nunha nova _fiestra"
-#: ../midori/midori-browser.c:4354
+#: ../midori/midori-browser.c:4570
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4355
+#: ../midori/midori-browser.c:4571
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4356
+#: ../midori/midori-browser.c:4572
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4357
+#: ../midori/midori-browser.c:4573
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4358
+#: ../midori/midori-browser.c:4574
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4378
-#: ../panels/midori-bookmarks.c:272
+#: ../midori/midori-browser.c:4595 ../panels/midori-bookmarks.c:271
msgid "Import bookmarks..."
msgstr "Importar marcadores..."
-#: ../midori/midori-browser.c:4381
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:4598 ../midori/midori-browser.c:5559
msgid "_Import bookmarks"
msgstr "_Importar marcadores"
-#: ../midori/midori-browser.c:4391
+#: ../midori/midori-browser.c:4609
msgid "_Application:"
msgstr "_Aplicativo:"
-#: ../midori/midori-browser.c:4418
-#: ../midori/midori-browser.c:5349
-#: ../midori/midori-websettings.c:230
-#: ../midori/midori-websettings.c:304
-#: ../katze/katze-utils.c:682
+#: ../midori/midori-browser.c:4636 ../midori/midori-browser.c:5663
+#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323
+#: ../katze/katze-utils.c:691
msgid "Custom..."
msgstr "Personalizado..."
-#: ../midori/midori-browser.c:4492
+#: ../midori/midori-browser.c:4710
msgid "Failed to import bookmarks"
msgstr "Produciuse un erro ao importar os marcadores"
-#: ../midori/midori-browser.c:4641
+#: ../midori/midori-browser.c:4746
+msgid "Failed to export bookmarks"
+msgstr "Produciuse un erro ao exportar os marcadores"
+
+#: ../midori/midori-browser.c:4800 ../panels/midori-history.c:141
+#: ../panels/midori-history.c:171
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Fallou ao eliminar o elemento do historial: %s\n"
+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-browser.c:4907
msgid "Clear Private Data"
msgstr "Limpar os datos privados"
-#: ../midori/midori-browser.c:4645
+#: ../midori/midori-browser.c:4911
msgid "_Clear private data"
msgstr "_Limpar os datos privados"
-#: ../midori/midori-browser.c:4658
+#: ../midori/midori-browser.c:4925
msgid "Clear the following data:"
msgstr "Limpar os seguintes datos:"
-#: ../midori/midori-browser.c:4668
-#: ../midori/midori-preferences.c:524
-#: ../panels/midori-history.c:114
+#: ../midori/midori-browser.c:4936 ../midori/midori-preferences.c:530
+#: ../panels/midori-history.c:119
msgid "History"
msgstr "Historial"
-#: ../midori/midori-browser.c:4673
+#: ../midori/midori-browser.c:4942
msgid "Cookies"
msgstr "Cookies"
-#: ../midori/midori-browser.c:4678
+#: ../midori/midori-browser.c:4947
msgid "'Flash' Cookies"
msgstr "Cookies de «Flash»"
-#: ../midori/midori-browser.c:4683
+#: ../midori/midori-browser.c:4952
msgid "Website icons"
msgstr "Iconas de sitios web"
-#: ../midori/midori-browser.c:4688
-#: ../midori/sokoke.c:1221
+#: ../midori/midori-browser.c:4957 ../midori/sokoke.c:1310
msgid "_Closed Tabs"
msgstr "_Lapelas pechadas"
-#: ../midori/midori-browser.c:4693
-#: ../extensions/web-cache.c:458
+#: ../midori/midori-browser.c:4962 ../extensions/web-cache.c:464
msgid "Web Cache"
msgstr "Caché web"
-#: ../midori/midori-browser.c:4701
+#: ../midori/midori-browser.c:4970
msgid "Clear private data when _quitting Midori"
msgstr "_Limpar os datos privados ao saír de Midori"
-#: ../midori/midori-browser.c:4809
+#: ../midori/midori-browser.c:5072
msgid "A lightweight web browser."
msgstr "Un navegador moi lixeiro"
-#: ../midori/midori-browser.c:4825
+#: ../midori/midori-browser.c:5074
+msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version."
+msgstr ""
+
+#: ../midori/midori-browser.c:5093
msgid "translator-credits"
msgstr ""
"Miguel Anxo Bouzada, 2008, 2009\n"
@@ -498,1119 +511,1157 @@ msgstr ""
"\n"
"Proxecto Trasno http://trasno.net"
-#: ../midori/midori-browser.c:5107
+#: ../midori/midori-browser.c:5402
msgid "_File"
msgstr "_Ficheiro"
-#: ../midori/midori-browser.c:5109
-#: ../midori/sokoke.c:1222
+#: ../midori/midori-browser.c:5404 ../midori/sokoke.c:1311
msgid "New _Window"
msgstr "Nova _fiestra"
-#: ../midori/midori-browser.c:5110
+#: ../midori/midori-browser.c:5405
msgid "Open a new window"
msgstr "Abrir unha nova fiestra"
-#: ../midori/midori-browser.c:5113
+#: ../midori/midori-browser.c:5408
msgid "Open a new tab"
msgstr "Abrir unha nova lapela"
-#: ../midori/midori-browser.c:5115
+#: ../midori/midori-browser.c:5410
msgid "P_rivate Browsing"
msgstr "Navegación p_rivada"
-#: ../midori/midori-browser.c:5116
+#: ../midori/midori-browser.c:5411
msgid "Don't save any private data while browsing"
msgstr "Non gardar datos privados durante a navegación"
-#: ../midori/midori-browser.c:5120
+#: ../midori/midori-browser.c:5415
msgid "Open a file"
msgstr "Abrir un ficheiro"
-#: ../midori/midori-browser.c:5123
+#: ../midori/midori-browser.c:5418
msgid "Save to a file"
msgstr "Gardar nun ficheiro"
-#: ../midori/midori-browser.c:5125
+#: ../midori/midori-browser.c:5420
msgid "Add to Speed _dial"
msgstr "Enga_dir a marcación rápida"
-#: ../midori/midori-browser.c:5126
+#: ../midori/midori-browser.c:5421
msgid "Add shortcut to speed dial"
msgstr "Engadir atallo á marcación rápida"
-#: ../midori/midori-browser.c:5128
+#: ../midori/midori-browser.c:5423
msgid "Add Shortcut to the _desktop"
msgstr "Engadir atallo no _escritorio"
-#: ../midori/midori-browser.c:5129
+#: ../midori/midori-browser.c:5424
msgid "Add shortcut to the desktop"
msgstr "Engadir un atallo no escritorio"
-#: ../midori/midori-browser.c:5131
+#: ../midori/midori-browser.c:5426
msgid "Subscribe to News _feed"
msgstr "Subscribirse á _fonte de novas"
-#: ../midori/midori-browser.c:5132
+#: ../midori/midori-browser.c:5427
msgid "Subscribe to this news feed"
msgstr "Subscribirse a esta fonte de novas"
-#: ../midori/midori-browser.c:5137
+#: ../midori/midori-browser.c:5432
msgid "_Close Tab"
msgstr "Pechar _lapela"
-#: ../midori/midori-browser.c:5138
+#: ../midori/midori-browser.c:5433
msgid "Close the current tab"
msgstr "Pechar a lapela actual"
-#: ../midori/midori-browser.c:5140
+#: ../midori/midori-browser.c:5435
msgid "C_lose Window"
msgstr "_Pechar a fiestra"
-#: ../midori/midori-browser.c:5141
+#: ../midori/midori-browser.c:5436
msgid "Close this window"
msgstr "Pechar esta fiestra"
-#: ../midori/midori-browser.c:5144
+#: ../midori/midori-browser.c:5439
msgid "Print the current page"
msgstr "Imprimir a páxina actual"
-#: ../midori/midori-browser.c:5147
+#: ../midori/midori-browser.c:5442
msgid "Quit the application"
msgstr "Saír do aplicativo"
-#: ../midori/midori-browser.c:5149
+#: ../midori/midori-browser.c:5444
msgid "_Edit"
msgstr "_Editar"
-#: ../midori/midori-browser.c:5153
+#: ../midori/midori-browser.c:5448
msgid "Undo the last modification"
msgstr "Desfacer a última modificación"
-#: ../midori/midori-browser.c:5156
+#: ../midori/midori-browser.c:5451
msgid "Redo the last modification"
msgstr "Refacer a última modificación"
-#: ../midori/midori-browser.c:5160
+#: ../midori/midori-browser.c:5455
msgid "Cut the selected text"
msgstr "Cortar o texto seleccionado"
-#: ../midori/midori-browser.c:5163
-#: ../midori/midori-browser.c:5166
+#: ../midori/midori-browser.c:5458 ../midori/midori-browser.c:5461
msgid "Copy the selected text"
msgstr "Copiar o texto seleccionado"
-#: ../midori/midori-browser.c:5169
+#: ../midori/midori-browser.c:5464
msgid "Paste text from the clipboard"
msgstr "Pegar o texto seleccionado no portarretallos"
-#: ../midori/midori-browser.c:5172
+#: ../midori/midori-browser.c:5467
msgid "Delete the selected text"
msgstr "Borrar o texto seleccionado"
-#: ../midori/midori-browser.c:5175
+#: ../midori/midori-browser.c:5470
msgid "Select all text"
msgstr "Seleccionar todo o texto"
-#: ../midori/midori-browser.c:5178
+#: ../midori/midori-browser.c:5473
msgid "Find a word or phrase in the page"
msgstr "Buscar unha palabra ou frase nesta páxina"
-#: ../midori/midori-browser.c:5180
+#: ../midori/midori-browser.c:5475
msgid "Find _Next"
msgstr "Buscar _seguinte"
-#: ../midori/midori-browser.c:5181
+#: ../midori/midori-browser.c:5476
msgid "Find the next occurrence of a word or phrase"
msgstr "Buscar a seguinte coincidencia de palabra ou frase"
-#: ../midori/midori-browser.c:5183
+#: ../midori/midori-browser.c:5478
msgid "Find _Previous"
msgstr "Buscar _anterior"
-#: ../midori/midori-browser.c:5184
+#: ../midori/midori-browser.c:5479
msgid "Find the previous occurrence of a word or phrase"
msgstr "Buscar a anterior coincidencia de palabra ou frase"
-#: ../midori/midori-browser.c:5188
+#: ../midori/midori-browser.c:5483
msgid "Configure the application preferences"
msgstr "Configurar as preferencias do aplicativo"
-#: ../midori/midori-browser.c:5190
+#: ../midori/midori-browser.c:5485
msgid "_View"
msgstr "_Ver"
-#: ../midori/midori-browser.c:5191
+#: ../midori/midori-browser.c:5486
msgid "_Toolbars"
msgstr "_Barra de ferramentas"
-#: ../midori/midori-browser.c:5203
+#: ../midori/midori-browser.c:5498
msgid "Increase the zoom level"
msgstr "Aumentar o nivel de zoom"
-#: ../midori/midori-browser.c:5206
+#: ../midori/midori-browser.c:5501
msgid "Decrease the zoom level"
msgstr "Diminuír o nivel de zoom"
-#: ../midori/midori-browser.c:5209
+#: ../midori/midori-browser.c:5504
msgid "Reset the zoom level"
msgstr "Restablecer o nivel de zoom"
-#: ../midori/midori-browser.c:5210
+#: ../midori/midori-browser.c:5505
msgid "_Encoding"
msgstr "_Codificación"
-#: ../midori/midori-browser.c:5212
+#: ../midori/midori-browser.c:5507
msgid "View So_urce"
msgstr "Ver o códi_go da páxina"
-#: ../midori/midori-browser.c:5213
+#: ../midori/midori-browser.c:5508
msgid "View the source code of the page"
msgstr "Ver o código fonte da páxina"
-#: ../midori/midori-browser.c:5216
+#: ../midori/midori-browser.c:5511
msgid "Toggle fullscreen view"
msgstr "Activar/desactivar pantalla completa"
-#: ../midori/midori-browser.c:5218
+#: ../midori/midori-browser.c:5514
+msgid "Scroll _Left"
+msgstr "Desprazar cara á _esquerda"
+
+#: ../midori/midori-browser.c:5515
+msgid "Scroll to the left"
+msgstr "Desprazar cara á esquerda"
+
+#: ../midori/midori-browser.c:5517
+msgid "Scroll _Down"
+msgstr "Desprazar cara a_baixo"
+
+#: ../midori/midori-browser.c:5518
+msgid "Scroll down"
+msgstr "Desprazar cara abaixo"
+
+#: ../midori/midori-browser.c:5520
+msgid "Scroll _Up"
+msgstr "Desprazar cara _arriba"
+
+#: ../midori/midori-browser.c:5521
+msgid "Scroll up"
+msgstr "Desprazar cara arriba"
+
+#: ../midori/midori-browser.c:5523
+msgid "Scroll _Right"
+msgstr "Desprazar cara á _dereita"
+
+#: ../midori/midori-browser.c:5524
+msgid "Scroll to the right"
+msgstr "Desprazar cara á dereita"
+
+#: ../midori/midori-browser.c:5527
msgid "_Go"
msgstr "_Ir"
-#: ../midori/midori-browser.c:5221
+#: ../midori/midori-browser.c:5530
msgid "Go back to the previous page"
msgstr "Ir á páxina anterior"
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5533
msgid "Go forward to the next page"
msgstr "Ir á seguinte páxina"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5537
msgid "Go to the previous sub-page"
msgstr "Ir á anterior subpáxina"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5232
+#: ../midori/midori-browser.c:5541
msgid "Go to the next sub-page"
msgstr "Ir á seguinte subpáxina"
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5544
msgid "Go to your homepage"
msgstr "Ir á súa páxina de inicio"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5546
msgid "Empty Trash"
msgstr "Baleirar o lixo"
-#: ../midori/midori-browser.c:5238
+#: ../midori/midori-browser.c:5547
msgid "Delete the contents of the trash"
msgstr "Borrar o contido do lixo"
-#: ../midori/midori-browser.c:5240
+#: ../midori/midori-browser.c:5549
msgid "Undo _Close Tab"
msgstr "Desfa_cer pechar lapela"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5550
msgid "Open the last closed tab"
msgstr "Abrir a última lapela pechada"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5556
msgid "Add a new _folder"
msgstr "Engadir un carta_fol novo"
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5557
msgid "Add a new bookmark folder"
msgstr "Engadir un novo cartafol de marcadores"
-#: ../midori/midori-browser.c:5253
-#: ../midori/midori-searchaction.c:499
+#: ../midori/midori-browser.c:5562
+msgid "_Export bookmarks"
+msgstr "_Exportar os marcadores"
+
+#: ../midori/midori-browser.c:5565 ../midori/midori-searchaction.c:493
msgid "_Manage Search Engines"
msgstr "_Xestor de motores de busca"
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5566
msgid "Add, edit and remove search engines..."
msgstr "Engadir, editar ou eliminar motores de busca..."
-#: ../midori/midori-browser.c:5257
+#: ../midori/midori-browser.c:5569
msgid "_Clear Private Data"
msgstr "_Limpar datos privados"
-#: ../midori/midori-browser.c:5258
+#: ../midori/midori-browser.c:5570
msgid "Clear private data..."
msgstr "Limpar os datos privados..."
-#: ../midori/midori-browser.c:5262
+#: ../midori/midori-browser.c:5574
msgid "_Inspect Page"
msgstr "_Inspeccionar a páxina"
-#: ../midori/midori-browser.c:5263
+#: ../midori/midori-browser.c:5575
msgid "Inspect page details and access developer tools..."
msgstr "Inspeccionar os detalles de páxina e acceder ás ferramentas de desenvolvemento..."
-#: ../midori/midori-browser.c:5268
+#: ../midori/midori-browser.c:5580
msgid "_Previous Tab"
msgstr "Lapela _anterior"
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5581
msgid "Switch to the previous tab"
msgstr "Cambiar á lapela anterior"
-#: ../midori/midori-browser.c:5271
+#: ../midori/midori-browser.c:5583
msgid "_Next Tab"
msgstr "Lapela _seguinte"
-#: ../midori/midori-browser.c:5272
+#: ../midori/midori-browser.c:5584
msgid "Switch to the next tab"
msgstr "Cambiar á lapela seguinte"
-#: ../midori/midori-browser.c:5274
+#: ../midori/midori-browser.c:5586
msgid "Focus _Current Tab"
msgstr "Enfocar a lapela a_ctual"
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5587
msgid "Focus the current tab"
msgstr "Enfocar a lapela actual"
-#: ../midori/midori-browser.c:5277
+#: ../midori/midori-browser.c:5589
msgid "Open last _session"
msgstr "Abrir a última _sesión"
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5590
msgid "Open the tabs saved in the last session"
msgstr "Abre as lapelas gardadas na última sesión"
-#: ../midori/midori-browser.c:5280
+#: ../midori/midori-browser.c:5592
msgid "_Help"
msgstr "_Axuda"
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5594
msgid "_Contents"
msgstr "_Contido"
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5595
msgid "Show the documentation"
msgstr "Mostrar a documentación"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5597
msgid "_Frequent Questions"
msgstr "Preguntas _frecuentes"
-#: ../midori/midori-browser.c:5286
+#: ../midori/midori-browser.c:5598
msgid "Show the Frequently Asked Questions"
msgstr "Mostrar as preguntas frecuentes"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5600
msgid "_Report a Bug"
msgstr "_Comunicar un erro"
-#: ../midori/midori-browser.c:5289
+#: ../midori/midori-browser.c:5601
msgid "Open Midori's bug tracker"
msgstr "Abrir o xestor de reporte de fallos de Midori"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5604
msgid "Show information about the program"
msgstr "Mostrar información sobre o programa"
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5612
msgid "_Menubar"
msgstr "Barra de _menú"
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5613
msgid "Show menubar"
msgstr "Mostrar barra de menú"
-#: ../midori/midori-browser.c:5303
+#: ../midori/midori-browser.c:5616
msgid "_Navigationbar"
msgstr "Barra de _navegación"
-#: ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:5617
msgid "Show navigationbar"
msgstr "Mostrar a barra de navegación"
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:5620
msgid "Side_panel"
msgstr "_Panel lateral"
-#: ../midori/midori-browser.c:5308
+#: ../midori/midori-browser.c:5621
msgid "Show sidepanel"
msgstr "Mostrar panel lateral"
-#: ../midori/midori-browser.c:5311
+#: ../midori/midori-browser.c:5624
msgid "_Bookmarkbar"
msgstr "Barra de marcadores"
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5625
msgid "Show bookmarkbar"
msgstr "Mostrar a barra de marcadores"
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5628
msgid "_Transferbar"
msgstr "Barra de _transferencias"
-#: ../midori/midori-browser.c:5316
+#: ../midori/midori-browser.c:5629
msgid "Show transferbar"
msgstr "Mostrar a barra de transferencias"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5632
msgid "_Statusbar"
msgstr "Barra de es_tado"
-#: ../midori/midori-browser.c:5320
+#: ../midori/midori-browser.c:5633
msgid "Show statusbar"
msgstr "Mostrar a barra de estado"
-#: ../midori/midori-browser.c:5327
+#: ../midori/midori-browser.c:5641
msgid "_Automatic"
msgstr "_Automático"
-#: ../midori/midori-browser.c:5330
-#: ../midori/midori-websettings.c:224
+#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:226
msgid "Chinese (BIG5)"
msgstr "Chinés (BIG5)"
-#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
-#: ../midori/midori-browser.c:5334
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5648
msgid "Japanese (SHIFT__JIS)"
msgstr "Xaponés (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5337
-#: ../midori/midori-websettings.c:226
+#: ../midori/midori-browser.c:5651 ../midori/midori-websettings.c:228
msgid "Korean (EUC-KR)"
msgstr "Coreano (EUC-KR)"
-#: ../midori/midori-browser.c:5340
-#: ../midori/midori-websettings.c:227
+#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:229
msgid "Russian (KOI8-R)"
msgstr "Ruso (KOI8-R)"
-#: ../midori/midori-browser.c:5343
-#: ../midori/midori-websettings.c:228
+#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:230
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5346
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:231
msgid "Western (ISO-8859-1)"
msgstr "Occidental (ISO-8859-1)"
-#: ../midori/midori-browser.c:5624
-#, 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:5895
+#: ../midori/midori-browser.c:6208
msgid "_Separator"
msgstr "_Separador"
-#: ../midori/midori-browser.c:5902
+#: ../midori/midori-browser.c:6215
msgid "_Location..."
msgstr "Localización..."
-#: ../midori/midori-browser.c:5904
+#: ../midori/midori-browser.c:6217
msgid "Open a particular location"
msgstr "Abrir un enderezo determinado"
-#: ../midori/midori-browser.c:5928
+#: ../midori/midori-browser.c:6241
msgid "_Web Search..."
msgstr "Buscar na _web..."
-#: ../midori/midori-browser.c:5930
+#: ../midori/midori-browser.c:6243
msgid "Run a web search"
msgstr "Executar unha busca na web"
-#: ../midori/midori-browser.c:5951
+#: ../midori/midori-browser.c:6264
msgid "Reopen a previously closed tab or window"
msgstr "Volver abrir fiestras ou lapelas pechadas"
-#: ../midori/midori-browser.c:5966
+#: ../midori/midori-browser.c:6279
msgid "_Recently visited pages"
msgstr "Páxinas visitadas _recentemente"
-#: ../midori/midori-browser.c:5968
+#: ../midori/midori-browser.c:6281
msgid "Reopen pages that you visited earlier"
msgstr "Volver abrir as páxinas que visitou antes"
-#: ../midori/midori-browser.c:5983
-#: ../midori/sokoke.c:1211
+#: ../midori/midori-browser.c:6296 ../midori/sokoke.c:1300
msgid "_Bookmarks"
msgstr "_Marcadores"
-#: ../midori/midori-browser.c:5985
+#: ../midori/midori-browser.c:6298
msgid "Show the saved bookmarks"
msgstr "Mostrar os marcadores gardados"
-#: ../midori/midori-browser.c:6000
+#: ../midori/midori-browser.c:6313
msgid "_Tools"
msgstr "_Ferramentas"
-#: ../midori/midori-browser.c:6013
+#: ../midori/midori-browser.c:6326
msgid "_Window"
msgstr "_Fiestra"
-#: ../midori/midori-browser.c:6015
+#: ../midori/midori-browser.c:6328
msgid "Show a list of all open tabs"
msgstr "Mostrar unha lista de tódalas lapelas abertas"
-#: ../midori/midori-browser.c:6029
+#: ../midori/midori-browser.c:6342
msgid "_Menu"
msgstr "_Menú"
-#: ../midori/midori-browser.c:6031
+#: ../midori/midori-browser.c:6344
msgid "Menu"
msgstr "Menú"
#. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:6235
+#: ../midori/midori-browser.c:6548
msgid "_Inline Find:"
msgstr "_Busca en liña:"
-#: ../midori/midori-browser.c:6266
+#: ../midori/midori-browser.c:6579
msgid "Previous"
msgstr "Anterior"
-#: ../midori/midori-browser.c:6271
+#: ../midori/midori-browser.c:6584
msgid "Next"
msgstr "Seguinte"
-#: ../midori/midori-browser.c:6276
+#: ../midori/midori-browser.c:6589
msgid "Match Case"
msgstr "Diferenciar maiúsculas de minúsculas"
-#: ../midori/midori-browser.c:6285
+#: ../midori/midori-browser.c:6598
msgid "Highlight Matches"
msgstr "Resaltar coincidencias"
-#: ../midori/midori-browser.c:6297
+#: ../midori/midori-browser.c:6610
msgid "Close Findbar"
msgstr "Pechar a barra de buscas"
-#: ../midori/midori-browser.c:6343
-#: ../panels/midori-transfers.c:142
+#: ../midori/midori-browser.c:6656 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Limpar todo"
-#: ../midori/midori-browser.c:6701
+#: ../midori/midori-browser.c:7014
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Opción inesperada «%s»"
-#: ../midori/midori-locationaction.c:376
+#: ../midori/midori-locationaction.c:377
#, c-format
-msgid "Failed to select from history: %s\n"
-msgstr "Produciuse un erro ao seleccionar do historial: %s\n"
+msgid "Failed to select from history\n"
+msgstr "Produciuse un erro ao seleccionar do historial\n"
-#: ../midori/midori-locationaction.c:1167
-#: ../panels/midori-history.c:286
-#: ../extensions/formhistory.c:457
-#: ../extensions/formhistory.c:461
+#: ../midori/midori-locationaction.c:459
#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "Fallou ao executar a declaración na base de datos: %s\n"
+msgid "Search for %s"
+msgstr "Buscar %s"
+
+#: ../midori/midori-locationaction.c:482
+#, c-format
+msgid "Search with %s"
+msgstr "Buscar con %s"
+
+#: ../midori/midori-locationaction.c:1197
+#, c-format
+msgid "Failed to execute database statement\n"
+msgstr "Produciuse un erro ao executar a instrución de base de datos\n"
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1225
+#: ../midori/midori-locationaction.c:1254
msgid "Paste and p_roceed"
msgstr "Pegar e _continuar"
-#: ../midori/midori-panel.c:432
-#: ../midori/midori-panel.c:434
+#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435
msgid "Detach chosen panel from the window"
msgstr "Separar o panel seleccionado da fiestra "
-#: ../midori/midori-panel.c:444
-#: ../midori/midori-panel.c:446
-#: ../midori/midori-panel.c:639
-#: ../midori/midori-panel.c:642
+#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447
+#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
msgid "Align sidepanel to the right"
msgstr "Aliñar o panel lateral á dereita"
-#: ../midori/midori-panel.c:456
-#: ../midori/midori-panel.c:457
+#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458
msgid "Close panel"
msgstr "Pechar o panel"
-#: ../midori/midori-panel.c:640
-#: ../midori/midori-panel.c:643
+#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644
msgid "Align sidepanel to the left"
msgstr "Aliñar o panel lateral á esquerda"
-#: ../midori/midori-panel.c:797
+#: ../midori/midori-panel.c:798
msgid "Hide operating controls"
msgstr "Ocultar os controis de operación"
-#: ../midori/midori-websettings.c:207
+#: ../midori/midori-websettings.c:209
msgid "Show Blank page"
msgstr "Mostrar unha páxina en branco"
-#: ../midori/midori-websettings.c:208
+#: ../midori/midori-websettings.c:210
msgid "Show Homepage"
msgstr "Mostrar a páxina inicial"
-#: ../midori/midori-websettings.c:209
+#: ../midori/midori-websettings.c:211
msgid "Show last open tabs"
msgstr "Mostrar as últimas lapelas abertas"
-#: ../midori/midori-websettings.c:225
+#: ../midori/midori-websettings.c:227
msgid "Japanese (SHIFT_JIS)"
msgstr "Xaponés (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:245
+#: ../midori/midori-websettings.c:247
msgid "New tab"
msgstr "Nova lapela"
-#: ../midori/midori-websettings.c:246
+#: ../midori/midori-websettings.c:248
msgid "New window"
msgstr "Nova fiestra"
-#: ../midori/midori-websettings.c:247
+#: ../midori/midori-websettings.c:249
msgid "Current tab"
msgstr "Lapela actual"
-#: ../midori/midori-websettings.c:262
+#: ../midori/midori-websettings.c:264
msgid "Default"
msgstr "Predeterminada"
-#: ../midori/midori-websettings.c:263
+#: ../midori/midori-websettings.c:265
msgid "Icons"
msgstr "Iconas"
-#: ../midori/midori-websettings.c:264
+#: ../midori/midori-websettings.c:266
msgid "Small icons"
msgstr "Iconas pequenas"
-#: ../midori/midori-websettings.c:265
+#: ../midori/midori-websettings.c:267
msgid "Text"
msgstr "Texto"
-#: ../midori/midori-websettings.c:266
+#: ../midori/midori-websettings.c:268
msgid "Icons and text"
msgstr "Iconas e texto"
-#: ../midori/midori-websettings.c:267
+#: ../midori/midori-websettings.c:269
msgid "Text beside icons"
msgstr "Texto a carón das iconas"
-#: ../midori/midori-websettings.c:282
+#: ../midori/midori-websettings.c:284
+msgid "Automatic (GNOME or environment)"
+msgstr "Automático (GNOME ou contorno)"
+
+#: ../midori/midori-websettings.c:285
+msgid "HTTP proxy server"
+msgstr "Servidor proxy HTTP"
+
+#: ../midori/midori-websettings.c:286
+msgid "No proxy server"
+msgstr "Sen servidor proxy"
+
+#: ../midori/midori-websettings.c:301
msgid "All cookies"
msgstr "Todas as cookies"
-#: ../midori/midori-websettings.c:283
+#: ../midori/midori-websettings.c:302
msgid "Session cookies"
msgstr "As cookies desta sesión"
-#: ../midori/midori-websettings.c:284
-#: ../panels/midori-addons.c:98
-#: ../katze/katze-utils.c:658
+#: ../midori/midori-websettings.c:303 ../katze/katze-utils.c:667
msgid "None"
msgstr "Ningunha"
-#: ../midori/midori-websettings.c:300
+#: ../midori/midori-websettings.c:319
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:301
+#: ../midori/midori-websettings.c:320
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:302
+#: ../midori/midori-websettings.c:321
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:303
+#: ../midori/midori-websettings.c:322
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:356
+#: ../midori/midori-websettings.c:375
msgid "Remember last window size"
msgstr "Lembrar o último tamaño de fiestra"
-#: ../midori/midori-websettings.c:357
+#: ../midori/midori-websettings.c:376
msgid "Whether to save the last window size"
msgstr "Gardar (ou non) o último tamaño de fiestra"
-#: ../midori/midori-websettings.c:365
+#: ../midori/midori-websettings.c:384
msgid "Last window width"
msgstr "Última largura da fiestra"
-#: ../midori/midori-websettings.c:366
+#: ../midori/midori-websettings.c:385
msgid "The last saved window width"
msgstr "Última largura da fiestra gardada"
-#: ../midori/midori-websettings.c:374
+#: ../midori/midori-websettings.c:393
msgid "Last window height"
msgstr "Última altura da fiestra"
-#: ../midori/midori-websettings.c:375
+#: ../midori/midori-websettings.c:394
msgid "The last saved window height"
msgstr "Última altura da fiestra gardada"
-#: ../midori/midori-websettings.c:400
+#: ../midori/midori-websettings.c:419
msgid "Last panel position"
msgstr "Última posición do panel"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:420
msgid "The last saved panel position"
msgstr "Última posición gardada do panel"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:429
msgid "Last panel page"
msgstr "Última páxina do panel"
-#: ../midori/midori-websettings.c:411
+#: ../midori/midori-websettings.c:430
msgid "The last saved panel page"
msgstr "Última páxina gardada do panel"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:438
msgid "Last Web search"
msgstr "Última busca na web"
-#: ../midori/midori-websettings.c:420
+#: ../midori/midori-websettings.c:439
msgid "The last saved Web search"
msgstr "Última busca na web gardada"
-#: ../midori/midori-websettings.c:429
+#: ../midori/midori-websettings.c:448
msgid "Show Menubar"
msgstr "Mostrar a barra de menú"
-#: ../midori/midori-websettings.c:430
+#: ../midori/midori-websettings.c:449
msgid "Whether to show the menubar"
msgstr "Mostrar (ou non) a barra de menú"
-#: ../midori/midori-websettings.c:438
+#: ../midori/midori-websettings.c:457
msgid "Show Navigationbar"
msgstr "Mostrar a barra de navegación"
-#: ../midori/midori-websettings.c:439
+#: ../midori/midori-websettings.c:458
msgid "Whether to show the navigationbar"
msgstr "Mostrar (ou non) a barra de navegación"
-#: ../midori/midori-websettings.c:447
+#: ../midori/midori-websettings.c:466
msgid "Show Bookmarkbar"
msgstr "Mostrar a barra de marcadores"
-#: ../midori/midori-websettings.c:448
+#: ../midori/midori-websettings.c:467
msgid "Whether to show the bookmarkbar"
msgstr "Mostrar (ou non) a barra de marcadores"
-#: ../midori/midori-websettings.c:456
+#: ../midori/midori-websettings.c:475
msgid "Show Panel"
msgstr "Mostrar o panel"
-#: ../midori/midori-websettings.c:457
+#: ../midori/midori-websettings.c:476
msgid "Whether to show the panel"
msgstr "Mostrar (ou non) o panel"
-#: ../midori/midori-websettings.c:472
+#: ../midori/midori-websettings.c:491
msgid "Show Transferbar"
msgstr "Mostrar a barra de transferencias"
-#: ../midori/midori-websettings.c:473
+#: ../midori/midori-websettings.c:492
msgid "Whether to show the transferbar"
msgstr "Mostrar (ou non) a barra de transferencias"
-#: ../midori/midori-websettings.c:481
+#: ../midori/midori-websettings.c:500
msgid "Show Statusbar"
msgstr "Mostrar a barra de estado"
-#: ../midori/midori-websettings.c:482
+#: ../midori/midori-websettings.c:501
msgid "Whether to show the statusbar"
msgstr "Mostrar (ou non) a barra de estado"
-#: ../midori/midori-websettings.c:491
+#: ../midori/midori-websettings.c:510
msgid "Toolbar Style:"
msgstr "Estilo da barra de ferramentas:"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:511
msgid "The style of the toolbar"
msgstr "O estilo da barra de ferramentas"
-#: ../midori/midori-websettings.c:508
+#: ../midori/midori-websettings.c:527
msgid "Show progress in location entry"
msgstr "Mostrar o progreso da carga na barra de navegación"
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:528
msgid "Whether to show loading progress in the location entry"
msgstr "Mostrar o progreso da carga (ou non) na barra de navegación"
-#: ../midori/midori-websettings.c:524
+#: ../midori/midori-websettings.c:543
msgid "Search engines in location completion"
msgstr "Motor de busca na barra de navegación"
-#: ../midori/midori-websettings.c:525
+#: ../midori/midori-websettings.c:544
msgid "Whether to show search engines in the location completion"
msgstr "Mostrar (ou non) o motor de busca na barra de navegación"
-#: ../midori/midori-websettings.c:533
+#: ../midori/midori-websettings.c:552
msgid "Toolbar Items"
msgstr "Elementos da barra de ferramentas"
-#: ../midori/midori-websettings.c:534
+#: ../midori/midori-websettings.c:553
msgid "The items to show on the toolbar"
msgstr "Elementos que se van mostrar na barra de ferramentas"
-#: ../midori/midori-websettings.c:542
+#: ../midori/midori-websettings.c:561
msgid "Compact Sidepanel"
msgstr "Panel lateral compacto"
-#: ../midori/midori-websettings.c:543
+#: ../midori/midori-websettings.c:562
msgid "Whether to make the sidepanel compact"
msgstr "Facer (ou non) o panel lateral compacto"
-#: ../midori/midori-websettings.c:558
+#: ../midori/midori-websettings.c:577
msgid "Show operating controls of the panel"
msgstr "Mostrar os controis de operación do panel"
-#: ../midori/midori-websettings.c:559
+#: ../midori/midori-websettings.c:578
msgid "Whether to show the operating controls of the panel"
msgstr "Mostrar (ou non) os controis de operación do panel"
-#: ../midori/midori-websettings.c:574
+#: ../midori/midori-websettings.c:593
msgid "Align sidepanel on the right"
msgstr "Aliñar á dereita o panel lateral"
-#: ../midori/midori-websettings.c:575
+#: ../midori/midori-websettings.c:594
msgid "Whether to align the sidepanel on the right"
msgstr "Aliñar (ou non) á dereita o panel lateral"
-#: ../midori/midori-websettings.c:590
+#: ../midori/midori-websettings.c:609
msgid "Open panels in separate windows"
msgstr "Abrir os paneis en fiestras separadas"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:610
msgid "Whether to always open panels in separate windows"
msgstr "Indica se os paneis se abren sempre en fiestras separadas"
-#: ../midori/midori-websettings.c:600
+#: ../midori/midori-websettings.c:619
msgid "When Midori starts:"
msgstr "Cando se inicia Midori:"
-#: ../midori/midori-websettings.c:601
+#: ../midori/midori-websettings.c:620
msgid "What to do when Midori starts"
msgstr "Que facer ao iniciar Midori"
-#: ../midori/midori-websettings.c:610
+#: ../midori/midori-websettings.c:629
msgid "Homepage:"
msgstr "Páxina de inicio:"
-#: ../midori/midori-websettings.c:611
+#: ../midori/midori-websettings.c:630
msgid "The homepage"
msgstr "A páxina de inicio"
-#: ../midori/midori-websettings.c:626
+#: ../midori/midori-websettings.c:645
msgid "Show crash dialog"
msgstr "Mostrar o diálogo de fallo"
-#: ../midori/midori-websettings.c:627
+#: ../midori/midori-websettings.c:646
msgid "Show a dialog after Midori crashed"
msgstr "Mostrar un cadro de dialogo despois de que Midori falle"
#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:643
+#: ../midori/midori-websettings.c:662
msgid "Show speed dial in new tabs"
msgstr "Mostrar a marcación rápida nas novas lapelas"
-#: ../midori/midori-websettings.c:644
+#: ../midori/midori-websettings.c:663
msgid "Show speed dial in newly opened tabs"
msgstr "Mostrar a marcación rápida nas novas lapelas que se abran"
-#: ../midori/midori-websettings.c:652
+#: ../midori/midori-websettings.c:671
msgid "Save downloaded files to:"
msgstr "Gardar os ficheiros descargados en:"
-#: ../midori/midori-websettings.c:653
+#: ../midori/midori-websettings.c:672
msgid "The folder downloaded files are saved to"
msgstr "O cartafol de descargas foi gardado en"
-#: ../midori/midori-websettings.c:674
+#: ../midori/midori-websettings.c:693
msgid "Ask for the destination folder"
msgstr "Preguntar polo cartafol de destino"
-#: ../midori/midori-websettings.c:675
+#: ../midori/midori-websettings.c:694
msgid "Whether to ask for the destination folder when downloading a file"
msgstr "Se se desexa seleccionar o cartafol de destino cando se descarga un ficheiro"
-#: ../midori/midori-websettings.c:694
+#: ../midori/midori-websettings.c:713
msgid "Notify when a transfer has been completed"
msgstr "Notificar cando se complete unha transferencia"
-#: ../midori/midori-websettings.c:695
+#: ../midori/midori-websettings.c:714
msgid "Whether to show a notification when a transfer has been completed"
msgstr "Se se desexa seleccionar o cartafol de destino cando se descarga un ficheiro"
-#: ../midori/midori-websettings.c:707
+#: ../midori/midori-websettings.c:726
msgid "Download Manager"
msgstr "Xestor de descargas"
-#: ../midori/midori-websettings.c:708
+#: ../midori/midori-websettings.c:727
msgid "An external download manager"
msgstr "Xestor de descargas externo"
-#: ../midori/midori-websettings.c:716
+#: ../midori/midori-websettings.c:735
msgid "Text Editor"
msgstr "Editor de texto"
-#: ../midori/midori-websettings.c:717
+#: ../midori/midori-websettings.c:736
msgid "An external text editor"
msgstr "Un editor de texto externo"
-#: ../midori/midori-websettings.c:732
+#: ../midori/midori-websettings.c:751
msgid "News Aggregator"
msgstr "Agregador de novas"
-#: ../midori/midori-websettings.c:733
+#: ../midori/midori-websettings.c:752
msgid "An external news aggregator"
msgstr "Un agregador de novas externo"
-#: ../midori/midori-websettings.c:741
+#: ../midori/midori-websettings.c:760
msgid "Location entry Search"
msgstr "Busca de barra de enderezos"
-#: ../midori/midori-websettings.c:742
+#: ../midori/midori-websettings.c:761
msgid "The search to perform inside the location entry"
msgstr "Facer unha busca a partir do contido da barra de enderezos"
-#: ../midori/midori-websettings.c:750
+#: ../midori/midori-websettings.c:769
msgid "Preferred Encoding"
msgstr "Codificación preferida"
-#: ../midori/midori-websettings.c:751
+#: ../midori/midori-websettings.c:770
msgid "The preferred character encoding"
msgstr "Codificación de carácteres preferida"
-#: ../midori/midori-websettings.c:761
+#: ../midori/midori-websettings.c:780
msgid "Always Show Tabbar"
msgstr "Mostrar sempre a barra de lapelas"
-#: ../midori/midori-websettings.c:762
+#: ../midori/midori-websettings.c:781
msgid "Always show the tabbar"
msgstr "Mostrar sempre a barra de lapelas"
-#: ../midori/midori-websettings.c:770
+#: ../midori/midori-websettings.c:789
msgid "Close Buttons on Tabs"
msgstr "Botón de pechar nas lapelas"
-#: ../midori/midori-websettings.c:771
+#: ../midori/midori-websettings.c:790
msgid "Whether tabs have close buttons"
msgstr "Cada unha das lapelas terá o seu botón para pechala"
-#: ../midori/midori-websettings.c:779
+#: ../midori/midori-websettings.c:798
msgid "Open new pages in:"
msgstr "Abrir as páxinas novas en:"
-#: ../midori/midori-websettings.c:780
+#: ../midori/midori-websettings.c:799
msgid "Where to open new pages"
msgstr "Onde se van abrir as páxinas novas"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:808
msgid "Open external pages in:"
msgstr "Abrir as páxinas externas en:"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:809
msgid "Where to open externally opened pages"
msgstr "Onde se van abrir as páxinas abertas dende o exterior"
-#: ../midori/midori-websettings.c:799
+#: ../midori/midori-websettings.c:818
msgid "Middle click opens Selection"
msgstr "Prema no botón central para abrir a selección"
-#: ../midori/midori-websettings.c:800
+#: ../midori/midori-websettings.c:819
msgid "Load an address from the selection via middle click"
msgstr "Cargue un enderezo da selección premendo no botón central do rato"
-#: ../midori/midori-websettings.c:808
+#: ../midori/midori-websettings.c:827
msgid "Open tabs in the background"
msgstr "Abrir as lapelas en segundo plano"
-#: ../midori/midori-websettings.c:809
+#: ../midori/midori-websettings.c:828
msgid "Whether to open new tabs in the background"
msgstr "Abrir (ou non) as novas lapelas en segundo plano"
-#: ../midori/midori-websettings.c:817
+#: ../midori/midori-websettings.c:836
msgid "Open Tabs next to Current"
msgstr "Abrir lapelas xunto á actual"
-#: ../midori/midori-websettings.c:818
+#: ../midori/midori-websettings.c:837
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr "Abrir as novas lapelas xunto á lapela actual ou despois da última"
-#: ../midori/midori-websettings.c:826
+#: ../midori/midori-websettings.c:845
msgid "Open popups in tabs"
msgstr "Abrir «emerxentes» en lapelas"
-#: ../midori/midori-websettings.c:827
+#: ../midori/midori-websettings.c:846
msgid "Whether to open popup windows in tabs"
msgstr "Abrir (ou non) as fiestras emerxentes en lapelas"
-#: ../midori/midori-websettings.c:837
-#: ../extensions/statusbar-features.c:88
+#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88
msgid "Load images automatically"
msgstr "Cargar as imaxes automaticamente"
-#: ../midori/midori-websettings.c:838
+#: ../midori/midori-websettings.c:857
msgid "Load and display images automatically"
msgstr "Cargar e mostrar as imaxes automaticamente"
-#: ../midori/midori-websettings.c:845
-#: ../extensions/statusbar-features.c:100
+#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100
msgid "Enable scripts"
msgstr "Activar scripts"
-#: ../midori/midori-websettings.c:846
+#: ../midori/midori-websettings.c:865
msgid "Enable embedded scripting languages"
msgstr "Activar linguaxes de script incrustadas"
-#: ../midori/midori-websettings.c:853
-#: ../extensions/statusbar-features.c:112
+#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112
msgid "Enable Netscape plugins"
msgstr "Activar os engadidos de Netscape"
-#: ../midori/midori-websettings.c:854
+#: ../midori/midori-websettings.c:873
msgid "Enable embedded Netscape plugin objects"
msgstr "Activar o engadido de obxectos incrustados de Netscape"
-#: ../midori/midori-websettings.c:870
+#: ../midori/midori-websettings.c:889
msgid "Enable HTML5 database support"
msgstr "Activar o soporte de base de datos HTML5"
-#: ../midori/midori-websettings.c:871
+#: ../midori/midori-websettings.c:890
msgid "Whether to enable HTML5 database support"
msgstr "Activar ou desactivar o soporte de base de datos HTML5"
-#: ../midori/midori-websettings.c:877
+#: ../midori/midori-websettings.c:896
msgid "Enable HTML5 local storage support"
msgstr "Activar o soporte de almacenamento local de HTML5"
-#: ../midori/midori-websettings.c:878
+#: ../midori/midori-websettings.c:897
msgid "Whether to enable HTML5 local storage support"
msgstr "Activar ou desactivar o soporte de almacenamento local de HTML5"
-#: ../midori/midori-websettings.c:886
+#: ../midori/midori-websettings.c:905
msgid "Enable offline web application cache"
msgstr "Activar a caché de aplicativos web sen conexión"
-#: ../midori/midori-websettings.c:887
+#: ../midori/midori-websettings.c:906
msgid "Whether to enable offline web application cache"
msgstr "Activar ou desactivar a caché de aplicativos web sen conexión"
-#: ../midori/midori-websettings.c:912
+#: ../midori/midori-websettings.c:931
msgid "Zoom Text and Images"
msgstr "Zoom sobre o texto e imaxes"
-#: ../midori/midori-websettings.c:913
+#: ../midori/midori-websettings.c:932
msgid "Whether to zoom text and images"
msgstr "Aplicar zoom (ou non) ao texto e ás imaxes"
-#: ../midori/midori-websettings.c:928
+#: ../midori/midori-websettings.c:947
msgid "Find inline while typing"
msgstr "Buscar en liña ao escribir"
-#: ../midori/midori-websettings.c:929
+#: ../midori/midori-websettings.c:948
msgid "Whether to automatically find inline while typing"
msgstr "Buscar en liña automaticamente (ou non) mentres se escribe"
-#: ../midori/midori-websettings.c:944
+#: ../midori/midori-websettings.c:963
msgid "Kinetic scrolling"
msgstr "Desprazamento cinético"
-#: ../midori/midori-websettings.c:945
+#: ../midori/midori-websettings.c:964
msgid "Whether scrolling should kinetically move according to speed"
msgstr "O desprazamento móvese de acordo ca velocidade"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:972
msgid "Accept cookies"
msgstr "Aceptar as «cookies»"
-#: ../midori/midori-websettings.c:954
+#: ../midori/midori-websettings.c:973
msgid "What type of cookies to accept"
msgstr "Que tipos de «cookies» se van aceptar"
-#: ../midori/midori-websettings.c:970
+#: ../midori/midori-websettings.c:989
msgid "Original cookies only"
msgstr "Só as «cookies» do sitio orixinal"
-#: ../midori/midori-websettings.c:971
+#: ../midori/midori-websettings.c:990
msgid "Accept cookies from the original website only"
msgstr "Só se aceptan as «cookies» do sitio web orixe"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:998
msgid "Maximum cookie age"
msgstr "Persistencia máxima das «cookies»"
-#: ../midori/midori-websettings.c:980
+#: ../midori/midori-websettings.c:999
msgid "The maximum number of days to save cookies for"
msgstr "Tempo máximo, en días, durante os que se gardaran as «cookies»"
-#: ../midori/midori-websettings.c:997
+#: ../midori/midori-websettings.c:1016
msgid "Remember last visited pages"
msgstr "Lembrar as últimas páxinas visitadas"
-#: ../midori/midori-websettings.c:998
+#: ../midori/midori-websettings.c:1017
msgid "Whether the last visited pages are saved"
msgstr "Lembrar (ou non) as últimas páxinas que se visitaron"
-#: ../midori/midori-websettings.c:1006
+#: ../midori/midori-websettings.c:1025
msgid "Maximum history age"
msgstr "Persistencia máxima do historial"
-#: ../midori/midori-websettings.c:1007
+#: ../midori/midori-websettings.c:1026
msgid "The maximum number of days to save the history for"
msgstr "Tempo máximo, en días, durante os que se gardará un dato do historial"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1034
msgid "Remember last downloaded files"
msgstr "Lembrar os últimos ficheiros descargados"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:1035
msgid "Whether the last downloaded files are saved"
msgstr "Lembrar (ou non) a lista de descargas realizadas ultimamente"
-#: ../midori/midori-websettings.c:1026
-msgid "Proxy Server"
+#: ../midori/midori-websettings.c:1052
+msgid "Proxy server"
msgstr "Servidor proxy"
-#: ../midori/midori-websettings.c:1027
+#: ../midori/midori-websettings.c:1053
+msgid "The type of proxy server to use"
+msgstr "O tipo de servidor proxy a usar"
+
+#: ../midori/midori-websettings.c:1062
+msgid "HTTP Proxy Server"
+msgstr "Servidor proxy HTTP"
+
+#: ../midori/midori-websettings.c:1063
msgid "The proxy server used for HTTP connections"
msgstr "Servidor proxy que se usa para as conexións HTTP"
-#: ../midori/midori-websettings.c:1042
+#: ../midori/midori-websettings.c:1078
msgid "Detect proxy server automatically"
msgstr "Detectar o servidor proxy automaticamente"
-#: ../midori/midori-websettings.c:1043
+#: ../midori/midori-websettings.c:1079
msgid "Whether to detect the proxy server automatically from the environment"
msgstr "Detectar (ou non) o servidor proxy automaticamente neste contorno"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1059
+#: ../midori/midori-websettings.c:1095
msgid "Identify as"
msgstr "Identificarse como"
-#: ../midori/midori-websettings.c:1060
+#: ../midori/midori-websettings.c:1096
msgid "What to identify as to web pages"
msgstr "Como se identifica nas páxinas web"
-#: ../midori/midori-websettings.c:1076
+#: ../midori/midori-websettings.c:1112
msgid "Identification string"
msgstr "Cadea de identificación"
-#: ../midori/midori-websettings.c:1077
+#: ../midori/midori-websettings.c:1113
msgid "The application identification string"
msgstr "Cadea de identificación do aplicativo"
-#: ../midori/midori-websettings.c:1092
+#: ../midori/midori-websettings.c:1128
msgid "Preferred languages"
msgstr "Idiomas preferidos"
-#: ../midori/midori-websettings.c:1093
+#: ../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\""
msgstr "Un lista separada por comas de idiomas preferidos para mostrar páxinas web multiidioma, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-fr;q=0.667\""
-#: ../midori/midori-websettings.c:1108
+#: ../midori/midori-websettings.c:1144
msgid "Clear private data"
msgstr "Limpar a información persoal"
-#: ../midori/midori-websettings.c:1109
+#: ../midori/midori-websettings.c:1145
msgid "The private data selected for deletion"
msgstr "Os datos privados seleccionados para eliminar"
@@ -1618,459 +1669,429 @@ msgstr "Os datos privados seleccionados para eliminar"
#. 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:956
-#: ../midori/midori-view.c:4160
-#: ../midori/midori-view.c:4164
+#: ../midori/midori-view.c:1182 ../midori/midori-view.c:4482
+#: ../midori/midori-view.c:4486
#, c-format
msgid "Error - %s"
msgstr "Erro - %s"
-#: ../midori/midori-view.c:957
+#: ../midori/midori-view.c:1183
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Non se puido cargar a páxina «%s»."
-#: ../midori/midori-view.c:962
+#: ../midori/midori-view.c:1188
msgid "Try again"
msgstr "Inténteo de novo"
#. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:1000
+#: ../midori/midori-view.c:1229
#, c-format
msgid "Not found - %s"
msgstr "Non se atopou - %s"
-#: ../midori/midori-view.c:1218
-#: ../midori/midori-view.c:2067
+#: ../midori/midori-view.c:1466 ../midori/midori-view.c:2303
#, c-format
msgid "Send a message to %s"
msgstr "Enviarlle unha mensaxe a %s"
-#: ../midori/midori-view.c:1836
-#: ../midori/midori-view.c:2229
+#: ../midori/midori-view.c:2085 ../midori/midori-view.c:2465
msgid "Inspect _Element"
msgstr "Inspeccionar _elemento"
-#: ../midori/midori-view.c:1888
-#: ../midori/midori-view.c:1966
-msgid "Open _Link"
-msgstr "Abrir unha _ligazón"
-
-#: ../midori/midori-view.c:1891
-#: ../midori/midori-view.c:1968
+#: ../midori/midori-view.c:2137 ../midori/midori-view.c:2207
msgid "Open Link in New _Tab"
msgstr "Abrir a ligazón nunha nova _lapela"
-#: ../midori/midori-view.c:1895
+#: ../midori/midori-view.c:2141
msgid "Open Link in _Foreground Tab"
msgstr "Abrir a ligazón na lapela de _primeiro plano"
-#: ../midori/midori-view.c:1896
+#: ../midori/midori-view.c:2142
msgid "Open Link in _Background Tab"
msgstr "Abrir a ligazón na lapela de _fondo"
-#: ../midori/midori-view.c:1899
-#: ../midori/midori-view.c:1975
+#: ../midori/midori-view.c:2145 ../midori/midori-view.c:2214
msgid "Open Link in New _Window"
msgstr "Abrir a ligazón nunha _fiestra nova"
-#: ../midori/midori-view.c:1902
+#: ../midori/midori-view.c:2148
msgid "Open Link as Web A_pplication"
msgstr "Abrir a ligazón como a_plicativo web"
-#: ../midori/midori-view.c:1905
+#: ../midori/midori-view.c:2151
msgid "Copy Link de_stination"
msgstr "Copiar o de_stino da ligazón"
-#: ../midori/midori-view.c:1908
-#: ../midori/midori-view.c:1987
+#: ../midori/midori-view.c:2154 ../midori/midori-view.c:2226
msgid "_Save Link destination"
msgstr "_Gardar ligazón de destino"
-#: ../midori/midori-view.c:1909
-#: ../midori/midori-view.c:1981
+#: ../midori/midori-view.c:2155 ../midori/midori-view.c:2220
msgid "_Download Link destination"
msgstr "_Descargar ligazón de destino"
-#: ../midori/midori-view.c:1913
-#: ../midori/midori-view.c:1949
-#: ../midori/midori-view.c:1992
+#: ../midori/midori-view.c:2159 ../midori/midori-view.c:2189
+#: ../midori/midori-view.c:2231
msgid "Download with Download _Manager"
msgstr "Descargar co _Xestor de descargas"
-#: ../midori/midori-view.c:1925
+#: ../midori/midori-view.c:2168
msgid "Open _Image in New Tab"
msgstr "Abrir a _imaxe nunha nova lapela"
-#: ../midori/midori-view.c:1928
-msgid "Open Image in New Wi_ndow"
-msgstr "Abrir a imaxe nunha _nova fiestra"
-
-#: ../midori/midori-view.c:1931
+#: ../midori/midori-view.c:2171
msgid "Copy Image _Address"
msgstr "Copiar o _enderezo da imaxe"
-#: ../midori/midori-view.c:1934
+#: ../midori/midori-view.c:2174
msgid "Save I_mage"
msgstr "Gardar a _imaxe"
-#: ../midori/midori-view.c:1935
+#: ../midori/midori-view.c:2175
msgid "Download I_mage"
msgstr "Descargar a i_maxe"
-#: ../midori/midori-view.c:1942
+#: ../midori/midori-view.c:2182
msgid "Copy Video _Address"
msgstr "Copiar o _enderezo do vídeo"
-#: ../midori/midori-view.c:1945
+#: ../midori/midori-view.c:2185
msgid "Save _Video"
msgstr "Gardar o _vídeo"
-#: ../midori/midori-view.c:1945
+#: ../midori/midori-view.c:2185
msgid "Download _Video"
msgstr "Descargar o _vídeo"
-#: ../midori/midori-view.c:2012
+#: ../midori/midori-view.c:2248
msgid "Search _with"
msgstr "Buscar _con: "
-#: ../midori/midori-view.c:2047
-#: ../midori/midori-view.c:2054
+#: ../midori/midori-view.c:2283 ../midori/midori-view.c:2290
msgid "_Search the Web"
msgstr "_Buscar na rede"
-#: ../midori/midori-view.c:2075
+#: ../midori/midori-view.c:2311
msgid "Open Address in New _Tab"
msgstr "Abrir o enderezo nunha nova _lapela"
-#: ../midori/midori-view.c:2361
+#: ../midori/midori-view.c:2615
msgid "Open or download file"
msgstr "Abrir ou descargar o ficheiro"
-#: ../midori/midori-view.c:2384
+#: ../midori/midori-view.c:2638
#, c-format
msgid "File Type: '%s'"
msgstr "Tipo de ficheiro: «%s»"
-#: ../midori/midori-view.c:2387
+#: ../midori/midori-view.c:2641
#, c-format
msgid "File Type: %s ('%s')"
msgstr "Tipo de ficheiro: %s («%s»)"
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2391
+#: ../midori/midori-view.c:2645
#, c-format
msgid "Open %s"
msgstr "Abrir %s"
-#: ../midori/midori-view.c:2906
+#: ../midori/midori-view.c:3179
#, c-format
msgid "Inspect page - %s"
msgstr "Inspeccionar a páxina - %s"
-#: ../midori/midori-view.c:3163
+#: ../midori/midori-view.c:3444
msgid "Speed dial"
msgstr "Marcación rápida"
-#: ../midori/midori-view.c:3164
+#: ../midori/midori-view.c:3445
msgid "Click to add a shortcut"
msgstr "Prema para engadir un atallo"
-#: ../midori/midori-view.c:3165
+#: ../midori/midori-view.c:3446
msgid "Enter shortcut address"
msgstr "Introduza o enderezo do atallo"
-#: ../midori/midori-view.c:3166
+#: ../midori/midori-view.c:3447
msgid "Enter shortcut title"
msgstr "Introduza o título do atallo"
-#: ../midori/midori-view.c:3167
+#: ../midori/midori-view.c:3448
msgid "Are you sure you want to delete this shortcut?"
msgstr "Está seguro de que desexa eliminar este atallo?"
-#: ../midori/midori-view.c:3201
+#: ../midori/midori-view.c:3485
#, c-format
msgid "Document cannot be displayed"
msgstr "Non se pode mostrar o documento"
-#: ../midori/midori-view.c:3218
+#: ../midori/midori-view.c:3508
#, c-format
msgid "No documentation installed"
msgstr "A documentación non está instalada"
-#: ../midori/midori-view.c:3437
+#: ../midori/midori-view.c:3758
msgid "Blank page"
msgstr "Páxina en branco"
-#: ../midori/midori-view.c:3697
+#: ../midori/midori-view.c:4018
msgid "_Duplicate Tab"
msgstr "_Duplicar a lapela"
-#: ../midori/midori-view.c:3702
+#: ../midori/midori-view.c:4023
msgid "_Restore Tab"
msgstr "_Restaurar a lapela"
-#: ../midori/midori-view.c:3702
+#: ../midori/midori-view.c:4023
msgid "_Minimize Tab"
msgstr "_Minimizar a lapela"
-#: ../midori/midori-view.c:3708
+#: ../midori/midori-view.c:4029
msgid "Close ot_her Tabs"
msgstr "Pechar ou_tras lapelas"
-#: ../midori/midori-view.c:4332
+#: ../midori/midori-view.c:4654
msgid "Print background images"
msgstr "Imprimir imaxes de fondo"
-#: ../midori/midori-view.c:4333
+#: ../midori/midori-view.c:4655
msgid "Whether background images should be printed"
msgstr "Se se imprimen (ou non) as imaxes de fondo"
-#: ../midori/midori-view.c:4385
-#: ../midori/midori-preferences.c:382
+#: ../midori/midori-view.c:4707 ../midori/midori-preferences.c:381
msgid "Features"
msgstr "Funcionalidades"
#. Page "General"
-#: ../midori/midori-preferences.c:299
+#: ../midori/midori-preferences.c:298
msgid "General"
msgstr "Xeral"
-#: ../midori/midori-preferences.c:300
+#: ../midori/midori-preferences.c:299
msgid "Startup"
msgstr "Inicio"
-#: ../midori/midori-preferences.c:315
-#: ../midori/midori-preferences.c:322
+#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321
msgid "Use current page as homepage"
msgstr "Usar a páxina actual como páxina de inicio"
-#: ../midori/midori-preferences.c:332
-#: ../panels/midori-transfers.c:87
+#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Transferencias"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:350
+#: ../midori/midori-preferences.c:349
msgid "Appearance"
msgstr "Aparencia"
-#: ../midori/midori-preferences.c:351
+#: ../midori/midori-preferences.c:350
msgid "Font settings"
msgstr "Axustes de tipo de letra"
-#: ../midori/midori-preferences.c:353
+#: ../midori/midori-preferences.c:352
msgid "Default Font Family"
msgstr "Tipo de letra predeterminado"
-#: ../midori/midori-preferences.c:356
+#: ../midori/midori-preferences.c:355
msgid "The default font family used to display text"
msgstr "Tipo de letra predeterminado utilizada para mostrar o texto"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:358
msgid "The default font size used to display text"
msgstr "Tamaño predeterminado do tipo de letra usado para mostrar o texto"
-#: ../midori/midori-preferences.c:361
+#: ../midori/midori-preferences.c:360
msgid "Fixed-width Font Family"
msgstr "Tipo de letra de ancho fixo"
-#: ../midori/midori-preferences.c:364
+#: ../midori/midori-preferences.c:363
msgid "The font family used to display fixed-width text"
msgstr "Tipo de letra que se usa para mostrar texto de ancho fixo"
-#: ../midori/midori-preferences.c:367
+#: ../midori/midori-preferences.c:366
msgid "The font size used to display fixed-width text"
msgstr "O tamaño do tipo de letra que se usa para mostrar texto de ancho fixo"
-#: ../midori/midori-preferences.c:369
+#: ../midori/midori-preferences.c:368
msgid "Minimum Font Size"
msgstr "Tamaño mínimo do tipo de letra"
-#: ../midori/midori-preferences.c:372
+#: ../midori/midori-preferences.c:371
msgid "The minimum font size used to display text"
msgstr "Tamaño mínimo do tipo de letra para mostrar texto"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:381
+#: ../midori/midori-preferences.c:380
msgid "Behavior"
msgstr "Comportamento"
-#: ../midori/midori-preferences.c:394
+#: ../midori/midori-preferences.c:393
msgid "Enforce 96 dots per inch"
msgstr "Aplicar 96 puntos por polgada"
-#: ../midori/midori-preferences.c:395
+#: ../midori/midori-preferences.c:394
msgid "Enforce a video dot density of 96 DPI"
msgstr "Aplica unha densidade de puntos de vídeo de 96 DIP"
#: ../midori/midori-preferences.c:414
+msgid "Allow scripts to open popups"
+msgstr "Permitir que os scripts abran fiestras emerxentes"
+
+#: ../midori/midori-preferences.c:415
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Definir se os scripts teñen permiso ou non para abrir fiestras emerxentes automaticamente"
+
+#: ../midori/midori-preferences.c:419
msgid "Spell Checking"
msgstr "Corrección ortográfica"
-#: ../midori/midori-preferences.c:417
+#: ../midori/midori-preferences.c:422
msgid "Enable Spell Checking"
msgstr "Activar a corrección ortográfica"
-#: ../midori/midori-preferences.c:418
+#: ../midori/midori-preferences.c:423
msgid "Enable spell checking while typing"
msgstr "Activar o corrector ortográfico ao escribir"
-#: ../midori/midori-preferences.c:420
+#: ../midori/midori-preferences.c:425
msgid "Spelling dictionaries:"
msgstr "Dicionarios de ortografía:"
#. i18n: The example should be adjusted to contain a good local default
-#: ../midori/midori-preferences.c:424
+#: ../midori/midori-preferences.c:429
msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\""
msgstr "Lista de idiomas, separados por comas, a empregar para a corrección ortográfica, p.ex. «en_GB,de_DE»"
#. Page "Interface"
-#: ../midori/midori-preferences.c:430
+#: ../midori/midori-preferences.c:435
msgid "Interface"
msgstr "Interface"
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:436
msgid "Navigationbar"
msgstr "Barra de navegación"
-#: ../midori/midori-preferences.c:441
+#: ../midori/midori-preferences.c:446
msgid "Browsing"
msgstr "Navegación"
#. Page "Applications"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:468
msgid "Applications"
msgstr "Aplicativos"
-#: ../midori/midori-preferences.c:464
+#: ../midori/midori-preferences.c:469
msgid "External applications"
msgstr "Aplicativos externos"
#. Page "Network"
-#: ../midori/midori-preferences.c:480
-#: ../midori/midori-preferences.c:481
+#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486
msgid "Network"
msgstr "Rede"
+#: ../midori/midori-preferences.c:492
+msgid "Hostname"
+msgstr "Nome de máquina"
+
#. Page "Privacy"
-#: ../midori/midori-preferences.c:505
+#: ../midori/midori-preferences.c:511
msgid "Privacy"
msgstr "Privacidade"
-#: ../midori/midori-preferences.c:506
+#: ../midori/midori-preferences.c:512
msgid "Web Cookies"
msgstr "Cookies"
-#: ../midori/midori-preferences.c:515
-#: ../midori/midori-preferences.c:529
+#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535
msgid "days"
msgstr "días"
-#: ../midori/midori-searchaction.c:923
+#: ../midori/midori-searchaction.c:917
msgid "Add search engine"
msgstr "Engadir un motor de busca"
-#: ../midori/midori-searchaction.c:923
+#: ../midori/midori-searchaction.c:917
msgid "Edit search engine"
msgstr "Editar o motor de busca"
-#: ../midori/midori-searchaction.c:951
+#: ../midori/midori-searchaction.c:945
msgid "_Name:"
msgstr "_Nome:"
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:989
msgid "_Icon:"
msgstr "_Icona"
-#: ../midori/midori-searchaction.c:1009
+#: ../midori/midori-searchaction.c:1003
msgid "_Token:"
msgstr "«_Marca»"
-#: ../midori/midori-searchaction.c:1240
+#: ../midori/midori-searchaction.c:1234
msgid "Manage Search Engines"
msgstr "Xestionar os motores de busca"
-#: ../midori/midori-searchaction.c:1341
+#: ../midori/midori-searchaction.c:1335
msgid "Use as _default"
msgstr "Usar como pre_determinado"
-#: ../midori/sokoke.c:1210
+#: ../midori/sokoke.c:1299
msgid "_Bookmark"
msgstr "_Marcador"
-#: ../midori/sokoke.c:1212
+#: ../midori/sokoke.c:1301
msgid "Add Boo_kmark"
msgstr "Engadir mar_cador…"
-#: ../midori/sokoke.c:1213
+#: ../midori/sokoke.c:1302
msgid "_Console"
msgstr "_Consola"
-#: ../midori/sokoke.c:1214
+#: ../midori/sokoke.c:1303
msgid "_Extensions"
msgstr "_Extensións"
-#: ../midori/sokoke.c:1215
+#: ../midori/sokoke.c:1304
msgid "_History"
msgstr "_Historial"
-#: ../midori/sokoke.c:1216
+#: ../midori/sokoke.c:1305
msgid "_Homepage"
msgstr "P_áxina de inicio"
-#: ../midori/sokoke.c:1217
+#: ../midori/sokoke.c:1306
msgid "_Userscripts"
msgstr "_Scripts de usuario"
-#: ../midori/sokoke.c:1218
+#: ../midori/sokoke.c:1307
msgid "New _Tab"
msgstr "Nova _lapela"
-#: ../midori/sokoke.c:1219
+#: ../midori/sokoke.c:1308
msgid "_Transfers"
msgstr "_Transferencias"
-#: ../midori/sokoke.c:1220
+#: ../midori/sokoke.c:1309
msgid "Netscape p_lugins"
msgstr "En_gadidos de Netscape"
-#: ../panels/midori-addons.c:99
-#: ../panels/midori-addons.c:144
-msgid "Userscripts"
-msgstr "Scripts de usuario"
-
-#: ../panels/midori-addons.c:100
-msgid "Userstyles"
-msgstr "Estilos de usuario"
-
-#: ../panels/midori-addons.c:305
-#, c-format
-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."
-
-#: ../panels/midori-addons.c:911
-#, c-format
-msgid "Can't monitor folder '%s': %s"
-msgstr "Non se pode monitorizar o cartafol '%s': %s"
-
-#: ../panels/midori-bookmarks.c:112
+#: ../panels/midori-bookmarks.c:111
msgid "Bookmarks"
msgstr "Marcadores"
-#: ../panels/midori-bookmarks.c:251
+#: ../panels/midori-bookmarks.c:250
msgid "Edit the selected bookmark"
msgstr "Editar o marcador seleccionado"
-#: ../panels/midori-bookmarks.c:259
+#: ../panels/midori-bookmarks.c:258
msgid "Delete the selected bookmark"
msgstr "Borrar o marcador seleccionado"
-#: ../panels/midori-bookmarks.c:279
+#: ../panels/midori-bookmarks.c:278
msgid "Add a new folder"
msgstr "Engadir un cartafol novo"
-#: ../panels/midori-bookmarks.c:609
+#: ../panels/midori-bookmarks.c:608
msgid "