-
+
+
diff --git a/data/gtk3.css b/data/gtk3.css
new file mode 100644
index 00000000..e6353665
--- /dev/null
+++ b/data/gtk3.css
@@ -0,0 +1,28 @@
+.notebook tab .button {
+ -GtkButton-default-border: 0;
+ -GtkButton-default-outside-border: 0;
+ -GtkButton-inner-border: 0;
+ -GtkWidget-focus-line-width: 0;
+ -GtkWidget-focus-padding: 0;
+ padding: 0;
+}
+
+GtkOverlay > * {
+ padding: 4px;
+ border-style: solid;
+ border-radius: 0 5px 0 0;
+ border-width: 1px 1px 0 0;
+}
+
+GtkOverlay MidoriFindbar {
+ border-radius: 0 0 0 5px;
+ border-width: 0 0 1px 1px; /* top right bottom left */
+}
+
+/* Kill grey backround on inactive buttons */
+GtkDrawingArea,
+GtkImage,
+GtkImage:insensitive,
+GtkImage:selected {
+ background-color: @transparent;
+}
diff --git a/data/midori.desktop.in b/data/midori.desktop.in
index e2d64937..fc6f39e7 100644
--- a/data/midori.desktop.in
+++ b/data/midori.desktop.in
@@ -3,6 +3,7 @@ Version=1.0
Type=Application
_Name=Midori
_GenericName=Web Browser
+_X-GNOME-Fullname=Midori Web Browser
_Comment=Browse the Web
_X-GNOME-Keywords=Internet;WWW;Explorer
_X-AppInstall-Keywords=Internet;WWW;Explorer
@@ -17,17 +18,17 @@ X-Osso-Service=midori
X-Ayatana-Desktop-Shortcuts=TabNew;WindowNew;Private
[TabNew Shortcut Group]
-Name=New _Tab
+_Name=New Tab
Exec=midori -e TabNew
TargetEnvironment=Unity
[WindowNew Shortcut Group]
-Name=New _Window
+_Name=New Window
Exec=midori -e WindowNew
TargetEnvironment=Unity
[Private Shortcut Group]
-Name=New P_rivate Browsing Window
+_Name=New Private Browsing Window
Exec=midori --private
TargetEnvironment=Unity
diff --git a/data/speeddial-head.html b/data/speeddial-head.html
index 7e7f2172..89cb96bb 100644
--- a/data/speeddial-head.html
+++ b/data/speeddial-head.html
@@ -114,22 +114,6 @@
display:none;
}
- div.osd {
- top: 9px;
- position: fixed;
- width: 100%;
- text-align: right;
- }
-
- div.osd span {
- border: 1px solid #999;
- background-color: #f5f5f5;
- padding: 8px;
- color: #999;
- -webkit-border-bottom-left-radius: 10px;
- visibility: hidden;
- }
-
.selected {
outline: 1px dotted black;
background-color: #eef;
@@ -138,75 +122,44 @@
-
-
-
+
diff --git a/extensions/adblock.c b/extensions/adblock.c
index e9cb4822..62f8fc7d 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -10,6 +10,7 @@
See the file COPYING for the full license text.
*/
#include
+#include "midori-core.h"
#include
#include "config.h"
@@ -29,7 +30,7 @@
(__filter[4] != '-' && __filter[5] != '-')
#ifdef G_ENABLE_DEBUG
#define adblock_debug(dmsg, darg1, darg2) \
- do { if (debug == 1) g_debug (dmsg, darg1, darg2); } while (0)
+ do { if (midori_debug ("adblock:match")) g_debug (dmsg, darg1, darg2); } while (0)
#else
#define adblock_debug(dmsg, darg1, darg2) /* nothing */
#endif
@@ -41,12 +42,14 @@ static GHashTable* urlcache = NULL;
static GHashTable* blockcssprivate = NULL;
static GHashTable* navigationwhitelist = NULL;
static GString* blockcss = NULL;
-#ifdef G_ENABLE_DEBUG
-static guint debug;
-#endif
+static GList* update_list = NULL;
+static gboolean update_done = FALSE;
+
+static void
+adblock_parse_file (gchar* path);
static gboolean
-adblock_parse_file (gchar* path);
+adblock_file_is_up_to_date (gchar* path);
static void
adblock_reload_rules (MidoriExtension* extension,
@@ -164,9 +167,26 @@ adblock_download_notify_status_cb (WebKitDownload* download,
GParamSpec* pspec,
MidoriExtension* extension)
{
- if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_FINISHED)
+ if (update_done)
return;
- adblock_reload_rules (extension, FALSE);
+
+ if (webkit_download_get_status (download) == WEBKIT_DOWNLOAD_STATUS_FINISHED)
+ {
+ GList* li = NULL;
+ for (li = update_list; li != NULL; li = g_list_next (li))
+ {
+ gchar* uri = g_strdup (webkit_download_get_destination_uri (download) + 7);
+ if (g_strcmp0 (li->data, uri))
+ update_list = g_list_remove (update_list, li->data);
+ g_free (uri);
+ }
+ }
+
+ if (g_list_length (update_list) == 0)
+ {
+ adblock_reload_rules (extension, FALSE);
+ update_done = TRUE;
+ }
}
static gchar*
@@ -182,8 +202,7 @@ adblock_get_filename_for_uri (const gchar* uri)
if (!strncmp (uri, "file", 4))
return g_strndup (uri + 7, strlen (uri) - 7);
- folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME,
- "adblock", NULL);
+ folder = g_build_filename (midori_paths_get_cache_dir (), "adblock", NULL);
katze_mkdir_with_parents (folder, 0700);
filename = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
@@ -226,7 +245,7 @@ adblock_reload_rules (MidoriExtension* extension,
continue;
}
- if (!adblock_parse_file (path))
+ if (!adblock_file_is_up_to_date (path))
{
WebKitNetworkRequest* request;
WebKitDownload* download;
@@ -236,11 +255,14 @@ adblock_reload_rules (MidoriExtension* extension,
download = webkit_download_new (request);
g_object_unref (request);
webkit_download_set_destination_uri (download, destination);
+ update_list = g_list_prepend (update_list, path);
g_free (destination);
g_signal_connect (download, "notify::status",
G_CALLBACK (adblock_download_notify_status_cb), extension);
webkit_download_start (download);
}
+ else
+ adblock_parse_file (path);
g_free (path);
i++;
}
@@ -480,6 +502,8 @@ adblock_get_preferences_dialog (MidoriExtension* extension)
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
#endif
NULL);
+ katze_widget_add_class (gtk_dialog_get_widget_for_response (
+ GTK_DIALOG (dialog), GTK_RESPONSE_HELP), "help_button");
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
g_signal_connect (dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed), &dialog);
@@ -505,8 +529,10 @@ adblock_get_preferences_dialog (MidoriExtension* extension)
"and click \"Add\" to add it to the list. "
"You can find more lists at %s."),
#if GTK_CHECK_VERSION (2, 18, 0)
+ "adblockplus.org/en/subscriptions "
"easylist.adblockplus.org ");
#else
+ "http://adblockplus.org/en/subscriptions "
"http://easylist.adblockplus.org/ ");
#endif
#if GTK_CHECK_VERSION (2, 18, 0)
@@ -571,6 +597,7 @@ adblock_get_preferences_dialog (MidoriExtension* extension)
vbox = gtk_vbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 4);
button = gtk_button_new_from_stock (GTK_STOCK_ADD);
+ g_object_set_data (G_OBJECT (dialog), "entry", entry);
g_object_set_data (G_OBJECT (button), "entry", entry);
g_signal_connect (button, "clicked",
G_CALLBACK (adblock_preferences_add_clicked_cb), liststore);
@@ -619,8 +646,9 @@ adblock_get_preferences_dialog (MidoriExtension* extension)
return dialog;
}
-static void
-adblock_open_preferences_cb (MidoriExtension* extension)
+static GtkWidget*
+adblock_show_preferences_dialog (MidoriExtension* extension,
+ const gchar* uri)
{
static GtkWidget* dialog = NULL;
@@ -633,6 +661,19 @@ adblock_open_preferences_cb (MidoriExtension* extension)
}
else
gtk_window_present (GTK_WINDOW (dialog));
+
+ if (uri != NULL)
+ {
+ GtkWidget* entry = g_object_get_data (G_OBJECT (dialog), "entry");
+ gtk_entry_set_text (GTK_ENTRY (entry), uri);
+ }
+ return dialog;
+}
+
+static void
+adblock_open_preferences_cb (MidoriExtension* extension)
+{
+ adblock_show_preferences_dialog (extension, NULL);
}
static inline gint
@@ -791,8 +832,29 @@ adblock_navigation_policy_decision_requested_cb (WebKitWebView* web_
WebKitNetworkRequest* request,
WebKitWebNavigationAction* action,
WebKitWebPolicyDecision* decision,
- MidoriView* view)
+ MidoriExtension* extension)
{
+ const gchar* uri = webkit_network_request_get_uri (request);
+ if (g_str_has_prefix (uri, "abp:"))
+ {
+ gchar** parts;
+ gchar* filter;
+ if (g_str_has_prefix (uri, "abp:subscribe?location="))
+ uri = &uri[23];
+ else if (g_str_has_prefix (uri, "abp://subscribe?location="))
+ uri = &uri[25];
+ else
+ return FALSE;
+
+ parts = g_strsplit (uri, "&", 2);
+ filter = soup_uri_decode (parts[0]);
+ webkit_web_policy_decision_ignore (decision);
+ adblock_show_preferences_dialog (extension, filter);
+ g_free (filter);
+ g_strfreev (parts);
+ return TRUE;
+ }
+
if (web_frame == webkit_web_view_get_main_frame (web_view))
{
const gchar* req_uri = webkit_network_request_get_uri (request);
@@ -843,7 +905,7 @@ adblock_resource_request_starting_cb (WebKitWebView* web_view,
}
#ifdef G_ENABLE_DEBUG
- if (debug == 2)
+ if (midori_debug ("adblock:time"))
g_test_timer_start ();
#endif
if (adblock_is_matched (req_uri, page_uri))
@@ -854,7 +916,7 @@ adblock_resource_request_starting_cb (WebKitWebView* web_view,
g_object_set_data (G_OBJECT (web_view), "blocked-uris", blocked_uris);
}
#ifdef G_ENABLE_DEBUG
- if (debug == 2)
+ if (midori_debug ("adblock:time"))
g_debug ("match: %f%s", g_test_timer_elapsed (), "seconds");
#endif
@@ -1019,7 +1081,7 @@ adblock_add_tab_cb (MidoriBrowser* browser,
g_signal_connect_after (web_view, "populate-popup",
G_CALLBACK (adblock_populate_popup_cb), extension);
g_signal_connect (web_view, "navigation-policy-decision-requested",
- G_CALLBACK (adblock_navigation_policy_decision_requested_cb), view);
+ G_CALLBACK (adblock_navigation_policy_decision_requested_cb), extension);
g_signal_connect (web_view, "resource-request-starting",
G_CALLBACK (adblock_resource_request_starting_cb), view);
g_signal_connect (web_view, "load-finished",
@@ -1281,7 +1343,7 @@ adblock_frame_add (gchar* line)
g_string_append (blockcss, line);
}
-static inline void
+static void
adblock_update_css_hash (gchar* domain,
gchar* value)
{
@@ -1478,7 +1540,156 @@ adblock_parse_line (gchar* line)
return adblock_add_url_pattern ("", "uri", line);
}
+static GDateMonth
+str_month_name_to_gdate (const gchar* month)
+{
+ guint i;
+ const gchar* months[] = {
+ "", "January", "February", "March", "April", "May", "June",
+ "July", "August", "September", "October", "November", "December"
+ };
+
+ for (i = 0; i < G_N_ELEMENTS (months); i++)
+ {
+ if (strncmp (month, months[i], 3) == 0)
+ return i;
+ }
+ return 0;
+}
+
static gboolean
+adblock_file_is_up_to_date (gchar* path)
+{
+ FILE* file;
+ gchar line[2000];
+
+ /* Check a chunk of header for update info */
+ if ((file = g_fopen (path, "r")))
+ {
+ gint days_to_expire = 0;
+ gchar* timestamp = NULL;
+ guint i;
+ gboolean found_meta = FALSE;
+ gint fs_days_elapsed, days_elapsed = 0, least_days;
+
+ for (i = 0; i <= 15; i++)
+ {
+ fgets (line, 2000, file);
+ if (strncmp ("! Expires", line, 9) == 0)
+ {
+ gchar** parts = g_strsplit (line, " ", 4);
+ days_to_expire = atoi (parts[2]);
+ g_strfreev (parts);
+ found_meta = TRUE;
+ }
+ if (strncmp ("! This list expires after", line, 25) == 0)
+ {
+ gchar** parts = g_strsplit (line, " ", 7);
+
+ if (strncmp (parts[6], "days", 4) == 0)
+ days_to_expire = atoi (parts[5]);
+ if (strncmp (parts[6], "hours", 5) == 0)
+ days_to_expire = (atoi (parts[5])) / 24;
+
+ g_strfreev (parts);
+ found_meta = TRUE;
+ }
+
+ if (strncmp ("! Last modified", line, 15) == 0
+ || strncmp ("! Updated", line, 9) == 0)
+ {
+ gchar** parts = g_strsplit (line, ":", 2);
+ timestamp = g_strdup (parts[1] + 1);
+ g_strchomp (timestamp);
+ g_strfreev (parts);
+ found_meta = TRUE;
+ }
+ }
+
+ if (!found_meta)
+ {
+ g_print ("Adblock: no metadata found in %s (broken download?)\n", path);
+ return FALSE;
+ }
+
+ /* query filesystem about file change, maybe there is no update yet
+ * or there is no "modified" metadata to check, otherwise we will repeatedly
+ * download files that have no new updates */
+ {
+ GDate* current = g_date_new ();
+ GDate* fs_mod_date = g_date_new ();
+ GTimeVal mod_time;
+ GFile* filter_file = g_file_new_for_path (path);
+ GFileInfo* info = g_file_query_info (filter_file, "time:modified", 0, NULL, NULL);
+
+ g_file_info_get_modification_time (info, &mod_time);
+ g_date_set_time_t (current, time (NULL));
+ g_date_set_time_val (fs_mod_date, &mod_time);
+
+ fs_days_elapsed = g_date_days_between (fs_mod_date, current);
+
+ g_date_free (current);
+ g_date_free (fs_mod_date);
+ }
+
+ /* If there is no update metadata but file is valid, assume one week */
+ if ((!days_to_expire && !timestamp) && fs_days_elapsed < 7)
+ return TRUE;
+
+ if (days_to_expire && timestamp != NULL)
+ {
+ GDate* current = g_date_new ();
+ GDate* mod_date = g_date_new ();
+ gchar** parts;
+ gboolean use_dots = FALSE;
+
+ /* Common dates are 20 Mar 2012, 20.08.2012 */
+ if (g_strrstr (timestamp, "."))
+ {
+ use_dots = TRUE;
+ parts = g_strsplit (timestamp, ".", 4);
+ }
+ else
+ parts = g_strsplit (timestamp, " ", 4);
+
+ g_date_set_day (mod_date, atoi (parts[0]));
+
+ if (use_dots)
+ g_date_set_month (mod_date, atoi (parts[1]));
+ else
+ g_date_set_month (mod_date, str_month_name_to_gdate (parts[1]));
+
+ g_date_set_year (mod_date, atoi (parts[2]));
+ g_strfreev (parts);
+
+ g_date_set_time_t (current, time (NULL));
+ days_elapsed = g_date_days_between (mod_date, current);
+
+ g_date_free (current);
+ g_date_free (mod_date);
+ g_free (timestamp);
+ }
+
+ /* File from the future? Assume up to date */
+ if (days_elapsed < 0)
+ {
+ g_print ("Adblock: file %s appears to be from the future,"
+ "check your system clock!\n", path);
+ return TRUE;
+ }
+
+ least_days = days_elapsed < fs_days_elapsed ? days_elapsed : fs_days_elapsed;
+ if (least_days < days_to_expire)
+ return TRUE;
+ else
+ return FALSE;
+
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static void
adblock_parse_file (gchar* path)
{
FILE* file;
@@ -1489,9 +1700,7 @@ adblock_parse_file (gchar* path)
while (fgets (line, 2000, file))
adblock_parse_line (line);
fclose (file);
- return TRUE;
}
- return FALSE;
}
static void
@@ -1510,7 +1719,7 @@ adblock_deactivate_tabs (MidoriView* view,
g_signal_handlers_disconnect_by_func (
web_view, adblock_load_finished_cb, view);
g_signal_handlers_disconnect_by_func (
- web_view, adblock_navigation_policy_decision_requested_cb, view);
+ web_view, adblock_navigation_policy_decision_requested_cb, extension);
}
static void
@@ -1546,25 +1755,9 @@ static void
adblock_activate_cb (MidoriExtension* extension,
MidoriApp* app)
{
- #ifdef G_ENABLE_DEBUG
- const gchar* debug_mode;
- #endif
KatzeArray* browsers;
MidoriBrowser* browser;
- #ifdef G_ENABLE_DEBUG
- debug_mode = g_getenv ("MIDORI_ADBLOCK");
- if (debug_mode)
- {
- if (*debug_mode == '1')
- debug = 1;
- else if (*debug_mode == '2')
- debug = 2;
- else
- debug = 0;
- }
- #endif
-
adblock_reload_rules (extension, FALSE);
browsers = katze_object_get_object (app, "browsers");
@@ -1597,6 +1790,57 @@ test_adblock_parse (void)
g_assert_cmpstr (adblock_parse_line ("http://bla.blub/*"), ==, "http://bla.blub/");
}
+static void
+test_subscription_update (void)
+{
+ gint temp;
+ gchar* filename;
+
+ temp = g_file_open_tmp ("midori_adblock_update_test_XXXXXX", &filename, NULL);
+ close (temp);
+
+ g_file_set_contents (filename, "", -1, NULL);
+ g_assert (!adblock_file_is_up_to_date (filename));
+
+ g_file_set_contents (filename,
+ "[Adblock Plus 1.1]\n"
+ "! Checksum: 48f6Qdo4PsNogsurLvQ71w\n"
+ "! Title: EasyList\n"
+ "! Last modified: 05 Sep 2010 11:00 UTC\n"
+ "! This list expires after 48 hours\n",
+ -1, NULL);
+ g_assert (!adblock_file_is_up_to_date (filename));
+
+ g_file_set_contents (filename,
+ "[Adblock Plus 1.1]\n"
+ "! Checksum: 48f6Qdo4PsNogsurLvQ71w\n"
+ "! Title: EasyList\n"
+ "! Last modified: 05.09.2010 11:00 UTC\n"
+ "! Expires: 2 days (update frequency)\n",
+ -1, NULL);
+ g_assert (!adblock_file_is_up_to_date (filename));
+
+ g_file_set_contents (filename,
+ "[Adblock Plus 1.1]\n"
+ "! Checksum: 48f6Qdo4PsNogsurLvQ71w\n"
+ "! Title: EasyList\n"
+ "! Updated: 05 Nov 2014 11:00 UTC\n"
+ "! Expires: 5 days (update frequency)\n",
+ -1, NULL);
+ g_assert (adblock_file_is_up_to_date (filename));
+
+ g_file_set_contents (filename,
+ "[Adblock]\n"
+ "! dutchblock v3\n"
+ "! This list expires after 14 days\n"
+ "|http://b*.mookie1.com/\n",
+ -1, NULL);
+ g_assert (adblock_file_is_up_to_date (filename));
+
+ g_unlink (filename);
+ g_free (filename);
+}
+
static void
test_adblock_pattern (void)
{
@@ -1660,6 +1904,7 @@ extension_test (void)
{
g_test_add_func ("/extensions/adblock/parse", test_adblock_parse);
g_test_add_func ("/extensions/adblock/pattern", test_adblock_pattern);
+ g_test_add_func ("/extensions/adblock/update", test_subscription_update);
}
#endif
diff --git a/extensions/addons.c b/extensions/addons.c
index 7c566f41..37e42fb7 100644
--- a/extensions/addons.c
+++ b/extensions/addons.c
@@ -14,6 +14,7 @@
/* This extensions add support for user addons: userscripts and userstyles */
#include
+#include "midori-core.h"
#include
#include "config.h"
@@ -182,8 +183,8 @@ addons_install_response (GtkWidget* infobar,
if (!filename)
filename = g_path_get_basename (uri);
- folder_path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
- PACKAGE_NAME, folder, NULL);
+ folder_path = g_build_path (G_DIR_SEPARATOR_S,
+ midori_paths_get_user_data_dir (), PACKAGE_NAME, folder, NULL);
if (!g_file_test (folder_path, G_FILE_TEST_EXISTS))
katze_mkdir_with_parents (folder_path, 0700);
@@ -293,13 +294,13 @@ addons_button_add_clicked_cb (GtkToolItem* toolitem,
if (addons->kind == ADDONS_USER_SCRIPTS)
{
addons_type = g_strdup ("userscripts");
- path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
+ path = g_build_path (G_DIR_SEPARATOR_S, midori_paths_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 (),
+ path = g_build_path (G_DIR_SEPARATOR_S, midori_paths_get_user_data_dir (),
PACKAGE_NAME, "styles", NULL);
}
else
@@ -336,23 +337,13 @@ addons_button_add_clicked_cb (GtkToolItem* toolitem,
if (!g_file_test (path, G_FILE_TEST_EXISTS))
katze_mkdir_with_parents (path, 0700);
- #if !GTK_CHECK_VERSION (2, 14, 0)
- files = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (dialog));
- #else
files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (dialog));
- #endif
-
while (files)
{
GFile* src_file;
GError* error = NULL;
- #if !GTK_CHECK_VERSION (2, 14, 0)
- src_file = g_file_new_for_path (files);
- #else
src_file = files->data;
- #endif
-
if (G_IS_FILE (src_file))
{
GFile* dest_file;
@@ -491,7 +482,7 @@ addons_open_in_editor_clicked_cb (GtkWidget* toolitem,
g_object_get (settings, "text-editor", &text_editor, NULL);
if (text_editor && *text_editor)
- sokoke_spawn_program (text_editor, element->fullpath);
+ sokoke_spawn_program (text_editor, TRUE, element->fullpath, TRUE);
else
{
gchar* element_uri = g_filename_to_uri (element->fullpath, NULL, NULL);
@@ -522,10 +513,13 @@ addons_open_target_folder_clicked_cb (GtkWidget* toolitem,
folder = g_path_get_dirname (element->fullpath);
}
else
- folder = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
- PACKAGE_NAME,
- addons->kind == ADDONS_USER_SCRIPTS
- ? "scripts" : "styles", NULL);
+ {
+ folder = g_build_path (G_DIR_SEPARATOR_S, midori_paths_get_user_data_dir (),
+ PACKAGE_NAME, addons->kind == ADDONS_USER_SCRIPTS
+ ? "scripts" : "styles", NULL);
+ katze_mkdir_with_parents (folder, 0700);
+ }
+
folder_uri = g_filename_to_uri (folder, NULL, NULL);
g_free (folder);
@@ -783,11 +777,10 @@ addons_treeview_render_text_cb (GtkTreeViewColumn* column,
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);
+ g_object_set (renderer, "text", element->displayname,
+ "sensitive", element->enabled,
+ "ellipsize", PANGO_ELLIPSIZE_END,
+ NULL);
}
static void
@@ -831,19 +824,16 @@ addons_get_directories (AddonsKind kind)
else
g_assert_not_reached ();
- path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
+ path = g_build_path (G_DIR_SEPARATOR_S, midori_paths_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);
+ directories = g_slist_prepend (directories, path);
datadirs = g_get_system_data_dirs ();
while (*datadirs)
{
path = g_build_path (G_DIR_SEPARATOR_S, *datadirs,
PACKAGE_NAME, folder_name, NULL);
- if (g_slist_find (directories, path) == NULL && g_access (path, X_OK) == 0)
+ if (g_slist_find (directories, path) == NULL)
directories = g_slist_prepend (directories, path);
else
g_free (path);
@@ -1335,8 +1325,9 @@ addons_init (Addons* addons)
G_CALLBACK (addons_cell_renderer_toggled_cb), addons);
gtk_tree_view_append_column (GTK_TREE_VIEW (addons->treeview), column);
column = gtk_tree_view_column_new ();
+ gtk_tree_view_column_set_expand (column, TRUE);
renderer_text = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (column, renderer_text, FALSE);
+ gtk_tree_view_column_pack_start (column, renderer_text, TRUE);
gtk_tree_view_column_set_cell_data_func (column, renderer_text,
(GtkTreeCellDataFunc)addons_treeview_render_text_cb,
addons->treeview, NULL);
@@ -1687,10 +1678,10 @@ addons_save_settings (MidoriApp* app,
config_dir = midori_extension_get_config_dir (extension);
config_file = g_build_filename (config_dir, "addons", NULL);
- katze_mkdir_with_parents (config_dir, 0700);
+ if (config_dir != NULL)
+ katze_mkdir_with_parents (config_dir, 0700);
sokoke_key_file_save_to_file (keyfile, config_file, &error);
- /* If the folder is /, this is a test run, thus no error */
- if (error && !g_str_equal (config_dir, "/"))
+ if (error && midori_extension_get_config_dir (extension) != NULL)
{
g_warning (_("The configuration of the extension '%s' couldn't be saved: %s\n"),
_("User addons"), error->message);
diff --git a/extensions/cookie-manager/cookie-manager-page.c b/extensions/cookie-manager/cookie-manager-page.c
index d21d128d..186e310e 100644
--- a/extensions/cookie-manager/cookie-manager-page.c
+++ b/extensions/cookie-manager/cookie-manager-page.c
@@ -702,7 +702,6 @@ static gchar *cm_get_domain_description_text(const gchar *domain, gint cookie_co
}
-#if GTK_CHECK_VERSION(2, 12, 0)
static gboolean cm_tree_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keyboard_mode,
GtkTooltip *tooltip, CookieManagerPage *cmp)
{
@@ -731,8 +730,6 @@ static gboolean cm_tree_query_tooltip(GtkWidget *widget, gint x, gint y, gboolea
return FALSE;
}
-#endif
-
static gboolean cm_filter_match(const gchar *haystack, const gchar *needle)
{
@@ -812,25 +809,20 @@ static void cm_filter_entry_changed_cb(GtkEditable *editable, CookieManagerPage
if (priv->ignore_changed_filter)
return;
- text = gtk_entry_get_text(GTK_ENTRY(editable));
+ if (!g_object_get_data (G_OBJECT (editable), "sokoke_has_default"))
+ text = gtk_entry_get_text(GTK_ENTRY(editable));
+ else
+ text = NULL;
cm_filter_tree(cmp, text);
cookie_manager_update_filter(priv->parent, text);
- if (*text != '\0')
- gtk_tree_view_expand_all(GTK_TREE_VIEW(priv->treeview));
- else
+ if (text && *text)
gtk_tree_view_collapse_all(GTK_TREE_VIEW(priv->treeview));
+ else
+ gtk_tree_view_expand_all(GTK_TREE_VIEW(priv->treeview));
}
-
-static void cm_filter_entry_clear_icon_released_cb(GtkIconEntry *e, gint pos, gint btn, gpointer data)
-{
- if (pos == GTK_ICON_ENTRY_SECONDARY)
- gtk_entry_set_text(GTK_ENTRY(e), "");
-}
-
-
static void cm_tree_selection_changed_cb(GtkTreeSelection *selection, CookieManagerPage *cmp)
{
GList *rows;
@@ -1002,6 +994,7 @@ static void cm_tree_render_text_cb(GtkTreeViewColumn *column, GtkCellRenderer *r
}
else
g_object_set(renderer, "text", name, NULL);
+ g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
g_free(name);
}
@@ -1022,6 +1015,7 @@ static GtkWidget *cm_tree_prepare(CookieManagerPage *cmp)
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
_("Name"), renderer, "text", COOKIE_MANAGER_COL_NAME, NULL);
+ gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_column_set_sort_indicator(column, TRUE);
gtk_tree_view_column_set_sort_column_id(column, COOKIE_MANAGER_COL_NAME);
gtk_tree_view_column_set_resizable(column, TRUE);
@@ -1045,10 +1039,8 @@ static GtkWidget *cm_tree_prepare(CookieManagerPage *cmp)
g_signal_connect(treeview, "popup-menu", G_CALLBACK(cm_tree_popup_menu_cb), cmp);
/* tooltips */
-#if GTK_CHECK_VERSION(2, 12, 0)
gtk_widget_set_has_tooltip(treeview, TRUE);
g_signal_connect(treeview, "query-tooltip", G_CALLBACK(cm_tree_query_tooltip), cmp);
-#endif
/* drag'n'drop */
gtk_tree_view_enable_model_drag_source(
@@ -1100,7 +1092,6 @@ static void cookie_manager_page_init(CookieManagerPage *self)
GtkWidget *desc_swin;
GtkWidget *paned;
GtkWidget *filter_hbox;
- GtkWidget *filter_label;
GtkWidget *treeview;
CookieManagerPagePrivate *priv;
@@ -1132,29 +1123,15 @@ static void cookie_manager_page_init(CookieManagerPage *self)
tree_swin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tree_swin),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tree_swin), GTK_SHADOW_IN);
gtk_container_add(GTK_CONTAINER(tree_swin), treeview);
gtk_widget_show(tree_swin);
- filter_label = gtk_label_new(_("Filter:"));
- gtk_widget_show(filter_label);
-
- priv->filter_entry = gtk_icon_entry_new();
- gtk_widget_set_tooltip_text(priv->filter_entry,
- _("Enter a filter string to show only cookies whose name or domain "
- "field match the entered filter"));
+ priv->filter_entry = sokoke_search_entry_new (_("Search Cookies by Name or Domain"));
gtk_widget_show(priv->filter_entry);
- gtk_icon_entry_set_icon_from_stock(GTK_ICON_ENTRY(priv->filter_entry),
- GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_CLEAR);
- gtk_icon_entry_set_icon_highlight(GTK_ICON_ENTRY (priv->filter_entry),
- GTK_ICON_ENTRY_SECONDARY, TRUE);
- g_signal_connect(priv->filter_entry, "icon-release",
- G_CALLBACK(cm_filter_entry_clear_icon_released_cb), NULL);
g_signal_connect(priv->filter_entry, "changed", G_CALLBACK(cm_filter_entry_changed_cb), self);
g_signal_connect(priv->filter_entry, "activate", G_CALLBACK(cm_filter_entry_changed_cb), self);
filter_hbox = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(filter_hbox), filter_label, FALSE, FALSE, 3);
gtk_box_pack_start(GTK_BOX(filter_hbox), priv->filter_entry, TRUE, TRUE, 3);
gtk_widget_show(filter_hbox);
diff --git a/extensions/delayed-load.vala b/extensions/delayed-load.vala
new file mode 100644
index 00000000..83af2539
--- /dev/null
+++ b/extensions/delayed-load.vala
@@ -0,0 +1,231 @@
+/*
+ Copyright (C) 2012 André Stösel
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+using Gtk;
+using Katze;
+using Midori;
+
+namespace DelayedLoad {
+ private class PreferencesDialog : Dialog {
+ protected Manager dl_manager;
+ protected Scale slider;
+
+ public PreferencesDialog (Manager manager) {
+ this.dl_manager = manager;
+
+ this.title = _("Preferences for %s").printf ( _("Delayed load"));
+ if (this.get_class ().find_property ("has-separator") != null)
+ this.set ("has-separator", false);
+ this.border_width = 5;
+ this.set_modal (true);
+ this.set_default_size (350, 100);
+ this.create_widgets ();
+
+ this.response.connect (response_cb);
+ }
+
+ private void response_cb (Dialog source, int response_id) {
+ switch (response_id) {
+ case ResponseType.APPLY:
+ this.dl_manager.set_integer ("delay", (int) (this.slider.get_value () * 1000));
+ this.dl_manager.preferences_changed ();
+ this.destroy ();
+ break;
+ case ResponseType.CANCEL:
+ this.destroy ();
+ break;
+ }
+ }
+
+ private void create_widgets () {
+ Label text = new Label (_("Delay in seconds until loading the page:"));
+#if HAVE_GTK3
+ this.slider = new Scale.with_range (Orientation.HORIZONTAL, 0, 15, 0.1);
+#else
+ this.slider = new HScale.with_range (0, 15, 0.1);
+#endif
+
+ int delay = this.dl_manager.get_integer ("delay");
+ if (delay > 0)
+ this.slider.set_value ((float)delay / 1000);
+
+#if HAVE_GTK3
+ Gtk.Box vbox = get_content_area () as Gtk.Box;
+ vbox.pack_start (text, false, false, 0);
+ vbox.pack_start (this.slider, false, true, 0);
+#else
+ this.vbox.pack_start (text, false, false, 0);
+ this.vbox.pack_start (this.slider, false, true, 0);
+#endif
+
+ this.add_button (Gtk.STOCK_CANCEL, ResponseType.CANCEL);
+ this.add_button (Gtk.STOCK_APPLY, ResponseType.APPLY);
+
+ this.show_all ();
+ }
+ }
+
+ private class TabShaker : GLib.Object {
+ public unowned Midori.Browser browser;
+ public GLib.PtrArray tasks;
+
+ public bool reload_tab () {
+ if (tasks.len == 1) {
+ Midori.View? view = browser.tab as Midori.View;
+ Midori.View scheduled_view = tasks.index (0) as Midori.View;
+ if (scheduled_view == view) {
+ Katze.Item item = view.get_proxy_item ();
+ item.ref();
+
+ int64 delay = item.get_meta_integer ("delay");
+ if (delay == -2) {
+ view.reload (true);
+ }
+ }
+ }
+ tasks.remove_index (0);
+ return false;
+ }
+
+ public TabShaker (Midori.Browser browser) {
+ this.browser = browser;
+ }
+
+ construct {
+ this.tasks = new GLib.PtrArray ();
+ }
+ }
+
+ private class Manager : Midori.Extension {
+ private int timeout = 0;
+ private bool timeout_handler = false;
+ private HashTable tasks;
+
+ public signal void preferences_changed ();
+
+ private void preferences_changed_cb () {
+ this.timeout = get_integer ("delay");
+ }
+
+ private void show_preferences () {
+ PreferencesDialog dialog = new PreferencesDialog (this);
+ dialog.show ();
+ }
+
+ private void schedule_reload (Midori.Browser browser, Midori.View view) {
+ if (this.timeout == 0)
+ view.reload (true);
+ else {
+ unowned TabShaker shaker = tasks.get (browser);
+ if (shaker != null) {
+ shaker.tasks.add (view);
+ Timeout.add (this.timeout, shaker.reload_tab);
+ }
+ }
+ }
+
+ private void tab_changed (Midori.View? old_view, Midori.View? new_view) {
+ if (new_view != null) {
+ Midori.App app = get_app ();
+ Midori.Browser browser = app.browser;
+
+ Katze.Item item = new_view.get_proxy_item ();
+ item.ref();
+
+ int64 delay = item.get_meta_integer ("delay");
+ if (delay == -2 && new_view.progress < 1.0) {
+ this.schedule_reload (browser, new_view);
+ }
+ }
+ }
+
+ private bool reload_first_tab () {
+ Midori.App app = get_app ();
+ Midori.Browser? browser = app.browser;
+ Midori.View? view = browser.tab as Midori.View;
+
+ if (view != null) {
+ Katze.Item item = view.get_proxy_item ();
+ item.ref();
+
+ int64 delay = item.get_meta_integer ("delay");
+ if (delay != 1) {
+ unowned WebKit.WebView web_view = view.get_web_view ();
+ WebKit.LoadStatus load_status = web_view.load_status;
+ if (load_status == WebKit.LoadStatus.FINISHED) {
+ if (this.timeout != 0)
+ this.tasks.set (browser, new TabShaker (browser));
+
+ if (view.progress < 1.0)
+ this.schedule_reload (browser, view);
+
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ private void browser_added (Midori.Browser browser) {
+ browser.switch_tab.connect_after (this.tab_changed);
+ }
+
+ private void browser_removed (Midori.Browser browser) {
+ browser.switch_tab.disconnect (this.tab_changed);
+ }
+
+ public void activated (Midori.App app) {
+ /* FIXME: override behavior without changing the preference */
+ app.settings.load_on_startup = MidoriStartup.DELAYED_PAGES;
+
+ this.preferences_changed ();
+
+ Midori.Browser? focused_browser = app.browser;
+ if (focused_browser == null)
+ Timeout.add (50, this.reload_first_tab);
+
+ foreach (Midori.Browser browser in app.get_browsers ()) {
+ browser_added (browser);
+ }
+ app.add_browser.connect (browser_added);
+ }
+
+ public void deactivated () {
+ Midori.App app = get_app ();
+ foreach (Midori.Browser browser in app.get_browsers ()) {
+ browser_removed (browser);
+ }
+ app.add_browser.disconnect (browser_added);
+ }
+
+ internal Manager () {
+ GLib.Object (name: _("Delayed load"),
+ description: _("Delay page load until you actually use the tab."),
+ version: "0.1",
+ authors: "André Stösel ");
+
+ install_integer ("delay", 0);
+
+ activate.connect (this.activated);
+ deactivate.connect (this.deactivated);
+ open_preferences.connect (show_preferences);
+ preferences_changed.connect (preferences_changed_cb);
+
+ this.tasks = new HashTable (GLib.direct_hash, GLib.direct_equal);
+ }
+ }
+}
+
+public Midori.Extension extension_init () {
+ return new DelayedLoad.Manager ();
+}
+
diff --git a/extensions/external-download-manager.vala b/extensions/external-download-manager.vala
index b4e783ab..b8c60142 100644
--- a/extensions/external-download-manager.vala
+++ b/extensions/external-download-manager.vala
@@ -35,9 +35,9 @@ namespace EDM {
private GLib.PtrArray download_managers = new GLib.PtrArray ();
public bool download_requested (Midori.View view, WebKit.Download download) {
- if (download.get_data ("save-as-download") == null
- && download.get_data ("open-download") == null
- && download.get_data ("cancel-download") == null) {
+ Midori.DownloadType download_type = download.get_data ("midori-download-type");
+
+ if (download_type == Midori.DownloadType.SAVE) {
var dlReq = new DownloadRequest ();
dlReq.uri = download.get_uri ();
@@ -206,6 +206,100 @@ namespace EDM {
this.deactivate.connect (deactivated);
}
}
+
+ private class CommandLinePreferences : Dialog {
+ protected Entry input;
+ protected CommandLine commandline;
+
+ public CommandLinePreferences(CommandLine cl) {
+ this.commandline = cl;
+
+ string ext_name;
+ this.get ("name",out ext_name);
+
+ this.title = _("Preferences for %s").printf (ext_name);
+ if (this.get_class ().find_property ("has-separator") != null)
+ this.set ("has-separator", false);
+ this.border_width = 5;
+ this.set_modal (true);
+ this.set_default_size (400, 100);
+ this.create_widgets ();
+
+ this.response.connect (response_cb);
+ }
+
+ private void response_cb (Dialog source, int response_id) {
+ switch (response_id) {
+ case ResponseType.APPLY:
+ this.commandline.set_string ("commandline", this.input.get_text ());
+ this.destroy ();
+ break;
+ case ResponseType.CANCEL:
+ this.destroy ();
+ break;
+ }
+ }
+
+ private void create_widgets () {
+ Label text = new Label (_("Command:"));
+ this.input = new Entry ();
+ this.input.set_text (this.commandline.get_string ("commandline"));
+
+
+#if HAVE_GTK3
+ Gtk.Box vbox = get_content_area () as Gtk.Box;
+ vbox.pack_start (text, false, false, 0);
+ vbox.pack_start (this.input, false, true, 0);
+#else
+ this.vbox.pack_start (text, false, false, 0);
+ this.vbox.pack_start (this.input, false, true, 0);
+#endif
+
+ this.add_button (Gtk.STOCK_CANCEL, ResponseType.CANCEL);
+ this.add_button (Gtk.STOCK_APPLY, ResponseType.APPLY);
+
+ this.show_all ();
+ }
+ }
+
+ private class CommandLine : ExternalDownloadManager {
+ private void show_preferences () {
+ CommandLinePreferences dialog = new CommandLinePreferences (this);
+ dialog.show ();
+ }
+
+ public override bool download (DownloadRequest dlReq) {
+ try {
+ string cmd = this.get_string ("commandline");
+ cmd = cmd.replace("{REFERER}", GLib.Shell.quote (dlReq.referer));
+ if (dlReq.cookie_header != null) {
+ cmd = cmd.replace("{COOKIES}", GLib.Shell.quote ("Cookie: " + dlReq.cookie_header));
+ } else {
+ cmd = cmd.replace("{COOKIES}", "\'\'");
+ }
+ cmd = cmd.replace("{URL}", GLib.Shell.quote (dlReq.uri));
+ GLib.Process.spawn_command_line_async (cmd);
+ return true;
+ } catch (Error e) {
+ this.handle_exception (e);
+ }
+ return false;
+ }
+
+ internal CommandLine () {
+ GLib.Object (name: _("External Download Manager - CommandLine"),
+ description: _("Download files with a specified command"),
+ version: "0.1" + Midori.VERSION_SUFFIX,
+ authors: "André Stösel ",
+ key: "commandline");
+
+ this.install_string ("commandline", "wget --no-check-certificate --referer={REFERER} --header={COOKIES} {URL}");
+
+ this.activate.connect (activated);
+ this.deactivate.connect (deactivated);
+ this.open_preferences.connect (show_preferences);
+ }
+ }
}
public Katze.Array extension_init () {
@@ -214,6 +308,7 @@ public Katze.Array extension_init () {
var extensions = new Katze.Array( typeof (Midori.Extension));
extensions.add_item (new EDM.Aria2 ());
extensions.add_item (new EDM.SteadyFlow ());
+ extensions.add_item (new EDM.CommandLine ());
return extensions;
}
diff --git a/extensions/formhistory/formhistory-js-frontend.c b/extensions/formhistory/formhistory-js-frontend.c
index c1c85ead..ec64d7ac 100644
--- a/extensions/formhistory/formhistory-js-frontend.c
+++ b/extensions/formhistory/formhistory-js-frontend.c
@@ -27,7 +27,7 @@ formhistory_construct_popup_gui (FormHistoryPriv* priv)
guint i;
gchar* file;
- file = sokoke_find_data_filename ("autosuggestcontrol.js", TRUE);
+ file = midori_app_find_res_filename ("autosuggestcontrol.js");
if (!g_file_get_contents (file, &autosuggest, NULL, NULL))
{
g_free (file);
@@ -35,7 +35,7 @@ formhistory_construct_popup_gui (FormHistoryPriv* priv)
}
g_strchomp (autosuggest);
- katze_assign (file, sokoke_find_data_filename ("autosuggestcontrol.css", TRUE));
+ katze_assign (file, midori_app_find_res_filename ("autosuggestcontrol.css"));
if (!g_file_get_contents (file, &style, NULL, NULL))
{
g_free (file);
diff --git a/extensions/formhistory/formhistory.c b/extensions/formhistory/formhistory.c
index db5a2344..fca8aada 100644
--- a/extensions/formhistory/formhistory.c
+++ b/extensions/formhistory/formhistory.c
@@ -522,12 +522,12 @@ formhistory_activate_cb (MidoriExtension* extension,
formhistory_construct_popup_gui (priv);
config_dir = midori_extension_get_config_dir (extension);
- katze_mkdir_with_parents (config_dir, 0700);
+ if (config_dir != NULL)
+ katze_mkdir_with_parents (config_dir, 0700);
filename = g_build_filename (config_dir, "forms.db", NULL);
if (sqlite3_open (filename, &db) != SQLITE_OK)
{
- /* If the folder is /, this is a test run, thus no error */
- if (!g_str_equal (midori_extension_get_config_dir (extension), "/"))
+ if (config_dir != NULL)
g_warning (_("Failed to open database: %s\n"), sqlite3_errmsg (db));
sqlite3_close (db);
}
diff --git a/extensions/history-list.vala b/extensions/history-list.vala
index 44af649f..499bb740 100644
--- a/extensions/history-list.vala
+++ b/extensions/history-list.vala
@@ -462,7 +462,7 @@ namespace HistoryList {
tab_added (browser, tab);
browser.add_tab.connect (tab_added);
browser.remove_tab.connect (tab_removed);
- browser.notify["tab"].connect (this.tab_changed);
+ browser.switch_tab.connect (this.tab_changed);
}
void browser_removed (Midori.Browser browser) {
@@ -491,7 +491,7 @@ namespace HistoryList {
browser.add_tab.disconnect (tab_added);
browser.remove_tab.disconnect (tab_removed);
- browser.notify["tab"].disconnect (this.tab_changed);
+ browser.switch_tab.disconnect (this.tab_changed);
}
void tab_added (Midori.Browser browser, Midori.View view) {
@@ -520,21 +520,18 @@ namespace HistoryList {
}
}
- void tab_changed (GLib.Object window, GLib.ParamSpec pspec) {
+ void tab_changed (Midori.View? old_view, Midori.View? new_view) {
if(this.ignoreNextChange) {
this.ignoreNextChange = false;
} else {
- Midori.Browser browser = window as Midori.Browser;
- Midori.View view = null;
- Midori.View last_view = null;
- browser.get ("tab", ref view);
-
- last_view = browser.get_data ("history-list-last-change");
+ Midori.Browser? browser = Midori.Browser.get_for_widget (new_view);
+ Midori.View? last_view
+ = browser.get_data ("history-list-last-change");
if (last_view != null) {
this.tab_list_resort (browser, last_view);
}
- browser.set_data ("history-list-last-change", view);
+ browser.set_data ("history-list-last-change", new_view);
}
}
diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c
index c9cd68a6..e2210d7f 100644
--- a/extensions/statusbar-features.c
+++ b/extensions/statusbar-features.c
@@ -107,6 +107,81 @@ statusbar_features_zoom_level_changed_cb (GtkWidget* combobox,
midori_view_set_zoom_level (view, zoom_level / 100.0);
}
+GtkWidget*
+statusbar_features_property_proxy (MidoriWebSettings* settings,
+ const gchar* property,
+ GtkWidget* toolbar)
+{
+ const gchar* kind = NULL;
+ GtkWidget* button;
+ GtkWidget* image;
+ if (!strcmp (property, "auto-load-images")
+ || !strcmp (property, "enable-scripts")
+ || !strcmp (property, "enable-plugins"))
+ kind = "toggle";
+ else if (!strcmp (property, "identify-as"))
+ kind = "custom-user-agent";
+ else if (strstr (property, "font") != NULL)
+ kind = "font";
+ else if (!strcmp (property, "zoom-level"))
+ {
+ MidoriBrowser* browser = midori_browser_get_for_widget (toolbar);
+ gint i;
+ button = gtk_combo_box_text_new_with_entry ();
+ gtk_entry_set_width_chars (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (button))), 4);
+ for (i = 0; i < G_N_ELEMENTS (zoom_levels); i++)
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (button), zoom_levels[i].label);
+ g_signal_connect (button, "changed",
+ G_CALLBACK (statusbar_features_zoom_level_changed_cb), browser);
+ g_signal_connect (browser, "notify::tab",
+ G_CALLBACK (statusbar_features_browser_notify_tab_cb), button);
+ statusbar_features_browser_notify_tab_cb (browser, NULL, button);
+ return button;
+ }
+
+ button = katze_property_proxy (settings, property, kind);
+ if (GTK_IS_BIN (button))
+ {
+ GtkWidget* label = gtk_bin_get_child (GTK_BIN (button));
+ if (GTK_IS_LABEL (label))
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+ }
+
+ if (!strcmp (property, "auto-load-images"))
+ {
+ g_object_set_data (G_OBJECT (button), "feature-label", _("Images"));
+ image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU);
+ gtk_button_set_image (GTK_BUTTON (button), image);
+ gtk_widget_set_tooltip_text (button, _("Load images automatically"));
+ statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
+ g_signal_connect (toolbar, "notify::toolbar-style",
+ G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button);
+ }
+ if (!strcmp (property, "enable-scripts"))
+ {
+ g_object_set_data (G_OBJECT (button), "feature-label", _("Scripts"));
+ image = gtk_image_new_from_stock (STOCK_SCRIPT, GTK_ICON_SIZE_MENU);
+ gtk_button_set_image (GTK_BUTTON (button), image);
+ gtk_widget_set_tooltip_text (button, _("Enable scripts"));
+ statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
+ g_signal_connect (toolbar, "notify::toolbar-style",
+ G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button);
+ }
+ else if (!strcmp (property, "enable-plugins"))
+ {
+ if (!midori_web_settings_has_plugin_support ())
+ gtk_widget_hide (button);
+ g_object_set_data (G_OBJECT (button), "feature-label", _("Netscape plugins"));
+ image = gtk_image_new_from_stock (STOCK_PLUGINS, GTK_ICON_SIZE_MENU);
+ gtk_button_set_image (GTK_BUTTON (button), image);
+ gtk_widget_set_tooltip_text (button, _("Enable Netscape plugins"));
+ statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
+ g_signal_connect (toolbar, "notify::toolbar-style",
+ G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button);
+ }
+ return button;
+}
+
static void
statusbar_features_app_add_browser_cb (MidoriApp* app,
MidoriBrowser* browser,
@@ -117,8 +192,8 @@ statusbar_features_app_add_browser_cb (MidoriApp* app,
MidoriWebSettings* settings;
GtkWidget* toolbar;
GtkWidget* button;
- GtkWidget* image;
gsize i;
+ gchar** filters;
/* FIXME: Monitor each view and modify its settings individually
instead of merely replicating the global preferences. */
@@ -127,52 +202,37 @@ statusbar_features_app_add_browser_cb (MidoriApp* app,
bbox = gtk_hbox_new (FALSE, 0);
settings = midori_browser_get_settings (browser);
toolbar = katze_object_get_object (browser, "navigationbar");
- button = katze_property_proxy (settings, "auto-load-images", "toggle");
- g_object_set_data (G_OBJECT (button), "feature-label", _("Images"));
- image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU);
- gtk_button_set_image (GTK_BUTTON (button), image);
- gtk_widget_set_tooltip_text (button, _("Load images automatically"));
- statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
- g_signal_connect (toolbar, "notify::toolbar-style",
- G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
- button = katze_property_proxy (settings, "enable-scripts", "toggle");
- g_object_set_data (G_OBJECT (button), "feature-label", _("Scripts"));
- image = gtk_image_new_from_stock (STOCK_SCRIPTS, GTK_ICON_SIZE_MENU);
- gtk_button_set_image (GTK_BUTTON (button), image);
- gtk_widget_set_tooltip_text (button, _("Enable scripts"));
- statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
- g_signal_connect (toolbar, "notify::toolbar-style",
- G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
- if (midori_web_settings_has_plugin_support ())
+
+ filters = midori_extension_get_string_list (extension, "items", NULL);
+ if (filters && *filters)
{
- button = katze_property_proxy (settings, "enable-plugins", "toggle");
- g_object_set_data (G_OBJECT (button), "feature-label", _("Netscape plugins"));
- image = gtk_image_new_from_stock (STOCK_PLUGINS, GTK_ICON_SIZE_MENU);
- gtk_button_set_image (GTK_BUTTON (button), image);
- gtk_widget_set_tooltip_text (button, _("Enable Netscape plugins"));
- statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
- g_signal_connect (toolbar, "notify::toolbar-style",
- G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
+ i = 0;
+ while (filters[i] != NULL)
+ {
+ button = statusbar_features_property_proxy (settings, filters[i], toolbar);
+ gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
+ i++;
+ }
+ }
+ else
+ {
+ button = statusbar_features_property_proxy (settings, "auto-load-images", toolbar);
+ gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
+ button = statusbar_features_property_proxy (settings, "enable-scripts", toolbar);
+ gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
+ button = statusbar_features_property_proxy (settings, "enable-plugins", toolbar);
+ gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
+ button = statusbar_features_property_proxy (settings, "identify-as", toolbar);
+ gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
+ button = statusbar_features_property_proxy (settings, "zoom-level", toolbar);
+ gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
}
- button = katze_property_proxy (settings, "identify-as", "custom-user-agent");
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
- button = gtk_combo_box_text_new_with_entry ();
- gtk_entry_set_width_chars (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (button))), 4);
- for (i = 0; i < G_N_ELEMENTS (zoom_levels); i++)
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (button), zoom_levels[i].label);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
- g_signal_connect (button, "changed",
- G_CALLBACK (statusbar_features_zoom_level_changed_cb), browser);
- g_signal_connect (browser, "notify::tab",
- G_CALLBACK (statusbar_features_browser_notify_tab_cb), button);
- statusbar_features_browser_notify_tab_cb (browser, NULL, button);
gtk_widget_show_all (bbox);
gtk_box_pack_end (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3);
g_object_unref (statusbar);
+ g_object_unref (toolbar);
+ g_strfreev (filters);
g_signal_connect (extension, "deactivate",
G_CALLBACK (statusbar_features_deactivate_cb), bbox);
}
@@ -201,6 +261,7 @@ extension_init (void)
"version", "0.1" MIDORI_VERSION_SUFFIX,
"authors", "Christian Dywan ",
NULL);
+ midori_extension_install_string_list (extension, "items", NULL, G_MAXSIZE);
g_signal_connect (extension, "activate",
G_CALLBACK (statusbar_features_activate_cb), NULL);
diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c
index a99a3a2d..44e23e6a 100644
--- a/extensions/tab-panel.c
+++ b/extensions/tab-panel.c
@@ -143,7 +143,6 @@ midori_extension_cursor_or_row_changed_cb (GtkTreeView* treeview,
/* Nothing to do */
}
-#if GTK_CHECK_VERSION (2, 12, 0)
static gboolean
tab_panel_treeview_query_tooltip_cb (GtkWidget* treeview,
gint x,
@@ -171,7 +170,6 @@ tab_panel_treeview_query_tooltip_cb (GtkWidget* treeview,
return TRUE;
}
-#endif
static void
midori_extension_row_activated_cb (GtkTreeView* treeview,
@@ -231,12 +229,12 @@ midori_extension_button_release_event_cb (GtkWidget* widget,
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
event->x, event->y, NULL, &column, NULL, NULL)
&& column == gtk_tree_view_get_column (GTK_TREE_VIEW (widget), 1))
- gtk_widget_destroy (view);
+ midori_browser_remove_tab (browser, view);
else
midori_browser_set_current_tab (browser, view);
}
else if (event->button == 2)
- gtk_widget_destroy (view);
+ midori_browser_remove_tab (midori_browser_get_for_widget (widget), view);
else
tab_panel_popup (widget, event, view);
@@ -534,11 +532,9 @@ tab_panel_app_add_browser_cb (MidoriApp* app,
treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
gtk_tree_view_set_show_expanders (GTK_TREE_VIEW (treeview), FALSE);
- #if GTK_CHECK_VERSION (2, 12, 0)
g_signal_connect (treeview, "query-tooltip",
G_CALLBACK (tab_panel_treeview_query_tooltip_cb), NULL);
gtk_widget_set_has_tooltip (treeview, TRUE);
- #endif
column = gtk_tree_view_column_new ();
renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE);
diff --git a/extensions/toolbar-editor.c b/extensions/toolbar-editor.c
index 79a567fa..93486682 100644
--- a/extensions/toolbar-editor.c
+++ b/extensions/toolbar-editor.c
@@ -46,8 +46,6 @@ static const GtkTargetEntry tb_editor_dnd_targets[] =
};
static const gint tb_editor_dnd_targets_len = G_N_ELEMENTS(tb_editor_dnd_targets);
-static void tb_editor_browser_populate_tool_menu_cb(MidoriBrowser *browser, GtkWidget *menu, MidoriExtension *ext);
-
static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, GtkWidget *menu,
MidoriExtension *ext);
@@ -58,7 +56,6 @@ static void tb_editor_deactivate_cb(MidoriExtension *extension, MidoriBrowser *b
{
MidoriApp *app = midori_extension_get_app(extension);
- g_signal_handlers_disconnect_by_func(browser, tb_editor_browser_populate_tool_menu_cb, extension);
g_signal_handlers_disconnect_by_func(browser, tb_editor_browser_populate_toolbar_menu_cb, extension);
g_signal_handlers_disconnect_by_func(extension, tb_editor_deactivate_cb, browser);
g_signal_handlers_disconnect_by_func(app, tb_editor_app_add_browser_cb, extension);
@@ -107,7 +104,12 @@ static GSList *tb_editor_array_to_list(const gchar **items)
name = items;
while (*name != NULL)
{
+ #ifdef HAVE_GRANITE
+ /* A "new tab" button is already part of the notebook */
+ if (*name[0] != '\0' && strcmp (*name, "TabNew"))
+ #else
if (*name[0] != '\0')
+ #endif
list = g_slist_append(list, g_strdup(*name));
name++;
}
@@ -574,17 +576,6 @@ static void tb_editor_menu_configure_toolbar_activate_cb(GtkWidget *menuitem, Mi
g_free(tbw);
}
-static void tb_editor_browser_populate_tool_menu_cb(MidoriBrowser *browser, GtkWidget *menu, MidoriExtension *ext)
-{
- GtkWidget *menuitem;
-
- menuitem = gtk_menu_item_new_with_mnemonic (_("Customize _Toolbar..."));
- g_signal_connect (menuitem, "activate",
- G_CALLBACK (tb_editor_menu_configure_toolbar_activate_cb), browser);
- gtk_widget_show (menuitem);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-}
-
static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, GtkWidget *menu,
MidoriExtension *ext)
{
@@ -594,7 +585,7 @@ static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, G
separator = gtk_separator_menu_item_new ();
gtk_widget_show (separator);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), separator);
- menuitem = gtk_menu_item_new_with_mnemonic (_("_Customize..."));
+ menuitem = gtk_menu_item_new_with_mnemonic (_("_Customize Toolbar…"));
g_signal_connect (menuitem, "activate",
G_CALLBACK (tb_editor_menu_configure_toolbar_activate_cb), browser);
gtk_widget_show (menuitem);
@@ -603,7 +594,6 @@ static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, G
static void tb_editor_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext)
{
- g_signal_connect(browser, "populate-tool-menu", G_CALLBACK(tb_editor_browser_populate_tool_menu_cb), ext);
g_signal_connect(browser, "populate-toolbar-menu", G_CALLBACK(tb_editor_browser_populate_toolbar_menu_cb), ext);
g_signal_connect(ext, "deactivate", G_CALLBACK(tb_editor_deactivate_cb), browser);
}
diff --git a/extensions/web-cache.c b/extensions/web-cache.c
index a3e592bf..53ea445b 100644
--- a/extensions/web-cache.c
+++ b/extensions/web-cache.c
@@ -28,8 +28,7 @@ web_cache_get_cache_dir (void)
{
static gchar* cache_dir = NULL;
if (!cache_dir)
- cache_dir = g_build_filename (g_get_user_cache_dir (),
- PACKAGE_NAME, "web", NULL);
+ cache_dir = g_build_filename (midori_paths_get_cache_dir (), "web", NULL);
return cache_dir;
}
diff --git a/extensions/wscript_build b/extensions/wscript_build
index b4031ee8..152d8206 100644
--- a/extensions/wscript_build
+++ b/extensions/wscript_build
@@ -33,11 +33,11 @@ for extension in extensions:
obj = bld.new_task_gen ('cc', 'shlib')
obj.target = target
- obj.includes = '..'
+ obj.includes = '.. ../katze ../midori'
obj.source = source
obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON'
obj.vapi_dirs = '../midori ../katze'
- obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 midori katze'
+ obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 midori midori-core katze'
if bld.env['HAVE_GTK3']:
obj.packages += ' gtk+-3.0 webkitgtk-3.0'
else:
diff --git a/icons/16x16/news-feed.png b/icons/16x16/internet-news-reader.png
similarity index 100%
rename from icons/16x16/news-feed.png
rename to icons/16x16/internet-news-reader.png
diff --git a/icons/22x22/news-feed.png b/icons/22x22/internet-news-reader.png
similarity index 100%
rename from icons/22x22/news-feed.png
rename to icons/22x22/internet-news-reader.png
diff --git a/icons/scalable/news-feed.svg b/icons/scalable/internet-news-reader.svg
similarity index 100%
rename from icons/scalable/news-feed.svg
rename to icons/scalable/internet-news-reader.svg
diff --git a/icons/wscript_build b/icons/wscript_build
index 6421b80c..4e2345c9 100644
--- a/icons/wscript_build
+++ b/icons/wscript_build
@@ -41,4 +41,4 @@ def add_image (bld, category, name):
add_image (bld, 'categories', 'extension')
add_image (bld, 'apps', 'midori')
-add_image (bld, 'status', 'news-feed')
+add_image (bld, 'status', 'internet-news-reader')
diff --git a/katze/gtk3-compat.c b/katze/gtk3-compat.c
index 8be80914..d7fd2495 100644
--- a/katze/gtk3-compat.c
+++ b/katze/gtk3-compat.c
@@ -71,17 +71,15 @@ gtk_entry_set_placeholder_text (GtkEntry* entry,
const gchar* default_text)
{
/* Note: The default text initially overwrites any previous text */
- gchar* old_value = g_object_get_data (G_OBJECT (entry),
- "sokoke_default_text");
- g_object_set_data (G_OBJECT (entry), "sokoke_default_text",
- (gpointer)default_text);
+ gchar* old_value = g_object_get_data (G_OBJECT (entry), "sokoke_default_text");
+ g_object_set_data (G_OBJECT (entry), "sokoke_default_text", (gpointer)default_text);
- if (!old_value)
+ if (default_text == NULL)
+ g_object_set_data (G_OBJECT (entry), "sokoke_has_default", GINT_TO_POINTER (0));
+ else if (!old_value)
{
- g_object_set_data (G_OBJECT (entry), "sokoke_has_default",
- GINT_TO_POINTER (1));
- sokoke_widget_set_pango_font_style (GTK_WIDGET (entry),
- PANGO_STYLE_ITALIC);
+ g_object_set_data (G_OBJECT (entry), "sokoke_has_default", GINT_TO_POINTER (1));
+ sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), PANGO_STYLE_ITALIC);
gtk_entry_set_text (entry, default_text);
g_signal_connect (entry, "drag-data-received",
G_CALLBACK (sokoke_on_entry_drag_data_received), NULL);
@@ -92,13 +90,11 @@ gtk_entry_set_placeholder_text (GtkEntry* entry,
}
else if (!gtk_widget_has_focus (GTK_WIDGET (entry)))
{
- gint has_default = GPOINTER_TO_INT (
- g_object_get_data (G_OBJECT (entry), "sokoke_has_default"));
+ gint has_default = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (entry), "sokoke_has_default"));
if (has_default)
{
gtk_entry_set_text (entry, default_text);
- sokoke_widget_set_pango_font_style (GTK_WIDGET (entry),
- PANGO_STYLE_ITALIC);
+ sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), PANGO_STYLE_ITALIC);
}
}
}
@@ -110,41 +106,3 @@ gtk_entry_get_placeholder_text (GtkEntry* entry)
}
#endif
-#if !GTK_CHECK_VERSION (2, 12, 0)
-
-void
-gtk_widget_set_has_tooltip (GtkWidget* widget,
- gboolean has_tooltip)
-{
- /* Do nothing */
-}
-
-void
-gtk_widget_set_tooltip_text (GtkWidget* widget,
- const gchar* text)
-{
- if (text && *text)
- {
- static GtkTooltips* tooltips = NULL;
- if (G_UNLIKELY (!tooltips))
- tooltips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tooltips, widget, text, NULL);
- }
-}
-
-void
-gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem,
- const gchar* text)
-{
- if (text && *text)
- {
- static GtkTooltips* tooltips = NULL;
- if (G_UNLIKELY (!tooltips))
- tooltips = gtk_tooltips_new ();
-
- gtk_tool_item_set_tooltip (toolitem, tooltips, text, NULL);
- }
-}
-
-#endif
-
diff --git a/katze/gtk3-compat.h b/katze/gtk3-compat.h
index 71a1ef19..a8450af2 100644
--- a/katze/gtk3-compat.h
+++ b/katze/gtk3-compat.h
@@ -39,25 +39,6 @@ G_BEGIN_DECLS
#define g_format_size(sz) g_format_size_for_display ((goffset)sz)
#endif
-#if !GTK_CHECK_VERSION (2, 14, 0)
- #define gtk_dialog_get_content_area(dlg) dlg->vbox
- #define gtk_dialog_get_action_area(dlg) dlg->action_area
- #define gtk_widget_get_window(wdgt) wdgt->window
- #define gtk_adjustment_get_page_size(adj) adj->page_size
- #define gtk_adjustment_get_upper(adj) adj->upper
- #define gtk_adjustment_get_lower(adj) adj->lower
- #define gtk_adjustment_get_value(adj) adj->value
-#endif
-
-#if !GTK_CHECK_VERSION (2, 16, 0)
- #define GTK_ACTIVATABLE GTK_WIDGET
- #define gtk_activatable_get_related_action gtk_widget_get_action
- #define gtk_menu_item_set_label(menuitem, label) \
- gtk_label_set_label (GTK_LABEL (GTK_BIN (menuitem)->child), \
- label ? label : "");
- #define gtk_image_menu_item_set_always_show_image(menuitem, yesno) ()
-#endif
-
#if !GTK_CHECK_VERSION (2, 18, 0)
#define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL (widget)
#define gtk_widget_has_focus(widget) GTK_WIDGET_HAS_FOCUS (widget)
@@ -95,22 +76,6 @@ G_BEGIN_DECLS
const gchar* gtk_entry_get_placeholder_text (GtkEntry* entry);
#endif
-#if !GTK_CHECK_VERSION(2, 12, 0)
-
-void
-gtk_widget_set_has_tooltip (GtkWidget* widget,
- gboolean has_tooltip);
-
-void
-gtk_widget_set_tooltip_text (GtkWidget* widget,
- const gchar* text);
-
-void
-gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem,
- const gchar* text);
-
-#endif
-
#if !GTK_CHECK_VERSION (2, 24 ,0)
#define gtk_combo_box_text_append_text gtk_combo_box_append_text
#define gtk_combo_box_text_new gtk_combo_box_new_text
@@ -151,6 +116,10 @@ gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem,
#define GDK_KEY_Return GDK_Return
#endif
+#ifndef GDK_IS_X11_DISPLAY
+ #define GDK_IS_X11_DISPLAY(display) TRUE
+#endif
+
G_END_DECLS
#endif
diff --git a/katze/katze-array.c b/katze/katze-array.c
index 6d11b5ae..602c1647 100644
--- a/katze/katze-array.c
+++ b/katze/katze-array.c
@@ -404,8 +404,13 @@ katze_array_find_token (KatzeArray* array,
for (items = array->items; items; items = g_list_next (items))
{
const gchar* found_token = ((KatzeItem*)items->data)->token;
- if (found_token != NULL && !strncmp (token, found_token, token_length))
- return items->data;
+ if (found_token != NULL)
+ {
+ guint bigger_item = strlen (found_token) > token_length ? strlen (found_token) : token_length;
+
+ if (strncmp (token, found_token, bigger_item) == 0)
+ return items->data;
+ }
}
return NULL;
}
diff --git a/katze/katze-http-cookies-sqlite.c b/katze/katze-http-cookies-sqlite.c
index bf4b5036..10eb3f33 100644
--- a/katze/katze-http-cookies-sqlite.c
+++ b/katze/katze-http-cookies-sqlite.c
@@ -207,7 +207,7 @@ katze_http_cookies_sqlite_jar_changed_cb (SoupCookieJar* jar,
}
}
- if (g_getenv ("MIDORI_COOKIES_DEBUG") != NULL)
+ if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies"))
http_cookies->counter++;
if (old_cookie) {
diff --git a/katze/katze-http-cookies.c b/katze/katze-http-cookies.c
index a25f62a1..1ccb8d9a 100644
--- a/katze/katze-http-cookies.c
+++ b/katze/katze-http-cookies.c
@@ -211,7 +211,7 @@ katze_http_cookies_update_jar (KatzeHttpCookies* http_cookies)
goto failed;
g_free (temporary_filename);
- if (g_getenv ("MIDORI_COOKIES_DEBUG") != NULL)
+ if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies"))
{
g_print ("KatzeHttpCookies: %d cookies changed\n", http_cookies->counter);
http_cookies->counter = 0;
@@ -223,7 +223,7 @@ failed:
fclose (f);
g_unlink (temporary_filename);
g_free (temporary_filename);
- if (g_getenv ("MIDORI_COOKIES_DEBUG") != NULL)
+ if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies"))
g_print ("KatzeHttpCookies: Failed to write '%s'\n",
http_cookies->filename);
return FALSE;
@@ -263,7 +263,7 @@ katze_http_cookies_jar_changed_cb (SoupCookieJar* jar,
}
}
- if (g_getenv ("MIDORI_COOKIES_DEBUG") != NULL)
+ if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies"))
http_cookies->counter++;
if (!http_cookies->timeout && (old_cookie || new_cookie->expires))
diff --git a/katze/katze-net.c b/katze/katze-net.c
index f873d08c..10b55bff 100644
--- a/katze/katze-net.c
+++ b/katze/katze-net.c
@@ -27,9 +27,6 @@
struct _KatzeNet
{
GObject parent_instance;
-
- gchar* cache_path;
- guint cache_size;
};
struct _KatzeNetClass
@@ -54,37 +51,14 @@ katze_net_class_init (KatzeNetClass* class)
static void
katze_net_init (KatzeNet* net)
{
- net->cache_path = g_build_filename (g_get_user_cache_dir (),
- PACKAGE_NAME, NULL);
}
static void
katze_net_finalize (GObject* object)
{
- KatzeNet* net = KATZE_NET (object);
-
- katze_assign (net->cache_path, NULL);
-
G_OBJECT_CLASS (katze_net_parent_class)->finalize (object);
}
-static KatzeNet*
-katze_net_new (void)
-{
- static KatzeNet* net = NULL;
-
- if (!net)
- {
- net = g_object_new (KATZE_TYPE_NET, NULL);
- /* Since this is a "singleton", keep an extra reference */
- g_object_ref (net);
- }
- else
- g_object_ref (net);
-
- return net;
-}
-
typedef struct
{
KatzeNetStatusCb status_cb;
@@ -109,29 +83,28 @@ katze_net_get_cached_path (KatzeNet* net,
const gchar* uri,
const gchar* subfolder)
{
- gchar* cache_path;
gchar* checksum;
gchar* extension;
gchar* cached_filename;
gchar* cached_path;
- net = katze_net_new ();
-
- if (subfolder)
- cache_path = g_build_filename (net->cache_path, subfolder, NULL);
- else
- cache_path = net->cache_path;
- katze_mkdir_with_parents (cache_path, 0700);
checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
-
extension = g_strrstr (uri, ".");
cached_filename = g_strdup_printf ("%s%s", checksum,
extension ? extension : "");
g_free (checksum);
- cached_path = g_build_filename (cache_path, cached_filename, NULL);
- g_free (cached_filename);
+
if (subfolder)
+ {
+ gchar* cache_path = g_build_filename (midori_paths_get_cache_dir (), subfolder, NULL);
+ katze_mkdir_with_parents (cache_path, 0700);
+ cached_path = g_build_filename (cache_path, cached_filename, NULL);
g_free (cache_path);
+ }
+ else
+ cached_path = g_build_filename (midori_paths_get_cache_dir (), cached_filename, NULL);
+
+ g_free (cached_filename);
return cached_path;
}
diff --git a/katze/katze-net.h b/katze/katze-net.h
index 5658ff47..eea2df41 100644
--- a/katze/katze-net.h
+++ b/katze/katze-net.h
@@ -14,8 +14,6 @@
#include "katze-utils.h"
-#include
-
G_BEGIN_DECLS
#define KATZE_TYPE_NET \
diff --git a/katze/katze-preferences.c b/katze/katze-preferences.c
index e4fd18aa..6108fd4a 100644
--- a/katze/katze-preferences.c
+++ b/katze/katze-preferences.c
@@ -15,6 +15,13 @@
#include
#endif
+#ifdef HAVE_GRANITE
+ #if HAVE_OSX
+ #error FIXME granite on OSX is not implemented
+ #endif
+ #include
+#endif
+
#if HAVE_HILDON
#include "katze-scrolled.h"
#include
@@ -103,11 +110,8 @@ katze_preferences_init (KatzePreferences* preferences)
gtk_dialog_add_buttons (GTK_DIALOG (preferences),
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
NULL);
- #if GTK_CHECK_VERSION (3, 0, 0)
- gtk_style_context_add_class (gtk_widget_get_style_context (
- gtk_dialog_get_widget_for_response (GTK_DIALOG (preferences),
- GTK_RESPONSE_HELP)), "help_button");
- #endif
+ katze_widget_add_class (gtk_dialog_get_widget_for_response (
+ GTK_DIALOG (preferences), GTK_RESPONSE_HELP), "help_button");
gtk_dialog_add_buttons (GTK_DIALOG (preferences),
#if HAVE_HILDON
@@ -202,7 +206,12 @@ katze_preferences_prepare (KatzePreferences* preferences)
g_signal_connect (priv->scrolled, "destroy",
G_CALLBACK (gtk_widget_destroyed), &priv->scrolled);
#else
+ #ifdef HAVE_GRANITE
+ /* FIXME: granite: should return GtkWidget* like GTK+ */
+ priv->notebook = (GtkWidget*)granite_widgets_static_notebook_new (FALSE);
+ #else
priv->notebook = gtk_notebook_new ();
+ #endif
gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 6);
#if HAVE_OSX
@@ -296,8 +305,14 @@ katze_preferences_add_category (KatzePreferences* preferences,
priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
gtk_widget_show (priv->page);
gtk_container_set_border_width (GTK_CONTAINER (priv->page), 4);
+ #ifdef HAVE_GRANITE
+ granite_widgets_static_notebook_append_page (
+ GRANITE_WIDGETS_STATIC_NOTEBOOK (priv->notebook),
+ priv->page, GTK_LABEL (gtk_label_new (label)));
+ #else
gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
priv->page, gtk_label_new (label));
+ #endif
#if HAVE_OSX
priv->toolbutton = GTK_WIDGET (priv->toolbutton ?
gtk_radio_tool_button_new_from_widget (
diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index f4170712..9c5ef9c6 100644
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -277,7 +277,6 @@ proxy_combo_box_changed_cb (GtkComboBox* button,
if (custom_value)
{
- #if GTK_CHECK_VERSION (2, 12, 0)
if (value == custom_value)
gtk_widget_set_tooltip_text (GTK_WIDGET (button), NULL);
else
@@ -286,7 +285,6 @@ proxy_combo_box_changed_cb (GtkComboBox* button,
gtk_widget_set_tooltip_text (GTK_WIDGET (button), custom_text);
g_free (custom_text);
}
- #endif
}
}
#endif
@@ -523,14 +521,8 @@ katze_property_proxy (gpointer object,
string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value);
gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (widget),
string ? string : "");
- #if GTK_CHECK_VERSION (2, 12, 0)
g_signal_connect (widget, "file-set",
G_CALLBACK (proxy_uri_file_set_cb), object);
- #else
- if (pspec->flags & G_PARAM_WRITABLE)
- g_signal_connect (widget, "selection-changed",
- G_CALLBACK (proxy_uri_file_set_cb), object);
- #endif
}
else if (type == G_TYPE_PARAM_STRING && (_hint == I_("font")
|| _hint == I_("font-monospace")))
@@ -818,11 +810,10 @@ katze_property_proxy (gpointer object,
G_CALLBACK (proxy_entry_focus_out_event_cb), object);
g_object_set_data_full (G_OBJECT (entry), "property",
g_strdup (custom), g_free);
+ gtk_widget_set_tooltip_text (widget, NULL);
}
- #if GTK_CHECK_VERSION (2, 12, 0)
else
gtk_widget_set_tooltip_text (widget, custom_text);
- #endif
g_free (custom_text);
@@ -837,10 +828,6 @@ katze_property_proxy (gpointer object,
widget = gtk_label_new (gettext (nick));
g_free (string);
- #if GTK_CHECK_VERSION (2, 12, 0)
- if (!gtk_widget_get_tooltip_text (widget))
- gtk_widget_set_tooltip_text (widget, g_param_spec_get_blurb (pspec));
- #endif
gtk_widget_set_sensitive (widget, pspec->flags & G_PARAM_WRITABLE);
g_object_set_data_full (G_OBJECT (widget), "property",
@@ -881,16 +868,8 @@ katze_property_label (gpointer object,
return gtk_label_new (property);
}
- #ifdef HAVE_HILDON_2_2
- if (G_PARAM_SPEC_TYPE (pspec) == G_TYPE_PARAM_ENUM)
- return gtk_label_new (NULL);
- #endif
-
nick = g_param_spec_get_nick (pspec);
widget = gtk_label_new (nick);
- #if GTK_CHECK_VERSION (2, 12, 0)
- gtk_widget_set_tooltip_text (widget, g_param_spec_get_blurb (pspec));
- #endif
gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
return widget;
@@ -1523,8 +1502,7 @@ katze_load_cached_icon (const gchar* uri,
filename = g_strdup_printf ("%s%s", checksum, ext ? ext : "");
g_free (icon_uri);
g_free (checksum);
- path = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME,
- "icons", filename, NULL);
+ path = g_build_filename (midori_paths_get_cache_dir (), "icons", filename, NULL);
g_free (filename);
if ((icon = gdk_pixbuf_new_from_file_at_size (path, 16, 16, NULL)))
{
@@ -1546,6 +1524,13 @@ katze_uri_entry_changed_cb (GtkWidget* entry,
gboolean valid = midori_uri_is_location (uri);
if (!valid && g_object_get_data (G_OBJECT (entry), "allow_%s"))
valid = uri && g_str_has_prefix (uri, "%s");
+ if (!valid)
+ valid = midori_uri_is_ip_address (uri);
+
+ #if GTK_CHECK_VERSION (3, 2, 0)
+ g_object_set_data (G_OBJECT (entry), "invalid", GINT_TO_POINTER (*uri && !valid));
+ gtk_widget_queue_draw (entry);
+ #else
if (*uri && !valid)
{
GdkColor bg_color = { 0 };
@@ -1560,11 +1545,34 @@ katze_uri_entry_changed_cb (GtkWidget* entry,
gtk_widget_modify_base (entry, GTK_STATE_NORMAL, NULL);
gtk_widget_modify_text (entry, GTK_STATE_NORMAL, NULL);
}
+ #endif
if (other_widget != NULL)
gtk_widget_set_sensitive (other_widget, valid);
}
+#if GTK_CHECK_VERSION (3, 2, 0)
+static gboolean
+katze_uri_entry_draw_cb (GtkWidget* entry,
+ cairo_t* cr,
+ GtkWidget* other_widget)
+{
+ const GdkRGBA color = { 0.9, 0., 0., 1. };
+ double width = gtk_widget_get_allocated_width (entry);
+ double height = gtk_widget_get_allocated_height (entry);
+
+ if (!g_object_get_data (G_OBJECT (entry), "invalid"))
+ return FALSE;
+
+ /* FIXME: error-underline-color requires GtkTextView */
+ gdk_cairo_set_source_rgba (cr, &color);
+
+ pango_cairo_show_error_underline (cr, width * 0.15, height / 1.9,
+ width * 0.75, height / 1.9 / 2);
+ return TRUE;
+}
+#endif
+
/**
* katze_uri_entry_new:
* @other_widget: a #GtkWidget, or %NULL
@@ -1582,11 +1590,28 @@ GtkWidget*
katze_uri_entry_new (GtkWidget* other_widget)
{
GtkWidget* entry = gtk_entry_new ();
+
+ gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY,
+ g_themed_icon_new_with_default_fallbacks ("text-html-symbolic"));
g_signal_connect (entry, "changed",
G_CALLBACK (katze_uri_entry_changed_cb), other_widget);
+ #if GTK_CHECK_VERSION (3, 2, 0)
+ g_signal_connect_after (entry, "draw",
+ G_CALLBACK (katze_uri_entry_draw_cb), other_widget);
+ #endif
return entry;
}
+void
+katze_widget_add_class (GtkWidget* widget,
+ const gchar* class_name)
+{
+ #if GTK_CHECK_VERSION (3,0,0)
+ GtkStyleContext* context = gtk_widget_get_style_context (widget);
+ gtk_style_context_add_class (context, class_name);
+ #endif
+}
+
/**
* katze_assert_str_equal:
* @input: a string
diff --git a/katze/katze-utils.h b/katze/katze-utils.h
index 274aebb2..bf97cbff 100644
--- a/katze/katze-utils.h
+++ b/katze/katze-utils.h
@@ -160,6 +160,10 @@ katze_load_cached_icon (const gchar* uri,
GtkWidget*
katze_uri_entry_new (GtkWidget* other_widget);
+void
+katze_widget_add_class (GtkWidget* widget,
+ const gchar* class_name);
+
void
katze_assert_str_equal (const gchar* input,
const gchar* result,
diff --git a/katze/katze.vapi b/katze/katze.vapi
index 6ba5cfa2..1627568b 100644
--- a/katze/katze.vapi
+++ b/katze/katze.vapi
@@ -3,9 +3,23 @@
[CCode (cprefix = "Katze", lower_case_cprefix = "katze_")]
namespace Katze {
- public class Array : GLib.Object {
+ static string assert_str_equal (string input, string result, string expected);
+
+ [CCode (cheader_filename = "katze/katze.h")]
+ public class Array : Katze.Item {
public Array (GLib.Type type);
public void add_item (GLib.Object item);
}
+
+ [CCode (cheader_filename = "katze/katze.h")]
+ public class Item : GLib.Object {
+ public string? uri { get; set; }
+ public string? name { get; set; }
+ public string? text { get; set; }
+
+ public bool get_meta_boolean (string key);
+ public int64 get_meta_integer (string key);
+ public void set_meta_integer (string key, int64 value);
+ }
}
diff --git a/katze/midori-hsts.vala b/katze/midori-hsts.vala
new file mode 100644
index 00000000..a878a6ec
--- /dev/null
+++ b/katze/midori-hsts.vala
@@ -0,0 +1,143 @@
+/*
+ Copyright (C) 2012 Christian Dywan
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+namespace Midori {
+ public class HSTS : GLib.Object, Soup.SessionFeature {
+ public class Directive {
+ public Soup.Date? expires = null;
+ public bool sub_domains = false;
+
+ public Directive (bool include_sub_domains) {
+ expires = new Soup.Date.from_now (int.MAX);
+ sub_domains = include_sub_domains;
+ }
+
+ public Directive.from_header (string header) {
+ var param_list = Soup.header_parse_param_list (header);
+ if (param_list == null)
+ return;
+
+ string? max_age = param_list.lookup ("max-age");
+ if (max_age != null)
+ expires = new Soup.Date.from_now (max_age.to_int ());
+ // if (param_list.lookup_extended ("includeSubDomains", null, null))
+ if ("includeSubDomains" in header)
+ sub_domains = true;
+ Soup.header_free_param_list (param_list);
+ }
+
+ public bool is_valid () {
+ return expires != null && !expires.is_past ();
+ }
+ }
+
+ File file;
+ HashTable whitelist;
+ bool debug = false;
+
+ public HSTS (owned string filename) {
+ whitelist = new HashTable (str_hash, str_equal);
+ read_cache (File.new_for_path (Paths.get_preset_filename (null, "hsts")));
+ file = File.new_for_path (filename);
+ read_cache (file);
+ if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "hsts") == 0)
+ debug = true;
+ }
+
+ async void read_cache (File file) {
+ try {
+ var stream = new DataInputStream (yield file.read_async ());
+ do {
+ string? line = yield stream.read_line_async ();
+ if (line == null)
+ break;
+ string[] parts = line.split (" ", 2);
+ if (parts[0] == null || parts[1] == null)
+ break;
+ var directive = new Directive.from_header (parts[1]);
+ if (directive.is_valid ())
+ append_to_whitelist (parts[0], directive);
+ } while (true);
+ }
+ catch (Error error) { }
+ }
+
+ /* No sub-features */
+ public bool add_feature (Type type) { return false; }
+ public bool remove_feature (Type type) { return false; }
+ public bool has_feature (Type type) { return false; }
+
+ public void attach (Soup.Session session) { session.request_queued.connect (queued); }
+ public void detach (Soup.Session session) { /* FIXME disconnect */ }
+
+ /* Never called but required by the interface */
+ public void request_started (Soup.Session session, Soup.Message msg, Soup.Socket socket) { }
+ public void request_queued (Soup.Session session, Soup.Message message) { }
+ public void request_unqueued (Soup.Session session, Soup.Message msg) { }
+
+ bool should_secure_host (string host) {
+ Directive? directive = whitelist.lookup (host);
+ if (directive == null)
+ directive = whitelist.lookup ("*." + host);
+ return directive != null && directive.is_valid ();
+ }
+
+ void queued (Soup.Session session, Soup.Message message) {
+ if (should_secure_host (message.uri.host)) {
+ message.uri.set_scheme ("https");
+ session.requeue_message (message);
+ if (debug)
+ stdout.printf ("HSTS: Enforce %s\n", message.uri.host);
+ }
+ else if (message.uri.scheme == "http")
+ message.finished.connect (strict_transport_security_handled);
+ }
+
+ void append_to_whitelist (string host, Directive directive) {
+ whitelist.insert (host, directive);
+ if (directive.sub_domains)
+ whitelist.insert ("*." + host, directive);
+ }
+
+ async void append_to_cache (string host, string header) {
+ if (Midori.Paths.is_readonly ())
+ return;
+
+ try {
+ var stream = file.append_to/* FIXME _async*/ (FileCreateFlags.NONE);
+ yield stream.write_async ((host + " " + header + "\n").data);
+ yield stream.flush_async ();
+ }
+ catch (Error error) {
+ critical ("Failed to update %s: %s", file.get_path (), error.message);
+ }
+ }
+
+ void strict_transport_security_handled (Soup.Message message) {
+ if (message == null || message.uri == null)
+ return;
+
+ unowned string? hsts = message.response_headers.get_one ("Strict-Transport-Security");
+ if (hsts == null)
+ return;
+
+ var directive = new Directive.from_header (hsts);
+ if (directive.is_valid ()) {
+ append_to_whitelist (message.uri.host, directive);
+ append_to_cache (message.uri.host, hsts);
+ }
+ if (debug)
+ stdout.printf ("HSTS: '%s' sets '%s' valid? %s\n",
+ message.uri.host, hsts, directive.is_valid ().to_string ());
+ }
+
+ }
+}
diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala
new file mode 100644
index 00000000..16efc739
--- /dev/null
+++ b/katze/midori-paths.vala
@@ -0,0 +1,244 @@
+/*
+ Copyright (C) 2012 Christian Dywan
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+namespace GLib {
+ #if HAVE_WIN32
+ extern static string win32_get_package_installation_directory_of_module (void* hmodule = null);
+ #endif
+}
+
+extern const string LIBDIR;
+extern const string MDATADIR;
+extern const string PACKAGE_NAME;
+extern const string SYSCONFDIR;
+extern const string MIDORI_VERSION_SUFFIX;
+
+namespace Midori {
+ public enum RuntimeMode {
+ UNDEFINED,
+ NORMAL,
+ APP,
+ PRIVATE,
+ PORTABLE
+ }
+
+ namespace Paths {
+ static string? exec_path = null;
+ static string[] command_line = null;
+ static RuntimeMode mode = RuntimeMode.UNDEFINED;
+
+ static string? config_dir = null;
+ static string? readonly_dir = null;
+ static string? cache_dir = null;
+ static string? user_data_dir = null;
+ static string? tmp_dir = null;
+
+ public static string get_readonly_config_dir () {
+ assert (mode != RuntimeMode.UNDEFINED);
+ return readonly_dir ?? config_dir;
+ }
+
+ public static string get_readonly_config_filename (string filename) {
+ assert (mode != RuntimeMode.UNDEFINED);
+ return Path.build_path (Path.DIR_SEPARATOR_S,
+ readonly_dir ?? config_dir, filename);
+ }
+
+ public bool is_readonly () {
+ assert (mode != RuntimeMode.UNDEFINED);
+ return readonly_dir != null;
+ }
+
+ public static void init (RuntimeMode new_mode, string? config_base) {
+ assert (mode == RuntimeMode.UNDEFINED);
+ assert (new_mode != RuntimeMode.UNDEFINED);
+ mode = new_mode;
+ if (mode == RuntimeMode.PORTABLE) {
+ config_dir = Path.build_path (Path.DIR_SEPARATOR_S,
+ exec_path, "profile", "config");
+ cache_dir = Path.build_path (Path.DIR_SEPARATOR_S,
+ exec_path, "profile", "cache");
+ user_data_dir = Path.build_path (Path.DIR_SEPARATOR_S,
+ exec_path, "profile", "misc");
+ tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S,
+ exec_path, "profile", "tmp");
+ }
+ else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) {
+ /* Use mock folders in development builds */
+ if ("." in MIDORI_VERSION_SUFFIX)
+ config_dir = cache_dir = user_data_dir = config_base;
+ else
+ config_dir = cache_dir = user_data_dir = "/";
+ readonly_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S,
+ Environment.get_user_config_dir (), PACKAGE_NAME);
+ tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S,
+ Environment.get_tmp_dir (), "midori-" + Environment.get_user_name ());
+ }
+ else {
+ config_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S,
+ Environment.get_user_config_dir (), PACKAGE_NAME);
+ cache_dir = Path.build_path (Path.DIR_SEPARATOR_S,
+ Environment.get_user_cache_dir (), PACKAGE_NAME);
+ user_data_dir = Environment.get_user_data_dir ();
+ tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S,
+ Environment.get_tmp_dir (), "midori-" + Environment.get_user_name ());
+ }
+ if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "paths") == 0) {
+ stdout.printf ("config: %s\ncache: %s\nuser_data: %s\ntmp: %s\n",
+ config_dir, cache_dir, user_data_dir, tmp_dir);
+ }
+ }
+
+ public static unowned string get_config_dir () {
+ assert (config_dir != null);
+ return config_dir;
+ }
+
+ public static string get_config_filename (string filename) {
+ assert (mode != RuntimeMode.UNDEFINED);
+ assert (config_dir != null);
+ return Path.build_path (Path.DIR_SEPARATOR_S, config_dir, filename);
+ }
+
+ public static unowned string get_cache_dir () {
+ assert (cache_dir != null);
+ return cache_dir;
+ }
+
+ public static unowned string get_user_data_dir () {
+ assert (user_data_dir != null);
+ return user_data_dir;
+ }
+
+ public static unowned string get_tmp_dir () {
+ assert (tmp_dir != null);
+ return tmp_dir;
+ }
+
+ public static void init_exec_path (string[] new_command_line) {
+ assert (command_line == null);
+ command_line = new_command_line;
+ #if HAVE_WIN32
+ exec_path = win32_get_package_installation_directory_of_module ();
+ #else
+ string? executable;
+ try {
+ if (!Path.is_absolute (command_line[0])) {
+ string program = Environment.find_program_in_path (command_line[0]);
+ if (FileUtils.test (program, FileTest.IS_SYMLINK))
+ executable = FileUtils.read_link (program);
+ else
+ executable = program;
+ }
+ else
+ executable = FileUtils.read_link (command_line[0]);
+ }
+ catch (Error error) {
+ executable = command_line[0];
+ }
+
+ exec_path = File.new_for_path (executable).get_parent ().get_parent ().get_path ();
+ #endif
+ if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "paths") == 0) {
+ stdout.printf ("command_line: %s\nexec_path: %s\nres: %s\nlib: %s\n",
+ get_command_line_str (), exec_path,
+ get_res_filename (""), get_lib_path (PACKAGE_NAME));
+ }
+ }
+
+ public static unowned string[] get_command_line () {
+ assert (command_line != null);
+ return command_line;
+ }
+
+ public static string get_command_line_str () {
+ assert (command_line != null);
+ return "".joinv (" ", command_line).replace (Environment.get_home_dir (), "~");
+ }
+
+ public static string get_lib_path (string package) {
+ assert (command_line != null);
+ #if HAVE_WIN32
+ return Path.build_filename (exec_path, "lib", package);
+ #else
+ string path = Path.build_filename (exec_path, "lib", package);
+ if (Posix.access (path, Posix.F_OK) == 0)
+ return path;
+
+ if (package == PACKAGE_NAME) {
+ /* Fallback to build folder */
+ path = Path.build_filename ((File.new_for_path (exec_path).get_path ()), "extensions");
+ if (Posix.access (path, Posix.F_OK) == 0)
+ return path;
+ }
+
+ return Path.build_filename (LIBDIR, PACKAGE_NAME);
+ #endif
+ }
+
+ public static string get_res_filename (string filename) {
+ assert (command_line != null);
+ #if HAVE_WIN32
+ return Path.build_filename (exec_path, "share", PACKAGE_NAME, "res", filename);
+ #else
+ string path = Path.build_filename (exec_path, "share", PACKAGE_NAME, "res", filename);
+ if (Posix.access (path, Posix.F_OK) == 0)
+ return path;
+
+ /* Fallback to build folder */
+ path = Path.build_filename ((File.new_for_path (exec_path)
+ .get_parent ().get_parent ().get_path ()), "data", filename);
+ if (Posix.access (path, Posix.F_OK) == 0)
+ return path;
+
+ return Path.build_filename (MDATADIR, PACKAGE_NAME, "res", filename);
+ #endif
+ }
+
+ public static string get_data_filename (string filename, bool res) {
+ assert (command_line != null);
+ string res1 = res ? PACKAGE_NAME : "";
+ string res2 = res ? "res" : "";
+
+ #if HAVE_WIN32
+ return Path.build_filename (exec_path, "share", res1, res2, filename);
+ #else
+ string path = Path.build_filename (get_user_data_dir (), res1, res2, filename);
+ if (Posix.access (path, Posix.F_OK) == 0)
+ return path;
+
+ foreach (string data_dir in Environment.get_system_data_dirs ()) {
+ path = Path.build_filename (data_dir, res1, res2, filename);
+ if (Posix.access (path, Posix.F_OK) == 0)
+ return path;
+ }
+
+ return Path.build_filename (MDATADIR, res1, res2, filename);
+ #endif
+ }
+
+ public static string get_preset_filename (string? folder, string filename) {
+ assert (config_dir != null);
+
+ #if HAVE_WIN32
+ return Path.build_filename (exec_path, "etc", "xdg", PACKAGE_NAME, folder ?? "", filename);
+ #else
+ foreach (string config_dir in Environment.get_system_config_dirs ()) {
+ string path = Path.build_filename (config_dir, PACKAGE_NAME, folder ?? "", filename);
+ if (Posix.access (path, Posix.F_OK) == 0)
+ return path;
+ }
+
+ return Path.build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, folder ?? "", filename);
+ #endif
+ }
+ }
+}
diff --git a/katze/midori-uri.vala b/katze/midori-uri.vala
index 4dad32c1..05ebceab 100644
--- a/katze/midori-uri.vala
+++ b/katze/midori-uri.vala
@@ -114,12 +114,7 @@ namespace Midori {
|| (uri.has_prefix ("geo:") && uri.chr (-1, ',') != null)
|| uri.has_prefix ("javascript:"));
}
- public static bool is_email (string? uri) {
- return uri != null
- && (uri.chr (-1, '@') != null || uri.has_prefix ("mailto:"))
- /* :// and @ together would mean login credentials */
- && uri.str ("://") == null;
- }
+
public static bool is_ip_address (string? uri) {
/* Quick check for IPv4 or IPv6, no validation.
FIXME: Schemes are not handled
@@ -127,8 +122,11 @@ namespace Midori {
we'd have to separate the path from the URI first. */
if (uri == null)
return false;
+ /* Skip leading user/ password */
+ if (uri.chr (-1, '@') != null)
+ return is_ip_address (uri.split ("@")[1]);
/* IPv4 */
- if (uri[0].isdigit () && (uri.chr (4, '.') != null))
+ if (uri[0] != '0' && uri[0].isdigit () && (uri.chr (4, '.') != null))
return true;
/* IPv6 */
if (uri[0].isalnum () && uri[1].isalnum ()
@@ -142,25 +140,44 @@ namespace Midori {
&& uri.chr (-1, ' ') == null
&& (URI.is_location (uri) || uri.chr (-1, '.') != null);
}
+
+ public static string? get_folder (string uri) {
+ /* Base the start folder on the current view's uri if it is local */
+ try {
+ string? filename = Filename.from_uri (uri);
+ if (filename != null) {
+ string? dirname = Path.get_dirname (filename);
+ if (dirname != null && FileUtils.test (dirname, FileTest.IS_DIR))
+ return dirname;
+ }
+ }
+ catch (Error error) { }
+ return null;
+ }
+
public static GLib.ChecksumType get_fingerprint (string uri,
out string checksum, out string label) {
/* http://foo.bar/baz/spam.eggs#!algo!123456 */
+ unowned string display = null;
+ GLib.ChecksumType type = (GLib.ChecksumType)int.MAX;
+
unowned string delimiter = "#!md5!";
- unowned string display = _("MD5-Checksum:");
- GLib.ChecksumType type = GLib.ChecksumType.MD5;
unowned string? fragment = uri.str (delimiter);
- if (fragment == null) {
- delimiter = "#!sha1!";
+ if (fragment != null) {
+ display = _("MD5-Checksum:");
+ type = GLib.ChecksumType.MD5;
+ }
+
+ delimiter = "#!sha1!";
+ fragment = uri.str (delimiter);
+ if (fragment != null) {
display = _("SHA1-Checksum:");
type = GLib.ChecksumType.SHA1;
- fragment = uri.str (delimiter);
- }
- if (fragment == null) {
- type = (GLib.ChecksumType)int.MAX;
- display = null;
}
+ /* No SHA256: no known usage and no need for strong encryption */
+
if (&checksum != null)
checksum = fragment != null
? fragment.offset (delimiter.length) : null;
diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c
index 44fddc03..c15ac1f6 100644
--- a/midori/gtkiconentry.c
+++ b/midori/gtkiconentry.c
@@ -1,27 +1,5 @@
-/*
- * Copyright (C) 2004-2006 Christian Hammond.
- * Copyright (C) 2008 Cody Russell
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
#include "gtkiconentry.h"
-#if GTK_CHECK_VERSION (2, 16, 0)
-
void
gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry,
GtkEntryIconPosition position,
@@ -36,1895 +14,3 @@ gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry,
gtk_entry_set_icon_activatable (entry, position, activatable);
}
-#else
-
-#include
-
-#if GTK_CHECK_VERSION (2, 14, 0)
-#define _GTK_IMAGE_GICON GTK_IMAGE_GICON
-#else
-#define _GTK_IMAGE_GICON 8
-#endif
-
-#ifndef GTK_PARAM_READABLE
-#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#endif
-
-#ifndef GTK_PARAM_WRITABLE
-#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#endif
-
-#ifndef GTK_PARAM_READWRITE
-#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#endif
-
-#define P_(s) (s)
-
-#define ICON_MARGIN 2
-#define MAX_ICONS 2
-
-#define IS_VALID_ICON_ENTRY_POSITION(pos) \
- ((pos) == GTK_ICON_ENTRY_PRIMARY || \
- (pos) == GTK_ICON_ENTRY_SECONDARY)
-
-typedef struct
-{
- GdkPixbuf *pixbuf;
- gboolean highlight;
- gboolean hovered;
- GdkWindow *window;
- gchar *tooltip_text;
- GdkCursorType cursor_type;
- gboolean custom_cursor;
- GtkImageType storage_type;
- GIcon *gicon;
- gchar *icon_name;
- gboolean insensitive;
-} EntryIconInfo;
-
-struct _GtkIconEntryPrivate
-{
- gdouble fraction;
- EntryIconInfo icons[MAX_ICONS];
-
- gulong icon_released_id;
-};
-
-enum
-{
- ICON_PRESSED,
- ICON_RELEASED,
- LAST_SIGNAL
-};
-
-enum
-{
- PROP_0,
- PROP_PIXBUF_PRIMARY,
- PROP_PIXBUF_SECONDARY,
- PROP_STOCK_PRIMARY,
- PROP_STOCK_SECONDARY,
- PROP_ICON_NAME_PRIMARY,
- PROP_ICON_NAME_SECONDARY,
- PROP_GICON_PRIMARY,
- PROP_GICON_SECONDARY,
- PROP_SENSITIVITY_PRIMARY,
- PROP_SENSITIVITY_SECONDARY
-};
-
-static void gtk_icon_entry_editable_init (GtkEditableClass *iface);
-static void gtk_icon_entry_finalize (GObject *obj);
-static void gtk_icon_entry_dispose (GObject *obj);
-static void gtk_icon_entry_map (GtkWidget *widget);
-static void gtk_icon_entry_unmap (GtkWidget *widget);
-static void gtk_icon_entry_realize (GtkWidget *widget);
-static void gtk_icon_entry_unrealize (GtkWidget *widget);
-static void gtk_icon_entry_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void gtk_icon_entry_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static gint gtk_icon_entry_expose (GtkWidget *widget,
- GdkEventExpose *event);
-static gint gtk_icon_entry_enter_notify (GtkWidget *widget,
- GdkEventCrossing *event);
-static gint gtk_icon_entry_leave_notify (GtkWidget *widget,
- GdkEventCrossing *event);
-static gint gtk_icon_entry_button_press (GtkWidget *widget,
- GdkEventButton *event);
-static gint gtk_icon_entry_button_release (GtkWidget *widget,
- GdkEventButton *event);
-static void gtk_icon_entry_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void gtk_icon_entry_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void gtk_icon_entry_style_set (GtkWidget *widget,
- GtkStyle *prev_style);
-static void gtk_icon_entry_set_icon_internal (GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- GdkPixbuf *pixbuf);
-static void icon_theme_changed (GtkIconEntry *entry);
-
-
-static GtkEntryClass *parent_class = NULL;
-static guint signals[LAST_SIGNAL] = {0};
-
-G_DEFINE_TYPE_EXTENDED (GtkIconEntry, gtk_icon_entry, GTK_TYPE_ENTRY,
- 0,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
- gtk_icon_entry_editable_init));
-
-static void
-gtk_icon_entry_class_init (GtkIconEntryClass *klass)
-{
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkEntryClass *entry_class;
-
- parent_class = g_type_class_peek_parent(klass);
-
- gobject_class = G_OBJECT_CLASS(klass);
- object_class = GTK_OBJECT_CLASS(klass);
- widget_class = GTK_WIDGET_CLASS(klass);
- entry_class = GTK_ENTRY_CLASS(klass);
-
- gobject_class->finalize = gtk_icon_entry_finalize;
- gobject_class->dispose = gtk_icon_entry_dispose;
- gobject_class->set_property = gtk_icon_entry_set_property;
- gobject_class->get_property = gtk_icon_entry_get_property;
-
- widget_class->map = gtk_icon_entry_map;
- widget_class->unmap = gtk_icon_entry_unmap;
- widget_class->realize = gtk_icon_entry_realize;
- widget_class->unrealize = gtk_icon_entry_unrealize;
- widget_class->size_request = gtk_icon_entry_size_request;
- widget_class->size_allocate = gtk_icon_entry_size_allocate;
- widget_class->expose_event = gtk_icon_entry_expose;
- widget_class->enter_notify_event = gtk_icon_entry_enter_notify;
- widget_class->leave_notify_event = gtk_icon_entry_leave_notify;
- widget_class->button_press_event = gtk_icon_entry_button_press;
- widget_class->button_release_event = gtk_icon_entry_button_release;
- widget_class->style_set = gtk_icon_entry_style_set;
-
- /**
- * GtkIconEntry::icon-pressed:
- * @entry: The entry on which the signal is emitted.
- * @icon_pos: The position of the clicked icon.
- * @button: The mouse button clicked.
- *
- * The ::icon-pressed signal is emitted when an icon is clicked.
- */
- if (!(signals[ICON_PRESSED] = g_signal_lookup ("icon-pressed", GTK_TYPE_ENTRY)))
- signals[ICON_PRESSED] =
- g_signal_new ("icon-pressed",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (GtkIconEntryClass, icon_pressed),
- NULL, NULL,
- gtk_marshal_VOID__INT_INT,
- G_TYPE_NONE, 2,
- G_TYPE_INT,
- G_TYPE_INT);
-
- /**
- * GtkIconEntry::icon-release:
- * @entry: The entry on which the signal is emitted.
- * @icon_pos: The position of the clicked icon.
- * @button: The mouse button clicked.
- *
- * The ::icon-release signal is emitted on the button release from a
- * mouse click.
- */
- if (!(signals[ICON_RELEASED] = g_signal_lookup ("icon-release", GTK_TYPE_ENTRY)))
- signals[ICON_RELEASED] =
- g_signal_new ("icon-release",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (GtkIconEntryClass, icon_released),
- NULL, NULL,
- gtk_marshal_VOID__INT_INT,
- G_TYPE_NONE, 2,
- G_TYPE_INT,
- G_TYPE_INT);
-
- /**
- * GtkIconEntry:pixbuf-primary:
- *
- * An image to use as the primary icon for the entry.
- */
- g_object_class_install_property (gobject_class,
- PROP_PIXBUF_PRIMARY,
- g_param_spec_object ("pixbuf-primary",
- P_("Primary pixbuf"),
- P_("Primary pixbuf for the entry"),
- GDK_TYPE_PIXBUF,
- GTK_PARAM_READWRITE));
-
- /**
- * GtkIconEntry:pixbuf-secondary:
- *
- * An image to use as the secondary icon for the entry.
- */
- g_object_class_install_property (gobject_class,
- PROP_PIXBUF_SECONDARY,
- g_param_spec_object ("pixbuf-secondary",
- P_("Secondary pixbuf"),
- P_("Secondary pixbuf for the entry"),
- GDK_TYPE_PIXBUF,
- GTK_PARAM_READWRITE));
-
- g_object_class_install_property (gobject_class,
- PROP_STOCK_PRIMARY,
- g_param_spec_string ("stock-primary",
- P_("Primary stock ID"),
- P_("Stock ID for primary icon"),
- NULL,
- GTK_PARAM_WRITABLE));
-
- g_object_class_install_property (gobject_class,
- PROP_STOCK_SECONDARY,
- g_param_spec_string ("stock-secondary",
- P_("Secondary stock ID"),
- P_("Stock ID for secondary icon"),
- NULL,
- GTK_PARAM_WRITABLE));
-
- g_object_class_install_property (gobject_class,
- PROP_ICON_NAME_PRIMARY,
- g_param_spec_string ("icon-name-primary",
- P_("Primary icon name"),
- P_("Icon name for primary icon"),
- NULL,
- GTK_PARAM_WRITABLE));
-
- g_object_class_install_property (gobject_class,
- PROP_ICON_NAME_SECONDARY,
- g_param_spec_string ("icon-name-secondary",
- P_("Secondary icon name"),
- P_("Icon name for secondary icon"),
- NULL,
- GTK_PARAM_WRITABLE));
-
- g_object_class_install_property (gobject_class,
- PROP_GICON_PRIMARY,
- g_param_spec_object ("gicon-primary",
- P_("Primary GIcon"),
- P_("GIcon for primary icon"),
- G_TYPE_ICON,
- GTK_PARAM_READWRITE));
-
- g_object_class_install_property (gobject_class,
- PROP_GICON_SECONDARY,
- g_param_spec_object ("gicon-secondary",
- P_("Secondary GIcon"),
- P_("GIcon for secondary icon"),
- G_TYPE_ICON,
- GTK_PARAM_READWRITE));
-
- g_type_class_add_private (klass, sizeof (GtkIconEntryPrivate));
-}
-
-static void
-gtk_icon_entry_editable_init (GtkEditableClass *iface)
-{
-};
-
-/* GTK+/ GtkEntry internal helper function
- Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- Modified by the GTK+ Team and others 1997-2000
- Copied from Gtk+ 2.13, whitespace adjusted */
-static void
-gtk_entry_get_pixel_ranges (GtkEntry *entry,
- gint **ranges,
- gint *n_ranges)
-{
- gint start_char, end_char;
-
- if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry),
- &start_char, &end_char))
- {
- PangoLayout *layout = gtk_entry_get_layout (entry);
- PangoLayoutLine *line = pango_layout_get_lines (layout)->data;
- const char *text = pango_layout_get_text (layout);
- gsize start_index = g_utf8_offset_to_pointer (text, start_char) - text;
- gsize end_index = g_utf8_offset_to_pointer (text, end_char) - text;
- gint real_n_ranges, i;
-
- pango_layout_line_get_x_ranges (line,
- start_index, end_index, ranges, &real_n_ranges);
-
- if (ranges)
- {
- gint *r = *ranges;
-
- for (i = 0; i < real_n_ranges; ++i)
- {
- r[2 * i + 1] = (r[2 * i + 1] - r[2 * i]) / PANGO_SCALE;
- r[2 * i] = r[2 * i] / PANGO_SCALE;
- }
- }
-
- if (n_ranges)
- *n_ranges = real_n_ranges;
- }
- else
- {
- if (n_ranges)
- *n_ranges = 0;
- if (ranges)
- *ranges = NULL;
- }
-}
-
-/* GTK+/ GtkEntry internal helper function
- Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- Modified by the GTK+ Team and others 1997-2000
- Copied from Gtk+ 2.13, whitespace adjusted
- Code adjusted to not rely on internal qdata */
-static void
-_gtk_entry_effective_inner_border (GtkEntry *entry,
- GtkBorder *border)
-{
- static const GtkBorder default_inner_border = { 2, 2, 2, 2 };
- GtkBorder *tmp_border;
-
- tmp_border = (GtkBorder*) gtk_entry_get_inner_border (entry);
-
- if (tmp_border)
- {
- *border = *tmp_border;
- return;
- }
-
- gtk_widget_style_get (GTK_WIDGET (entry), "inner-border", &tmp_border, NULL);
-
- if (tmp_border)
- {
- *border = *tmp_border;
- gtk_border_free (tmp_border);
- return;
- }
-
- *border = default_inner_border;
-}
-
-static void
-gtk_entry_borders (GtkEntry* entry,
- gint* xborder,
- gint* yborder,
- gboolean* interior_focus,
- gint* focus_width)
-{
- GtkWidget *widget = GTK_WIDGET (entry);
-
- if (entry->has_frame)
- {
- *xborder = widget->style->xthickness;
- *yborder = widget->style->ythickness;
- }
- else
- {
- *xborder = 0;
- *yborder = 0;
- }
-
- gtk_widget_style_get (widget, "interior-focus", interior_focus,
- "focus-line-width", focus_width, NULL);
-
- if (interior_focus)
- {
- *xborder += *focus_width;
- *yborder += *focus_width;
- }
-}
-
-/* GTK+/ GtkEntry internal helper function
- Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- Modified by the GTK+ Team and others 1997-2000
- Copied from Gtk+ 2.13, whitespace adjusted */
-static void
-gtk_entry_get_text_area_size (GtkEntry *entry,
- gint *x,
- gint *y,
- gint *width,
- gint *height)
-{
- gint frame_height;
- gint xborder, yborder;
- gboolean interior_focus;
- gint focus_width;
- GtkRequisition requisition;
- GtkWidget *widget = GTK_WIDGET (entry);
-
- gtk_widget_get_child_requisition (widget, &requisition);
- gtk_entry_borders (entry, &xborder, &yborder, &interior_focus, &focus_width);
-
- if (GTK_WIDGET_REALIZED (widget))
- gdk_drawable_get_size (widget->window, NULL, &frame_height);
- else
- frame_height = requisition.height;
-
- if (GTK_WIDGET_HAS_FOCUS (widget) && interior_focus)
- frame_height -= 2 * focus_width;
-
- if (x)
- *x = xborder;
-
- if (y)
- *y = frame_height / 2 - (requisition.height - yborder * 2) / 2;
-
- if (width)
- *width = GTK_WIDGET (entry)->allocation.width - xborder * 2;
-
- if (height)
- *height = requisition.height - yborder * 2;
-}
-
-/* GTK+/ GtkEntry internal helper function
- Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- Modified by the GTK+ Team and others 1997-2000
- Copied from Gtk+ 2.13, whitespace adjusted */
-static void
-get_layout_position (GtkEntry *entry,
- gint *x,
- gint *y)
-{
- PangoLayout *layout;
- PangoRectangle logical_rect;
- gint area_width, area_height;
- GtkBorder inner_border;
- gint y_pos;
- PangoLayoutLine *line;
-
- layout = gtk_entry_get_layout (entry);
-
- gtk_entry_get_text_area_size (entry, NULL, NULL, &area_width, &area_height);
- _gtk_entry_effective_inner_border (entry, &inner_border);
-
- area_height = PANGO_SCALE *
- (area_height - inner_border.top - inner_border.bottom);
-
- line = pango_layout_get_lines (layout)->data;
- pango_layout_line_get_extents (line, NULL, &logical_rect);
-
- /* Align primarily for locale's ascent/descent */
- y_pos = ((area_height - entry->ascent - entry->descent) / 2 +
- entry->ascent + logical_rect.y);
-
- /* Now see if we need to adjust to fit in actual drawn string */
- if (logical_rect.height > area_height)
- y_pos = (area_height - logical_rect.height) / 2;
- else if (y_pos < 0)
- y_pos = 0;
- else if (y_pos + logical_rect.height > area_height)
- y_pos = area_height - logical_rect.height;
-
- y_pos = inner_border.top + y_pos / PANGO_SCALE;
-
- if (x)
- *x = inner_border.left - entry->scroll_offset;
-
- if (y)
- *y = y_pos;
-}
-
-/* GTK+/ GtkEntry internal helper function
- Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- Modified by the GTK+ Team and others 1997-2000
- Copied from Gtk+ 2.13, whitespace adjusted
- Code adjusted to not rely on internal _gtk_entry_ensure_layout */
-static void
-gtk_entry_draw_text (GtkEntry *entry)
-{
- GtkWidget *widget;
-
- if (!entry->visible && entry->invisible_char == 0)
- return;
-
- if (GTK_WIDGET_DRAWABLE (entry))
- {
- PangoLayout *layout = gtk_entry_get_layout (entry);
- cairo_t *cr;
- gint x, y;
- gint start_pos, end_pos;
-
- widget = GTK_WIDGET (entry);
-
- get_layout_position (entry, &x, &y);
-
- cr = gdk_cairo_create (entry->text_area);
-
- cairo_move_to (cr, x, y);
- gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]);
- pango_cairo_show_layout (cr, layout);
-
- if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry),
- &start_pos, &end_pos))
- {
- gint *ranges;
- gint n_ranges, i;
- PangoRectangle logical_rect;
- GdkColor *selection_color, *text_color;
- GtkBorder inner_border;
-
- pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
- gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges);
-
- if (GTK_WIDGET_HAS_FOCUS (entry))
- {
- selection_color = &widget->style->base [GTK_STATE_SELECTED];
- text_color = &widget->style->text [GTK_STATE_SELECTED];
- }
- else
- {
- selection_color = &widget->style->base [GTK_STATE_ACTIVE];
- text_color = &widget->style->text [GTK_STATE_ACTIVE];
- }
-
- _gtk_entry_effective_inner_border (entry, &inner_border);
-
- for (i = 0; i < n_ranges; ++i)
- cairo_rectangle (cr,
- inner_border.left -
- entry->scroll_offset + ranges[2 * i],
- y,
- ranges[2 * i + 1],
- logical_rect.height);
-
- cairo_clip (cr);
-
- gdk_cairo_set_source_color (cr, selection_color);
- cairo_paint (cr);
-
- cairo_move_to (cr, x, y);
- gdk_cairo_set_source_color (cr, text_color);
- pango_cairo_show_layout (cr, layout);
-
- g_free (ranges);
- }
-
- cairo_destroy (cr);
- }
-}
-
-static gboolean
-entry_expose_event (GtkWidget* entry,
- GdkEventExpose* event,
- GtkIconEntry* icon_entry)
-{
- GtkIconEntryPrivate *priv;
- GdkWindow* text_area;
- gint width, height;
-
- priv = icon_entry->priv;
- text_area = GTK_ENTRY (entry)->text_area;
- gdk_drawable_get_size (text_area, &width, &height);
-
- if (priv->fraction > 0.0)
- {
- gtk_paint_box (entry->style, text_area,
- GTK_STATE_SELECTED, GTK_SHADOW_OUT,
- &event->area, entry, "entry-progress",
- 0, 0, priv->fraction * width, height);
- gtk_entry_draw_text (GTK_ENTRY (entry));
- }
- return FALSE;
-}
-
-static void
-gtk_icon_entry_init (GtkIconEntry *entry)
-{
- entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (entry, GTK_TYPE_ICON_ENTRY,
- GtkIconEntryPrivate);
-
- g_signal_connect_after (entry, "expose-event",
- G_CALLBACK (entry_expose_event), entry);
-}
-
-static void
-gtk_icon_entry_finalize (GObject *obj)
-{
- GtkIconEntry *entry;
-
- g_return_if_fail (obj != NULL);
- g_return_if_fail (GTK_IS_ICON_ENTRY(obj));
-
- entry = GTK_ICON_ENTRY (obj);
-
- G_OBJECT_CLASS (parent_class)->finalize (obj);
-}
-
-static void
-gtk_icon_entry_dispose (GObject *obj)
-{
- GtkIconEntry *entry;
-
- entry = GTK_ICON_ENTRY (obj);
-
- gtk_icon_entry_set_icon_from_pixbuf (entry, GTK_ICON_ENTRY_PRIMARY, NULL);
- gtk_icon_entry_set_icon_from_pixbuf (entry, GTK_ICON_ENTRY_SECONDARY, NULL);
-
- G_OBJECT_CLASS (parent_class)->dispose (obj);
-}
-
-static void
-gtk_icon_entry_map (GtkWidget *widget)
-{
- GtkIconEntryPrivate *priv;
- GdkCursor *cursor;
-
- if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget))
- {
- int i;
-
- GTK_WIDGET_CLASS (parent_class)->map (widget);
-
- priv = GTK_ICON_ENTRY (widget)->priv;
-
- for (i = 0; i < MAX_ICONS; i++)
- {
- if (priv->icons[i].pixbuf != NULL)
- gdk_window_show (priv->icons[i].window);
-
- if (priv->icons[i].custom_cursor == TRUE && !priv->icons[i].insensitive)
- {
- cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
- priv->icons[i].cursor_type);
-
- gdk_window_set_cursor (priv->icons[i].window, cursor);
- gdk_cursor_unref (cursor);
- }
- }
-
- GTK_WIDGET_CLASS (parent_class)->map (widget);
- }
-}
-
-static void
-gtk_icon_entry_unmap (GtkWidget *widget)
-{
- GtkIconEntryPrivate *priv;
-
- if (GTK_WIDGET_MAPPED (widget))
- {
- int i;
-
- priv = GTK_ICON_ENTRY (widget)->priv;
-
- for (i = 0; i < MAX_ICONS; i++)
- {
- if (priv->icons[i].pixbuf != NULL)
- {
- gdk_window_hide (priv->icons[i].window);
- }
- }
-
- GTK_WIDGET_CLASS (parent_class)->unmap (widget);
- }
-}
-
-static void
-gtk_icon_entry_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- GtkIconEntry *entry = GTK_ICON_ENTRY (object);
-
- switch (prop_id)
- {
- case PROP_PIXBUF_PRIMARY:
- gtk_icon_entry_set_icon_from_pixbuf (entry,
- GTK_ICON_ENTRY_PRIMARY,
- g_value_get_object (value));
- break;
-
- case PROP_PIXBUF_SECONDARY:
- gtk_icon_entry_set_icon_from_pixbuf (entry,
- GTK_ICON_ENTRY_SECONDARY,
- g_value_get_object (value));
- break;
-
- case PROP_STOCK_PRIMARY:
- gtk_icon_entry_set_icon_from_stock (entry,
- GTK_ICON_ENTRY_PRIMARY,
- g_value_get_string (value));
- break;
-
- case PROP_STOCK_SECONDARY:
- gtk_icon_entry_set_icon_from_stock (entry,
- GTK_ICON_ENTRY_SECONDARY,
- g_value_get_string (value));
- break;
-
- case PROP_ICON_NAME_PRIMARY:
- gtk_icon_entry_set_icon_from_icon_name (entry,
- GTK_ICON_ENTRY_PRIMARY,
- g_value_get_string (value));
- break;
-
- case PROP_ICON_NAME_SECONDARY:
- gtk_icon_entry_set_icon_from_icon_name (entry,
- GTK_ICON_ENTRY_SECONDARY,
- g_value_get_string (value));
- break;
-
- case PROP_GICON_PRIMARY:
- gtk_icon_entry_set_icon_from_gicon (entry,
- GTK_ICON_ENTRY_PRIMARY,
- g_value_get_object (value));
- break;
-
- case PROP_GICON_SECONDARY:
- gtk_icon_entry_set_icon_from_gicon (entry,
- GTK_ICON_ENTRY_SECONDARY,
- g_value_get_object (value));
- break;
- }
-}
-
-static void
-gtk_icon_entry_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- GtkIconEntry *entry = GTK_ICON_ENTRY (object);
-
- switch (prop_id)
- {
- case PROP_PIXBUF_PRIMARY:
- g_value_set_object (value,
- gtk_icon_entry_get_pixbuf (entry,
- GTK_ICON_ENTRY_PRIMARY));
- break;
-
- case PROP_PIXBUF_SECONDARY:
- g_value_set_object (value,
- gtk_icon_entry_get_pixbuf (entry,
- GTK_ICON_ENTRY_SECONDARY));
- break;
-
- case PROP_GICON_PRIMARY:
- g_value_set_object (value,
- gtk_icon_entry_get_gicon (entry,
- GTK_ICON_ENTRY_PRIMARY));
- break;
-
- case PROP_GICON_SECONDARY:
- g_value_set_object (value,
- gtk_icon_entry_get_gicon (entry,
- GTK_ICON_ENTRY_SECONDARY));
- }
-}
-
-static gint
-get_icon_width (GtkIconEntry *entry, GtkIconEntryPosition icon_pos)
-{
- gint menu_icon_width;
- gint width;
- GtkIconEntryPrivate *priv;
- EntryIconInfo *icon_info;
-
- priv = entry->priv;
- icon_info = &priv->icons[icon_pos];
-
- if (icon_info->pixbuf == NULL)
- return 0;
-
- gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &menu_icon_width, NULL);
-
- width = MAX (gdk_pixbuf_get_width (icon_info->pixbuf), menu_icon_width);
-
- return width;
-}
-
-static void
-get_borders (GtkIconEntry *entry, gint *xborder, gint *yborder)
-{
- GtkWidget *widget = GTK_WIDGET (entry);
- gint focus_width;
- gboolean interior_focus;
-
- gtk_widget_style_get (widget,
- "interior-focus", &interior_focus,
- "focus-line-width", &focus_width,
- NULL);
-
- if (gtk_entry_get_has_frame (GTK_ENTRY (entry)))
- {
- *xborder = widget->style->xthickness;
- *yborder = widget->style->ythickness;
- }
- else
- {
- *xborder = 0;
- *yborder = 0;
- }
-
- if (!interior_focus)
- {
- *xborder += focus_width;
- *yborder += focus_width;
- }
-}
-
-static void
-get_text_area_size (GtkIconEntry *entry, GtkAllocation *alloc)
-{
- GtkWidget *widget = GTK_WIDGET (entry);
- GtkRequisition requisition;
- gint xborder, yborder;
-
- gtk_widget_get_child_requisition (widget, &requisition);
- get_borders (entry, &xborder, &yborder);
-
- alloc->x = xborder;
- alloc->y = yborder;
- alloc->width = widget->allocation.width - xborder * 2;
- alloc->height = requisition.height - yborder * 2;
-}
-
-static void
-get_icon_allocation (GtkIconEntry *icon_entry,
- gboolean left,
- GtkAllocation *widget_alloc,
- GtkAllocation *text_area_alloc,
- GtkAllocation *allocation,
- GtkIconEntryPosition *icon_pos)
-{
- gboolean rtl;
-
- rtl = (gtk_widget_get_direction (GTK_WIDGET (icon_entry)) ==
- GTK_TEXT_DIR_RTL);
-
- if (left)
- *icon_pos = (rtl ? GTK_ICON_ENTRY_SECONDARY : GTK_ICON_ENTRY_PRIMARY);
- else
- *icon_pos = (rtl ? GTK_ICON_ENTRY_PRIMARY : GTK_ICON_ENTRY_SECONDARY);
-
- allocation->y = text_area_alloc->y;
- allocation->width = get_icon_width(icon_entry, *icon_pos);
- allocation->height = text_area_alloc->height;
-
- if (left)
- {
- allocation->x = text_area_alloc->x + ICON_MARGIN;
- }
- else
- {
- allocation->x = text_area_alloc->x + text_area_alloc->width -
- allocation->width - ICON_MARGIN;
- }
-}
-
-static void
-gtk_icon_entry_realize (GtkWidget *widget)
-{
- GtkIconEntry *entry;
- GtkIconEntryPrivate *priv;
- GdkWindowAttr attributes;
- gint attributes_mask;
- int i;
-
- entry = GTK_ICON_ENTRY (widget);
- priv = entry->priv;
-
- GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
- attributes.x = 0;
- attributes.y = 0;
- attributes.width = 1;
- attributes.height = 1;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
- attributes.event_mask = gtk_widget_get_events (widget);
- attributes.event_mask |=
- (GDK_EXPOSURE_MASK
- | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
-
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-
- for (i = 0; i < MAX_ICONS; i++)
- {
- EntryIconInfo *icon_info;
-
- icon_info = &priv->icons[i];
- icon_info->window = gdk_window_new (widget->window, &attributes,
- attributes_mask);
- gdk_window_set_user_data (icon_info->window, widget);
-
- gdk_window_set_background (icon_info->window,
- &widget->style->base[GTK_WIDGET_STATE(widget)]);
- }
-
- gtk_widget_queue_resize (widget);
-}
-
-static void
-gtk_icon_entry_unrealize (GtkWidget *widget)
-{
- GtkIconEntry *entry;
- GtkIconEntryPrivate *priv;
- int i;
-
- entry = GTK_ICON_ENTRY (widget);
- priv = entry->priv;
-
- GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
-
- for (i = 0; i < MAX_ICONS; i++)
- {
- EntryIconInfo *icon_info = &priv->icons[i];
-
- gdk_window_destroy (icon_info->window);
- icon_info->window = NULL;
- }
-}
-
-static void
-gtk_icon_entry_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
- GtkEntry *gtkentry;
- GtkIconEntry *entry;
- gint icon_widths = 0;
- int i;
-
- gtkentry = GTK_ENTRY(widget);
- entry = GTK_ICON_ENTRY(widget);
-
- for (i = 0; i < MAX_ICONS; i++)
- {
- int icon_width = get_icon_width (entry, i);
-
- if (icon_width > 0)
- {
- icon_widths += icon_width + ICON_MARGIN;
- }
- }
-
- GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition);
-
- if (icon_widths > requisition->width)
- requisition->width += icon_widths;
-}
-
-static void
-place_windows (GtkIconEntry *icon_entry, GtkAllocation *widget_alloc)
-{
- GtkIconEntryPosition left_icon_pos;
- GtkIconEntryPosition right_icon_pos;
- GtkAllocation left_icon_alloc;
- GtkAllocation right_icon_alloc;
- GtkAllocation text_area_alloc;
- GtkIconEntryPrivate *priv;
- gint y;
-
- priv = icon_entry->priv;
-
- get_text_area_size (icon_entry, &text_area_alloc);
-
- /* DJW center text/icon
- * TODO flicker needs to be eliminated
- */
- gdk_window_get_geometry (GTK_ENTRY (icon_entry)->text_area, NULL, &y, NULL, NULL, NULL);
- text_area_alloc.y = y;
-
- get_icon_allocation (icon_entry, TRUE, widget_alloc, &text_area_alloc,
- &left_icon_alloc, &left_icon_pos);
- get_icon_allocation (icon_entry, FALSE, widget_alloc, &text_area_alloc,
- &right_icon_alloc, &right_icon_pos);
-
- if (left_icon_alloc.width > 0)
- {
- text_area_alloc.x = left_icon_alloc.x + left_icon_alloc.width + ICON_MARGIN;
- }
-
- if (right_icon_alloc.width > 0)
- {
- text_area_alloc.width -= right_icon_alloc.width + ICON_MARGIN;
- }
-
- text_area_alloc.width -= text_area_alloc.x;
-
- gdk_window_move_resize (priv->icons[left_icon_pos].window,
- left_icon_alloc.x, left_icon_alloc.y,
- left_icon_alloc.width, left_icon_alloc.height);
-
- gdk_window_move_resize (priv->icons[right_icon_pos].window,
- right_icon_alloc.x, right_icon_alloc.y,
- right_icon_alloc.width, right_icon_alloc.height);
-
- gdk_window_move_resize (GTK_ENTRY (icon_entry)->text_area,
- text_area_alloc.x, text_area_alloc.y,
- text_area_alloc.width, text_area_alloc.height);
-}
-
-static void
-gtk_icon_entry_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
- g_return_if_fail (GTK_IS_ICON_ENTRY(widget));
- g_return_if_fail (allocation != NULL);
-
- widget->allocation = *allocation;
-
- GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
-
- if (GTK_WIDGET_REALIZED (widget))
- place_windows (GTK_ICON_ENTRY (widget), allocation);
-}
-
-static GdkPixbuf *
-get_pixbuf_from_icon (GtkIconEntry *entry, GtkIconEntryPosition icon_pos)
-{
- EntryIconInfo *icon_info;
- GtkIconEntryPrivate *priv;
-
- priv = entry->priv;
- icon_info = &priv->icons[icon_pos];
-
- g_object_ref (icon_info->pixbuf);
-
- return icon_info->pixbuf;
-}
-
-/* Kudos to the gnome-panel guys. */
-static void
-colorshift_pixbuf (GdkPixbuf *dest, GdkPixbuf *src, int shift)
-{
- gint i, j;
- gint width, height, has_alpha, src_rowstride, dest_rowstride;
- guchar *target_pixels;
- guchar *original_pixels;
- guchar *pix_src;
- guchar *pix_dest;
- int val;
- guchar r, g, b;
-
- has_alpha = gdk_pixbuf_get_has_alpha (src);
- width = gdk_pixbuf_get_width (src);
- height = gdk_pixbuf_get_height (src);
- src_rowstride = gdk_pixbuf_get_rowstride (src);
- dest_rowstride = gdk_pixbuf_get_rowstride (dest);
- original_pixels = gdk_pixbuf_get_pixels (src);
- target_pixels = gdk_pixbuf_get_pixels (dest);
-
- for (i = 0; i < height; i++)
- {
- pix_dest = target_pixels + i * dest_rowstride;
- pix_src = original_pixels + i * src_rowstride;
-
- for (j = 0; j < width; j++)
- {
- r = *(pix_src++);
- g = *(pix_src++);
- b = *(pix_src++);
-
- val = r + shift;
- *(pix_dest++) = CLAMP(val, 0, 255);
-
- val = g + shift;
- *(pix_dest++) = CLAMP(val, 0, 255);
-
- val = b + shift;
- *(pix_dest++) = CLAMP(val, 0, 255);
-
- if (has_alpha)
- *(pix_dest++) = *(pix_src++);
- }
- }
-}
-
-static void
-draw_icon (GtkWidget *widget, GtkIconEntryPosition icon_pos)
-{
- GtkIconEntry *entry;
- GtkIconEntryPrivate *priv;
- EntryIconInfo *icon_info;
- GdkPixbuf *pixbuf;
- gint x, y, width, height;
-
- entry = GTK_ICON_ENTRY (widget);
- priv = entry->priv;
- icon_info = &priv->icons[icon_pos];
-
- if (icon_info->pixbuf == NULL || !GTK_WIDGET_REALIZED (widget))
- return;
-
- if ((pixbuf = get_pixbuf_from_icon (entry, icon_pos)) == NULL)
- return;
-
- gdk_drawable_get_size (icon_info->window, &width, &height);
-
- if (width == 1 || height == 1)
- {
- /*
- * size_allocate hasn't been called yet. These are the default values.
- */
- return;
- }
-
- if (gdk_pixbuf_get_height (pixbuf) > height)
- {
- GdkPixbuf *temp_pixbuf;
- int scale;
-
- scale = height - (2 * ICON_MARGIN);
-
- temp_pixbuf = gdk_pixbuf_scale_simple (pixbuf, scale, scale,
- GDK_INTERP_BILINEAR);
-
- g_object_unref (pixbuf);
-
- pixbuf = temp_pixbuf;
- }
-
- x = (width - gdk_pixbuf_get_width(pixbuf)) / 2;
- y = (height - gdk_pixbuf_get_height(pixbuf)) / 2;
-
- if (icon_info->insensitive)
- {
- GdkPixbuf *temp_pixbuf;
-
- temp_pixbuf = gdk_pixbuf_copy (pixbuf);
-
- gdk_pixbuf_saturate_and_pixelate (pixbuf,
- temp_pixbuf,
- 0.8f,
- TRUE);
- g_object_unref (pixbuf);
- pixbuf = temp_pixbuf;
- }
- else if (icon_info->hovered)
- {
- GdkPixbuf *temp_pixbuf;
-
- temp_pixbuf = gdk_pixbuf_copy (pixbuf);
-
- colorshift_pixbuf (temp_pixbuf, pixbuf, 30);
-
- g_object_unref (pixbuf);
-
- pixbuf = temp_pixbuf;
- }
-
- gdk_draw_pixbuf (icon_info->window, widget->style->black_gc, pixbuf,
- 0, 0, x, y, -1, -1,
- GDK_RGB_DITHER_NORMAL, 0, 0);
-
- g_object_unref (pixbuf);
-}
-
-static gint
-gtk_icon_entry_expose (GtkWidget *widget, GdkEventExpose *event)
-{
- GtkIconEntry *entry;
- GtkIconEntryPrivate *priv;
-
- g_return_val_if_fail (GTK_IS_ICON_ENTRY (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- entry = GTK_ICON_ENTRY (widget);
- priv = entry->priv;
-
- if (GTK_WIDGET_DRAWABLE (widget))
- {
- gboolean found = FALSE;
- int i;
-
- for (i = 0; i < MAX_ICONS && !found; i++)
- {
- EntryIconInfo *icon_info = &priv->icons[i];
-
- if (event->window == icon_info->window)
- {
- gint width;
- GtkAllocation text_area_alloc;
-
- get_text_area_size (entry, &text_area_alloc);
- gdk_drawable_get_size (icon_info->window, &width, NULL);
-
- gtk_paint_flat_box (widget->style, icon_info->window,
- GTK_WIDGET_STATE (widget), GTK_SHADOW_NONE,
- NULL, widget, "entry_bg",
- 0, 0, width, text_area_alloc.height);
-
- draw_icon (widget, i);
-
- found = TRUE;
- }
- }
-
- if (!found)
- GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
- }
-
- return FALSE;
-}
-
-static gint
-gtk_icon_entry_enter_notify (GtkWidget *widget, GdkEventCrossing *event)
-{
- GtkIconEntry *entry;
- GtkIconEntryPrivate *priv;
- int i;
-
- entry = GTK_ICON_ENTRY (widget);
- priv = entry->priv;
-
- for (i = 0; i < MAX_ICONS; i++)
- {
- if (event->window == priv->icons[i].window)
- {
- if (gtk_icon_entry_get_icon_highlight (entry, i))
- {
- priv->icons[i].hovered = TRUE;
-
- if (priv->icons[i].tooltip_text != NULL)
- {
- gtk_widget_set_tooltip_text (widget,
- priv->icons[i].tooltip_text);
- gtk_widget_set_has_tooltip (widget, TRUE);
- } else {
- gtk_widget_set_has_tooltip (widget, FALSE);
- }
-
- gtk_widget_queue_draw (widget);
-
- break;
- }
- }
- }
-
- return FALSE;
-}
-
-static gint
-gtk_icon_entry_leave_notify (GtkWidget *widget, GdkEventCrossing *event)
-{
- GtkIconEntry *entry;
- GtkIconEntryPrivate *priv;
- int i;
-
- entry = GTK_ICON_ENTRY (widget);
- priv = entry->priv;
-
- for (i = 0; i < MAX_ICONS; i++)
- {
- if (event->window == priv->icons[i].window)
- {
- if (gtk_icon_entry_get_icon_highlight (entry, i))
- {
- priv->icons[i].hovered = FALSE;
-
- gtk_widget_set_has_tooltip (widget, FALSE);
- gtk_widget_queue_draw (widget);
-
- break;
- }
- }
- }
-
- return FALSE;
-}
-
-static gint
-gtk_icon_entry_button_press (GtkWidget *widget, GdkEventButton *event)
-{
- GtkIconEntry *entry;
- GtkIconEntryPrivate *priv;
- int i;
-
- entry = GTK_ICON_ENTRY (widget);
- priv = entry->priv;
-
- for (i = 0; i < MAX_ICONS; i++)
- {
- if (event->window == priv->icons[i].window)
- {
- if (event->button == 1 && gtk_icon_entry_get_icon_highlight (entry, i))
- {
- priv->icons[i].hovered = FALSE;
-
- gtk_widget_queue_draw (widget);
- }
-
- g_signal_emit (entry, signals[ICON_PRESSED], 0, i, event->button);
-
- return TRUE;
- }
- }
-
- if (GTK_WIDGET_CLASS (parent_class)->button_press_event)
- return GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, event);
-
- return FALSE;
-}
-
-static gint
-gtk_icon_entry_button_release (GtkWidget *widget, GdkEventButton *event)
-{
- GtkIconEntry *entry;
- GtkIconEntryPrivate *priv;
- int i;
-
- entry = GTK_ICON_ENTRY (widget);
- priv = entry->priv;
-
- for (i = 0; i < MAX_ICONS; i++)
- {
- GdkWindow *icon_window = priv->icons[i].window;
-
- if (event->window == icon_window)
- {
- int width, height;
- gdk_drawable_get_size (icon_window, &width, &height);
-
- if (event->button == 1 &&
- gtk_icon_entry_get_icon_highlight (entry, i) &&
- event->x >= 0 && event->y >= 0 &&
- event->x <= width && event->y <= height)
- {
- priv->icons[i].hovered = TRUE;
-
- gtk_widget_queue_draw (widget);
- }
-
- g_signal_emit (entry, signals[ICON_RELEASED], 0, i, event->button);
-
- return TRUE;
- }
- }
-
- if (GTK_WIDGET_CLASS (parent_class)->button_release_event)
- return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
-
- return FALSE;
-}
-
-static void
-gtk_icon_entry_style_set (GtkWidget *widget, GtkStyle *prev_style)
-{
- GtkIconEntry *icon_entry;
-
- icon_entry = GTK_ICON_ENTRY (widget);
-
- if (GTK_WIDGET_CLASS (gtk_icon_entry_parent_class)->style_set)
- GTK_WIDGET_CLASS (gtk_icon_entry_parent_class)->style_set (widget, prev_style);
-
- icon_theme_changed (icon_entry);
-}
-
-static void
-icon_theme_changed (GtkIconEntry *entry)
-{
- GtkIconEntryPrivate *priv;
- int i;
-
- priv = entry->priv;
-
- for (i = 0; i < MAX_ICONS; i++)
- {
- if (priv->icons[i].storage_type == GTK_IMAGE_ICON_NAME)
- {
- g_object_unref (priv->icons[i].pixbuf);
- priv->icons[i].pixbuf = NULL;
-
- gtk_icon_entry_set_icon_from_icon_name (entry, i, priv->icons[i].icon_name);
- }
- else if (priv->icons[i].storage_type == _GTK_IMAGE_GICON)
- {
- g_object_unref (priv->icons[i].pixbuf);
- priv->icons[i].pixbuf = NULL;
-
- gtk_icon_entry_set_icon_from_gicon (entry, i, priv->icons[i].gicon);
- }
- }
-
- gtk_widget_queue_draw (GTK_WIDGET (entry));
-}
-
-static void
-gtk_icon_entry_set_icon_internal (GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- GdkPixbuf *pixbuf)
-{
- EntryIconInfo *icon_info;
- GtkIconEntryPrivate *priv;
-
- g_return_if_fail (entry != NULL);
- g_return_if_fail (GTK_IS_ICON_ENTRY (entry));
- g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos));
-
- priv = entry->priv;
- icon_info = &priv->icons[icon_pos];
-
- if (pixbuf == icon_info->pixbuf)
- return;
-
- if (icon_pos == GTK_ICON_ENTRY_SECONDARY &&
- priv->icon_released_id != 0)
- {
- g_signal_handler_disconnect (entry, priv->icon_released_id);
- priv->icon_released_id = 0;
- }
-
- if (pixbuf == NULL)
- {
- if (icon_info->pixbuf != NULL)
- {
- g_object_unref (icon_info->pixbuf);
- icon_info->pixbuf = NULL;
-
- /* Explicitly check, as the pointer may become invalidated
- * during destruction.
- */
- if (icon_info->window != NULL && GDK_IS_WINDOW (icon_info->window))
- gdk_window_hide (icon_info->window);
- }
- }
- else
- {
- if (icon_info->window != NULL && icon_info->pixbuf == NULL)
- gdk_window_show (icon_info->window);
-
- icon_info->pixbuf = pixbuf;
- g_object_ref (pixbuf);
- }
-
- gtk_widget_queue_draw (GTK_WIDGET (entry));
-}
-
-/**
- * gtk_icon_entry_new
- *
- * Creates a new GtkIconEntry widget.
- *
- * Returns a new #GtkIconEntry.
- */
-GtkWidget *
-gtk_icon_entry_new (void)
-{
- return GTK_WIDGET (g_object_new (GTK_TYPE_ICON_ENTRY, NULL));
-}
-
-/**
- * gtk_icon_entry_set_icon_from_pixbuf
- * @entry: A #GtkIconEntry.
- * @position: Icon position.
- * @pixbuf: A #GdkPixbuf.
- *
- * Sets the icon shown in the specified position using a pixbuf.
- */
-void
-gtk_icon_entry_set_icon_from_pixbuf (GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- GdkPixbuf *pixbuf)
-{
- EntryIconInfo *icon_info;
- GtkIconEntryPrivate *priv;
-
- g_return_if_fail (entry != NULL);
- g_return_if_fail (GTK_IS_ICON_ENTRY (entry));
- g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos));
-
- priv = entry->priv;
- icon_info = &priv->icons[icon_pos];
-
- if (pixbuf == icon_info->pixbuf)
- return;
-
- if (icon_pos == GTK_ICON_ENTRY_SECONDARY &&
- priv->icon_released_id != 0)
- {
- g_signal_handler_disconnect (entry, priv->icon_released_id);
- priv->icon_released_id = 0;
- }
-
- if (pixbuf == NULL)
- {
- if (icon_info->pixbuf != NULL)
- {
- g_object_unref (icon_info->pixbuf);
- icon_info->pixbuf = NULL;
-
- /* Explicitly check, as the pointer may become invalidated
- * during destruction.
- */
- if (icon_info->window != NULL && GDK_IS_WINDOW (icon_info->window))
- gdk_window_hide (icon_info->window);
- }
- }
- else
- {
- if (icon_info->window != NULL && icon_info->pixbuf == NULL)
- gdk_window_show (icon_info->window);
-
- icon_info->pixbuf = pixbuf;
- g_object_ref (pixbuf);
- }
-
- gtk_widget_queue_draw (GTK_WIDGET (entry));
-}
-
-/**
- * gtk_icon_entry_set_icon_from_stock
- * @entry: A #GtkIconEntry.
- * @position: Icon position.
- * @stock_id: The name of the stock item.
- *
- * Sets the icon shown in the entry at the specified position from a stock image.
- */
-void
-gtk_icon_entry_set_icon_from_stock (GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- const gchar *stock_id)
-{
- GdkPixbuf *pixbuf;
-
- /* FIXME: Due to a bug in GtkIconEntry we need to set a non-NULL icon */
- if (! stock_id)
- stock_id = GTK_STOCK_INFO;
-
- pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
- stock_id,
- GTK_ICON_SIZE_MENU,
- NULL);
-
- gtk_icon_entry_set_icon_internal (entry,
- icon_pos,
- pixbuf);
-}
-
-/**
- * gtk_icon_entry_set_icon_from_icon_name
- * @entry: A #GtkIconEntry;
- * @icon_pos: The position at which to set the icon
- * @icon_name: An icon name
- *
- * Sets the icon shown in the entry at the specified position from the current
- * icon theme. If the icon name isn't known, a "broken image" icon will be
- * displayed instead. If the current icon theme is changed, the icon will be
- * updated appropriately.
- */
-void
-gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- const gchar *icon_name)
-{
- GdkPixbuf *pixbuf = NULL;
- EntryIconInfo *icon_info;
- GtkIconEntryPrivate *priv;
- GdkScreen *screen;
- GtkIconTheme *icon_theme;
- GtkSettings *settings;
- gint width, height;
- GError *error = NULL;
-
- g_return_if_fail (entry != NULL);
- g_return_if_fail (GTK_IS_ICON_ENTRY (entry));
- g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos));
-
- priv = entry->priv;
- icon_info = &priv->icons[icon_pos];
-
- screen = gtk_widget_get_screen (GTK_WIDGET (entry));
- icon_theme = gtk_icon_theme_get_for_screen (screen);
- settings = gtk_settings_get_for_screen (screen);
-
- if (icon_name != NULL)
- {
- gtk_icon_size_lookup_for_settings (settings,
- GTK_ICON_SIZE_MENU,
- &width, &height);
-
- pixbuf = gtk_icon_theme_load_icon (icon_theme,
- icon_name,
- MIN (width, height), 0, &error);
-
- if (pixbuf == NULL)
- {
- g_error_free (error);
- pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
- GTK_STOCK_MISSING_IMAGE,
- GTK_ICON_SIZE_MENU,
- NULL);
- }
- }
-
- gtk_icon_entry_set_icon_internal (entry,
- icon_pos,
- pixbuf);
-}
-
-/**
- * gtk_icon_entry_set_icon_from_gicon
- * @entry: A #GtkIconEntry;
- * @icon_pos: The position at which to set the icon
- * @icon: The icon to set
- *
- * Sets the icon shown in the entry at the specified position from the current
- * icon theme. If the icon isn't known, a "broken image" icon will be displayed
- * instead. If the current icon theme is changed, the icon will be updated
- * appropriately.
- */
-void
-gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- GIcon *icon)
-{
- GdkPixbuf *pixbuf = NULL;
- GtkIconEntryPrivate *priv;
- EntryIconInfo *icon_info;
- GdkScreen *screen;
- GtkIconTheme *icon_theme;
- GtkSettings *settings;
- gint width, height;
- GError *error = NULL;
- GtkIconInfo *info;
-
- priv = entry->priv;
- icon_info = &priv->icons[icon_pos];
-
- screen = gtk_widget_get_screen (GTK_WIDGET (entry));
- icon_theme = gtk_icon_theme_get_for_screen (screen);
- settings = gtk_settings_get_for_screen (screen);
-
- if (icon != NULL)
- {
- gtk_icon_size_lookup_for_settings (settings,
- GTK_ICON_SIZE_MENU,
- &width, &height);
-
- #if GTK_CHECK_VERSION (2, 14, 0)
- info = gtk_icon_theme_lookup_by_gicon (icon_theme,
- icon,
- MIN (width, height), 0);
- #else
- info = NULL;
- #endif
- pixbuf = gtk_icon_info_load_icon (info, &error);
- if (pixbuf == NULL)
- {
- g_error_free (error);
- pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
- GTK_STOCK_MISSING_IMAGE,
- GTK_ICON_SIZE_MENU,
- NULL);
- }
- }
-
- gtk_icon_entry_set_icon_internal ((GtkIconEntry*)entry,
- icon_pos,
- pixbuf);
-}
-
-/**
- * gtk_icon_entry_set_cursor
- * @entry: A #GtkIconEntry;
- * @icon_pos: The position at which to set the cursor
- * @cursor_type: A #GdkCursorType; describing the cursor to set
- *
- * Sets an alternate mouse cursor used for the specified icon.
- */
-void
-gtk_icon_entry_set_cursor (const GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- GdkCursorType cursor_type)
-{
- EntryIconInfo *icon_info;
- GtkIconEntryPrivate *priv;
- GdkCursor *cursor;
-
- priv = entry->priv;
- icon_info = &priv->icons[icon_pos];
-
- icon_info->cursor_type = cursor_type;
- icon_info->custom_cursor = TRUE;
-
- if (GTK_WIDGET_REALIZED (GTK_WIDGET (entry)))
- {
- cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (entry)),
- cursor_type);
-
- gdk_window_set_cursor (icon_info->window, cursor);
- gdk_cursor_unref (cursor);
- }
-}
-
-/**
- * gtk_icon_entry_set_icon_highlight
- * @entry: A #GtkIconEntry;
- * @position: Icon position.
- * @highlight: TRUE if the icon should highlight on mouse-over
- *
- * Determines whether the icon will highlight on mouse-over.
- */
-void
-gtk_icon_entry_set_icon_highlight (const GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- gboolean highlight)
-{
- EntryIconInfo *icon_info;
- GtkIconEntryPrivate *priv;
-
- priv = entry->priv;
-
- g_return_if_fail (entry != NULL);
- g_return_if_fail (GTK_IS_ICON_ENTRY (entry));
- g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos));
-
- icon_info = &priv->icons[icon_pos];
-
- if (icon_info->highlight == highlight)
- return;
-
- icon_info->highlight = highlight;
-}
-
-/**
- * gtk_icon_entry_get_pixbuf
- * @entry: A #GtkIconEntry.
- * @position: Icon position.
- *
- * Retrieves the image used for the icon. Unlike the other methods of setting
- * and getting icon data, this method will work regardless of whether the icon
- * was set using a #GdkPixbuf, a #GIcon, a stock item, or an icon name.
- *
- * Returns: A #GdkPixbuf, or NULL if no icon is set for this position.
- */
-GdkPixbuf *
-gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos)
-{
- GtkIconEntryPrivate *priv;
-
- g_return_val_if_fail (entry != NULL, NULL);
- g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), NULL);
- g_return_val_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos), NULL);
-
- priv = entry->priv;
-
- return priv->icons[icon_pos].pixbuf;
-}
-
-/**
- * gtk_icon_entry_get_gicon
- * @entry: A #GtkIconEntry
- * @position: Icon position.
- *
- * Retrieves the GIcon used for the icon, or NULL if there is no icon or if
- * the icon was set by some other method (e.g., by stock, pixbuf, or icon name).
- *
- * Returns: A #GIcon, or NULL if no icon is set or if the icon is not a GIcon.
- */
-GIcon *
-gtk_icon_entry_get_gicon (const GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos)
-{
- GtkIconEntryPrivate *priv;
- EntryIconInfo *icon_info;
-
- g_return_val_if_fail (entry != NULL, NULL);
- g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), NULL);
- g_return_val_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos), NULL);
-
- priv = entry->priv;
- icon_info = &priv->icons[icon_pos];
-
- return icon_info->storage_type == _GTK_IMAGE_GICON ? icon_info->gicon : NULL;
-}
-
-/**
- * gtk_icon_entry_get_icon_highlight
- * @entry: A #GtkIconEntry.
- * @position: Icon position.
- *
- * Retrieves whether entry will highlight the icon on mouseover.
- *
- * Returns: TRUE if icon highlights.
- */
-gboolean
-gtk_icon_entry_get_icon_highlight (const GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos)
-{
- GtkIconEntryPrivate *priv;
-
- g_return_val_if_fail (entry != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), FALSE);
- g_return_val_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos), FALSE);
-
- priv = entry->priv;
-
- return priv->icons[icon_pos].highlight;
-}
-
-/**
- * gtk_icon_entry_set_tooltip
- * @entry: A #GtkIconEntry.
- * @position: Icon position.
- * @text: The text to be used for the tooltip.
- *
- * Sets the tooltip text used for the specified icon.
- */
-void
-gtk_icon_entry_set_tooltip (const GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- const gchar *text)
-{
- EntryIconInfo *icon_info;
- GtkIconEntryPrivate *priv;
- gchar *new_tooltip;
-
- g_return_if_fail (entry != NULL);
- g_return_if_fail (GTK_IS_ICON_ENTRY (entry));
- g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos));
-
- priv = entry->priv;
-
- icon_info = &priv->icons[icon_pos];
-
- new_tooltip = g_strdup (text);
- if (icon_info->tooltip_text != NULL)
- g_free (icon_info->tooltip_text);
- icon_info->tooltip_text = new_tooltip;
-}
-
-/**
- * gtk_icon_entry_set_icon_sensitive
- * @entry: A #GtkIconEntry.
- * @position: Icon position.
- * @sensitive: Specifies whether the icon should appear sensitive or insensitive.
- *
- * Sets the sensitivity for the specified icon.
- */
-void
-gtk_icon_entry_set_icon_sensitive (const GtkIconEntry *icon_entry,
- GtkIconEntryPosition icon_pos,
- gboolean sensitive)
-{
- EntryIconInfo *icon_info;
- GtkIconEntryPrivate *priv;
-
- g_return_if_fail (icon_entry != NULL);
- g_return_if_fail (GTK_IS_ICON_ENTRY (icon_entry));
- g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos));
-
- priv = icon_entry->priv;
-
- icon_info = &priv->icons[icon_pos];
-
- icon_info->insensitive = !sensitive;
-
- if (icon_info->custom_cursor == TRUE && GTK_WIDGET_REALIZED (GTK_WIDGET (icon_entry)))
- {
- GdkCursor *cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (icon_entry)),
- sensitive ? icon_info->cursor_type : GDK_ARROW);
- gdk_window_set_cursor (icon_info->window, cursor);
- gdk_cursor_unref (cursor);
- }
-}
-
-void
-gtk_icon_entry_set_progress_fraction (GtkIconEntry *icon_entry,
- gdouble fraction)
-{
- GtkIconEntryPrivate *priv;
-
- g_return_if_fail (GTK_IS_ICON_ENTRY (icon_entry));
-
- priv = icon_entry->priv;
- priv->fraction = CLAMP (fraction, 0.0, 1.0);
-
- if (GTK_ENTRY (icon_entry)->text_area)
- gdk_window_invalidate_rect (GTK_ENTRY (icon_entry)->text_area, NULL, FALSE);
-}
-
-#endif
diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h
index 18ec4e10..daa1819d 100644
--- a/midori/gtkiconentry.h
+++ b/midori/gtkiconentry.h
@@ -26,7 +26,6 @@
G_BEGIN_DECLS
-#if GTK_CHECK_VERSION (2, 16, 0)
#define GtkIconEntry GtkEntry
#define GtkIconEntryPosition GtkEntryIconPosition
#define GTK_ICON_ENTRY_PRIMARY GTK_ENTRY_ICON_PRIMARY
@@ -42,99 +41,9 @@ G_BEGIN_DECLS
GtkEntryIconPosition position,
GdkPixbuf* pixbuf);
#define gtk_icon_entry_set_tooltip gtk_entry_set_icon_tooltip_text
+ #define gtk_icon_entry_get_tooltip gtk_entry_get_icon_tooltip_text
#define gtk_icon_entry_set_icon_highlight gtk_entry_set_icon_activatable
#define gtk_icon_entry_set_progress_fraction gtk_entry_set_progress_fraction
-#else
-
-#define GTK_TYPE_ICON_ENTRY (gtk_icon_entry_get_type())
-#define GTK_ICON_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_ICON_ENTRY, GtkIconEntry))
-#define GTK_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_ICON_ENTRY, GtkIconEntryClass))
-#define GTK_IS_ICON_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_ICON_ENTRY))
-#define GTK_IS_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_ICON_ENTRY))
-#define GTK_ICON_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ICON_ENTRY, GtkIconEntryClass))
-
-typedef enum
-{
- GTK_ICON_ENTRY_PRIMARY,
- GTK_ICON_ENTRY_SECONDARY
-} GtkIconEntryPosition;
-
-typedef struct _GtkIconEntry GtkIconEntry;
-typedef struct _GtkIconEntryClass GtkIconEntryClass;
-typedef struct _GtkIconEntryPrivate GtkIconEntryPrivate;
-
-struct _GtkIconEntry
-{
- GtkEntry parent_object;
-
- GtkIconEntryPrivate* priv;
-};
-
-struct _GtkIconEntryClass
-{
- GtkEntryClass parent_class;
-
- /* Signals */
- void (*icon_pressed) (GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- int button);
- void (*icon_released) (GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- int button);
-
- void (*gtk_reserved1) (void);
- void (*gtk_reserved2) (void);
- void (*gtk_reserved3) (void);
- void (*gtk_reserved4) (void);
-};
-
-GType gtk_icon_entry_get_type (void) G_GNUC_CONST;
-
-GtkWidget* gtk_icon_entry_new (void);
-
-void gtk_icon_entry_set_icon_from_pixbuf (GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- GdkPixbuf *pixbuf);
-void gtk_icon_entry_set_icon_from_stock (GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- const gchar *stock_id);
-void gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- const gchar *icon_name);
-
-void gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- GIcon *icon);
-
-GdkPixbuf* gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos);
-
-GIcon* gtk_icon_entry_get_gicon (const GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos);
-
-void gtk_icon_entry_set_icon_highlight (const GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos,
- gboolean highlight);
-
-gboolean gtk_icon_entry_get_icon_highlight (const GtkIconEntry *entry,
- GtkIconEntryPosition icon_pos);
-
-void gtk_icon_entry_set_cursor (const GtkIconEntry *icon_entry,
- GtkIconEntryPosition icon_pos,
- GdkCursorType cursor_type);
-
-void gtk_icon_entry_set_tooltip (const GtkIconEntry *icon_entry,
- GtkIconEntryPosition icon_pos,
- const gchar *text);
-
-void gtk_icon_entry_set_icon_sensitive (const GtkIconEntry *icon_entry,
- GtkIconEntryPosition icon_pos,
- gboolean sensitive);
-
-void gtk_icon_entry_set_progress_fraction (GtkIconEntry *icon_entry,
- gdouble fraction);
-
-#endif
G_END_DECLS
diff --git a/midori/main.c b/midori/main.c
index 7db7522d..2d3af37a 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -45,12 +45,6 @@
#include
#endif
-#if HAVE_HILDON
- #define BOOKMARK_FILE "/home/user/.bookmarks/MyBookmarks.xml"
-#else
- #define BOOKMARK_FILE "bookmarks.xbel"
-#endif
-
#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
#include
#include
@@ -58,18 +52,11 @@
#include
#endif
-static gchar*
-build_config_filename (const gchar* filename)
-{
- return g_build_filename (sokoke_set_config_dir (NULL), filename, NULL);
-}
-
static MidoriWebSettings*
-settings_and_accels_new (const gchar* config,
- gchar*** extensions)
+settings_and_accels_new (gchar*** extensions)
{
MidoriWebSettings* settings = midori_web_settings_new ();
- gchar* config_file = g_build_filename (config, "config", NULL);
+ gchar* config_file = midori_paths_get_readonly_config_filename ("config");
GKeyFile* key_file = g_key_file_new ();
GError* error = NULL;
GObjectClass* class;
@@ -89,7 +76,7 @@ settings_and_accels_new (const gchar* config,
if (error->code == G_FILE_ERROR_NOENT)
{
GError* inner_error = NULL;
- katze_assign (config_file, sokoke_find_config_filename (NULL, "config"));
+ katze_assign (config_file, midori_paths_get_preset_filename (NULL, "config"));
g_key_file_load_from_file (key_file, config_file,
G_KEY_FILE_KEEP_COMMENTS, &inner_error);
if (inner_error != NULL)
@@ -162,9 +149,9 @@ settings_and_accels_new (const gchar* config,
g_key_file_free (key_file);
/* Load accelerators */
- katze_assign (config_file, g_build_filename (config, "accels", NULL));
+ katze_assign (config_file, midori_paths_get_config_filename ("accels"));
if (g_access (config_file, F_OK) != 0)
- katze_assign (config_file, sokoke_find_config_filename (NULL, "accels"));
+ katze_assign (config_file, midori_paths_get_preset_filename (NULL, "accels"));
gtk_accel_map_load (config_file);
g_free (config_file);
@@ -261,7 +248,17 @@ settings_save_to_file (MidoriWebSettings* settings,
}
g_free (pspecs);
- if (extensions)
+ /* Take frozen list of active extensions until preferences reset it */
+ if ((_extensions = g_object_get_data (G_OBJECT (app), "extensions")))
+ {
+ i = 0;
+ while (_extensions[i])
+ {
+ g_key_file_set_boolean (key_file, "extensions", _extensions[i], TRUE);
+ i++;
+ }
+ }
+ else if (extensions)
{
KATZE_ARRAY_FOREACH_ITEM (extension, extensions)
if (midori_extension_is_active (extension))
@@ -285,16 +282,6 @@ settings_save_to_file (MidoriWebSettings* settings,
}
g_object_unref (extensions);
}
- else if ((_extensions = g_object_get_data (G_OBJECT (app), "extensions")))
- {
- i = 0;
- while (_extensions[i])
- {
- g_key_file_set_boolean (key_file, "extensions", _extensions[i], TRUE);
- i++;
- }
- }
-
saved = sokoke_key_file_save_to_file (key_file, filename, error);
g_key_file_free (key_file);
return saved;
@@ -317,8 +304,6 @@ search_engines_new_from_file (const gchar* filename,
key_file = g_key_file_new ();
g_key_file_load_from_file (key_file, filename,
G_KEY_FILE_KEEP_COMMENTS, error);
- /*g_key_file_load_from_data_dirs(keyFile, sFilename, NULL
- , G_KEY_FILE_KEEP_COMMENTS, error);*/
engines = g_key_file_get_groups (key_file, NULL);
pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (search_engines),
&n_properties);
@@ -344,10 +329,9 @@ search_engines_new_from_file (const gchar* filename,
}
static KatzeArray*
-search_engines_new_from_folder (const gchar* config,
- GString* error_messages)
+search_engines_new_from_folder (GString* error_messages)
{
- gchar* config_file = g_build_filename (config, "search", NULL);
+ gchar* config_file = midori_paths_get_config_filename ("search");
GError* error = NULL;
KatzeArray* search_engines;
@@ -361,18 +345,10 @@ search_engines_new_from_folder (const gchar* config,
}
if (!error && katze_array_is_empty (search_engines))
{
- g_object_unref (search_engines);
- #ifdef G_OS_WIN32
- gchar* dir = g_win32_get_package_installation_directory_of_module (NULL);
katze_assign (config_file,
- g_build_filename (dir, "etc", "xdg", PACKAGE_NAME, "search", NULL));
- g_free (dir);
- search_engines = search_engines_new_from_file (config_file, NULL);
- #else
- katze_assign (config_file,
- sokoke_find_config_filename (NULL, "search"));
- search_engines = search_engines_new_from_file (config_file, NULL);
- #endif
+ midori_paths_get_preset_filename (NULL, "search"));
+ katze_object_assign (search_engines,
+ search_engines_new_from_file (config_file, NULL));
}
else if (error)
{
@@ -440,7 +416,6 @@ midori_history_clear_cb (KatzeArray* array,
static gboolean
midori_history_initialize (KatzeArray* array,
const gchar* filename,
- const gchar* bookmarks_filename,
char** errmsg)
{
sqlite3* db;
@@ -448,6 +423,9 @@ midori_history_initialize (KatzeArray* array,
sqlite3_stmt* stmt;
gint result;
gchar* sql;
+ gchar* bookmarks_filename;
+
+ g_return_val_if_fail (errmsg != NULL, FALSE);
if (sqlite3_open (filename, &db) != SQLITE_OK)
{
@@ -499,7 +477,9 @@ midori_history_initialize (KatzeArray* array,
"COMMIT;",
NULL, NULL, errmsg);
+ bookmarks_filename = midori_paths_get_config_filename ("bookmarks_v2.db");
sql = g_strdup_printf ("ATTACH DATABASE '%s' AS bookmarks", bookmarks_filename);
+ g_free (bookmarks_filename);
sqlite3_exec (db, sql, NULL, NULL, errmsg);
g_free (sql);
g_object_set_data (G_OBJECT (array), "db", db);
@@ -538,10 +518,10 @@ settings_notify_cb (MidoriWebSettings* settings,
gchar* config_file;
/* Skip state related properties to avoid disk IO */
- if (pspec && pspec->flags & MIDORI_PARAM_DELAY_SAVING)
+ if (pspec && midori_settings_delay_saving (MIDORI_SETTINGS (settings), pspec->name))
return;
- config_file = build_config_filename ("config");
+ config_file = midori_paths_get_config_filename ("config");
if (!settings_save_to_file (settings, app, config_file, &error))
{
g_warning (_("The configuration couldn't be saved. %s"), error->message);
@@ -550,22 +530,13 @@ settings_notify_cb (MidoriWebSettings* settings,
g_free (config_file);
}
-static void
-extension_activate_cb (MidoriExtension* extension,
- MidoriApp* app)
-{
- MidoriWebSettings* settings = katze_object_get_object (app, "settings");
- settings_notify_cb (settings, NULL, app);
- g_object_unref (settings);
-}
-
static void
accel_map_changed_cb (GtkAccelMap* accel_map,
gchar* accel_path,
guint accel_key,
GdkModifierType accel_mods)
{
- gchar* config_file = build_config_filename ("accels");
+ gchar* config_file = midori_paths_get_config_filename ("accels");
gtk_accel_map_save (config_file);
g_free (config_file);
}
@@ -575,7 +546,7 @@ midori_search_engines_modify_cb (KatzeArray* array,
gpointer item,
KatzeArray* search_engines)
{
- gchar* config_file = build_config_filename ("search");
+ gchar* config_file = midori_paths_get_config_filename ("search");
GError* error = NULL;
if (!search_engines_save_to_file (search_engines, config_file, &error))
{
@@ -610,7 +581,7 @@ static void
midori_trash_remove_item_cb (KatzeArray* trash,
GObject* item)
{
- gchar* config_file = build_config_filename ("tabtrash.xbel");
+ gchar* config_file = midori_paths_get_config_filename ("tabtrash.xbel");
GError* error = NULL;
midori_trash_add_item_no_save_cb (trash, item);
if (!midori_array_to_file (trash, config_file, "xbel", &error))
@@ -629,19 +600,51 @@ midori_trash_add_item_cb (KatzeArray* trash,
midori_trash_remove_item_cb (trash, item);
}
+static void
+midori_load_module (MidoriApp* app,
+ const gchar* extension_path,
+ const gchar* filename,
+ gboolean activate);
static void
midori_browser_show_preferences_cb (MidoriBrowser* browser,
KatzePreferences* preferences,
MidoriApp* app)
{
KatzeArray* array;
+ gchar* extension_path;
GtkWidget* scrolled;
GtkWidget* addon;
GList* children;
GtkWidget* page;
- /* Hide if there are no extensions at all */
+ if (!g_module_supported ())
+ return;
+
array = katze_object_get_object (app, "extensions");
+ if ((extension_path = midori_paths_get_lib_path (PACKAGE_NAME)))
+ {
+ GDir* extension_dir = NULL;
+ if ((extension_dir = g_dir_open (extension_path, 0, NULL)))
+ {
+ const gchar* filename;
+ while ((filename = g_dir_read_name (extension_dir)))
+ {
+ /* Ignore files which don't have the correct suffix */
+ if (!g_str_has_suffix (filename, G_MODULE_SUFFIX))
+ continue;
+
+ midori_load_module (app, extension_path, filename, FALSE);
+ }
+ g_dir_close (extension_dir);
+ }
+ g_free (extension_path);
+ }
+
+
+ /* Reset frozen list: allow active extensions to be saved */
+ g_object_set_data (G_OBJECT (app), "extensions", NULL);
+
+ /* Hide if there are no extensions at all */
if (!katze_array_get_nth_item (array, 0))
{
g_object_unref (array);
@@ -657,7 +660,7 @@ midori_browser_show_preferences_cb (MidoriBrowser* browser,
gtk_widget_reparent (g_list_nth_data (children, 0), scrolled);
g_list_free (children);
page = katze_preferences_add_category (preferences,
- _("Extensions"), STOCK_EXTENSIONS);
+ _("Extensions"), STOCK_EXTENSION);
gtk_box_pack_start (GTK_BOX (page), scrolled, TRUE, TRUE, 4);
}
@@ -673,12 +676,17 @@ midori_browser_privacy_preferences_cb (MidoriBrowser* browser,
katze_preferences_add_category (preferences, _("Privacy"), GTK_STOCK_INDEX);
katze_preferences_add_group (preferences, NULL);
- button = katze_property_label (settings, "maximum-cookie-age");
+ button = gtk_label_new (_("Delete old Cookies after:"));
+ gtk_misc_set_alignment (GTK_MISC (button), 0.0, 0.5);
+ gtk_widget_set_tooltip_text (button, _("The maximum number of days to save cookies for"));
katze_preferences_add_widget (preferences, button, "indented");
button = katze_property_proxy (settings, "maximum-cookie-age", "days");
+ gtk_widget_set_tooltip_text (button, _("The maximum number of days to save cookies for"));
katze_preferences_add_widget (preferences, button, "spanned");
#ifdef HAVE_LIBSOUP_2_29_91
button = katze_property_proxy (settings, "first-party-cookies-only", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Only accept Cookies from sites you visit"));
+ gtk_widget_set_tooltip_text (button, _("Block cookies sent by third-party websites"));
katze_preferences_add_widget (preferences, button, "filled");
#endif
@@ -690,15 +698,24 @@ midori_browser_privacy_preferences_cb (MidoriBrowser* browser,
g_free (markup);
katze_preferences_add_widget (preferences, label, "filled");
button = katze_property_proxy (settings, "enable-offline-web-application-cache", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Enable offline web application cache"));
katze_preferences_add_widget (preferences, button, "indented");
button = katze_property_proxy (settings, "enable-html5-local-storage", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Enable HTML5 local storage support"));
katze_preferences_add_widget (preferences, button, "spanned");
button = katze_property_proxy (settings, "strip-referer", NULL);
+ /* i18n: Reworded: Shorten details propagated when going to another page */
+ gtk_button_set_label (GTK_BUTTON (button), _("Strip referrer details sent to websites"));
+ /* i18n: Referer here is not a typo but a technical term */
+ gtk_widget_set_tooltip_text (button, _("Whether the \"Referer\" header should be shortened to the hostname"));
katze_preferences_add_widget (preferences, button, "indented");
katze_preferences_add_widget (preferences, gtk_label_new (NULL), "indented");
- button = katze_property_label (settings, "maximum-history-age");
+ button = gtk_label_new (_("Delete pages from history after:"));
+ gtk_misc_set_alignment (GTK_MISC (button), 0.0, 0.5);
+ gtk_widget_set_tooltip_text (button, _("The maximum number of days to save the history for"));
katze_preferences_add_widget (preferences, button, "indented");
button = katze_property_proxy (settings, "maximum-history-age", "days");
+ gtk_widget_set_tooltip_text (button, _("The maximum number of days to save the history for"));
katze_preferences_add_widget (preferences, button, "spanned");
}
@@ -735,7 +752,7 @@ static guint save_timeout = 0;
static gboolean
midori_session_save_timeout_cb (KatzeArray* session)
{
- gchar* config_file = build_config_filename ("session.xbel");
+ gchar* config_file = midori_paths_get_config_filename ("session.xbel");
GError* error = NULL;
if (!midori_array_to_file (session, config_file, "xbel", &error))
{
@@ -767,7 +784,7 @@ static void
midori_app_quit_cb (MidoriBrowser* browser,
KatzeArray* session)
{
- gchar* config_file = build_config_filename ("running");
+ gchar* config_file = midori_paths_get_config_filename ("running");
g_unlink (config_file);
g_free (config_file);
@@ -859,66 +876,69 @@ soup_session_settings_notify_first_party_cb (MidoriWebSettings* settings,
}
#endif
+#if defined (HAVE_LIBSOUP_2_34_0)
+/* Implemented in MidoriLocationAction */
+void
+midori_map_add_message (SoupMessage* message);
+
+static void
+midori_soup_session_request_started_cb (SoupSession* session,
+ SoupMessage* message,
+ SoupSocket* socket,
+ gpointer user_data)
+{
+ midori_map_add_message (message);
+}
+#endif
+
static void
midori_soup_session_settings_accept_language_cb (SoupSession* session,
SoupMessage* msg,
MidoriWebSettings* settings)
{
- gchar* languages = katze_object_get_string (settings, "preferred-languages");
- gchar* accpt;
-
- /* Empty, use the system locales */
- if (!(languages && *languages))
- accpt = sokoke_accept_languages (g_get_language_names ());
- /* No =, no ., looks like a list of language names */
- else if (!(strchr (languages, '=') && strchr (languages, '.')))
- {
- gchar ** lang_names = g_strsplit_set (languages, ",; ", -1);
- accpt = sokoke_accept_languages ((const gchar* const *)lang_names);
- g_strfreev (lang_names);
- }
- /* Presumably a well formatted list including priorities */
- else
- accpt = languages;
-
- if (accpt != languages)
- g_free (languages);
- soup_message_headers_append (msg->request_headers, "Accept-Language", accpt);
- g_free (accpt);
+ const gchar* accept = midori_web_settings_get_accept_language (settings);
+ soup_message_headers_append (msg->request_headers, "Accept-Language", accept);
if (katze_object_get_boolean (settings, "strip-referer"))
{
const gchar* referer
= soup_message_headers_get_one (msg->request_headers, "Referer");
SoupURI* destination = soup_message_get_uri (msg);
- if (referer && destination && !strstr (referer, destination->host))
+ SoupURI* stripped_uri;
+ if (referer && destination && !strstr (referer, destination->host)
+ && (stripped_uri = soup_uri_new (referer)))
{
- SoupURI* stripped_uri = soup_uri_new (referer);
- if (stripped_uri != NULL)
+ gchar* stripped_referer;
+ soup_uri_set_path (stripped_uri, "");
+ soup_uri_set_query (stripped_uri, NULL);
+ stripped_referer = soup_uri_to_string (stripped_uri, FALSE);
+ soup_uri_free (stripped_uri);
+ if (strcmp (stripped_referer, referer))
{
- gchar* stripped_referer;
- soup_uri_set_path (stripped_uri, "");
- soup_uri_set_query (stripped_uri, NULL);
- stripped_referer = soup_uri_to_string (stripped_uri, FALSE);
- soup_uri_free (stripped_uri);
- if (g_getenv ("MIDORI_SOUP_DEBUG"))
- g_message ("Referer %s stripped to %s", referer, stripped_referer);
+ if (midori_debug ("referer"))
+ g_message ("Referer '%s' stripped to '%s'", referer, stripped_referer);
soup_message_headers_replace (msg->request_headers, "Referer",
stripped_referer);
- g_free (stripped_referer);
}
+ g_free (stripped_referer);
}
+
+ /* With HTTP, Host is optional. Strip to outsmart some filter proxies */
+ if (destination && destination->scheme == SOUP_URI_SCHEME_HTTP)
+ soup_message_headers_remove (msg->request_headers, "Host");
}
}
static void
midori_soup_session_debug (SoupSession* session)
{
- const char* soup_debug = g_getenv ("MIDORI_SOUP_DEBUG");
-
- if (soup_debug)
+ gint soup_debug_level = 0;
+ if (midori_debug ("headers"))
+ soup_debug_level = SOUP_LOGGER_LOG_HEADERS;
+ else if (midori_debug ("body"))
+ soup_debug_level = SOUP_LOGGER_LOG_BODY;
+ if (soup_debug_level > 0)
{
- gint soup_debug_level = atoi (soup_debug);
SoupLogger* logger = soup_logger_new (soup_debug_level, -1);
soup_logger_attach (logger, session);
g_object_unref (logger);
@@ -930,6 +950,7 @@ midori_load_soup_session (gpointer settings)
{
SoupSession* session = webkit_get_default_session ();
+ #ifndef G_OS_WIN32
#if defined (HAVE_LIBSOUP_2_37_1)
g_object_set (session,
"ssl-use-system-ca-file", TRUE,
@@ -960,6 +981,17 @@ midori_load_soup_session (gpointer settings)
g_warning (_("No root certificate file is available. "
"SSL certificates cannot be verified."));
#endif
+ #else /* G_OS_WIN32 */
+ /* We cannot use "ssl-use-system-ca-file" on Windows
+ * some GTLS backend pieces are missing currently.
+ * Instead we specify the bundle we ship ourselves */
+ gchar* certificate_file = midori_paths_get_res_filename ("ca-bundle.crt");
+ g_object_set (session,
+ "ssl-ca-file", certificate_file,
+ "ssl-strict", FALSE,
+ NULL);
+ g_free (certificate_file);
+ #endif
#if !WEBKIT_CHECK_VERSION (1, 3, 5)
/* See http://stevesouders.com/ua/index.php */
@@ -982,15 +1014,22 @@ midori_load_soup_session (gpointer settings)
#endif
#if WEBKIT_CHECK_VERSION (1, 8, 0)
- gchar* cache = g_build_filename (g_get_user_data_dir (),
+ gchar* cache = g_build_filename (midori_paths_get_user_data_dir (),
"webkit", "icondatabase", NULL);
webkit_favicon_database_set_path (webkit_get_favicon_database (), cache);
g_free (cache);
#endif
+ #if defined (HAVE_LIBSOUP_2_34_0)
+ g_signal_connect (session, "request-started",
+ G_CALLBACK (midori_soup_session_request_started_cb), session);
+ #endif
g_signal_connect (session, "request-queued",
G_CALLBACK (midori_soup_session_settings_accept_language_cb), settings);
+ soup_session_add_feature (session, SOUP_SESSION_FEATURE (
+ midori_hsts_new (midori_paths_get_readonly_config_filename ("hsts"))));
+
midori_soup_session_debug (session);
g_object_set_data (G_OBJECT (session), "midori-session-initialized", (void*)1);
@@ -1012,6 +1051,7 @@ static void
button_disable_extensions_clicked_cb (GtkWidget* button,
MidoriApp* app)
{
+ /* Reset frozen list of active extensions */
g_object_set_data (G_OBJECT (app), "extensions", NULL);
gtk_widget_set_sensitive (button, FALSE);
}
@@ -1065,6 +1105,7 @@ midori_show_diagnostic_dialog (MidoriWebSettings* settings,
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4);
gtk_widget_show_all (align);
button = katze_property_proxy (settings, "show-crash-dialog", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Show a dialog after Midori crashed"));
gtk_widget_show (button);
gtk_container_add (GTK_CONTAINER (content_area), button);
gtk_container_set_focus_child (GTK_CONTAINER (dialog), gtk_dialog_get_action_area (GTK_DIALOG (dialog)));
@@ -1120,7 +1161,7 @@ midori_load_soup_session_full (gpointer settings)
midori_load_soup_session (settings);
- config_file = build_config_filename ("logins");
+ config_file = midori_paths_get_config_filename ("logins");
feature = g_object_new (KATZE_TYPE_HTTP_AUTH, "filename", config_file, NULL);
soup_session_add_feature (session, feature);
g_object_unref (feature);
@@ -1130,7 +1171,7 @@ midori_load_soup_session_full (gpointer settings)
soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar));
g_object_unref (jar);
- katze_assign (config_file, build_config_filename ("cookies.db"));
+ katze_assign (config_file, midori_paths_get_config_filename ("cookies.db"));
have_new_cookies = g_access (config_file, F_OK) == 0;
feature = g_object_new (KATZE_TYPE_HTTP_COOKIES_SQLITE, NULL);
g_object_set_data_full (G_OBJECT (feature), "filename",
@@ -1140,7 +1181,7 @@ midori_load_soup_session_full (gpointer settings)
if (!have_new_cookies)
{
- katze_assign (config_file, build_config_filename ("cookies.txt"));
+ katze_assign (config_file, midori_paths_get_config_filename ("cookies.txt"));
if (g_access (config_file, F_OK) == 0)
{
g_message ("Importing cookies from txt to sqlite3");
@@ -1153,8 +1194,7 @@ midori_load_soup_session_full (gpointer settings)
}
#if WEBKIT_CHECK_VERSION (1, 3, 11)
- katze_assign (config_file, g_build_filename (g_get_user_cache_dir (),
- PACKAGE_NAME, "web", NULL));
+ katze_assign (config_file, g_build_filename (midori_paths_get_cache_dir (), "web", NULL));
feature = SOUP_SESSION_FEATURE (soup_cache_new (config_file, 0));
soup_session_add_feature (session, feature);
soup_cache_set_max_size (SOUP_CACHE (feature),
@@ -1168,132 +1208,133 @@ midori_load_soup_session_full (gpointer settings)
static void
midori_load_extension (MidoriApp* app,
- KatzeArray* extensions,
- gchar** active_extensions,
MidoriExtension* extension,
const gchar* filename)
{
+ KatzeArray* extensions = katze_object_get_object (app, "extensions");
/* Signal that we want the extension to load and save */
g_object_set_data_full (G_OBJECT (extension), "filename",
g_strdup (filename), g_free);
if (midori_extension_is_prepared (extension))
midori_extension_get_config_dir (extension);
-
katze_array_add_item (extensions, extension);
- if (active_extensions)
+ g_object_unref (extensions);
+}
+
+static void
+midori_load_module (MidoriApp* app,
+ const gchar* extension_path,
+ const gchar* filename,
+ gboolean activate)
+{
+ gchar* fullname;
+ GModule* module;
+ typedef GObject* (*extension_init_func)(void);
+ extension_init_func extension_init;
+ GObject* extension = NULL;
+ static GHashTable* modules = NULL;
+
+ if (strchr (filename, '/'))
{
- guint i = 0;
- gchar* key;
- gchar* name;
- gchar* term;
-
- key = katze_object_get_string (extension, "key");
- if (key && *key)
- term = g_strdup_printf ("%s/%s", filename, key);
- else
- term = g_strdup (filename);
-
- while ((name = active_extensions[i++]))
- if (!g_strcmp0 (term, name))
- g_signal_emit_by_name (extension, "activate", app);
-
- g_free (key);
- g_free (term);
+ gchar* clean = g_strndup (filename, strchr (filename, '/') - filename);
+ fullname = g_build_filename (extension_path, clean, NULL);
+ g_free (clean);
}
- g_signal_connect_after (extension, "activate",
- G_CALLBACK (extension_activate_cb), app);
- g_signal_connect_after (extension, "deactivate",
- G_CALLBACK (extension_activate_cb), app);
+ else
+ fullname = g_build_filename (extension_path, filename, NULL);
+
+ module = g_module_open (fullname, G_MODULE_BIND_LOCAL);
+ g_free (fullname);
+
+ /* GModule detects repeated loading but exposes no API to check it.
+ Skip any modules that were loaded before. */
+ if (modules == NULL)
+ modules = g_hash_table_new (g_direct_hash, g_direct_equal);
+ if (g_hash_table_lookup (modules, module))
+ return;
+ g_hash_table_insert (modules, module, g_strdup (filename));
+
+ if (module && g_module_symbol (module, "extension_init",
+ (gpointer) &extension_init)
+ && (extension = extension_init ()))
+ {
+ if (MIDORI_IS_EXTENSION (extension))
+ {
+ midori_load_extension (app, MIDORI_EXTENSION (extension), filename);
+ if (activate)
+ g_signal_emit_by_name (extension, "activate", app);
+ }
+ else if (KATZE_IS_ARRAY (extension))
+ {
+ MidoriExtension* extension_item;
+ KATZE_ARRAY_FOREACH_ITEM (extension_item, KATZE_ARRAY (extension))
+ if (MIDORI_IS_EXTENSION (extension_item))
+ {
+ gchar* key;
+
+ midori_load_extension (app, extension_item, filename);
+ if (activate)
+ {
+ key = katze_object_get_string (extension_item, "key");
+ if (key && strstr (filename, key))
+ g_signal_emit_by_name (extension_item, "activate", app);
+ g_free (key);
+ }
+ }
+ }
+ }
+
+ if (!extension && g_module_error () != NULL)
+ {
+ KatzeArray* extensions = katze_object_get_object (app, "extensions");
+ extension = g_object_new (MIDORI_TYPE_EXTENSION,
+ "name", filename,
+ "description", g_module_error (),
+ NULL);
+ g_warning ("%s", g_module_error ());
+ katze_array_add_item (extensions, extension);
+ g_object_unref (extensions);
+ }
+ g_object_unref (extension);
+}
+
+static void
+extensions_update_cb (KatzeArray* extensions,
+ MidoriApp* app)
+{
+ MidoriWebSettings* settings = katze_object_get_object (app, "settings");
+ settings_notify_cb (settings, NULL, app);
+ g_object_unref (settings);
}
static gboolean
midori_load_extensions (gpointer data)
{
MidoriApp* app = MIDORI_APP (data);
- gchar** active_extensions = g_object_get_data (G_OBJECT (app), "extensions");
+ gchar** keys = g_object_get_data (G_OBJECT (app), "extensions");
KatzeArray* extensions;
#ifdef G_ENABLE_DEBUG
- gboolean startup_timer = g_getenv ("MIDORI_STARTTIME") != NULL;
+ gboolean startup_timer = midori_debug ("startup");
GTimer* timer = startup_timer ? g_timer_new () : NULL;
#endif
/* Load extensions */
extensions = katze_array_new (MIDORI_TYPE_EXTENSION);
+ g_signal_connect (extensions, "update", G_CALLBACK (extensions_update_cb), app);
g_object_set (app, "extensions", extensions, NULL);
+
if (g_module_supported ())
{
gchar* extension_path;
- GDir* extension_dir = NULL;
-
- if (!(extension_path = g_strdup (g_getenv ("MIDORI_EXTENSION_PATH"))))
- extension_path = sokoke_find_lib_path (PACKAGE_NAME);
- if (extension_path != NULL)
- extension_dir = g_dir_open (extension_path, 0, NULL);
- if (extension_dir != NULL)
+ if (keys && (extension_path = midori_paths_get_lib_path (PACKAGE_NAME)))
{
+ gint i = 0;
const gchar* filename;
-
- while ((filename = g_dir_read_name (extension_dir)))
- {
- gchar* fullname;
- GModule* module;
- typedef GObject* (*extension_init_func)(void);
- extension_init_func extension_init;
- GObject* extension = NULL;
-
- /* Ignore files which don't have the correct suffix */
- if (!g_str_has_suffix (filename, G_MODULE_SUFFIX))
- continue;
-
- fullname = g_build_filename (extension_path, filename, NULL);
- module = g_module_open (fullname, G_MODULE_BIND_LOCAL);
- g_free (fullname);
-
- if (module && g_module_symbol (module, "extension_init",
- (gpointer) &extension_init))
- {
- extension = extension_init ();
- if (extension != NULL)
- {
- if (MIDORI_IS_EXTENSION (extension))
- midori_load_extension (app, extensions,
- active_extensions,
- MIDORI_EXTENSION (extension), filename);
- else if (KATZE_IS_ARRAY (extension))
- {
- MidoriExtension* extension_item;
- KATZE_ARRAY_FOREACH_ITEM (extension_item, KATZE_ARRAY (extension))
- {
- if (MIDORI_IS_EXTENSION (extension_item))
- midori_load_extension (app, extensions,
- active_extensions, extension_item,
- filename);
- }
- }
-
- }
- }
-
- if (!extension)
- {
- /* No extension, no error: not available, not shown */
- if (g_module_error () == NULL)
- continue;
-
- extension = g_object_new (MIDORI_TYPE_EXTENSION,
- "name", filename,
- "description", g_module_error (),
- NULL);
- g_warning ("%s", g_module_error ());
- katze_array_add_item (extensions, extension);
- }
- g_object_unref (extension);
- }
- g_dir_close (extension_dir);
+ while ((filename = keys[i++]))
+ midori_load_module (app, extension_path, filename, TRUE);
+ g_free (extension_path);
}
- g_free (extension_path);
}
- g_strfreev (active_extensions);
#ifdef G_ENABLE_DEBUG
if (startup_timer)
@@ -1308,7 +1349,7 @@ midori_browser_action_last_session_activate_cb (GtkAction* action,
MidoriBrowser* browser)
{
KatzeArray* old_session = katze_array_new (KATZE_TYPE_ITEM);
- gchar* config_file = build_config_filename ("session.old.xbel");
+ gchar* config_file = midori_paths_get_readonly_config_filename ("session.old.xbel");
GError* error = NULL;
if (midori_array_from_file (old_session, config_file, "xbel", &error))
{
@@ -1342,7 +1383,7 @@ midori_load_session (gpointer data)
gint64 current;
gchar** command = g_object_get_data (G_OBJECT (app), "execute-command");
#ifdef G_ENABLE_DEBUG
- gboolean startup_timer = g_getenv ("MIDORI_STARTTIME") != NULL;
+ gboolean startup_timer = midori_debug ("startup");
GTimer* timer = startup_timer ? g_timer_new () : NULL;
#endif
@@ -1350,7 +1391,7 @@ midori_load_session (gpointer data)
g_signal_connect_after (katze_object_get_object (app, "settings"), "notify",
G_CALLBACK (settings_notify_cb), app);
- config_file = build_config_filename ("session.old.xbel");
+ config_file = midori_paths_get_readonly_config_filename ("session.old.xbel");
if (g_access (config_file, F_OK) == 0)
{
GtkActionGroup* action_group = midori_browser_get_action_group (browser);
@@ -1362,7 +1403,7 @@ midori_load_session (gpointer data)
midori_app_add_browser (app, browser);
gtk_widget_show (GTK_WIDGET (browser));
- katze_assign (config_file, build_config_filename ("accels"));
+ katze_assign (config_file, midori_paths_get_readonly_config_filename ("accels"));
g_signal_connect_after (gtk_accel_map_get (), "changed",
G_CALLBACK (accel_map_changed_cb), NULL);
@@ -1406,7 +1447,7 @@ midori_load_session (gpointer data)
g_object_unref (settings);
g_object_unref (_session);
- katze_assign (config_file, build_config_filename ("session.xbel"));
+ katze_assign (config_file, midori_paths_get_readonly_config_filename ("session.xbel"));
g_signal_connect_after (browser, "add-tab",
G_CALLBACK (midori_browser_session_cb), session);
g_signal_connect_after (browser, "remove-tab",
@@ -1481,7 +1522,7 @@ midori_remove_config_file (gint clear_prefs,
{
if ((clear_prefs & flag) == flag)
{
- gchar* config_file = build_config_filename (filename);
+ gchar* config_file = midori_paths_get_config_filename (filename);
g_unlink (config_file);
g_free (config_file);
}
@@ -1518,93 +1559,6 @@ signal_handler (int signal_id)
}
#endif
-static GKeyFile*
-speeddial_new_from_file (const gchar* config,
- GError** error)
-{
-
- GKeyFile* key_file = g_key_file_new ();
- gchar* config_file = g_build_filename (config, "speeddial", NULL);
- guint i = 0;
- gchar* json_content;
- gsize json_length;
- GString* script;
- JSGlobalContextRef js_context;
- gchar* keyfile;
- gchar* thumb_dir;
- gchar** tiles;
-
- if (g_key_file_load_from_file (key_file, config_file, G_KEY_FILE_NONE, error))
- {
- g_free (config_file);
- return key_file;
- }
-
- katze_assign (config_file, g_build_filename (config, "speeddial.json", NULL));
- if (!g_file_get_contents (config_file, &json_content, &json_length, NULL))
- {
- katze_assign (json_content, g_strdup ("'{}'"));
- json_length = strlen ("'{}'");
- }
-
- script = g_string_sized_new (json_length);
- g_string_append (script, "var json = JSON.parse (");
- g_string_append_len (script, json_content, json_length);
- g_string_append (script, "); "
- "var keyfile = '';"
- "for (var i in json['shortcuts']) {"
- "var tile = json['shortcuts'][i];"
- "keyfile += '[Dial ' + tile['id'].substring (1) + ']\\n'"
- " + 'uri=' + tile['href'] + '\\n'"
- " + 'img=' + tile['img'] + '\\n'"
- " + 'title=' + tile['title'] + '\\n\\n';"
- "} "
- "var columns = json['width'] ? json['width'] : 3;"
- "var rows = json['shortcuts'] ? json['shortcuts'].length / columns : 0;"
- "keyfile += '[settings]\\n'"
- " + 'columns=' + columns + '\\n'"
- " + 'rows=' + (rows > 3 ? rows : 3) + '\\n\\n';"
- "keyfile;");
- g_free (json_content);
- js_context = JSGlobalContextCreateInGroup (NULL, NULL);
- keyfile = sokoke_js_script_eval (js_context, script->str, NULL);
- JSGlobalContextRelease (js_context);
- g_string_free (script, TRUE);
- g_key_file_load_from_data (key_file, keyfile, -1, 0, NULL);
- g_free (keyfile);
- tiles = g_key_file_get_groups (key_file, NULL);
- thumb_dir = g_build_path (G_DIR_SEPARATOR_S, g_get_user_cache_dir (),
- PACKAGE_NAME, "thumbnails", NULL);
- if (!g_file_test (thumb_dir, G_FILE_TEST_EXISTS))
- katze_mkdir_with_parents (thumb_dir, 0700);
- g_free (thumb_dir);
-
- while (tiles[i] != NULL)
- {
- gsize sz;
- gchar* uri = g_key_file_get_string (key_file, tiles[i], "uri", NULL);
- gchar* img = g_key_file_get_string (key_file, tiles[i], "img", NULL);
- if (img != NULL && (uri && *uri && *uri != '#'))
- {
- guchar* decoded = g_base64_decode (img, &sz);
- gchar* thumb_path = sokoke_build_thumbnail_path (uri);
- g_file_set_contents (thumb_path, (gchar*)decoded, sz, NULL);
- g_free (thumb_path);
- g_free (decoded);
- }
- g_free (img);
- g_free (uri);
- g_key_file_remove_key (key_file, tiles[i], "img", NULL);
- i++;
- }
- g_strfreev (tiles);
-
- katze_assign (config_file, g_build_filename (config, "speeddial", NULL));
- sokoke_key_file_save_to_file (key_file, config_file, NULL);
- g_free (config_file);
- return key_file;
-}
-
static void
midori_soup_session_block_uris_cb (SoupSession* session,
SoupMessage* msg,
@@ -1645,9 +1599,16 @@ midori_inactivity_timeout (gpointer data)
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 (GDK_IS_X11_DISPLAY (display))
+ {
+ xdisplay = GDK_DISPLAY_XDISPLAY (display);
+ has_extension = XScreenSaverQueryExtension (xdisplay,
+ &event_base, &error_base);
+ }
+ else
+ {
+ has_extension = 0;
+ }
}
if (has_extension)
@@ -1665,7 +1626,7 @@ midori_inactivity_timeout (gpointer data)
GList* data_items = sokoke_register_privacy_item (NULL, NULL, NULL);
while ((view = midori_browser_get_nth_tab (mit->browser, i++)))
- gtk_widget_destroy (view);
+ midori_browser_remove_tab (mit->browser, view);
midori_browser_set_current_uri (mit->browser, mit->uri);
/* Clear all private data */
if (history != NULL)
@@ -1762,10 +1723,10 @@ static void
midori_clear_saved_logins_cb (void)
{
sqlite3* db;
- gchar* path = g_build_filename (sokoke_set_config_dir (NULL), "logins", NULL);
+ gchar* path = g_build_filename (midori_paths_get_config_dir (), "logins", NULL);
g_unlink (path);
/* Form History database, written by the extension */
- katze_assign (path, g_build_filename (sokoke_set_config_dir (NULL),
+ katze_assign (path, g_build_filename (midori_paths_get_config_dir (),
"extensions", MIDORI_MODULE_PREFIX "formhistory." G_MODULE_SUFFIX, "forms.db", NULL));
if (sqlite3_open (path, &db) == SQLITE_OK)
{
@@ -1781,7 +1742,7 @@ midori_clear_web_cache_cb (void)
{
SoupSession* session = webkit_get_default_session ();
SoupSessionFeature* feature = soup_session_get_feature (session, SOUP_TYPE_CACHE);
- gchar* cache = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, "web", NULL);
+ gchar* cache = g_build_filename (midori_paths_get_cache_dir (), "web", NULL);
soup_cache_clear (SOUP_CACHE (feature));
soup_cache_flush (SOUP_CACHE (feature));
sokoke_remove_path (cache, TRUE);
@@ -1792,13 +1753,11 @@ midori_clear_web_cache_cb (void)
static void
midori_clear_page_icons_cb (void)
{
- gchar* cache = g_build_filename (g_get_user_cache_dir (),
- PACKAGE_NAME, "icons", NULL);
+ gchar* cache = g_build_filename (midori_paths_get_cache_dir (), "icons", NULL);
/* FIXME: Exclude search engine icons */
sokoke_remove_path (cache, TRUE);
g_free (cache);
- cache = g_build_filename (g_get_user_data_dir (),
- "webkit", "icondatabase", NULL);
+ cache = g_build_filename (midori_paths_get_user_data_dir (), "webkit", "icondatabase", NULL);
sokoke_remove_path (cache, TRUE);
g_free (cache);
#if WEBKIT_CHECK_VERSION (1, 8, 0)
@@ -1855,6 +1814,8 @@ main (int argc,
gchar* webapp;
gchar* config;
gboolean private;
+ gboolean portable;
+ gboolean plain;
gboolean diagnostic_dialog;
gboolean back_from_crash;
gboolean run;
@@ -1879,6 +1840,12 @@ main (int argc,
#endif
{ "private", 'p', 0, G_OPTION_ARG_NONE, &private,
N_("Private browsing, no changes are saved"), NULL },
+ #ifdef G_OS_WIN32
+ { "portable", 'P', 0, G_OPTION_ARG_NONE, &portable,
+ N_("Portable mode, all runtime files are stored in one place"), NULL },
+ #endif
+ { "plain", '\0', 0, G_OPTION_ARG_NONE, &plain,
+ N_("Plain GTK+ window with WebKit, akin to GtkLauncher"), NULL },
{ "diagnostic-dialog", 'd', 0, G_OPTION_ARG_NONE, &diagnostic_dialog,
N_("Show a diagnostic dialog"), NULL },
{ "run", 'r', 0, G_OPTION_ARG_NONE, &run,
@@ -1908,9 +1875,7 @@ main (int argc,
gchar** extensions;
MidoriWebSettings* settings;
gchar* config_file;
- gchar* bookmarks_file;
- GKeyFile* speeddial;
- gboolean bookmarks_exist;
+ MidoriSpeedDial* dial;
MidoriStartup load_on_startup;
KatzeArray* search_engines;
KatzeArray* bookmarks;
@@ -1926,34 +1891,19 @@ main (int argc,
gint max_history_age;
gint clear_prefs = MIDORI_CLEAR_NONE;
#ifdef G_ENABLE_DEBUG
- gboolean startup_timer = g_getenv ("MIDORI_STARTTIME") != NULL;
+ gboolean startup_timer = midori_debug ("startup");
#define midori_startup_timer(tmrmsg) if (startup_timer) \
g_debug (tmrmsg, (g_test_timer_last () - g_test_timer_elapsed ()) * -1)
#else
#define midori_startup_timer(tmrmsg)
#endif
- #ifdef HAVE_SIGNAL_H
- #ifdef SIGHUP
- signal (SIGHUP, &signal_handler);
- #endif
- #ifdef SIGINT
- signal (SIGINT, &signal_handler);
- #endif
- #ifdef SIGTERM
- signal (SIGTERM, &signal_handler);
- #endif
- #ifdef SIGQUIT
- signal (SIGQUIT, &signal_handler);
- #endif
- #endif
-
- midori_app_setup (argv);
-
/* Parse cli options */
webapp = NULL;
config = NULL;
private = FALSE;
+ portable = FALSE;
+ plain = FALSE;
back_from_crash = FALSE;
diagnostic_dialog = FALSE;
run = FALSE;
@@ -1966,8 +1916,7 @@ main (int argc,
block_uris = NULL;
inactivity_reset = 0;
error = NULL;
- if (!gtk_init_with_args (&argc, &argv, _("[Addresses]"), entries,
- GETTEXT_PACKAGE, &error))
+ if (!midori_app_setup (&argc, &argv, entries, &error))
{
g_print ("%s - %s\n", _("Midori"), error->message);
g_error_free (error);
@@ -1984,17 +1933,7 @@ main (int argc,
g_free (old_config);
}
- /* Private browsing, window title, default config folder */
- if (private)
- {
- if (!config && !webapp)
- config = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
- /* Mask the timezone, which can be read by Javascript */
- g_setenv ("TZ", "UTC", TRUE);
- }
- else
- g_set_application_name (_("Midori"));
-
+ g_set_application_name (_("Midori"));
/* Versioned prgname to override menuproxy blacklist */
g_set_prgname (PACKAGE_NAME "4");
@@ -2002,11 +1941,11 @@ main (int argc,
{
g_print (
"%s %s\n\n"
- "Copyright (c) 2007-2011 Christian Dywan\n\n"
+ "Copyright (c) 2007-2012 Christian Dywan\n\n"
"%s\n"
"\t%s\n\n"
"%s\n"
- "\thttp://www.twotoasts.de\n",
+ "\thttp://www.midori-browser.org\n",
_("Midori"), PACKAGE_VERSION,
_("Please report comments, suggestions and bugs to:"),
PACKAGE_BUGREPORT,
@@ -2057,6 +1996,7 @@ main (int argc,
gchar* filename;
gint fd;
GtkWidget* web_view;
+ gchar* uri;
#if HAVE_OFFSCREEN
GtkWidget* offscreen;
GdkScreen* screen;
@@ -2093,7 +2033,9 @@ main (int argc,
#endif
g_signal_connect (web_view, "load-finished",
G_CALLBACK (snapshot_load_finished_cb), filename);
- webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), snapshot);
+ uri = midori_prepare_uri (snapshot);
+ webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), uri);
+ g_free (uri);
gtk_main ();
g_free (filename);
return 0;
@@ -2104,6 +2046,47 @@ main (int argc,
g_log_set_default_handler (midori_log_to_file, (gpointer)logfile);
}
+ if (plain)
+ {
+ GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ GtkWidget* scrolled = gtk_scrolled_window_new (NULL, NULL);
+ GtkWidget* web_view = webkit_web_view_new ();
+ gchar* uri = midori_prepare_uri (
+ (uris != NULL && uris[0]) ? uris[0] : "http://www.example.com");
+
+ gint width, height;
+ GdkRectangle monitor;
+ GdkScreen* screen = gtk_window_get_screen (GTK_WINDOW (window));
+ gdk_screen_get_monitor_geometry (screen, 0, &monitor);
+ width = monitor.width / 1.7; height = monitor.height / 1.7;
+ gtk_window_set_default_size (GTK_WINDOW (window), width, height);
+
+ gtk_container_add (GTK_CONTAINER (window), scrolled);
+ gtk_container_add (GTK_CONTAINER (scrolled), web_view);
+ g_signal_connect (window, "delete-event",
+ G_CALLBACK (gtk_main_quit), window);
+ gtk_widget_show_all (window);
+ webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), uri);
+ g_free (uri);
+ gtk_main ();
+ return 0;
+ }
+
+ #ifdef HAVE_SIGNAL_H
+ #ifdef SIGHUP
+ signal (SIGHUP, &signal_handler);
+ #endif
+ #ifdef SIGINT
+ signal (SIGINT, &signal_handler);
+ #endif
+ #ifdef SIGTERM
+ signal (SIGTERM, &signal_handler);
+ #endif
+ #ifdef SIGQUIT
+ signal (SIGQUIT, &signal_handler);
+ #endif
+ #endif
+
/* i18n: Logins and passwords in websites and web forms */
sokoke_register_privacy_item ("formhistory", _("Saved logins and _passwords"),
G_CALLBACK (midori_clear_saved_logins_cb));
@@ -2129,21 +2112,28 @@ main (int argc,
midori_startup_timer ("Browser: \t%f");
- if (config)
+ if (private)
+ midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, config);
+ else if (webapp)
+ midori_paths_init (MIDORI_RUNTIME_MODE_APP, config);
+ else
+ midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, config);
+
+ if (private || !webapp)
{
- settings = settings_and_accels_new (config, &extensions);
+ settings = settings_and_accels_new (&extensions);
g_strfreev (extensions);
- search_engines = search_engines_new_from_folder (config, NULL);
+ search_engines = search_engines_new_from_folder (NULL);
g_object_set (browser, "search-engines", search_engines, NULL);
g_object_unref (search_engines);
- speeddial = speeddial_new_from_file (config, &error);
- g_object_set (browser, "speed-dial", speeddial, NULL);
}
else
settings = g_object_ref (midori_browser_get_settings (browser));
if (private)
{
+ /* Mask the timezone, which can be read by Javascript */
+ g_setenv ("TZ", "UTC", TRUE);
/* In-memory trash for re-opening closed tabs */
trash = katze_array_new (KATZE_TYPE_ITEM);
g_signal_connect_after (trash, "add-item",
@@ -2172,12 +2162,9 @@ main (int argc,
"gtk-application-prefer-dark-theme", TRUE,
NULL);
#endif
- }
- if (private || !config)
- {
- /* Disable saving by setting an unwritable folder */
- sokoke_set_config_dir ("/");
+ g_object_set (gtk_settings_get_default (),
+ "gtk-recent-files-max-age", 0, NULL);
}
midori_load_soup_session (settings);
@@ -2291,9 +2278,17 @@ main (int argc,
if (inactivity_reset > 0)
g_error ("--inactivity-reset is currently only supported with --app.");
- sokoke_set_config_dir (config);
- app = midori_app_new ();
- katze_assign (config, (gchar*)sokoke_set_config_dir (NULL));
+ if (portable)
+ {
+ g_object_set (gtk_settings_get_default (),
+ "gtk-recent-files-max-age", 0, NULL);
+ midori_paths_init (MIDORI_RUNTIME_MODE_PORTABLE, config);
+ }
+ else
+ midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, config);
+
+ app = midori_app_new ();
+ katze_assign (config, g_strdup (midori_paths_get_config_dir ()));
midori_startup_timer ("App created: \t%f");
/* FIXME: The app might be 'running' but actually showing a dialog
@@ -2338,13 +2333,13 @@ main (int argc,
/* Load configuration file */
error_messages = g_string_new (NULL);
error = NULL;
- settings = settings_and_accels_new (config, &extensions);
+ settings = settings_and_accels_new (&extensions);
g_object_set (settings, "enable-developer-extras", TRUE, NULL);
g_object_set (settings, "enable-html5-database", TRUE, NULL);
midori_startup_timer ("Config and accels read: \t%f");
/* Load search engines */
- search_engines = search_engines_new_from_folder (config, error_messages);
+ search_engines = search_engines_new_from_folder (error_messages);
/* Pick first search engine as default if not set */
g_object_get (settings, "location-entry-search", &uri, NULL);
if (!(uri && *uri) && !katze_array_is_empty (search_engines))
@@ -2357,30 +2352,13 @@ main (int argc,
midori_startup_timer ("Search read: \t%f");
bookmarks = katze_array_new (KATZE_TYPE_ARRAY);
- bookmarks_file = g_build_filename (config, "bookmarks.db", NULL);
- bookmarks_exist = g_access (bookmarks_file, F_OK) == 0;
errmsg = NULL;
- if ((db = midori_bookmarks_initialize (bookmarks, bookmarks_file, &errmsg)) == NULL)
+ if ((db = midori_bookmarks_initialize (bookmarks, &errmsg)) == NULL)
{
g_string_append_printf (error_messages,
_("Bookmarks couldn't be loaded: %s\n"), errmsg);
errmsg = NULL;
}
- else if (!bookmarks_exist)
- {
- /* Initial creation, import old bookmarks */
- gchar* old_bookmarks;
- if (g_path_is_absolute (BOOKMARK_FILE))
- old_bookmarks = g_strdup (BOOKMARK_FILE);
- else
- old_bookmarks = g_build_filename (config, BOOKMARK_FILE, NULL);
- if (g_access (old_bookmarks, F_OK) == 0)
- {
- midori_bookmarks_import (old_bookmarks, db);
- /* Leave old bookmarks around */
- }
- g_free (old_bookmarks);
- }
g_object_set_data (G_OBJECT (bookmarks), "db", db);
midori_startup_timer ("Bookmarks read: \t%f");
@@ -2390,7 +2368,7 @@ main (int argc,
#if HAVE_LIBXML
if (load_on_startup >= MIDORI_STARTUP_LAST_OPEN_PAGES)
{
- katze_assign (config_file, build_config_filename ("session.xbel"));
+ katze_assign (config_file, midori_paths_get_readonly_config_filename ("session.xbel"));
error = NULL;
if (!midori_array_from_file (_session, config_file, "xbel", &error))
{
@@ -2421,17 +2399,16 @@ main (int argc,
katze_assign (config_file, g_build_filename (config, "history.db", NULL));
errmsg = NULL;
- if (!midori_history_initialize (history, config_file, bookmarks_file, &errmsg))
+ if (!midori_history_initialize (history, config_file, &errmsg))
{
g_string_append_printf (error_messages,
_("The history couldn't be loaded: %s\n"), errmsg);
errmsg = NULL;
}
- g_free (bookmarks_file);
midori_startup_timer ("History read: \t%f");
- error = NULL;
- speeddial = speeddial_new_from_file (config, &error);
+ katze_assign (config_file, g_build_filename (config, "speeddial", NULL));
+ dial = midori_speed_dial_new (config_file, NULL);
/* In case of errors */
if (error_messages->len)
@@ -2520,7 +2497,7 @@ main (int argc,
G_CALLBACK (midori_trash_remove_item_cb), NULL);
katze_item_set_parent (KATZE_ITEM (_session), app);
- g_object_set_data (G_OBJECT (app), "extensions", extensions);
+ g_object_set_data_full (G_OBJECT (app), "extensions", extensions, (GDestroyNotify)g_strfreev);
/* We test for the presence of a dummy file which is created once
and deleted during normal runtime, but persists in case of a crash. */
katze_assign (config_file, g_build_filename (config, "running", NULL));
@@ -2548,7 +2525,7 @@ main (int argc,
"trash", trash,
"search-engines", search_engines,
"history", history,
- "speed-dial", speeddial,
+ "speed-dial", dial,
NULL);
g_object_unref (history);
g_object_unref (search_engines);
@@ -2606,12 +2583,12 @@ main (int argc,
load_on_startup = katze_object_get_int (settings, "load-on-startup");
if (load_on_startup < MIDORI_STARTUP_LAST_OPEN_PAGES)
{
- katze_assign (config_file, g_build_filename (config, "session.xbel", NULL));
+ katze_assign (config_file, midori_paths_get_config_filename ("session.xbel"));
g_unlink (config_file);
}
g_object_unref (settings);
- g_key_file_free (speeddial);
+ g_object_unref (dial);
g_object_unref (app);
g_free (config_file);
return 0;
diff --git a/midori/marshal.list b/midori/marshal.list
index b0808f8a..df8bfd3f 100644
--- a/midori/marshal.list
+++ b/midori/marshal.list
@@ -6,6 +6,7 @@ OBJECT:OBJECT
VOID:BOOLEAN,STRING
VOID:OBJECT,ENUM,BOOLEAN
VOID:OBJECT,INT,INT
+VOID:OBJECT,OBJECT
VOID:POINTER,INT
VOID:STRING,BOOLEAN
VOID:STRING,INT,STRING
diff --git a/midori/midori-app.c b/midori/midori-app.c
index 8c361f9b..e6b5a200 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -21,9 +21,11 @@
#include "midori-app.h"
#include "midori-platform.h"
+#include "midori-core.h"
#include
#include
+#include
#include
#if ENABLE_NLS
@@ -227,6 +229,32 @@ _midori_app_add_browser (MidoriApp* app,
katze_array_add_item (app->browsers, browser);
+ #if GTK_CHECK_VERSION (3, 0, 0)
+ if (app->browser == NULL)
+ {
+ gchar* filename;
+ if ((filename = midori_paths_get_res_filename ("gtk3.css")))
+ {
+ GtkCssProvider* css_provider = gtk_css_provider_new ();
+ GError* error = NULL;
+ gtk_css_provider_load_from_path (css_provider, filename, &error);
+ if (error == NULL)
+ {
+ gtk_style_context_add_provider_for_screen (
+ gtk_widget_get_screen (GTK_WIDGET (browser)),
+ GTK_STYLE_PROVIDER (css_provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ }
+ else
+ {
+ g_warning ("Failed to load \"%s\": %s", filename, error->message);
+ g_error_free (error);
+ }
+ g_free (filename);
+ }
+ }
+ #endif
+
app->browser = browser;
#if HAVE_UNIQUE
/* We *do not* let unique watch windows because that includes
@@ -723,7 +751,7 @@ midori_app_create_instance (MidoriApp* app)
{
#if HAVE_UNIQUE
- const gchar* config = sokoke_set_config_dir (NULL);
+ const gchar* config = midori_paths_get_config_dir ();
gchar* name_hash;
name_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, config, -1);
katze_assign (app_name, g_strconcat ("midori", "_", name_hash, NULL));
@@ -754,7 +782,7 @@ midori_app_create_instance (MidoriApp* app)
g_signal_connect (instance, "message-received",
G_CALLBACK (midori_browser_message_received_cb), app);
#else
- instance = socket_init (instance_name, sokoke_set_config_dir (NULL), &exists);
+ instance = socket_init (instance_name, midori_paths_get_config_dir (), &exists);
g_object_set_data (G_OBJECT (app), "sock-exists",
exists ? (gpointer)0xdeadbeef : NULL);
if (instance != MidoriAppInstanceNull)
@@ -1117,7 +1145,19 @@ midori_app_send_command (MidoriApp* app,
/* g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); */
g_return_val_if_fail (command != NULL, FALSE);
- if (!midori_app_instance_is_running (app))
+ if (midori_app_instance_is_running (app))
+ {
+ MidoriBrowser* browser = midori_browser_new ();
+ int i;
+ for (i=0; command && command[i]; i++)
+ {
+ gboolean action_known = (gtk_action_group_get_action (midori_browser_get_action_group (browser), command[i]) != NULL);
+ if (!action_known)
+ g_warning (_("Unexpected action '%s'."), command[i]);
+ }
+ gtk_widget_destroy (GTK_WIDGET (browser));
+ }
+ else
return midori_app_command_received (app, "command", command, NULL);
#if HAVE_HILDON
@@ -1310,146 +1350,39 @@ midori_app_send_notification (MidoriApp* app,
*
* Since: 0.4.2
**/
-void
-midori_app_setup (gchar** argument_vector)
+gboolean
+midori_app_setup (gint *argc,
+ gchar** *argument_vector,
+ const GOptionEntry *entries,
+ GError* *error)
{
GtkIconSource* icon_source;
GtkIconSet* icon_set;
GtkIconFactory* factory;
gsize i;
+ gboolean success;
- typedef struct
+ static GtkStockItem items[] =
{
- const gchar* stock_id;
- const gchar* label;
- GdkModifierType modifier;
- guint keyval;
- const gchar* fallback;
- } FatStockItem;
- static FatStockItem items[] =
- {
- { STOCK_EXTENSION, NULL, 0, 0, GTK_STOCK_CONVERT },
- { STOCK_IMAGE, NULL, 0, 0, GTK_STOCK_ORIENTATION_PORTRAIT },
- { STOCK_WEB_BROWSER, NULL, 0, 0, "gnome-web-browser" },
- { STOCK_NEWS_FEED, NULL, 0, 0, GTK_STOCK_INDEX },
- { STOCK_SCRIPT, NULL, 0, 0, GTK_STOCK_EXECUTE },
- { STOCK_STYLE, NULL, 0, 0, GTK_STOCK_SELECT_COLOR },
- { STOCK_TRANSFER, NULL, 0, 0, GTK_STOCK_SAVE },
+ { STOCK_IMAGE },
+ { STOCK_WEB_BROWSER },
+ { STOCK_NEWS_FEED },
+ { STOCK_STYLE },
- { STOCK_BOOKMARK, N_("_Bookmark"), 0, 0, GTK_STOCK_FILE },
- { STOCK_BOOKMARKS, N_("_Bookmarks"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_B, GTK_STOCK_DIRECTORY },
- { STOCK_BOOKMARK_ADD, N_("Add Boo_kmark"), 0, 0, "stock_add-bookmark" },
- { STOCK_CONSOLE, N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING },
- { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT },
- { STOCK_HISTORY, N_("_History"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_H, GTK_STOCK_SORT_ASCENDING },
- { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME },
- { STOCK_SCRIPTS, N_("_Userscripts"), 0, 0, GTK_STOCK_EXECUTE },
- { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, GTK_STOCK_ADD },
- { STOCK_TRANSFERS, N_("_Transfers"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_J, GTK_STOCK_SAVE },
- { STOCK_PLUGINS, N_("Netscape p_lugins"), 0, 0, GTK_STOCK_CONVERT },
- { STOCK_USER_TRASH, N_("_Closed Tabs"), 0, 0, "gtk-undo-ltr" },
- { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD },
- { GTK_STOCK_DIRECTORY, N_("New _Folder"), 0, 0, NULL },
+ { STOCK_BOOKMARKS, N_("_Bookmarks"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_B },
+ { STOCK_BOOKMARK_ADD, N_("Add Boo_kmark") },
+ { STOCK_EXTENSION, N_("_Extensions") },
+ { STOCK_HISTORY, N_("_History"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_H },
+ { STOCK_SCRIPT, N_("_Userscripts") },
+ { STOCK_STYLE, N_("User_styles") },
+ { STOCK_TAB_NEW, N_("New _Tab") },
+ { STOCK_TRANSFER, N_("_Transfers"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_J },
+ { STOCK_PLUGINS, N_("Netscape p_lugins") },
+ { STOCK_USER_TRASH, N_("_Closed Tabs") },
+ { STOCK_WINDOW_NEW, N_("New _Window") },
+ { STOCK_FOLDER_NEW, N_("New _Folder") },
};
- /* Preserve argument vector */
- sokoke_get_argv (argument_vector);
-
- /* libSoup uses threads, therefore if WebKit is built with libSoup
- * or Midori is using it, we need to initialize threads. */
- #if !GLIB_CHECK_VERSION (2, 32, 0)
- if (!g_thread_supported ()) g_thread_init (NULL);
- #endif
-
- #if ENABLE_NLS
- setlocale (LC_ALL, "");
- if (g_getenv ("MIDORI_NLSPATH"))
- bindtextdomain (GETTEXT_PACKAGE, g_getenv ("MIDORI_NLSPATH"));
- else
- #ifdef G_OS_WIN32
- {
- gchar* path = sokoke_find_data_filename ("locale", FALSE);
- bindtextdomain (GETTEXT_PACKAGE, path);
- g_free (path);
- }
- #else
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- #endif
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
- #endif
-
- g_type_init ();
- factory = gtk_icon_factory_new ();
- for (i = 0; i < G_N_ELEMENTS (items); i++)
- {
- icon_set = gtk_icon_set_new ();
- icon_source = gtk_icon_source_new ();
- if (items[i].fallback)
- {
- gtk_icon_source_set_icon_name (icon_source, items[i].fallback);
- items[i].fallback = NULL;
- gtk_icon_set_add_source (icon_set, icon_source);
- }
- gtk_icon_source_set_icon_name (icon_source, items[i].stock_id);
- gtk_icon_set_add_source (icon_set, icon_source);
- gtk_icon_source_free (icon_source);
- gtk_icon_factory_add (factory, items[i].stock_id, icon_set);
- gtk_icon_set_unref (icon_set);
- }
- gtk_stock_add_static ((GtkStockItem*)items, G_N_ELEMENTS (items));
- gtk_icon_factory_add_default (factory);
- g_object_unref (factory);
-
- #if HAVE_HILDON
- /* Maemo doesn't theme stock icons. So we map platform icons
- to stock icons. These are all monochrome toolbar icons. */
- typedef struct
- {
- const gchar* stock_id;
- const gchar* icon_name;
- } CompatItem;
- static CompatItem compat_items[] =
- {
- { GTK_STOCK_ADD, "general_add" },
- { GTK_STOCK_BOLD, "general_bold" },
- { GTK_STOCK_CLOSE, "general_close_b" },
- { GTK_STOCK_DELETE, "general_delete" },
- { GTK_STOCK_DIRECTORY, "general_toolbar_folder" },
- { GTK_STOCK_FIND, "general_search" },
- { GTK_STOCK_FULLSCREEN, "general_fullsize_b" },
- { GTK_STOCK_GO_BACK, "general_back" },
- { GTK_STOCK_GO_FORWARD, "general_forward" },
- { GTK_STOCK_GO_UP, "filemanager_folder_up" },
- { GTK_STOCK_GOTO_FIRST, "pdf_viewer_first_page" },
- { GTK_STOCK_GOTO_LAST, "pdf_viewer_last_page" },
- { GTK_STOCK_INFO, "general_information" },
- { GTK_STOCK_ITALIC, "general_italic" },
- { GTK_STOCK_JUMP_TO, "general_move_to_folder" },
- { GTK_STOCK_PREFERENCES,"general_settings" },
- { GTK_STOCK_REFRESH, "general_refresh" },
- { GTK_STOCK_SAVE, "notes_save" },
- { GTK_STOCK_STOP, "general_stop" },
- { GTK_STOCK_UNDERLINE, "notes_underline" },
- { GTK_STOCK_ZOOM_IN, "pdf_zoomin" },
- { GTK_STOCK_ZOOM_OUT, "pdf_zoomout" },
- };
-
- factory = gtk_icon_factory_new ();
- for (i = 0; i < G_N_ELEMENTS (compat_items); i++)
- {
- icon_set = gtk_icon_set_new ();
- icon_source = gtk_icon_source_new ();
- gtk_icon_source_set_icon_name (icon_source, compat_items[i].icon_name);
- gtk_icon_set_add_source (icon_set, icon_source);
- gtk_icon_source_free (icon_source);
- gtk_icon_factory_add (factory, compat_items[i].stock_id, icon_set);
- gtk_icon_set_unref (icon_set);
- }
- gtk_icon_factory_add_default (factory);
- g_object_unref (factory);
- #endif
-
/* Print messages to stdout on Win32 console, cf. AbiWord
* http://svn.abisource.com/abiword/trunk/src/wp/main/win/Win32Main.cpp */
#ifdef _WIN32
@@ -1472,5 +1405,90 @@ midori_app_setup (gchar** argument_vector)
}
}
#endif
+
+ /* libSoup uses threads, therefore if WebKit is built with libSoup
+ * or Midori is using it, we need to initialize threads. */
+ #if !GLIB_CHECK_VERSION (2, 32, 0)
+ if (!g_thread_supported ()) g_thread_init (NULL);
+ #endif
+
+ /* Midori.Paths uses GFile */
+ g_type_init ();
+ /* Preserve argument vector */
+ midori_paths_init_exec_path (*argument_vector, *argc);
+
+ #if ENABLE_NLS
+ if (g_getenv ("MIDORI_NLSPATH"))
+ bindtextdomain (GETTEXT_PACKAGE, g_getenv ("MIDORI_NLSPATH"));
+ else
+ #ifdef G_OS_WIN32
+ {
+ gchar* path = midori_paths_get_data_filename ("locale", FALSE);
+ bindtextdomain (GETTEXT_PACKAGE, path);
+ g_free (path);
+ }
+ #else
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ #endif
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+ #endif
+
+ success = gtk_init_with_args (argc, argument_vector, _("[Addresses]"),
+ entries, GETTEXT_PACKAGE, error);
+
+ factory = gtk_icon_factory_new ();
+ for (i = 0; i < G_N_ELEMENTS (items); i++)
+ {
+ icon_set = gtk_icon_set_new ();
+ icon_source = gtk_icon_source_new ();
+ gtk_icon_source_set_icon_name (icon_source, items[i].stock_id);
+ gtk_icon_set_add_source (icon_set, icon_source);
+ gtk_icon_source_free (icon_source);
+ gtk_icon_factory_add (factory, items[i].stock_id, icon_set);
+ gtk_icon_set_unref (icon_set);
+ }
+ gtk_stock_add_static ((GtkStockItem*)items, G_N_ELEMENTS (items));
+ gtk_icon_factory_add_default (factory);
+ g_object_unref (factory);
+
+ return success;
+}
+
+gboolean
+midori_debug (const gchar* token)
+{
+ static const gchar* debug_token = NULL;
+ const gchar* debug = g_getenv ("MIDORI_DEBUG");
+ const gchar* debug_tokens = "headers body referer cookies paths hsts unarmed ";
+ const gchar* full_debug_tokens = "adblock:match adblock:time startup bookmarks ";
+ if (debug_token == NULL)
+ {
+ gchar* found_token;
+ if (debug && (found_token = strstr (full_debug_tokens, debug)) && *(found_token + strlen (debug)) == ' ')
+ {
+ #ifdef G_ENABLE_DEBUG
+ debug_token = g_intern_static_string (debug);
+ #else
+ g_warning ("Value '%s' for MIDORI_DEBUG requires a full debugging build.", debug);
+ #endif
+ }
+ else if (debug && (found_token = strstr (debug_tokens, debug)) && *(found_token + strlen (debug)) == ' ')
+ debug_token = g_intern_static_string (debug);
+ else if (debug)
+ g_warning ("Unrecognized value '%s' for MIDORI_DEBUG.", debug);
+ else
+ debug_token = "NONE";
+ if (!debug_token)
+ {
+ debug_token = "INVALID";
+ g_print ("Supported values: %s\nWith full debugging: %s\n",
+ debug_tokens, full_debug_tokens);
+ }
+ }
+ if (debug_token != g_intern_static_string ("NONE")
+ && !strstr (debug_tokens, token) && !strstr (full_debug_tokens, token))
+ g_warning ("Token '%s' passed to midori_debug is not a known token.", token);
+ return debug_token == g_intern_static_string (token);
}
diff --git a/midori/midori-app.h b/midori/midori-app.h
index c918a19e..07af1927 100644
--- a/midori/midori-app.h
+++ b/midori/midori-app.h
@@ -82,8 +82,14 @@ midori_app_send_notification (MidoriApp* app,
const gchar* title,
const gchar* message);
-void
-midori_app_setup (gchar** argument_vector);
+gboolean
+midori_app_setup (gint *argc,
+ gchar** *argument_vector,
+ const GOptionEntry *entries,
+ GError* *error);
+
+gboolean
+midori_debug (const gchar* token);
G_END_DECLS
diff --git a/midori/midori-array.c b/midori/midori-array.c
index 7ba6c624..aa10715e 100644
--- a/midori/midori-array.c
+++ b/midori/midori-array.c
@@ -982,24 +982,26 @@ katze_item_set_value_from_column (sqlite3_stmt* stmt,
item->added = date;
}
else if (g_str_equal (name, "day") || g_str_equal (name, "app")
- || g_str_equal (name, "toolbar"))
+ || g_str_equal (name, "toolbar") || g_str_equal (name, "id")
+ || g_str_equal (name, "parentid") || g_str_equal (name, "seq")
+ || g_str_equal (name, "pos_panel") || g_str_equal (name, "pos_bar"))
{
gint value;
value = sqlite3_column_int64 (stmt, column);
katze_item_set_meta_integer (item, name, value);
}
- else if (g_str_equal (name, "folder"))
- {
- const unsigned char* folder;
- folder = sqlite3_column_text (stmt, column);
- katze_item_set_meta_string (item, name, (gchar*)folder);
- }
else if (g_str_equal (name, "desc"))
{
const unsigned char* text;
text = sqlite3_column_text (stmt, column);
item->text = g_strdup ((gchar*)text);
}
+ else if (g_str_equal (name, "sql"))
+ {
+ const unsigned char* sql;
+ sql = sqlite3_column_text (stmt, column);
+ katze_item_set_meta_string (item, name, (gchar*)sql);
+ }
else
g_warn_if_reached ();
}
@@ -1102,7 +1104,7 @@ midori_array_query_recursive (KatzeArray* bookmarks,
return NULL;
sqlcmd = g_strdup_printf ("SELECT %s FROM bookmarks WHERE %s "
- "ORDER BY title DESC", fields, condition);
+ "ORDER BY (uri='') ASC, title DESC", fields, condition);
if (strstr (condition, "%q"))
{
sqlcmd_value = sqlite3_mprintf (sqlcmd, value ? value : "");
@@ -1120,10 +1122,14 @@ midori_array_query_recursive (KatzeArray* bookmarks,
{
if (KATZE_ITEM_IS_FOLDER (item))
{
+ gchar* parentid = g_strdup_printf ("%" G_GINT64_FORMAT,
+ katze_item_get_meta_integer (item, "id"));
KatzeArray* subarray = midori_array_query_recursive (bookmarks,
- fields, "folder='%q'", item->name, TRUE);
+ fields, "parentid=%q", parentid, TRUE);
katze_item_set_name (KATZE_ITEM (subarray), item->name);
katze_array_add_item (array, subarray);
+
+ g_free (parentid);
}
}
g_list_free (list);
diff --git a/midori/midori-bookmarks.c b/midori/midori-bookmarks.c
index 59865fb9..bbcb3eda 100644
--- a/midori/midori-bookmarks.c
+++ b/midori/midori-bookmarks.c
@@ -13,9 +13,17 @@
#include "midori-bookmarks.h"
#include "panels/midori-bookmarks.h"
#include "midori-array.h"
+#include "sokoke.h"
+#include "midori-core.h"
+#include
#include
+#include
+#ifdef HAVE_UNISTD_H
+ #include
+#endif
+
#ifdef G_ENABLE_DEBUG
void midori_bookmarks_dbtracer(void* dummy, const char* query)
{
@@ -29,7 +37,7 @@ midori_bookmarks_add_item_cb (KatzeArray* array,
sqlite3* db)
{
midori_bookmarks_insert_item_db (db, item,
- katze_item_get_meta_string (item, "folder"));
+ katze_item_get_meta_integer (item, "parentid"));
}
void
@@ -40,19 +48,10 @@ midori_bookmarks_remove_item_cb (KatzeArray* array,
gchar* sqlcmd;
char* errmsg = NULL;
- if (KATZE_ITEM_IS_BOOKMARK (item))
- sqlcmd = sqlite3_mprintf (
- "DELETE FROM bookmarks WHERE uri = '%q' "
- " AND folder = '%q'",
- katze_item_get_uri (item),
- katze_str_non_null (katze_item_get_meta_string (item, "folder")));
- else
- sqlcmd = sqlite3_mprintf (
- "DELETE FROM bookmarks WHERE title = '%q'"
- " AND folder = '%q'",
- katze_item_get_name (item),
- katze_str_non_null (katze_item_get_meta_string (item, "folder")));
+ sqlcmd = sqlite3_mprintf (
+ "DELETE FROM bookmarks WHERE id = %" G_GINT64_FORMAT ";",
+ katze_item_get_meta_integer (item, "id"));
if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
{
@@ -63,38 +62,258 @@ midori_bookmarks_remove_item_cb (KatzeArray* array,
sqlite3_free (sqlcmd);
}
+#define _APPEND_TO_SQL_ERRORMSG(custom_errmsg) \
+ do { \
+ if (sql_errmsg) \
+ { \
+ g_string_append_printf (errmsg_str, "%s : %s\n", custom_errmsg, sql_errmsg); \
+ sqlite3_free (sql_errmsg); \
+ } \
+ else \
+ g_string_append (errmsg_str, custom_errmsg); \
+ } while (0)
+
+gboolean
+midori_bookmarks_import_from_old_db (sqlite3* db,
+ const gchar* oldfile,
+ gchar** errmsg)
+{
+ gint sql_errcode;
+ gboolean failure = FALSE;
+ gchar* sql_errmsg = NULL;
+ GString* errmsg_str = g_string_new (NULL);
+ gchar* attach_stmt = sqlite3_mprintf ("ATTACH DATABASE %Q AS old_db;", oldfile);
+ const gchar* convert_stmts =
+ "BEGIN TRANSACTION;"
+ "INSERT INTO main.bookmarks (parentid, title, uri, desc, app, toolbar) "
+ "SELECT NULL AS parentid, title, uri, desc, app, toolbar "
+ "FROM old_db.bookmarks;"
+ "UPDATE main.bookmarks SET parentid = ("
+ "SELECT id FROM main.bookmarks AS b1 WHERE b1.title = ("
+ "SELECT folder FROM old_db.bookmarks WHERE title = main.bookmarks.title));"
+ "COMMIT;";
+ const gchar* detach_stmt = "DETACH DATABASE old_db;";
+
+ *errmsg = NULL;
+ sql_errcode = sqlite3_exec (db, attach_stmt, NULL, NULL, &sql_errmsg);
+ sqlite3_free (attach_stmt);
+
+ if (sql_errcode != SQLITE_OK)
+ {
+ _APPEND_TO_SQL_ERRORMSG (_("failed to ATTACH old db"));
+ goto convert_failed;
+ }
+
+ if (sqlite3_exec (db, convert_stmts, NULL, NULL, &sql_errmsg) != SQLITE_OK)
+ {
+ failure = TRUE;
+ _APPEND_TO_SQL_ERRORMSG (_("failed to import from old db"));
+
+ /* try to get back to previous state */
+ if (sqlite3_exec (db, "ROLLBACK TRANSACTION;", NULL, NULL, &sql_errmsg) != SQLITE_OK)
+ _APPEND_TO_SQL_ERRORMSG (_("failed to rollback the transaction"));
+ }
+
+ if (sqlite3_exec (db, detach_stmt, NULL, NULL, &sql_errmsg) != SQLITE_OK)
+ _APPEND_TO_SQL_ERRORMSG (_("failed to DETACH "));
+
+ if (failure)
+ {
+ convert_failed:
+ *errmsg = g_string_free (errmsg_str, FALSE);
+ g_print ("ERRORR: %s\n", errmsg_str->str);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+#undef _APPEND_TO_SQL_ERRORMSG
+
sqlite3*
midori_bookmarks_initialize (KatzeArray* array,
- const gchar* filename,
char** errmsg)
{
sqlite3* db;
+ gchar* oldfile;
+ gchar* newfile;
+ gboolean newfile_did_exist, oldfile_exists;
+ const gchar* create_stmt;
+ gchar* sql_errmsg = NULL;
+ gchar* import_errmsg = NULL;
- if (sqlite3_open (filename, &db) != SQLITE_OK)
+ g_return_val_if_fail (errmsg != NULL, NULL);
+
+ oldfile = g_build_filename (midori_paths_get_config_dir (), "bookmarks.db", NULL);
+ oldfile_exists = g_access (oldfile, F_OK) == 0;
+ newfile = g_build_filename (midori_paths_get_config_dir (), "bookmarks_v2.db", NULL);
+ newfile_did_exist = g_access (newfile, F_OK) == 0;
+
+ /* sqlite3_open will create the file if it did not exists already */
+ if (sqlite3_open (newfile, &db) != SQLITE_OK)
{
- if (errmsg)
- *errmsg = g_strdup_printf (_("Failed to open database: %s\n"),
- sqlite3_errmsg (db));
- sqlite3_close (db);
- return NULL;
+ if (db)
+ *errmsg = g_strdup_printf (_("failed to open database: %s\n"),
+ sqlite3_errmsg (db));
+ else
+ *errmsg = g_strdup (_("failed to open database\n"));
+
+ goto init_failed;
}
#ifdef G_ENABLE_DEBUG
- if (g_getenv ("MIDORI_BOOKMARKS_DEBUG"))
+ if (midori_debug ("bookmarks"))
sqlite3_trace (db, midori_bookmarks_dbtracer, NULL);
#endif
- if (sqlite3_exec (db,
- "CREATE TABLE IF NOT EXISTS "
- "bookmarks (uri text, title text, folder text, "
- "desc text, app integer, toolbar integer);",
- NULL, NULL, errmsg) != SQLITE_OK)
+ create_stmt = /* Table structure */
+ "CREATE TABLE IF NOT EXISTS bookmarks "
+ "(id INTEGER PRIMARY KEY AUTOINCREMENT, "
+ "parentid INTEGER DEFAULT NULL, "
+ "title TEXT, uri TEXT, desc TEXT, app INTEGER, toolbar INTEGER, "
+ "pos_panel INTEGER, pos_bar INTEGER, "
+ "created DATE DEFAULT CURRENT_TIMESTAMP, "
+ "last_visit DATE, visit_count INTEGER DEFAULT 0, "
+ "nick TEXT, "
+ "FOREIGN KEY(parentid) REFERENCES bookmarks(id) "
+ "ON DELETE CASCADE); PRAGMA foreign_keys = ON;"
+
+ /* trigger: insert panel position */
+ "CREATE TRIGGER IF NOT EXISTS bookmarkInsertPosPanel "
+ "AFTER INSERT ON bookmarks FOR EACH ROW "
+ "BEGIN UPDATE bookmarks SET pos_panel = ("
+ "SELECT ifnull(MAX(pos_panel),0)+1 FROM bookmarks WHERE "
+ "(NEW.parentid IS NOT NULL AND parentid = NEW.parentid) "
+ "OR (NEW.parentid IS NULL AND parentid IS NULL)) "
+ "WHERE id = NEW.id; END;"
+
+ /* trigger: insert Bookmarkbar position */
+ "CREATE TRIGGER IF NOT EXISTS bookmarkInsertPosBar "
+ "AFTER INSERT ON bookmarks FOR EACH ROW WHEN NEW.toolbar=1 "
+ "BEGIN UPDATE bookmarks SET pos_bar = ("
+ "SELECT ifnull(MAX(pos_bar),0)+1 FROM bookmarks WHERE "
+ "((NEW.parentid IS NOT NULL AND parentid = NEW.parentid) "
+ "OR (NEW.parentid IS NULL AND parentid IS NULL)) AND toolbar=1) "
+ "WHERE id = NEW.id; END;"
+
+ /* trigger: update panel position */
+ "CREATE TRIGGER IF NOT EXISTS bookmarkUpdatePosPanel "
+ "BEFORE UPDATE OF parentid ON bookmarks FOR EACH ROW "
+ "WHEN ((NEW.parentid IS NULL OR OLD.parentid IS NULL) "
+ "AND NEW.parentid IS NOT OLD.parentid) OR "
+ "((NEW.parentid IS NOT NULL AND OLD.parentid IS NOT NULL) "
+ "AND NEW.parentid!=OLD.parentid) "
+ "BEGIN UPDATE bookmarks SET pos_panel = pos_panel-1 "
+ "WHERE ((OLD.parentid IS NOT NULL AND parentid = OLD.parentid) "
+ "OR (OLD.parentid IS NULL AND parentid IS NULL)) AND pos_panel > OLD.pos_panel; "
+ "UPDATE bookmarks SET pos_panel = ("
+ "SELECT ifnull(MAX(pos_panel),0)+1 FROM bookmarks "
+ "WHERE (NEW.parentid IS NOT NULL AND parentid = NEW.parentid) "
+ "OR (NEW.parentid IS NULL AND parentid IS NULL)) "
+ "WHERE id = OLD.id; END;"
+
+ /* trigger: update Bookmarkbar position */
+ "CREATE TRIGGER IF NOT EXISTS bookmarkUpdatePosBar0 "
+ "AFTER UPDATE OF parentid, toolbar ON bookmarks FOR EACH ROW "
+ "WHEN ((NEW.parentid IS NULL OR OLD.parentid IS NULL) "
+ "AND NEW.parentid IS NOT OLD.parentid) "
+ "OR ((NEW.parentid IS NOT NULL AND OLD.parentid IS NOT NULL) "
+ "AND NEW.parentid!=OLD.parentid) OR (OLD.toolbar=1 AND NEW.toolbar=0) "
+ "BEGIN UPDATE bookmarks SET pos_bar = NULL WHERE id = NEW.id; "
+ "UPDATE bookmarks SET pos_bar = pos_bar-1 "
+ "WHERE ((OLD.parentid IS NOT NULL AND parentid = OLD.parentid) "
+ "OR (OLD.parentid IS NULL AND parentid IS NULL)) AND pos_bar > OLD.pos_bar; END;"
+
+ /* trigger: update Bookmarkbar position */
+ "CREATE TRIGGER IF NOT EXISTS bookmarkUpdatePosBar1 "
+ "BEFORE UPDATE OF parentid, toolbar ON bookmarks FOR EACH ROW "
+ "WHEN ((NEW.parentid IS NULL OR OLD.parentid IS NULL) "
+ "AND NEW.parentid IS NOT OLD.parentid) OR "
+ "((NEW.parentid IS NOT NULL AND OLD.parentid IS NOT NULL) "
+ "AND NEW.parentid!=OLD.parentid) OR (OLD.toolbar=0 AND NEW.toolbar=1) "
+ "BEGIN UPDATE bookmarks SET pos_bar = ("
+ "SELECT ifnull(MAX(pos_bar),0)+1 FROM bookmarks WHERE "
+ "(NEW.parentid IS NOT NULL AND parentid = NEW.parentid) "
+ "OR (NEW.parentid IS NULL AND parentid IS NULL)) "
+ "WHERE id = OLD.id; END;"
+
+ /* trigger: delete panel position */
+ "CREATE TRIGGER IF NOT EXISTS bookmarkDeletePosPanel "
+ "AFTER DELETE ON bookmarks FOR EACH ROW "
+ "BEGIN UPDATE bookmarks SET pos_panel = pos_panel-1 "
+ "WHERE ((OLD.parentid IS NOT NULL AND parentid = OLD.parentid) "
+ "OR (OLD.parentid IS NULL AND parentid IS NULL)) AND pos_panel > OLD.pos_panel; END;"
+
+ /* trigger: delete Bookmarkbar position */
+ "CREATE TRIGGER IF NOT EXISTS bookmarkDeletePosBar "
+ "AFTER DELETE ON bookmarks FOR EACH ROW WHEN OLD.toolbar=1 "
+ "BEGIN UPDATE bookmarks SET pos_bar = pos_bar-1 "
+ "WHERE ((OLD.parentid IS NOT NULL AND parentid = OLD.parentid) "
+ "OR (OLD.parentid IS NULL AND parentid IS NULL)) AND pos_bar > OLD.pos_bar; END;";
+
+
+ if (newfile_did_exist)
+ {
+ /* we are done */
+ goto init_success;
+ }
+ else
+ {
+ /* initial creation */
+ if (sqlite3_exec (db, create_stmt, NULL, NULL, &sql_errmsg) != SQLITE_OK)
+ {
+
+ if (errmsg)
+ {
+ if (sql_errmsg)
+ {
+ *errmsg = g_strdup_printf (_("could not create bookmarks table: %s\n"), sql_errmsg);
+ sqlite3_free (sql_errmsg);
+ }
+ else
+ *errmsg = g_strdup (_("could not create bookmarks table"));
+ }
+
+ /* we can as well remove the new file */
+ g_unlink (newfile);
+ goto init_failed;
+ }
+
+ }
+
+ if (oldfile_exists)
+ /* import from old db */
+ if (!midori_bookmarks_import_from_old_db (db, oldfile, &import_errmsg))
+ {
+ if (errmsg)
+ {
+ if (import_errmsg)
+ {
+ *errmsg = g_strdup_printf (_("could not import from old database: %s\n"), import_errmsg);
+ g_free (import_errmsg);
+ }
+ else
+ *errmsg = g_strdup_printf (_("could not import from old database"));
+ }
+ }
+
+ init_success:
+ g_free (newfile);
+ g_free (oldfile);
+ g_signal_connect (array, "add-item",
+ G_CALLBACK (midori_bookmarks_add_item_cb), db);
+ g_signal_connect (array, "remove-item",
+ G_CALLBACK (midori_bookmarks_remove_item_cb), db);
+
+ return db;
+
+ init_failed:
+ g_free (newfile);
+ g_free (oldfile);
+
+ if (db)
+ sqlite3_close (db);
+
return NULL;
- g_signal_connect (array, "add-item",
- G_CALLBACK (midori_bookmarks_add_item_cb), db);
- g_signal_connect (array, "remove-item",
- G_CALLBACK (midori_bookmarks_remove_item_cb), db);
- return db;
}
void
@@ -112,5 +331,5 @@ midori_bookmarks_import (const gchar* filename,
g_error_free (error);
return;
}
- midori_bookmarks_import_array_db (db, bookmarks, "");
+ midori_bookmarks_import_array_db (db, bookmarks, 0);
}
diff --git a/midori/midori-bookmarks.h b/midori/midori-bookmarks.h
index a5f38ce1..e4a3f8d6 100644
--- a/midori/midori-bookmarks.h
+++ b/midori/midori-bookmarks.h
@@ -25,7 +25,6 @@ midori_bookmarks_remove_item_cb (KatzeArray* array,
sqlite3*
midori_bookmarks_initialize (KatzeArray* array,
- const gchar* filename,
char** errmsg);
void
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index de250d4f..12da322e 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -13,13 +13,13 @@
#include "midori-browser.h"
+#include "midori-app.h"
#include "midori-array.h"
#include "midori-view.h"
#include "midori-preferences.h"
#include "midori-panel.h"
#include "midori-locationaction.h"
#include "midori-searchaction.h"
-#include "midori-panedaction.h"
#include "midori-findbar.h"
#include "midori-transferbar.h"
#include "midori-platform.h"
@@ -32,11 +32,16 @@
#include
#include
+#include
+
#ifdef HAVE_GRANITE
#include
#endif
-#include
+#ifdef HAVE_ZEITGEIST
+ #include
+#endif
+
#ifdef HAVE_UNISTD_H
#include
#endif
@@ -95,7 +100,7 @@ struct _MidoriBrowser
KatzeArray* trash;
KatzeArray* search_engines;
KatzeArray* history;
- GKeyFile* speeddial;
+ MidoriSpeedDial* dial;
gboolean show_tabs;
gboolean show_navigationbar;
@@ -140,6 +145,7 @@ enum
ADD_TAB,
REMOVE_TAB,
MOVE_TAB,
+ SWITCH_TAB,
ACTIVATE_ACTION,
ADD_DOWNLOAD,
SEND_NOTIFICATION,
@@ -174,7 +180,11 @@ midori_browser_get_property (GObject* object,
void
midori_bookmarks_import_array_db (sqlite3* db,
KatzeArray* array,
- gchar* folder);
+ gint64 parentid);
+
+gboolean
+midori_bookmarks_update_item_db (sqlite3* db,
+ KatzeItem* item);
void
midori_browser_open_bookmark (MidoriBrowser* browser,
@@ -196,7 +206,8 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser,
GtkWidget*
midori_panel_construct_menu_item (MidoriPanel* panel,
- MidoriViewable* viewable);
+ MidoriViewable* viewable,
+ gboolean popup);
static void
midori_browser_settings_notify (MidoriWebSettings* web_settings,
@@ -251,12 +262,12 @@ static gboolean
_toggle_tabbar_smartly (MidoriBrowser* browser,
gboolean ignore_fullscreen)
{
+ gboolean has_tabs = midori_browser_get_n_pages (browser) > 1;
#ifdef HAVE_GRANITE
- gboolean has_tabs = !(midori_browser_is_fullscreen (browser) || ignore_fullscreen);
- /* FIXME: Toggle tabbar visibility */
+ gboolean show_tabs = !midori_browser_is_fullscreen (browser) || ignore_fullscreen;
+ granite_widgets_dynamic_notebook_set_show_tabs (
+ GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), show_tabs);
#else
- gboolean has_tabs =
- gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), 1) != NULL;
gboolean show_tabs =
browser->show_tabs
&& (!midori_browser_is_fullscreen (browser) || ignore_fullscreen)
@@ -304,16 +315,11 @@ midori_browser_update_secondary_icon (MidoriBrowser* browser,
}
static void
-_midori_browser_update_interface (MidoriBrowser* browser)
+_midori_browser_update_interface (MidoriBrowser* browser,
+ MidoriView* view)
{
- GtkWidget* widget = midori_browser_get_current_tab (browser);
- MidoriView* view = MIDORI_VIEW (widget);
- gboolean loading = midori_view_get_load_status (view) != MIDORI_LOAD_FINISHED;
- gboolean can_reload = midori_view_can_reload (view);
GtkAction* action;
- _action_set_sensitive (browser, "Reload", can_reload);
- _action_set_sensitive (browser, "Stop", can_reload && loading);
_action_set_sensitive (browser, "Back", midori_view_can_go_back (view));
_action_set_sensitive (browser, "Forward", midori_view_can_go_forward (view));
_action_set_sensitive (browser, "Previous",
@@ -324,7 +330,6 @@ _midori_browser_update_interface (MidoriBrowser* browser)
_action_set_sensitive (browser, "AddSpeedDial", !midori_view_is_blank (view));
_action_set_sensitive (browser, "BookmarkAdd", !midori_view_is_blank (view));
_action_set_sensitive (browser, "SaveAs", midori_view_can_save (view));
- _action_set_sensitive (browser, "Print", midori_view_can_print (view));
_action_set_sensitive (browser, "ZoomIn", midori_view_can_zoom_in (view));
_action_set_sensitive (browser, "ZoomOut", midori_view_can_zoom_out (view));
_action_set_sensitive (browser, "ZoomNormal",
@@ -333,52 +338,34 @@ _midori_browser_update_interface (MidoriBrowser* browser)
midori_view_can_view_source (view));
_action_set_sensitive (browser, "SourceView",
midori_view_can_view_source (view));
- _action_set_sensitive (browser, "Find",
- midori_view_can_find (view));
- _action_set_sensitive (browser, "FindNext",
- midori_view_can_find (view));
- _action_set_sensitive (browser, "FindPrevious",
- midori_view_can_find (view));
- midori_findbar_set_can_find (MIDORI_FINDBAR (browser->find),
- midori_view_can_find (view));
- action = _action_by_name (browser, "ReloadStop");
- if (!loading)
+ action = _action_by_name (browser, "NextForward");
+ if (midori_view_can_go_forward (view))
{
g_object_set (action,
- "stock-id", GTK_STOCK_REFRESH,
- "tooltip", _("Reload the current page"),
- "sensitive", can_reload, NULL);
- katze_item_set_meta_integer (midori_view_get_proxy_item (view),
- "dont-write-history", -1);
+ "stock-id", GTK_STOCK_GO_FORWARD,
+ "tooltip", _("Go forward to the next page"),
+ "sensitive", TRUE, NULL);
}
else
{
g_object_set (action,
- "stock-id", GTK_STOCK_STOP,
- "tooltip", _("Stop loading the current page"), NULL);
+ "stock-id", GTK_STOCK_MEDIA_NEXT,
+ "tooltip", _("Go to the next sub-page"),
+ "sensitive", midori_view_get_next_page (view) != NULL, NULL);
}
- #if HAVE_HILDON
- #if HILDON_CHECK_VERSION (2, 2, 0)
- hildon_gtk_window_set_progress_indicator (GTK_WINDOW (browser), loading);
- #endif
- #else
- gtk_widget_set_sensitive (browser->throbber, loading);
- katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading);
- #endif
-
action = _action_by_name (browser, "Location");
midori_location_action_set_security_hint (
MIDORI_LOCATION_ACTION (action), midori_view_get_security (view));
- midori_browser_update_secondary_icon (browser, MIDORI_VIEW (view), action);
+ midori_browser_update_secondary_icon (browser, view, action);
}
static void
_midori_browser_set_statusbar_text (MidoriBrowser* browser,
+ MidoriView* view,
const gchar* text)
{
- GtkWidget* view = midori_browser_get_current_tab (browser);
#if GTK_CHECK_VERSION (3, 2, 0)
gboolean is_location = FALSE;
#else
@@ -395,7 +382,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser,
&& text && *text)
{
#if GTK_CHECK_VERSION (3, 2, 0)
- midori_view_set_overlay_text (MIDORI_VIEW (view), browser->statusbar_text);
+ midori_view_set_overlay_text (view, browser->statusbar_text);
#else
GtkAction* action = _action_by_name (browser, "Location");
MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
@@ -406,13 +393,13 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser,
else if (!gtk_widget_get_visible (browser->statusbar) && !is_location)
{
#if GTK_CHECK_VERSION (3, 2, 0)
- midori_view_set_overlay_text (MIDORI_VIEW (view), NULL);
+ midori_view_set_overlay_text (view, NULL);
#else
GtkAction* action = _action_by_name (browser, "Location");
MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
midori_browser_update_secondary_icon (browser, view, action);
midori_location_action_set_text (location_action,
- midori_view_get_display_uri (MIDORI_VIEW (view)));
+ midori_view_get_display_uri (view));
#endif
}
else
@@ -436,18 +423,74 @@ static void
_midori_browser_update_progress (MidoriBrowser* browser,
MidoriView* view)
{
- MidoriLocationAction* action;
- gdouble progress;
+ GtkAction* action;
+ gdouble progress = midori_view_get_progress (view);
+ gboolean loading = progress > 0.0;
- action = MIDORI_LOCATION_ACTION (_action_by_name (browser, "Location"));
- progress = midori_view_get_progress (view);
- /* When we are finished, we don't want to *see* progress anymore */
- if (midori_view_get_load_status (view) == MIDORI_LOAD_FINISHED)
- progress = 0.0;
- /* When loading we want to see at minimum 10% progress */
+ action = _action_by_name (browser, "Location");
+ midori_location_action_set_progress (MIDORI_LOCATION_ACTION (action), progress);
+
+ _action_set_sensitive (browser, "Reload", !loading);
+ _action_set_sensitive (browser, "Stop", loading);
+
+ action = _action_by_name (browser, "ReloadStop");
+ if (!loading)
+ {
+ g_object_set (action,
+ "stock-id", GTK_STOCK_REFRESH,
+ "tooltip", _("Reload the current page"), NULL);
+ katze_item_set_meta_integer (midori_view_get_proxy_item (view),
+ "dont-write-history", -1);
+ }
else
- progress = CLAMP (progress, 0.1, 1.0);
- midori_location_action_set_progress (action, progress);
+ {
+ g_object_set (action,
+ "stock-id", GTK_STOCK_STOP,
+ "tooltip", _("Stop loading the current page"), NULL);
+ }
+
+ gtk_widget_set_sensitive (browser->throbber, loading);
+ katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading);
+}
+
+/**
+ * midori_browser_update_history:
+ * @item: a #KatzeItem
+ * @type: "website", "bookmark" or "download"
+ * @event: "access", "leave", "modify", "delete"
+ *
+ * Since: 0.4.7
+ **/
+void
+midori_browser_update_history (KatzeItem* item,
+ const gchar* type,
+ const gchar* event)
+{
+ #ifdef HAVE_ZEITGEIST
+ const gchar* inter;
+ if (strstr (event, "access"))
+ inter = ZEITGEIST_ZG_ACCESS_EVENT;
+ else if (strstr (event, "leave"))
+ inter = ZEITGEIST_ZG_LEAVE_EVENT;
+ else if (strstr (event, "modify"))
+ inter = ZEITGEIST_ZG_MODIFY_EVENT;
+ else if (strstr (event, "create"))
+ inter = ZEITGEIST_ZG_CREATE_EVENT;
+ else if (strstr (event, "delete"))
+ inter = ZEITGEIST_ZG_DELETE_EVENT;
+ else
+ g_assert_not_reached ();
+ zeitgeist_log_insert_events_no_reply (zeitgeist_log_get_default (),
+ zeitgeist_event_new_full (inter, ZEITGEIST_ZG_USER_ACTIVITY,
+ "application://midori.desktop",
+ zeitgeist_subject_new_full (
+ item->uri,
+ strstr (type, "bookmark") ? ZEITGEIST_NFO_BOOKMARK : ZEITGEIST_NFO_WEBSITE,
+ zeitgeist_manifestation_for_uri (item->uri),
+ katze_item_get_meta_string (item, "mime-type"), NULL, item->name, NULL),
+ NULL),
+ NULL);
+ #endif
}
static void
@@ -476,6 +519,8 @@ midori_browser_update_history_title (MidoriBrowser* browser,
g_printerr (_("Failed to update title: %s\n"), sqlite3_errmsg (db));
sqlite3_reset (stmt);
sqlite3_clear_bindings (stmt);
+
+ midori_browser_update_history (item, "website", "access");
}
static void
@@ -497,7 +542,7 @@ midori_view_notify_icon_cb (MidoriView* view,
if (midori_browser_get_current_tab (browser) != (GtkWidget*)view)
return;
- if (sokoke_is_app_or_private ())
+ if (midori_paths_is_readonly () /* APP, PRIVATE */)
gtk_window_set_icon (GTK_WINDOW (browser), midori_view_get_icon (view));
}
@@ -523,8 +568,8 @@ midori_view_notify_load_status_cb (GtkWidget* widget,
g_object_notify (G_OBJECT (browser), "uri");
}
- _midori_browser_update_interface (browser);
- _midori_browser_set_statusbar_text (browser, NULL);
+ _midori_browser_update_interface (browser, view);
+ _midori_browser_set_statusbar_text (browser, view, NULL);
/* This is a hack to ensure that the address entry is focussed
with speed dial open. */
@@ -580,9 +625,6 @@ midori_view_notify_title_cb (GtkWidget* widget,
MidoriBrowser* browser)
{
MidoriView* view = MIDORI_VIEW (widget);
- const gchar* title;
-
- title = midori_view_get_display_title (view);
if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED)
{
@@ -612,7 +654,7 @@ midori_view_notify_title_cb (GtkWidget* widget,
}
if (widget == midori_browser_get_current_tab (browser))
- midori_browser_set_title (browser, title);
+ midori_browser_set_title (browser, midori_view_get_display_title (view));
}
static void
@@ -622,9 +664,7 @@ midori_view_notify_minimized_cb (GtkWidget* widget,
{
if (katze_object_get_boolean (widget, "minimized"))
{
- #ifdef HAVE_GRANITE
- /* FIXME */
- #else
+ #ifndef HAVE_GRANITE
GtkNotebook* notebook = GTK_NOTEBOOK (browser->notebook);
GtkWidget* label = gtk_notebook_get_tab_label (notebook, widget);
gtk_widget_set_size_request (label, -1, -1);
@@ -654,15 +694,16 @@ midori_view_notify_statusbar_text_cb (GtkWidget* view,
if (view == midori_browser_get_current_tab (browser))
{
g_object_get (view, "statusbar-text", &text, NULL);
- _midori_browser_set_statusbar_text (browser, text);
+ _midori_browser_set_statusbar_text (browser, MIDORI_VIEW (view), text);
g_free (text);
}
}
static GtkWidget*
-midori_bookmark_folder_button_new (KatzeArray* array,
- gboolean new_bookmark,
- const gchar* selected)
+midori_bookmark_folder_button_new (KatzeArray* array,
+ gboolean new_bookmark,
+ gint64 selected,
+ gint64 parentid)
{
GtkListStore* model;
GtkWidget* combo;
@@ -671,16 +712,16 @@ midori_bookmark_folder_button_new (KatzeArray* array,
sqlite3* db;
sqlite3_stmt* statement;
gint result;
- const gchar* sqlcmd = "SELECT title from bookmarks where uri=''";
+ const gchar* sqlcmd = "SELECT title, id FROM bookmarks WHERE uri='' ORDER BY title ASC";
- model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
+ model = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT64);
combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "text", 0);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "ellipsize", 1);
gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
- 0, _("Toplevel folder"), 1, PANGO_ELLIPSIZE_END, -1);
+ 0, _("Bookmarks"), 1, PANGO_ELLIPSIZE_END, 2, (gint64)0, -1);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
db = g_object_get_data (G_OBJECT (array), "db");
@@ -690,34 +731,45 @@ midori_bookmark_folder_button_new (KatzeArray* array,
while ((result = sqlite3_step (statement)) == SQLITE_ROW)
{
const unsigned char* name = sqlite3_column_text (statement, 0);
- gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
- 0, name, 1, PANGO_ELLIPSIZE_END, -1);
- if (!new_bookmark && !g_strcmp0 (selected, (gchar*)name))
- gtk_combo_box_set_active (GTK_COMBO_BOX (combo), n);
- n++;
+ gint64 id = sqlite3_column_int64 (statement, 1);
+
+ /* do not show the folder itself */
+ if (id != selected)
+ {
+ gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
+ 0, name, 1, PANGO_ELLIPSIZE_END, 2, id, -1);
+
+ if (!new_bookmark && id == parentid)
+ gtk_combo_box_set_active (GTK_COMBO_BOX (combo), n);
+ n++;
+ }
}
if (n < 2)
gtk_widget_set_sensitive (combo, FALSE);
return combo;
}
-static gchar*
+static gint64
midori_bookmark_folder_button_get_active (GtkWidget* combo)
{
- gchar* selected = NULL;
+ gint64 id;
GtkTreeIter iter;
- g_return_val_if_fail (GTK_IS_COMBO_BOX (combo), NULL);
+ g_return_val_if_fail (GTK_IS_COMBO_BOX (combo), 0);
if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
{
+ gchar* selected = NULL;
GtkTreeModel* model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
- gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &selected, -1);
- if (g_str_equal (selected, _("Toplevel folder")))
- katze_assign (selected, g_strdup (""));
+ gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &selected, 2, &id, -1);
+
+ if (g_str_equal (selected, _("Bookmarks")))
+ id = 0;
+
+ g_free (selected);
}
- return selected;
+ return id;
}
static void
@@ -749,8 +801,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
const gchar* title;
GtkWidget* dialog;
GtkWidget* content_area;
- GtkSizeGroup* sizegroup;
GtkWidget* view;
+ GtkWidget* vbox;
GtkWidget* hbox;
GtkWidget* label;
const gchar* value;
@@ -780,7 +832,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
/* FIXME: granite: should return GtkWidget* like GTK+ */
dialog = (GtkWidget*)granite_widgets_pop_over_new ();
granite_widgets_pop_over_move_to_widget (
- GRANITE_WIDGETS_POP_OVER (dialog), proxy);
+ GRANITE_WIDGETS_POP_OVER (dialog), proxy, TRUE);
}
else
#endif
@@ -791,12 +843,31 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
+
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox),
+ gtk_image_new_from_stock (STOCK_BOOKMARK_ADD, GTK_ICON_SIZE_DIALOG), FALSE, FALSE, 0);
+ vbox = gtk_vbox_new (FALSE, 0);
+ #ifdef HAVE_GRANITE
+ if (proxy != NULL)
+ {
+ gchar* markup = g_strdup_printf ("%s ", title);
+ label = gtk_label_new (markup);
+ g_free (markup);
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ }
+ #endif
+ label = gtk_label_new (_("Type a name for this bookmark and choose where to keep it."));
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 12);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 12);
+
+ gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
gtk_window_set_icon_name (GTK_WINDOW (dialog),
new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_REMOVE);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_container_set_border_width (GTK_CONTAINER (content_area), 5);
- sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
if (!bookmark)
{
@@ -813,11 +884,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
"name", midori_view_get_display_title (MIDORI_VIEW (view)), NULL);
}
- hbox = gtk_hbox_new (FALSE, 8);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
- label = gtk_label_new_with_mnemonic (_("_Title:"));
- gtk_size_group_add_widget (sizegroup, label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
entry_title = gtk_entry_new ();
gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE);
value = katze_item_get_name (bookmark);
@@ -826,18 +892,11 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
GTK_DIALOG (dialog));
g_signal_connect (entry_title, "changed",
G_CALLBACK (midori_browser_edit_bookmark_title_changed_cb), dialog);
- gtk_box_pack_start (GTK_BOX (hbox), entry_title, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (content_area), hbox);
- gtk_widget_show_all (hbox);
+ gtk_container_add (GTK_CONTAINER (content_area), entry_title);
entry_uri = NULL;
if (!is_folder)
{
- hbox = gtk_hbox_new (FALSE, 8);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
- label = gtk_label_new_with_mnemonic (_("_Address:"));
- gtk_size_group_add_widget (sizegroup, label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
entry_uri = katze_uri_entry_new (
#if GTK_CHECK_VERSION (2, 20, 0)
gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT));
@@ -851,72 +910,41 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
#endif
gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE);
gtk_entry_set_text (GTK_ENTRY (entry_uri), katze_item_get_uri (bookmark));
- gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (content_area), hbox);
- gtk_widget_show_all (hbox);
+ gtk_container_add (GTK_CONTAINER (content_area), entry_uri);
}
- hbox = gtk_hbox_new (FALSE, 8);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
- label = gtk_label_new_with_mnemonic (_("_Folder:"));
- gtk_size_group_add_widget (sizegroup, label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
combo_folder = midori_bookmark_folder_button_new (browser->bookmarks,
- new_bookmark, katze_item_get_meta_string (bookmark, "folder"));
- gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (content_area), hbox);
- gtk_widget_show_all (hbox);
+ new_bookmark, katze_item_get_meta_integer (bookmark, "id"),
+ katze_item_get_meta_integer (bookmark, "parentid"));
+ gtk_container_add (GTK_CONTAINER (content_area), combo_folder);
if (new_bookmark && !is_folder)
{
- 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);
+ gtk_container_add (GTK_CONTAINER (content_area), label);
}
- hbox = gtk_hbox_new (FALSE, 8);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 1);
- label = gtk_label_new (NULL);
- gtk_size_group_add_widget (sizegroup, label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
check_toolbar = gtk_check_button_new_with_mnemonic (_("Show in the tool_bar"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_toolbar),
katze_item_get_meta_boolean (bookmark, "toolbar"));
- gtk_box_pack_start (GTK_BOX (hbox), check_toolbar, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (content_area), hbox);
- gtk_widget_show_all (hbox);
+ gtk_container_add (GTK_CONTAINER (content_area), check_toolbar);
check_app = NULL;
if (!is_folder)
{
- hbox = gtk_hbox_new (FALSE, 8);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 1);
- label = gtk_label_new (NULL);
- gtk_size_group_add_widget (sizegroup, label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
check_app = gtk_check_button_new_with_mnemonic (_("Run as _web application"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_app),
katze_item_get_meta_boolean (bookmark, "app"));
- gtk_box_pack_start (GTK_BOX (hbox), check_app, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (content_area), hbox);
- gtk_widget_show_all (hbox);
+ gtk_container_add (GTK_CONTAINER (content_area), check_app);
}
+ gtk_widget_show_all (content_area);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
{
- gchar* selected;
-
- if (!new_bookmark)
- katze_array_remove_item (browser->bookmarks, bookmark);
+ gint64 selected;
katze_item_set_name (bookmark,
gtk_entry_get_text (GTK_ENTRY (entry_title)));
@@ -931,13 +959,17 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
}
selected = midori_bookmark_folder_button_get_active (combo_folder);
- katze_item_set_meta_string (bookmark, "folder", selected);
- katze_array_add_item (browser->bookmarks, bookmark);
+ katze_item_set_meta_integer (bookmark, "parentid", selected);
+
+ if (new_bookmark)
+ katze_array_add_item (browser->bookmarks, bookmark);
+ else
+ midori_bookmarks_update_item_db (db, bookmark);
+ midori_browser_update_history (bookmark, "bookmark", new_bookmark ? "create" : "modify");
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)))
if (!gtk_widget_get_visible (browser->bookmarkbar))
_action_set_active (browser, "Bookmarkbar", TRUE);
- g_free (selected);
return_status = TRUE;
}
if (gtk_widget_get_visible (browser->bookmarkbar))
@@ -952,54 +984,8 @@ midori_browser_prepare_download (MidoriBrowser* browser,
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);
- gchar* path = g_file_get_path (folder);
- gboolean can_write = g_access (path, W_OK) == 0;
- g_free (path);
- g_object_unref (file);
- g_object_unref (folder);
- if (free_space < total_size || !can_write)
- {
- gchar* message;
- gchar* detailed_message;
-
- if (!can_write)
- {
- message = g_strdup_printf (
- _("The file \"%s\" can't be saved in this folder."), &uri[7]);
- detailed_message = g_strdup_printf (
- _("You don't have permission to write in this location."));
- }
- else if (free_space < total_size)
- {
- gchar* total_size_string = g_format_size (total_size);
- gchar* free_space_string = g_format_size (free_space);
- message = g_strdup_printf (
- _("There is not enough free space to download \"%s\"."),
- &uri[7]);
- detailed_message = g_strdup_printf (
- _("The file needs %s but only %s are left."),
- total_size_string, free_space_string);
- g_free (total_size_string);
- g_free (free_space_string);
- }
- else
- g_assert_not_reached ();
-
- sokoke_message_dialog (GTK_MESSAGE_ERROR, message, detailed_message, FALSE);
- g_free (message);
- g_free (detailed_message);
- g_object_unref (download);
+ if (!midori_download_has_enough_space (download, uri))
return FALSE;
- }
-
webkit_download_set_destination_uri (download, uri);
g_signal_emit (browser, signals[ADD_DOWNLOAD], 0, download);
midori_transferbar_add_download_item (MIDORI_TRANSFERBAR (browser->transferbar), download);
@@ -1008,17 +994,60 @@ midori_browser_prepare_download (MidoriBrowser* browser,
return TRUE;
}
+static void
+midori_browser_save_resources (MidoriView* view,
+ const gchar* folder)
+{
+ WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view));
+ WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view);
+ WebKitWebDataSource* data_source = webkit_web_frame_get_data_source (frame);
+ GList* resources = webkit_web_data_source_get_subresources (data_source);
+ GList* list;
+
+ katze_mkdir_with_parents (folder, 0700);
+
+ for (list = resources; list; list = g_list_next (list))
+ {
+ WebKitWebResource* resource = WEBKIT_WEB_RESOURCE (list->data);
+ GString* data = webkit_web_resource_get_data (resource);
+
+ /* Resource could be adblocked, skip it in that case */
+ if (!g_strcmp0 (webkit_web_resource_get_uri (resource), "about:blank"))
+ continue;
+
+ gchar* sub_filename = midori_download_get_filename_suggestion_for_uri (
+ webkit_web_resource_get_mime_type (resource),
+ webkit_web_resource_get_uri (resource));
+ gchar* sub_path = g_build_filename (folder, sub_filename, NULL);
+ sub_path = midori_download_get_unique_filename (sub_path);
+ if (data)
+ {
+ GError* error = NULL;
+ if (!g_file_set_contents (sub_path, data->str, data->len, &error))
+ {
+ g_warning ("Failed to save %s: %s", sub_filename, error->message);
+ g_error_free (error);
+ }
+ }
+ else
+ g_warning ("Skipping empty resource %s", sub_filename);
+ g_free (sub_filename);
+ g_free (sub_path);
+ }
+ g_list_free (resources);
+}
+
static void
midori_browser_save_uri (MidoriBrowser* browser,
MidoriView* view,
const gchar* uri)
{
static gchar* last_dir = NULL;
- gboolean folder_set = FALSE;
GtkWidget* dialog;
+ const gchar* title = midori_view_get_display_title (view);
gchar* filename;
- gchar* dirname;
- gchar* last_slash;
+ gboolean file_only = TRUE;
+ GtkWidget* checkbox = NULL;
if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
@@ -1027,38 +1056,54 @@ midori_browser_save_uri (MidoriBrowser* browser,
GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE);
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
- if (uri)
+ if (uri == NULL)
+ uri = midori_view_get_display_uri (view);
+
+ if (midori_view_can_view_source (view))
{
- /* Base the start folder on the current view's uri if it is local */
- filename = g_filename_from_uri (uri, NULL, NULL);
- if (filename)
- {
- dirname = g_path_get_dirname (filename);
- if (dirname && g_file_test (dirname, G_FILE_TEST_IS_DIR))
- {
- gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname);
- folder_set = TRUE;
- }
-
- g_free (dirname);
- g_free (filename);
- }
-
- /* Try to provide a good default filename, UTF-8 encoded */
- filename = soup_uri_decode (uri);
- last_slash = g_strrstr (filename, "/") + 1;
- gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), last_slash);
- g_free (filename);
+ file_only = FALSE;
+ checkbox = gtk_check_button_new_with_mnemonic (_("Save associated _resources"));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE);
+ gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), checkbox);
}
- if (!folder_set && last_dir && *last_dir)
+ if (last_dir && *last_dir)
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir);
+ else
+ {
+ gchar* dirname = midori_uri_get_folder (uri);
+ if (dirname == NULL)
+ dirname = katze_object_get_string (browser->settings, "download-folder");
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname);
+ g_free (dirname);
+ }
+
+ if (!file_only && !g_str_equal (title, uri))
+ filename = midori_download_clean_filename (title);
+ else
+ {
+ gchar* mime_type = katze_object_get_object (view, "mime-type");
+ filename = midori_download_get_filename_suggestion_for_uri (mime_type, uri);
+ g_free (mime_type);
+ }
+ gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename);
+ g_free (filename);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
{
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
- midori_view_save_source (view, uri, filename);
-
+ if (checkbox != NULL)
+ file_only = !file_only && !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
+ if (!file_only && !g_str_equal (title, uri))
+ {
+ gchar* fullname = g_strconcat (filename, ".html", NULL);
+ midori_view_save_source (view, uri, fullname);
+ g_free (fullname);
+ }
+ else
+ midori_view_save_source (view, uri, filename);
+ if (!file_only)
+ midori_browser_save_resources (view, filename);
katze_assign (last_dir,
gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
}
@@ -1074,35 +1119,15 @@ midori_view_save_as_cb (GtkWidget* menuitem,
midori_browser_save_uri (browser, MIDORI_VIEW (view), uri);
}
-static gchar*
-midori_browser_speed_dial_get_next_free_slot (MidoriView* view)
+static void
+midori_browser_speed_dial_refresh_cb (MidoriSpeedDial* dial,
+ MidoriBrowser* browser)
{
- MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
- GKeyFile* key_file;
- guint slot_count = 0, slot = 1, i;
- gchar** groups;
-
- g_object_get (browser, "speed-dial", &key_file, NULL);
-
- groups = g_key_file_get_groups (key_file, NULL);
- for (i = 0; groups[i]; i++)
- {
- if (g_key_file_has_key (key_file, groups[i], "uri", NULL))
- slot_count++;
- }
-
- while (slot <= slot_count)
- {
- gchar* dial_id = g_strdup_printf ("Dial %d", slot);
- if (!g_key_file_has_group (key_file, dial_id))
- {
- g_free (dial_id);
- return g_strdup_printf ("s%d", slot);
- }
- g_free (dial_id);
- slot++;
- }
- return g_strdup_printf ("s%d", slot_count + 1);
+ GList* tabs = midori_browser_get_tabs (browser);
+ for (; tabs != NULL; tabs = g_list_next (tabs))
+ if (midori_view_is_blank (tabs->data))
+ midori_view_reload (tabs->data, FALSE);
+ g_list_free (tabs);
}
static void
@@ -1110,44 +1135,14 @@ midori_browser_add_speed_dial (MidoriBrowser* browser)
{
GdkPixbuf* img;
GtkWidget* view = midori_browser_get_current_tab (browser);
- gchar* uri = g_strdup (midori_view_get_display_uri (MIDORI_VIEW (view)));
- gchar* title = g_strdup (midori_view_get_display_title (MIDORI_VIEW (view)));
- gchar* slot_id = midori_browser_speed_dial_get_next_free_slot (MIDORI_VIEW (view));
-
- if (slot_id == NULL)
- {
- g_free (uri);
- g_free (title);
- return;
- }
if ((img = midori_view_get_snapshot (MIDORI_VIEW (view), 240, 160)))
{
- GKeyFile* key_file;
- gchar* dial_id = g_strdup_printf ("Dial %s", slot_id + 1);
- gchar* file_path = sokoke_build_thumbnail_path (uri);
- gchar* thumb_dir = g_build_path (G_DIR_SEPARATOR_S, g_get_user_cache_dir (),
- PACKAGE_NAME, "thumbnails", NULL);
- g_object_get (browser, "speed-dial", &key_file, NULL);
-
- g_key_file_set_string (key_file, dial_id, "uri", uri);
- g_key_file_set_string (key_file, dial_id, "title", title);
-
- if (!g_file_test (thumb_dir, G_FILE_TEST_EXISTS))
- katze_mkdir_with_parents (thumb_dir, 0700);
-
- gdk_pixbuf_save (img, file_path, "png", NULL, "compression", "7", NULL);
-
- midori_view_save_speed_dial_config (MIDORI_VIEW (view), key_file);
-
+ midori_speed_dial_add (browser->dial,
+ midori_view_get_display_uri (MIDORI_VIEW (view)),
+ midori_view_get_display_title (MIDORI_VIEW (view)), img);
g_object_unref (img);
- g_free (file_path);
- g_free (thumb_dir);
- g_free (dial_id);
}
- g_free (uri);
- g_free (title);
- g_free (slot_id);
}
@@ -1168,7 +1163,7 @@ midori_browser_tab_leave_notify_event_cb (GtkWidget* widget,
GdkEventCrossing* event,
MidoriBrowser* browser)
{
- _midori_browser_set_statusbar_text (browser, NULL);
+ _midori_browser_set_statusbar_text (browser, MIDORI_VIEW (widget), NULL);
return TRUE;
}
@@ -1196,6 +1191,8 @@ midori_view_attach_inspector_cb (GtkWidget* view,
gtk_widget_show_all (browser->inspector);
browser->inspector_view = inspector_view;
gtk_widget_destroy (toplevel);
+ if (!katze_object_get_boolean (browser->settings, "last-inspector-attached"))
+ g_object_set (browser->settings, "last-inspector-attached", TRUE, NULL);
}
static void
@@ -1209,6 +1206,8 @@ midori_view_detach_inspector_cb (GtkWidget* view,
gtk_container_remove (GTK_CONTAINER (scrolled), GTK_WIDGET (inspector_view));
gtk_container_add (GTK_CONTAINER (scrolled), browser->inspector_view);
gtk_widget_hide (paned);
+ if (katze_object_get_boolean (browser->settings, "last-inspector-attached"))
+ g_object_set (browser->settings, "last-inspector-attached", FALSE, NULL);
}
static void
@@ -1241,16 +1240,20 @@ midori_browser_view_copy_history (GtkWidget* view_to,
static gboolean
midori_browser_notify_new_tab_timeout_cb (MidoriBrowser *browser)
{
+ #ifndef G_OS_WIN32
gtk_window_set_opacity (GTK_WINDOW (browser), 1);
+ #endif
return G_SOURCE_REMOVE;
}
static void
-midori_browser_notify_new_tab (MidoriBrowser *browser)
+midori_browser_notify_new_tab (MidoriBrowser* browser)
{
if (katze_object_get_boolean (browser->settings, "flash-window-on-new-bg-tabs"))
{
+ #ifndef G_OS_WIN32
gtk_window_set_opacity (GTK_WINDOW (browser), 0.8);
+ #endif
g_timeout_add (100, (GSourceFunc) midori_browser_notify_new_tab_timeout_cb, browser);
}
}
@@ -1304,9 +1307,9 @@ midori_view_new_view_cb (GtkWidget* view,
gint n = midori_browser_add_tab (browser, new_view);
if (where != MIDORI_NEW_VIEW_BACKGROUND)
midori_browser_set_current_page (browser, n);
- else
- midori_browser_notify_new_tab (browser);
}
+ else
+ midori_browser_notify_new_tab (browser);
if (!user_initiated)
{
@@ -1325,24 +1328,6 @@ midori_view_new_view_cb (GtkWidget* view,
}
}
-static void
-midori_view_download_save_as_response_cb (GtkWidget* dialog,
- gint response,
- MidoriBrowser* browser)
-{
- WebKitDownload* download = g_object_get_data (G_OBJECT (dialog), "download");
- if (response == GTK_RESPONSE_OK)
- {
- gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
- if (midori_browser_prepare_download (browser, download, uri))
- webkit_download_start (download);
- g_free (uri);
- }
- else
- g_object_unref (download);
- gtk_widget_hide (dialog);
-}
-
static void
midori_browser_download_status_cb (WebKitDownload* download,
GParamSpec* pspec,
@@ -1372,77 +1357,6 @@ midori_browser_download_status_cb (WebKitDownload* download,
}
}
-static gchar*
-midori_browser_download_prepare_filename (gchar* filename)
-{
- if (g_file_test (filename, G_FILE_TEST_EXISTS))
- {
- int i = 1;
- const gchar* dot_pos;
- const gchar* last_separator;
- gchar* serial;
- GString* tmp_filename;
- gssize position;
-
- last_separator = strrchr (filename, G_DIR_SEPARATOR);
- dot_pos = strrchr ((last_separator) ? last_separator : filename, '.');
- position = dot_pos ? (dot_pos - filename) : (gssize) strlen (filename);
- tmp_filename = g_string_new (NULL);
-
- do
- {
- serial = g_strdup_printf ("-%d", i++);
- g_string_assign (tmp_filename, filename);
- g_string_insert (tmp_filename, position, serial);
- g_free (serial);
- } while (g_file_test (tmp_filename->str, G_FILE_TEST_EXISTS));
-
- g_free (filename);
- filename = g_string_free (tmp_filename, FALSE);
- }
- return filename;
-}
-
-static gchar*
-midori_browser_download_prepare_destination_uri (WebKitDownload* download,
- const gchar* folder)
-{
- gchar* suggested_filename;
- GFile* file_source;
- gchar* file_basename;
- gchar* download_dir = NULL;
- gchar* destination_uri;
- gchar* destination_filename;
- gchar* midori_tmp_dir;
-
- suggested_filename = sokoke_get_download_filename (download);
- file_source = g_file_new_for_uri (suggested_filename);
- g_free (suggested_filename);
- file_basename = g_file_get_basename (file_source);
- if (folder == NULL)
- {
- midori_tmp_dir = g_strconcat ("midori-", g_get_user_name (), NULL);
- download_dir = g_build_filename (g_get_tmp_dir (), midori_tmp_dir, NULL);
- g_free (midori_tmp_dir);
- }
- else
- download_dir = (gchar*)folder;
- destination_filename = g_build_filename (download_dir, file_basename, NULL);
- destination_filename = midori_browser_download_prepare_filename (destination_filename);
- destination_uri = g_filename_to_uri (destination_filename, NULL, NULL);
-
- if (!g_file_test (download_dir, G_FILE_TEST_EXISTS))
- katze_mkdir_with_parents (download_dir, 0700);
-
- g_free (file_basename);
- if (folder == NULL)
- g_free (download_dir);
- g_free (destination_filename);
- g_object_unref (file_source);
-
- return destination_uri;
-}
-
static gboolean
midori_browser_remove_tab_idle (gpointer view)
{
@@ -1459,6 +1373,7 @@ midori_view_download_requested_cb (GtkWidget* view,
WebKitDownload* download,
MidoriBrowser* browser)
{
+ MidoriDownloadType type = midori_download_get_type (download);
GtkWidget* web_view;
WebKitWebFrame* web_frame;
WebKitWebDataSource* datasource;
@@ -1466,22 +1381,23 @@ midori_view_download_requested_cb (GtkWidget* view,
g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
handled = TRUE;
- if (g_object_get_data (G_OBJECT (download), "cancel-download"))
+ if (type == MIDORI_DOWNLOAD_CANCEL)
{
handled = FALSE;
}
- else if (g_object_get_data (G_OBJECT (download), "open-in-viewer"))
+ else if (type == MIDORI_DOWNLOAD_OPEN_IN_VIEWER)
{
gchar* destination_uri =
- midori_browser_download_prepare_destination_uri (download, NULL);
+ midori_download_prepare_destination_uri (download, NULL);
midori_browser_prepare_download (browser, download, destination_uri);
g_signal_connect (download, "notify::status",
G_CALLBACK (midori_browser_download_status_cb), GTK_WIDGET (browser));
g_free (destination_uri);
+ webkit_download_start (download);
}
else if (!webkit_download_get_destination_uri (download))
{
- if (g_object_get_data (G_OBJECT (download), "save-as-download"))
+ if (type == MIDORI_DOWNLOAD_SAVE_AS)
{
static GtkWidget* dialog = NULL;
gchar* filename;
@@ -1494,29 +1410,46 @@ midori_view_download_requested_cb (GtkWidget* view,
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");
+ folder = midori_uri_get_folder (webkit_download_get_uri (download));
+ if (folder == NULL)
+ folder = katze_object_get_string (browser->settings, "download-folder");
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), folder);
g_free (folder);
g_signal_connect (dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed), &dialog);
- g_signal_connect (dialog, "response",
- G_CALLBACK (midori_view_download_save_as_response_cb), browser);
}
g_object_set_data (G_OBJECT (dialog), "download", download);
- filename = sokoke_get_download_filename (download);
+ filename = midori_download_get_suggested_filename (download);
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename);
g_free (filename);
- gtk_widget_show (dialog);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+ {
+ gtk_widget_hide (dialog);
+ gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+ if (!midori_browser_prepare_download (browser, download, uri))
+ {
+ g_free (uri);
+ return FALSE;
+ }
+ g_free (uri);
+ }
+ else
+ {
+ gtk_widget_hide (dialog);
+ return FALSE;
+ }
}
else
{
- gchar* folder = g_object_get_data (G_OBJECT (download), "open-download")
- ? NULL : katze_object_get_string (browser->settings, "download-folder");
+ gchar* folder = type == MIDORI_DOWNLOAD_OPEN ? NULL
+ : katze_object_get_string (browser->settings, "download-folder");
gchar* destination_uri =
- midori_browser_download_prepare_destination_uri (download, folder);
+ midori_download_prepare_destination_uri (download, folder);
midori_browser_prepare_download (browser, download, destination_uri);
g_free (destination_uri);
}
+ webkit_download_start (download);
}
/* Close empty tabs due to download links with a target */
@@ -1537,36 +1470,50 @@ midori_view_search_text_cb (GtkWidget* view,
midori_findbar_search_text (MIDORI_FINDBAR (browser->find), view, found, typing);
}
-static gboolean
-midori_browser_tab_destroy_cb (GtkWidget* widget,
+gint
+midori_browser_get_n_pages (MidoriBrowser* browser)
+{
+ #ifdef HAVE_GRANITE
+ return granite_widgets_dynamic_notebook_get_n_tabs (
+ GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook));
+ #else
+ return gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook));
+ #endif
+}
+
+static void
+midori_browser_tab_destroy_cb (MidoriView* view,
MidoriBrowser* browser)
{
- KatzeItem* item;
-
- if (browser->proxy_array && MIDORI_IS_VIEW (widget))
+ if (browser->proxy_array)
{
- item = midori_view_get_proxy_item (MIDORI_VIEW (widget));
- if (browser->trash && !midori_view_is_blank (MIDORI_VIEW (widget)))
- katze_array_add_item (browser->trash, item);
- katze_array_remove_item (browser->proxy_array, item);
- }
-
- _midori_browser_update_actions (browser);
-
- /* This callback must only be called once, but we need to ensure
- that "remove-tab" is emitted in any case */
- g_signal_handlers_disconnect_by_func (widget,
- midori_browser_tab_destroy_cb, browser);
-
- g_signal_emit (browser, signals[REMOVE_TAB], 0, widget);
+ KatzeItem* item = midori_view_get_proxy_item (view);
+ if (katze_array_get_item_index (browser->proxy_array, item) != -1)
+ {
+ if (!midori_view_is_blank (view))
+ {
+ if (browser->trash)
+ katze_array_add_item (browser->trash, item);
+ midori_browser_update_history (item, "website", "leave");
+ }
+ katze_array_remove_item (browser->proxy_array, item);
+ }
/* We don't ever want to be in a situation with no tabs,
so just create an empty one if the last one is closed.
The only exception is when we are closing the window,
which is indicated by the proxy array having been unset. */
- if (browser->proxy_array && !midori_browser_get_current_tab (browser))
- midori_browser_add_uri (browser, "");
- return FALSE;
+ if (midori_browser_get_n_pages (browser) == 0)
+ midori_browser_add_uri (browser, "");
+ }
+
+ _midori_browser_update_actions (browser);
+}
+
+static void
+_midori_browser_remove_tab (MidoriBrowser* browser,
+ GtkWidget* widget)
+{
}
#ifndef HAVE_GRANITE
@@ -1629,20 +1576,13 @@ midori_browser_notebook_size_allocate_cb (GtkWidget* widget,
}
static void
-_midori_browser_add_tab (MidoriBrowser* browser,
- GtkWidget* view)
+midori_browser_connect_tab (MidoriBrowser* browser,
+ GtkWidget* view)
{
- GtkWidget* notebook = browser->notebook;
-#ifndef HAVE_GRANITE
- GtkWidget* tab_label;
-#endif
- KatzeItem* item;
- guint n;
-
- gtk_widget_set_can_focus (view, TRUE);
- item = midori_view_get_proxy_item (MIDORI_VIEW (view));
+ KatzeItem* item = midori_view_get_proxy_item (MIDORI_VIEW (view));
katze_array_add_item (browser->proxy_array, item);
+ gtk_widget_set_can_focus (view, TRUE);
g_object_connect (view,
"signal::notify::icon",
midori_view_notify_icon_cb, browser,
@@ -1682,7 +1622,23 @@ _midori_browser_add_tab (MidoriBrowser* browser,
midori_view_add_speed_dial_cb, browser,
"signal::leave-notify-event",
midori_browser_tab_leave_notify_event_cb, browser,
+ "signal::destroy",
+ midori_browser_tab_destroy_cb, browser,
NULL);
+}
+
+static void
+_midori_browser_add_tab (MidoriBrowser* browser,
+ GtkWidget* view)
+{
+ GtkWidget* notebook = browser->notebook;
+ KatzeItem* item = midori_view_get_proxy_item (MIDORI_VIEW (view));
+ #ifndef HAVE_GRANITE
+ GtkWidget* tab_label;
+ #endif
+ guint n;
+
+ midori_browser_connect_tab (browser, view);
if (!katze_item_get_meta_boolean (item, "append") &&
katze_object_get_boolean (browser->settings, "open-tabs-next-to-current"))
@@ -1691,12 +1647,13 @@ _midori_browser_add_tab (MidoriBrowser* browser,
katze_array_move_item (browser->proxy_array, item, n);
}
else
- n = -1;
+ n = midori_browser_get_n_pages (browser);
+ katze_item_set_meta_integer (item, "append", -1);
+
#ifdef HAVE_GRANITE
- /* FIXME: Move to desired position */
- granite_widgets_dynamic_notebook_append_page (
+ granite_widgets_dynamic_notebook_insert_tab (
GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook),
- view, midori_view_get_display_title (MIDORI_VIEW (view)), "text-plain");
+ midori_view_get_tab (MIDORI_VIEW (view)), n);
#else
tab_label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view));
/* Don't resize empty bin, which is used for thumbnail tabs */
@@ -1706,23 +1663,10 @@ _midori_browser_add_tab (MidoriBrowser* browser,
gtk_notebook_insert_page (GTK_NOTEBOOK (notebook), view, tab_label, n);
gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (notebook), view, TRUE);
gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (notebook), view, TRUE);
+ midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser);
#endif
- katze_item_set_meta_integer (item, "append", -1);
-
- /* We want the tab to be removed if the widget is destroyed */
- g_signal_connect (view, "destroy",
- G_CALLBACK (midori_browser_tab_destroy_cb), browser);
_midori_browser_update_actions (browser);
- midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser);
-}
-
-static void
-_midori_browser_remove_tab (MidoriBrowser* browser,
- GtkWidget* view)
-{
- gtk_widget_destroy (view);
- midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser);
}
/**
@@ -1741,10 +1685,17 @@ midori_browser_foreach (MidoriBrowser* browser,
GtkCallback callback,
gpointer callback_data)
{
- g_return_if_fail (MIDORI_IS_BROWSER (browser));
+ g_return_if_fail (MIDORI_IS_BROWSER (browser));
- gtk_container_foreach (GTK_CONTAINER (browser->notebook),
- callback, callback_data);
+ #ifdef HAVE_GRANITE
+ /* FIXME */
+ if (GTK_IS_BIN (browser->notebook))
+ gtk_container_foreach (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (
+ browser->notebook))), callback, callback_data);
+ else
+ #endif
+ gtk_container_foreach (GTK_CONTAINER (browser->notebook),
+ callback, callback_data);
}
static void
@@ -1797,6 +1748,7 @@ midori_browser_key_press_event (GtkWidget* widget,
gtk_widget_grab_focus (midori_browser_get_current_tab (MIDORI_BROWSER (widget)));
else if (G_OBJECT_TYPE (focus) == WEBKIT_TYPE_WEB_VIEW
&& event->keyval == GDK_KEY_space
+ && (!(event->state & GDK_SHIFT_MASK))
&& !webkit_web_view_can_cut_clipboard (WEBKIT_WEB_VIEW (focus))
&& !webkit_web_view_can_paste_clipboard (WEBKIT_WEB_VIEW (focus)))
{
@@ -1933,6 +1885,28 @@ midori_browser_class_init (MidoriBrowserClass* class)
G_TYPE_NONE, 3,
GTK_TYPE_NOTEBOOK, G_TYPE_INT, G_TYPE_INT);
+ /**
+ * MidoriBrowser::switch-tab:
+ * @browser: the object on which the signal is emitted
+ * @old_view: the previous tab
+ * @new_view: the new tab
+ *
+ * Emitted when a tab is switched.
+ * There's no guarantee what the current tab is.
+ *
+ * Since: 0.4.7
+ */
+ signals[SWITCH_TAB] = g_signal_new (
+ "switch-tab",
+ G_TYPE_FROM_CLASS (class),
+ (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
+ 0,
+ 0,
+ NULL,
+ midori_cclosure_marshal_VOID__OBJECT_OBJECT,
+ G_TYPE_NONE, 2,
+ G_TYPE_OBJECT, G_TYPE_OBJECT);
+
signals[ACTIVATE_ACTION] = g_signal_new (
"activate-action",
G_TYPE_FROM_CLASS (class),
@@ -2280,16 +2254,16 @@ midori_browser_class_init (MidoriBrowserClass* class)
* The speed dial configuration file.
*
* Since: 0.3.4
+ * Since 0.4.7 this is a Midori.SpeedDial instance.
*/
g_object_class_install_property (gobject_class,
PROP_SPEED_DIAL,
g_param_spec_pointer (
"speed-dial",
"Speeddial",
- "Pointer to key-value object with speed dial items",
+ "Speed dial",
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
/**
* MidoriBrowser:show-tabs:
*
@@ -2325,13 +2299,7 @@ static void
_action_window_new_activate (GtkAction* action,
MidoriBrowser* browser)
{
- MidoriBrowser* new_browser;
- g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
- if (new_browser)
- {
- midori_browser_add_uri (new_browser, "");
- midori_browser_activate_action (new_browser, "Location");
- }
+ midori_view_new_window_cb (NULL, "", browser);
}
static void
@@ -2488,9 +2456,9 @@ midori_browser_subscribe_to_news_feed (MidoriBrowser* browser,
/* Special-case Liferea because a helper script may be required */
if (g_str_equal (browser->news_aggregator, "liferea")
&& g_find_program_in_path ("liferea-add-feed"))
- sokoke_spawn_program ("liferea-add-feed", feed);
+ sokoke_spawn_program ("liferea-add-feed", FALSE, feed, TRUE);
else
- sokoke_spawn_program (browser->news_aggregator, feed);
+ sokoke_spawn_program (browser->news_aggregator, TRUE, feed, TRUE);
g_free (feed);
}
else
@@ -2559,11 +2527,7 @@ _action_compact_add_activate (GtkAction* action,
g_free (label);
gtk_widget_set_name (button, "GtkButton-thumb");
gtk_box_pack_start (box, button, TRUE, TRUE, 4);
- #if GTK_CHECK_VERSION (2, 16, 0)
gtk_activatable_set_related_action (GTK_ACTIVATABLE (button), action);
- #else
- gtk_action_connect_proxy (action, button);
- #endif
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy), dialog);
}
@@ -2578,16 +2542,16 @@ _action_tab_close_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* widget = midori_browser_get_current_tab (browser);
- gboolean last_tab =
- midori_browser_get_nth_tab (browser, 1) == NULL;
- if (last_tab && sokoke_is_app_or_private ())
+ MidoriView* view = MIDORI_VIEW (widget);
+ gboolean last_tab = midori_browser_get_n_pages (browser) == 1;
+ if (last_tab && midori_paths_is_readonly () /* APP, PRIVATE */)
{
gtk_widget_destroy (GTK_WIDGET (browser));
return;
}
- if (last_tab && midori_view_is_blank (MIDORI_VIEW (widget)))
+ if (last_tab && midori_view_is_blank (view))
return;
- gtk_widget_destroy (widget);
+ midori_browser_remove_tab (browser, widget);
}
static void
@@ -2606,8 +2570,36 @@ _action_print_activate (GtkAction* action,
if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
- if ((view = midori_browser_get_current_tab (browser)))
- midori_view_print (MIDORI_VIEW (view));
+ if (!(view = midori_browser_get_current_tab (browser)))
+ return;
+
+ #ifdef HAVE_GRANITE
+ /* FIXME: Blacklist/ custom contract doesn't work
+ gchar* blacklisted_contracts[] = { "print", NULL }; */
+ /* FIXME: granite: should return GtkWidget* like GTK+ */
+ GtkWidget* dialog = (GtkWidget*)granite_widgets_pop_over_new ();
+ GtkWidget* content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ /* FIXME: granite: should return GtkWidget* like GTK+ */
+ gchar* filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL);
+ const gchar* mime_type = katze_item_get_meta_string (
+ midori_view_get_proxy_item (MIDORI_VIEW (view)), "mime-type");
+ GtkWidget* contractor = (GtkWidget*)granite_widgets_contractor_view_new (
+ filename, mime_type, 32, TRUE);
+ /* granite_widgets_contractor_view_add_item (GRANITE_WIDGETS_CONTRACTOR_VIEW (
+ contractor), _("_Print"), _("Send document to the printer"), "document-print",
+ 32, G_MAXINT, midori_view_print, view);
+ granite_widgets_contractor_view_name_blacklist (GRANITE_WIDGETS_CONTRACTOR_VIEW (
+ contractor), blacklisted_contracts, -1); */
+ g_free (filename);
+ gtk_container_add (GTK_CONTAINER (content_area), contractor);
+ gtk_widget_show (contractor);
+ gtk_widget_show (dialog);
+ if (gtk_widget_get_visible (browser->navigationbar))
+ granite_widgets_pop_over_move_to_widget (
+ GRANITE_WIDGETS_POP_OVER (dialog), browser->navigationbar, TRUE);
+ #else
+ midori_view_print (MIDORI_VIEW (view));
+ #endif
}
static void
@@ -2814,7 +2806,7 @@ midori_browser_get_toolbar_actions (MidoriBrowser* browser)
static const gchar* actions[] = {
"WindowNew", "TabNew", "Open", "SaveAs", "Print", "Find",
"Fullscreen", "Preferences", "Window", "Bookmarks",
- "ReloadStop", "ZoomIn", "TabClose",
+ "ReloadStop", "ZoomIn", "TabClose", "NextForward",
"ZoomOut", "Separator", "Back", "Forward", "Homepage",
"Panel", "Trash", "Search", "BookmarkAdd", "Previous", "Next", NULL };
@@ -3002,7 +2994,7 @@ _action_tools_populate_popup (GtkAction* action,
j = 0;
while ((widget = midori_panel_get_nth_page (panel, j++)))
{
- menuitem = midori_panel_construct_menu_item (panel, MIDORI_VIEWABLE (widget));
+ menuitem = midori_panel_construct_menu_item (panel, MIDORI_VIEWABLE (widget), FALSE);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
}
continue;
@@ -3029,14 +3021,35 @@ _action_bookmarks_populate_folder (GtkAction* action,
KatzeArray* folder,
MidoriBrowser* browser)
{
- const gchar* folder_name;
+ gint64 id;
KatzeArray* bookmarks;
GtkWidget* menuitem;
- folder_name = katze_item_get_name (KATZE_ITEM (folder));
- if (!(bookmarks = midori_array_query (browser->bookmarks,
- "uri, title, app, folder", "folder = '%q'", folder_name)))
- return FALSE;
+ id = katze_item_get_meta_integer (KATZE_ITEM (folder), "id");
+
+ if (id == -1)
+ {
+ if (!(bookmarks = midori_array_query (browser->bookmarks,
+ "id, title, parentid, uri, app, pos_panel, pos_bar", "parentid is NULL", NULL)))
+ {
+ g_warning ("midori_array_query returned NULL)");
+ return FALSE;
+ }
+ }
+ else
+ {
+ gchar *parentid = g_strdup_printf ("%" G_GINT64_FORMAT, id);
+
+ if (!(bookmarks = midori_array_query (browser->bookmarks,
+ "id, title, parentid, uri, app, pos_panel, pos_bar", "parentid = %q", parentid)))
+ {
+ g_warning ("midori_array_query returned NULL (id='%s')", parentid);
+ g_free (parentid);
+ return FALSE;
+ }
+
+ g_free (parentid);
+ }
/* Clear items from dummy array here */
gtk_container_foreach (GTK_CONTAINER (menu),
@@ -3114,34 +3127,32 @@ _action_compact_menu_populate_popup (GtkAction* action,
static const GtkActionEntry actions[] = {
{ "TabNew" },
{ "WindowNew" },
+ { "PrivateBrowsing" },
{ NULL },
- { "Open" },
{ "Find" },
#if !HAVE_HILDON
{ "Print" },
- { "InspectPage" },
#endif
+ { "Fullscreen" },
{ NULL },
- { "PrivateBrowsing" },
#if !HAVE_HILDON
+ { "p" },
+ { NULL },
+ { "BookmarksImport" },
+ { "BookmarksExport" },
{ "ClearPrivateData" },
#if defined (GDK_WINDOWING_X11)
{ "AddDesktopShortcut" },
#endif
- { NULL },
- { "BookmarksImport"},
- { "BookmarksExport"},
- { NULL },
- { "Fullscreen" },
- { "Panel" },
- { "Bookmarkbar" },
{ "-" },
#endif
{ NULL },
#if !HAVE_HILDON
+ #ifndef HAVE_GRANITE
{ "HelpFAQ" },
{ "HelpBugs"},
#endif
+ #endif
{ "About" },
{ "Preferences" },
#if HAVE_HILDON
@@ -3187,6 +3198,21 @@ _action_compact_menu_populate_popup (GtkAction* action,
g_signal_emit (browser, signals[POPULATE_TOOL_MENU], 0, menu);
continue;
}
+ else if (actions[i].name[0] == 'p')
+ {
+ MidoriPanel* panel;
+ gsize j;
+ GtkWidget* widget;
+
+ panel = MIDORI_PANEL (browser->panel);
+ j = 0;
+ while ((widget = midori_panel_get_nth_page (panel, j++)))
+ {
+ menuitem = midori_panel_construct_menu_item (panel, MIDORI_VIEWABLE (widget), TRUE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+ }
+ continue;
+ }
menuitem = sokoke_action_create_popup_menu_item (
_action_by_name (browser, actions[i].name));
}
@@ -3456,7 +3482,7 @@ _action_source_view_activate (GtkAction* action,
}
else
{
- sokoke_spawn_program (text_editor, filename);
+ sokoke_spawn_program (text_editor, TRUE, filename, TRUE);
g_free (filename);
}
g_free (text_editor);
@@ -3466,7 +3492,33 @@ static void
_action_caret_browsing_activate (GtkAction* action,
MidoriBrowser* browser)
{
- _("Toggle text cursor navigation");
+ gint response;
+ GtkWidget* dialog;
+
+ if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
+ return;
+
+ if (!katze_object_get_boolean (browser->settings, "enable-caret-browsing"))
+ {
+ dialog = gtk_message_dialog_new (GTK_WINDOW (browser),
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+ _("Toggle text cursor navigation"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Toggle text cursor navigation"));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ _("Pressing F7 toggles Caret Browsing. When active, a text cursor appears in all websites."));
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Enable Caret Browsing"), GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+
+ if (response != GTK_RESPONSE_ACCEPT)
+ return;
+ }
+
g_object_set (browser->settings, "enable-caret-browsing",
!katze_object_get_boolean (browser->settings, "enable-caret-browsing"), NULL);
}
@@ -3508,8 +3560,9 @@ _action_fullscreen_activate (GtkAction* action,
gtk_widget_hide (browser->bookmarkbar);
gtk_widget_hide (browser->navigationbar);
gtk_widget_hide (browser->statusbar);
- #ifndef HAVE_GRANITE
- /* FIXME hide tabs */
+ #ifdef HAVE_GRANITE
+ granite_widgets_dynamic_notebook_set_show_tabs (
+ GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), FALSE);
#else
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), FALSE);
gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), FALSE);
@@ -3543,6 +3596,71 @@ _action_scroll_somewhere_activate (GtkAction* action,
webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_VISUAL_POSITIONS, 1);
}
+static void
+_action_readable_activate (GtkAction* action,
+ MidoriBrowser* browser)
+{
+ GtkWidget* view = midori_browser_get_current_tab (browser);
+ gchar* filename;
+ gchar* stylesheet;
+ gint i;
+ gchar* script;
+ gchar* exception;
+
+ if (!view)
+ return;
+
+ filename = midori_paths_get_res_filename ("faq.css");
+ stylesheet = NULL;
+ if (!g_file_get_contents (filename, &stylesheet, NULL, NULL))
+ {
+ katze_assign (filename, midori_paths_get_data_filename ("doc/midori/faq.css", FALSE));
+ g_file_get_contents (filename, &stylesheet, NULL, NULL);
+ }
+ if (!(stylesheet && *stylesheet))
+ {
+ g_free (filename);
+ g_free (stylesheet);
+ midori_view_add_info_bar (MIDORI_VIEW (view), GTK_MESSAGE_ERROR,
+ "Stylesheet faq.css not found", NULL, view,
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+ return;
+ }
+
+ i = 0;
+ while (stylesheet[i])
+ {
+ /* Replace line breaks with spaces */
+ if (stylesheet[i] == '\n' || stylesheet[i] == '\r')
+ stylesheet[i] = ' ';
+ /* Change all single quotes to double quotes */
+ else if (stylesheet[i] == '\'')
+ stylesheet[i] = '\"';
+ i++;
+ }
+
+ script = g_strdup_printf (
+ "(function () {"
+ "var style = document.createElement ('style');"
+ "style.setAttribute ('type', 'text/css');"
+ "style.appendChild (document.createTextNode ('%s'));"
+ "var head = document.getElementsByTagName ('head')[0];"
+ "if (head) head.appendChild (style);"
+ "else document.documentElement.insertBefore"
+ "(style, document.documentElement.firstChild);"
+ "}) ();", stylesheet);
+ g_free (stylesheet);
+ exception = NULL;
+ if (!midori_view_execute_script (MIDORI_VIEW (view), script, &exception))
+ {
+ midori_view_add_info_bar (MIDORI_VIEW (view), GTK_MESSAGE_ERROR,
+ exception, NULL, view,
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+ g_free (exception);
+ }
+ g_free (script);
+}
+
static gboolean
_action_navigation_activate (GtkAction* action,
MidoriBrowser* browser)
@@ -3571,9 +3689,11 @@ _action_navigation_activate (GtkAction* action,
return FALSE;
view = MIDORI_VIEW (tab);
-
name = gtk_action_get_name (action);
+ if (!strcmp (name, "NextForward"))
+ name = midori_view_can_go_forward (view) ? "Forward" : "Next";
+
if (g_str_equal (name, "Back"))
{
if (middle_click)
@@ -4068,13 +4188,7 @@ midori_browser_bookmark_open_in_window_activate_cb (GtkWidget* menuitem,
item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
uri = katze_item_get_uri (item);
-
- if (uri && *uri)
- {
- MidoriBrowser* new_browser;
- g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
- midori_browser_add_uri (new_browser, uri);
- }
+ midori_view_new_window_cb (NULL, uri, browser);
}
static void
@@ -4218,6 +4332,7 @@ _action_bookmarks_import_activate (GtkAction* action,
{ ".kde/share/apps/konqueror/bookmarks.xml", N_("Konqueror"), "konqueror" },
{ ".gnome2/epiphany/bookmarks.rdf", N_("Epiphany"), "epiphany" },
{ ".mozilla/firefox/*/bookmarks.html", N_("Firefox (%s)"), "firefox" },
+ { ".config/midori/bookmarks.xbel", N_("Midori 0.2.6"), "midori" },
};
GtkWidget* dialog;
@@ -4238,7 +4353,7 @@ _action_bookmarks_import_activate (GtkAction* action,
return;
dialog = gtk_dialog_new_with_buttons (
- _("Import bookmarks..."), GTK_WINDOW (browser),
+ _("Import bookmarks…"), GTK_WINDOW (browser),
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("_Import bookmarks"), GTK_RESPONSE_ACCEPT,
@@ -4323,23 +4438,16 @@ _action_bookmarks_import_activate (GtkAction* action,
gtk_container_add (GTK_CONTAINER (content_area), hbox);
gtk_widget_show_all (hbox);
- hbox = gtk_hbox_new (FALSE, 8);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- label = gtk_label_new_with_mnemonic (_("_Folder:"));
- gtk_size_group_add_widget (sizegroup, label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
combobox_folder = midori_bookmark_folder_button_new (browser->bookmarks,
- FALSE, NULL);
- gtk_box_pack_start (GTK_BOX (hbox), combobox_folder, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (content_area), hbox);
- gtk_widget_show_all (hbox);
+ FALSE, 0, 0);
+ gtk_container_add (GTK_CONTAINER (content_area), combobox_folder);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
{
GtkTreeIter iter;
gchar* path = NULL;
- gchar* selected = NULL;
+ gint64 selected;
GError* error;
sqlite3* db = g_object_get_data (G_OBJECT (browser->bookmarks), "db");
@@ -4372,7 +4480,6 @@ _action_bookmarks_import_activate (GtkAction* action,
midori_bookmarks_import_array_db (db, bookmarks, selected);
katze_array_update (browser->bookmarks);
g_object_unref (bookmarks);
- g_free (selected);
g_free (path);
}
else
@@ -4429,7 +4536,7 @@ wrong_format:
error = NULL;
bookmarks = midori_array_query_recursive (browser->bookmarks,
- "*", "folder='%q'", "", TRUE);
+ "*", "parentid IS NULL", NULL, TRUE);
if (!midori_array_to_file (bookmarks, path, format, &error))
{
sokoke_message_dialog (GTK_MESSAGE_ERROR,
@@ -4560,6 +4667,8 @@ _action_clear_private_data_activate (GtkAction* action,
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("_Clear private data"), GTK_RESPONSE_ACCEPT, NULL);
+ katze_widget_add_class (gtk_dialog_get_widget_for_response (
+ GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT), "noundo");
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
screen = gtk_widget_get_screen (GTK_WIDGET (browser));
@@ -4640,17 +4749,6 @@ _action_inspect_page_activate (GtkAction* action,
webkit_web_inspector_show (inspector);
}
-static gint
-midori_browser_get_n_pages (MidoriBrowser* browser)
-{
- #ifdef HAVE_GRANITE
- return granite_widgets_dynamic_notebook_get_n_pages (
- GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook));
- #else
- return gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook));
- #endif
-}
-
static void
_action_tab_move_backward_activate (GtkAction* action,
MidoriBrowser* browser)
@@ -4663,11 +4761,13 @@ _action_tab_move_backward_activate (GtkAction* action,
else
new_pos = midori_browser_get_n_pages (browser) - 1;
#ifdef HAVE_GRANITE
- /* FIXME */
+ granite_widgets_dynamic_notebook_set_tab_position (
+ GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook),
+ midori_view_get_tab (MIDORI_VIEW (widget)), new_pos);
#else
gtk_notebook_reorder_child (GTK_NOTEBOOK (browser->notebook), widget, new_pos);
- g_signal_emit (browser, signals[MOVE_TAB], 0, browser->notebook, cur_pos, new_pos);
#endif
+ g_signal_emit (browser, signals[MOVE_TAB], 0, browser->notebook, cur_pos, new_pos);
}
static void
@@ -4682,11 +4782,13 @@ _action_tab_move_forward_activate (GtkAction* action,
else
new_pos = cur_pos + 1;
#ifdef HAVE_GRANITE
- /* FIXME */
+ granite_widgets_dynamic_notebook_set_tab_position (
+ GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook),
+ midori_view_get_tab (MIDORI_VIEW (widget)), new_pos);
#else
gtk_notebook_reorder_child (GTK_NOTEBOOK (browser->notebook), widget, new_pos);
- g_signal_emit (browser, signals[MOVE_TAB], 0, browser->notebook, cur_pos, new_pos);
#endif
+ g_signal_emit (browser, signals[MOVE_TAB], 0, browser->notebook, cur_pos, new_pos);
}
static void
@@ -4798,6 +4900,33 @@ _action_about_activate_email (GtkAboutDialog* about,
}
#endif
+static gchar*
+midori_browser_get_docs (gboolean error)
+{
+ #ifdef G_OS_WIN32
+ gchar* path = midori_paths_get_data_filename ("doc/midori/faq.html", FALSE);
+ if (g_access (path, F_OK) == 0)
+ return g_filename_to_uri (path, NULL, NULL);
+ else
+ {
+ #ifdef DOCDIR
+ if (g_access (DOCDIR "/faq.html", F_OK) == 0)
+ return g_strdup ("file://" DOCDIR "/faq.html");
+ else
+ #endif
+ return error ? g_strdup ("error:nodocs share/doc/midori/faq.html") : NULL;
+ }
+ g_free (path);
+ #else
+ #ifdef DOCDIR
+ if (g_access (DOCDIR "/faq.html", F_OK) == 0)
+ return g_strdup ("file://" DOCDIR "/faq.html");
+ else
+ #endif
+ return error ? g_strdup ("error:nodocs " DOCDIR "/faq.html") : NULL;
+ #endif
+}
+
static void
_action_about_activate (GtkAction* action,
MidoriBrowser* browser)
@@ -4815,76 +4944,54 @@ _action_about_activate (GtkAction* action,
gtk_about_dialog_set_email_hook (_action_about_activate_email, NULL, NULL);
gtk_about_dialog_set_url_hook (_action_about_activate_link, browser, NULL);
#endif
+#ifdef HAVE_GRANITE
+ gchar* docs = midori_browser_get_docs (FALSE);
+ granite_widgets_show_about_dialog (GTK_WINDOW (browser),
+ "translate", "https://translations.xfce.org/projects/p/midori/",
+ "bug", PACKAGE_BUGREPORT,
+ "help", docs,
+ "copyright", "2007-2012 Christian Dywan",
+#else
gtk_show_about_dialog (GTK_WINDOW (browser),
+ "wrap-license", TRUE,
+ "copyright", "Copyright © 2007-2012 Christian Dywan",
+#endif
"logo-icon-name", gtk_window_get_icon_name (GTK_WINDOW (browser)),
- "name", PACKAGE_NAME,
+ "program-name", PACKAGE_NAME,
"version", PACKAGE_VERSION,
"comments", comments,
- "copyright", "Copyright © 2007-2011 Christian Dywan",
- "website", "http://www.twotoasts.de",
+ "website", "http://www.midori-browser.org",
"authors", credits_authors,
"documenters", credits_documenters,
"artists", credits_artists,
"license", license,
- "wrap-license", TRUE,
"translator-credits", _("translator-credits"),
NULL);
g_free (comments);
+ #ifdef HAVE_GRANITE
+ g_free (docs);
+ #endif
}
static void
_action_help_link_activate (GtkAction* action,
MidoriBrowser* browser)
{
- const gchar* action_name;
- const gchar* uri = NULL;
- gint n;
- #if defined (G_OS_WIN32) && defined (DOCDIR)
- gchar* free_uri = NULL;
- #endif
-
- action_name = gtk_action_get_name (action);
- if (!strncmp ("HelpFAQ", action_name, 7))
- {
- #ifdef G_OS_WIN32
- {
- #ifdef DOCDIR
- gchar* path = sokoke_find_data_filename ("doc/midori/faq.html", FALSE);
- uri = free_uri = g_filename_to_uri (path, NULL, NULL);
- if (g_access (path, F_OK) != 0)
- {
- if (g_access (DOCDIR "/faq.html", F_OK) == 0)
- uri = "file://" DOCDIR "/faq.html";
- else
- #endif
- uri = "error:nodocs share/doc/midori/faq.html";
- #ifdef DOCDIR
- }
- g_free (path);
- #endif
- }
- #else
- #ifdef DOCDIR
- uri = "file://" DOCDIR "/faq.html";
- if (g_access (DOCDIR "/faq.html", F_OK) != 0)
- #endif
- uri = "error:nodocs " DOCDIR "/faq.html";
- #endif
- }
+ const gchar* action_name = gtk_action_get_name (action);
+ gchar* uri = NULL;
+ if (!strncmp ("HelpFAQ", action_name, 7))
+ uri = midori_browser_get_docs (TRUE);
else if (!strncmp ("HelpBugs", action_name, 8))
{
if (!g_spawn_command_line_async ("ubuntu-bug " PACKAGE_NAME, NULL))
- uri = PACKAGE_BUGREPORT;
+ uri = g_strdup (PACKAGE_BUGREPORT);
}
if (uri)
{
- n = midori_browser_add_uri (browser, uri);
+ gint n = midori_browser_add_uri (browser, uri);
midori_browser_set_current_page (browser, n);
-
- #if defined (G_OS_WIN32) && defined (DOCDIR)
- g_free (free_uri);
- #endif
+ g_free (uri);
}
}
@@ -5005,74 +5112,52 @@ midori_panel_close_cb (MidoriPanel* panel,
}
static void
-midori_browser_notebook_switch_page_cb (GtkWidget* notebook,
- gpointer page,
- guint page_num,
- MidoriBrowser* browser)
+midori_browser_switched_tab (MidoriBrowser* browser,
+ GtkWidget* old_widget,
+ MidoriView* new_view,
+ gint new_page)
{
- GtkWidget* widget;
GtkAction* action;
const gchar* text;
-
- if (!(widget = midori_browser_get_current_tab (browser)))
- return;
-
- action = _action_by_name (browser, "Location");
- text = midori_location_action_get_text (MIDORI_LOCATION_ACTION (action));
- g_object_set_data_full (G_OBJECT (widget), "midori-browser-typed-text",
- g_strdup (text), g_free);
-}
-
-static void
-midori_browser_notebook_switch_page_after_cb (GtkWidget* notebook,
- gpointer page,
- guint page_num,
- MidoriBrowser* browser)
-{
- GtkWidget* widget;
- MidoriView* view;
const gchar* uri;
- GtkAction* action;
- if (!(widget = midori_browser_get_current_tab (browser)))
+ if (old_widget != NULL)
+ {
+ action = _action_by_name (browser, "Location");
+ text = midori_location_action_get_text (MIDORI_LOCATION_ACTION (action));
+ g_object_set_data_full (G_OBJECT (old_widget), "midori-browser-typed-text",
+ g_strdup (text), g_free);
+ }
+
+ if (new_view == NULL)
+ {
+ g_signal_emit (browser, signals[SWITCH_TAB], 0, old_widget, new_view);
return;
+ }
- view = MIDORI_VIEW (widget);
- uri = g_object_get_data (G_OBJECT (widget), "midori-browser-typed-text");
+ g_return_if_fail (MIDORI_IS_VIEW (new_view));
+
+ uri = g_object_get_data (G_OBJECT (new_view), "midori-browser-typed-text");
if (!uri)
- uri = midori_view_get_display_uri (view);
- midori_browser_set_title (browser, midori_view_get_display_title (view));
+ uri = midori_view_get_display_uri (new_view);
+ midori_browser_set_title (browser, midori_view_get_display_title (new_view));
action = _action_by_name (browser, "Location");
midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
- if (sokoke_is_app_or_private ())
- gtk_window_set_icon (GTK_WINDOW (browser), midori_view_get_icon (view));
+ if (midori_paths_is_readonly () /* APP, PRIVATE */)
+ gtk_window_set_icon (GTK_WINDOW (browser), midori_view_get_icon (new_view));
if (browser->proxy_array)
- katze_item_set_meta_integer (KATZE_ITEM (browser->proxy_array), "current",
- midori_browser_get_current_page (browser));
+ katze_item_set_meta_integer (KATZE_ITEM (browser->proxy_array), "current", new_page);
g_object_notify (G_OBJECT (browser), "tab");
+ g_signal_emit (browser, signals[SWITCH_TAB], 0, old_widget, new_view);
- _midori_browser_set_statusbar_text (browser, NULL);
- _midori_browser_update_interface (browser);
- _midori_browser_update_progress (browser, view);
+ _midori_browser_set_statusbar_text (browser, new_view, NULL);
+ _midori_browser_update_interface (browser, new_view);
+ _midori_browser_update_progress (browser, new_view);
}
-#ifdef HAVE_GRANITE
static void
-midori_browser_notebook_new_tab_created_cb (GtkWidget* notebook,
- GraniteWidgetsTab* tab,
- MidoriBrowser* browser)
-{
- /* FIXME Pack view into tab: How? */
- KatzeItem* item = katze_item_new ();
- GtkWidget* view = midori_view_new_with_item (item, browser->settings);
- gint n = midori_browser_add_tab (browser, view);
- midori_browser_set_current_page (browser, n);
-}
-#endif
-
-static void
-midori_browser_notebook_page_reordered_cb (GtkNotebook* notebook,
+midori_browser_notebook_page_reordered_cb (GtkWidget* notebook,
MidoriView* view,
guint page_num,
MidoriBrowser* browser)
@@ -5082,28 +5167,9 @@ midori_browser_notebook_page_reordered_cb (GtkNotebook* notebook,
g_object_notify (G_OBJECT (browser), "tab");
}
-static void
-midori_browser_notebook_page_removed_cb (GtkWidget* notebook,
- GtkWidget* view,
- guint page_num,
- MidoriBrowser* browser)
-{
- _midori_browser_remove_tab (browser, view);
-}
-
-static gboolean
-midori_browser_notebook_reorder_tab_cb (GtkNotebook* notebook,
- GtkDirectionType arg1,
- gboolean arg2,
- gpointer user_data)
-{
- g_signal_stop_emission_by_name (notebook, "reorder-tab");
- return TRUE;
-}
-
static GtkWidget*
-midori_browser_notebook_create_window_cb (GtkNotebook* notebook,
- MidoriView* view,
+midori_browser_notebook_create_window_cb (GtkWidget* notebook,
+ GtkWidget* view,
gint x,
gint y,
MidoriBrowser* browser)
@@ -5120,6 +5186,108 @@ midori_browser_notebook_create_window_cb (GtkNotebook* notebook,
return NULL;
}
+#ifdef HAVE_GRANITE
+static void
+midori_browser_notebook_tab_added_cb (GtkWidget* notebook,
+ GraniteWidgetsTab* tab,
+ MidoriBrowser* browser)
+{
+ GtkWidget* view = midori_view_new_with_item (NULL, browser->settings);
+ midori_view_set_tab (MIDORI_VIEW (view), tab);
+ midori_browser_connect_tab (browser, view);
+ /* FIXME: signal add-tab */
+ _midori_browser_update_actions (browser);
+ midori_view_set_uri (MIDORI_VIEW (view), "");
+}
+
+static gboolean
+midori_browser_notebook_tab_removed_cb (GtkWidget* notebook,
+ GraniteWidgetsTab* tab,
+ MidoriBrowser* browser)
+{
+ MidoriView* view = MIDORI_VIEW (granite_widgets_tab_get_page (tab));
+ g_signal_emit (browser, signals[REMOVE_TAB], 0, view);
+ gtk_widget_destroy (view);
+ return TRUE;
+}
+
+static void
+midori_browser_notebook_tab_switched_cb (GraniteWidgetsDynamicNotebook* notebook,
+ GraniteWidgetsTab* old_tab,
+ GraniteWidgetsTab* new_tab,
+ MidoriBrowser* browser)
+{
+ gint new_pos = granite_widgets_dynamic_notebook_get_tab_position (notebook, new_tab);
+
+ midori_browser_switched_tab (browser,
+ old_tab ? granite_widgets_tab_get_page (old_tab) : NULL,
+ MIDORI_VIEW (granite_widgets_tab_get_page (new_tab)), new_pos);
+}
+
+static void
+midori_browser_notebook_tab_moved_cb (GtkWidget* notebook,
+ GraniteWidgetsTab* tab,
+ gint old_pos,
+ gboolean new_window,
+ gint x,
+ gint y,
+ MidoriBrowser* browser)
+{
+ GtkWidget* view = granite_widgets_tab_get_page (tab);
+ if (new_window)
+ {
+ GtkWidget* notebook = midori_browser_notebook_create_window_cb (
+ browser->notebook, view, x, y, browser);
+ if (notebook != NULL)
+ {
+ g_object_ref (tab);
+ granite_widgets_dynamic_notebook_remove_tab (
+ GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), tab);
+ granite_widgets_dynamic_notebook_insert_tab (
+ GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook), tab, 0);
+ g_object_unref (tab);
+ }
+ }
+ else
+ {
+ gint new_pos = granite_widgets_dynamic_notebook_get_tab_position (
+ GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook), tab);
+ midori_browser_notebook_page_reordered_cb (notebook,
+ MIDORI_VIEW (view), new_pos, browser);
+ }
+}
+#else
+static void
+midori_browser_notebook_switch_page_cb (GtkWidget* notebook,
+ gpointer page,
+ guint page_num,
+ MidoriBrowser* browser)
+{
+ midori_browser_switched_tab (browser,
+ midori_browser_get_current_tab (browser),
+ MIDORI_VIEW (midori_browser_get_nth_tab (browser, page_num)), page_num);
+}
+
+static void
+midori_browser_notebook_page_removed_cb (GtkWidget* notebook,
+ GtkWidget* view,
+ guint page_num,
+ MidoriBrowser* browser)
+{
+ _midori_browser_remove_tab (browser, view);
+ midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser);
+}
+
+static gboolean
+midori_browser_notebook_reorder_tab_cb (GtkNotebook* notebook,
+ GtkDirectionType arg1,
+ gboolean arg2,
+ gpointer user_data)
+{
+ g_signal_stop_emission_by_name (notebook, "reorder-tab");
+ return TRUE;
+}
+
static void
midori_browser_menu_item_switch_tab_cb (GtkWidget* menuitem,
MidoriBrowser* browser)
@@ -5182,6 +5350,7 @@ midori_browser_notebook_button_press_event_after_cb (GtkNotebook* notebook,
return FALSE;
}
+#endif
static void
_action_undo_tab_close_activate (GtkAction* action,
@@ -5227,7 +5396,7 @@ static const GtkActionEntry entries[] =
NULL, "o",
N_("Open a file"), G_CALLBACK (_action_open_activate) },
{ "SaveAs", GTK_STOCK_SAVE_AS,
- N_("_Save Page As..."), "s",
+ N_("_Save Page As…"), "s",
N_("Save to a file"), G_CALLBACK (_action_save_as_activate) },
{ "AddSpeedDial", NULL,
N_("Add to Speed _dial"), "h",
@@ -5251,9 +5420,15 @@ static const GtkActionEntry entries[] =
{ "WindowClose", NULL,
N_("C_lose Window"), "w",
NULL, G_CALLBACK (_action_window_close_activate) },
+ #ifdef HAVE_GRANITE
+ { "Print", "document-export",
+ N_("_Share"), "p",
+ NULL, G_CALLBACK (_action_print_activate) },
+ #else
{ "Print", GTK_STOCK_PRINT,
NULL, "p",
N_("Print the current page"), G_CALLBACK (_action_print_activate) },
+ #endif
{ "Quit", GTK_STOCK_QUIT,
N_("Close a_ll Windows"), "q",
NULL, G_CALLBACK (_action_quit_activate) },
@@ -5281,7 +5456,7 @@ static const GtkActionEntry entries[] =
NULL, "a",
NULL, G_CALLBACK (_action_select_all_activate) },
{ "Find", GTK_STOCK_FIND,
- N_("_Find..."), "f",
+ N_("_Find…"), "f",
N_("Find a word or phrase in the page"), G_CALLBACK (_action_find_activate) },
{ "FindNext", GTK_STOCK_GO_FORWARD,
N_("Find _Next"), "g",
@@ -5305,7 +5480,7 @@ static const GtkActionEntry entries[] =
NULL, "Escape",
N_("Stop loading the current page"), G_CALLBACK (_action_reload_stop_activate) },
{ "ReloadStop", GTK_STOCK_STOP,
- NULL, "r",
+ NULL, "",
N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
{ "ZoomIn", GTK_STOCK_ZOOM_IN,
NULL, "plus",
@@ -5338,6 +5513,9 @@ static const GtkActionEntry entries[] =
{ "ScrollRight", NULL,
N_("Scroll _Right"), "l",
NULL, G_CALLBACK (_action_scroll_somewhere_activate) },
+ { "Readable", NULL,
+ N_("_Readable"), "R",
+ NULL, G_CALLBACK (_action_readable_activate) },
{ "Go", NULL, N_("_Go") },
{ "Back", GTK_STOCK_GO_BACK,
@@ -5354,8 +5532,11 @@ static const GtkActionEntry entries[] =
NULL, "Right",
/* i18n: Visit the following logical page, ie. in a forum or blog */
N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) },
- { "Homepage", STOCK_HOMEPAGE,
- NULL, "Home",
+ { "NextForward", GTK_STOCK_MEDIA_NEXT,
+ NULL, "",
+ N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) },
+ { "Homepage", GTK_STOCK_HOME,
+ N_("_Homepage"), "Home",
N_("Go to your homepage"), G_CALLBACK (_action_navigation_activate) },
{ "TrashEmpty", GTK_STOCK_CLEAR,
N_("Empty Trash"), "",
@@ -5397,7 +5578,7 @@ static const GtkActionEntry entries[] =
{ "TabMoveForward", NULL, N_("_Move Tab Forward"), "Page_Down",
NULL, G_CALLBACK (_action_tab_move_forward_activate) },
{ "TabCurrent", NULL,
- N_("Focus _Current Tab"), "Home",
+ N_("Focus _Current Tab"), "Home",
NULL, G_CALLBACK (_action_tab_current_activate) },
{ "NextView", NULL,
N_("Focus _Next view"), "F6",
@@ -5420,12 +5601,12 @@ static const GtkActionEntry entries[] =
N_("_Frequent Questions"), "F1",
NULL, G_CALLBACK (_action_help_link_activate) },
{ "HelpBugs", NULL,
- N_("_Report a Problem..."), NULL,
+ N_("_Report a Problem…"), NULL,
NULL, G_CALLBACK (_action_help_link_activate) },
{ "About", GTK_STOCK_ABOUT,
NULL, "",
NULL, G_CALLBACK (_action_about_activate) },
- { "Dummy", NULL, "Dummy" },
+ { "Dummy", NULL, N_("_Tools") },
};
static const guint entries_n = G_N_ELEMENTS (entries);
@@ -5482,7 +5663,7 @@ static const GtkRadioActionEntry encoding_entries[] =
N_("Western (ISO-8859-1)"), "",
NULL, 1 },
{ "EncodingCustom", NULL,
- N_("Custom..."), "",
+ N_("Custom…"), "",
NULL, 1 },
};
static const guint encoding_entries_n = G_N_ELEMENTS (encoding_entries);
@@ -5564,13 +5745,15 @@ midori_browser_destroy_cb (MidoriBrowser* browser)
/* Destroy panel first, so panels don't need special care */
gtk_widget_destroy (browser->panel);
- /* Destroy tabs second, so child widgets don't need special care */
+ #ifndef HAVE_GRANITE
g_signal_handlers_disconnect_by_func (browser->notebook,
midori_browser_notebook_reorder_tab_cb,
NULL);
g_signal_handlers_disconnect_by_func (browser->notebook,
midori_browser_notebook_size_allocate_cb,
browser);
+ #endif
+ /* Destroy tabs second, so child widgets don't need special care */
gtk_container_foreach (GTK_CONTAINER (browser->notebook),
(GtkCallback) gtk_widget_destroy, NULL);
}
@@ -5645,6 +5828,7 @@ static const gchar* ui_markup =
""
""
" "
/* For accelerators to work all actions need to be used
*somewhere* in the UI definition */
+ /* These also show up in Unity's HUD */
""
"
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+namespace Sokoke {
+ extern static bool show_uri (Gdk.Screen screen, string uri, uint32 timestamp) throws Error;
+ extern static bool message_dialog (Gtk.MessageType type, string short, string detailed, bool modal);
+}
+
+namespace Midori {
+ namespace Download {
+ public static bool is_finished (WebKit.Download download) {
+ switch (download.status) {
+ case WebKit.DownloadStatus.FINISHED:
+ case WebKit.DownloadStatus.CANCELLED:
+ case WebKit.DownloadStatus.ERROR:
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ public static int get_type (WebKit.Download download) {
+ return download.get_data ("midori-download-type");
+ }
+
+ public static void set_type (WebKit.Download download, int type) {
+ download.set_data ("midori-download-type", type);
+ }
+
+ public static double get_progress (WebKit.Download download) {
+ /* Avoid a bug in WebKit */
+ if (download.status == WebKit.DownloadStatus.CREATED)
+ return 0.0;
+ return download.progress;
+ }
+
+ public static string get_tooltip (WebKit.Download download) {
+ string filename = Path.get_basename (download.destination_uri);
+ /* i18n: Download tooltip (size): 4KB of 43MB */
+ string size = _("%s of %s").printf (
+ format_size (download.current_size),
+ format_size (download.total_size));
+
+ /* Finished, no speed or remaining time */
+ if (is_finished (download) || download.status == WebKit.DownloadStatus.CREATED)
+ return "%s\n%s".printf (filename, size);
+
+ uint64 total_size = download.total_size, current_size = download.current_size;
+ double elapsed = download.get_elapsed_time (),
+ diff = elapsed / current_size,
+ estimated = (total_size - current_size) * diff;
+ int hour = 3600, minute = 60;
+ int hours = (int)(estimated / hour),
+ minutes = (int)((estimated - (hours * hour)) / minute),
+ seconds = (int)((estimated - (hours * hour) - (minutes * minute)));
+ string hours_ = ngettext ("%d hour", "%d hours", hours).printf (hours);
+ string minutes_ = ngettext ("%d minute", "%d minutes", minutes).printf (minutes);
+ string seconds_ = ngettext ("%d second", "%d seconds", seconds).printf (seconds);
+ double last_time = download.get_data ("last-time");
+ uint64 last_size = download.get_data ("last-size");
+
+ string eta = "";
+ if (estimated > 0) {
+ if (hours > 0)
+ eta = hours_ + ", " + minutes_;
+ else if (minutes >= 10)
+ eta = minutes_;
+ else if (minutes < 10 && minutes > 0)
+ eta = minutes_ + ", " + seconds_;
+ else if (seconds > 0)
+ eta = seconds_;
+ if (eta != "")
+ /* i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning */
+ eta = _(" - %s remaining").printf (eta);
+ }
+
+ string speed;
+ if (elapsed != last_time) {
+ speed = format_size ((uint64)(
+ (current_size - last_size) / (elapsed - last_time)));
+ }
+ else
+ /* i18n: Unknown number of bytes, used for transfer rate like ?B/s */
+ speed = _("?B");
+ /* i18n: Download tooltip (transfer rate): (130KB/s) */
+ speed = _(" (%s/s)").printf (speed);
+ if (elapsed - last_time > 5.0) {
+ download.set_data ("last-time", (int)elapsed);
+ download.set_data ("last-size", current_size);
+ }
+
+ return "%s\n%s %s%s".printf (filename, size, speed, eta);
+ }
+
+ public static string get_content_type (WebKit.Download download, string? mime_type) {
+ string? content_type = ContentType.guess (download.suggested_filename, null, null);
+ if (content_type == null) {
+ content_type = ContentType.from_mime_type (mime_type);
+ if (content_type == null)
+ content_type = ContentType.from_mime_type ("application/octet-stream");
+ }
+ return content_type;
+ }
+
+ public static bool has_wrong_checksum (WebKit.Download download) {
+ int status = download.get_data ("checksum-status");
+ if (status == 0) {
+ /* Link Fingerprint */
+ string? original_uri = download.network_request.get_data ("midori-original-uri");
+ if (original_uri == null)
+ original_uri = download.get_uri ();
+ string? fingerprint;
+ ChecksumType checksum_type = URI.get_fingerprint (original_uri, out fingerprint, null);
+ /* By default, no wrong checksum */
+ status = 2;
+ if (fingerprint != null) {
+ try {
+ string filename = Filename.from_uri (download.destination_uri);
+ string contents;
+ size_t length;
+ bool y = FileUtils.get_contents (filename, out contents, out length);
+ string checksum = Checksum.compute_for_string (checksum_type, contents, length);
+ /* Checksums are case-insensitive */
+ if (!y || fingerprint.ascii_casecmp (checksum) != 0)
+ status = 1; /* wrong checksum */
+ }
+ catch (Error error) {
+ status = 1; /* wrong checksum */
+ }
+ }
+ download.set_data ("checksum-status", status);
+ }
+ return status == 1;
+ }
+
+ public static bool action_clear (WebKit.Download download, Gtk.Widget widget) throws Error {
+ switch (download.status) {
+ case WebKit.DownloadStatus.CREATED:
+ case WebKit.DownloadStatus.STARTED:
+ download.cancel ();
+ break;
+ case WebKit.DownloadStatus.FINISHED:
+ if (open (download, widget))
+ return true;
+ break;
+ case WebKit.DownloadStatus.CANCELLED:
+ return true;
+ default:
+ critical ("action_clear: %d", download.status);
+ warn_if_reached ();
+ break;
+ }
+ return false;
+ }
+
+ public static string action_stock_id (WebKit.Download download) {
+ switch (download.status) {
+ case WebKit.DownloadStatus.CREATED:
+ case WebKit.DownloadStatus.STARTED:
+ return Gtk.Stock.CANCEL;
+ case WebKit.DownloadStatus.FINISHED:
+ if (has_wrong_checksum (download))
+ return Gtk.Stock.DIALOG_WARNING;
+ return Gtk.Stock.OPEN;
+ case WebKit.DownloadStatus.CANCELLED:
+ return Gtk.Stock.CLEAR;
+ default:
+ critical ("action_stock_id: %d", download.status);
+ warn_if_reached ();
+ return Gtk.Stock.MISSING_IMAGE;
+ }
+ }
+
+ public static bool open (WebKit.Download download, Gtk.Widget widget) throws Error {
+ if (!has_wrong_checksum (download))
+ return Sokoke.show_uri (widget.get_screen (),
+ download.destination_uri, Gtk.get_current_event_time ());
+
+ Sokoke.message_dialog (Gtk.MessageType.WARNING,
+ _("The downloaded file is erroneous."),
+ _("The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards."),
+ true);
+ return false;
+ }
+
+ public unowned string fallback_extension (string? extension, string mime_type) {
+ if (extension != null && extension[0] != '\0')
+ return extension;
+ if ("css" in mime_type)
+ return ".css";
+ if ("javascript" in mime_type)
+ return ".js";
+ if ("html" in mime_type)
+ return ".htm";
+ if ("plain" in mime_type)
+ return ".txt";
+ return "";
+ }
+
+ public string clean_filename (string filename) {
+ #if HAVE_WIN32
+ return filename.delimit ("/\\<>:\"|?*", '_');
+ #else
+ return filename.delimit ("/", '_');
+ #endif
+ }
+
+ public string get_suggested_filename (WebKit.Download download) {
+ /* https://bugs.webkit.org/show_bug.cgi?id=83161
+ https://d19vezwu8eufl6.cloudfront.net/nlp/slides%2F03-01-FormalizingNB.pdf */
+ return clean_filename (download.get_suggested_filename ());
+ }
+
+ public string get_filename_suggestion_for_uri (string mime_type, string uri) {
+ /* Try to provide a good default filename, UTF-8 encoded */
+ string filename = clean_filename (Soup.URI.decode (uri));
+ /* Take the rest of the URI if needed */
+ if (filename.has_suffix ("/") || uri.index_of_char ('.') == -1)
+ return Path.build_filename (filename, fallback_extension (null, mime_type));
+ return filename;
+ }
+
+ public static string? get_extension_for_uri (string uri, out string basename = null) {
+ if (&basename != null)
+ basename = null;
+ /* Find the last slash and the last period *after* the last slash. */
+ int last_slash = uri.last_index_of_char ('/');
+ /* Huh, URI without slashes? */
+ if (last_slash == -1)
+ return null;
+ int period = uri.last_index_of_char ('.', last_slash);
+ if (period == -1)
+ return null;
+ /* The extension, or "." if it ended with a period */
+ string extension = uri.substring (period, -1);
+ if (&basename != null)
+ basename = uri.substring (0, period);
+ return extension;
+
+ }
+
+ public string get_unique_filename (string filename) {
+ if (Posix.access (filename, Posix.F_OK) == 0) {
+ string basename;
+ string? extension = get_extension_for_uri (filename, out basename);
+ string? new_filename = null;
+ int i = 0;
+ do {
+ new_filename = "%s-%d%s".printf (basename, i++, extension ?? "");
+ } while (Posix.access (new_filename, Posix.F_OK) == 0);
+ return new_filename;
+ }
+ return filename;
+ }
+
+ public string prepare_destination_uri (WebKit.Download download, string? folder) {
+ string suggested_filename = get_suggested_filename (download);
+ string basename = File.new_for_uri (suggested_filename).get_basename ();
+ string download_dir;
+ if (folder == null) {
+ download_dir = Paths.get_tmp_dir ();
+ Katze.mkdir_with_parents (download_dir, 0700);
+ }
+ else
+ download_dir = folder;
+ string destination_filename = Path.build_filename (download_dir, basename);
+ try {
+ return Filename.to_uri (get_unique_filename (destination_filename));
+ }
+ catch (Error error) {
+ return "file://" + destination_filename;
+ }
+ }
+
+ public static bool has_enough_space (WebKit.Download download, string uri) {
+ var folder = File.new_for_uri (uri).get_parent ();
+ bool can_write;
+ uint64 free_space;
+ try {
+ var info = folder.query_filesystem_info ("filesystem::free");
+ free_space = info.get_attribute_uint64 ("filesystem::free");
+ info = folder.query_info ("access::can-write", 0);
+ can_write = info.get_attribute_boolean ("access::can-write");
+ }
+ catch (Error error) {
+ can_write = false;
+ free_space = 0;
+ }
+
+ if (free_space < download.total_size || !can_write) {
+ string message;
+ string detailed_message;
+ if (!can_write) {
+ message = _("The file \"%s\" can't be saved in this folder.").printf (
+ Path.get_basename (uri));
+ detailed_message = _("You don't have permission to write in this location.");
+ }
+ else if (free_space < download.total_size) {
+ message = _("There is not enough free space to download \"%s\".").printf (
+ Path.get_basename (uri));
+ detailed_message = _("The file needs %s but only %s are left.").printf (
+ format_size (download.total_size), format_size (free_space));
+ }
+ else
+ assert_not_reached ();
+ Sokoke.message_dialog (Gtk.MessageType.ERROR, message, detailed_message, false);
+ return false;
+ }
+ return true;
+ }
+ }
+}
diff --git a/midori/midori-extension.c b/midori/midori-extension.c
index 28156342..01f518cc 100644
--- a/midori/midori-extension.c
+++ b/midori/midori-extension.c
@@ -14,6 +14,7 @@
#include
#include "midori-platform.h"
+#include "midori-core.h"
#include
G_DEFINE_TYPE (MidoriExtension, midori_extension, G_TYPE_OBJECT);
@@ -317,10 +318,10 @@ midori_extension_activate_cb (MidoriExtension* extension,
strlen (filename) - strlen ("." G_MODULE_SUFFIX));
else
filename = g_strdup (filename);
- folder = g_strconcat ("extensions/", filename, NULL);
+ folder = g_build_filename ("extensions", filename, NULL);
g_free (filename);
katze_assign (config_file,
- sokoke_find_config_filename (folder, "config"));
+ midori_paths_get_preset_filename (folder, "config"));
g_free (folder);
g_key_file_load_from_file (extension->priv->key_file, config_file,
G_KEY_FILE_KEEP_COMMENTS, NULL);
@@ -340,29 +341,32 @@ midori_extension_activate_cb (MidoriExtension* extension,
if (setting->type == G_TYPE_BOOLEAN)
{
MESettingBoolean* setting_ = (MESettingBoolean*)setting;
- if (extension->priv->key_file)
- setting_->value = sokoke_key_file_get_boolean_default (
- extension->priv->key_file,
- "settings", setting->name, setting_->default_value, NULL);
+ if (extension->priv->key_file
+ && g_key_file_has_key (extension->priv->key_file, "settings", setting_->name, NULL))
+ setting_->value = g_key_file_get_boolean (extension->priv->key_file,
+ "settings", setting->name, NULL);
else
setting_->value = setting_->default_value;
}
else if (setting->type == G_TYPE_INT)
{
MESettingInteger* setting_ = (MESettingInteger*)setting;
- if (extension->priv->key_file)
- setting_->value = sokoke_key_file_get_integer_default (
- extension->priv->key_file,
- "settings", setting->name, setting_->default_value, NULL);
+ if (extension->priv->key_file
+ && g_key_file_has_key (extension->priv->key_file, "settings", setting_->name, NULL))
+ setting_->value = g_key_file_get_integer (extension->priv->key_file,
+ "settings", setting_->name, NULL);
else
setting_->value = setting_->default_value;
}
else if (setting->type == G_TYPE_STRING)
{
if (extension->priv->key_file)
- setting->value = sokoke_key_file_get_string_default (
- extension->priv->key_file,
- "settings", setting->name, setting->default_value, NULL);
+ {
+ setting->value = g_key_file_get_string (
+ extension->priv->key_file, "settings", setting->name, NULL);
+ if (setting->value == NULL)
+ setting->value = setting->default_value;
+ }
else
setting->value = g_strdup (setting->default_value);
}
@@ -371,10 +375,10 @@ midori_extension_activate_cb (MidoriExtension* extension,
MESettingStringList* setting_ = (MESettingStringList*)setting;
if (extension->priv->key_file)
{
- setting_->value = sokoke_key_file_get_string_list_default (
- extension->priv->key_file,
- "settings", setting->name, &setting_->length,
- setting_->default_value, &setting_->default_length, NULL);
+ setting_->value = g_key_file_get_string_list (extension->priv->key_file,
+ "settings", setting->name, &setting_->length, NULL);
+ if (setting_->value == NULL)
+ setting_->value = g_strdupv (setting_->default_value);
}
else
setting_->value = g_strdupv (setting_->default_value);
@@ -645,10 +649,11 @@ midori_extension_get_config_dir (MidoriExtension* extension)
if (!extension->priv->config_dir)
{
gchar* filename = g_object_get_data (G_OBJECT (extension), "filename");
- if (!filename)
- return "/";
- extension->priv->config_dir = g_build_filename (
- sokoke_set_config_dir (NULL), "extensions", filename, NULL);
+ if (filename != NULL)
+ extension->priv->config_dir = g_build_filename (
+ midori_paths_get_config_dir (), "extensions", filename, NULL);
+ else
+ extension->priv->config_dir = NULL;
}
return extension->priv->config_dir;
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 6decf805..5bd0b7da 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -376,10 +376,14 @@ midori_location_action_add_search_engines (MidoriLocationAction* action,
{
KatzeItem* item;
gint i = 0;
+ #ifndef G_OS_WIN32
GtkStyle* style;
+ #endif
gtk_widget_realize (action->treeview);
+ #ifndef G_OS_WIN32
style = gtk_widget_get_style (action->treeview);
+ #endif
/* FIXME: choose 3 most frequently except for default */
KATZE_ARRAY_FOREACH_ITEM (item, action->search_engines)
@@ -397,7 +401,9 @@ midori_location_action_add_search_engines (MidoriLocationAction* action,
icon = midori_search_action_get_icon (item, action->treeview, NULL, FALSE);
gtk_list_store_insert_with_values (store, NULL, matches + i,
URI_COL, uri, TITLE_COL, desc, YALIGN_COL, 0.25,
+ #ifndef G_OS_WIN32
BACKGROUND_COL, style ? &style->bg[GTK_STATE_NORMAL] : NULL,
+ #endif
STYLE_COL, 1, FAVICON_COL, icon, -1);
g_free (uri);
g_free (title);
@@ -409,9 +415,11 @@ midori_location_action_add_search_engines (MidoriLocationAction* action,
if (i > 2 && matches > 0)
{
gtk_list_store_insert_with_values (store, NULL, matches + i,
- URI_COL, "about:search", TITLE_COL, _("Search with..."),
+ URI_COL, "about:search", TITLE_COL, _("Search with…"),
YALIGN_COL, 0.25,
+ #ifndef G_OS_WIN32
BACKGROUND_COL, style ? &style->bg[GTK_STATE_NORMAL] : NULL,
+ #endif
STYLE_COL, 1, FAVICON_COL, NULL, -1);
i++;
break;
@@ -814,15 +822,31 @@ midori_location_action_activate (GtkAction* action)
GTK_ACTION_CLASS (midori_location_action_parent_class)->activate (action);
}
+static void
+midori_location_action_entry_drag_data_get_cb (GtkWidget* entry,
+ GdkDragContext* context,
+ GtkSelectionData* data,
+ guint info,
+ guint32 time,
+ GtkAction* action)
+{
+ if (gtk_entry_get_current_icon_drag_source (GTK_ENTRY (entry)) == GTK_ENTRY_ICON_PRIMARY)
+ {
+ const gchar* uri = gtk_entry_get_text (GTK_ENTRY (entry));
+ gchar** uris = g_strsplit (uri, uri, 1);
+ gtk_selection_data_set_uris (data, uris);
+ g_strfreev (uris);
+ }
+}
+
static GtkWidget*
midori_location_action_create_tool_item (GtkAction* action)
{
GtkWidget* toolitem;
GtkWidget* alignment;
GtkWidget* entry;
- #if HAVE_HILDON
- HildonGtkInputMode mode;
- #endif
+
+ GtkTargetList *targetlist;
toolitem = GTK_WIDGET (gtk_tool_item_new ());
gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE);
@@ -831,46 +855,21 @@ midori_location_action_create_tool_item (GtkAction* action)
gtk_widget_show (alignment);
gtk_container_add (GTK_CONTAINER (toolitem), alignment);
- #if HAVE_HILDON
- entry = gtk_entry_new ();
- mode = hildon_gtk_entry_get_input_mode (GTK_ENTRY (entry));
- mode &= ~HILDON_GTK_INPUT_MODE_AUTOCAP;
- hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry), mode);
- #else
entry = gtk_icon_entry_new ();
- /* Work-around icon being activatable by default */
gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_PRIMARY, FALSE);
+ GTK_ICON_ENTRY_PRIMARY, TRUE);
gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
GTK_ICON_ENTRY_SECONDARY, TRUE);
- #endif
+
+ targetlist = gtk_target_list_new (NULL, 0);
+ gtk_target_list_add_uri_targets (targetlist, 0);
+ gtk_entry_set_icon_drag_source (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, targetlist, GDK_ACTION_ASK | GDK_ACTION_COPY | GDK_ACTION_LINK);
+ gtk_target_list_unref (targetlist);
+ g_signal_connect (entry, "drag-data-get",
+ G_CALLBACK (midori_location_action_entry_drag_data_get_cb), action);
gtk_widget_show (entry);
gtk_container_add (GTK_CONTAINER (alignment), entry);
- #if GTK_CHECK_VERSION (3, 0, 0)
- {
- static const gchar default_style[] =
- ".security_unknown {\n"
- "background-image: none;\n"
- "background-color: #ef7070;\n"
- "color: #000;\n"
- "}\n"
- ".security_trusted {\n"
- "background-image: none;\n"
- "background-color: #d1eeb9;\n"
- "color: #000;\n"
- "}\n";
- GtkCssProvider* css_provider;
- GtkStyleContext* context;
-
- css_provider = gtk_css_provider_new ();
- context = gtk_widget_get_style_context (entry);
- gtk_css_provider_load_from_data (css_provider, default_style, -1, NULL);
- gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER (css_provider),
- GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
- }
- #endif
-
return toolitem;
}
@@ -993,10 +992,6 @@ midori_location_action_key_press_event_cb (GtkEntry* entry,
/* Return FALSE to allow Escape to stop loading */
return FALSE;
}
- case GDK_KEY_Page_Up:
- case GDK_KEY_Page_Down:
- if (!(location_action->popup && gtk_widget_get_visible (location_action->popup)))
- return TRUE;
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
{
@@ -1045,7 +1040,12 @@ midori_location_action_key_press_event_cb (GtkEntry* entry,
case GDK_KEY_KP_Up:
case GDK_KEY_Tab:
case GDK_KEY_ISO_Left_Tab:
+ case GDK_KEY_Page_Down:
+ case GDK_KEY_Page_Up:
{
+ if ((event->keyval == GDK_KEY_Page_Up || event->keyval == GDK_KEY_Page_Down) &&
+ !(location_action->popup && gtk_widget_get_visible (location_action->popup)))
+ return TRUE;
if (location_action->popup && gtk_widget_get_visible (location_action->popup))
{
GtkTreeModel* model = location_action->completion_model;
@@ -1055,35 +1055,62 @@ midori_location_action_key_press_event_cb (GtkEntry* entry,
gint selected = location_action->completion_index;
if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down
- || event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_ISO_Left_Tab)
- selected = MIN (selected + 1, matches -1);
- else if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up)
+ || ((event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_ISO_Left_Tab)
+ && !(event->state & GDK_SHIFT_MASK)))
+ {
+ selected = selected + 1;
+ if (selected == matches)
+ selected = -1;
+ }
+ else if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up
+ || ((event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_ISO_Left_Tab)
+ && (event->state & GDK_SHIFT_MASK)))
{
if (selected == -1)
selected = matches - 1;
else
- selected = MAX (selected - 1, 0);
+ selected = selected - 1;
}
else if (event->keyval == GDK_KEY_Page_Down)
- selected = MIN (selected + 14, matches -1);
+ {
+ if (selected == -1)
+ selected = 0;
+ else if (selected < matches - 1)
+ selected = MIN (selected + 14, matches -1);
+ else
+ selected = -1;
+ }
else if (event->keyval == GDK_KEY_Page_Up)
- selected = MAX (selected - 14, 0);
+ {
+ if (selected == -1)
+ selected = matches - 1;
+ else if (selected > 0)
+ selected = MAX (selected - 14, 0);
+ else
+ selected = -1;
+ }
else if (event->keyval != GDK_KEY_KP_Delete && event->keyval != GDK_KEY_Delete)
g_assert_not_reached ();
- path = gtk_tree_path_new_from_indices (selected, -1);
- gtk_tree_view_set_cursor (GTK_TREE_VIEW (location_action->treeview),
- path, NULL, FALSE);
- gtk_tree_path_free (path);
-
- if (gtk_tree_model_iter_nth_child (model, &iter, NULL, selected))
+ if (selected != -1)
{
- gchar* uri;
- gtk_tree_model_get (model, &iter, URI_COL, &uri, -1);
- /* Update the layout without actually changing the text */
- pango_layout_set_text (gtk_entry_get_layout (entry), uri, -1);
- g_free (uri);
+ path = gtk_tree_path_new_from_indices (selected, -1);
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (location_action->treeview),
+ path, NULL, FALSE);
+ gtk_tree_path_free (path);
+
+ if (gtk_tree_model_iter_nth_child (model, &iter, NULL, selected))
+ {
+ gchar* uri;
+ gtk_tree_model_get (model, &iter, URI_COL, &uri, -1);
+ /* Update the layout without actually changing the text */
+ pango_layout_set_text (gtk_entry_get_layout (entry), uri, -1);
+ g_free (uri);
+ }
}
+ else
+ gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (location_action->treeview)));
+
location_action->completion_index = selected;
return TRUE;
}
@@ -1147,12 +1174,237 @@ midori_location_action_focus_out_event_cb (GtkWidget* widget,
return FALSE;
}
+#ifdef HAVE_GCR
+ #define GCR_API_SUBJECT_TO_CHANGE
+ #include
+#endif
+
+#if defined (HAVE_LIBSOUP_2_34_0)
+static GHashTable* message_map = NULL;
+void
+midori_map_add_message (SoupMessage* message)
+{
+ SoupURI* uri = soup_message_get_uri (message);
+ if (message_map == NULL)
+ message_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+ g_return_if_fail (uri && uri->host);
+ g_hash_table_insert (message_map, g_strdup (uri->host), g_object_ref (message));
+}
+
+SoupMessage*
+midori_map_get_message (SoupMessage* message)
+{
+ SoupURI* uri = soup_message_get_uri (message);
+ SoupMessage* full;
+ g_return_val_if_fail (uri && uri->host, message);
+ full = g_hash_table_lookup (message_map, uri->host);
+ g_return_val_if_fail (full, message);
+ return full;
+}
+
+#ifdef HAVE_GCR
+typedef enum {
+ MIDORI_CERT_TRUST,
+ MIDORI_CERT_REVOKE,
+ MIDORI_CERT_EXPORT,
+} MidoriCertTrust;
+
+static void
+midori_location_action_cert_response_cb (GtkWidget* dialog,
+ gint response,
+ GcrCertificate* gcr_cert)
+{
+ gchar* peer = g_object_get_data (G_OBJECT (gcr_cert), "peer");
+ GError* error = NULL;
+ if (response == MIDORI_CERT_TRUST)
+ gcr_trust_add_pinned_certificate (gcr_cert, GCR_PURPOSE_SERVER_AUTH, peer, NULL, &error);
+ else if (response == MIDORI_CERT_REVOKE)
+ gcr_trust_remove_pinned_certificate (gcr_cert, GCR_PURPOSE_SERVER_AUTH, peer, NULL, &error);
+ else if (response == MIDORI_CERT_EXPORT)
+ {
+ /* FIXME: Would be nice if GcrCertificateExporter became public */
+ gchar* filename = g_strconcat (peer, ".crt", NULL);
+ GtkWidget* dialog = sokoke_file_chooser_dialog_new (_("Export certificate"),
+ NULL, GTK_FILE_CHOOSER_ACTION_SAVE);
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+ gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename);
+ g_free (filename);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+ {
+ gsize n_data;
+ gconstpointer data = gcr_certificate_get_der_data (gcr_cert, &n_data);
+ g_return_if_fail (data);
+ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+ g_file_set_contents (filename, data, n_data, NULL);
+ g_free (filename);
+ }
+ gtk_widget_destroy (dialog);
+ }
+ if (error != NULL)
+ {
+ g_warning ("Error %s trust: %s", response == MIDORI_CERT_TRUST ?
+ "granting" : "revoking", error->message);
+ g_error_free (error);
+ }
+ gtk_widget_destroy (dialog);
+}
+#endif
+
+const gchar*
+midori_location_action_tls_flags_to_string (GTlsCertificateFlags tls_flags)
+{
+ const gchar* tls_error;
+ if (tls_flags & G_TLS_CERTIFICATE_UNKNOWN_CA)
+ tls_error = _("The signing certificate authority is not known.");
+ else if (tls_flags & G_TLS_CERTIFICATE_BAD_IDENTITY)
+ tls_error = _("The certificate does not match the expected identity of the site that it was retrieved from.");
+ else if(tls_flags & G_TLS_CERTIFICATE_NOT_ACTIVATED)
+ tls_error = _("The certificate's activation time is still in the future.");
+ else if (tls_flags & G_TLS_CERTIFICATE_EXPIRED)
+ tls_error = _("The certificate has expired");
+ else if (tls_flags & G_TLS_CERTIFICATE_REVOKED)
+ tls_error = _("The certificate has been revoked according to the GTlsConnection's certificate revocation list.");
+ else if (tls_flags & G_TLS_CERTIFICATE_INSECURE)
+ tls_error = _("The certificate's algorithm is considered insecure.");
+ else if (tls_flags & G_TLS_CERTIFICATE_GENERIC_ERROR)
+ tls_error = _("Some other error occurred validating the certificate.");
+ else
+ tls_error = "Unknown GTLSCertificateFlags value";
+ return tls_error;
+}
+
+void
+midori_location_action_show_page_info (GtkWidget* widget,
+ GtkBox* box,
+ GtkWidget* dialog)
+{
+ MidoriBrowser* browser = midori_browser_get_for_widget (widget);
+ MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser));
+ WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view));
+ WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (web_view);
+ WebKitWebDataSource* source = webkit_web_frame_get_data_source (web_frame);
+ WebKitNetworkRequest* request = webkit_web_data_source_get_request (source);
+ SoupMessage* message = midori_map_get_message (webkit_network_request_get_message (request));
+ GTlsCertificate* tls_cert;
+ GTlsCertificateFlags tls_flags;
+
+ g_return_if_fail (message);
+ g_object_get (message, "tls-certificate", &tls_cert, "tls-errors", &tls_flags, NULL);
+
+ if (tls_cert == NULL)
+ return;
+
+ #ifdef HAVE_GCR
+ GByteArray* der_cert;
+ GcrCertificate* gcr_cert;
+ GtkWidget* details;
+ SoupURI* uri = soup_message_get_uri (message);
+
+ g_object_get (tls_cert, "certificate", &der_cert, NULL);
+ gcr_cert = gcr_simple_certificate_new (
+ der_cert->data, der_cert->len);
+ g_byte_array_unref (der_cert);
+ details = (GtkWidget*)gcr_certificate_details_widget_new (gcr_cert);
+ gtk_widget_show (details);
+ gtk_container_add (GTK_CONTAINER (box), details);
+ if (gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, uri->host, NULL, NULL))
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ ("_Don't trust this website"), MIDORI_CERT_REVOKE, NULL);
+ else if (tls_flags > 0)
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ ("_Trust this website"), MIDORI_CERT_TRUST, NULL);
+ gtk_container_child_set (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dialog))),
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Export certificate"), MIDORI_CERT_EXPORT),
+ "secondary", TRUE, NULL);
+
+ g_object_set_data_full (G_OBJECT (gcr_cert), "peer", g_strdup (uri->host), (GDestroyNotify)g_free);
+ g_object_set_data_full (G_OBJECT (dialog), "gcr-cert", gcr_cert, (GDestroyNotify)g_object_unref);
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (midori_location_action_cert_response_cb), gcr_cert);
+ /* With GTK+2 the scrolled contents can't communicate a natural size to the window */
+ #if !GTK_CHECK_VERSION (3, 0, 0)
+ gtk_window_set_default_size (GTK_WINDOW (dialog), 250, 200);
+ #endif
+ #else
+ const gchar* tls_error = midori_location_action_tls_flags_to_string (tls_flags);
+
+ if (!g_tls_certificate_get_issuer (tls_cert))
+ gtk_box_pack_start (box, gtk_label_new (_("Self-signed")), FALSE, FALSE, 0);
+
+ gtk_box_pack_start (box, gtk_label_new (tls_error), FALSE, FALSE, 0);
+ #endif
+
+ g_object_unref (tls_cert);
+}
+#endif
+
+#ifndef HAVE_GRANITE
+static gboolean
+midori_location_action_dialog_focus_out_cb (GtkWidget* dialog,
+ GdkEvent* event,
+ gpointer user_data)
+{
+ gtk_widget_destroy (dialog);
+ return TRUE;
+}
+#endif
+
static void
midori_location_action_icon_released_cb (GtkWidget* widget,
GtkIconEntryPosition icon_pos,
gint button,
GtkAction* action)
{
+ /* The dialog should "toggle" like a menu, as far as users go
+ FIXME: Half-working: the dialog closes but re-opens */
+ static GtkWidget* dialog = NULL;
+ if (icon_pos == GTK_ICON_ENTRY_PRIMARY && dialog != NULL)
+ gtk_widget_destroy (dialog);
+
+ if (icon_pos == GTK_ICON_ENTRY_PRIMARY)
+ {
+ const gchar* title = _("Security details");
+ GtkWidget* content_area;
+ GtkWidget* hbox;
+ #ifdef HAVE_GRANITE
+ gint root_x, root_y;
+ GdkRectangle icon_rect;
+ /* FIXME: granite: should return GtkWidget* like GTK+ */
+ dialog = (GtkWidget*)granite_widgets_pop_over_new ();
+ gchar* markup = g_strdup_printf ("%s ", title);
+ GtkWidget* label = gtk_label_new (markup);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ g_free (markup);
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+ gtk_box_pack_start (GTK_BOX (content_area), label, FALSE, FALSE, 0);
+ gtk_entry_get_icon_area (GTK_ENTRY (widget), icon_pos, &icon_rect);
+ gdk_window_get_root_coords (gtk_widget_get_window (widget),
+ icon_rect.x + icon_rect.width / 2, icon_rect.y + icon_rect.height,
+ &root_x, &root_y);
+ granite_widgets_pop_over_move_to_coords (GRANITE_WIDGETS_POP_OVER (dialog),
+ root_x, root_y, TRUE);
+ #else
+ dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (gtk_widget_get_toplevel (widget)),
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, NULL, NULL);
+ /* FIXME: check focus-in on the transient-for window instead of
+ focus-out-event */
+ g_signal_connect (dialog, "focus-out-event",
+ G_CALLBACK (midori_location_action_dialog_focus_out_cb), NULL);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ #endif
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), gtk_image_new_from_gicon (
+ gtk_entry_get_icon_gicon (GTK_ENTRY (widget), icon_pos), GTK_ICON_SIZE_DIALOG), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox),
+ gtk_label_new (gtk_icon_entry_get_tooltip (GTK_ICON_ENTRY (widget), icon_pos)), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
+ #if defined (HAVE_LIBSOUP_2_34_0)
+ midori_location_action_show_page_info (widget, GTK_BOX (content_area), dialog);
+ #endif
+ g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &dialog);
+ gtk_widget_show_all (dialog);
+ }
if (icon_pos == GTK_ICON_ENTRY_SECONDARY)
{
gboolean result;
@@ -1711,91 +1963,30 @@ midori_location_action_set_security_hint (MidoriLocationAction* location_action,
for (; proxies != NULL; proxies = g_slist_next (proxies))
if (GTK_IS_TOOL_ITEM (proxies->data))
{
- #if !GTK_CHECK_VERSION (3, 0, 0)
- const gchar* bg_color = NULL;
- const gchar* fg_color = NULL;
- #endif
GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data);
- GdkScreen* screen = gtk_widget_get_screen (entry);
- GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen);
if (hint == MIDORI_SECURITY_UNKNOWN)
{
- #if !GTK_CHECK_VERSION (3, 0, 0)
- bg_color = "#ef7070";
- fg_color = "#000";
- #endif
- #if !HAVE_HILDON
- if (gtk_icon_theme_has_icon (icon_theme, "channel-insecure-symbolic"))
- gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_PRIMARY, "channel-insecure-symbolic");
- else if (gtk_icon_theme_has_icon (icon_theme, "lock-insecure"))
- gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_PRIMARY, "lock-insecure");
- else
- gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_INFO);
+ gchar* icon_names[] = { "channel-insecure-symbolic", "lock-insecure", "dialog-information", NULL };
+ gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY,
+ g_themed_icon_new_from_names (icon_names, -1));
gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (entry),
GTK_ICON_ENTRY_PRIMARY, _("Not verified"));
- #endif
}
else if (hint == MIDORI_SECURITY_TRUSTED)
{
- #if !GTK_CHECK_VERSION (3, 0, 0)
- bg_color = "#d1eeb9";
- fg_color = "#000";
- #endif
- #if !HAVE_HILDON
- if (gtk_icon_theme_has_icon (icon_theme, "channel-secure-symbolic"))
- gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_PRIMARY, "channel-secure-symbolic");
- else if (gtk_icon_theme_has_icon (icon_theme, "lock-secure"))
- gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_PRIMARY, "lock-secure");
- else
- gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_DIALOG_AUTHENTICATION);
+ gchar* icon_names[] = { "channel-secure-symbolic", "lock-secure", "locked", NULL };
+ gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY,
+ g_themed_icon_new_from_names (icon_names, -1));
gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (entry),
GTK_ICON_ENTRY_PRIMARY, _("Verified and encrypted connection"));
- #endif
}
else if (hint == MIDORI_SECURITY_NONE)
{
- if (gtk_icon_theme_has_icon (icon_theme, "text-html-symbolic"))
- gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_PRIMARY, "text-html-symbolic");
- else
- gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_PRIMARY, "text-html");
+ gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY,
+ g_themed_icon_new_with_default_fallbacks ("text-html-symbolic"));
gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (entry),
GTK_ICON_ENTRY_PRIMARY, _("Open, unencrypted connection"));
}
-
- {
- #if GTK_CHECK_VERSION (3, 0, 0)
- GtkStyleContext* context = gtk_widget_get_style_context (entry);
- if (hint == MIDORI_SECURITY_UNKNOWN)
- {
- gtk_style_context_add_class (context, "security_unknown");
- gtk_style_context_remove_class (context, "security_trusted");
- }
- else if (hint == MIDORI_SECURITY_TRUSTED)
- {
- gtk_style_context_add_class (context, "security_trusted");
- gtk_style_context_remove_class (context, "security_unknown");
- }
- else if (hint == MIDORI_SECURITY_NONE)
- {
- gtk_style_context_remove_class (context, "security_unknown");
- gtk_style_context_remove_class (context, "security_trusted");
- }
- #else
- GdkColor color = { 0 };
- if (bg_color) gdk_color_parse (bg_color, &color);
- gtk_widget_modify_base (entry, GTK_STATE_NORMAL, bg_color ? &color : NULL);
- if (fg_color) gdk_color_parse (fg_color, &color);
- gtk_widget_modify_text (entry, GTK_STATE_NORMAL, fg_color ? &color : NULL);
- #endif
- }
}
}
diff --git a/midori/midori-panedaction.c b/midori/midori-panedaction.c
deleted file mode 100644
index e858b8a5..00000000
--- a/midori/midori-panedaction.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- Copyright (C) 2011 Peter Hatina
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#include
-#include
-#include "midori-panedaction.h"
-
-struct _MidoriPanedActionChild
-{
- GtkWidget* widget;
- gchar* name;
- gboolean resize;
- gboolean shrink;
-};
-
-struct _MidoriPanedAction
-{
- GtkAction parent_instance;
- GtkWidget* hpaned;
- GtkWidget* toolitem;
- struct _MidoriPanedActionChild child1;
- struct _MidoriPanedActionChild child2;
-};
-
-struct _MidoriPanedActionClass
-{
- GtkActionClass parent_class;
-};
-
-G_DEFINE_TYPE (MidoriPanedAction, midori_paned_action, GTK_TYPE_ACTION);
-
-static GtkWidget*
-midori_paned_action_create_tool_item (GtkAction *action);
-
-static void
-midori_paned_action_finalize (GObject* object);
-
-static void
-midori_paned_action_init (MidoriPanedAction* paned_action)
-{
- paned_action->hpaned = NULL;
- paned_action->toolitem = NULL;
- memset ((void*) &paned_action->child1, 0, sizeof (struct _MidoriPanedActionChild));
- memset ((void*) &paned_action->child2, 0, sizeof (struct _MidoriPanedActionChild));
-}
-
-static void
-midori_paned_action_finalize (GObject* object)
-{
- MidoriPanedAction* paned_action = MIDORI_PANED_ACTION (object);
-
- g_object_unref (G_OBJECT (paned_action->toolitem));
- g_object_unref (G_OBJECT (paned_action->hpaned));
- katze_assign (paned_action->child1.name, NULL);
- katze_assign (paned_action->child2.name, NULL);
-
- G_OBJECT_CLASS (midori_paned_action_parent_class)->finalize (object);
-}
-
-static void
-midori_paned_action_class_init (MidoriPanedActionClass* class)
-{
- GObjectClass* gobject_class;
- GtkActionClass* action_class;
-
- gobject_class = G_OBJECT_CLASS (class);
- gobject_class->finalize = midori_paned_action_finalize;
-
- action_class = GTK_ACTION_CLASS (class);
- action_class->create_tool_item = midori_paned_action_create_tool_item;
-}
-
-static GtkWidget*
-midori_paned_action_create_tool_item (GtkAction* action)
-{
- MidoriPanedAction* paned_action = MIDORI_PANED_ACTION (action);
- GtkWidget* alignment = gtk_alignment_new (0.0f, 0.5f, 1.0f, 0.1f);
- paned_action->hpaned = gtk_hpaned_new ();
- paned_action->toolitem = GTK_WIDGET (gtk_tool_item_new ());
- gtk_tool_item_set_expand (GTK_TOOL_ITEM (paned_action->toolitem), TRUE);
- gtk_container_add (GTK_CONTAINER (paned_action->toolitem), alignment);
- gtk_container_add (GTK_CONTAINER (alignment), GTK_WIDGET (paned_action->hpaned));
-
- gtk_paned_pack1 (GTK_PANED (paned_action->hpaned),
- paned_action->child1.widget,
- paned_action->child1.resize,
- paned_action->child1.shrink);
- gtk_paned_pack2 (GTK_PANED (paned_action->hpaned),
- paned_action->child2.widget,
- paned_action->child2.resize,
- paned_action->child2.shrink);
-
- gtk_widget_show_all (GTK_WIDGET (paned_action->toolitem));
- return paned_action->toolitem;
-}
-
-/**
- * midori_paned_action_set_child1:
- * @paned_action: a #MidoriPanedAction
- * @child1: a #GtkWidget to be added into GtkHPaned container
- * @name: string name for the child2
- * @resize: should child1 expand when the MidoriPanedAction is resized
- * @shrink: can child1 be made smaller than its requisition
- **/
-void
-midori_paned_action_set_child1 (MidoriPanedAction* paned_action,
- GtkWidget* child1,
- const gchar* name,
- gboolean resize,
- gboolean shrink)
-{
- g_return_if_fail (MIDORI_IS_PANED_ACTION (paned_action));
-
- katze_assign (paned_action->child1.name, g_strdup (name));
- paned_action->child1.widget = child1;
- paned_action->child1.resize = resize;
- paned_action->child1.shrink = shrink;
-}
-
-/**
- * midori_paned_action_set_child1:
- * @paned_action: a #MidoriPanedAction
- * @child2: a #GtkWidget to be added into GtkHPaned container
- * @name: string name for the child2
- * @resize: should child2 expand when the MidoriPanedAction is resized
- * @shrink: can child2 be made smaller than its requisition
- **/
-void
-midori_paned_action_set_child2 (MidoriPanedAction* paned_action,
- GtkWidget* child2,
- const gchar* name,
- gboolean resize,
- gboolean shrink)
-{
- g_return_if_fail (MIDORI_IS_PANED_ACTION (paned_action));
-
- katze_assign (paned_action->child2.name, g_strdup (name));
- paned_action->child2.widget = child2;
- paned_action->child2.resize = resize;
- paned_action->child2.shrink = shrink;
-}
-
-/**
- * midori_paned_action_get_child1:
- * @paned_action: a #MidoriPanedAction
- *
- * returns the first child held in GtkHPaned container
- **/
-GtkWidget*
-midori_paned_action_get_child1 (MidoriPanedAction* paned_action)
-{
- g_return_val_if_fail (MIDORI_IS_PANED_ACTION (paned_action), NULL);
-
- return paned_action->child1.widget;
-}
-
-/**
- * midori_paned_action_get_child1:
- * @paned_action: a #MidoriPanedAction
- *
- * returns the second child held in GtkHPaned container
- **/
-GtkWidget*
-midori_paned_action_get_child2 (MidoriPanedAction* paned_action)
-{
- g_return_val_if_fail (MIDORI_IS_PANED_ACTION (paned_action), NULL);
-
- return paned_action->child2.widget;
-}
-
-/**
- * midori_paned_action_get_child1:
- * @paned_action: a #MidoriPanedAction
- * @name: string name for one of the children
- *
- * returns a child specified by its name
- **/
-GtkWidget*
-midori_paned_action_get_child_by_name (MidoriPanedAction* paned_action,
- const gchar* name)
-{
- g_return_val_if_fail (MIDORI_IS_PANED_ACTION (paned_action), NULL);
- g_return_val_if_fail (name != NULL, NULL);
-
- if (g_strcmp0 (name, paned_action->child1.name) == 0)
- return midori_paned_action_get_child1 (paned_action);
- else if (g_strcmp0 (name, paned_action->child2.name) == 0)
- return midori_paned_action_get_child2 (paned_action);
-
- return NULL;
-}
-
-/**
- * midori_paned_action_get_child1_name:
- * @paned_action a #MidoriPanedAction
- *
- * Returns: The name of the first child
- **/
-const gchar*
-midori_paned_action_get_child1_name (MidoriPanedAction* paned_action)
-{
- g_return_val_if_fail (MIDORI_IS_PANED_ACTION (paned_action), NULL);
-
- return paned_action->child1.name;
-}
-
-/**
- * midori_paned_action_get_child2_name:
- * @paned_action a #MidoriPanedAction
- *
- * Returns: The name of the second child
- **/
-const gchar*
-midori_paned_action_get_child2_name (MidoriPanedAction* paned_action)
-{
- g_return_val_if_fail (MIDORI_IS_PANED_ACTION (paned_action), NULL);
-
- return paned_action->child2.name;
-}
diff --git a/midori/midori-panedaction.h b/midori/midori-panedaction.h
deleted file mode 100644
index 58444735..00000000
--- a/midori/midori-panedaction.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- Copyright (C) 2011 Peter Hatina
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#ifndef __MIDORI_PANED_ACTION_H__
-#define __MIDORI_PANED_ACTION_H__
-
-#include
-
-G_BEGIN_DECLS
-
-#define MIDORI_TYPE_PANED_ACTION \
- (midori_paned_action_get_type ())
-#define MIDORI_PANED_ACTION(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_PANED_ACTION, MidoriPanedAction))
-#define MIDORI_PANED_ACTION_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_PANED_ACTION, MidoriPanedActionClass))
-#define MIDORI_IS_PANED_ACTION(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_PANED_ACTION))
-#define MIDORI_IS_PANED_ACTION_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_PANED_ACTION))
-#define MIDORI_PANED_ACTION_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_PANED_ACTION, MidoriPanedActionClass))
-
-typedef struct _MidoriPanedAction MidoriPanedAction;
-typedef struct _MidoriPanedActionClass MidoriPanedActionClass;
-
-GType
-midori_paned_action_get_type (void) G_GNUC_CONST;
-
-void
-midori_paned_action_set_child1 (MidoriPanedAction* paned_action,
- GtkWidget* child1,
- const gchar* name,
- gboolean resize,
- gboolean shrink);
-
-void
-midori_paned_action_set_child2 (MidoriPanedAction* paned_action,
- GtkWidget* child2,
- const gchar* name,
- gboolean resize,
- gboolean shrink);
-
-GtkWidget*
-midori_paned_action_get_child1 (MidoriPanedAction* paned_action);
-
-GtkWidget*
-midori_paned_action_get_child2 (MidoriPanedAction* paned_action);
-
-GtkWidget*
-midori_paned_action_get_child_by_name (MidoriPanedAction* paned_action,
- const gchar* name);
-
-const gchar*
-midori_paned_action_get_child1_name (MidoriPanedAction* paned_action);
-
-const gchar*
-midori_paned_action_get_child2_name (MidoriPanedAction* paned_action);
-
-G_END_DECLS
-
-#endif // __MIDORI_PANED_ACTION_H__
diff --git a/midori/midori-panedaction.vala b/midori/midori-panedaction.vala
new file mode 100644
index 00000000..dd7ecde3
--- /dev/null
+++ b/midori/midori-panedaction.vala
@@ -0,0 +1,79 @@
+/*
+ Copyright (C) 2011 Peter Hatina
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+namespace Midori {
+ public class PanedAction : Gtk.Action {
+ Gtk.HPaned? hpaned = null;
+ Gtk.ToolItem? toolitem = null;
+ Child child1 = new Child();
+ Child child2 = new Child();
+
+ private struct Child {
+ protected Gtk.Widget widget;
+ string name;
+ bool resize;
+ bool shrink;
+ }
+
+ public override unowned Gtk.Widget create_tool_item () {
+ Gtk.Alignment alignment = new Gtk.Alignment (0.0f, 0.5f, 1.0f, 0.1f);
+ hpaned = new Gtk.HPaned ();
+ toolitem = new Gtk.ToolItem ();
+ toolitem.set_expand (true);
+ toolitem.add (alignment);
+ alignment.add (hpaned);
+
+ hpaned.pack1 (child1.widget, child1.resize, child1.shrink);
+ hpaned.pack2 (child2.widget, child2.resize, child2.shrink);
+ toolitem.show_all ();
+ return toolitem;
+ }
+
+ public void set_child1 (Gtk.Widget widget, string name, bool resize, bool shrink) {
+ child1.widget = widget;
+ child1.name = name;
+ child1.resize = resize;
+ child1.shrink = shrink;
+ }
+
+ public void set_child2 (Gtk.Widget widget, string name, bool resize, bool shrink) {
+ child2.widget = widget;
+ child2.name = name;
+ child2.resize = resize;
+ child2.shrink = shrink;
+ }
+
+ public Gtk.Widget? get_child1 () {
+ return child1.widget;
+ }
+
+ public Gtk.Widget? get_child2 () {
+ return child2.widget;
+ }
+
+ public Gtk.Widget? get_child_by_name (string name) {
+ if (name == child1.name)
+ return child1.widget;
+ else if (name == child2.name)
+ return child2.widget;
+ return null;
+ }
+
+ public string get_child1_name () {
+ return child1.name;
+ }
+
+ public string get_child2_name () {
+ return child2.name;
+ }
+ }
+}
+
diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index ffe110e6..22ec10c7 100644
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -253,36 +253,6 @@ static GtkWidget*
_midori_panel_child_for_scrolled (MidoriPanel* panel,
GtkWidget* scrolled);
-static gboolean
-midori_panel_detached_window_delete_event_cb (GtkWidget* window,
- GdkEvent* event,
- MidoriPanel* panel)
-{
- /* FIXME: The panel will not end up at its original position */
- /* FIXME: The menuitem may be mispositioned */
- GtkWidget* vbox = gtk_bin_get_child (GTK_BIN (window));
- GtkWidget* scrolled = g_object_get_data (G_OBJECT (window), "scrolled");
- GtkWidget* toolbar = g_object_get_data (G_OBJECT (scrolled), "panel-toolbar");
- GtkWidget* menuitem = g_object_get_data (G_OBJECT (scrolled), "panel-menuitem");
- GtkWidget* viewable = _midori_panel_child_for_scrolled (panel, scrolled);
- GtkToolItem* toolitem;
- gint n;
-
- g_object_ref (toolbar);
- gtk_container_remove (GTK_CONTAINER (vbox), toolbar);
- gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar);
- g_object_unref (toolbar);
- g_object_ref (scrolled);
- gtk_container_remove (GTK_CONTAINER (vbox), scrolled);
- n = gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), scrolled, NULL);
- g_object_unref (scrolled);
- toolitem = midori_panel_construct_tool_item (panel, MIDORI_VIEWABLE (viewable));
- if (menuitem)
- g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem);
- midori_panel_set_current_page (panel, n);
- return FALSE;
-}
-
static void
midori_panel_widget_destroy_cb (GtkWidget* viewable,
GtkWidget* widget)
@@ -292,57 +262,6 @@ midori_panel_widget_destroy_cb (GtkWidget* viewable,
viewable, midori_panel_widget_destroy_cb, widget);
}
-static void
-midori_panel_detach_page (MidoriPanel* panel,
- gint n)
-{
- GtkToolItem* toolitem = gtk_toolbar_get_nth_item (
- GTK_TOOLBAR (panel->toolbar), n);
- const gchar* title = gtk_tool_button_get_label (GTK_TOOL_BUTTON (toolitem));
- GtkWidget* toolbar = gtk_notebook_get_nth_page (
- GTK_NOTEBOOK (panel->toolbook), n);
- GtkWidget* scrolled = gtk_notebook_get_nth_page (
- GTK_NOTEBOOK (panel->notebook), n);
- GtkWidget* vbox = gtk_vbox_new (FALSE, 0);
- #if HAVE_HILDON
- GtkWidget* window = hildon_window_new ();
- hildon_program_add_window (hildon_program_get_instance (), HILDON_WINDOW (window));
- #else
- GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window), TRUE);
- gtk_window_set_default_size (GTK_WINDOW (window), 250, 400);
- gtk_window_set_transient_for (GTK_WINDOW (window),
- GTK_WINDOW (gtk_widget_get_toplevel (panel->notebook)));
- #endif
- gtk_widget_show (vbox);
- gtk_container_add (GTK_CONTAINER (window), vbox);
- g_object_set_data (G_OBJECT (window), "scrolled", scrolled);
- gtk_window_set_title (GTK_WINDOW (window), title);
- g_signal_handlers_disconnect_by_func (
- _midori_panel_child_for_scrolled (panel, scrolled),
- midori_panel_widget_destroy_cb, toolitem);
- gtk_container_remove (GTK_CONTAINER (panel->toolbar), GTK_WIDGET (toolitem));
- g_object_ref (toolbar);
- gtk_container_remove (GTK_CONTAINER (panel->toolbook), toolbar);
- #if HAVE_HILDON
- hildon_window_add_toolbar (HILDON_WINDOW (window), GTK_TOOLBAR (toolbar));
- #else
- gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 0);
- #endif
- g_object_unref (toolbar);
- g_object_set_data (G_OBJECT (scrolled), "panel-toolbar", toolbar);
- g_object_ref (scrolled);
- gtk_container_remove (GTK_CONTAINER (panel->notebook), scrolled);
- gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0);
- g_object_unref (scrolled);
- midori_panel_set_current_page (panel, n > 0 ? n - 1 : 0);
- toolitem = gtk_toolbar_get_nth_item (GTK_TOOLBAR (panel->toolbar),
- n > 0 ? n - 1 : 0);
- g_signal_connect (window, "delete-event",
- G_CALLBACK (midori_panel_detached_window_delete_event_cb), panel);
- gtk_widget_show (window);
-}
-
static void
midori_panel_button_align_clicked_cb (GtkWidget* toolitem,
MidoriPanel* panel)
@@ -381,6 +300,7 @@ midori_panel_init (MidoriPanel* panel)
/* Create the titlebar */
labelbar = gtk_toolbar_new ();
+ katze_widget_add_class (labelbar, "secondary-toolbar");
panel->labelbar = labelbar;
gtk_toolbar_set_icon_size (GTK_TOOLBAR (labelbar), GTK_ICON_SIZE_MENU);
gtk_toolbar_set_style (GTK_TOOLBAR (labelbar), GTK_TOOLBAR_ICONS);
@@ -426,6 +346,7 @@ midori_panel_init (MidoriPanel* panel)
/* Create the notebook */
panel->notebook = gtk_notebook_new ();
+ katze_widget_add_class (panel->notebook, "content-view");
gtk_notebook_set_show_border (GTK_NOTEBOOK (panel->notebook), FALSE);
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (panel->notebook), FALSE);
panel->frame = gtk_frame_new (NULL);
@@ -570,13 +491,15 @@ midori_panel_set_right_aligned (MidoriPanel* panel,
/* Private function, used by MidoriBrowser */
/* static */ GtkWidget*
midori_panel_construct_menu_item (MidoriPanel* panel,
- MidoriViewable* viewable)
+ MidoriViewable* viewable,
+ gboolean popup)
{
GtkAction* action;
GtkWidget* menuitem;
action = g_object_get_data (G_OBJECT (viewable), "midori-panel-action");
- menuitem = gtk_action_create_menu_item (action);
+ menuitem = popup ? sokoke_action_create_popup_menu_item (action)
+ : gtk_action_create_menu_item (action);
g_object_set_data (G_OBJECT (menuitem), "page", viewable);
if (gtk_widget_get_visible (GTK_WIDGET (viewable)))
@@ -638,24 +561,9 @@ midori_panel_action_activate_cb (GtkRadioAction* action,
GtkWidget* viewable = g_object_get_data (G_OBJECT (action), "viewable");
gint n = midori_panel_page_num (panel, viewable);
- /* If the panel is detached, focus the window */
- if (n == -1)
- {
- GtkWidget* toplevel = gtk_widget_get_toplevel (viewable);
- gtk_window_present (GTK_WINDOW (toplevel));
- return;
- }
-
- if (panel->open_panels_in_windows
- && gtk_radio_action_get_current_value (action)
- == katze_object_get_int (action, "value"))
- midori_panel_detach_page (panel, n);
- else
- {
- midori_panel_set_current_page (panel, n);
- g_signal_emit (panel, signals[SWITCH_PAGE], 0, n);
- gtk_widget_show (GTK_WIDGET (panel));
- }
+ midori_panel_set_current_page (panel, n);
+ g_signal_emit (panel, signals[SWITCH_PAGE], 0, n);
+ gtk_widget_show (GTK_WIDGET (panel));
}
/**
@@ -710,7 +618,7 @@ midori_panel_append_page (MidoriPanel* panel,
{
scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
- GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_widget_set_can_focus (scrolled, TRUE);
gtk_widget_show (scrolled);
diff --git a/midori/midori-panel.h b/midori/midori-panel.h
index 87166674..c5cd2756 100644
--- a/midori/midori-panel.h
+++ b/midori/midori-panel.h
@@ -12,11 +12,7 @@
#ifndef __MIDORI_PANEL_H__
#define __MIDORI_PANEL_H__
-#include
-
-#include
-
-#include "midori-viewable.h"
+#include "midori-core.h"
G_BEGIN_DECLS
diff --git a/midori/midori-platform.h b/midori/midori-platform.h
index 88168688..b74339af 100644
--- a/midori/midori-platform.h
+++ b/midori/midori-platform.h
@@ -38,11 +38,6 @@
&& MIDORI_MOD_NEW_TAB(((GdkEventButton*)evt)->state)) \
|| (((GdkEventButton*)evt)->button == 2)))
-#ifndef G_OS_WIN32
- #define MIDORI_MODULE_PREFIX "lib"
-#else
- #define MIDORI_MODULE_PREFIX ""
-#endif
-
+#define MIDORI_MODULE_PREFIX "lib"
#endif /* !__MIDORI_PLATFORM_H__ */
diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index be60c466..cbdf69bb 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -11,6 +11,8 @@
#include "midori-preferences.h"
+#include "midori-app.h"
+#include "midori-core.h"
#include "midori-platform.h"
#include
@@ -292,7 +294,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
#define SPANNED_ADD(__widget) \
katze_preferences_add_widget (_preferences, __widget, "spanned")
/* Page "General" */
- if (!sokoke_is_app_or_private ())
+ if (!midori_paths_is_readonly ())
{
PAGE_NEW (GTK_STOCK_HOME, _("Startup"));
FRAME_NEW (NULL);
@@ -300,7 +302,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
INDENTED_ADD (label);
button = katze_property_proxy (settings, "load-on-startup", NULL);
SPANNED_ADD (button);
- label = katze_property_label (settings, "homepage");
+ label = gtk_label_new (_("Homepage:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
INDENTED_ADD (label);
entry = katze_property_proxy (settings, "homepage", "address");
SPANNED_ADD (entry);
@@ -350,7 +353,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
button = katze_property_proxy (settings, "enforce-font-family", NULL);
INDENTED_ADD (button);
#endif
- label = katze_property_label (settings, "preferred-encoding");
+ label = gtk_label_new (_("Preferred Encoding"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
INDENTED_ADD (label);
button = katze_property_proxy (settings, "preferred-encoding", "custom-default-encoding");
SPANNED_ADD (button);
@@ -360,12 +364,14 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
FRAME_NEW (NULL);
#if !HAVE_HILDON
button = katze_property_proxy (settings, "auto-load-images", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically"));
INDENTED_ADD (button);
button = katze_property_proxy (settings, "enable-spell-checking", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Enable Spell Checking"));
SPANNED_ADD (button);
/* Disable spell check option if there are no enchant modules */
{
- gchar* enchant_path = sokoke_find_lib_path ("enchant");
+ gchar* enchant_path = midori_paths_get_lib_path ("enchant");
if (enchant_path == NULL)
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
@@ -375,11 +381,15 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
g_free (enchant_path);
}
button = katze_property_proxy (settings, "enable-scripts", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts"));
INDENTED_ADD (button);
button = katze_property_proxy (settings, "enable-plugins", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Enable Netscape plugins"));
+ gtk_widget_set_sensitive (button, midori_web_settings_has_plugin_support ());
SPANNED_ADD (button);
#endif
button = katze_property_proxy (settings, "zoom-text-and-images", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Zoom Text and Images"));
INDENTED_ADD (button);
button = katze_property_proxy (settings, "javascript-can-open-windows-automatically", NULL);
gtk_button_set_label (GTK_BUTTON (button), _("Allow scripts to open popups"));
@@ -387,30 +397,42 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
SPANNED_ADD (button);
if (katze_widget_has_touchscreen_mode (parent ?
GTK_WIDGET (parent) : GTK_WIDGET (preferences)))
+ {
button = katze_property_proxy (settings, "kinetic-scrolling", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Kinetic scrolling"));
+ gtk_widget_set_tooltip_text (button, _("Whether scrolling should kinetically move according to speed"));
+ }
else
+ {
button = katze_property_proxy (settings, "middle-click-opens-selection", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Middle click opens Selection"));
+ gtk_widget_set_tooltip_text (button, _("Load an address from the selection via middle click"));
+ }
INDENTED_ADD (button);
- button = katze_property_proxy (settings, "flash-window-on-new-bg-tabs", NULL);
- SPANNED_ADD (button);
-
if (katze_object_has_property (settings, "enable-webgl"))
{
button = katze_property_proxy (settings, "enable-webgl", NULL);
- INDENTED_ADD (button);
+ gtk_button_set_label (GTK_BUTTON (button), _("Enable WebGL support"));
+ SPANNED_ADD (button);
}
+ #ifndef G_OS_WIN32
+ button = katze_property_proxy (settings, "flash-window-on-new-bg-tabs", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Flash window on background tabs"));
+ INDENTED_ADD (button);
+ #endif
FRAME_NEW (NULL);
- button = katze_property_label (settings, "preferred-languages");
+ button = gtk_label_new (_("Preferred languages"));
+ gtk_misc_set_alignment (GTK_MISC (button), 0.0, 0.5);
INDENTED_ADD (button);
entry = katze_property_proxy (settings, "preferred-languages", "languages");
+ gtk_widget_set_tooltip_text (entry, _("A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""));
SPANNED_ADD (entry);
- #if !HAVE_HILDON
- label = katze_property_label (settings, "download-folder");
+ label = gtk_label_new (_("Save downloaded files to:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
INDENTED_ADD (label);
button = katze_property_proxy (settings, "download-folder", "folder");
SPANNED_ADD (button);
- #endif
/* Page "Interface" */
PAGE_NEW (GTK_STOCK_CONVERT, _("Browsing"));
@@ -428,47 +450,51 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
INDENTED_ADD (label);
button = katze_property_proxy (settings, "open-new-pages-in", NULL);
SPANNED_ADD (button);
- #if !HAVE_HILDON
button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Close Buttons on Tabs"));
INDENTED_ADD (button);
#ifndef HAVE_GRANITE
button = katze_property_proxy (settings, "always-show-tabbar", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Always Show Tabbar"));
SPANNED_ADD (button);
#endif
- #endif
button = katze_property_proxy (settings, "open-tabs-next-to-current", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Open Tabs next to Current"));
+ gtk_widget_set_tooltip_text (button, _("Whether to open new tabs next to the current tab or after the last one"));
INDENTED_ADD (button);
button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL);
+ gtk_button_set_label (GTK_BUTTON (button), _("Open tabs in the background"));
SPANNED_ADD (button);
- #if !HAVE_HILDON
+
INDENTED_ADD (gtk_label_new (NULL));
- label = katze_property_label (settings, "text-editor");
+ label = gtk_label_new (_("Text Editor"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
INDENTED_ADD (label);
entry = katze_property_proxy (settings, "text-editor", "application-text/plain");
SPANNED_ADD (entry);
- label = katze_property_label (settings, "news-aggregator");
+ label = gtk_label_new (_("News Aggregator"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
INDENTED_ADD (label);
entry = katze_property_proxy (settings, "news-aggregator", "application-News");
SPANNED_ADD (entry);
- #endif
/* Page "Network" */
PAGE_NEW (GTK_STOCK_NETWORK, _("Network"));
FRAME_NEW (NULL);
- #if !HAVE_HILDON
- label = katze_property_label (settings, "proxy-type");
+ label = gtk_label_new (_("Proxy server"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
INDENTED_ADD (label);
button = katze_property_proxy (settings, "proxy-type", NULL);
SPANNED_ADD (button);
label = gtk_label_new (_("Hostname"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
INDENTED_ADD (label);
- entry = katze_property_proxy (settings, "http-proxy", NULL);
+ entry = katze_property_proxy (settings, "http-proxy", "address");
SPANNED_ADD (entry);
g_signal_connect (settings, "notify::proxy-type",
G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry);
midori_preferences_notify_proxy_type_cb (settings, NULL, entry);
- label = katze_property_label (settings, "http-proxy-port");
+ label = gtk_label_new (_("Port"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
INDENTED_ADD (label);
entry = katze_property_proxy (settings, "http-proxy-port", NULL);
@@ -476,13 +502,14 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
g_signal_connect (settings, "notify::proxy-type",
G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry);
midori_preferences_notify_proxy_type_cb (settings, NULL, entry);
- #endif
#if WEBKIT_CHECK_VERSION (1, 3, 11)
if (soup_session_get_feature (webkit_get_default_session (), SOUP_TYPE_CACHE))
{
- label = katze_property_label (settings, "maximum-cache-size");
+ label = gtk_label_new (_("Web Cache"));
+ gtk_widget_set_tooltip_text (label, _("The maximum size of cached pages on disk"));
INDENTED_ADD (label);
button = katze_property_proxy (settings, "maximum-cache-size", NULL);
+ gtk_widget_set_tooltip_text (button, _("The maximum size of cached pages on disk"));
SPANNED_ADD (button);
label = gtk_label_new (_("MB"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index bc814d99..7d01734c 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -311,8 +311,7 @@ midori_search_action_create_tool_item (GtkAction* action)
GtkWidget* alignment;
toolitem = GTK_WIDGET (gtk_tool_item_new ());
- entry = gtk_icon_entry_new ();
- sokoke_entry_set_clear_button_visible (GTK_ENTRY (entry), TRUE);
+ entry = sokoke_search_entry_new (NULL);
gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
GTK_ICON_ENTRY_PRIMARY, TRUE);
alignment = gtk_alignment_new (0, 0.5, 1, 0.1);
@@ -433,7 +432,7 @@ midori_search_action_get_icon (KatzeItem* item,
else if (gtk_icon_theme_has_icon (icon_theme, "edit-find-option"))
*icon_name = "edit-find-option";
else
- *icon_name = "edit-find";
+ *icon_name = STOCK_EDIT_FIND;
return NULL;
}
@@ -877,15 +876,189 @@ midori_search_action_editor_name_changed_cb (GtkWidget* entry,
GTK_RESPONSE_ACCEPT, text && *text);
}
-static void
+gchar*
+midori_search_action_token_for_uri (const gchar* uri)
+{
+ guint len, i;
+ gchar** parts;
+ gchar* hostname = NULL, *path = NULL;
+
+ path = midori_uri_parse_hostname (uri, NULL);
+ parts = g_strsplit (path, ".", -1);
+ g_free (path);
+
+ len = g_strv_length (parts);
+ if (len > 2)
+ {
+ for (i = len; i == 0; i--)
+ {
+ if (parts[i] && *parts[i])
+ if (strlen (parts[i]) > 3)
+ {
+ hostname = g_strdup (parts[i]);
+ break;
+ }
+ }
+ }
+ else
+ hostname = g_strdup (parts[0]);
+
+ if (!hostname)
+ hostname = g_strdup (parts[1]);
+
+ g_strfreev (parts);
+
+ if (strlen (hostname) > 4)
+ {
+ GString* str = g_string_new (NULL);
+ int j, count = 0;
+
+ for (j = 0; count < 4; j++)
+ {
+ if (hostname[j] == 'a'
+ || hostname[j] == 'e'
+ || hostname[j] == 'i'
+ || hostname[j] == 'o'
+ || hostname[j] == 'u')
+ continue;
+ else
+ {
+ g_string_append_c (str, hostname[j]);
+ count++;
+ }
+ }
+ return g_string_free (str, FALSE);
+ }
+ return g_strdup (hostname);
+}
+
+KatzeItem*
+midori_search_action_get_engine_for_form (WebKitWebView* web_view,
+ PangoEllipsizeMode ellipsize)
+{
+ #if WEBKIT_CHECK_VERSION (1, 5, 0)
+ WebKitDOMDocument* doc;
+ WebKitDOMHTMLFormElement* active_form;
+ WebKitDOMHTMLCollection* form_nodes;
+ WebKitDOMElement* active_element;
+ gchar* token_element;
+ const gchar* title;
+ GString* uri_str;
+ gulong form_len;
+ const gchar* action;
+ guint i;
+ KatzeItem* item;
+ gchar** parts;
+
+ #if WEBKIT_CHECK_VERSION (1, 9, 5)
+ doc = webkit_web_frame_get_dom_document (web_view);
+ #else
+ if (webkit_web_view_get_focused_frame (web_view) != webkit_web_view_get_main_frame (web_view))
+ return NULL;
+ doc = webkit_web_view_get_dom_document (web_view);
+ #endif
+
+ active_element = webkit_dom_html_document_get_active_element ((WebKitDOMHTMLDocument*)doc);
+ active_form = webkit_dom_html_input_element_get_form ((WebKitDOMHTMLInputElement*)active_element);
+
+ if (!active_form)
+ return NULL;
+
+ token_element = webkit_dom_element_get_attribute (active_element, "name");
+
+ form_nodes = webkit_dom_html_form_element_get_elements (active_form);
+ form_len = webkit_dom_html_form_element_get_length (active_form);
+
+ /* action NULL or "": relative path */
+ if ((action = webkit_dom_html_form_element_get_action (active_form)) && *action)
+ uri_str = g_string_new (action);
+ else
+ {
+ gchar* hostname = midori_uri_parse_hostname (webkit_web_view_get_uri (web_view), NULL);
+ uri_str = g_string_new ("http://");
+ g_string_append (uri_str, hostname);
+ g_free (hostname);
+ }
+ g_string_append_c (uri_str, '?');
+
+ for (i = 0; i < form_len; i++)
+ {
+ WebKitDOMNode* form_node = webkit_dom_html_collection_item (form_nodes, i);
+ WebKitDOMElement* form_element = (WebKitDOMElement*) form_node;
+ gchar* name = webkit_dom_element_get_attribute (form_element, "name");
+
+ if (name && *name)
+ {
+ if (!g_strcmp0 (token_element, name))
+ g_string_append_printf (uri_str, "%s=%s&", name, "\%s");
+ else
+ {
+ gchar* value;
+ if (!g_strcmp0 (webkit_dom_element_get_tag_name (form_element), "SELECT"))
+ {
+ WebKitDOMHTMLSelectElement* select_element = (WebKitDOMHTMLSelectElement*) form_element;
+ gulong pos = webkit_dom_html_select_element_get_selected_index (select_element);
+ WebKitDOMNode* selected_node = webkit_dom_html_select_element_item (select_element, pos);
+ WebKitDOMElement* selected_element = (WebKitDOMElement*) selected_node;
+
+ value = webkit_dom_element_get_attribute (selected_element, "value");
+ }
+ else
+ value = webkit_dom_element_get_attribute (form_element, "value");
+
+ g_string_append_printf (uri_str, "%s=%s&", name, value);
+ g_free (value);
+ }
+ g_free (name);
+ }
+ }
+
+ title = webkit_web_view_get_title (web_view);
+
+ item = katze_item_new ();
+ item->uri = g_string_free (uri_str, FALSE);
+ item->token = midori_search_action_token_for_uri (webkit_web_view_get_uri (web_view));
+
+ if (strstr (title, " - "))
+ parts = g_strsplit (title, " - ", 2);
+ else if (strstr (title, ": "))
+ parts = g_strsplit (title, ": ", 2);
+ else
+ parts = NULL;
+ if (parts != NULL)
+ {
+ /* See midori_view_set_title: title can be first or last */
+ if (ellipsize == PANGO_ELLIPSIZE_END)
+ {
+ item->name = g_strdup (parts[0]);
+ item->text = g_strdup (parts[1]);
+ }
+ else
+ {
+ item->name = g_strdup (parts[1]);
+ item->text = g_strdup (parts[2]);
+ }
+ g_strfreev (parts);
+ }
+ else
+ item->name = g_strdup (title);
+
+ g_free (token_element);
+ return item;
+ #else
+ return NULL;
+ #endif
+}
+
+void
midori_search_action_get_editor (MidoriSearchAction* search_action,
+ KatzeItem* item,
gboolean new_engine)
{
GtkWidget* toplevel;
GtkWidget* dialog;
GtkWidget* content_area;
GtkSizeGroup* sizegroup;
- KatzeItem* item;
GtkWidget* hbox;
GtkWidget* label;
GtkTreeModel* liststore;
@@ -894,7 +1067,6 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
GtkWidget* entry_name;
GtkWidget* entry_description;
GtkWidget* entry_uri;
- GtkWidget* entry_icon;
GtkWidget* entry_token;
toplevel = gtk_widget_get_toplevel (search_action->treeview);
@@ -914,7 +1086,6 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
if (new_engine)
{
- item = katze_item_new ();
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
GTK_RESPONSE_ACCEPT, FALSE);
}
@@ -935,9 +1106,8 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
g_signal_connect (entry_name, "changed",
G_CALLBACK (midori_search_action_editor_name_changed_cb), dialog);
gtk_entry_set_activates_default (GTK_ENTRY (entry_name), TRUE);
- if (!new_engine)
- gtk_entry_set_text (GTK_ENTRY (entry_name),
- katze_str_non_null (katze_item_get_name (item)));
+ gtk_entry_set_text (GTK_ENTRY (entry_name),
+ katze_str_non_null (katze_item_get_name (item)));
gtk_box_pack_start (GTK_BOX (hbox), entry_name, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (content_area), hbox);
gtk_widget_show_all (hbox);
@@ -949,8 +1119,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
entry_description = gtk_entry_new ();
gtk_entry_set_activates_default (GTK_ENTRY (entry_description), TRUE);
- if (!new_engine)
- gtk_entry_set_text (GTK_ENTRY (entry_description)
+ gtk_entry_set_text (GTK_ENTRY (entry_description)
, katze_str_non_null (katze_item_get_text (item)));
gtk_box_pack_start (GTK_BOX (hbox), entry_description, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (content_area), hbox);
@@ -969,27 +1138,12 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
#endif
g_object_set_data (G_OBJECT (entry_uri), "allow_%s", (void*)1);
gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE);
- if (!new_engine)
- gtk_entry_set_text (GTK_ENTRY (entry_uri)
- , katze_str_non_null (katze_item_get_uri (item)));
+ gtk_entry_set_text (GTK_ENTRY (entry_uri),
+ katze_str_non_null (katze_item_get_uri (item)));
gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (content_area), hbox);
gtk_widget_show_all (hbox);
- hbox = gtk_hbox_new (FALSE, 8);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- label = gtk_label_new_with_mnemonic (_("_Icon:"));
- gtk_size_group_add_widget (sizegroup, label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- entry_icon = gtk_entry_new ();
- gtk_entry_set_activates_default (GTK_ENTRY (entry_icon), TRUE);
- if (!new_engine)
- gtk_entry_set_text (GTK_ENTRY (entry_icon)
- , katze_str_non_null (katze_item_get_icon (item)));
- gtk_box_pack_start (GTK_BOX (hbox), entry_icon, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (content_area), hbox);
- gtk_widget_show_all (hbox);
-
hbox = gtk_hbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
label = gtk_label_new_with_mnemonic (_("_Token:"));
@@ -997,8 +1151,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
entry_token = gtk_entry_new ();
gtk_entry_set_activates_default (GTK_ENTRY (entry_token), TRUE);
- if (!new_engine)
- gtk_entry_set_text (GTK_ENTRY (entry_token)
+ gtk_entry_set_text (GTK_ENTRY (entry_token)
, katze_str_non_null (katze_item_get_token (item)));
gtk_box_pack_start (GTK_BOX (hbox), entry_token, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (content_area), hbox);
@@ -1011,7 +1164,6 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
"name", gtk_entry_get_text (GTK_ENTRY (entry_name)),
"text", gtk_entry_get_text (GTK_ENTRY (entry_description)),
"uri", gtk_entry_get_text (GTK_ENTRY (entry_uri)),
- "icon", gtk_entry_get_text (GTK_ENTRY (entry_icon)),
"token", gtk_entry_get_text (GTK_ENTRY (entry_token)),
NULL);
@@ -1036,7 +1188,7 @@ midori_search_action_activate_edit_cb (GtkTreeView *treeview,
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
if (gtk_tree_selection_get_selected (selection, NULL, NULL))
- midori_search_action_get_editor (search_action, FALSE);
+ midori_search_action_get_editor (search_action, NULL, FALSE);
}
@@ -1044,7 +1196,7 @@ static void
midori_search_action_dialog_add_cb (GtkWidget* widget,
MidoriSearchAction* search_action)
{
- midori_search_action_get_editor (search_action, TRUE);
+ midori_search_action_get_editor (search_action, katze_item_new (), TRUE);
}
static void
@@ -1057,7 +1209,7 @@ midori_search_action_dialog_edit_cb (GtkWidget* widget,
treeview = search_action->treeview;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
if (gtk_tree_selection_get_selected (selection, NULL, NULL))
- midori_search_action_get_editor (search_action, FALSE);
+ midori_search_action_get_editor (search_action, NULL, FALSE);
}
static void
@@ -1305,6 +1457,8 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action)
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
#endif
NULL);
+ katze_widget_add_class (gtk_dialog_get_widget_for_response (
+ GTK_DIALOG (dialog), GTK_RESPONSE_HELP), "help_button");
g_signal_connect (dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed), &search_action->dialog);
gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES);
@@ -1339,6 +1493,11 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action)
gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf,
(GtkTreeCellDataFunc)midori_search_action_dialog_render_tick_cb,
treeview, NULL);
+ renderer_text = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (column, renderer_text, FALSE);
+ gtk_tree_view_column_set_cell_data_func (column, renderer_text,
+ (GtkTreeCellDataFunc)midori_search_action_dialog_render_token,
+ treeview, NULL);
renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE);
gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf,
@@ -1349,11 +1508,6 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action)
gtk_tree_view_column_set_cell_data_func (column, renderer_text,
(GtkTreeCellDataFunc)midori_search_action_dialog_render_text,
treeview, NULL);
- renderer_text = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (column, renderer_text, TRUE);
- gtk_tree_view_column_set_cell_data_func (column, renderer_text,
- (GtkTreeCellDataFunc)midori_search_action_dialog_render_token,
- treeview, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
diff --git a/midori/midori-searchaction.h b/midori/midori-searchaction.h
index c8d0ed88..1f1d2200 100644
--- a/midori/midori-searchaction.h
+++ b/midori/midori-searchaction.h
@@ -13,6 +13,7 @@
#define __MIDORI_SEARCH_ACTION_H__
#include
+#include
G_BEGIN_DECLS
@@ -72,6 +73,15 @@ midori_search_action_set_default_item (MidoriSearchAction* search_action,
GtkWidget*
midori_search_action_get_dialog (MidoriSearchAction* search_action);
+void
+midori_search_action_get_editor (MidoriSearchAction* search_action,
+ KatzeItem* item,
+ gboolean new_engine);
+
+KatzeItem*
+midori_search_action_get_engine_for_form (WebKitWebView* web_view,
+ PangoEllipsizeMode ellipsize);
+
G_END_DECLS
#endif /* __MIDORI_SEARCH_ACTION_H__ */
diff --git a/midori/midori-settings.vala b/midori/midori-settings.vala
new file mode 100644
index 00000000..70d213c2
--- /dev/null
+++ b/midori/midori-settings.vala
@@ -0,0 +1,109 @@
+/*
+ Copyright (C) 2008-2012 Christian Dywan
+ Copyright (C) 2011 Peter Hatina
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+namespace Midori {
+ [CCode (cprefix = "MIDORI_WINDOW_")]
+ public enum WindowState {
+ NORMAL,
+ MINIMIZED,
+ MAXIMIZED,
+ FULLSCREEN
+ }
+ /* Since: 0.1.3 */
+
+ public class Settings : WebKit.WebSettings {
+ public bool remember_last_window_size { get; set; default = true; }
+ public int last_window_width { get; set; default = 0; }
+ public int last_window_height { get; set; default = 0; }
+ public int last_panel_position { get; set; default = 0; }
+ public int last_panel_page { get; set; default = 0; }
+ public int last_web_search { get; set; default = 0; }
+ /* Since: 0.4.3 */
+ // [IntegerType (min = 10, max = int.max)]
+ public int search_width { get; set; default = 200; }
+ /* Since: 0.4.7 */
+ public bool last_inspector_attached { get; set; default = false; }
+ /* Since: 0.1.3 */
+ public WindowState last_window_state { get; set; default = WindowState.NORMAL; }
+
+ public string? location_entry_search { get; set; default = null; }
+ /* Since: 0.1.7 */
+ public int clear_private_data { get; set; default = 0; }
+ /* Since: 0.2.9 */
+ public string? clear_data { get; set; default = null; }
+
+ public bool compact_sidepanel { get; set; default = false; }
+ /* Since: 0.2.2 */
+ public bool open_panels_in_windows { get; set; default = false; }
+ /* Since: 0.1.3 */
+ public bool right_align_sidepanel { get; set; default = false; }
+
+ public bool show_menubar { get; set; default = false; }
+ public bool show_navigationbar { get; set; default = true; }
+ public bool show_bookmarkbar { get; set; default = false; }
+ public bool show_panel { get; set; default = false; }
+ public bool show_statusbar { get; set; default = true; }
+ /* Since: 0.1.2 */
+ public bool show_crash_dialog { get; set; default = true; }
+ public string toolbar_items { get; set; default =
+ "TabNew,Back,NextForward,ReloadStop,BookmarkAdd,Location,Search,Trash,CompactMenu"; }
+ /* Since: 0.1.4 */
+ // [Deprecated (since = "0.4.7")]
+ public bool find_while_typing { get; set; default = false; }
+
+ public bool open_popups_in_tabs { get; set; default = true; }
+ /* Since: 0.1.3 */
+ public bool zoom_text_and_images { get; set; default = true; }
+ /* Since: 0.2.0 */
+ public bool kinetic_scrolling { get; set; default = true; }
+ public bool middle_click_opens_selection { get; set; default = true; }
+ public bool flash_window_on_new_bg_tabs { get; set; default = false; }
+
+ public bool close_buttons_on_tabs { get; set; default = true; }
+ public bool open_tabs_in_the_background { get; set; default = true; }
+ public bool open_tabs_next_to_current { get; set; default = true; }
+ public bool always_show_tabbar { get; set; default = true; }
+
+ public string homepage { get; set; default = "http://www.google.com"; }
+ static string default_download_folder () {
+ return Environment.get_user_special_dir (UserDirectory.DOWNLOAD)
+ ?? Environment.get_home_dir ();
+ }
+ public string download_folder { get; set; default = default_download_folder (); }
+ public string? text_editor { get; set; default = null; }
+ /* Since: 0.1.6 */
+ public string? news_aggregator { get; set; default = null; }
+
+ public string http_proxy { get; set; default = null; }
+ /* Since: 0.4.2 */
+ // [IntegerType (min = 1, max = 65535)]
+ public int http_proxy_port { get; set; default = 8080; }
+ /* Since: 0.3.4 */
+ // [IntegerType (min = 0, int.max)]
+ public int maximum_cache_size { get; set; default = 100; }
+ /* Since: 0.3.4 */
+ public bool strip_referer { get; set; default = false; }
+ /* Since: 0.4.2 */
+ public bool first_party_cookies_only { get; set; default = true; }
+ // [IntegerType (min = 0, int.max)]
+ public int maximum_cookie_age { get; set; default = 30; }
+ // [IntegerType (min = 0, int.max)]
+ public int maximum_history_age { get; set; default = 30; }
+
+ /* Since: 0.4.7 */
+ public bool delay_saving (string property) {
+ return property.has_prefix ("last-")
+ || property == "user-stylesheet-uri"
+ || property.has_suffix ("-width");
+ }
+ }
+}
diff --git a/midori/midori-speeddial.vala b/midori/midori-speeddial.vala
new file mode 100644
index 00000000..392257d3
--- /dev/null
+++ b/midori/midori-speeddial.vala
@@ -0,0 +1,401 @@
+/*
+ Copyright (C) 2011-2012 Christian Dywan
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+namespace Katze {
+ extern static string mkdir_with_parents (string pathname, int mode);
+}
+
+namespace Sokoke {
+ extern static string js_script_eval (void* ctx, string script, void* error);
+}
+
+namespace Midori {
+ public errordomain SpeedDialError {
+ INVALID_MESSAGE,
+ NO_ACTION,
+ NO_ID,
+ NO_URL,
+ NO_TITLE,
+ NO_ID2,
+ INVALID_ACTION,
+ }
+
+ public class SpeedDial : GLib.Object {
+ string filename;
+ string? html = null;
+ List thumb_queue = null;
+ WebKit.WebView thumb_view = null;
+ Spec? spec = null;
+
+ public GLib.KeyFile keyfile;
+ public bool close_buttons_left { get; set; default = false; }
+ public signal void refresh ();
+
+ public class Spec {
+ public string dial_id;
+ public string uri;
+ public Spec (string dial_id, string uri) {
+ this.dial_id = dial_id;
+ this.uri = uri;
+ }
+ }
+
+ public SpeedDial (string new_filename, string? fallback = null) {
+ filename = new_filename;
+ keyfile = new GLib.KeyFile ();
+ try {
+ keyfile.load_from_file (filename, GLib.KeyFileFlags.NONE);
+ }
+ catch (GLib.Error io_error) {
+ string json;
+ size_t len;
+ try {
+ FileUtils.get_contents (fallback ?? (filename + ".json"),
+ out json, out len);
+ }
+ catch (GLib.Error fallback_error) {
+ json = "'{}'";
+ len = 4;
+ }
+
+ var script = new StringBuilder.sized (len);
+ script.append ("var json = JSON.parse (");
+ script.append_len (json, (ssize_t)len);
+ script.append ("""
+ );
+ var keyfile = '';
+ for (var i in json['shortcuts']) {
+ var tile = json['shortcuts'][i];
+ keyfile += '[Dial ' + tile['id'].substring (1) + ']\n'
+ + 'uri=' + tile['href'] + '\n'
+ + 'img=' + tile['img'] + '\n'
+ + 'title=' + tile['title'] + '\n\n';
+ }
+ var columns = json['width'] ? json['width'] : 3;
+ var rows = json['shortcuts'] ? json['shortcuts'].length / columns : 0;
+ keyfile += '[settings]\n'
+ + 'columns=' + columns + '\n'
+ + 'rows=' + (rows > 3 ? rows : 3) + '\n\n';
+ keyfile;
+ """);
+
+ try {
+ keyfile.load_from_data (
+ Sokoke.js_script_eval (null, script.str, null),
+ -1, 0);
+ }
+ catch (GLib.Error eval_error) {
+ GLib.critical ("Failed to parse %s as speed dial JSON: %s",
+ fallback ?? (filename + ".json"), eval_error.message);
+ }
+ Katze.mkdir_with_parents (
+ Path.build_path (Path.DIR_SEPARATOR_S,
+ Environment.get_user_cache_dir (),
+ "midori", "thumbnails"), 0700);
+
+ foreach (string tile in keyfile.get_groups ()) {
+ try {
+ string img = keyfile.get_string (tile, "img");
+ keyfile.remove_key (tile, "img");
+ string uri = keyfile.get_string (tile, "uri");
+ if (img != null && uri[0] != '\0' && uri[0] != '#') {
+ uchar[] decoded = Base64.decode (img);
+ FileUtils.set_data (build_thumbnail_path (uri), decoded);
+ }
+ }
+ catch (GLib.Error img_error) {
+ /* img and uri can be missing */
+ }
+ }
+ }
+ }
+
+ public string get_next_free_slot (out uint count = null) {
+ uint slot_count = 0;
+ foreach (string tile in keyfile.get_groups ()) {
+ try {
+ if (keyfile.has_key (tile, "uri"))
+ slot_count++;
+ }
+ catch (KeyFileError error) { }
+ }
+ if (&count != null)
+ count = slot_count;
+
+ uint slot = 1;
+ while (slot <= slot_count) {
+ string tile = "Dial %u".printf (slot);
+ if (!keyfile.has_group (tile))
+ return tile;
+ slot++;
+ }
+
+ return "Dial %u".printf (slot_count + 1);
+ }
+
+ public void add (string uri, string title, Gdk.Pixbuf img) {
+ string id = get_next_free_slot ();
+ add_with_id (id, uri, title, img);
+ }
+
+ public void add_with_id (string id, string uri, string title, Gdk.Pixbuf img) {
+ keyfile.set_string (id, "uri", uri);
+ keyfile.set_string (id, "title", title);
+
+ Katze.mkdir_with_parents (Path.build_path (Path.DIR_SEPARATOR_S,
+ Paths.get_cache_dir (), "thumbnails"), 0700);
+ string filename = build_thumbnail_path (uri);
+ try {
+ img.save (filename, "png", null, "compression", "7", null);
+ }
+ catch (Error error) {
+ critical ("Failed to save speed dial thumbnail: %s", error.message);
+ }
+ save ();
+ }
+
+ string build_thumbnail_path (string filename) {
+ string thumbnail = Checksum.compute_for_string (ChecksumType.MD5, filename) + ".png";
+ return Path.build_filename (Paths.get_cache_dir (), "thumbnails", thumbnail);
+ }
+
+ public unowned string get_html () throws Error {
+ bool load_missing = true;
+
+ if (html != null)
+ return html;
+
+ string? head = null;
+ string filename = Paths.get_res_filename ("speeddial-head.html");
+ if (keyfile != null
+ && FileUtils.get_contents (filename, out head, null)) {
+ string header = head.replace ("{title}", _("Speed Dial")).
+ replace ("{click_to_add}", _("Click to add a shortcut")).
+ replace ("{enter_shortcut_address}", _("Enter shortcut address")).
+ replace ("{enter_shortcut_name}", _("Enter shortcut title")).
+ replace ("{are_you_sure}", _("Are you sure you want to delete this shortcut?"));
+ var markup = new StringBuilder (header);
+
+ uint slot_count = 1;
+ string dial_id = get_next_free_slot (out slot_count);
+ uint next_slot = dial_id.substring (5, -1).to_int ();
+
+ /* Try to guess the best X by X grid size */
+ uint grid_index = 3;
+ while ((grid_index * grid_index) < slot_count)
+ grid_index++;
+
+ /* Percent width size of one slot */
+ uint slot_size = (100 / grid_index);
+
+ /* No editing in private/ app mode or without scripts */
+ markup.append_printf (
+ "%s%s" +
+ "\n",
+ Paths.is_readonly () ? "" : "",
+ Paths.is_readonly () ? "" : " ",
+ slot_size + 1, slot_size - 4);
+
+ /* Combined width of slots should always be less than 100%.
+ * Use half of the remaining percentage as a margin size */
+ uint div_factor;
+ if (slot_size * grid_index >= 100 && grid_index > 4)
+ div_factor = 8;
+ else
+ div_factor = 2;
+ uint margin = (100 - ((slot_size - 4) * grid_index)) / div_factor;
+ if (margin > 9)
+ margin = margin % 10;
+
+ markup.append_printf (
+ "", margin);
+ if (close_buttons_left)
+ markup.append_printf (
+ "");
+
+ foreach (string tile in keyfile.get_groups ()) {
+ try {
+ string uri = keyfile.get_string (tile, "uri");
+ if (uri != null && uri.str ("://") != null && tile.has_prefix ("Dial ")) {
+ string title = keyfile.get_string (tile, "title");
+ string thumb_filename = build_thumbnail_path (uri);
+ uint slot = tile.substring (5, -1).to_int ();
+ string encoded;
+ try {
+ uint8[] thumb;
+ FileUtils.get_data (thumb_filename, out thumb);
+ encoded = Base64.encode (thumb);
+ }
+ catch (FileError error) {
+ encoded = null;
+ if (load_missing)
+ get_thumb (tile, uri);
+ }
+ markup.append_printf ("""
+
+
+
+
%s
\n\n\n");
+ html = markup.str;
+ }
+ else
+ html = "";
+
+ return html;
+ }
+
+ public void save_message (string message) throws Error {
+ if (!message.has_prefix ("speed_dial-save-"))
+ throw new SpeedDialError.INVALID_MESSAGE ("Invalid message '%s'", message);
+
+ string msg = message.substring (16, -1);
+ string[] parts = msg.split (" ", 4);
+ if (parts[0] == null)
+ throw new SpeedDialError.NO_ACTION ("No action.");
+ string action = parts[0];
+
+ if (parts[1] == null)
+ throw new SpeedDialError.NO_ID ("No ID argument.");
+ string dial_id = "Dial " + parts[1];
+
+ if (action == "delete") {
+ string uri = keyfile.get_string (dial_id, "uri");
+ string file_path = build_thumbnail_path (uri);
+ keyfile.remove_group (dial_id);
+ FileUtils.unlink (file_path);
+ }
+ else if (action == "add") {
+ if (parts[2] == null)
+ throw new SpeedDialError.NO_URL ("No URL argument.");
+ keyfile.set_string (dial_id, "uri", parts[2]);
+ get_thumb (dial_id, parts[2]);
+ }
+ else if (action == "rename") {
+ if (parts[2] == null)
+ throw new SpeedDialError.NO_TITLE ("No title argument.");
+ string title = parts[2];
+ keyfile.set_string (dial_id, "title", title);
+ }
+ else if (action == "swap") {
+ if (parts[2] == null)
+ throw new SpeedDialError.NO_ID2 ("No ID2 argument.");
+ string dial2_id = "Dial " + parts[2];
+
+ string uri = keyfile.get_string (dial_id, "uri");
+ string title = keyfile.get_string (dial_id, "title");
+ string uri2 = keyfile.get_string (dial2_id, "uri");
+ string title2 = keyfile.get_string (dial2_id, "title");
+
+ keyfile.set_string (dial_id, "uri", uri2);
+ keyfile.set_string (dial2_id, "uri", uri);
+ keyfile.set_string (dial_id, "title", title2);
+ keyfile.set_string (dial2_id, "title", title);
+ }
+ else
+ throw new SpeedDialError.INVALID_ACTION ("Invalid action '%s'", action);
+
+ save ();
+ }
+
+ void save () {
+ html = null;
+
+ try {
+ FileUtils.set_contents (filename, keyfile.to_data ());
+ }
+ catch (Error error) {
+ critical ("Failed to update speed dial: %s", error.message);
+ }
+ refresh ();
+ }
+
+ void load_status (GLib.Object thumb_view_, ParamSpec pspec) {
+ if (thumb_view.load_status != WebKit.LoadStatus.FINISHED)
+ return;
+
+ return_if_fail (spec != null);
+ #if HAVE_OFFSCREEN
+ var img = (thumb_view.parent as Gtk.OffscreenWindow).get_pixbuf ();
+ var pixbuf_scaled = img.scale_simple (240, 160, Gdk.InterpType.TILES);
+ img = pixbuf_scaled;
+ #else
+ thumb_view.realize ();
+ var img = midori_view_web_view_get_snapshot (thumb_view, 240, 160);
+ #endif
+ unowned string title = thumb_view.get_title ();
+ add_with_id (spec.dial_id, spec.uri, title ?? spec.uri, img);
+
+ thumb_queue.remove (spec);
+ if (thumb_queue != null && thumb_queue.data != null) {
+ spec = thumb_queue.data;
+ thumb_view.load_uri (spec.uri);
+ }
+ else
+ /* disconnect_by_func (thumb_view, load_status) */;
+ }
+
+ void get_thumb (string dial_id, string uri) {
+ if (thumb_view == null) {
+ thumb_view = new WebKit.WebView ();
+ var settings = new WebKit.WebSettings ();
+ settings. set ("enable-scripts", false,
+ "enable-plugins", false,
+ "auto-load-images", true,
+ "enable-html5-database", false,
+ "enable-html5-local-storage", false);
+ if (settings.get_class ().find_property ("enable-java-applet") != null)
+ settings.set ("enable-java-applet", false);
+ thumb_view.settings = settings;
+ #if HAVE_OFFSCREEN
+ var offscreen = new Gtk.OffscreenWindow ();
+ offscreen.add (thumb_view);
+ thumb_view.set_size_request (800, 600);
+ offscreen.show_all ();
+ #else
+ /* What we are doing here is a bit of a hack. In order to render a
+ thumbnail we need a new view and load the url in it. But it has
+ to be visible and packed in a container. So we secretly pack it
+ into the notebook of the parent browser. */
+ notebook.add (thumb_view);
+ thumb_view.destroy.connect (Gtk.widget_destroyed);
+ /* We use an empty label. It's not invisible but hard to spot. */
+ notebook.set_tab_label (thumb_view, new Gtk.EventBox ());
+ thumb_view.show ();
+ #endif
+ }
+
+ thumb_queue.append (new Spec (dial_id, uri));
+ if (thumb_queue.nth_data (1) != null)
+ return;
+
+ spec = thumb_queue.data;
+ thumb_view.notify["load-status"].connect (load_status);
+ thumb_view.load_uri (spec.uri);
+ }
+ }
+}
+
diff --git a/midori/midori-stock.h b/midori/midori-stock.h
index 7fe9f127..a28d3edf 100644
--- a/midori/midori-stock.h
+++ b/midori/midori-stock.h
@@ -12,42 +12,28 @@
#ifndef __MIDORI_STOCK_H__
#define __MIDORI_STOCK_H__ 1
-/* Custom stock items
+/* Stock items */
- We should distribute these
- Names should match with epiphany and/ or xdg spec */
-
-#define STOCK_BOOKMARK "stock_bookmark"
#define STOCK_BOOKMARKS "user-bookmarks"
-#define STOCK_CONSOLE "terminal"
#define STOCK_EXTENSION "extension"
-#define STOCK_EXTENSIONS "extension"
#define STOCK_HISTORY "document-open-recent"
#define STOCK_WEB_BROWSER "web-browser"
-#define STOCK_NEWS_FEED "news-feed"
-#define STOCK_STYLE "gnome-settings-theme"
+#define STOCK_NEWS_FEED "internet-news-reader"
+#define STOCK_STYLE "preferences-desktop-theme"
#define STOCK_TRANSFER "package"
-#define STOCK_TRANSFERS "package"
-#define STOCK_PLUGINS "gnome-mime-application-x-shockwave-flash"
-
+#define STOCK_PLUGINS "application-x-shockwave-flash"
#define STOCK_BOOKMARK_ADD "bookmark-new"
-#define STOCK_HOMEPAGE "go-home"
-#define STOCK_IMAGE "gnome-mime-image"
+#define STOCK_IMAGE "image-x-generic"
#define STOCK_NETWORK_OFFLINE "network-offline"
-#define STOCK_SCRIPT "stock_script"
-#define STOCK_SCRIPTS "gnome-settings-theme"
-#define STOCK_SEND "stock_mail-send"
-#define STOCK_TAB_NEW "stock_new-tab"
-#define STOCK_USER_TRASH "gnome-stock-trash"
-#define STOCK_WINDOW_NEW "stock_new-window"
-
-#if defined (HAVE_HILDON) && HAVE_HILDON
- #undef STOCK_BOOKMARKS
- #define STOCK_BOOKMARKS "general_mybookmarks_folder"
- #undef STOCK_NEWS_FEED
- #define STOCK_NEWS_FEED "general_rss"
- #undef STOCK_WEB_BROWSER
- #define STOCK_WEB_BROWSER "general_web"
-#endif
+#define STOCK_SCRIPT "text-x-javascript"
+#define STOCK_SEND "mail-send"
+#define STOCK_TAB_NEW "tab-new"
+#define STOCK_USER_TRASH "user-trash"
+#define STOCK_WINDOW_NEW "window-new"
+#define STOCK_FOLDER_NEW "folder-new"
+#define STOCK_EDIT_CLEAR "edit-clear"
+#define STOCK_EDIT_FIND "edit-find"
+#define STOCK_STOP "stop"
+#define STOCK_URL "text-html"
#endif /* !__MIDORI_STOCK_H__ */
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 9561be77..b3b6634b 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -20,10 +20,20 @@
#include "marshal.h"
+#include
+
#ifdef HAVE_GRANITE
#include
#endif
+#ifdef HAVE_GCR
+ #define GCR_API_SUBJECT_TO_CHANGE
+ #include
+
+SoupMessage*
+midori_map_get_message (SoupMessage* message);
+#endif
+
#include
#include
#include
@@ -32,7 +42,6 @@
#include
#include
-#include
#if HAVE_UNISTD_H
#include
#endif
@@ -68,10 +77,14 @@ midori_view_web_view_get_snapshot (GtkWidget* web_view,
gint width,
gint height);
-static void
-midori_view_speed_dial_get_thumb (MidoriView* view,
- gchar* dial_id,
- gchar* url);
+static gboolean
+midori_view_display_error (MidoriView* view,
+ const gchar* uri,
+ const gchar* title,
+ const gchar* message,
+ const gchar* description,
+ const gchar* try_again,
+ WebKitWebFrame* web_frame);
struct _MidoriView
{
@@ -105,14 +118,18 @@ struct _MidoriView
gint alerts;
GtkWidget* menu_item;
+ PangoEllipsizeMode ellipsize;
+ #ifdef HAVE_GRANITE
+ GraniteWidgetsTab* tab;
+ #else
GtkWidget* tab_label;
GtkWidget* tab_icon;
GtkWidget* tab_title;
GtkWidget* tab_close;
+ #endif
KatzeItem* item;
gint scrollh, scrollv;
gboolean back_forward_set;
- GHashTable* memory;
GtkWidget* scrolled_window;
#if GTK_CHECK_VERSION (3, 2, 0)
@@ -200,19 +217,8 @@ enum {
LAST_SIGNAL
};
-enum {
- DOWNLOAD_SAVE = 1,
- DOWNLOAD_SAVE_AS,
- DOWNLOAD_CANCEL,
- DOWNLOAD_OPEN,
-};
-
static guint signals[LAST_SIGNAL];
-static gchar* speeddial_markup = NULL;
-static GtkWidget* thumb_view = NULL;
-static GList* thumb_queue = NULL;
-
static void
midori_view_finalize (GObject* object);
@@ -237,10 +243,6 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings,
GParamSpec* pspec,
MidoriView* view);
-static void
-midori_view_speed_dial_save (MidoriView* view,
- const gchar* message);
-
static void
midori_view_class_init (MidoriViewClass* class)
{
@@ -614,29 +616,10 @@ midori_view_class_init (MidoriViewClass* class)
flags));
}
-#ifdef HAVE_GRANITE
-static GraniteWidgetsTab*
-midori_view_get_tab (MidoriView* view)
-{
- GraniteWidgetsDynamicNotebook* notebook;
- GraniteWidgetsTab* tab = NULL;
-
- notebook = (GraniteWidgetsDynamicNotebook*)gtk_widget_get_parent ((GtkWidget*)view);
- if (notebook != NULL)
- tab = granite_widgets_dynamic_notebook_get_nth_page (notebook,
- granite_widgets_dynamic_notebook_page_num (notebook, (GtkWidget*)view));
-
- return tab;
-}
-#endif
-
static void
midori_view_set_title (MidoriView* view, const gchar* title)
{
const gchar* display_title;
- #ifdef HAVE_GRANITE
- GraniteWidgetsTab* tab;
- #endif
if (!title)
title = view->uri;
@@ -670,18 +653,8 @@ midori_view_set_title (MidoriView* view, const gchar* title)
#endif
display_title = midori_view_get_display_title (view);
- #ifdef HAVE_GRANITE
- /* FIXME: granite: GraniteWidgetsTab.text should be a property */
- tab = midori_view_get_tab (view);
- if (tab != NULL)
- katze_assign (tab->text, g_strdup (display_title));
- #endif
- if (view->tab_label)
- {
/* If the title starts with the presumed name of the website, we
ellipsize differently, to emphasize the subtitle */
- if (gtk_label_get_angle (GTK_LABEL (view->tab_title)) == 0.0)
- {
SoupURI* uri = soup_uri_new (view->uri);
const gchar* host = uri ? (uri->host ? uri->host : "") : "";
const gchar* name = g_str_has_prefix (host, "www.") ? &host[4] : host;
@@ -690,16 +663,25 @@ midori_view_set_title (MidoriView* view, const gchar* title)
if (name[i] == '.')
break;
if (!g_ascii_strncasecmp (display_title, name, i))
- gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_START);
+ view->ellipsize = PANGO_ELLIPSIZE_START;
else
- gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_END);
+ view->ellipsize = PANGO_ELLIPSIZE_END;
if (uri)
soup_uri_free (uri);
- }
+ #ifdef HAVE_GRANITE
+ if (view->tab)
+ g_object_set (view->tab,
+ "label", display_title, "ellipsize-mode", view->ellipsize, NULL);
+ #else
+ if (view->tab_label)
+ {
gtk_label_set_text (GTK_LABEL (view->tab_title), display_title);
gtk_widget_set_tooltip_text (view->tab_icon, display_title);
gtk_widget_set_tooltip_text (view->tab_title, display_title);
+ if (gtk_label_get_angle (GTK_LABEL (view->tab_title)) == 0.0)
+ gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), view->ellipsize);
}
+ #endif
if (view->menu_item)
gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (
view->menu_item))), display_title);
@@ -711,11 +693,6 @@ midori_view_apply_icon (MidoriView* view,
GdkPixbuf* icon,
const gchar* icon_name)
{
- #ifdef HAVE_GRANITE
- GraniteWidgetsTab* tab = midori_view_get_tab (view);
- g_object_set (tab, "pixbuf", icon, NULL);
- #endif
-
katze_item_set_icon (view->item, icon_name);
/* katze_item_get_image knows about this pixbuf */
g_object_set_data_full (G_OBJECT (view->item), "pixbuf", g_object_ref (icon),
@@ -723,6 +700,10 @@ midori_view_apply_icon (MidoriView* view,
katze_object_assign (view->icon, icon);
g_object_notify (G_OBJECT (view), "icon");
+ #ifdef HAVE_GRANITE
+ if (view->tab)
+ g_object_set (view->tab, "icon", icon, NULL);
+ #else
if (view->tab_icon)
{
if (icon_name && !strchr (icon_name, '/'))
@@ -732,6 +713,7 @@ midori_view_apply_icon (MidoriView* view,
katze_throbber_set_static_pixbuf (KATZE_THROBBER (view->tab_icon),
view->icon);
}
+ #endif
if (view->menu_item)
{
GtkWidget* image = katze_item_get_image (view->item);
@@ -739,70 +721,59 @@ midori_view_apply_icon (MidoriView* view,
}
}
-static gboolean
-midori_view_mime_icon (MidoriView* view,
- GtkIconTheme* icon_theme,
- const gchar* format,
- const gchar* part1,
- const gchar* part2)
-{
- gchar* icon_name;
- GdkPixbuf* icon;
-
- icon_name = part2 ? g_strdup_printf (format, part1, part2)
- : g_strdup_printf (format, part1);
- if (!(icon = gtk_icon_theme_load_icon (icon_theme, icon_name, 16, 0, NULL)))
- {
- g_free (icon_name);
- return FALSE;
- }
-
- g_object_ref (icon);
- midori_view_apply_icon (view, icon, icon_name);
- g_free (icon_name);
- return TRUE;
-}
-
static void
midori_view_unset_icon (MidoriView* view)
{
GdkScreen* screen;
- GtkIconTheme* theme;
- gchar** parts = NULL;
- GdkPixbuf* icon;
+ GtkIconTheme* icon_theme;
+ GIcon* icon;
+ gchar** icon_names;
+ GdkPixbuf* pixbuf = NULL;
if (!((screen = gtk_widget_get_screen (view->web_view))
- && (theme = gtk_icon_theme_get_for_screen (screen))))
+ && (icon_theme = gtk_icon_theme_get_for_screen (screen))))
return;
- if (!(view->mime_type
- && (parts = g_strsplit (view->mime_type, "/", 2))
- && (*parts && parts[1])))
+ if (view->mime_type != NULL)
{
- icon = gtk_widget_render_icon (view->web_view,
- GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL);
- midori_view_apply_icon (view, icon, GTK_STOCK_FILE);
- goto free_parts;
+ gchar* content_type = g_content_type_from_mime_type (view->mime_type);
+ icon = g_content_type_get_icon (content_type);
+ g_free (content_type);
+ g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html");
}
+ else
+ icon = g_themed_icon_new ("text-html");
- if (midori_view_mime_icon (view, theme, "%s-%s", *parts, parts[1]))
- goto free_parts;
- if (midori_view_mime_icon (view, theme, "gnome-mime-%s-%s", *parts, parts[1]))
- goto free_parts;
- if (midori_view_mime_icon (view, theme, "%s-x-generic", *parts, NULL))
- goto free_parts;
- if (midori_view_mime_icon (view, theme, "gnome-mime-%s-x-generic", *parts, NULL))
- goto free_parts;
+ if ((icon_names = (gchar**)g_themed_icon_get_names (G_THEMED_ICON (icon))))
+ while (*icon_names)
+ {
+ if ((pixbuf = gtk_icon_theme_load_icon (icon_theme, *icon_names, 16, 0, NULL)))
+ break;
+ icon_names++;
+ }
+ g_object_unref (icon);
- icon = gtk_widget_render_icon (view->web_view,
- GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL);
- midori_view_apply_icon (view, icon, GTK_STOCK_FILE);
-
-free_parts:
- g_strfreev (parts);
+ midori_view_apply_icon (view, pixbuf, GTK_STOCK_FILE);
}
#if !WEBKIT_CHECK_VERSION (1, 8, 0)
+static void
+katze_net_object_maybe_unref (gpointer object)
+{
+ if (object)
+ g_object_unref (object);
+}
+
+static GHashTable*
+midori_view_get_memory (void)
+{
+ static GHashTable* memory = NULL;
+ if (!memory)
+ memory = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, katze_net_object_maybe_unref);
+ return (memory);
+}
+
static gboolean
katze_net_icon_status_cb (KatzeNetRequest* request,
MidoriView* view)
@@ -864,7 +835,7 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request,
return;
}
- g_hash_table_insert (view->memory, g_strdup (view->icon_uri), pixbuf);
+ g_hash_table_insert (midori_view_get_memory (), g_strdup (view->icon_uri), pixbuf);
settings = gtk_widget_get_settings (view->web_view);
gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &icon_width, &icon_height);
pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, GDK_INTERP_BILINEAR);
@@ -910,7 +881,7 @@ _midori_web_view_load_icon (MidoriView* view)
view->icon_uri = g_strdup_printf ("%s/favicon.ico", view->uri);
}
- if (g_hash_table_lookup_extended (view->memory,
+ if (g_hash_table_lookup_extended (midori_view_get_memory (),
view->icon_uri, NULL, (gpointer)&pixbuf))
{
g_warn_if_fail (pixbuf != NULL);
@@ -919,7 +890,7 @@ _midori_web_view_load_icon (MidoriView* view)
else if ((icon_file = katze_net_get_cached_path (NULL, view->icon_uri, "icons")) &&
(pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL)))
{
- g_hash_table_insert (view->memory,
+ g_hash_table_insert (midori_view_get_memory (),
g_strdup (view->icon_uri), g_object_ref (pixbuf));
}
else if (!view->special)
@@ -960,12 +931,14 @@ midori_view_update_load_status (MidoriView* view,
g_object_notify (G_OBJECT (view), "load-status");
#ifdef HAVE_GRANITE
- g_object_set (midori_view_get_tab (view),
- "loading", view->load_status != MIDORI_LOAD_FINISHED, NULL);
- #endif
+ if (view->tab)
+ g_object_set (view->tab, "working",
+ midori_view_get_progress (view) > 0.0, NULL);
+ #else
if (view->tab_icon)
katze_throbber_set_animated (KATZE_THROBBER (view->tab_icon),
- view->load_status != MIDORI_LOAD_FINISHED);
+ midori_view_get_progress (view) > 0.0);
+ #endif
}
static gboolean
@@ -986,7 +959,7 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView* web_view
g_free (new_uri);
return TRUE;
}
- else if (g_str_has_prefix (uri, "mailto:") || sokoke_external_uri (uri))
+ else if (sokoke_external_uri (uri))
{
if (sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (web_view)),
uri, GDK_CURRENT_TIME, NULL))
@@ -995,6 +968,61 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView* web_view
return TRUE;
}
}
+ else if (g_str_has_prefix (uri, "data:image/"))
+ {
+ /* For security reasons, main content served as data: is limited to images
+ http://lcamtuf.coredump.cx/switch/ */
+ webkit_web_policy_decision_ignore (decision);
+ return TRUE;
+ }
+ #ifdef HAVE_GCR
+ else if (/* view->special && */ !strncmp (uri, "https", 5))
+ {
+ /* We show an error page if the certificate is invalid.
+ If a "special", unverified page loads a form, it must be that page.
+ if (webkit_web_navigation_action_get_reason (action) == WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED)
+ FIXME: Verify more stricly that this cannot be eg. a simple Reload */
+ if (webkit_web_navigation_action_get_reason (action) == WEBKIT_WEB_NAVIGATION_REASON_RELOAD)
+ {
+ SoupMessage* message = webkit_network_request_get_message (request);
+ if (!(soup_message_get_flags (message) & SOUP_MESSAGE_CERTIFICATE_TRUSTED))
+ {
+ SoupURI* soup_uri = soup_message_get_uri (message);
+ GTlsCertificate* tls_cert;
+ GcrCertificate* gcr_cert;
+ GByteArray* der_cert;
+
+ message = midori_map_get_message (message);
+ g_object_get (message, "tls-certificate", &tls_cert, NULL);
+ g_return_val_if_fail (tls_cert != NULL, FALSE);
+ g_object_get (tls_cert, "certificate", &der_cert, NULL);
+ gcr_cert = gcr_simple_certificate_new (der_cert->data, der_cert->len);
+ g_byte_array_unref (der_cert);
+ if (soup_uri && soup_uri->host && !gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, soup_uri->host, NULL, NULL))
+ {
+ GError* error = NULL;
+ gcr_trust_add_pinned_certificate (gcr_cert, GCR_PURPOSE_SERVER_AUTH, soup_uri->host, NULL, &error);
+ if (error != NULL)
+ {
+ gchar* slots = g_strjoinv (" , ", (gchar**)gcr_pkcs11_get_trust_lookup_uris ());
+ gchar* title = g_strdup_printf ("Error granting trust: %s", error->message);
+ midori_view_stop_loading (view);
+ midori_view_display_error (view, view->uri,
+ view->title ? view->title : view->uri, title, slots,
+ _("Trust this website"), NULL);
+ g_free (title);
+ g_free (slots);
+ g_error_free (error);
+ }
+ }
+ else
+ g_warn_if_reached ();
+ g_object_unref (gcr_cert);
+ g_object_unref (tls_cert);
+ }
+ }
+ }
+ #endif
view->special = FALSE;
/* Remove link labels */
@@ -1036,6 +1064,11 @@ webkit_web_view_load_started_cb (WebKitWebView* web_view,
g_object_thaw_notify (G_OBJECT (view));
}
+#ifdef HAVE_GCR
+const gchar*
+midori_location_action_tls_flags_to_string (GTlsCertificateFlags flags);
+#endif
+
static void
webkit_web_view_load_committed_cb (WebKitWebView* web_view,
WebKitWebFrame* web_frame,
@@ -1088,6 +1121,40 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view,
if (message
&& soup_message_get_flags (message) & SOUP_MESSAGE_CERTIFICATE_TRUSTED)
view->security = MIDORI_SECURITY_TRUSTED;
+ #ifdef HAVE_GCR
+ else if (!view->special && message != NULL)
+ {
+ GTlsCertificate* tls_cert;
+ GcrCertificate* gcr_cert;
+ GByteArray* der_cert;
+ SoupURI* soup_uri;
+
+ message = midori_map_get_message (message);
+ g_object_get (message, "tls-certificate", &tls_cert, NULL);
+ g_return_if_fail (tls_cert != NULL);
+ g_object_get (tls_cert, "certificate", &der_cert, NULL);
+ gcr_cert = gcr_simple_certificate_new (der_cert->data, der_cert->len);
+ g_byte_array_unref (der_cert);
+ soup_uri = soup_message_get_uri (message);
+ if (gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, soup_uri->host, NULL, NULL))
+ view->security = MIDORI_SECURITY_TRUSTED;
+ else
+ {
+ GTlsCertificateFlags tls_flags;
+ view->security = MIDORI_SECURITY_UNKNOWN;
+ g_object_get (message, "tls-errors", &tls_flags, NULL);
+ midori_view_stop_loading (view);
+ midori_view_display_error (
+ view, view->uri, view->title ? view->title : view->uri,
+ _("Security unknown"),
+ midori_location_action_tls_flags_to_string (tls_flags),
+ _("Trust this website"),
+ NULL);
+ }
+ g_object_unref (tls_cert);
+ g_object_unref (gcr_cert);
+ }
+ #endif
else
#endif
view->security = MIDORI_SECURITY_UNKNOWN;
@@ -1128,7 +1195,7 @@ midori_view_web_view_resource_request_cb (WebKitWebView* web_view,
if (g_str_has_prefix (uri, "res://"))
{
- gchar* filepath = sokoke_find_data_filename (&uri[6], TRUE);
+ gchar* filepath = midori_paths_get_res_filename (&uri[6]);
gchar* file_uri = g_filename_to_uri (filepath, NULL, NULL);
g_free (filepath);
webkit_network_request_set_uri (request, file_uri);
@@ -1144,10 +1211,14 @@ midori_view_web_view_resource_request_cb (WebKitWebView* web_view,
gint real_icon_size;
GtkIconInfo* icon_info;
const gchar* icon_filename;
+ static gint icon_size_large_dialog = 0;
+
+ if (!icon_size_large_dialog)
+ icon_size_large_dialog = gtk_icon_size_register ("large-dialog", 64, 64);
if (g_ascii_isalpha (icon_name[0]))
icon_size = strstr (icon_name, "dialog") ?
- GTK_ICON_SIZE_DIALOG : GTK_ICON_SIZE_BUTTON;
+ icon_size_large_dialog : GTK_ICON_SIZE_BUTTON;
else if (g_ascii_isdigit (icon_name[0]))
{
guint i = 0;
@@ -1227,7 +1298,8 @@ midori_view_infobar_response_cb (GtkWidget* infobar,
{
void (*response_cb) (GtkWidget*, gint, gpointer);
response_cb = g_object_get_data (G_OBJECT (infobar), "midori-infobar-cb");
- response_cb (infobar, response, data_object);
+ if (response_cb != NULL)
+ response_cb (infobar, response, data_object);
gtk_widget_destroy (infobar);
}
#else
@@ -1239,7 +1311,8 @@ midori_view_info_bar_button_cb (GtkWidget* button,
gint response = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "midori-infobar-response"));
void (*response_cb) (GtkWidget*, gint, gpointer);
response_cb = g_object_get_data (G_OBJECT (infobar), "midori-infobar-cb");
- response_cb (infobar, response, data_object);
+ if (response_cb != NULL)
+ response_cb (infobar, response, data_object);
gtk_widget_destroy (infobar);
}
#endif
@@ -1279,7 +1352,6 @@ midori_view_add_info_bar (MidoriView* view,
const gchar* button_text;
g_return_val_if_fail (message != NULL, NULL);
- g_return_val_if_fail (response_cb != NULL, NULL);
va_start (args, first_button_text);
@@ -1441,7 +1513,7 @@ midori_view_display_error (MidoriView* view,
const gchar* try_again,
WebKitWebFrame* web_frame)
{
- gchar* path = sokoke_find_data_filename ("error.html", TRUE);
+ gchar* path = midori_paths_get_res_filename ("error.html");
gchar* template;
if (g_file_get_contents (path, &template, NULL, NULL))
@@ -1453,6 +1525,8 @@ midori_view_display_error (MidoriView* view,
title_escaped = g_markup_escape_text (title, -1);
icon = katze_item_get_icon (view->item);
result = sokoke_replace_variables (template,
+ "{dir}", gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL ?
+ "rtl" : "ltr",
"{title}", title_escaped,
"{icon}", icon ? icon : "",
"{message}", message,
@@ -1542,10 +1616,6 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view,
midori_view_apply_scroll_position (view);
- view->progress = 1.0;
- g_object_notify (G_OBJECT (view), "progress");
- midori_view_update_load_status (view, MIDORI_LOAD_FINISHED);
-
if (web_frame == webkit_web_view_get_main_frame (web_view))
{
JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
@@ -1628,14 +1698,16 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view,
g_object_set_data_full (G_OBJECT (view), "news-feeds", default_uri, g_free);
g_free (value);
- /* Ensure load-status is notified again, whether it changed or not */
- g_object_notify (G_OBJECT (view), "load-status");
#if !WEBKIT_CHECK_VERSION (1, 4, 3)
_midori_web_view_load_icon (view);
#endif
}
+ view->progress = 1.0;
+ g_object_notify (G_OBJECT (view), "progress");
+ midori_view_update_load_status (view, MIDORI_LOAD_FINISHED);
+
g_object_thaw_notify (G_OBJECT (view));
}
@@ -1712,7 +1784,7 @@ static gboolean
midori_view_always_same_tab (const gchar* uri)
{
/* No opening in tab, window or app for Javascript or mailto links */
- return g_str_has_prefix (uri, "javascript:") || midori_uri_is_email (uri);
+ return g_str_has_prefix (uri, "javascript:") || g_str_has_prefix (uri, "mailto:");
}
static void
@@ -1939,13 +2011,168 @@ midori_view_inspector_window_key_press_event_cb (GtkWidget* window,
return FALSE;
}
+static void
+handle_link_hints (WebKitWebView* web_view,
+ GdkEventKey* event,
+ MidoriView* view)
+{
+ gint digit = g_ascii_digit_value (event->keyval);
+ gunichar uc = gdk_keyval_to_unicode (event->keyval);
+ gchar* result = NULL;
+ WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (web_view);
+ JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
+
+ if (view->find_links < 0)
+ {
+ /* Links are currently off, turn them on */
+ result = sokoke_js_script_eval (js_context,
+ " var style_func = (function (selector, rule) { "
+ " var style = document.createElement ('style');"
+ " style.setAttribute ('type', 'text/css');"
+ " var heads = document.getElementsByTagName ('head');"
+ " heads[0].appendChild (style);"
+ " document.styleSheets[0].insertRule (selector + ' ' + rule);"
+ " } );"
+ " style_func ('.midoriHKD87346', '{ "
+ " font-size:small !important; font-weight:bold !important;"
+ " z-index:500; border-radius:0.3em; line-height:1 !important;"
+ " background: white !important; color: black !important;"
+ " border:1px solid gray; padding:0 0.1em !important;"
+ " position:absolute; display:inline !important; }');"
+ " style_func ('.midori_access_key_fc04de', '{ "
+ " font-size:small !important; font-weight:bold !important;"
+ " z-index:500; border-radius:0.3em; line-height:1 !important;"
+ " background: black !important; color: white !important;"
+ " border:1px solid gray; padding:0 0.1em 0.2em 0.1em !important;"
+ " position:absolute; display:inline !important; }');"
+ " var label_count = 0;"
+ " for (i in document.links) {"
+ " if (document.links[i].href && document.links[i].insertBefore) {"
+ " var child = document.createElement ('span');"
+ " if (document.links[i].accessKey && isNaN (document.links[i].accessKey)) {"
+ " child.setAttribute ('class', 'midori_access_key_fc04de');"
+ " child.appendChild (document.createTextNode (document.links[i].accessKey));"
+ " } else {"
+ " child.setAttribute ('class', 'midoriHKD87346');"
+ " child.appendChild (document.createTextNode (label_count));"
+ " label_count++;"
+ " }"
+ " document.links[i].insertBefore (child); } }",
+ NULL);
+ view->find_links = 0; /* Links are now on */
+ g_free (result);
+ return;
+ }
+
+ if (event->keyval == '.')
+ {
+ /* Pressed '.' with links on, so turn them off */
+ result = sokoke_js_script_eval (js_context,
+ "var links = document.getElementsByClassName ('midoriHKD87346');"
+ "for (var i = links.length - 1; i >= 0; i--) {"
+ " var parent = links[i].parentNode;"
+ " parent.removeChild(links[i]); }",
+ NULL);
+ g_free (result);
+ result = sokoke_js_script_eval (js_context,
+ "var links = document.getElementsByClassName ('midori_access_key_fc04de');"
+ "if (links != undefined && links.length > 0) {"
+ " for (var i = links.length - 1; i >= 0; i--) {"
+ " var parent = links[i].parentNode;"
+ " parent.removeChild(links[i]); } }",
+ NULL);
+ g_free (result);
+ view->find_links = -1;
+ return;
+ }
+
+ /* Links are already on at this point, so process the input character */
+
+ if (digit != -1 && event->keyval != GDK_KEY_Return && event->keyval != GDK_KEY_Escape)
+ {
+ /* Got a digit, add it to the link count/ number */
+ if (view->find_links > 0)
+ view->find_links *= 10;
+ view->find_links += digit;
+ return;
+ }
+
+ if (event->keyval == GDK_KEY_Escape)
+ {
+ // Clear the link count/number
+ view->find_links = 0;
+ return;
+ }
+
+ if (g_unichar_isalpha (uc))
+ {
+ /* letter pressed if we have a corresponding accessKey and grab URI */
+ gchar* script = NULL;
+ gchar* utf8 = NULL;
+ gulong sz = g_unichar_to_utf8 (uc, NULL);
+
+ utf8 = g_malloc0 (sz);
+ g_unichar_to_utf8 (uc, utf8);
+ script = g_strdup_printf (
+ "var l = 'undefined';"
+ "for (i in document.links) {"
+ " if ( document.links[i].href &&"
+ " document.links[i].accessKey == \"%s\" )"
+ " {"
+ " l = document.links[i].href;"
+ " break;"
+ " }"
+ "}"
+ "if (l != 'undefined') { l; }"
+ , utf8
+ );
+ g_free (utf8);
+ result = sokoke_js_script_eval (js_context, script, NULL);
+ g_free (script);
+ }
+ else if (event->keyval == GDK_KEY_Return)
+ {
+ /* Return pressed, grab URI if we have a link with the entered number */
+ gchar* script = g_strdup_printf (
+ "var links = document.getElementsByClassName ('midoriHKD87346');"
+ "var i = %d; var return_key = %d;"
+ "if (return_key) {"
+ " if (typeof links[i] != 'undefined')"
+ " links[i].parentNode.href; }",
+ view->find_links, event->keyval == GDK_KEY_Return
+ );
+ result = sokoke_js_script_eval (js_context, script, NULL);
+ g_free (script);
+ }
+
+ /* Check the URI we grabbed to see if it's valid, if so go there */
+ if (midori_uri_is_location (result))
+ {
+ if (MIDORI_MOD_NEW_TAB (event->state))
+ {
+ gboolean background = view->open_tabs_in_the_background;
+ if (MIDORI_MOD_BACKGROUND (event->state))
+ background = !background;
+ g_signal_emit (view, signals[NEW_TAB], 0, result, background);
+ }
+ else
+ midori_view_set_uri (view, result);
+ view->find_links = -1; /* Turn off link mode */
+ }
+ else /* Invalid URI, start over... */
+ view->find_links = 0;
+
+ if (result)
+ g_free (result);
+ return;
+}
+
static gboolean
gtk_widget_key_press_event_cb (WebKitWebView* web_view,
GdkEventKey* event,
MidoriView* view)
{
guint character;
- gint digit = g_ascii_digit_value (event->keyval);
event->state = event->state & MIDORI_KEYS_MODIFIER_MASK;
@@ -1956,109 +2183,9 @@ gtk_widget_key_press_event_cb (WebKitWebView* web_view,
event->keyval = '.';
/* Find links by number: . to show links, type number, Return to go */
- if (event->keyval == '.'
- || (view->find_links > -1
- && (digit != -1 || event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_Escape)))
+ if ( event->keyval == '.' || view->find_links > -1 )
{
- WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (web_view);
- JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
- gchar* result;
-
- if (view->find_links == -1)
- {
- result = sokoke_js_script_eval (js_context,
- " var style_func = (function (selector, rule) { "
- " var style = document.createElement ('style');"
- " style.setAttribute ('type', 'text/css');"
- " var heads = document.getElementsByTagName ('head');"
- " heads[0].appendChild (style);"
- " document.styleSheets[0].insertRule (selector + ' ' + rule);"
- " } );"
- " style_func ('.midoriHKD87346', '{ "
- " font-size:small !important; font-weight:bold !important;"
- " z-index:500; border-radius:0.3em; line-height:1 !important;"
- " background: white !important; color: black !important;"
- " border:1px solid gray; padding:0 0.1em !important;"
- " position:absolute; display:inline !important; }');"
- " style_func ('.midori_access_key_fc04de', '{ "
- " font-size:small !important; font-weight:bold !important;"
- " z-index:500; border-radius:0.3em; line-height:1 !important;"
- " background: black !important; color: white !important;"
- " border:1px solid gray; padding:0 0.1em 0.2em 0.1em !important;"
- " position:absolute; display:inline !important; }');"
- " var label_count = 0;"
- " for (var i in document.links) {"
- " if (document.links[i].href && document.links[i].insertBefore) {"
- " var child = document.createElement ('span');"
- " if (document.links[i].accessKey && isNaN (document.links[i].accessKey)) {"
- " child.setAttribute ('class', 'midori_access_key_fc04de');"
- " child.appendChild (document.createTextNode (document.links[i].accessKey));"
- " } else {"
- " child.setAttribute ('class', 'midoriHKD87346');"
- " child.appendChild (document.createTextNode (label_count));"
- " label_count++;"
- " }"
- " document.links[i].insertBefore (child); } }",
- NULL);
- view->find_links = 0;
- }
- else if (digit != -1 && event->keyval != GDK_KEY_Return && event->keyval != GDK_KEY_Escape)
- {
- if (view->find_links > -1)
- view->find_links *= 10;
- view->find_links += digit;
- }
- else if (event->keyval == GDK_KEY_Escape)
- {
- view->find_links = 0;
- }
- else if (event->keyval == GDK_KEY_Return)
- {
- gchar* script;
- script = g_strdup_printf (
- "var links = document.getElementsByClassName ('midoriHKD87346');"
- "var i = %d; var return_key = %d;"
- "if (return_key) {"
- " if (typeof links[i] != 'undefined')"
- " links[i].parentNode.href; }",
- view->find_links, event->keyval == GDK_KEY_Return
- );
- result = sokoke_js_script_eval (js_context, script, NULL);
- if (midori_uri_is_location (result))
- {
- if (MIDORI_MOD_NEW_TAB (event->state))
- {
- gboolean background = view->open_tabs_in_the_background;
- if (MIDORI_MOD_BACKGROUND (event->state))
- background = !background;
- g_signal_emit (view, signals[NEW_TAB], 0, result, background);
- }
- else
- midori_view_set_uri (view, result);
- }
- g_free (script);
- g_free (result);
- view->find_links = 0;
- }
- else
- {
- result = sokoke_js_script_eval (js_context,
- "var links = document.getElementsByClassName ('midoriHKD87346');"
- "for (var i = links.length - 1; i >= 0; i--) {"
- " var parent = links[i].parentNode;"
- " parent.removeChild(links[i]); }",
- NULL);
- g_free (result);
- result = sokoke_js_script_eval (js_context,
- "var links = document.getElementsByClassName ('midori_access_key_fc04de');"
- "if (links != undefined && links.length > 0) {"
- " for (var i = links.length - 1; i >= 0; i--) {"
- " var parent = links[i].parentNode;"
- " parent.removeChild(links[i]); } }",
- NULL);
- g_free (result);
- view->find_links = -1;
- }
+ handle_link_hints (web_view, event, view);
return FALSE;
}
@@ -2129,21 +2256,29 @@ midori_web_view_menu_link_copy_activate_cb (GtkWidget* widget,
MidoriView* view)
{
if (g_str_has_prefix (view->link_uri, "mailto:"))
- sokoke_widget_copy_clipboard (widget, view->link_uri + 7);
+ sokoke_widget_copy_clipboard (widget, view->link_uri + 7, NULL, NULL);
else
- sokoke_widget_copy_clipboard (widget, view->link_uri);
+ sokoke_widget_copy_clipboard (widget, view->link_uri, NULL, NULL);
+}
+
+static void
+midori_view_download_uri (MidoriView* view,
+ MidoriDownloadType type,
+ const gchar* uri)
+{
+ WebKitNetworkRequest* request = webkit_network_request_new (uri);
+ WebKitDownload* download = webkit_download_new (request);
+ gboolean handled;
+ g_object_unref (request);
+ midori_download_set_type (download, type);
+ g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
}
static void
midori_web_view_menu_save_activate_cb (GtkWidget* widget,
MidoriView* view)
{
- WebKitNetworkRequest* request = webkit_network_request_new (view->link_uri);
- WebKitDownload* download = webkit_download_new (request);
- gboolean handled;
- g_object_unref (request);
- g_object_set_data (G_OBJECT (download), "save-as-download", (void*)0xdeadbeef);
- g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
+ midori_view_download_uri (view, MIDORI_DOWNLOAD_SAVE_AS, view->link_uri);
}
static void
@@ -2156,12 +2291,73 @@ midori_web_view_menu_image_new_tab_activate_cb (GtkWidget* widget,
g_free (uri);
}
+static GString*
+midori_view_get_data_for_uri (MidoriView* view,
+ const gchar* uri)
+{
+ WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view);
+ WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view);
+ WebKitWebDataSource* data_source = webkit_web_frame_get_data_source (frame);
+ GList* resources = webkit_web_data_source_get_subresources (data_source);
+ GList* list;
+ GString* result;
+
+ for (list = resources; list; list = g_list_next (list))
+ {
+ WebKitWebResource* resource = WEBKIT_WEB_RESOURCE (list->data);
+ GString* data = webkit_web_resource_get_data (resource);
+ if (!g_strcmp0 (webkit_web_resource_get_uri (resource), uri))
+ {
+ result = data;
+ break;
+ }
+ }
+ g_list_free (resources);
+ return result;
+}
+
+static void
+midori_view_clipboard_get_image_cb (GtkClipboard* clipboard,
+ GtkSelectionData* selection_data,
+ guint info,
+ gpointer user_data)
+{
+ MidoriView* view = MIDORI_VIEW (g_object_get_data (user_data, "view"));
+ WebKitHitTestResult* hit_test = user_data;
+ gchar* uri = katze_object_get_string (hit_test, "image-uri");
+ /* if (gtk_selection_data_targets_include_image (selection_data, TRUE)) */
+ {
+ GString* data = midori_view_get_data_for_uri (view, uri);
+ if (data != NULL)
+ {
+ GInputStream* stream = g_memory_input_stream_new_from_data (data->str, data->len, NULL);
+ GError* error = NULL;
+ GdkPixbuf* pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, &error);
+ g_object_unref (stream);
+ if (error != NULL)
+ {
+ g_critical ("Error copying pixbuf: %s\n", error->message);
+ g_error_free (error);
+ }
+ gtk_selection_data_set_pixbuf (selection_data, pixbuf);
+ g_object_unref (pixbuf);
+ }
+ else
+ g_warn_if_reached ();
+ }
+ /* if (gtk_selection_data_targets_include_text (selection_data)) */
+ gtk_selection_data_set_text (selection_data, uri, -1);
+ g_free (uri);
+}
+
static void
midori_web_view_menu_image_copy_activate_cb (GtkWidget* widget,
MidoriView* view)
{
gchar* uri = katze_object_get_string (view->hit_test, "image-uri");
- sokoke_widget_copy_clipboard (widget, uri);
+ g_object_set_data (G_OBJECT (view->hit_test), "view", view);
+ sokoke_widget_copy_clipboard (widget,
+ uri, midori_view_clipboard_get_image_cb, view->hit_test);
g_free (uri);
}
@@ -2170,26 +2366,16 @@ midori_web_view_menu_image_save_activate_cb (GtkWidget* widget,
MidoriView* view)
{
gchar* uri = katze_object_get_string (view->hit_test, "image-uri");
- WebKitNetworkRequest* request = webkit_network_request_new (uri);
- WebKitDownload* download = webkit_download_new (request);
- gboolean handled;
- g_object_unref (request);
- g_object_set_data (G_OBJECT (download), "save-as-download", (void*)0xdeadbeef);
- g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
+ midori_view_download_uri (view, MIDORI_DOWNLOAD_SAVE_AS, uri);
g_free (uri);
}
static void
-midori_web_view_open_picture_cb (GtkWidget* widget,
- MidoriView* view)
+midori_web_view_open_in_viewer_cb (GtkWidget* widget,
+ MidoriView* view)
{
gchar* uri = katze_object_get_string (view->hit_test, "image-uri");
- WebKitNetworkRequest* request = webkit_network_request_new (uri);
- WebKitDownload* download = webkit_download_new (request);
- gboolean handled;
- g_object_unref (request);
- g_object_set_data (G_OBJECT (download), "open-in-viewer", (void*)0xdeadbeef);
- g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
+ midori_view_download_uri (view, MIDORI_DOWNLOAD_OPEN_IN_VIEWER, uri);
g_free (uri);
}
@@ -2198,7 +2384,7 @@ midori_web_view_menu_video_copy_activate_cb (GtkWidget* widget,
MidoriView* view)
{
gchar* uri = katze_object_get_string (view->hit_test, "media-uri");
- sokoke_widget_copy_clipboard (widget, uri);
+ sokoke_widget_copy_clipboard (widget, uri, NULL, NULL);
g_free (uri);
}
@@ -2207,12 +2393,7 @@ midori_web_view_menu_video_save_activate_cb (GtkWidget* widget,
MidoriView* view)
{
gchar* uri = katze_object_get_string (view->hit_test, "media-uri");
- WebKitNetworkRequest* request = webkit_network_request_new (uri);
- WebKitDownload* download = webkit_download_new (request);
- gboolean handled;
- g_object_unref (request);
- g_object_set_data (G_OBJECT (download), "save-as-download", (void*)0xdeadbeef);
- g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
+ midori_view_download_uri (view, MIDORI_DOWNLOAD_SAVE_AS, uri);
g_free (uri);
}
@@ -2278,7 +2459,7 @@ static void
midori_web_view_menu_copy_activate_cb (GtkWidget* widget,
MidoriView* view)
{
- sokoke_widget_copy_clipboard (widget, view->selected_text);
+ sokoke_widget_copy_clipboard (widget, view->selected_text, NULL, NULL);
}
static void
@@ -2312,6 +2493,19 @@ midori_web_view_menu_inspect_element_activate_cb (GtkWidget* widget,
webkit_web_inspector_show (inspector);
}
+#if WEBKIT_CHECK_VERSION (1, 5, 0)
+static void
+midori_view_menu_add_search_engine_cb (GtkWidget* widget,
+ MidoriView* view)
+{
+ MidoriBrowser* browser = midori_browser_get_for_widget (view->web_view);
+ GtkActionGroup* actions = midori_browser_get_action_group (browser);
+ GtkAction* action = gtk_action_group_get_action (actions, "Search");
+ KatzeItem* item = g_object_get_data (G_OBJECT (widget), "item");
+ midori_search_action_get_editor (MIDORI_SEARCH_ACTION (action), item, TRUE);
+}
+#endif
+
static GtkWidget*
midori_view_insert_menu_item (GtkMenuShell* menu,
gint position,
@@ -2417,6 +2611,23 @@ midori_view_populate_popup (MidoriView* view,
gtk_widget_set_sensitive (menuitem,
webkit_web_view_can_undo (web_view));
gtk_menu_shell_prepend (menu_shell, menuitem);
+
+ #if WEBKIT_CHECK_VERSION (1, 5, 0)
+ {
+ KatzeItem* item = midori_search_action_get_engine_for_form (
+ WEBKIT_WEB_VIEW (view->web_view), view->ellipsize);
+ if (item != NULL)
+ {
+ menuitem = midori_view_insert_menu_item (menu_shell, -1,
+ _("Add _search engine..."), NULL,
+ G_CALLBACK (midori_view_menu_add_search_engine_cb), widget);
+ g_object_set_data (G_OBJECT (menuitem), "item", item);
+ gtk_menu_shell_append (menu_shell, menuitem);
+ gtk_widget_show (menuitem);
+ }
+ }
+ #endif
+
if (manual)
{
menuitem = sokoke_action_create_popup_menu_item (
@@ -2539,14 +2750,14 @@ midori_view_populate_popup (MidoriView* view,
_("Open _Image in New Tab"), STOCK_TAB_NEW,
G_CALLBACK (midori_web_view_menu_image_new_tab_activate_cb), widget);
midori_view_insert_menu_item (menu_shell, -1,
- _("Copy Image _Address"), NULL,
+ _("Copy Im_age"), NULL,
G_CALLBACK (midori_web_view_menu_image_copy_activate_cb), widget);
midori_view_insert_menu_item (menu_shell, -1,
_("Save I_mage"), GTK_STOCK_SAVE,
G_CALLBACK (midori_web_view_menu_image_save_activate_cb), widget);
midori_view_insert_menu_item (menu_shell, -1,
_("Open in Image _Viewer"), GTK_STOCK_OPEN,
- G_CALLBACK (midori_web_view_open_picture_cb), widget);
+ G_CALLBACK (midori_web_view_open_in_viewer_cb), widget);
}
if (is_media)
@@ -2620,7 +2831,10 @@ midori_view_populate_popup (MidoriView* view,
g_strstrip (view->selected_text);
if (midori_uri_is_valid (view->selected_text))
{
- if (midori_uri_is_email (view->selected_text))
+ /* :// and @ together would mean login credentials */
+ if (g_str_has_prefix (view->selected_text, "mailto:")
+ || (strchr (view->selected_text, '@') != NULL
+ && strstr (view->selected_text, "://") == NULL))
{
gchar* text = g_strdup_printf (_("Send a message to %s"), view->selected_text);
menuitem = midori_view_insert_menu_item (menu_shell, -1,
@@ -2747,7 +2961,7 @@ midori_view_populate_popup (MidoriView* view,
gtk_action_group_get_action (actions, "BookmarkAdd"));
gtk_menu_shell_append (menu_shell, menuitem);
- if (!midori_view_is_blank (view) && !sokoke_is_app_or_private ())
+ if (!midori_view_is_blank (view) && !midori_paths_is_readonly ())
{
menuitem = sokoke_action_create_popup_menu_item (
gtk_action_group_get_action (actions, "AddSpeedDial"));
@@ -2873,6 +3087,8 @@ webkit_web_view_create_web_view_cb (GtkWidget* web_view,
g_signal_connect (new_view->web_view, "web-view-ready",
G_CALLBACK (webkit_web_view_web_view_ready_cb), view);
}
+ g_object_set_data_full (G_OBJECT (new_view), "opener-uri",
+ g_strdup (webkit_web_frame_get_uri (web_frame)), g_free);
return new_view->web_view;
}
@@ -2891,15 +3107,12 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view,
if (midori_view_is_blank (view))
view_source = webkit_web_view_get_view_source_mode (WEBKIT_WEB_VIEW (web_view));
- /* Render raw XML, including news feeds, as source */
- if (!view_source && (!strcmp (mime_type, "application/xml")
- || !strcmp (mime_type, "text/xml")))
- view_source = TRUE;
webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (web_view), view_source);
if (web_frame == webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)))
{
katze_assign (view->mime_type, g_strdup (mime_type));
+ katze_item_set_meta_string (view->item, "mime-type", mime_type);
midori_view_unset_icon (view);
g_object_notify (G_OBJECT (view), "mime-type");
}
@@ -2917,60 +3130,52 @@ webkit_web_view_download_requested_cb (GtkWidget* web_view,
WebKitDownload* download,
MidoriView* view)
{
+ gchar* opener_uri;
+ gchar* hostname;
GtkWidget* dialog;
gchar* content_type;
gchar* description;
- gchar* file_type;
- gchar* name;
- gchar* file_name;
WebKitWebFrame* web_frame;
- const gchar* mime_type;
WebKitWebDataSource* datasource;
- WebKitNetworkRequest* request;
- WebKitNetworkRequest* original_request;
- const gchar* original_uri;
- gchar* fingerprint;
- gchar* fplabel;
- #if GTK_CHECK_VERSION (2, 14, 0)
+ GString* details;
GIcon* icon;
GtkWidget* image;
- #endif
gchar* title;
GdkScreen* screen;
GtkIconTheme* icon_theme;
gint response;
gboolean handled;
- dialog = gtk_message_dialog_new (
- NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
- _("Open or download file"));
- mime_type = g_object_get_data(G_OBJECT (view), "download-mime-type");
- content_type = g_content_type_from_mime_type (mime_type);
- if (!content_type)
- #ifdef G_OS_WIN32
- content_type = g_content_type_get_mime_type ("*");
- #else
- content_type = g_strdup ("application/octet-stream");
- #endif
+ /* Opener may differ from displaying view:
+ http://lcamtuf.coredump.cx/fldl/ http://lcamtuf.coredump.cx/switch/ */
+ opener_uri = g_object_get_data (G_OBJECT (view), "opener-uri");
+ hostname = midori_uri_parse_hostname (
+ opener_uri ? opener_uri : midori_view_get_display_uri (view), NULL);
+ dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+ _("Open or download file from %s"), hostname);
+ g_free (hostname);
+ content_type = midori_download_get_content_type (download,
+ g_object_get_data (G_OBJECT (view), "download-mime-type"));
description = g_content_type_get_description (content_type);
- #if GTK_CHECK_VERSION (2, 14, 0)
icon = g_content_type_get_icon (content_type);
- g_themed_icon_append_name (G_THEMED_ICON (icon), "document-x-generic");
+ g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html");
image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
g_object_unref (icon);
gtk_widget_show (image);
gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
- #endif
- g_free (content_type);
- if (g_strrstr (description, mime_type))
- file_type = g_strdup_printf (_("File Type: '%s'"), mime_type);
- else
- file_type = g_strdup_printf (_("File Type: %s ('%s')"), description, mime_type);
- g_free (description);
- name = sokoke_get_download_filename (download);
- file_name = g_strdup_printf (_("File Name: %s"), name);
- g_free (name);
+ details = g_string_sized_new (20 * 4);
+ g_string_append_printf (details, _("File Name: %s"),
+ webkit_download_get_suggested_filename (download));
+ g_string_append_c (details, '\n');
+
+ if (g_strrstr (description, content_type))
+ g_string_append_printf (details, _("File Type: '%s'"), content_type);
+ else
+ g_string_append_printf (details, _("File Type: %s ('%s')"), description, content_type);
+ g_string_append_c (details, '\n');
+ g_free (description);
+ g_free (content_type);
/* Link Fingerprint */
/* We look at the original URI because redirection would lose the fragment */
@@ -2978,26 +3183,44 @@ webkit_web_view_download_requested_cb (GtkWidget* web_view,
datasource = webkit_web_frame_get_provisional_data_source (web_frame);
if (datasource)
{
- original_request = webkit_web_data_source_get_initial_request (datasource);
- original_uri = webkit_network_request_get_uri (original_request);
+ gchar* fingerprint;
+ gchar* fplabel;
+ WebKitNetworkRequest* original_request = webkit_web_data_source_get_initial_request (datasource);
+ const gchar* original_uri = webkit_network_request_get_uri (original_request);
midori_uri_get_fingerprint (original_uri, &fingerprint, &fplabel);
+ if (fplabel && fingerprint)
+ {
+ WebKitNetworkRequest* request = webkit_download_get_network_request (download);
+
+ g_string_append (details, fplabel);
+ g_string_append_c (details, ' ');
+ g_string_append (details, fingerprint);
+ g_string_append_c (details, '\n');
+
+ /* Propagate original URI to make it available when the download finishes */
+ g_object_set_data_full (G_OBJECT (request), "midori-original-uri",
+ g_strdup (original_uri), g_free);
+ }
+ g_free (fplabel);
+ g_free (fingerprint);
+
}
- else
+
+ if (webkit_download_get_total_size (download) > webkit_download_get_current_size (download))
{
- fingerprint = fplabel = NULL;
+ gchar* total = g_format_size (webkit_download_get_total_size (download));
+ g_string_append_printf (details, _("Size: %s"), total);
+ g_string_append_c (details, '\n');
+ g_free (total);
}
+
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- "%s\n%s\n%s %s", file_name, file_type, fplabel ? fplabel : "", fingerprint ? fingerprint : "");
- g_free (fingerprint);
- g_free (fplabel);
- g_free (file_name);
- g_free (file_type);
+ "%s", details->str);
+ g_string_free (details, TRUE);
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
/* i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" */
- request = webkit_download_get_network_request (download);
- title = g_strdup_printf (_("Open %s"),
- webkit_network_request_get_uri (request));
+ title = g_strdup_printf (_("Open %s"), webkit_download_get_uri (download));
gtk_window_set_title (GTK_WINDOW (dialog), title);
g_free (title);
screen = gtk_widget_get_screen (dialog);
@@ -3010,35 +3233,17 @@ webkit_web_view_download_requested_cb (GtkWidget* web_view,
gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN);
}
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_SAVE, DOWNLOAD_SAVE,
- GTK_STOCK_SAVE_AS, DOWNLOAD_SAVE_AS,
- GTK_STOCK_CANCEL, DOWNLOAD_CANCEL,
- GTK_STOCK_OPEN, DOWNLOAD_OPEN,
+ GTK_STOCK_SAVE, MIDORI_DOWNLOAD_SAVE,
+ GTK_STOCK_SAVE_AS, MIDORI_DOWNLOAD_SAVE_AS,
+ GTK_STOCK_CANCEL, MIDORI_DOWNLOAD_CANCEL,
+ GTK_STOCK_OPEN, MIDORI_DOWNLOAD_OPEN,
NULL);
response = gtk_dialog_run (GTK_DIALOG (dialog));
-
gtk_widget_destroy (dialog);
- switch (response)
- {
- case DOWNLOAD_SAVE_AS:
- g_object_set_data (G_OBJECT (download), "save-as-download", (gpointer)1);
- break;
- case DOWNLOAD_OPEN:
- g_object_set_data (G_OBJECT (download), "open-download", (gpointer)1);
- case DOWNLOAD_SAVE:
- break;
- case DOWNLOAD_CANCEL:
- case GTK_RESPONSE_DELETE_EVENT:
- g_object_set_data (G_OBJECT (download), "cancel-download", (gpointer)1);
- break;
- default:
- g_warn_if_reached ();
- }
-
- /* Propagate original URI to make it available when the download finishes */
- g_object_set_data_full (G_OBJECT (request), "midori-original-uri",
- g_strdup (original_uri), g_free);
+ if (response == GTK_RESPONSE_DELETE_EVENT)
+ response = MIDORI_DOWNLOAD_CANCEL;
+ midori_download_set_type (download, response);
g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
return handled;
@@ -3056,7 +3261,17 @@ webkit_web_view_console_message_cb (GtkWidget* web_view,
return FALSE;
if (!strncmp (message, "speed_dial-save", 13))
- midori_view_speed_dial_save (view, message);
+ {
+ MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
+ MidoriSpeedDial* dial = katze_object_get_object (browser, "speed-dial");
+ GError* error = NULL;
+ midori_speed_dial_save_message (dial, message, &error);
+ if (error != NULL)
+ {
+ g_critical ("Failed speed dial message: %s\n", error->message);
+ g_error_free (error);
+ }
+ }
else
g_signal_emit (view, signals[CONSOLE_MESSAGE], 0, message, line, source_id);
return TRUE;
@@ -3173,23 +3388,6 @@ midori_view_notify_vadjustment_cb (MidoriView* view,
G_CALLBACK (midori_view_vadjustment_notify_value_cb), view);
}
-static void
-katze_net_object_maybe_unref (gpointer object)
-{
- if (object)
- g_object_unref (object);
-}
-
-static GHashTable* midori_view_get_memory (void)
-{
- static GHashTable* memory = NULL;
- if (!memory)
- memory = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, katze_net_object_maybe_unref);
- return g_hash_table_ref (memory);
-
-}
-
static void
midori_view_init (MidoriView* view)
{
@@ -3199,7 +3397,6 @@ midori_view_init (MidoriView* view)
view->mime_type = NULL;
view->icon = NULL;
view->icon_uri = NULL;
- view->memory = midori_view_get_memory ();
view->progress = 0.0;
view->load_status = MIDORI_LOAD_FINISHED;
view->minimized = FALSE;
@@ -3233,10 +3430,15 @@ midori_view_init (MidoriView* view)
gtk_box_pack_start (GTK_BOX (view), view->overlay, TRUE, TRUE, 0);
/* Overlays must be created before showing GtkOverlay as of GTK+ 3.2 */
+ {
+ GtkWidget* frame = gtk_frame_new (NULL);
view->overlay_label = gtk_label_new (NULL);
- gtk_widget_set_halign (view->overlay_label, GTK_ALIGN_START);
- gtk_widget_set_valign (view->overlay_label, GTK_ALIGN_END);
- gtk_overlay_add_overlay (GTK_OVERLAY (view->overlay), view->overlay_label);
+ gtk_widget_show (view->overlay_label);
+ gtk_container_add (GTK_CONTAINER (frame), view->overlay_label);
+ gtk_widget_set_halign (frame, GTK_ALIGN_START);
+ gtk_widget_set_valign (frame, GTK_ALIGN_END);
+ gtk_overlay_add_overlay (GTK_OVERLAY (view->overlay), frame);
+ }
view->overlay_find = g_object_new (MIDORI_TYPE_FINDBAR, NULL);
gtk_widget_set_halign (view->overlay_find, GTK_ALIGN_END);
gtk_widget_set_valign (view->overlay_find, GTK_ALIGN_START);
@@ -3275,12 +3477,6 @@ midori_view_finalize (GObject* object)
katze_object_assign (view->icon, NULL);
katze_assign (view->icon_uri, NULL);
- if (view->memory)
- {
- g_hash_table_unref (view->memory);
- view->memory = NULL;
- }
-
katze_assign (view->statusbar_text, NULL);
katze_assign (view->link_uri, NULL);
katze_assign (view->selected_text, NULL);
@@ -3315,8 +3511,15 @@ midori_view_set_property (GObject* object,
view->minimized ? 1 : -1);
g_signal_handlers_unblock_by_func (view->item,
midori_view_item_meta_data_changed, view);
+ #ifdef HAVE_GRANITE
+ if (view->tab)
+ g_object_set (view->tab, "label",
+ "fixed", view->minimized, NULL);
+ //view->minimized ? NULL : midori_view_get_display_title(view), NULL);
+ #else
if (view->tab_label)
sokoke_widget_set_visible (view->tab_title, !view->minimized);
+ #endif
break;
case PROP_ZOOM_LEVEL:
midori_view_set_zoom_level (view, g_value_get_float (value));
@@ -3527,8 +3730,10 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings,
else if (name == g_intern_string ("close-buttons-on-tabs"))
{
view->close_buttons_on_tabs = g_value_get_boolean (&value);
+ #ifndef HAVE_GRANITE
sokoke_widget_set_visible (view->tab_close,
view->close_buttons_on_tabs);
+ #endif
}
else if (name == g_intern_string ("open-new-pages-in"))
view->open_new_pages_in = g_value_get_enum (&value);
@@ -3598,7 +3803,14 @@ midori_view_get_progress (MidoriView* view)
{
g_return_val_if_fail (MIDORI_IS_VIEW (view), 0.0);
- return view->progress;
+ /* When we are finished, we don't want to *see* progress anymore */
+ if (view->load_status == MIDORI_LOAD_FINISHED)
+ return 0.0;
+ /* Full progress but not finished: presumably all loaded */
+ if (view->progress == 1.0)
+ return 0.0;
+ /* When loading we want to see at minimum 10% progress */
+ return CLAMP (view->progress, 0.1, 1.0);
}
static void
@@ -3658,7 +3870,7 @@ midori_view_web_inspector_construct_window (gpointer inspector,
gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), TRUE);
#endif
gtk_container_add (GTK_CONTAINER (window), inspector_view);
- gtk_widget_show_all (window);
+ gtk_widget_show_all (inspector_view);
g_signal_connect (window, "key-press-event",
G_CALLBACK (midori_view_inspector_window_key_press_event_cb), NULL);
@@ -3690,7 +3902,13 @@ midori_view_web_inspector_show_window_cb (WebKitWebInspector* inspector,
GtkWidget* window = gtk_widget_get_toplevel (GTK_WIDGET (inspector_view));
if (!window)
return FALSE;
- gtk_window_present (GTK_WINDOW (window));
+ if (katze_object_get_boolean (view->settings, "last-inspector-attached"))
+ g_signal_emit_by_name (inspector, "attach-window");
+ else
+ {
+ gtk_widget_show (window);
+ gtk_window_present (GTK_WINDOW (window));
+ }
return TRUE;
}
@@ -3741,7 +3959,7 @@ midori_view_construct_web_view (MidoriView* view)
view->web_view = webkit_web_view_new ();
/* Load something to avoid a bug where WebKit might not set a main frame */
- webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), "");
+ webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view->web_view), "");
#if HAVE_HILDON
gtk_widget_tap_and_hold_setup (view->web_view, NULL, NULL, 0);
@@ -3934,6 +4152,7 @@ static const gchar* valid_about_uris[] = {
"error:nodocs",
"http://.invalid",
"about:geolocation",
+ "about:paths",
};
static void
@@ -3946,130 +4165,6 @@ list_about_uris (GString* markup)
valid_about_uris[i], valid_about_uris[i]);
}
-static gchar*
-prepare_speed_dial_html (MidoriView* view,
- gboolean load_missing)
-{
- MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
- GKeyFile* key_file;
- GString* markup = NULL;
- guint slot_count = 1, i, grid_index = 3, slot_size;
- gchar* speed_dial_head;
- gchar* file_path;
- gchar** groups;
-
- g_object_get (browser, "speed-dial", &key_file, NULL);
- file_path = sokoke_find_data_filename ("speeddial-head-" MIDORI_VERSION ".html", TRUE);
-
- if (key_file != NULL
- && g_access (file_path, F_OK) == 0
- && g_file_get_contents (file_path, &speed_dial_head, NULL, NULL))
- {
- gchar* header = sokoke_replace_variables (speed_dial_head,
- "{title}", _("Speed Dial"),
- "{click_to_add}", _("Click to add a shortcut"),
- "{enter_shortcut_address}", _("Enter shortcut address"),
- "{enter_shortcut_name}", _("Enter shortcut title"),
- "{are_you_sure}", _("Are you sure you want to delete this shortcut?"),
- NULL);
-
- markup = g_string_new (header);
-
- g_free (speed_dial_head);
- g_free (file_path);
- g_free (header);
- }
- else
- {
- g_free (file_path);
- return NULL;
- }
-
- groups = g_key_file_get_groups (key_file, NULL);
- for (i = 0; groups[i]; i++)
- {
- if (g_key_file_has_key (key_file, groups[i], "uri", NULL))
- slot_count++;
- }
-
- /* try to guess the best X by X grid size */
- while ((grid_index * grid_index) < slot_count)
- grid_index++;
-
- /* percent width size of one slot */
- slot_size = (100 / grid_index);
- /* No editing in private/ app mode or without scripts */
- g_string_append_printf (markup,
- "%s%s"
- "\n",
- sokoke_is_app_or_private () ? "" : "",
- sokoke_is_app_or_private () ? "" : " ",
- slot_size + 1, slot_size - 4);
-
- /* Combined width of slots should always be less than 100%.
- * Use half of the remaining percentage as a margin size */
- g_string_append_printf (markup,
- "",
- (100 - ((slot_size - 4) * grid_index)) / 2);
-
- if (katze_object_get_boolean (view->settings, "close-buttons-left"))
- g_string_append_printf (markup,
- "");
-
- for (i = 0; groups[i]; i++)
- {
- gchar* uri = g_key_file_get_string (key_file, groups[i], "uri", NULL);
- if (uri && strstr (uri, "://"))
- {
- gchar* title = g_key_file_get_string (key_file, groups[i], "title", NULL);
- gchar* thumb_file = sokoke_build_thumbnail_path (uri);
- gchar* encoded;
- guint slot = atoi (groups[i] + strlen ("Dial "));
-
- if (g_access (thumb_file, F_OK) == 0)
- {
- gsize sz;
- gchar* thumb_content;
- g_file_get_contents (thumb_file, &thumb_content, &sz, NULL);
- encoded = g_base64_encode ((guchar*)thumb_content, sz);
- g_free (thumb_content);
- }
- else
- {
- encoded = NULL;
- if (load_missing)
- midori_view_speed_dial_get_thumb (view, groups[i], uri);
- }
- g_free (thumb_file);
-
- g_string_append_printf (markup,
- ""
- "
"
- "
"
- "
%s
\n\n\n");
-
- return g_string_free (markup, FALSE);
-}
-
/**
* midori_view_set_uri:
@@ -4093,29 +4188,30 @@ midori_view_set_uri (MidoriView* view,
g_warning ("Calling %s() before adding the view to a browser. This "
"breaks extensions that monitor page loading.", G_STRFUNC);
- if (g_getenv ("MIDORI_UNARMED") == NULL)
+ if (!midori_debug ("unarmed"))
{
if (!uri || !strcmp (uri, "") || !strcmp (uri, "about:blank"))
{
+ MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
+ MidoriSpeedDial* dial = katze_object_get_object (browser, "speed-dial");
+ const gchar* html;
#ifdef G_ENABLE_DEBUG
GTimer* timer = NULL;
- if (g_getenv ("MIDORI_STARTTIME") != NULL)
+ if (midori_debug ("startup"))
timer = g_timer_new ();
#endif
katze_assign (view->uri, NULL);
katze_assign (view->mime_type, NULL);
+ katze_item_set_meta_string (view->item, "mime-type", NULL);
katze_item_set_meta_integer (view->item, "delay", -1);
- if (speeddial_markup == NULL)
- speeddial_markup = prepare_speed_dial_html (view, TRUE);
-
- midori_view_load_alternate_string (view,
- speeddial_markup ? speeddial_markup : "", "about:blank", NULL);
+ html = midori_speed_dial_get_html (dial, NULL);
+ midori_view_load_alternate_string (view, html, "about:blank", NULL);
#ifdef G_ENABLE_DEBUG
- if (g_getenv ("MIDORI_STARTTIME") != NULL)
+ if (midori_debug ("startup"))
{
g_debug ("Speed Dial: \t%fs", g_timer_elapsed (timer, NULL));
g_timer_destroy (timer);
@@ -4154,7 +4250,8 @@ midori_view_set_uri (MidoriView* view,
"
foo bar spam eggs ",
+ "foo bar spam eggs ",
+ "foo bar spam eggs ",
"
Lorem ipsum doloret sit amet...",
+ "Lorem ipsum doloret sit amet…",
"",
@@ -4225,11 +4322,26 @@ midori_view_set_uri (MidoriView* view,
list_geolocation (markup);
data = g_string_free (markup, FALSE);
}
+ else if (!strcmp (uri, "about:paths"))
+ {
+ gchar* res_dir = midori_paths_get_res_filename ("");
+ gchar* lib_dir = midori_paths_get_lib_path (PACKAGE_NAME);
+ data = g_strdup_printf ("%s "
+ "config: %s
"
+ "res: %s
"
+ "lib: %s
"
+ "cache: %s
"
+ "tmp: %s
"
+ "",
+ uri, midori_paths_get_config_dir (), res_dir,
+ lib_dir, midori_paths_get_cache_dir (), midori_paths_get_tmp_dir ());
+ g_free (res_dir);
+ g_free (lib_dir);
+ katze_assign (view->uri, g_strdup (uri));
+ }
else if (!strcmp (uri, "about:") || !strcmp (uri, "about:version"))
{
- gchar* arguments = g_strjoinv (" ", sokoke_get_argv (NULL));
- gchar* command_line = sokoke_replace_variables (
- arguments, g_get_home_dir (), "~", NULL);
+ gchar* command_line = midori_paths_get_command_line_str ();
gchar* architecture, *platform;
const gchar* sys_name = midori_web_settings_get_system_name (
&architecture, &platform);
@@ -4242,16 +4354,18 @@ midori_view_set_uri (MidoriView* view,
static char const * const version_format_strings[] = {
" libsoup %s",
"cairo %s ", "(%s) gcr %s granite %s libnotify %s single instance %s Platform %s ", "%s ", "%s Identification %s Identification %sVideo Formats %s "
- "Command line %s Command line %sMidori %s (%s) GTK+ %d.%d.%d (%d.%d.%d)"
" Glib %d.%d.%d (%d.%d.%d)
+#ifdef HAVE_GRANITE
+ #include
+#endif
+
G_BEGIN_DECLS
#define MIDORI_LOAD_PROVISIONAL WEBKIT_LOAD_PROVISIONAL
@@ -53,6 +57,15 @@ midori_security_get_type (void) G_GNUC_CONST;
#define MIDORI_TYPE_SECURITY \
(midori_security_get_type ())
+typedef enum
+{
+ MIDORI_DOWNLOAD_CANCEL,
+ MIDORI_DOWNLOAD_OPEN,
+ MIDORI_DOWNLOAD_SAVE,
+ MIDORI_DOWNLOAD_SAVE_AS,
+ MIDORI_DOWNLOAD_OPEN_IN_VIEWER,
+} MidoriDownloadType;
+
#define MIDORI_VIEW(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_VIEW, MidoriView))
#define MIDORI_VIEW_CLASS(klass) \
@@ -142,8 +155,17 @@ midori_view_get_tab_menu (MidoriView* view);
PangoEllipsizeMode
midori_view_get_label_ellipsize (MidoriView* view);
+#ifdef HAVE_GRANITE
+GraniteWidgetsTab*
+midori_view_get_tab (MidoriView* view);
+
+void
+midori_view_set_tab (MidoriView* view,
+ GraniteWidgetsTab* tab);
+#else
GtkWidget*
midori_view_get_proxy_tab_label (MidoriView* view);
+#endif
KatzeItem*
midori_view_get_proxy_item (MidoriView* view);
@@ -161,9 +183,6 @@ void
midori_view_set_zoom_level (MidoriView* view,
gfloat zoom_level);
-gboolean
-midori_view_can_reload (MidoriView* view);
-
void
midori_view_reload (MidoriView* view,
gboolean from_cache);
@@ -197,9 +216,6 @@ midori_view_get_previous_page (MidoriView* view);
const gchar*
midori_view_get_next_page (MidoriView* view);
-gboolean
-midori_view_can_print (MidoriView* view);
-
void
midori_view_print (MidoriView* view);
@@ -214,9 +230,6 @@ midori_view_save_source (MidoriView* view,
const gchar* uri,
const gchar* outfile);
-gboolean
-midori_view_can_find (MidoriView* view);
-
void
midori_view_unmark_text_matches (MidoriView* view);
@@ -268,9 +281,9 @@ midori_view_add_info_bar (MidoriView* view,
const gchar* first_button_text,
...);
-void
-midori_view_save_speed_dial_config (MidoriView* view,
- GKeyFile* key_file);
+const gchar*
+midori_view_fallback_extension (MidoriView* view,
+ const gchar* extension);
G_END_DECLS
diff --git a/midori/midori-viewable.c b/midori/midori-viewable.c
deleted file mode 100644
index f17c305a..00000000
--- a/midori/midori-viewable.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- Copyright (C) 2008 Christian Dywan
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#include "midori-viewable.h"
-
-#include
-
-enum {
- POPULATE_OPTION_MENU,
-
- LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-static void
-midori_viewable_base_init (MidoriViewableIface* iface);
-
-static void
-midori_viewable_base_finalize (MidoriViewableIface* iface);
-
-GType
-midori_viewable_get_type (void)
-{
- static GType viewable_type = 0;
-
- if (!viewable_type)
- {
- const GTypeInfo viewable_info =
- {
- sizeof (MidoriViewableIface),
- (GBaseInitFunc) midori_viewable_base_init,
- (GBaseFinalizeFunc) midori_viewable_base_finalize,
- };
-
- viewable_type = g_type_register_static (G_TYPE_INTERFACE,
- "MidoriViewable",
- &viewable_info, 0);
- g_type_interface_add_prerequisite (viewable_type, GTK_TYPE_WIDGET);
- }
-
- return viewable_type;
-}
-
-static const gchar*
-midori_viewable_default_get_stock_id (MidoriViewable* viewable)
-{
- return NULL;
-}
-
-static const gchar*
-midori_viewable_default_get_label (MidoriViewable* viewable)
-{
- return NULL;
-}
-
-static GtkWidget*
-midori_viewable_default_get_toolbar (MidoriViewable* viewable)
-{
- return NULL;
-}
-
-static void
-midori_viewable_base_init (MidoriViewableIface* iface)
-{
- static gboolean initialized = FALSE;
-
- if (initialized)
- return;
-
- /**
- * MidoriViewable::populate-option-menu:
- * @viewable: the object on which the signal is emitted
- * @menu: the #GtkMenu to populate
- *
- * Emitted when an Option menu is displayed, for instance
- * when the user clicks the Options button in the panel.
- *
- * Deprecated: 0.2.3
- */
- signals[POPULATE_OPTION_MENU] = g_signal_new (
- "populate-option-menu",
- G_TYPE_FROM_INTERFACE (iface),
- (GSignalFlags)(G_SIGNAL_RUN_LAST),
- 0,
- 0,
- NULL,
- g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1,
- GTK_TYPE_MENU);
-
- iface->get_stock_id = midori_viewable_default_get_stock_id;
- iface->get_label = midori_viewable_default_get_label;
- iface->get_toolbar = midori_viewable_default_get_toolbar;
-
- initialized = TRUE;
-}
-
-static void
-midori_viewable_base_finalize (MidoriViewableIface* iface)
-{
-}
-
-/**
- * midori_viewable_get_stock_id:
- * @viewable: a #MidoriViewable
- *
- * Retrieves the stock ID of the viewable.
- *
- * Return value: a stock ID
- **/
-const gchar*
-midori_viewable_get_stock_id (MidoriViewable* viewable)
-{
- g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), NULL);
-
- return MIDORI_VIEWABLE_GET_IFACE (viewable)->get_stock_id (viewable);
-}
-
-/**
- * midori_viewable_get_label:
- * @viewable: a #MidoriViewable
- *
- * Retrieves the label of the viewable.
- *
- * Return value: a label string
- **/
-const gchar*
-midori_viewable_get_label (MidoriViewable* viewable)
-{
- g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), NULL);
-
- return MIDORI_VIEWABLE_GET_IFACE (viewable)->get_label (viewable);
-}
-
-/**
- * midori_viewable_get_toolbar:
- * @viewable: a #MidoriViewable
- *
- * Retrieves the toolbar of the viewable.
- *
- * Return value: a toolbar
- **/
-GtkWidget*
-midori_viewable_get_toolbar (MidoriViewable* viewable)
-{
- GtkWidget* toolbar;
-
- g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), NULL);
-
- toolbar = MIDORI_VIEWABLE_GET_IFACE (viewable)->get_toolbar (viewable);
- if (!toolbar)
- toolbar = gtk_toolbar_new ();
- return toolbar;
-}
diff --git a/midori/midori-viewable.h b/midori/midori-viewable.h
deleted file mode 100644
index 7e36c7b0..00000000
--- a/midori/midori-viewable.h
+++ /dev/null
@@ -1,61 +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_VIEWABLE_H__
-#define __MIDORI_VIEWABLE_H__
-
-#include
-
-G_BEGIN_DECLS
-
-#define MIDORI_TYPE_VIEWABLE \
- (midori_viewable_get_type ())
-#define MIDORI_VIEWABLE(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_VIEWABLE, MidoriViewable))
-#define MIDORI_IS_VIEWABLE(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_VIEWABLE))
-#define MIDORI_VIEWABLE_GET_IFACE(inst) \
- (G_TYPE_INSTANCE_GET_INTERFACE ((inst), MIDORI_TYPE_VIEWABLE, \
- MidoriViewableIface))
-
-typedef struct _MidoriViewable MidoriViewable;
-typedef struct _MidoriViewableIface MidoriViewableIface;
-
-struct _MidoriViewableIface
-{
- GTypeInterface base_iface;
-
- /* Virtual functions */
- const gchar*
- (*get_stock_id) (MidoriViewable* viewable);
-
- const gchar*
- (*get_label) (MidoriViewable* viewable);
-
- GtkWidget*
- (*get_toolbar) (MidoriViewable* viewable);
-};
-
-GType
-midori_viewable_get_type (void) G_GNUC_CONST;
-
-const gchar*
-midori_viewable_get_stock_id (MidoriViewable* viewable);
-
-const gchar*
-midori_viewable_get_label (MidoriViewable* viewable);
-
-GtkWidget*
-midori_viewable_get_toolbar (MidoriViewable* viewable);
-
-G_END_DECLS
-
-#endif /* __MIDORI_VIEWABLE_H__ */
diff --git a/midori/midori-viewable.vala b/midori/midori-viewable.vala
new file mode 100644
index 00000000..3fa177ec
--- /dev/null
+++ b/midori/midori-viewable.vala
@@ -0,0 +1,23 @@
+/*
+ Copyright (C) 2008 Christian Dywan
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+namespace Midori {
+ public interface Viewable {
+ public abstract unowned string get_stock_id ();
+ public abstract unowned string get_label ();
+ public abstract Gtk.Widget get_toolbar ();
+ /* Emitted when an Option menu is displayed, for instance
+ * when the user clicks the Options button in the panel.
+ * Deprecated: 0.2.3 */
+ public signal void populate_option_menu (Gtk.Menu menu);
+ }
+}
+
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 11dc999f..e0549b61 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008-2010 Christian Dywan
+ Copyright (C) 2008-2012 Christian Dywan
Copyright (C) 2011 Peter Hatina
This library is free software; you can redistribute it and/or
@@ -12,6 +12,7 @@
#include "midori-websettings.h"
+#include "midori-app.h"
#include "sokoke.h"
#include /* Vala API */
@@ -33,59 +34,19 @@
struct _MidoriWebSettings
{
- WebKitWebSettings parent_instance;
+ MidoriSettings parent_instance;
- gboolean remember_last_window_size : 1;
- MidoriWindowState last_window_state : 2;
- gboolean show_menubar : 1;
- gboolean show_navigationbar : 1;
- gboolean show_bookmarkbar : 1;
- gboolean show_panel : 1;
- gboolean show_statusbar : 1;
MidoriToolbarStyle toolbar_style : 3;
- gboolean compact_sidepanel : 1;
- gboolean right_align_sidepanel : 1;
- gboolean open_panels_in_windows : 1;
MidoriStartup load_on_startup : 2;
- gboolean show_crash_dialog : 1;
MidoriPreferredEncoding preferred_encoding : 3;
- gboolean always_show_tabbar : 1;
- gboolean close_buttons_on_tabs : 1;
gint close_buttons_left;
MidoriNewPage open_new_pages_in : 2;
- gboolean middle_click_opens_selection : 1;
- gboolean open_tabs_in_the_background : 1;
- gboolean open_tabs_next_to_current : 1;
- gboolean open_popups_in_tabs : 1;
- gboolean zoom_text_and_images : 1;
- gboolean find_while_typing : 1;
- gboolean kinetic_scrolling : 1;
gboolean first_party_cookies_only : 1;
- gboolean remember_last_visited_pages : 1;
MidoriProxy proxy_type : 2;
MidoriIdentity identify_as : 3;
- gint last_window_width;
- gint last_window_height;
- gint last_panel_position;
- gint last_panel_page;
- gint last_web_search;
- gint maximum_cookie_age;
- gint maximum_history_age;
- gint search_width;
-
- gchar* toolbar_items;
- gchar* homepage;
- gchar* download_folder;
- gchar* text_editor;
- gchar* news_aggregator;
- gchar* location_entry_search;
- gchar* http_proxy;
- gint http_proxy_port;
- #if WEBKIT_CHECK_VERSION (1, 3, 11)
- gint maximum_cache_size;
- #endif
gchar* http_accept_language;
+ gchar* accept;
gchar* ident_string;
gint clear_private_data;
@@ -94,9 +55,7 @@ struct _MidoriWebSettings
#if !WEBKIT_CHECK_VERSION (1, 3, 13)
gboolean enable_dns_prefetching;
#endif
- gboolean strip_referer;
gboolean enforce_font_family;
- gboolean flash_window_on_bg_tabs;
gchar* user_stylesheet_uri;
gchar* user_stylesheet_uri_cached;
GHashTable* user_stylesheets;
@@ -104,110 +63,38 @@ struct _MidoriWebSettings
struct _MidoriWebSettingsClass
{
- WebKitWebSettingsClass parent_class;
+ MidoriSettingsClass parent_class;
};
-G_DEFINE_TYPE (MidoriWebSettings, midori_web_settings, WEBKIT_TYPE_WEB_SETTINGS)
+G_DEFINE_TYPE (MidoriWebSettings, midori_web_settings, MIDORI_TYPE_SETTINGS);
enum
{
PROP_0,
- PROP_REMEMBER_LAST_WINDOW_SIZE,
- PROP_LAST_WINDOW_WIDTH,
- PROP_LAST_WINDOW_HEIGHT,
- PROP_LAST_WINDOW_STATE,
- PROP_LAST_PANEL_POSITION,
- PROP_LAST_PANEL_PAGE,
- PROP_LAST_WEB_SEARCH,
-
- PROP_SHOW_MENUBAR,
- PROP_SHOW_NAVIGATIONBAR,
- PROP_SHOW_BOOKMARKBAR,
- PROP_SHOW_PANEL,
- PROP_SHOW_STATUSBAR,
-
PROP_TOOLBAR_STYLE,
- PROP_TOOLBAR_ITEMS,
- PROP_COMPACT_SIDEPANEL,
- PROP_RIGHT_ALIGN_SIDEPANEL,
- PROP_OPEN_PANELS_IN_WINDOWS,
PROP_LOAD_ON_STARTUP,
- PROP_HOMEPAGE,
- PROP_SHOW_CRASH_DIALOG,
- PROP_DOWNLOAD_FOLDER,
- PROP_TEXT_EDITOR,
- PROP_NEWS_AGGREGATOR,
- PROP_LOCATION_ENTRY_SEARCH,
PROP_PREFERRED_ENCODING,
- PROP_ALWAYS_SHOW_TABBAR,
- PROP_CLOSE_BUTTONS_ON_TABS,
PROP_CLOSE_BUTTONS_LEFT,
PROP_OPEN_NEW_PAGES_IN,
- PROP_MIDDLE_CLICK_OPENS_SELECTION,
- PROP_OPEN_TABS_IN_THE_BACKGROUND,
- PROP_OPEN_TABS_NEXT_TO_CURRENT,
- PROP_OPEN_POPUPS_IN_TABS,
- PROP_FLASH_WINDOW_ON_BG_TABS,
- PROP_ENABLE_WEBGL,
PROP_ENABLE_FULLSCREEN,
- PROP_AUTO_LOAD_IMAGES,
- PROP_ENABLE_SCRIPTS,
PROP_ENABLE_PLUGINS,
- PROP_ENABLE_DEVELOPER_EXTRAS,
- PROP_ENABLE_SPELL_CHECKING,
- PROP_ENABLE_HTML5_DATABASE,
- PROP_ENABLE_HTML5_LOCAL_STORAGE,
- PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE,
PROP_ENABLE_PAGE_CACHE,
- PROP_ZOOM_TEXT_AND_IMAGES,
- PROP_FIND_WHILE_TYPING,
- PROP_KINETIC_SCROLLING,
- PROP_MAXIMUM_COOKIE_AGE,
- PROP_FIRST_PARTY_COOKIES_ONLY,
-
- PROP_MAXIMUM_HISTORY_AGE,
PROP_PROXY_TYPE,
- PROP_HTTP_PROXY,
- PROP_HTTP_PROXY_PORT,
- PROP_MAXIMUM_CACHE_SIZE,
PROP_IDENTIFY_AS,
PROP_USER_AGENT,
PROP_PREFERRED_LANGUAGES,
- PROP_CLEAR_PRIVATE_DATA,
- PROP_CLEAR_DATA,
PROP_SITE_DATA_RULES,
PROP_ENABLE_DNS_PREFETCHING,
- PROP_STRIP_REFERER,
PROP_ENFORCE_FONT_FAMILY,
PROP_USER_STYLESHEET_URI,
-
- PROP_SEARCH_WIDTH,
};
-GType
-midori_window_state_get_type (void)
-{
- static GType type = 0;
- if (!type)
- {
- static const GEnumValue values[] = {
- { MIDORI_WINDOW_NORMAL, "MIDORI_WINDOW_NORMAL", "Normal" },
- { MIDORI_WINDOW_MINIMIZED, "MIDORI_WINDOW_MINIMIZED", "Minimized" },
- { MIDORI_WINDOW_MAXIMIZED, "MIDORI_WINDOW_MAXIMIZED", "Maximized" },
- { MIDORI_WINDOW_FULLSCREEN, "MIDORI_WINDOW_FULLSCREEN", "Fullscreen" },
- { 0, NULL, NULL }
- };
- type = g_enum_register_static ("MidoriWindowState", values);
- }
- return type;
-}
-
GType
midori_startup_get_type (void)
{
@@ -311,6 +198,7 @@ midori_identity_get_type (void)
static const GEnumValue values[] = {
{ MIDORI_IDENT_MIDORI, "MIDORI_IDENT_MIDORI", N_("_Automatic") },
{ MIDORI_IDENT_GENUINE, "MIDORI_IDENT_GENUINE", N_("Midori") },
+ { MIDORI_IDENT_CHROME, "MIDORI_IDENT_CHROME", N_("Chrome") },
{ MIDORI_IDENT_SAFARI, "MIDORI_IDENT_SAFARI", N_("Safari") },
{ MIDORI_IDENT_IPHONE, "MIDORI_IDENT_IPHONE", N_("iPhone") },
{ MIDORI_IDENT_FIREFOX, "MIDORI_IDENT_FIREFOX", N_("Firefox") },
@@ -338,17 +226,6 @@ midori_web_settings_get_property (GObject* object,
GValue* value,
GParamSpec* pspec);
-static const gchar*
-midori_get_download_dir (void)
-{
- const gchar* dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD);
- if (dir)
- {
- katze_mkdir_with_parents (dir, 0700);
- return dir;
- }
- return g_get_home_dir ();
-}
static gboolean
midori_web_settings_low_memory_profile ()
{
@@ -394,125 +271,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS;
- g_object_class_install_property (gobject_class,
- PROP_REMEMBER_LAST_WINDOW_SIZE,
- g_param_spec_boolean (
- "remember-last-window-size",
- _("Remember last window size"),
- _("Whether to save the last window size"),
- TRUE,
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_LAST_WINDOW_WIDTH,
- g_param_spec_int (
- "last-window-width",
- _("Last window width"),
- _("The last saved window width"),
- 0, G_MAXINT, 0,
- flags | MIDORI_PARAM_DELAY_SAVING));
-
- g_object_class_install_property (gobject_class,
- PROP_LAST_WINDOW_HEIGHT,
- g_param_spec_int (
- "last-window-height",
- _("Last window height"),
- _("The last saved window height"),
- 0, G_MAXINT, 0,
- flags | MIDORI_PARAM_DELAY_SAVING));
-
- /**
- * MidoriWebSettings:last-window-state:
- *
- * The last saved window state.
- *
- * Since: 0.1.3
- */
- g_object_class_install_property (gobject_class,
- PROP_LAST_WINDOW_STATE,
- g_param_spec_enum (
- "last-window-state",
- "Last window state",
- "The last saved window state",
- MIDORI_TYPE_WINDOW_STATE,
- MIDORI_WINDOW_NORMAL,
- flags | MIDORI_PARAM_DELAY_SAVING));
-
- g_object_class_install_property (gobject_class,
- PROP_LAST_PANEL_POSITION,
- g_param_spec_int (
- "last-panel-position",
- _("Last panel position"),
- _("The last saved panel position"),
- 0, G_MAXINT, 0,
- flags | MIDORI_PARAM_DELAY_SAVING));
-
- g_object_class_install_property (gobject_class,
- PROP_LAST_PANEL_PAGE,
- g_param_spec_int (
- "last-panel-page",
- /* i18n: The internal index of the last opened panel */
- _("Last panel page"),
- _("The last saved panel page"),
- 0, G_MAXINT, 0,
- flags | MIDORI_PARAM_DELAY_SAVING));
-
- g_object_class_install_property (gobject_class,
- PROP_LAST_WEB_SEARCH,
- g_param_spec_int (
- "last-web-search",
- _("Last Web search"),
- _("The last saved Web search"),
- 0, G_MAXINT, 0,
- flags));
-
-
- g_object_class_install_property (gobject_class,
- PROP_SHOW_MENUBAR,
- g_param_spec_boolean (
- "show-menubar",
- _("Show Menubar"),
- _("Whether to show the menubar"),
- FALSE,
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_SHOW_NAVIGATIONBAR,
- g_param_spec_boolean (
- "show-navigationbar",
- _("Show Navigationbar"),
- _("Whether to show the navigationbar"),
- TRUE,
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_SHOW_BOOKMARKBAR,
- g_param_spec_boolean (
- "show-bookmarkbar",
- _("Show Bookmarkbar"),
- _("Whether to show the bookmarkbar"),
- FALSE,
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_SHOW_PANEL,
- g_param_spec_boolean (
- "show-panel",
- _("Show Panel"),
- _("Whether to show the panel"),
- FALSE,
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_SHOW_STATUSBAR,
- g_param_spec_boolean (
- "show-statusbar",
- _("Show Statusbar"),
- _("Whether to show the statusbar"),
- TRUE,
- flags));
-
-
g_object_class_install_property (gobject_class,
PROP_TOOLBAR_STYLE,
g_param_spec_enum (
@@ -523,169 +281,26 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
MIDORI_TOOLBAR_DEFAULT,
flags));
- g_object_class_install_property (gobject_class,
- PROP_TOOLBAR_ITEMS,
- g_param_spec_string (
- "toolbar-items",
- _("Toolbar Items"),
- _("The items to show on the toolbar"),
- "TabNew,Back,Forward,Next,ReloadStop,BookmarkAdd,Location,Search,Trash,CompactMenu",
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_COMPACT_SIDEPANEL,
- g_param_spec_boolean (
- "compact-sidepanel",
- _("Compact Sidepanel"),
- _("Whether to make the sidepanel compact"),
- FALSE,
- flags));
-
- /**
- * MidoriWebSettings:right-sidepanel:
- *
- * Whether to align the sidepanel on the right.
- *
- * Since: 0.1.3
- */
- g_object_class_install_property (gobject_class,
- PROP_RIGHT_ALIGN_SIDEPANEL,
- g_param_spec_boolean (
- "right-align-sidepanel",
- _("Align sidepanel on the right"),
- _("Whether to align the sidepanel on the right"),
- FALSE,
- flags));
-
- /**
- * MidoriWebSettings:open-panels-in-window:
- *
- * Whether to open panels in separate windows.
- *
- * Since: 0.2.2
- */
- g_object_class_install_property (gobject_class,
- PROP_OPEN_PANELS_IN_WINDOWS,
- g_param_spec_boolean (
- "open-panels-in-windows",
- _("Open panels in separate windows"),
- _("Whether to always open panels in separate windows"),
- FALSE,
- flags));
-
-
g_object_class_install_property (gobject_class,
PROP_LOAD_ON_STARTUP,
g_param_spec_enum (
"load-on-startup",
_("When Midori starts:"),
- _("What to do when Midori starts"),
+ "What to do when Midori starts",
MIDORI_TYPE_STARTUP,
MIDORI_STARTUP_LAST_OPEN_PAGES,
flags));
- g_object_class_install_property (gobject_class,
- PROP_HOMEPAGE,
- g_param_spec_string (
- "homepage",
- _("Homepage:"),
- _("The homepage"),
- "http://www.google.com",
- flags));
-
- /**
- * MidoriWebSettings:show-crash-dialog:
- *
- * Show a dialog after Midori crashed.
- *
- * Since: 0.1.2
- */
- g_object_class_install_property (gobject_class,
- PROP_SHOW_CRASH_DIALOG,
- g_param_spec_boolean (
- "show-crash-dialog",
- _("Show crash dialog"),
- _("Show a dialog after Midori crashed"),
- TRUE,
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_DOWNLOAD_FOLDER,
- g_param_spec_string (
- "download-folder",
- _("Save downloaded files to:"),
- _("The folder downloaded files are saved to"),
- midori_get_download_dir (),
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_TEXT_EDITOR,
- g_param_spec_string (
- "text-editor",
- _("Text Editor"),
- _("An external text editor"),
- NULL,
- flags));
-
- /**
- * MidoriWebSettings:news-aggregator:
- *
- * An external news aggregator.
- *
- * Since: 0.1.6
- */
- g_object_class_install_property (gobject_class,
- PROP_NEWS_AGGREGATOR,
- g_param_spec_string (
- "news-aggregator",
- _("News Aggregator"),
- _("An external news aggregator"),
- NULL,
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_LOCATION_ENTRY_SEARCH,
- g_param_spec_string (
- "location-entry-search",
- _("Location entry Search"),
- _("The search to perform inside the location entry"),
- NULL,
- flags));
-
g_object_class_install_property (gobject_class,
PROP_PREFERRED_ENCODING,
g_param_spec_enum (
"preferred-encoding",
- _("Preferred Encoding"),
- _("The preferred character encoding"),
+ "Preferred Encoding",
+ "The preferred character encoding",
MIDORI_TYPE_PREFERRED_ENCODING,
MIDORI_ENCODING_WESTERN,
flags));
-
- g_object_class_install_property (gobject_class,
- PROP_ALWAYS_SHOW_TABBAR,
- g_param_spec_boolean (
- "always-show-tabbar",
- _("Always Show Tabbar"),
- _("Always show the tabbar"),
- TRUE,
- #ifdef HAVE_GRANITE
- G_PARAM_READABLE
- #else
- flags
- #endif
- ));
-
- g_object_class_install_property (gobject_class,
- PROP_CLOSE_BUTTONS_ON_TABS,
- g_param_spec_boolean (
- "close-buttons-on-tabs",
- _("Close Buttons on Tabs"),
- _("Whether tabs have close buttons"),
- TRUE,
- flags));
-
/**
* MidoriWebSettings:close-buttons-left:
*
@@ -708,110 +323,20 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
g_param_spec_enum (
"open-new-pages-in",
_("Open new pages in:"),
- _("Where to open new pages"),
+ "Where to open new pages",
MIDORI_TYPE_NEW_PAGE,
MIDORI_NEW_PAGE_TAB,
flags));
- g_object_class_install_property (gobject_class,
- PROP_MIDDLE_CLICK_OPENS_SELECTION,
- g_param_spec_boolean (
- "middle-click-opens-selection",
- _("Middle click opens Selection"),
- _("Load an address from the selection via middle click"),
- TRUE,
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_OPEN_TABS_IN_THE_BACKGROUND,
- g_param_spec_boolean (
- "open-tabs-in-the-background",
- _("Open tabs in the background"),
- _("Whether to open new tabs in the background"),
- FALSE,
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_OPEN_TABS_NEXT_TO_CURRENT,
- g_param_spec_boolean (
- "open-tabs-next-to-current",
- _("Open Tabs next to Current"),
- _("Whether to open new tabs next to the current tab or after the last one"),
- TRUE,
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_OPEN_POPUPS_IN_TABS,
- g_param_spec_boolean (
- "open-popups-in-tabs",
- _("Open popups in tabs"),
- _("Whether to open popup windows in tabs"),
- TRUE,
- flags));
-
-
- /* Override properties to localize them for preference proxies */
- g_object_class_install_property (gobject_class,
- PROP_AUTO_LOAD_IMAGES,
- g_param_spec_boolean (
- "auto-load-images",
- _("Load images automatically"),
- _("Load and display images automatically"),
- TRUE,
- flags));
- g_object_class_install_property (gobject_class,
- PROP_ENABLE_SCRIPTS,
- g_param_spec_boolean (
- "enable-scripts",
- _("Enable scripts"),
- _("Enable embedded scripting languages"),
- TRUE,
- flags));
g_object_class_install_property (gobject_class,
PROP_ENABLE_PLUGINS,
g_param_spec_boolean (
"enable-plugins",
- _("Enable Netscape plugins"),
- _("Enable embedded Netscape plugin objects"),
- midori_web_settings_has_plugin_support (),
- midori_web_settings_has_plugin_support () ? flags : G_PARAM_READABLE));
- /* Override properties to override defaults */
- g_object_class_install_property (gobject_class,
- PROP_ENABLE_DEVELOPER_EXTRAS,
- g_param_spec_boolean (
- "enable-developer-extras",
- "Enable developer tools",
- "Enable special extensions for developers",
+ "Enable Netscape plugins",
+ "Enable embedded Netscape plugin objects",
TRUE,
flags));
- g_object_class_install_property (gobject_class,
- PROP_ENABLE_SPELL_CHECKING,
- g_param_spec_boolean ("enable-spell-checking",
- _("Enable Spell Checking"),
- _("Enable spell checking while typing"),
- TRUE,
- flags));
- g_object_class_install_property (gobject_class,
- PROP_ENABLE_HTML5_DATABASE,
- g_param_spec_boolean ("enable-html5-database",
- _("Enable HTML5 database support"),
- _("Whether to enable HTML5 database support"),
- FALSE,
- flags));
- g_object_class_install_property (gobject_class,
- PROP_ENABLE_HTML5_LOCAL_STORAGE,
- g_param_spec_boolean ("enable-html5-local-storage",
- _("Enable HTML5 local storage support"),
- _("Whether to enable HTML5 local storage support"),
- FALSE,
- flags));
- g_object_class_install_property (gobject_class,
- PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE,
- g_param_spec_boolean ("enable-offline-web-application-cache",
- _("Enable offline web application cache"),
- _("Whether to enable offline web application cache"),
- FALSE,
- flags));
+
#if WEBKIT_CHECK_VERSION (1, 1, 18)
g_object_class_install_property (gobject_class,
PROP_ENABLE_PAGE_CACHE,
@@ -821,24 +346,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
!midori_web_settings_low_memory_profile (),
flags));
#endif
- g_object_class_install_property (gobject_class,
- PROP_FLASH_WINDOW_ON_BG_TABS,
- g_param_spec_boolean (
- "flash-window-on-new-bg-tabs",
- _("Flash window on background tabs"),
- _("Flash the browser window if a new tab was opened in the background"),
- FALSE,
- flags));
- if (g_object_class_find_property (gobject_class, "enable-webgl"))
- g_object_class_install_property (gobject_class,
- PROP_ENABLE_WEBGL,
- g_param_spec_boolean (
- "enable-webgl",
- _("Enable WebGL support"),
- _("Allow websites to use OpenGL rendering"),
- /* Enable by default for git builds */
- !g_str_equal (PACKAGE_VERSION, MIDORI_VERSION),
- flags));
if (g_object_class_find_property (gobject_class, "enable-fullscreen"))
g_object_class_install_property (gobject_class,
PROP_ENABLE_FULLSCREEN,
@@ -849,96 +356,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
TRUE,
flags));
-
- /**
- * MidoriWebSettings:zoom-text-and-images:
- *
- * Whether to zoom text and images.
- *
- * Since: 0.1.3
- */
- g_object_class_install_property (gobject_class,
- PROP_ZOOM_TEXT_AND_IMAGES,
- g_param_spec_boolean (
- "zoom-text-and-images",
- _("Zoom Text and Images"),
- _("Whether to zoom text and images"),
- FALSE,
- flags));
-
- /**
- * MidoriWebSettings:find-while-typing:
- *
- * Whether to automatically find inline while typing something.
- *
- * Since: 0.1.4
- */
- g_object_class_install_property (gobject_class,
- PROP_FIND_WHILE_TYPING,
- g_param_spec_boolean (
- "find-while-typing",
- _("Find inline while typing"),
- _("Whether to automatically find inline while typing"),
- FALSE,
- flags));
-
- /**
- * MidoriWebSettings:kinetic-scrolling:
- *
- * Whether scrolling should kinetically move according to speed.
- *
- * Since: 0.2.0
- */
- g_object_class_install_property (gobject_class,
- PROP_KINETIC_SCROLLING,
- g_param_spec_boolean (
- "kinetic-scrolling",
- _("Kinetic scrolling"),
- _("Whether scrolling should kinetically move according to speed"),
- TRUE,
- flags));
-
- g_object_class_install_property (gobject_class,
- PROP_MAXIMUM_COOKIE_AGE,
- g_param_spec_int (
- "maximum-cookie-age",
- _("Delete old Cookies after:"),
- _("The maximum number of days to save cookies for"),
- 0, G_MAXINT, 30,
- flags));
-
- /**
- * MidoriWebSettings:first-party-cookies-only:
- *
- * Whether only first party cookies should be accepted.
- * WebKitGTK+ 1.1.21 is required for this to work.
- *
- * Since: 0.4.2
- */
- g_object_class_install_property (gobject_class,
- PROP_FIRST_PARTY_COOKIES_ONLY,
- g_param_spec_boolean (
- "first-party-cookies-only",
- _("Only accept Cookies from sites you visit"),
- _("Block cookies sent by third-party websites"),
- #ifdef HAVE_LIBSOUP_2_29_91
- TRUE,
- g_object_class_find_property (gobject_class, /* WebKitGTK+ >= 1.1.21 */
- "enable-file-access-from-file-uris") ? flags : G_PARAM_READABLE));
- #else
- FALSE,
- G_PARAM_READABLE));
- #endif
-
- g_object_class_install_property (gobject_class,
- PROP_MAXIMUM_HISTORY_AGE,
- g_param_spec_int (
- "maximum-history-age",
- _("Delete pages from history after:"),
- _("The maximum number of days to save the history for"),
- 0, G_MAXINT, 30,
- flags));
-
/**
* MidoriWebSettings:proxy-type:
*
@@ -950,56 +367,12 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
PROP_PROXY_TYPE,
g_param_spec_enum (
"proxy-type",
- _("Proxy server"),
- _("The type of proxy server to use"),
+ "Proxy server",
+ "The type of proxy server to use",
MIDORI_TYPE_PROXY,
MIDORI_PROXY_AUTOMATIC,
flags));
- g_object_class_install_property (gobject_class,
- PROP_HTTP_PROXY,
- g_param_spec_string (
- "http-proxy",
- _("HTTP Proxy Server"),
- _("The proxy server used for HTTP connections"),
- NULL,
- flags));
-
- /**
- * MidoriWebSettings:http-proxy-port:
- *
- * The proxy server port used for HTTP connections
- *
- * Since: 0.4.2
- */
- g_object_class_install_property (gobject_class,
- PROP_HTTP_PROXY_PORT,
- g_param_spec_int (
- "http-proxy-port",
- _("Port"),
- _("The proxy server port used for HTTP connections"),
- 1, 65535, 8080,
- flags
- ));
-
- #if WEBKIT_CHECK_VERSION (1, 3, 11)
- /**
- * MidoriWebSettings:maximum-cache-size:
- *
- * The maximum size of cached pages on disk.
- *
- * Since: 0.3.4
- */
- g_object_class_install_property (gobject_class,
- PROP_MAXIMUM_CACHE_SIZE,
- g_param_spec_int (
- "maximum-cache-size",
- _("Web Cache"),
- _("The maximum size of cached pages on disk"),
- 0, G_MAXINT, 100,
- flags));
- #endif
-
/**
* MidoriWebSettings:identify-as:
*
@@ -1029,8 +402,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
PROP_USER_AGENT,
g_param_spec_string (
"user-agent",
- _("Identification string"),
- _("The application identification string"),
+ "Identification string",
+ "The application identification string",
NULL,
flags));
@@ -1046,42 +419,11 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
PROP_PREFERRED_LANGUAGES,
g_param_spec_string (
"preferred-languages",
- _("Preferred languages"),
- _("A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""),
+ "Preferred languages",
+ "A comma separated list of languages",
NULL,
flags));
- /**
- * MidoriWebSettings:clear-private-data:
- *
- * The core data selected for deletion.
- *
- * Since: 0.1.7
- */
- g_object_class_install_property (gobject_class,
- PROP_CLEAR_PRIVATE_DATA,
- g_param_spec_int (
- "clear-private-data",
- _("Clear private data"),
- _("The private data selected for deletion"),
- 0, G_MAXINT, 0,
- flags));
-
- /**
- * MidoriWebSettings:clear-data:
- *
- * The data selected for deletion, including extensions.
- *
- * Since: 0.2.9
- */
- g_object_class_install_property (gobject_class,
- PROP_CLEAR_DATA,
- g_param_spec_string (
- "clear-data",
- _("Clear data"),
- _("The data selected for deletion"),
- NULL,
- flags));
/**
* MidoriWebSettings:site-data-rules:
*
@@ -1116,23 +458,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
flags));
#endif
- /**
- * MidoriWebSettings:strip-referer:
- *
- * Whether to strip referrer details sent to external sites.
- *
- * Since: 0.3.4
- */
- g_object_class_install_property (gobject_class,
- PROP_STRIP_REFERER,
- g_param_spec_boolean (
- "strip-referer",
- /* i18n: Reworded: Shorten details propagated when going to another page */
- _("Strip referrer details sent to websites"),
- /* i18n: Referer here is not a typo but a technical term */
- _("Whether the \"Referer\" header should be shortened to the hostname"),
- FALSE,
- flags));
/**
* MidoriWebSettings:enforc-font-family:
*
@@ -1156,23 +481,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
"User stylesheet URI",
"Load stylesheets from a local URI",
NULL,
- flags | MIDORI_PARAM_DELAY_SAVING));
-
- /**
- * MidoriWebSettings:search-entry-width:
- *
- * Search action width in pixels
- *
- * Since: 0.4.3
- **/
- g_object_class_install_property (gobject_class,
- PROP_SEARCH_WIDTH,
- g_param_spec_int (
- "search-width",
- "Search action width",
- "Search action width in pixels",
- 10, G_MAXINT, 200,
- flags | MIDORI_PARAM_DELAY_SAVING));
+ flags));
}
static void
@@ -1217,10 +526,6 @@ notify_default_font_family_cb (GObject* object,
static void
midori_web_settings_init (MidoriWebSettings* web_settings)
{
- web_settings->download_folder = g_strdup (midori_get_download_dir ());
- web_settings->http_proxy = NULL;
- web_settings->open_popups_in_tabs = TRUE;
- web_settings->kinetic_scrolling = TRUE;
web_settings->user_stylesheet_uri = web_settings->user_stylesheet_uri_cached = NULL;
web_settings->user_stylesheets = NULL;
@@ -1230,7 +535,7 @@ midori_web_settings_init (MidoriWebSettings* web_settings)
"* { -webkit-box-shadow: none !important; }");
#endif
- #if defined (_WIN32) && WEBKIT_CHECK_VERSION (1, 7, 1)
+ #if defined (_WIN32) && WEBKIT_CHECK_VERSION (1, 7, 1) && !GTK_CHECK_VERSION (3, 0, 0)
/* Try to work-around black borders on native widgets and GTK+2 on Win32 */
midori_web_settings_add_style (web_settings, "black-widgets-workaround",
"input[type='checkbox'] { -webkit-appearance: checkbox !important }"
@@ -1251,13 +556,8 @@ midori_web_settings_finalize (GObject* object)
web_settings = MIDORI_WEB_SETTINGS (object);
- katze_assign (web_settings->toolbar_items, NULL);
- katze_assign (web_settings->homepage, NULL);
- katze_assign (web_settings->download_folder, NULL);
- katze_assign (web_settings->text_editor, NULL);
- katze_assign (web_settings->news_aggregator, NULL);
- katze_assign (web_settings->location_entry_search, NULL);
- katze_assign (web_settings->http_proxy, NULL);
+ katze_assign (web_settings->http_accept_language, NULL);
+ katze_assign (web_settings->accept, NULL);
katze_assign (web_settings->ident_string, NULL);
katze_assign (web_settings->user_stylesheet_uri, NULL);
katze_assign (web_settings->user_stylesheet_uri_cached, NULL);
@@ -1279,11 +579,10 @@ midori_web_settings_finalize (GObject* object)
gboolean
midori_web_settings_has_plugin_support (void)
{
- #ifdef G_OS_WIN32
+ #if !WEBKIT_CHECK_VERSION (1, 8, 2) && defined G_OS_WIN32
return FALSE;
#else
- return g_getenv ("MIDORI_UNARMED") == NULL
- && g_strcmp0 (g_getenv ("MOZ_PLUGIN_PATH"), "/");
+ return !midori_debug ("unarmed") && g_strcmp0 (g_getenv ("MOZ_PLUGIN_PATH"), "/");
#endif
}
@@ -1435,8 +734,11 @@ generate_ident_string (MidoriWebSettings* web_settings,
return g_strdup_printf ("Mozilla/5.0 (%s %s) AppleWebKit/%d.%d+ %s",
platform, os, webcore_major, webcore_minor, appname);
case MIDORI_IDENT_MIDORI:
+ case MIDORI_IDENT_CHROME:
+ return g_strdup_printf ("Mozilla/5.0 (%s %s) AppleWebKit/%d.%d "
+ "(KHTML, like Gecko) Chrome/18.0.1025.133 Safari/%d.%d %s",
+ platform, os, webcore_major, webcore_minor, webcore_major, webcore_minor, appname);
case MIDORI_IDENT_SAFARI:
- g_object_set (web_settings, "enable-site-specific-quirks", TRUE, NULL);
return g_strdup_printf ("Mozilla/5.0 (Macintosh; U; Intel Mac OS X; %s) "
"AppleWebKit/%d+ (KHTML, like Gecko) Version/5.0 Safari/%d.%d+ %s",
lang, webcore_major, webcore_major, webcore_minor, appname);
@@ -1455,6 +757,121 @@ generate_ident_string (MidoriWebSettings* web_settings,
}
}
+/* Provide a new way for SoupSession to assume an 'Accept-Language'
+ string automatically from the return value of g_get_language_names(),
+ properly formatted according to RFC2616.
+ Copyright (C) 2009 Mario Sanchez Prada
+ Copyright (C) 2009 Dan Winship
+ Mostly copied from libSoup 2.29, coding style adjusted */
+
+/* Converts a language in POSIX format and to be RFC2616 compliant */
+/* Based on code from epiphany-webkit (ephy_langs_append_languages()) */
+
+static gchar *
+sokoke_posix_lang_to_rfc2616 (const gchar *language)
+{
+ if (!strchr (language, '.') && !strchr (language, '@') && language[0] != 'C')
+ /* change to lowercase and '_' to '-' */
+ return g_strdelimit (g_ascii_strdown (language, -1), "_", '-');
+
+ return NULL;
+}
+
+/* Adds a quality value to a string (any value between 0 and 1). */
+static gchar *
+sokoke_add_quality_value (const gchar *str,
+ float qvalue)
+{
+ if ((qvalue >= 0.0) && (qvalue <= 1.0))
+ {
+ int qv_int = (qvalue * 1000 + 0.5);
+ return g_strdup_printf ("%s;q=%d.%d",
+ str, (int) (qv_int / 1000), qv_int % 1000);
+ }
+
+ return g_strdup (str);
+}
+
+/* Returns a RFC2616 compliant languages list from system locales */
+static gchar *
+sokoke_accept_languages (const gchar* const * lang_names)
+{
+ GArray *langs_garray = NULL;
+ char *cur_lang = NULL;
+ char *prev_lang = NULL;
+ char **langs_array;
+ char *langs_str;
+ float delta;
+ int i, n_lang_names;
+
+ /* Calculate delta for setting the quality values */
+ n_lang_names = g_strv_length ((gchar **)lang_names);
+ delta = 0.999 / (n_lang_names - 1);
+
+ /* Build the array of languages */
+ langs_garray = g_array_new (TRUE, FALSE, sizeof (char*));
+ for (i = 0; lang_names[i] != NULL; i++)
+ {
+ cur_lang = sokoke_posix_lang_to_rfc2616 (lang_names[i]);
+
+ /* Apart from getting a valid RFC2616 compliant
+ language, also get rid of extra variants */
+ if (cur_lang && (!prev_lang ||
+ (!strcmp (prev_lang, cur_lang) || !strstr (prev_lang, cur_lang))))
+ {
+
+ gchar *qv_lang = NULL;
+
+ /* Save reference for further comparison */
+ prev_lang = cur_lang;
+
+ /* Add the quality value and append it */
+ qv_lang = sokoke_add_quality_value (cur_lang, 1 - i * delta);
+ g_array_append_val (langs_garray, qv_lang);
+ }
+ }
+
+ /* Fallback: add "en" if list is empty */
+ if (langs_garray->len == 0)
+ {
+ gchar* fallback = g_strdup ("en");
+ g_array_append_val (langs_garray, fallback);
+ }
+
+ langs_array = (char **) g_array_free (langs_garray, FALSE);
+ langs_str = g_strjoinv (", ", langs_array);
+
+ return langs_str;
+}
+
+
+static void
+midori_web_settings_update_accept_language (MidoriWebSettings* settings)
+{
+ gchar* languages = settings->http_accept_language;
+ /* Empty, use the system locales */
+ if (!(languages && *languages))
+ katze_assign (settings->accept, sokoke_accept_languages (g_get_language_names ()));
+ /* No =, no ., looks like a list of language names */
+ else if (!(strchr (languages, '=') && strchr (languages, '.')))
+ {
+ gchar ** lang_names = g_strsplit_set (languages, ",; ", -1);
+ katze_assign (settings->accept, sokoke_accept_languages ((const gchar* const *)lang_names));
+ g_strfreev (lang_names);
+ }
+ /* Presumably a well formatted list including priorities */
+ else
+ katze_assign (settings->accept, g_strdup (languages));
+}
+
+const gchar*
+midori_web_settings_get_accept_language (MidoriWebSettings* settings)
+{
+ if (!settings->accept)
+ midori_web_settings_update_accept_language (settings);
+ return settings->accept;
+}
+
static void
midori_web_settings_process_stylesheets (MidoriWebSettings* settings,
gint delta_len);
@@ -1473,81 +890,13 @@ midori_web_settings_set_property (GObject* object,
switch (prop_id)
{
- case PROP_REMEMBER_LAST_WINDOW_SIZE:
- web_settings->remember_last_window_size = g_value_get_boolean (value);
- break;
- case PROP_LAST_WINDOW_WIDTH:
- web_settings->last_window_width = g_value_get_int (value);
- break;
- case PROP_LAST_WINDOW_HEIGHT:
- web_settings->last_window_height = g_value_get_int (value);
- break;
- case PROP_LAST_WINDOW_STATE:
- web_settings->last_window_state = g_value_get_enum (value);
- break;
- case PROP_LAST_PANEL_POSITION:
- web_settings->last_panel_position = g_value_get_int (value);
- break;
- case PROP_LAST_PANEL_PAGE:
- web_settings->last_panel_page = g_value_get_int (value);
- break;
- case PROP_LAST_WEB_SEARCH:
- web_settings->last_web_search = g_value_get_int (value);
- break;
-
- case PROP_SHOW_MENUBAR:
- web_settings->show_menubar = g_value_get_boolean (value);
- break;
- case PROP_SHOW_NAVIGATIONBAR:
- web_settings->show_navigationbar = g_value_get_boolean (value);
- break;
- case PROP_SHOW_BOOKMARKBAR:
- web_settings->show_bookmarkbar = g_value_get_boolean (value);
- break;
- case PROP_SHOW_PANEL:
- web_settings->show_panel = g_value_get_boolean (value);
- break;
- case PROP_SHOW_STATUSBAR:
- web_settings->show_statusbar = g_value_get_boolean (value);
- break;
-
case PROP_TOOLBAR_STYLE:
web_settings->toolbar_style = g_value_get_enum (value);
break;
- case PROP_TOOLBAR_ITEMS:
- katze_assign (web_settings->toolbar_items, g_value_dup_string (value));
- break;
- case PROP_COMPACT_SIDEPANEL:
- web_settings->compact_sidepanel = g_value_get_boolean (value);
- break;
- case PROP_RIGHT_ALIGN_SIDEPANEL:
- web_settings->right_align_sidepanel = g_value_get_boolean (value);
- break;
- case PROP_OPEN_PANELS_IN_WINDOWS:
- web_settings->open_panels_in_windows = g_value_get_boolean (value);
- break;
case PROP_LOAD_ON_STARTUP:
web_settings->load_on_startup = g_value_get_enum (value);
break;
- case PROP_HOMEPAGE:
- katze_assign (web_settings->homepage, g_value_dup_string (value));
- break;
- case PROP_SHOW_CRASH_DIALOG:
- web_settings->show_crash_dialog = g_value_get_boolean (value);
- break;
- case PROP_DOWNLOAD_FOLDER:
- katze_assign (web_settings->download_folder, g_value_dup_string (value));
- break;
- case PROP_TEXT_EDITOR:
- katze_assign (web_settings->text_editor, g_value_dup_string (value));
- break;
- case PROP_NEWS_AGGREGATOR:
- katze_assign (web_settings->news_aggregator, g_value_dup_string (value));
- break;
- case PROP_LOCATION_ENTRY_SEARCH:
- katze_assign (web_settings->location_entry_search, g_value_dup_string (value));
- break;
case PROP_PREFERRED_ENCODING:
web_settings->preferred_encoding = g_value_get_enum (value);
switch (web_settings->preferred_encoding)
@@ -1578,36 +927,10 @@ midori_web_settings_set_property (GObject* object,
}
break;
- case PROP_ALWAYS_SHOW_TABBAR:
- web_settings->always_show_tabbar = g_value_get_boolean (value);
- break;
- case PROP_CLOSE_BUTTONS_ON_TABS:
- web_settings->close_buttons_on_tabs = g_value_get_boolean (value);
- break;
case PROP_OPEN_NEW_PAGES_IN:
web_settings->open_new_pages_in = g_value_get_enum (value);
break;
- case PROP_MIDDLE_CLICK_OPENS_SELECTION:
- web_settings->middle_click_opens_selection = g_value_get_boolean (value);
- break;
- case PROP_OPEN_TABS_IN_THE_BACKGROUND:
- web_settings->open_tabs_in_the_background = g_value_get_boolean (value);
- break;
- case PROP_OPEN_TABS_NEXT_TO_CURRENT:
- web_settings->open_tabs_next_to_current = g_value_get_boolean (value);
- break;
- case PROP_OPEN_POPUPS_IN_TABS:
- web_settings->open_popups_in_tabs = g_value_get_boolean (value);
- break;
- case PROP_AUTO_LOAD_IMAGES:
- g_object_set (web_settings, "WebKitWebSettings::auto-load-images",
- g_value_get_boolean (value), NULL);
- break;
- case PROP_ENABLE_SCRIPTS:
- g_object_set (web_settings, "WebKitWebSettings::enable-scripts",
- g_value_get_boolean (value), NULL);
- break;
case PROP_ENABLE_PLUGINS:
g_object_set (web_settings,
"WebKitWebSettings::enable-plugins", g_value_get_boolean (value),
@@ -1616,66 +939,16 @@ midori_web_settings_set_property (GObject* object,
#endif
NULL);
break;
- case PROP_ENABLE_DEVELOPER_EXTRAS:
- g_object_set (web_settings, "WebKitWebSettings::enable-developer-extras",
- g_value_get_boolean (value), NULL);
- break;
- case PROP_ENABLE_SPELL_CHECKING:
- g_object_set (web_settings, "WebKitWebSettings::enable-spell-checking",
- g_value_get_boolean (value), NULL);
- break;
- case PROP_ENABLE_HTML5_DATABASE:
- g_object_set (web_settings, "WebKitWebSettings::enable-html5-database",
- g_value_get_boolean (value), NULL);
- break;
- case PROP_ENABLE_HTML5_LOCAL_STORAGE:
- g_object_set (web_settings, "WebKitWebSettings::enable-html5-local-storage",
- g_value_get_boolean (value), NULL);
- break;
- case PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE:
- g_object_set (web_settings, "WebKitWebSettings::enable-offline-web-application-cache",
- g_value_get_boolean (value), NULL);
- break;
#if WEBKIT_CHECK_VERSION (1, 1, 18)
case PROP_ENABLE_PAGE_CACHE:
g_object_set (web_settings, "WebKitWebSettings::enable-page-cache",
g_value_get_boolean (value), NULL);
break;
#endif
- case PROP_ZOOM_TEXT_AND_IMAGES:
- web_settings->zoom_text_and_images = g_value_get_boolean (value);
- break;
- case PROP_FIND_WHILE_TYPING:
- web_settings->find_while_typing = g_value_get_boolean (value);
- break;
- case PROP_KINETIC_SCROLLING:
- web_settings->kinetic_scrolling = g_value_get_boolean (value);
- break;
- case PROP_MAXIMUM_COOKIE_AGE:
- web_settings->maximum_cookie_age = g_value_get_int (value);
- break;
- case PROP_FIRST_PARTY_COOKIES_ONLY:
- web_settings->first_party_cookies_only = g_value_get_boolean (value);
- break;
-
- case PROP_MAXIMUM_HISTORY_AGE:
- web_settings->maximum_history_age = g_value_get_int (value);
- break;
case PROP_PROXY_TYPE:
web_settings->proxy_type = g_value_get_enum (value);
break;
- case PROP_HTTP_PROXY:
- katze_assign (web_settings->http_proxy, g_value_dup_string (value));
- break;
- case PROP_HTTP_PROXY_PORT:
- web_settings->http_proxy_port = g_value_get_int (value);
- break;
- #if WEBKIT_CHECK_VERSION (1, 3, 11)
- case PROP_MAXIMUM_CACHE_SIZE:
- web_settings->maximum_cache_size = g_value_get_int (value);
- break;
- #endif
case PROP_IDENTIFY_AS:
web_settings->identify_as = g_value_get_enum (value);
if (web_settings->identify_as != MIDORI_IDENT_CUSTOM)
@@ -1695,12 +968,7 @@ midori_web_settings_set_property (GObject* object,
katze_assign (web_settings->http_accept_language, g_value_dup_string (value));
g_object_set (web_settings, "spell-checking-languages",
web_settings->http_accept_language, NULL);
- break;
- case PROP_CLEAR_PRIVATE_DATA:
- web_settings->clear_private_data = g_value_get_int (value);
- break;
- case PROP_CLEAR_DATA:
- katze_assign (web_settings->clear_data, g_value_dup_string (value));
+ midori_web_settings_update_accept_language (web_settings);
break;
case PROP_SITE_DATA_RULES:
katze_assign (web_settings->site_data_rules, g_value_dup_string (value));
@@ -1710,9 +978,6 @@ midori_web_settings_set_property (GObject* object,
web_settings->enable_dns_prefetching = g_value_get_boolean (value);
break;
#endif
- case PROP_STRIP_REFERER:
- web_settings->strip_referer = g_value_get_boolean (value);
- break;
case PROP_ENFORCE_FONT_FAMILY:
if ((web_settings->enforce_font_family = g_value_get_boolean (value)))
{
@@ -1732,13 +997,6 @@ midori_web_settings_set_property (GObject* object,
else
midori_web_settings_remove_style (web_settings, "enforce-font-family");
break;
- case PROP_FLASH_WINDOW_ON_BG_TABS:
- web_settings->flash_window_on_bg_tabs = g_value_get_boolean (value);
- break;
- case PROP_ENABLE_WEBGL:
- g_object_set (web_settings, "WebKitWebSettings::enable-webgl",
- g_value_get_boolean (value), NULL);
- break;
case PROP_ENABLE_FULLSCREEN:
g_object_set (web_settings, "WebKitWebSettings::enable-fullscreen",
g_value_get_boolean (value), NULL);
@@ -1764,9 +1022,6 @@ midori_web_settings_set_property (GObject* object,
midori_web_settings_process_stylesheets (web_settings, new_len - old_len);
}
break;
- case PROP_SEARCH_WIDTH:
- web_settings->search_width = g_value_get_int (value);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -1783,91 +1038,17 @@ midori_web_settings_get_property (GObject* object,
switch (prop_id)
{
- case PROP_REMEMBER_LAST_WINDOW_SIZE:
- g_value_set_boolean (value, web_settings->remember_last_window_size);
- break;
- case PROP_LAST_WINDOW_WIDTH:
- g_value_set_int (value, web_settings->last_window_width);
- break;
- case PROP_LAST_WINDOW_HEIGHT:
- g_value_set_int (value, web_settings->last_window_height);
- break;
- case PROP_LAST_WINDOW_STATE:
- g_value_set_enum (value, web_settings->last_window_state);
- break;
- case PROP_LAST_PANEL_POSITION:
- g_value_set_int (value, web_settings->last_panel_position);
- break;
- case PROP_LAST_PANEL_PAGE:
- g_value_set_int (value, web_settings->last_panel_page);
- break;
- case PROP_LAST_WEB_SEARCH:
- g_value_set_int (value, web_settings->last_web_search);
- break;
-
- case PROP_SHOW_MENUBAR:
- g_value_set_boolean (value, web_settings->show_menubar);
- break;
- case PROP_SHOW_NAVIGATIONBAR:
- g_value_set_boolean (value, web_settings->show_navigationbar);
- break;
- case PROP_SHOW_BOOKMARKBAR:
- g_value_set_boolean (value, web_settings->show_bookmarkbar);
- break;
- case PROP_SHOW_PANEL:
- g_value_set_boolean (value, web_settings->show_panel);
- break;
- case PROP_SHOW_STATUSBAR:
- g_value_set_boolean (value, web_settings->show_statusbar);
- break;
-
case PROP_TOOLBAR_STYLE:
g_value_set_enum (value, web_settings->toolbar_style);
break;
- case PROP_TOOLBAR_ITEMS:
- g_value_set_string (value, web_settings->toolbar_items);
- break;
- case PROP_COMPACT_SIDEPANEL:
- g_value_set_boolean (value, web_settings->compact_sidepanel);
- break;
- case PROP_RIGHT_ALIGN_SIDEPANEL:
- g_value_set_boolean (value, web_settings->right_align_sidepanel);
- break;
- case PROP_OPEN_PANELS_IN_WINDOWS:
- g_value_set_boolean (value, web_settings->open_panels_in_windows);
- break;
case PROP_LOAD_ON_STARTUP:
g_value_set_enum (value, web_settings->load_on_startup);
break;
- case PROP_HOMEPAGE:
- g_value_set_string (value, web_settings->homepage);
- break;
- case PROP_SHOW_CRASH_DIALOG:
- g_value_set_boolean (value, web_settings->show_crash_dialog);
- break;
- case PROP_DOWNLOAD_FOLDER:
- g_value_set_string (value, web_settings->download_folder);
- break;
- case PROP_TEXT_EDITOR:
- g_value_set_string (value, web_settings->text_editor);
- break;
- case PROP_NEWS_AGGREGATOR:
- g_value_set_string (value, web_settings->news_aggregator);
- break;
- case PROP_LOCATION_ENTRY_SEARCH:
- g_value_set_string (value, web_settings->location_entry_search);
- break;
case PROP_PREFERRED_ENCODING:
g_value_set_enum (value, web_settings->preferred_encoding);
break;
- case PROP_ALWAYS_SHOW_TABBAR:
- g_value_set_boolean (value, web_settings->always_show_tabbar);
- break;
- case PROP_CLOSE_BUTTONS_ON_TABS:
- g_value_set_boolean (value, web_settings->close_buttons_on_tabs);
- break;
case PROP_CLOSE_BUTTONS_LEFT:
#if HAVE_OSX
g_value_set_boolean (value, TRUE);
@@ -1881,7 +1062,7 @@ midori_web_settings_get_property (GObject* object,
GtkSettings* settings = gtk_settings_get_for_screen (screen);
gchar* theme = katze_object_get_string (settings, "gtk-theme-name");
gchar* theme_file = g_build_filename ("themes", theme, "index.theme", NULL);
- gchar* filename = sokoke_find_data_filename (theme_file, FALSE);
+ gchar* filename = midori_paths_get_data_filename (theme_file, FALSE);
g_free (theme_file);
web_settings->close_buttons_left = 1;
if (g_access (filename, F_OK) != 0)
@@ -1909,91 +1090,21 @@ midori_web_settings_get_property (GObject* object,
case PROP_OPEN_NEW_PAGES_IN:
g_value_set_enum (value, web_settings->open_new_pages_in);
break;
- case PROP_MIDDLE_CLICK_OPENS_SELECTION:
- g_value_set_boolean (value, web_settings->middle_click_opens_selection);
- break;
- case PROP_OPEN_TABS_IN_THE_BACKGROUND:
- g_value_set_boolean (value, web_settings->open_tabs_in_the_background);
- break;
- case PROP_OPEN_TABS_NEXT_TO_CURRENT:
- g_value_set_boolean (value, web_settings->open_tabs_next_to_current);
- break;
- case PROP_OPEN_POPUPS_IN_TABS:
- g_value_set_boolean (value, web_settings->open_popups_in_tabs);
- break;
- case PROP_AUTO_LOAD_IMAGES:
- g_value_set_boolean (value, katze_object_get_boolean (web_settings,
- "WebKitWebSettings::auto-load-images"));
- break;
- case PROP_ENABLE_SCRIPTS:
- g_value_set_boolean (value, katze_object_get_boolean (web_settings,
- "WebKitWebSettings::enable-scripts"));
- break;
case PROP_ENABLE_PLUGINS:
g_value_set_boolean (value, katze_object_get_boolean (web_settings,
"WebKitWebSettings::enable-plugins"));
break;
- case PROP_ENABLE_DEVELOPER_EXTRAS:
- g_value_set_boolean (value, katze_object_get_boolean (web_settings,
- "WebKitWebSettings::enable-developer-extras"));
- break;
- case PROP_ENABLE_SPELL_CHECKING:
- g_value_set_boolean (value, katze_object_get_boolean (web_settings,
- "WebKitWebSettings::enable-spell-checking"));
- break;
- case PROP_ENABLE_HTML5_DATABASE:
- g_value_set_boolean (value, katze_object_get_boolean (web_settings,
- "WebKitWebSettings::enable-html5-database"));
- break;
- case PROP_ENABLE_HTML5_LOCAL_STORAGE:
- g_value_set_boolean (value, katze_object_get_boolean (web_settings,
- "WebKitWebSettings::enable-html5-local-storage"));
- break;
- case PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE:
- g_value_set_boolean (value, katze_object_get_boolean (web_settings,
- "WebKitWebSettings::enable-offline-web-application-cache"));
- break;
#if WEBKIT_CHECK_VERSION (1, 1, 18)
case PROP_ENABLE_PAGE_CACHE:
g_value_set_boolean (value, katze_object_get_boolean (web_settings,
"WebKitWebSettings::enable-page-cache"));
break;
#endif
- case PROP_ZOOM_TEXT_AND_IMAGES:
- g_value_set_boolean (value, web_settings->zoom_text_and_images);
- break;
- case PROP_FIND_WHILE_TYPING:
- g_value_set_boolean (value, web_settings->find_while_typing);
- break;
- case PROP_KINETIC_SCROLLING:
- g_value_set_boolean (value, web_settings->kinetic_scrolling);
- break;
- case PROP_MAXIMUM_COOKIE_AGE:
- g_value_set_int (value, web_settings->maximum_cookie_age);
- break;
- case PROP_FIRST_PARTY_COOKIES_ONLY:
- g_value_set_boolean (value, web_settings->first_party_cookies_only);
- break;
-
- case PROP_MAXIMUM_HISTORY_AGE:
- g_value_set_int (value, web_settings->maximum_history_age);
- break;
case PROP_PROXY_TYPE:
g_value_set_enum (value, web_settings->proxy_type);
break;
- case PROP_HTTP_PROXY:
- g_value_set_string (value, web_settings->http_proxy);
- break;
- case PROP_HTTP_PROXY_PORT:
- g_value_set_int (value, web_settings->http_proxy_port);
- break;
- #if WEBKIT_CHECK_VERSION (1, 3, 11)
- case PROP_MAXIMUM_CACHE_SIZE:
- g_value_set_int (value, web_settings->maximum_cache_size);
- break;
- #endif
case PROP_IDENTIFY_AS:
g_value_set_enum (value, web_settings->identify_as);
break;
@@ -2008,12 +1119,6 @@ midori_web_settings_get_property (GObject* object,
case PROP_PREFERRED_LANGUAGES:
g_value_set_string (value, web_settings->http_accept_language);
break;
- case PROP_CLEAR_PRIVATE_DATA:
- g_value_set_int (value, web_settings->clear_private_data);
- break;
- case PROP_CLEAR_DATA:
- g_value_set_string (value, web_settings->clear_data);
- break;
case PROP_SITE_DATA_RULES:
g_value_set_string (value, web_settings->site_data_rules);
break;
@@ -2022,19 +1127,9 @@ midori_web_settings_get_property (GObject* object,
g_value_set_boolean (value, web_settings->enable_dns_prefetching);
break;
#endif
- case PROP_STRIP_REFERER:
- g_value_set_boolean (value, web_settings->strip_referer);
- break;
case PROP_ENFORCE_FONT_FAMILY:
g_value_set_boolean (value, web_settings->enforce_font_family);
break;
- case PROP_FLASH_WINDOW_ON_BG_TABS:
- g_value_set_boolean (value, web_settings->flash_window_on_bg_tabs);
- break;
- case PROP_ENABLE_WEBGL:
- g_value_set_boolean (value, katze_object_get_boolean (web_settings,
- "WebKitWebSettings::enable-webgl"));
- break;
case PROP_ENABLE_FULLSCREEN:
g_value_set_boolean (value, katze_object_get_boolean (web_settings,
"WebKitWebSettings::enable-fullscreen"));
@@ -2043,9 +1138,6 @@ midori_web_settings_get_property (GObject* object,
g_value_take_string (value, katze_object_get_string (web_settings,
"WebKitWebSettings::user-stylesheet-uri"));
break;
- case PROP_SEARCH_WIDTH:
- g_value_set_int (value, web_settings->search_width);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h
index 08dc876e..9907895d 100644
--- a/midori/midori-websettings.h
+++ b/midori/midori-websettings.h
@@ -34,8 +34,6 @@ G_BEGIN_DECLS
typedef struct _MidoriWebSettings MidoriWebSettings;
typedef struct _MidoriWebSettingsClass MidoriWebSettingsClass;
-#define MIDORI_PARAM_DELAY_SAVING (1 << 8)
-
enum
{
MIDORI_CLEAR_NONE = 0,
@@ -49,20 +47,6 @@ enum
MIDORI_CLEAR_SESSION = 128,
};
-typedef enum
-{
- MIDORI_WINDOW_NORMAL,
- MIDORI_WINDOW_MINIMIZED,
- MIDORI_WINDOW_MAXIMIZED,
- MIDORI_WINDOW_FULLSCREEN,
-} MidoriWindowState;
-
-GType
-midori_window_state_get_type (void) G_GNUC_CONST;
-
-#define MIDORI_TYPE_WINDOW_STATE \
- (midori_window_state_get_type ())
-
/* values >= MIDORI_STARTUP_LAST_OPEN_PAGES mean session is saved */
typedef enum
{
@@ -142,6 +126,7 @@ typedef enum
{
MIDORI_IDENT_MIDORI /* Automatic */,
MIDORI_IDENT_GENUINE /* Midori */,
+ MIDORI_IDENT_CHROME,
MIDORI_IDENT_SAFARI,
MIDORI_IDENT_IPHONE,
MIDORI_IDENT_FIREFOX,
@@ -189,6 +174,9 @@ MidoriSiteDataPolicy
midori_web_settings_get_site_data_policy (MidoriWebSettings* settings,
const gchar* uri);
+const gchar*
+midori_web_settings_get_accept_language (MidoriWebSettings* settings);
+
G_END_DECLS
#endif /* __MIDORI_WEB_SETTINGS_H__ */
diff --git a/midori/midori.h b/midori/midori.h
index a272938f..2dace3d6 100644
--- a/midori/midori.h
+++ b/midori/midori.h
@@ -22,7 +22,6 @@
#include "midori-preferences.h"
#include "midori-searchaction.h"
#include "midori-view.h"
-#include "midori-viewable.h"
#include "midori-websettings.h"
#include "midori-platform.h"
#include /* Vala API */
diff --git a/midori/midori.vapi b/midori/midori.vapi
index 61c5990d..1042d0a8 100644
--- a/midori/midori.vapi
+++ b/midori/midori.vapi
@@ -14,19 +14,19 @@ namespace Midori {
[NoAccessorMethod]
public string name { get; set; }
[NoAccessorMethod]
- public Midori.WebSettings settings { get; set; }
+ public Midori.WebSettings settings { owned get; set; }
[NoAccessorMethod]
- public GLib.Object bookmarks { get; set; }
+ public Katze.Array bookmarks { get; set; }
[NoAccessorMethod]
- public GLib.Object trash { get; set; }
+ public Katze.Array trash { get; set; }
[NoAccessorMethod]
- public GLib.Object search_engines { get; set; }
+ public Katze.Array search_engines { get; set; }
[NoAccessorMethod]
- public GLib.Object history { get; set; }
+ public Katze.Array history { get; set; }
[NoAccessorMethod]
- public GLib.Object extensions { get; set; }
+ public Katze.Array extensions { get; set; }
[NoAccessorMethod]
- public GLib.Object browsers { get; }
+ public Katze.Array browsers { get; }
public Browser? browser { get; }
[HasEmitter]
@@ -35,18 +35,20 @@ namespace Midori {
[HasEmitter]
public signal void quit ();
}
+
+ [CCode (cheader_filename = "midori/midori.h")]
public class Browser : Gtk.Window {
public Browser ();
- public int add_item (GLib.Object item);
+ public int add_item (Katze.Item item);
public int add_uri (string uri);
public unowned View get_nth_tab (int n);
public GLib.List get_tabs ();
public void block_action (Gtk.Action action);
public void unblock_action (Gtk.Action action);
public unowned Gtk.ActionGroup get_action_group ();
- public unowned Browser get_for_widget (Gtk.Widget widget);
+ public static unowned Browser get_for_widget (Gtk.Widget widget);
public unowned string[] get_toolbar_actions ();
- public unowned GLib.Object get_proxy_items ();
+ public unowned Katze.Array get_proxy_items ();
[NoAccessorMethod]
public Gtk.MenuBar menubar { owned get; }
@@ -67,13 +69,13 @@ namespace Midori {
public string statusbar_text { owned get; set; }
public Midori.WebSettings settings { get; set; }
[NoAccessorMethod]
- public GLib.Object bookmarks { owned get; set; }
+ public Katze.Array? bookmarks { owned get; set; }
[NoAccessorMethod]
- public GLib.Object trash { owned get; set; }
+ public Katze.Array? trash { owned get; set; }
[NoAccessorMethod]
- public GLib.Object search_engines { owned get; set; }
+ public Katze.Array? search_engines { owned get; set; }
[NoAccessorMethod]
- public GLib.Object history { owned get; set; }
+ public Katze.Array? history { owned get; set; }
[NoAccessorMethod]
public bool show_tabs { get; set; }
@@ -82,9 +84,10 @@ namespace Midori {
public signal void add_tab (View tab);
[HasEmitter]
public signal void remove_tab (View tab);
+ public signal void switch_tab (View? old_view, View? new_view);
[HasEmitter]
public signal void activate_action (string name);
- public signal void add_download (GLib.Object download);
+ public signal void add_download (WebKit.Download download);
public signal void populate_tool_menu (Gtk.Menu menu);
[HasEmitter]
public signal void quit ();
@@ -125,6 +128,7 @@ namespace Midori {
public signal void open_preferences ();
}
+ [CCode (cheader_filename = "midori/midori.h")]
public class View : Gtk.VBox {
[CCode (type = "GtkWidget*")]
public View (GLib.Object net);
@@ -142,9 +146,8 @@ namespace Midori {
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 Katze.Item 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);
@@ -152,6 +155,7 @@ namespace Midori {
public Gdk.Pixbuf get_snapshot (int width, int height);
public unowned WebKit.WebView get_web_view ();
public void populate_popup (Gtk.Menu menu, bool manual);
+ public void reload (bool from_cache);
public string uri { get; }
public string title { get; }
@@ -162,7 +166,7 @@ namespace Midori {
public double progress { get; set; }
public bool minimized { get; }
public float zoom_level { get; }
- public GLib.Object news_feeds { get; }
+ public Katze.Array news_feeds { get; }
public string statusbar_text { get; }
public WebSettings settings { get; set; }
public GLib.Object net { get; }
@@ -172,8 +176,32 @@ namespace Midori {
}
+ [CCode (cheader_filename = "midori/midori.h")]
+ public class SearchAction : Gtk.Action {
+ public static Katze.Item? get_engine_for_form (WebKit.WebView web_view, Pango.EllipsizeMode ellipsize);
+ }
+
+ [CCode (cheader_filename = "midori/midori-view.h", cprefix = "MIDORI_DOWNLOAD_")]
+ public enum DownloadType {
+ CANCEL,
+ OPEN,
+ SAVE,
+ SAVE_AS,
+ OPEN_IN_VIEWER
+ }
+
public class WebSettings : WebKit.WebSettings {
public WebSettings ();
+ [NoAccessorMethod]
+ public MidoriStartup load_on_startup { get; set; }
+ }
+
+ [CCode (cheader_filename = "midori/midori-websettings.h", cprefix = "MIDORI_STARTUP_")]
+ public enum MidoriStartup {
+ BLANK_PAGE,
+ HOMEPAGE,
+ LAST_OPEN_PAGES,
+ DELAYED_PAGES
}
[CCode (cheader_filename = "midori/sokoke.h", lower_case_cprefix = "sokoke_")]
diff --git a/midori/sokoke.c b/midori/sokoke.c
index e4a0a444..a303bfbf 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -15,6 +15,7 @@
#include "midori-core.h"
#include "midori-platform.h"
+#include "midori-app.h"
#include
#if HAVE_UNISTD_H
@@ -63,15 +64,18 @@ sokoke_js_script_eval (JSContextRef js_context,
const gchar* script,
gchar** exception)
{
+ JSGlobalContextRef temporary_context = NULL;
gchar* value;
JSStringRef js_value_string;
JSStringRef js_script;
JSValueRef js_exception = NULL;
JSValueRef js_value;
- g_return_val_if_fail (js_context, FALSE);
g_return_val_if_fail (script, FALSE);
+ if (!js_context)
+ js_context = temporary_context = JSGlobalContextCreateInGroup (NULL, NULL);
+
js_script = JSStringCreateWithUTF8CString (script);
js_value = JSEvaluateScript (js_context, js_script,
JSContextGetGlobalObject (js_context), NULL, 0, &js_exception);
@@ -81,6 +85,8 @@ sokoke_js_script_eval (JSContextRef js_context,
{
JSStringRef js_message = JSValueToStringCopy (js_context,
js_exception, NULL);
+ g_return_val_if_fail (js_message != NULL, NULL);
+
value = sokoke_js_string_utf8 (js_message);
if (exception)
*exception = value;
@@ -90,12 +96,16 @@ sokoke_js_script_eval (JSContextRef js_context,
g_free (value);
}
JSStringRelease (js_message);
+ if (temporary_context)
+ JSGlobalContextRelease (temporary_context);
return NULL;
}
js_value_string = JSValueToStringCopy (js_context, js_value, NULL);
value = sokoke_js_string_utf8 (js_value_string);
JSStringRelease (js_value_string);
+ if (temporary_context)
+ JSGlobalContextRelease (temporary_context);
return value;
}
@@ -196,7 +206,6 @@ sokoke_show_uri_with_mime_type (GdkScreen* screen,
!g_str_has_prefix (uri, "file://"));
g_free (content_type);
files = g_list_prepend (NULL, file);
- #if GTK_CHECK_VERSION (2, 14, 0)
#if GTK_CHECK_VERSION (3, 0, 0)
context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
#else
@@ -204,9 +213,6 @@ sokoke_show_uri_with_mime_type (GdkScreen* screen,
#endif
gdk_app_launch_context_set_screen (context, screen);
gdk_app_launch_context_set_timestamp (context, timestamp);
- #else
- context = g_app_launch_context_new ();
- #endif
success = g_app_info_launch (app_info, files, context, error);
@@ -227,7 +233,7 @@ sokoke_open_with_response_cb (GtkWidget* dialog,
{
const gchar* command = gtk_entry_get_text (entry);
const gchar* uri = g_object_get_data (G_OBJECT (dialog), "uri");
- sokoke_spawn_program (command, uri);
+ sokoke_spawn_program (command, FALSE, uri, TRUE);
}
gtk_widget_destroy (dialog);
}
@@ -313,13 +319,8 @@ sokoke_show_uri (GdkScreen* screen,
sokoke_recursive_fork_protection (uri, TRUE);
- #if GTK_CHECK_VERSION (2, 14, 0)
if (gtk_show_uri (screen, uri, timestamp, error))
return TRUE;
- #else
- if (g_app_info_launch_default_for_uri (uri, NULL, NULL))
- return TRUE;
- #endif
#if !GLIB_CHECK_VERSION (2, 28, 0)
info = sokoke_default_for_uri (uri, &scheme);
@@ -378,117 +379,122 @@ sokoke_show_uri (GdkScreen* screen,
#endif
}
+/**
+ * sokoke_prepare_command:
+ * @command: the command, properly quoted
+ * @argument: any arguments, properly quoted
+ * @quote_command: if %TRUE, @command will be quoted
+ * @quote_argument: if %TRUE, @argument will be quoted, ie. a URI or filename
+ *
+ * If @command contains %s, @argument will be quoted and inserted into
+ * @command, which is left unquoted regardless of @quote_command.
+ *
+ * Return value: the command prepared for spawning
+ **/
+gchar*
+sokoke_prepare_command (const gchar* command,
+ gboolean quote_command,
+ const gchar* argument,
+ gboolean quote_argument)
+{
+ g_return_val_if_fail (command != NULL, FALSE);
+ g_return_val_if_fail (argument != NULL, FALSE);
+
+ if (midori_debug ("paths"))
+ g_print ("Preparing command: %s %d %s %d\n",
+ command, quote_command, argument, quote_argument);
+
+ {
+ gchar* uri_format;
+ gchar* real_command;
+ gchar* command_ready;
+
+ /* .desktop files accept %u, %U, %f, %F as URI/ filename, we treat it like %s */
+ real_command = g_strdup (command);
+ if ((uri_format = strstr (real_command, "%u"))
+ || (uri_format = strstr (real_command, "%U"))
+ || (uri_format = strstr (real_command, "%f"))
+ || (uri_format = strstr (real_command, "%F")))
+ uri_format[1] = 's';
+
+
+ if (strstr (real_command, "%s"))
+ {
+ gchar* argument_quoted = quote_argument ? g_shell_quote (argument) : g_strdup (argument);
+ command_ready = g_strdup_printf (real_command, argument_quoted);
+ g_free (argument_quoted);
+ }
+ else if (quote_argument)
+ {
+ gchar* quoted_command = quote_command ? g_shell_quote (real_command) : g_strdup (real_command);
+ gchar* argument_quoted = g_shell_quote (argument);
+ command_ready = g_strconcat (quoted_command, " ", argument_quoted, NULL);
+ g_free (argument_quoted);
+ g_free (quoted_command);
+ }
+ else
+ {
+ gchar* quoted_command = quote_command ? g_shell_quote (real_command) : g_strdup (real_command);
+ command_ready = g_strconcat (quoted_command, " ", argument, NULL);
+ g_free (quoted_command);
+ }
+ g_free (real_command);
+ return command_ready;
+ }
+}
+
+/**
+ * sokoke_spawn_program:
+ * @command: the command, properly quoted
+ * @argument: any arguments, properly quoted
+ * @quote_command: if %TRUE, @command will be quoted
+ * @quote_argument: if %TRUE, @argument will be quoted, ie. a URI or filename
+ *
+ * If @command contains %s, @argument will be quoted and inserted into
+ * @command, which is left unquoted regardless of @quote_command.
+ *
+ * Return value: %TRUE on success, %FALSE if an error occurred
+ **/
gboolean
sokoke_spawn_program (const gchar* command,
- const gchar* argument)
+ gboolean quote_command,
+ const gchar* argument,
+ gboolean quote_argument)
{
GError* error;
+ gchar* command_ready;
+ gchar** argv;
g_return_val_if_fail (command != NULL, FALSE);
g_return_val_if_fail (argument != NULL, FALSE);
- if (!g_strstr_len (argument, 8, "://")
- && !g_str_has_prefix (argument, "about:"))
+ command_ready = sokoke_prepare_command (command, quote_command, argument, quote_argument);
+ g_print ("Launching command: %s\n", command_ready);
+
+ error = NULL;
+ if (!g_shell_parse_argv (command_ready, NULL, &argv, &error))
{
- gboolean success;
-
- #if HAVE_HILDON
- osso_context_t* osso;
- DBusConnection* dbus;
-
- osso = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL);
- if (!osso)
- {
- sokoke_message_dialog (GTK_MESSAGE_ERROR,
- _("Could not run external program."),
- "Failed to initialize libosso", FALSE);
- return FALSE;
- }
-
- dbus = (DBusConnection *) osso_get_dbus_connection (osso);
- if (!dbus)
- {
- osso_deinitialize (osso);
- sokoke_message_dialog (GTK_MESSAGE_ERROR,
- _("Could not run external program."),
- "Failed to get dbus connection from osso context", FALSE);
- return FALSE;
- }
-
- error = NULL;
- /* FIXME: This is not correct, find a proper way to do this */
- success = (osso_application_top (osso, command, argument) == OSSO_OK);
- osso_deinitialize (osso);
- #else
- GAppInfo* info;
- GFile* file;
- GList* files;
-
- info = g_app_info_create_from_commandline (command,
- NULL, G_APP_INFO_CREATE_NONE, NULL);
- file = g_file_new_for_commandline_arg (argument);
- files = g_list_append (NULL, file);
-
- error = NULL;
- success = g_app_info_launch (info, files, NULL, &error);
- g_object_unref (file);
- g_list_free (files);
- #endif
-
- if (!success)
- {
- sokoke_message_dialog (GTK_MESSAGE_ERROR,
- _("Could not run external program."),
- error ? error->message : "", FALSE);
- if (error)
- g_error_free (error);
- return FALSE;
- }
- }
- else
- {
- /* FIXME: Implement Hildon specific version */
- gchar* uri_format;
- gchar* argument_quoted;
- gchar* command_ready;
- gchar** argv;
-
- if ((uri_format = strstr (command, "%u")))
- uri_format[1] = 's';
-
- argument_quoted = g_shell_quote (argument);
- if (strstr (command, "%s"))
- command_ready = g_strdup_printf (command, argument_quoted);
- else
- command_ready = g_strconcat (command, " ", argument_quoted, NULL);
- g_free (argument_quoted);
-
- error = NULL;
- if (!g_shell_parse_argv (command_ready, NULL, &argv, &error))
- {
- sokoke_message_dialog (GTK_MESSAGE_ERROR,
- _("Could not run external program."),
- error->message, FALSE);
- g_error_free (error);
- g_free (command_ready);
- return FALSE;
- }
+ sokoke_message_dialog (GTK_MESSAGE_ERROR,
+ _("Could not run external program."),
+ error->message, FALSE);
+ g_error_free (error);
g_free (command_ready);
+ return FALSE;
+ }
+ g_free (command_ready);
- error = NULL;
- if (!g_spawn_async (NULL, argv, NULL,
- (GSpawnFlags)G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
- NULL, NULL, NULL, &error))
- {
- sokoke_message_dialog (GTK_MESSAGE_ERROR,
- _("Could not run external program."),
- error->message, FALSE);
- g_error_free (error);
- }
-
- g_strfreev (argv);
+ error = NULL;
+ if (!g_spawn_async (NULL, argv, NULL,
+ (GSpawnFlags)G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+ NULL, NULL, NULL, &error))
+ {
+ sokoke_message_dialog (GTK_MESSAGE_ERROR,
+ _("Could not run external program."),
+ error->message, FALSE);
+ g_error_free (error);
}
+ g_strfreev (argv);
return TRUE;
}
@@ -496,24 +502,20 @@ void
sokoke_spawn_app (const gchar* uri,
gboolean private)
{
- const gchar* executable = sokoke_get_argv (NULL)[0];
- /* "midori"
- "/usr/bin/midori"
- "c:/Program Files/Midori/bin/midori.exe" */
- gchar* quoted = g_shell_quote (executable);
- gchar* command;
+ const gchar* executable = midori_paths_get_command_line (NULL)[0];
+ gchar* uri_quoted = g_shell_quote (uri);
+ gchar* argument;
if (private)
{
- gchar* quoted_config = g_shell_quote (sokoke_set_config_dir (NULL));
- command = g_strconcat (quoted, " -c ", quoted_config,
- " -p", NULL);
- g_free (quoted_config);
+ gchar* config_quoted = g_shell_quote (midori_paths_get_config_dir ());
+ argument = g_strconcat ("-c ", config_quoted,
+ " -p ", uri_quoted, NULL);
}
else
- command = g_strconcat (quoted, " -a", NULL);
- g_free (quoted);
- sokoke_spawn_program (command, uri);
- g_free (command);
+ argument = g_strconcat ("-a ", uri_quoted, NULL);
+ g_free (uri_quoted);
+ sokoke_spawn_program (executable, TRUE, argument, FALSE);
+ g_free (argument);
}
static void
@@ -686,26 +688,29 @@ sokoke_get_desktop (void)
}
else
{
- /* Are we running in Xfce <= 4.6? */
- GdkDisplay* display = gdk_display_get_default ();
- Display* xdisplay = GDK_DISPLAY_XDISPLAY (display);
- Window root_window = RootWindow (xdisplay, 0);
- Atom save_mode_atom = gdk_x11_get_xatom_by_name_for_display (
- display, "_DT_SAVE_MODE");
- Atom actual_type;
- int actual_format;
- unsigned long n_items, bytes;
- gchar* value;
- int status = XGetWindowProperty (xdisplay, root_window,
- save_mode_atom, 0, (~0L),
- False, AnyPropertyType, &actual_type, &actual_format,
- &n_items, &bytes, (unsigned char**)&value);
- if (status == Success)
- {
- if (n_items == 6 && !strncmp (value, "xfce4", 6))
- desktop = SOKOKE_DESKTOP_XFCE;
- XFree (value);
- }
+ /* Are we running in Xfce <= 4.6? */
+ GdkDisplay* display = gdk_display_get_default ();
+ if (GDK_IS_X11_DISPLAY (display))
+ {
+ Display* xdisplay = GDK_DISPLAY_XDISPLAY (display);
+ Window root_window = RootWindow (xdisplay, 0);
+ Atom save_mode_atom = gdk_x11_get_xatom_by_name_for_display (
+ display, "_DT_SAVE_MODE");
+ Atom actual_type;
+ int actual_format;
+ unsigned long n_items, bytes;
+ gchar* value;
+ int status = XGetWindowProperty (xdisplay, root_window,
+ save_mode_atom, 0, (~0L),
+ False, AnyPropertyType, &actual_type, &actual_format,
+ &n_items, &bytes, (unsigned char**)&value);
+ if (status == Success)
+ {
+ if (n_items == 6 && !strncmp (value, "xfce4", 6))
+ desktop = SOKOKE_DESKTOP_XFCE;
+ XFree (value);
+ }
+ }
}
}
@@ -786,72 +791,6 @@ sokoke_xfce_header_new (const gchar* icon,
return NULL;
}
-gchar*
-sokoke_key_file_get_string_default (GKeyFile* key_file,
- const gchar* group,
- const gchar* key,
- const gchar* default_value,
- GError** error)
-{
- gchar* value = g_key_file_get_string (key_file, group, key, error);
- return value == NULL ? g_strdup (default_value) : value;
-}
-
-gint
-sokoke_key_file_get_integer_default (GKeyFile* key_file,
- const gchar* group,
- const gchar* key,
- const gint default_value,
- GError** error)
-{
- if (!g_key_file_has_key (key_file, group, key, NULL))
- return default_value;
- return g_key_file_get_integer (key_file, group, key, error);
-}
-
-gdouble
-sokoke_key_file_get_double_default (GKeyFile* key_file,
- const gchar* group,
- const gchar* key,
- const gdouble default_value,
- GError** error)
-{
- if (!g_key_file_has_key (key_file, group, key, NULL))
- return default_value;
- return g_key_file_get_double (key_file, group, key, error);
-}
-
-gboolean
-sokoke_key_file_get_boolean_default (GKeyFile* key_file,
- const gchar* group,
- const gchar* key,
- const gboolean default_value,
- GError** error)
-{
- if (!g_key_file_has_key (key_file, group, key, NULL))
- return default_value;
- return g_key_file_get_boolean (key_file, group, key, error);
-}
-
-gchar**
-sokoke_key_file_get_string_list_default (GKeyFile* key_file,
- const gchar* group,
- const gchar* key,
- gsize* length,
- gchar** default_value,
- gsize* default_length,
- GError* error)
-{
- gchar** value = g_key_file_get_string_list (key_file, group, key, length, NULL);
- if (!value)
- {
- value = g_strdupv (default_value);
- if (length)
- *length = *default_length;
- }
- return value;
-}
-
gboolean
sokoke_key_file_save_to_file (GKeyFile* key_file,
const gchar* filename,
@@ -978,42 +917,6 @@ sokoke_time_t_to_julian (const time_t* timestamp)
return julian;
}
-/**
- * sokoke_set_config_dir:
- * @new_config_dir: an absolute path, or %NULL
- *
- * Retrieves and/ or sets the base configuration folder.
- *
- * "/" means no configuration is saved.
- *
- * Return value: the configuration folder, or %NULL
- **/
-const gchar*
-sokoke_set_config_dir (const gchar* new_config_dir)
-{
- static gchar* config_dir = NULL;
-
- if (config_dir)
- return config_dir;
-
- if (!new_config_dir)
- config_dir = g_build_filename (g_get_user_config_dir (),
- PACKAGE_NAME, NULL);
- else
- {
- g_return_val_if_fail (g_path_is_absolute (new_config_dir), NULL);
- katze_assign (config_dir, g_strdup (new_config_dir));
- }
-
- return config_dir;
-}
-
-gboolean
-sokoke_is_app_or_private (void)
-{
- return !strcmp ("/", sokoke_set_config_dir (NULL));
-}
-
/**
* sokoke_remove_path:
* @path: an absolute path
@@ -1053,150 +956,6 @@ sokoke_remove_path (const gchar* path,
return TRUE;
}
-/**
- * sokoke_find_config_filename:
- * @folder: a subfolder
- * @filename: a filename or relative path
- *
- * Looks for the specified filename in the system config
- * directories, depending on the platform.
- *
- * Return value: a full path
- **/
-gchar*
-sokoke_find_config_filename (const gchar* folder,
- const gchar* filename)
-{
- const gchar* const* config_dirs = g_get_system_config_dirs ();
- guint i = 0;
- const gchar* config_dir;
- gchar* path;
-
- if (!folder)
- folder = "";
-
- while ((config_dir = config_dirs[i++]))
- {
- path = g_build_filename (config_dir, PACKAGE_NAME, folder, filename, NULL);
- if (g_access (path, F_OK) == 0)
- return path;
- g_free (path);
- }
-
- #ifdef G_OS_WIN32
- config_dir = g_win32_get_package_installation_directory_of_module (NULL);
- path = g_build_filename (config_dir, "etc", "xdg", PACKAGE_NAME, folder, filename, NULL);
- if (g_access (path, F_OK) == 0)
- return path;
- g_free (path);
- #endif
-
- return g_build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, folder, filename, NULL);
-}
-
-/**
- * sokoke_find_lib_path:
- * @folder: the lib subfolder
- *
- * Looks for the specified folder in the lib directories.
- *
- * Return value: a newly allocated full path, or %NULL
- **/
-gchar* sokoke_find_lib_path (const gchar* folder)
-{
- #ifdef G_OS_WIN32
- gchar* path = g_win32_get_package_installation_directory_of_module (NULL);
- gchar* lib_path = g_build_filename (path, "lib", folder ? folder : "", NULL);
- g_free (path);
- if (g_access (lib_path, F_OK) == 0)
- return lib_path;
- #else
- const gchar* lib_dirs[] =
- {
- LIBDIR,
- "/usr/local/lib",
- "/usr/lib",
- NULL
- };
- guint i;
-
- for (i = 0; i < G_N_ELEMENTS (lib_dirs); i++)
- {
- gchar* lib_path = g_build_filename (lib_dirs[i], folder ? folder : "", NULL);
- if (g_access (lib_path, F_OK) == 0)
- return lib_path;
- else
- g_free (lib_path);
- }
- #endif
-
- return NULL;
-}
-
-/**
- * sokoke_find_data_filename:
- * @filename: a filename or relative path
- *
- * Looks for the specified filename in the system data
- * directories, depending on the platform.
- *
- * Return value: a newly allocated full path
- **/
-gchar*
-sokoke_find_data_filename (const gchar* filename,
- gboolean res)
-{
- const gchar* res1 = res ? PACKAGE_NAME : "";
- const gchar* res2 = res ? "res" : "";
- const gchar* const* data_dirs = g_get_system_data_dirs ();
- guint i = 0;
- const gchar* data_dir;
- gchar* path;
-
- #ifdef G_OS_WIN32
- gchar* install_path = g_win32_get_package_installation_directory_of_module (NULL);
- path = g_build_filename (install_path, "share", res1, res2, filename, NULL);
- g_free (install_path);
- if (g_access (path, F_OK) == 0)
- return path;
-
- g_free (path);
- #endif
-
- path = g_build_filename (g_get_user_data_dir (), res1, res2, filename, NULL);
- if (g_access (path, F_OK) == 0)
- return path;
- g_free (path);
-
- while ((data_dir = data_dirs[i++]))
- {
- path = g_build_filename (data_dir, res1, res2, filename, NULL);
- if (g_access (path, F_OK) == 0)
- return path;
- g_free (path);
- }
- return g_build_filename (MDATADIR, res1, res2, filename, NULL);
-}
-
-/**
- * sokoke_get_argv:
- * @argument_vector: %NULL
- *
- * Retrieves the argument vector passed at program startup.
- *
- * Return value: the argument vector
- **/
-gchar**
-sokoke_get_argv (gchar** argument_vector)
-{
- static gchar** stored_argv = NULL;
-
- if (!stored_argv)
- stored_argv = g_strdupv (argument_vector);
-
- return stored_argv;
-}
-
gchar*
sokoke_replace_variables (const gchar* template,
const gchar* variable_first, ...)
@@ -1419,92 +1178,6 @@ sokoke_recursive_fork_protection (const gchar* uri,
return g_strcmp0 (fork_uri, uri) == 0 ? FALSE : TRUE;
}
-/* Provide a new way for SoupSession to assume an 'Accept-Language'
- string automatically from the return value of g_get_language_names(),
- properly formatted according to RFC2616.
- Copyright (C) 2009 Mario Sanchez Prada
- Copyright (C) 2009 Dan Winship
- Mostly copied from libSoup 2.29, coding style adjusted */
-
-/* Converts a language in POSIX format and to be RFC2616 compliant */
-/* Based on code from epiphany-webkit (ephy_langs_append_languages()) */
-static gchar *
-sokoke_posix_lang_to_rfc2616 (const gchar *language)
-{
- if (!strchr (language, '.') && !strchr (language, '@') && language[0] != 'C')
- /* change to lowercase and '_' to '-' */
- return g_strdelimit (g_ascii_strdown (language, -1), "_", '-');
-
- return NULL;
-}
-
-/* Adds a quality value to a string (any value between 0 and 1). */
-static gchar *
-sokoke_add_quality_value (const gchar *str,
- float qvalue)
-{
- if ((qvalue >= 0.0) && (qvalue <= 1.0))
- {
- int qv_int = (qvalue * 1000 + 0.5);
- return g_strdup_printf ("%s;q=%d.%d",
- str, (int) (qv_int / 1000), qv_int % 1000);
- }
-
- return g_strdup (str);
-}
-
-/* Returns a RFC2616 compliant languages list from system locales */
-gchar *
-sokoke_accept_languages (const gchar* const * lang_names)
-{
- GArray *langs_garray = NULL;
- char *cur_lang = NULL;
- char *prev_lang = NULL;
- char **langs_array;
- char *langs_str;
- float delta;
- int i, n_lang_names;
-
- /* Calculate delta for setting the quality values */
- n_lang_names = g_strv_length ((gchar **)lang_names);
- delta = 0.999 / (n_lang_names - 1);
-
- /* Build the array of languages */
- langs_garray = g_array_new (TRUE, FALSE, sizeof (char*));
- for (i = 0; lang_names[i] != NULL; i++)
- {
- cur_lang = sokoke_posix_lang_to_rfc2616 (lang_names[i]);
-
- /* Apart from getting a valid RFC2616 compliant
- language, also get rid of extra variants */
- if (cur_lang && (!prev_lang ||
- (!strcmp (prev_lang, cur_lang) || !strstr (prev_lang, cur_lang))))
- {
-
- gchar *qv_lang = NULL;
-
- /* Save reference for further comparison */
- prev_lang = cur_lang;
-
- /* Add the quality value and append it */
- qv_lang = sokoke_add_quality_value (cur_lang, 1 - i * delta);
- g_array_append_val (langs_garray, qv_lang);
- }
- }
-
- /* Fallback: add "en" if list is empty */
- if (langs_garray->len == 0)
- {
- gchar* fallback = g_strdup ("en");
- g_array_append_val (langs_garray, fallback);
- }
-
- langs_array = (char **) g_array_free (langs_garray, FALSE);
- langs_str = g_strjoinv (", ", langs_array);
-
- return langs_str;
-}
-
/**
* sokoke_register_privacy_item:
* @name: the name of the privacy item
@@ -1539,114 +1212,43 @@ sokoke_register_privacy_item (const gchar* name,
return NULL;
}
+static void
+sokoke_widget_clipboard_owner_clear_func (GtkClipboard* clipboard,
+ gpointer user_data)
+{
+ g_object_unref (user_data);
+}
+
void
-sokoke_widget_copy_clipboard (GtkWidget* widget,
- const gchar* text)
+sokoke_widget_copy_clipboard (GtkWidget* widget,
+ const gchar* text,
+ GtkClipboardGetFunc get_cb,
+ gpointer owner)
{
GdkDisplay* display = gtk_widget_get_display (widget);
GtkClipboard* clipboard;
- clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
- gtk_clipboard_set_text (clipboard, text ? text : "", -1);
+ g_return_if_fail (text != NULL);
+
clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_PRIMARY);
- gtk_clipboard_set_text (clipboard, text ? text : "", -1);
-}
+ gtk_clipboard_set_text (clipboard, text, -1);
-gchar*
-sokoke_build_thumbnail_path (const gchar* name)
-{
- gchar* path = NULL;
- if (name != NULL)
- {
- gchar* checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, name, -1);
- gchar* filename = g_strdup_printf ("%s.png", checksum);
-
- path = g_build_filename (g_get_user_cache_dir (), "midori", "thumbnails",
- filename, NULL);
-
- g_free (filename);
- g_free (checksum);
- }
- return path;
-}
-
-gchar*
-midori_download_prepare_tooltip_text (WebKitDownload* download)
-{
- gdouble* last_time;
- guint64* last_size;
- gint hour = 3600, min = 60;
- gint hours_left, minutes_left, seconds_left;
- guint64 total_size = webkit_download_get_total_size (download);
- guint64 current_size = webkit_download_get_current_size (download);
- gdouble time_elapsed = webkit_download_get_elapsed_time (download);
- gdouble time_estimated, time_diff;
- gchar* current, *total, *download_speed;
- gchar* hours_str, *minutes_str, *seconds_str;
- GString* tooltip = g_string_new (NULL);
-
- time_diff = time_elapsed / current_size;
- time_estimated = (total_size - current_size) * time_diff;
-
- hours_left = time_estimated / hour;
- minutes_left = (time_estimated - (hours_left * hour)) / min;
- seconds_left = (time_estimated - (hours_left * hour) - (minutes_left * min));
-
- hours_str = g_strdup_printf (ngettext ("%d hour", "%d hours", hours_left), hours_left);
- minutes_str = g_strdup_printf (ngettext ("%d minute", "%d minutes", minutes_left), minutes_left);
- seconds_str = g_strdup_printf (ngettext ("%d second", "%d seconds", seconds_left), seconds_left);
-
- current = g_format_size (current_size);
- total = g_format_size (total_size);
- last_time = g_object_get_data (G_OBJECT (download), "last-time");
- last_size = g_object_get_data (G_OBJECT (download), "last-size");
-
- /* i18n: Download tooltip (size): 4KB of 43MB */
- g_string_append_printf (tooltip, _("%s of %s"), current, total);
- g_free (current);
- g_free (total);
-
- if (time_elapsed != *last_time)
- download_speed = g_format_size (
- (current_size - *last_size) / (time_elapsed - *last_time));
+ clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
+ if (get_cb == NULL)
+ gtk_clipboard_set_text (clipboard, text, -1);
else
- /* i18n: Unknown number of bytes, used for transfer rate like ?B/s */
- download_speed = g_strdup (_("?B"));
-
- /* i18n: Download tooltip (transfer rate): (130KB/s) */
- g_string_append_printf (tooltip, _(" (%s/s)"), download_speed);
- g_free (download_speed);
-
- if (time_estimated > 0)
{
- gchar* eta = NULL;
- if (hours_left > 0)
- eta = g_strdup_printf ("%s, %s", hours_str, minutes_str);
- else if (minutes_left >= 10)
- eta = g_strdup_printf ("%s", minutes_str);
- else if (minutes_left < 10 && minutes_left > 0)
- eta = g_strdup_printf ("%s, %s", minutes_str, seconds_str);
- else if (seconds_left > 0)
- eta = g_strdup_printf ("%s", seconds_str);
- if (eta != NULL)
- {
- /* i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning */
- g_string_append_printf (tooltip, _(" - %s remaining"), eta);
- g_free (eta);
- }
+ GtkTargetList* target_list = gtk_target_list_new (NULL, 0);
+ GtkTargetEntry* targets;
+ gint n_targets;
+ gtk_target_list_add_text_targets (target_list, 0);
+ gtk_target_list_add_image_targets (target_list, 0, TRUE);
+ targets = gtk_target_table_new_from_list (target_list, &n_targets);
+ gtk_clipboard_set_with_owner (clipboard, targets, n_targets, get_cb,
+ sokoke_widget_clipboard_owner_clear_func, owner);
+ gtk_target_table_free (targets, n_targets);
+ gtk_target_list_unref (target_list);
}
-
- g_free (hours_str);
- g_free (seconds_str);
- g_free (minutes_str);
-
- if (time_elapsed - *last_time > 5.0)
- {
- *last_time = time_elapsed;
- *last_size = current_size;
- }
-
- return g_string_free (tooltip, FALSE);
}
static gboolean
@@ -1696,15 +1298,15 @@ sokoke_entry_icon_released_cb (GtkEntry* entry,
gtk_widget_grab_focus (GTK_WIDGET (entry));
}
-void
-sokoke_entry_set_clear_button_visible (GtkEntry* entry,
- gboolean visible)
+GtkWidget*
+sokoke_search_entry_new (const gchar* placeholder_text)
{
- g_return_if_fail (GTK_IS_ENTRY (entry));
-
- gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_SECONDARY, TRUE);
- if (visible)
+ GtkWidget* entry = gtk_entry_new ();
+ gtk_entry_set_placeholder_text (GTK_ENTRY (entry), placeholder_text);
+ gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
+ GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
+ gtk_icon_entry_set_icon_highlight (GTK_ENTRY (entry),
+ GTK_ENTRY_ICON_SECONDARY, TRUE);
{
g_object_connect (entry,
"signal::icon-release",
@@ -1715,35 +1317,8 @@ sokoke_entry_set_clear_button_visible (GtkEntry* entry,
G_CALLBACK (sokoke_entry_focus_out_event_cb), entry,
"signal::changed",
G_CALLBACK (sokoke_entry_changed_cb), entry, NULL);
- sokoke_entry_changed_cb ((GtkEditable*)entry, entry);
- }
- else
- {
- g_object_disconnect (entry,
- "any_signal::icon-release",
- G_CALLBACK (sokoke_entry_icon_released_cb), NULL,
- "any_signal::focus-in-event",
- G_CALLBACK (sokoke_entry_focus_out_event_cb), entry,
- "any_signal::focus-out-event",
- G_CALLBACK (sokoke_entry_focus_out_event_cb), entry,
- "any_signal::changed",
- G_CALLBACK (sokoke_entry_changed_cb), entry, NULL);
- gtk_icon_entry_set_icon_from_stock (
- GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_SECONDARY, NULL);
+ sokoke_entry_changed_cb ((GtkEditable*)entry, GTK_ENTRY (entry));
}
-}
-
-gchar*
-sokoke_get_download_filename (WebKitDownload* download)
-{
- /* https://bugs.webkit.org/show_bug.cgi?id=83161 */
- /* https://d19vezwu8eufl6.cloudfront.net/nlp/slides%2F03-01-FormalizingNB.pdf */
- gchar* filename = g_strdup (webkit_download_get_suggested_filename (download));
- #ifdef G_OS_WIN32
- g_strdelimit (filename, "/\\<>:\"|?*", '_');
- #else
- g_strdelimit (filename, "/", '_');
- #endif
- return filename;
+ return entry;
}
diff --git a/midori/sokoke.h b/midori/sokoke.h
index a714cd98..b322f4f8 100644
--- a/midori/sokoke.h
+++ b/midori/sokoke.h
@@ -42,9 +42,17 @@ sokoke_show_uri (GdkScreen* screen,
guint32 timestamp,
GError** error);
+gchar*
+sokoke_prepare_command (const gchar* command,
+ gboolean quote_command,
+ const gchar* argument,
+ gboolean quote_argument);
+
gboolean
sokoke_spawn_program (const gchar* command,
- const gchar* argument);
+ gboolean quote_command,
+ const gchar* argument,
+ gboolean quote_argument);
void
sokoke_spawn_app (const gchar* uri,
@@ -64,47 +72,6 @@ GtkWidget*
sokoke_xfce_header_new (const gchar* icon,
const gchar* title);
-void
-sokoke_entry_set_default_text (GtkEntry* entry,
- const gchar* default_text);
-
-gchar*
-sokoke_key_file_get_string_default (GKeyFile* key_file,
- const gchar* group,
- const gchar* key,
- const gchar* default_value,
- GError** error);
-
-gint
-sokoke_key_file_get_integer_default (GKeyFile* key_file,
- const gchar* group,
- const gchar* key,
- const gint default_value,
- GError** error);
-
-gdouble
-sokoke_key_file_get_double_default (GKeyFile* key_file,
- const gchar* group,
- const gchar* key,
- gdouble default_value,
- GError** error);
-
-gboolean
-sokoke_key_file_get_boolean_default (GKeyFile* key_file,
- const gchar* group,
- const gchar* key,
- gboolean default_value,
- GError** error);
-
-gchar**
-sokoke_key_file_get_string_list_default (GKeyFile* key_file,
- const gchar* group,
- const gchar* key,
- gsize* length,
- gchar** default_value,
- gsize* default_length,
- GError* error);
-
gboolean
sokoke_key_file_save_to_file (GKeyFile* key_file,
const gchar* filename,
@@ -122,30 +89,10 @@ sokoke_action_create_popup_menu_item (GtkAction* action);
gint64
sokoke_time_t_to_julian (const time_t* timestamp);
-const gchar*
-sokoke_set_config_dir (const gchar* new_config_dir);
-
-gboolean
-sokoke_is_app_or_private (void);
-
gboolean
sokoke_remove_path (const gchar* path,
gboolean ignore_errors);
-gchar*
-sokoke_find_config_filename (const gchar* folder,
- const gchar* filename);
-
-gchar*
-sokoke_find_lib_path (const gchar* folder);
-
-gchar*
-sokoke_find_data_filename (const gchar* filename,
- gboolean res);
-
-gchar**
-sokoke_get_argv (gchar** argument_vector);
-
gchar*
sokoke_replace_variables (const gchar* template,
const gchar* variable_first, ...);
@@ -170,14 +117,9 @@ sokoke_prefetch_uri (MidoriWebSettings* settings,
gboolean
sokoke_resolve_hostname (const gchar* hostname);
-gchar *
-sokoke_accept_languages (const gchar* const * lang_names);
-
gboolean
sokoke_recursive_fork_protection (const gchar* uri,
gboolean set_uri);
-gchar*
-sokoke_get_download_filename (WebKitDownload* download);
typedef struct
{
@@ -192,17 +134,12 @@ sokoke_register_privacy_item (const gchar* name,
GCallback clear);
void
-sokoke_widget_copy_clipboard (GtkWidget* widget,
- const gchar* text);
+sokoke_widget_copy_clipboard (GtkWidget* widget,
+ const gchar* text,
+ GtkClipboardGetFunc get_cb,
+ gpointer owner);
-gchar*
-sokoke_build_thumbnail_path (const gchar* name);
-
-gchar*
-midori_download_prepare_tooltip_text (WebKitDownload* download);
-
-void
-sokoke_entry_set_clear_button_visible (GtkEntry* entry,
- gboolean visible);
+GtkWidget*
+sokoke_search_entry_new (const gchar* placeholder_text);
#endif /* !__SOKOKE_H__ */
diff --git a/midori/wscript_build b/midori/wscript_build
index e0ee7e69..52c3337b 100644
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -8,9 +8,9 @@ import platform
progressive = True
libs = 'M UNIQUE LIBSOUP GMODULE GTHREAD LIBIDN GIO GTK SQLITE ' \
'LIBNOTIFY WEBKIT JAVASCRIPTCOREGTK LIBXML X11 XSS WS2_32 HILDON' \
- 'HILDON_FM GRANITE'
+ 'HILDON_FM GCR GRANITE ZEITGEIST'
-if progressive or Options.commands['check']:
+if progressive:
obj = bld.new_task_gen ('cc', 'staticlib')
obj.target = 'midori-core'
obj.includes = '.. ../katze . ../toolbars'
@@ -18,10 +18,14 @@ if progressive or Options.commands['check']:
obj.uselib = libs
obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal')
obj.install_path = None
- obj.packages = 'glib-2.0 gio-2.0 gtk+-2.0 libsoup-2.4 webkit-1.0'
+ obj.vapi_dirs = '../midori ../katze'
+ obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 posix'
+ if bld.env['HAVE_GTK3']:
+ obj.packages += ' gtk+-3.0 webkitgtk-3.0'
+ else:
+ obj.packages += ' gtk+-2.0 webkit-1.0'
bld.add_group ()
-if progressive:
obj = bld.new_task_gen ('cc', 'program')
obj.target = 'midori'
obj.includes = '.. ../katze . ../panels'
@@ -30,12 +34,3 @@ if progressive:
obj.uselib_local = 'midori-core'
if bld.env['WINRC']:
obj.source += ' ../data/midori.rc'
-else:
- obj = bld.new_task_gen ('cc', 'program')
- obj.target = 'midori'
- obj.includes = '.. ../katze . ../panels ../toolbars'
- obj.find_sources_in_dirs ('../katze . ../panels ../toolbars')
- obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal')
- obj.uselib = libs
- if bld.env['WINRC']:
- obj.source += ' ../data/midori.rc'
diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 099e9d80..39b4950a 100644
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -16,7 +16,7 @@
#include "midori-browser.h"
#include "midori-platform.h"
#include "midori-view.h"
-#include "midori-viewable.h"
+#include "midori-core.h"
#include
#include
@@ -120,66 +120,87 @@ midori_bookmarks_get_stock_id (MidoriViewable* viewable)
return STOCK_BOOKMARKS;
}
+/* TODO: Function never used */
void
-midori_bookmarks_export_array_db (sqlite3* db,
- KatzeArray* array,
- const gchar* folder)
+midori_bookmarks_export_array_db (sqlite3* db,
+ KatzeArray* array,
+ gint64 parentid)
{
KatzeArray* root_array;
KatzeArray* subarray;
KatzeItem* item;
GList* list;
+ gchar* parent_id;
- if (!(root_array = midori_array_query (array, "*", "folder='%q'", folder)))
+ parent_id = g_strdup_printf ("%" G_GINT64_FORMAT, parentid);
+ if (!(root_array = midori_array_query (array, "*", "parentid = %q", parent_id)))
+ {
+ g_free (parent_id);
return;
+ }
KATZE_ARRAY_FOREACH_ITEM_L (item, root_array, list)
{
if (KATZE_ITEM_IS_FOLDER (item))
{
subarray = katze_array_new (KATZE_TYPE_ARRAY);
katze_item_set_name (KATZE_ITEM (subarray), katze_item_get_name (item));
- midori_bookmarks_export_array_db (db, subarray, katze_item_get_name (item));
+ midori_bookmarks_export_array_db (db, subarray,
+ katze_item_get_meta_integer (item, "parentid"));
katze_array_add_item (array, subarray);
}
else
katze_array_add_item (array, item);
}
+
+ g_free (parent_id);
g_list_free (list);
}
void
-midori_bookmarks_import_array_db (sqlite3* db,
- KatzeArray* array,
- const gchar* folder)
+midori_bookmarks_import_array_db (sqlite3* db,
+ KatzeArray* array,
+ gint64 parentid)
{
GList* list;
KatzeItem* item;
+ gint64 id;
if (!db)
return;
KATZE_ARRAY_FOREACH_ITEM_L (item, array, list)
{
+ id = midori_bookmarks_insert_item_db (db, item, parentid);
if (KATZE_IS_ARRAY (item))
- midori_bookmarks_import_array_db (db, KATZE_ARRAY (item), folder);
- midori_bookmarks_insert_item_db (db, item, folder);
+ midori_bookmarks_import_array_db (db, KATZE_ARRAY (item), id);
}
g_list_free (list);
}
static KatzeArray*
midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks,
- const gchar* folder,
+ gint64 parentid,
const gchar* keyword)
{
KatzeArray* array;
if (keyword && *keyword)
array = midori_array_query (bookmarks->array,
- "uri, title, desc, app, toolbar, folder", "title LIKE '%%%q%%'", keyword);
+ "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "title LIKE '%%%q%%'", keyword);
else
- array = midori_array_query (bookmarks->array,
- "uri, title, desc, app, toolbar, folder", "folder = '%q'", folder);
+ {
+ if (parentid > 0)
+ {
+ gchar* parent_id = g_strdup_printf ("%" G_GINT64_FORMAT, parentid);
+ array = midori_array_query (bookmarks->array,
+ "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "parentid = %q", parent_id);
+
+ g_free (parent_id);
+ }
+ else
+ array = midori_array_query (bookmarks->array,
+ "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "parentid IS NULL", NULL);
+ }
return array ? array : katze_array_new (KATZE_TYPE_ITEM);
}
@@ -187,7 +208,7 @@ static void
midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks,
GtkTreeStore* model,
GtkTreeIter* parent,
- const gchar* folder,
+ gint64 parentid,
const gchar* keyword)
{
KatzeArray* array;
@@ -195,7 +216,7 @@ midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks,
KatzeItem* item;
GtkTreeIter child;
- array = midori_bookmarks_read_from_db (bookmarks, folder, keyword);
+ array = midori_bookmarks_read_from_db (bookmarks, parentid, keyword);
katze_bookmark_populate_tree_view (array, model, parent);
/* Remove invisible dummy row */
last = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (model), parent);
@@ -209,23 +230,30 @@ midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks,
g_object_unref (item);
}
-void
-midori_bookmarks_insert_item_db (sqlite3* db,
- KatzeItem* item,
- const gchar* folder)
+gint64
+midori_bookmarks_insert_item_db (sqlite3* db,
+ KatzeItem* item,
+ gint64 parentid)
{
gchar* sqlcmd;
char* errmsg = NULL;
KatzeItem* old_parent;
- const gchar* parent;
+ gchar* new_parentid;
+ gchar* id = NULL;
const gchar* uri = NULL;
const gchar* desc = NULL;
+ gint64 seq = 0;
/* Bookmarks must have a name, import may produce invalid items */
- g_return_if_fail (katze_item_get_name (item));
+ g_return_val_if_fail (katze_item_get_name (item), seq);
if (!db)
- return;
+ return seq;
+
+ if (katze_item_get_meta_integer (item, "id") > 0)
+ id = g_strdup_printf ("%" G_GINT64_FORMAT, katze_item_get_meta_integer(item, "id"));
+ else
+ id = g_strdup_printf ("NULL");
if (KATZE_ITEM_IS_BOOKMARK (item))
uri = katze_item_get_uri (item);
@@ -235,30 +263,57 @@ midori_bookmarks_insert_item_db (sqlite3* db,
/* Use folder, otherwise fallback to parent folder */
old_parent = katze_item_get_parent (item);
- if (folder && *folder)
- parent = folder;
- else if (old_parent && katze_item_get_name (old_parent))
- parent = katze_item_get_name (old_parent);
+ if (parentid > 0)
+ new_parentid = g_strdup_printf ("%" G_GINT64_FORMAT, parentid);
+ else if (old_parent && katze_item_get_meta_integer (old_parent, "id") > 0)
+ new_parentid = g_strdup_printf ("%" G_GINT64_FORMAT, katze_item_get_meta_integer (old_parent, "id"));
else
- parent = "";
+ new_parentid = g_strdup_printf ("NULL");
sqlcmd = sqlite3_mprintf (
- "INSERT into bookmarks (uri, title, desc, folder, toolbar, app) values"
- " ('%q', '%q', '%q', '%q', %d, %d)",
- uri ? uri : "",
+ "INSERT INTO bookmarks (id, parentid, title, uri, desc, toolbar, app) "
+ "VALUES (%q, %q, '%q', '%q', '%q', %d, %d)",
+ id,
+ new_parentid,
katze_item_get_name (item),
- desc ? desc : "",
- parent,
+ katze_str_non_null (uri),
+ katze_str_non_null (desc),
katze_item_get_meta_boolean (item, "toolbar"),
katze_item_get_meta_boolean (item, "app"));
- if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
+ if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) == SQLITE_OK)
+ {
+ /* Get insert id */
+ if (g_str_equal (id, "NULL"))
+ {
+ KatzeArray* seq_array;
+
+ sqlite3_free (sqlcmd);
+ sqlcmd = sqlite3_mprintf (
+ "SELECT seq FROM sqlite_sequence WHERE name = 'bookmarks'");
+
+ seq_array = katze_array_from_sqlite (db, sqlcmd);
+ if (katze_array_get_nth_item (seq_array, 0))
+ {
+ KatzeItem* seq_item = katze_array_get_nth_item (seq_array, 0);
+
+ seq = katze_item_get_meta_integer (seq_item, "seq");
+ katze_item_set_meta_integer (item, "id", seq);
+ }
+ g_object_unref (seq_array);
+ }
+ }
+ else
{
g_printerr (_("Failed to add bookmark item: %s\n"), errmsg);
sqlite3_free (errmsg);
}
sqlite3_free (sqlcmd);
+ g_free (new_parentid);
+ g_free (id);
+
+ return seq;
}
static void
@@ -268,15 +323,9 @@ midori_bookmarks_add_item_cb (KatzeArray* array,
{
GtkTreeModel* model;
model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview));
- if (!g_strcmp0 (katze_item_get_meta_string (item, "folder"), ""))
- gtk_tree_store_insert_with_values (GTK_TREE_STORE (model),
- NULL, NULL, G_MAXINT, 0, item, -1);
- else
- {
- gtk_tree_store_clear (GTK_TREE_STORE (model));
- midori_bookmarks_read_from_db_to_model (bookmarks,
- GTK_TREE_STORE (model), NULL, NULL, bookmarks->filter);
- }
+ gtk_tree_store_clear (GTK_TREE_STORE (model));
+ midori_bookmarks_read_from_db_to_model (bookmarks,
+ GTK_TREE_STORE (model), NULL, 0, bookmarks->filter);
}
static void
@@ -287,7 +336,7 @@ midori_bookmarks_remove_item_cb (KatzeArray* array,
GtkTreeModel* model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview));
gtk_tree_store_clear (GTK_TREE_STORE (model));
midori_bookmarks_read_from_db_to_model (bookmarks,
- GTK_TREE_STORE (model), NULL, NULL, bookmarks->filter);
+ GTK_TREE_STORE (model), NULL, 0, bookmarks->filter);
}
static void
@@ -297,7 +346,7 @@ midori_bookmarks_update_cb (KatzeArray* array,
GtkTreeModel* model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview));
gtk_tree_store_clear (GTK_TREE_STORE (model));
midori_bookmarks_read_from_db_to_model (bookmarks,
- GTK_TREE_STORE (model), NULL, NULL, bookmarks->filter);
+ GTK_TREE_STORE (model), NULL, 0, bookmarks->filter);
}
@@ -310,7 +359,7 @@ midori_bookmarks_row_changed_cb (GtkTreeModel* model,
KatzeItem* item;
GtkTreeIter parent;
KatzeItem* new_parent = NULL;
- const gchar* parent_name;
+ gint64 parentid;
gtk_tree_model_get (model, iter, 0, &item, -1);
@@ -320,15 +369,15 @@ midori_bookmarks_row_changed_cb (GtkTreeModel* model,
/* Bookmarks must not be moved into non-folder items */
if (!KATZE_ITEM_IS_FOLDER (new_parent))
- parent_name = "";
+ parentid = 0;
else
- parent_name = katze_item_get_name (new_parent);
+ parentid = katze_item_get_meta_integer (new_parent, "id");
}
else
- parent_name = "";
+ parentid = 0;
katze_array_remove_item (bookmarks->array, item);
- katze_item_set_meta_string (item, "folder", parent_name);
+ katze_item_set_meta_integer (item, "parentid", parentid);
katze_array_add_item (bookmarks->array, item);
g_object_unref (item);
@@ -359,14 +408,24 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem,
{
KatzeItem* item;
MidoriBrowser* browser;
+ gint64 parentid;
gtk_tree_model_get (model, &iter, 0, &item, -1);
g_assert (!KATZE_ITEM_IS_SEPARATOR (item));
browser = midori_browser_get_for_widget (bookmarks->treeview);
+ parentid = katze_item_get_meta_integer (item, "parentid");
midori_browser_edit_bookmark_dialog_new (
browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item), NULL);
+
+ if (katze_item_get_meta_integer (item, "parentid") != parentid)
+ {
+ gtk_tree_store_clear (GTK_TREE_STORE (model));
+ midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model),
+ NULL, 0, NULL);
+ }
+
g_object_unref (item);
}
}
@@ -382,6 +441,47 @@ midori_bookmarks_toolbar_update (MidoriBookmarks *bookmarks)
gtk_widget_set_sensitive (GTK_WIDGET (bookmarks->edit), selected);
}
+gboolean
+midori_bookmarks_update_item_db (sqlite3* db,
+ KatzeItem* item)
+{
+ gchar* sqlcmd;
+ char* errmsg = NULL;
+ gchar* parentid;
+ gboolean updated;
+
+ if (katze_item_get_meta_integer (item, "parentid") > 0)
+ parentid = g_strdup_printf ("%" G_GINT64_FORMAT,
+ katze_item_get_meta_integer (item, "parentid"));
+ else
+ parentid = g_strdup_printf ("NULL");
+
+ sqlcmd = sqlite3_mprintf (
+ "UPDATE bookmarks SET "
+ "parentid=%q, title='%q', uri='%q', desc='%q', toolbar=%d, app=%d "
+ "WHERE id = %" G_GINT64_FORMAT ";",
+ parentid,
+ katze_item_get_name (item),
+ katze_str_non_null (katze_item_get_uri (item)),
+ katze_str_non_null (katze_item_get_meta_string (item, "desc")),
+ katze_item_get_meta_boolean (item, "toolbar"),
+ katze_item_get_meta_boolean (item, "app"),
+ katze_item_get_meta_integer (item, "id"));
+
+ updated = TRUE;
+ if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
+ {
+ updated = FALSE;
+ g_printerr (_("Failed to update bookmark : %s\n"), errmsg);
+ sqlite3_free (errmsg);
+ }
+
+ sqlite3_free (sqlcmd);
+ g_free (parentid);
+
+ return updated;
+}
+
static void
midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem,
MidoriBookmarks* bookmarks)
@@ -421,7 +521,7 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
bookmarks->toolbar = toolbar;
- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
+ toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);
gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd");
gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
_("Add a new bookmark"));
@@ -452,7 +552,7 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
gtk_tool_item_set_expand (toolitem, TRUE);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
gtk_widget_show (GTK_WIDGET (toolitem));
- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY);
+ toolitem = gtk_tool_button_new_from_stock (STOCK_FOLDER_NEW);
gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkFolderAdd");
gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
_("Add a new folder"));
@@ -496,8 +596,8 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks,
g_object_ref (app);
bookmarks->array = katze_object_get_object (app, "bookmarks");
- midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), NULL, "", NULL);
- g_signal_connect (bookmarks->array, "add-item",
+ midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), NULL, 0, NULL);
+ g_signal_connect_after (bookmarks->array, "add-item",
G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks);
g_signal_connect (bookmarks->array, "remove-item",
G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks);
@@ -588,8 +688,11 @@ midori_bookmarks_treeview_render_text_cb (GtkTreeViewColumn* column,
gtk_tree_model_get (model, iter, 0, &item, -1);
if (item && katze_item_get_name (item))
+ {
g_object_set (renderer, "markup", NULL,
+ "ellipsize", PANGO_ELLIPSIZE_END,
"text", katze_item_get_name (item), NULL);
+ }
else
g_object_set (renderer, "markup", _("Separator "), NULL);
@@ -687,7 +790,9 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem,
KatzeItem* child;
KatzeArray* array;
- array = midori_bookmarks_read_from_db (bookmarks, katze_item_get_name (item), NULL);
+ array = midori_bookmarks_read_from_db (bookmarks,
+ katze_item_get_meta_integer (item, "parentid"), NULL);
+
g_return_if_fail (KATZE_IS_ARRAY (array));
KATZE_ARRAY_FOREACH_ITEM (child, array)
{
@@ -843,7 +948,7 @@ midori_bookmarks_row_expanded_cb (GtkTreeView* treeview,
model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
gtk_tree_model_get (model, iter, 0, &item, -1);
midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model),
- iter, katze_item_get_name (item), NULL);
+ iter, katze_item_get_meta_integer (item, "id"), NULL);
g_object_unref (item);
}
@@ -885,7 +990,7 @@ midori_bookmarks_filter_timeout_cb (gpointer data)
gtk_tree_store_clear (treestore);
midori_bookmarks_read_from_db_to_model (bookmarks,
- treestore, NULL, NULL, bookmarks->filter);
+ treestore, NULL, 0, bookmarks->filter);
return FALSE;
}
@@ -896,21 +1001,16 @@ midori_bookmarks_filter_entry_changed_cb (GtkEntry* entry,
{
if (bookmarks->filter_timeout)
g_source_remove (bookmarks->filter_timeout);
- katze_assign (bookmarks->filter, g_strdup (gtk_entry_get_text (entry)));
+
+ if (!g_object_get_data (G_OBJECT (entry), "sokoke_has_default"))
+ katze_assign (bookmarks->filter, g_strdup (gtk_entry_get_text (entry)));
+ else
+ katze_assign (bookmarks->filter, NULL);
+
bookmarks->filter_timeout = g_timeout_add (COMPLETION_DELAY,
midori_bookmarks_filter_timeout_cb, bookmarks);
}
-static void
-midori_bookmarks_filter_entry_clear_cb (GtkEntry* entry,
- gint icon_pos,
- gint button,
- MidoriBookmarks* bookmarks)
-{
- if (icon_pos == GTK_ICON_ENTRY_SECONDARY)
- gtk_entry_set_text (entry, "");
-}
-
static void
midori_bookmarks_init (MidoriBookmarks* bookmarks)
{
@@ -924,14 +1024,8 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks)
GtkTreeSelection* selection;
/* Create the filter entry */
- entry = gtk_icon_entry_new ();
- gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_PRIMARY,
- GTK_STOCK_FIND);
- sokoke_entry_set_clear_button_visible (GTK_ENTRY (entry), TRUE);
- g_signal_connect (entry, "icon-release",
- G_CALLBACK (midori_bookmarks_filter_entry_clear_cb), bookmarks);
- g_signal_connect (entry, "changed",
+ entry = sokoke_search_entry_new (_("Search Bookmarks"));
+ g_signal_connect_after (entry, "changed",
G_CALLBACK (midori_bookmarks_filter_entry_changed_cb), bookmarks);
box = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 3);
@@ -944,14 +1038,14 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks)
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), 1);
column = gtk_tree_view_column_new ();
- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_column_set_expand (column, TRUE);
renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE);
gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf,
(GtkTreeCellDataFunc)midori_bookmarks_treeview_render_icon_cb,
treeview, NULL);
renderer_text = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (column, renderer_text, FALSE);
+ gtk_tree_view_column_pack_start (column, renderer_text, TRUE);
gtk_tree_view_column_set_cell_data_func (column, renderer_text,
(GtkTreeCellDataFunc)midori_bookmarks_treeview_render_text_cb,
treeview, NULL);
diff --git a/panels/midori-bookmarks.h b/panels/midori-bookmarks.h
index 1be04121..cf56dea9 100644
--- a/panels/midori-bookmarks.h
+++ b/panels/midori-bookmarks.h
@@ -40,15 +40,19 @@ midori_bookmarks_get_type (void);
GtkWidget*
midori_bookmarks_new (void);
-void
-midori_bookmarks_insert_item_db (sqlite3* db,
- KatzeItem* item,
- const gchar* folder);
+gint64
+midori_bookmarks_insert_item_db (sqlite3* db,
+ KatzeItem* item,
+ gint64 parentid);
void
-midori_bookmarks_import_array_db (sqlite3* db,
- KatzeArray* array,
- const gchar* folder);
+midori_bookmarks_import_array_db (sqlite3* db,
+ KatzeArray* array,
+ gint64 parentid);
+
+gboolean
+midori_bookmarks_update_item_db (sqlite3* db,
+ KatzeItem* item);
G_END_DECLS
diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c
index 0aec2be0..f9100d1c 100644
--- a/panels/midori-extensions.c
+++ b/panels/midori-extensions.c
@@ -14,7 +14,6 @@
#include "midori-app.h"
#include "midori-extension.h"
#include "midori-platform.h"
-#include "midori-viewable.h"
#include "midori-core.h"
#include
@@ -94,7 +93,7 @@ midori_extensions_get_label (MidoriViewable* viewable)
static const gchar*
midori_extensions_get_stock_id (MidoriViewable* viewable)
{
- return STOCK_EXTENSIONS;
+ return STOCK_EXTENSION;
}
static GtkWidget*
@@ -285,6 +284,7 @@ midori_extensions_treeview_render_text_cb (GtkTreeViewColumn* column,
g_object_set (renderer,
"markup", text,
+ "ellipsize", PANGO_ELLIPSIZE_END,
"sensitive", midori_extension_is_prepared (extension),
NULL);
@@ -305,13 +305,17 @@ midori_extensions_treeview_row_activated_cb (GtkTreeView* treeview,
if (gtk_tree_model_get_iter (model, &iter, path))
{
MidoriExtension* extension;
+ KatzeArray* array = katze_object_get_object (extensions->app, "extensions");
gtk_tree_model_get (model, &iter, 0, &extension, -1);
if (midori_extension_is_active (extension))
midori_extension_deactivate (extension);
else if (midori_extension_is_prepared (extension))
g_signal_emit_by_name (extension, "activate", extensions->app);
+ /* Make it easy for listeners to see that extensions changed */
+ katze_array_update (array);
+ g_object_unref (array);
g_object_unref (extension);
}
}
@@ -328,13 +332,17 @@ midori_extensions_cell_renderer_toggled_cb (GtkCellRendererToggle* renderer,
if (gtk_tree_model_get_iter_from_string (model, &iter, path))
{
MidoriExtension* extension;
+ KatzeArray* array = katze_object_get_object (extensions->app, "extensions");
gtk_tree_model_get (model, &iter, 0, &extension, -1);
if (midori_extension_is_active (extension))
midori_extension_deactivate (extension);
else if (midori_extension_is_prepared (extension))
g_signal_emit_by_name (extension, "activate", extensions->app);
+ /* Make it easy for listeners to see that extensions changed */
+ katze_array_update (array);
+ g_object_unref (array);
g_object_unref (extension);
}
}
@@ -454,10 +462,9 @@ midori_extensions_init (MidoriExtensions* extensions)
extensions->treeview, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (extensions->treeview), column);
column = gtk_tree_view_column_new ();
- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
- renderer_text = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (column, renderer_text, FALSE);
gtk_tree_view_column_set_expand (column, TRUE);
+ renderer_text = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (column, renderer_text, TRUE);
gtk_tree_view_column_set_cell_data_func (column, renderer_text,
(GtkTreeCellDataFunc)midori_extensions_treeview_render_text_cb,
extensions->treeview, NULL);
diff --git a/panels/midori-history.c b/panels/midori-history.c
index 7ec1717f..c1bb1816 100644
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -16,7 +16,7 @@
#include "midori-browser.h"
#include "midori-platform.h"
#include "midori-view.h"
-#include "midori-viewable.h"
+#include "midori-core.h"
#include
#include
@@ -624,11 +624,14 @@ midori_history_treeview_render_text_cb (GtkTreeViewColumn* column,
if (KATZE_ITEM_IS_BOOKMARK (item))
g_object_set (renderer, "markup", NULL,
+ "ellipsize", PANGO_ELLIPSIZE_END,
"text", katze_item_get_name (item), NULL);
else if (KATZE_ITEM_IS_FOLDER (item))
{
gchar* formatted = midori_history_format_date (item);
- g_object_set (renderer, "markup", NULL, "text", formatted, NULL);
+ g_object_set (renderer, "markup", NULL, "text", formatted,
+ "ellipsize", PANGO_ELLIPSIZE_END,
+ NULL);
g_free (formatted);
}
else
@@ -964,17 +967,11 @@ midori_history_filter_entry_changed_cb (GtkEntry* entry,
g_source_remove (history->filter_timeout);
history->filter_timeout = g_timeout_add (COMPLETION_DELAY,
midori_history_filter_timeout_cb, history);
- katze_assign (history->filter, g_strdup (gtk_entry_get_text (entry)));
-}
-static void
-midori_history_filter_entry_clear_cb (GtkEntry* entry,
- gint icon_pos,
- gint button,
- MidoriHistory* history)
-{
- if (icon_pos == GTK_ICON_ENTRY_SECONDARY)
- gtk_entry_set_text (entry, "");
+ if (!g_object_get_data (G_OBJECT (entry), "sokoke_has_default"))
+ katze_assign (history->filter, g_strdup (gtk_entry_get_text (entry)));
+ else
+ katze_assign (history->filter, NULL);
}
static void
@@ -997,14 +994,8 @@ midori_history_init (MidoriHistory* history)
GtkTreeSelection* selection;
/* Create the filter entry */
- entry = gtk_icon_entry_new ();
- gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_PRIMARY,
- GTK_STOCK_FIND);
- sokoke_entry_set_clear_button_visible (GTK_ENTRY (entry), TRUE);
- g_signal_connect (entry, "icon-release",
- G_CALLBACK (midori_history_filter_entry_clear_cb), history);
- g_signal_connect (entry, "changed",
+ entry = sokoke_search_entry_new (_("Search History"));
+ g_signal_connect_after (entry, "changed",
G_CALLBACK (midori_history_filter_entry_changed_cb), history);
box = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 3);
@@ -1017,14 +1008,14 @@ midori_history_init (MidoriHistory* history)
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), 1);
column = gtk_tree_view_column_new ();
- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_column_set_expand (column, TRUE);
renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE);
gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf,
(GtkTreeCellDataFunc)midori_history_treeview_render_icon_cb,
treeview, NULL);
renderer_text = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (column, renderer_text, FALSE);
+ gtk_tree_view_column_pack_start (column, renderer_text, TRUE);
gtk_tree_view_column_set_cell_data_func (column, renderer_text,
(GtkTreeCellDataFunc)midori_history_treeview_render_text_cb,
treeview, NULL);
diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c
index 1c8ca470..c7dc45a7 100644
--- a/panels/midori-transfers.c
+++ b/panels/midori-transfers.c
@@ -15,6 +15,7 @@
#include "midori-browser.h"
#include "midori-platform.h"
#include "midori-view.h"
+#include "midori-core.h"
#include
@@ -89,7 +90,7 @@ midori_transfers_get_label (MidoriViewable* viewable)
static const gchar*
midori_transfers_get_stock_id (MidoriViewable* viewable)
{
- return STOCK_TRANSFERS;
+ return STOCK_TRANSFER;
}
static void
@@ -103,13 +104,10 @@ midori_transfers_button_clear_clicked_cb (GtkToolItem* toolitem,
while ((gtk_tree_model_iter_nth_child (model, &iter, NULL, n++)))
{
WebKitDownload* download;
- WebKitDownloadStatus status;
gtk_tree_model_get (model, &iter, 1, &download, -1);
- status = webkit_download_get_status (download);
- if (status == WEBKIT_DOWNLOAD_STATUS_FINISHED
- || status == WEBKIT_DOWNLOAD_STATUS_CANCELLED)
+ if (midori_download_is_finished (download))
{
gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
n--; /* Decrement n since we just removed it */
@@ -240,9 +238,21 @@ midori_transfers_treeview_render_icon_cb (GtkTreeViewColumn* column,
GtkTreeIter* iter,
GtkWidget* treeview)
{
- g_object_set (renderer, "stock-id", STOCK_TRANSFER,
+ WebKitDownload* download;
+ gchar* content_type;
+ GIcon* icon;
+
+ gtk_tree_model_get (model, iter, 1, &download, -1);
+ content_type = midori_download_get_content_type (download, NULL);
+ icon = g_content_type_get_icon (content_type);
+ g_themed_icon_append_name (G_THEMED_ICON (icon), "text-html");
+
+ g_object_set (renderer, "gicon", icon,
"stock-size", GTK_ICON_SIZE_DND,
"xpad", 1, "ypad", 12, NULL);
+ g_free (content_type);
+ g_object_unref (icon);
+ g_object_unref (download);
}
static void
@@ -253,34 +263,17 @@ midori_transfers_treeview_render_text_cb (GtkTreeViewColumn* column,
GtkWidget* treeview)
{
WebKitDownload* download;
- gchar* current;
- gchar* total;
- gchar* size_text;
- gchar* text;
- gchar* filename;
+ gchar* tooltip;
gdouble progress;
gtk_tree_model_get (model, iter, 1, &download, -1);
- /* FIXME: Ellipsize filename */
- current = g_format_size (webkit_download_get_current_size (download));
- total = g_format_size (webkit_download_get_total_size (download));
- size_text = g_strdup_printf (_("%s of %s"), current, total);
- g_free (current);
- g_free (total);
- filename = sokoke_get_download_filename (download);
- text = g_strdup_printf ("%s\n%s", filename, size_text);
- g_free (filename);
- g_free (size_text);
- /* Avoid a bug in WebKit */
- if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_CREATED)
- progress = webkit_download_get_progress (download);
- else
- progress = 0.0;
- g_object_set (renderer, "text", text,
+ tooltip = midori_download_get_tooltip (download);
+ progress = midori_download_get_progress (download);
+ g_object_set (renderer, "text", tooltip,
"value", (gint)(progress * 100),
"xpad", 1, "ypad", 6, NULL);
- g_free (text);
+ g_free (tooltip);
g_object_unref (download);
}
@@ -296,17 +289,7 @@ midori_transfers_treeview_render_button_cb (GtkTreeViewColumn* column,
gtk_tree_model_get (model, iter, 1, &download, -1);
- switch (webkit_download_get_status (download))
- {
- case WEBKIT_DOWNLOAD_STATUS_STARTED:
- stock_id = GTK_STOCK_CANCEL;
- break;
- case WEBKIT_DOWNLOAD_STATUS_FINISHED:
- stock_id = GTK_STOCK_OPEN;
- break;
- default:
- stock_id = GTK_STOCK_CLEAR;
- }
+ stock_id = midori_download_action_stock_id (download);
g_object_set (renderer, "stock-id", stock_id,
"stock-size", GTK_ICON_SIZE_MENU, NULL);
@@ -327,25 +310,8 @@ midori_transfers_treeview_row_activated_cb (GtkTreeView* treeview,
gtk_tree_model_get (model, &iter, 1, &download, -1);
- switch (webkit_download_get_status (download))
- {
- case WEBKIT_DOWNLOAD_STATUS_STARTED:
- webkit_download_cancel (download);
- break;
- case WEBKIT_DOWNLOAD_STATUS_FINISHED:
- {
- const gchar* uri;
-
- uri = webkit_download_get_destination_uri (download);
- sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (
- treeview)), uri, gtk_get_current_event_time (), NULL);
- break;
- }
- case WEBKIT_DOWNLOAD_STATUS_CANCELLED:
- /* FIXME: Remove this item from the model */
- default:
- break;
- }
+ if (midori_download_action_clear (download, GTK_WIDGET (treeview), NULL))
+ gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
g_object_unref (download);
}
}
@@ -530,7 +496,7 @@ midori_transfers_init (MidoriTransfers* transfers)
transfers->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (transfers->treeview), FALSE);
column = gtk_tree_view_column_new ();
- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_column_set_expand (column, TRUE);
renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE);
gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf,
diff --git a/panels/midori-transfers.h b/panels/midori-transfers.h
index 97787115..1174ac9c 100644
--- a/panels/midori-transfers.h
+++ b/panels/midori-transfers.h
@@ -12,11 +12,7 @@
#ifndef __MIDORI_TRANSFERS_H__
#define __MIDORI_TRANSFERS_H__
-#include
-
-#include
-
-#include "midori-viewable.h"
+#include "midori-core.h"
G_BEGIN_DECLS
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c7f98f56..6f26ccaa 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,8 +9,11 @@ midori/midori-browser.c
midori/midori-extension.c
midori/midori-locationaction.c
midori/midori-panel.c
+midori/midori-settings.vala
midori/midori-websettings.c
midori/midori-view.c
+midori/midori-download.vala
+midori/midori-speeddial.vala
midori/midori-preferences.c
midori/midori-searchaction.c
midori/sokoke.c
@@ -27,6 +30,8 @@ katze/katze-item.c
katze/katze-array.c
katze/katze-arrayaction.c
katze/katze-preferences.c
+katze/midori-uri.vala
+katze/midori-paths.vala
extensions/adblock.c
extensions/addons.c
extensions/colorful-tabs.c
diff --git a/po/ar.po b/po/ar.po
index 8dcbdec6..0e47e847 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: midori\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 22:39+0000\n"
-"PO-Revision-Date: 2012-01-31 08:37+0300\n"
+"POT-Creation-Date: 2012-05-20 18:39+0000\n"
+"PO-Revision-Date: 2012-05-21 00:13+0300\n"
"Last-Translator: mohammad \n"
"Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n"
"Language: ar\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.7.0\n"
+"X-Generator: Virtaal 0.7.1\n"
"X-Poedit-Language: Arabic\n"
"X-Poedit-Country: MOROCCO\n"
@@ -28,8 +28,8 @@ msgstr "تصفّح الإنترنت"
msgid "Internet;WWW;Explorer"
msgstr "شبكة الإنترنت؛WWW؛إكسبلورر"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:1978 ../midori/main.c:1998
-#: ../midori/main.c:2009 ../midori/midori-websettings.c:304
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996
+#: ../midori/main.c:2010 ../midori/midori-websettings.c:313
msgid "Midori"
msgstr "ميدوري"
@@ -45,82 +45,71 @@ msgstr "متصفح ميدوري الخاص"
msgid "Open a new private browsing window"
msgstr "فتح نافذة تصفح خاصة الجديدة"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4013
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4223
msgid "Private Browsing"
msgstr "التصفح الخاص"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:97 ../midori/main.c:103
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "لا يمكن تحميل الإعدادات: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:151
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "القيمة '%s' غبر صالحة ل %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:156 ../midori/main.c:260
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "قيمة الإعدادات '%s' غبر صالحة"
-#: ../midori/main.c:364
+#: ../midori/main.c:381
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "فشل تحميل أدوات البحث. %s\n"
-#: ../midori/main.c:418
+#: ../midori/main.c:435
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "فشل محو السجل: %s\n"
-#: ../midori/main.c:438 ../midori/main.c:559
-#: ../extensions/formhistory/formhistory.c:249
+#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "فشل فتح قاعدة البيانات: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:502
+#: ../midori/main.c:525
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "فشل حذف العناصر القديمة للسجل: %s\n"
-#: ../midori/main.c:542 ../panels/midori-history.c:189
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "فشل حذف عنصر السجل: %s\n"
-
-#: ../midori/main.c:589
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "لا يمكن حفظ العلامات. %s"
-
-#: ../midori/main.c:611
+#: ../midori/main.c:547
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "لا يمكن حفظ الإعدادات. %s"
-#: ../midori/main.c:646
+#: ../midori/main.c:582
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "لا يمكن حفظ أدوات البحث. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:683
+#: ../midori/main.c:619
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "لا يمكن حفظ المهملات. %s"
-#: ../midori/main.c:724 ../panels/midori-extensions.c:91
+#: ../midori/main.c:660 ../panels/midori-extensions.c:91
msgid "Extensions"
msgstr "إمتدادات"
-#: ../midori/main.c:738
+#: ../midori/main.c:674
msgid "Privacy"
msgstr "الخصوصية"
-#: ../midori/main.c:750
+#: ../midori/main.c:686
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -128,17 +117,17 @@ msgstr ""
"الكوكيز تخزن بيانات تسجيل الدخول والألعاب المحفوظة ، أو تعريف المستخدم "
"لأغراض الإعلان."
-#: ../midori/main.c:806
+#: ../midori/main.c:742
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "لا يمكن حفظ الجلسة. %s"
-#: ../midori/main.c:1024
+#: ../midori/main.c:960
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr "لا يوجد ملف شهادة للجذر هو متاح. لا يمكن التحقق من شهادات SSL."
-#: ../midori/main.c:1092
+#: ../midori/main.c:1036
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -146,240 +135,225 @@ msgstr ""
"يبدو أن ميدوري إنهار في المرة الأخيرة التي تم فتحه. إذا تكرر هذا، حاول أحد "
"الخيارات التالية لحل المشكلة."
-#: ../midori/main.c:1111
+#: ../midori/main.c:1055
msgid "Modify _preferences"
msgstr "تحرير ال_تفضيلات"
-#: ../midori/main.c:1115
+#: ../midori/main.c:1059
msgid "Disable all _extensions"
msgstr "تعطيل كل الإمتدادات"
-#: ../midori/main.c:1128
+#: ../midori/main.c:1072
msgid "Discard old tabs"
msgstr "تجاهل العلامات القديمة"
-#: ../midori/main.c:1129 ../midori/midori-websettings.c:213
+#: ../midori/main.c:1073 ../midori/midori-websettings.c:221
msgid "Show last tabs without loading"
msgstr "أظهر أخر تبويب بدون تحميل"
-#: ../midori/main.c:1130 ../midori/midori-websettings.c:212
+#: ../midori/main.c:1074 ../midori/midori-websettings.c:220
msgid "Show last open tabs"
msgstr "أظهر اخر التبويبات المفتوحة"
-#: ../midori/main.c:1338 ../midori/main.c:2393
+#: ../midori/main.c:1321 ../midori/main.c:2399
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "لا يمكن تحميل الجلسة: %s\n"
-#: ../midori/main.c:1476
+#: ../midori/main.c:1459
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "حفظ لقطة في : %s\n"
-#: ../midori/main.c:1881
+#: ../midori/main.c:1875
msgid "Run ADDRESS as a web application"
msgstr "شغل العنوان كتطبيق وب"
-#: ../midori/main.c:1881
+#: ../midori/main.c:1875
msgid "ADDRESS"
msgstr "عنوان"
-#: ../midori/main.c:1884
+#: ../midori/main.c:1878
msgid "Use FOLDER as configuration folder"
msgstr "إستعمل المجلد كمجلد إعدادات"
-#: ../midori/main.c:1884
+#: ../midori/main.c:1878
msgid "FOLDER"
msgstr "مجلد"
-#: ../midori/main.c:1887
+#: ../midori/main.c:1881
msgid "Private browsing, no changes are saved"
msgstr "التصفح الخاص ، لا يتم حفظ أية تغييرات"
-#: ../midori/main.c:1889
+#: ../midori/main.c:1883
msgid "Show a diagnostic dialog"
msgstr "يظهر حوار التشخيص"
-#: ../midori/main.c:1891
+#: ../midori/main.c:1885
msgid "Run the specified filename as javascript"
msgstr "تشغيل ملف جافا سكريبت على النحو المحدد"
-#: ../midori/main.c:1893
+#: ../midori/main.c:1887
msgid "Take a snapshot of the specified URI"
msgstr "أخذ لقطة للعنوان المحدد"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1889
msgid "Execute the specified command"
msgstr "تنفيذ الأمر المحدد"
-#: ../midori/main.c:1897
+#: ../midori/main.c:1891
msgid "List available commands to execute with -e/ --execute"
msgstr "قائمة الأوامر المتوفرة لتنفيذ مع -e/ --execute"
-#: ../midori/main.c:1899
+#: ../midori/main.c:1893
msgid "Display program version"
msgstr "إظهار نسخة البرنامج"
-#: ../midori/main.c:1901
+#: ../midori/main.c:1895
msgid "Addresses"
msgstr "عناوين"
-#: ../midori/main.c:1903
+#: ../midori/main.c:1897
msgid "Block URIs according to regular expression PATTERN"
msgstr "كتلة محددات وفقا للنمط التعبير العادي"
-#: ../midori/main.c:1903
+#: ../midori/main.c:1897
msgid "PATTERN"
msgstr "نموذج"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1907
+#: ../midori/main.c:1901
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "إعادة ميدوري ثانية بعد ثوان من الخمول"
-#: ../midori/main.c:1907
+#: ../midori/main.c:1901
msgid "SECONDS"
msgstr "ثواني"
-#: ../midori/main.c:1910
+#: ../midori/main.c:1904
msgid "Redirects console warnings to the specified FILENAME"
msgstr "الموجهات التحذيرات حدة لتحديد FILENAME"
-#: ../midori/main.c:1910
+#: ../midori/main.c:1904
msgid "FILENAME"
msgstr "إسم الملف"
-#: ../midori/main.c:1975
+#: ../midori/main.c:1969
msgid "[Addresses]"
msgstr "[عناوين]"
-#: ../midori/main.c:1985
-msgid "The specified configuration folder is invalid."
-msgstr "إعداد المجلد المحدد غير صالح."
-
-#: ../midori/main.c:2010
+#: ../midori/main.c:2011
msgid "Please report comments, suggestions and bugs to:"
msgstr "الرجاء الإبلاغ عن التعليقات والاقتراحات والعلل إلى:"
-#: ../midori/main.c:2012
+#: ../midori/main.c:2013
msgid "Check for new versions at:"
msgstr "تحقق من توفر نسخ جديدة في:"
-#: ../midori/main.c:2095
-msgid "Website icons"
-msgstr "أيقونات الموقع"
-
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2098
+#: ../midori/main.c:2108
msgid "Saved logins and _passwords"
msgstr "الحسابات و_كلمات السر المحفوظة"
-#: ../midori/main.c:2100
-msgid "Cookies"
-msgstr "كعكات"
+#: ../midori/main.c:2110
+msgid "Cookies and Website data"
+msgstr "ملفات تعريف الارتباط وبيانات المواقع"
-#: ../midori/main.c:2103
-msgid "'Flash' Cookies"
-msgstr "'فلاش' كعكات"
-
-#: ../midori/main.c:2106
-msgid "HTML5 _Databases"
-msgstr "HTML5 _قاعدة بيانات"
-
-#: ../midori/main.c:2109 ../midori/midori-websettings.c:947
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/main.c:2114 ../midori/midori-websettings.c:997
#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
msgstr "ملفات الوب المؤقتة"
-#: ../midori/main.c:2111
-msgid "Offline Application Cache"
-msgstr "ذاكرة التطبيقات بدون اتصال"
+#: ../midori/main.c:2117
+msgid "Website icons"
+msgstr "أيقونات الموقع"
-#: ../midori/main.c:2218
+#: ../midori/main.c:2223
msgid "An unknown error occured"
msgstr "حدث خطأ مجهول"
-#: ../midori/main.c:2324
+#: ../midori/main.c:2330
msgid "An instance of Midori is already running but not responding.\n"
msgstr "هناك مثيل لميدوري قيد التشغيل بالفعل ولكن لا يستجيب.\n"
-#: ../midori/main.c:2360
+#: ../midori/main.c:2366
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "لا يمكن تحميل العلامات: %s\n"
-#: ../midori/main.c:2408
+#: ../midori/main.c:2414
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "لا يمكن تحميل المهلملات: %s\n"
-#: ../midori/main.c:2421
+#: ../midori/main.c:2427
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "لا يمكن تحميل التاريخ: %s\n"
-#: ../midori/main.c:2437
+#: ../midori/main.c:2443
msgid "The following errors occured:"
msgstr "حدثت الأخطاء التالية:"
-#: ../midori/main.c:2453
+#: ../midori/main.c:2459
msgid "_Ignore"
msgstr "_تجاهل"
-#: ../midori/midori-app.c:1331
+#: ../midori/midori-app.c:1339
msgid "_Bookmark"
msgstr "_علامة"
-#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:6049
+#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066
msgid "_Bookmarks"
msgstr "_علامات"
-#: ../midori/midori-app.c:1333
+#: ../midori/midori-app.c:1341
msgid "Add Boo_kmark"
msgstr "أضِف _علامة"
-#: ../midori/midori-app.c:1334
+#: ../midori/midori-app.c:1342
msgid "_Console"
msgstr "_طرفية"
-#: ../midori/midori-app.c:1335
+#: ../midori/midori-app.c:1343
msgid "_Extensions"
msgstr "_إمتدادات"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4619
+#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591
msgid "_History"
msgstr "_سجل"
-#: ../midori/midori-app.c:1337
+#: ../midori/midori-app.c:1345
msgid "_Homepage"
msgstr "_الصفحة الرئيسية"
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1346
msgid "_Userscripts"
msgstr "_النصوص البرمجية المستخدمة"
-#: ../midori/midori-app.c:1339
+#: ../midori/midori-app.c:1347
msgid "New _Tab"
msgstr "تب_ويب جديد"
-#: ../midori/midori-app.c:1340
+#: ../midori/midori-app.c:1348
msgid "_Transfers"
msgstr "_النقل"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1349
msgid "Netscape p_lugins"
msgstr "Netscape _ملحقات"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1350
msgid "_Closed Tabs"
msgstr "_التبويبات المغلقة"
-#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5206
+#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218
msgid "New _Window"
msgstr "نافذة جديدة"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1352
msgid "New _Folder"
msgstr "مج_لد جديد"
@@ -400,140 +374,140 @@ msgstr "علامات غير معتمدة الصيغة."
msgid "Writing failed."
msgstr "فشل الكتابة."
-#: ../midori/midori-browser.c:326 ../midori/midori-browser.c:5288
-#: ../midori/midori-browser.c:5297
+#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5309
msgid "Reload the current page"
msgstr "تحديث الصفحة الحالية"
-#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306
msgid "Stop loading the current page"
msgstr "إيقاف تحميل الصفحة الحالية"
-#: ../midori/midori-browser.c:465
+#: ../midori/midori-browser.c:476
#, c-format
msgid "Failed to update title: %s\n"
msgstr "فشل تحديث عنوان: %s\n"
-#: ../midori/midori-browser.c:478
+#: ../midori/midori-browser.c:489
#, c-format
msgid "Unexpected action '%s'."
msgstr "حدث غير متوقع'%s'."
-#: ../midori/midori-browser.c:568
+#: ../midori/midori-browser.c:569
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (التصفح الخاص)"
-#: ../midori/midori-browser.c:678 ../midori/midori-browser.c:711
+#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
msgid "Toplevel folder"
msgstr "مجلد المستوي عالي"
-#: ../midori/midori-browser.c:768
+#: ../midori/midori-browser.c:774
msgid "New folder"
msgstr "مجلد جديد"
-#: ../midori/midori-browser.c:768
+#: ../midori/midori-browser.c:774
msgid "Edit folder"
msgstr "تحرير المجلد"
-#: ../midori/midori-browser.c:770
+#: ../midori/midori-browser.c:776
msgid "New bookmark"
msgstr "علامة حديدة"
-#: ../midori/midori-browser.c:770
+#: ../midori/midori-browser.c:776
msgid "Edit bookmark"
msgstr "تحرير العلامة"
-#: ../midori/midori-browser.c:801
+#: ../midori/midori-browser.c:818
msgid "_Title:"
msgstr "_عنوان:"
-#: ../midori/midori-browser.c:821 ../midori/midori-searchaction.c:967
+#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
#: ../extensions/feed-panel/main.c:377
msgid "_Address:"
msgstr "_عنوان:"
-#: ../midori/midori-browser.c:844 ../midori/midori-browser.c:4356
+#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328
msgid "_Folder:"
msgstr "_مجلد:"
-#: ../midori/midori-browser.c:860
+#: ../midori/midori-browser.c:877
msgid "Add to _Speed Dial"
msgstr "أضف إلى _الحوار السريع"
-#: ../midori/midori-browser.c:873
+#: ../midori/midori-browser.c:890
msgid "Show in the tool_bar"
msgstr "أظهر في شريط الأدوات"
-#: ../midori/midori-browser.c:888
+#: ../midori/midori-browser.c:905
msgid "Run as _web application"
msgstr "تشغيل كتطبيق انترنت"
-#: ../midori/midori-browser.c:959
+#: ../midori/midori-browser.c:976
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "الملف \"%s\" لا يمكن حفظها في هذا المجلد."
-#: ../midori/midori-browser.c:961
+#: ../midori/midori-browser.c:978
#, c-format
msgid "You don't have permission to write in this location."
msgstr "ليس لديك إذن الكتابة في هذا الموقع."
-#: ../midori/midori-browser.c:968
+#: ../midori/midori-browser.c:985
#, c-format
msgid "There is not enough free space to download \"%s\"."
msgstr "لا توجد مساحة حرة كافية لتحميل \"%s\"."
-#: ../midori/midori-browser.c:971
+#: ../midori/midori-browser.c:988
#, c-format
msgid "The file needs %s but only %s are left."
msgstr "الملف يحتاجج %s ولكن فقط %s مساحة حرة."
-#: ../midori/midori-browser.c:1015 ../midori/midori-browser.c:4425
+#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397
msgid "Save file as"
msgstr "حفظ الملف في"
-#: ../midori/midori-browser.c:1324
+#: ../midori/midori-browser.c:1320
msgid "New Window"
msgstr "نافذة جديدة"
-#: ../midori/midori-browser.c:1324
+#: ../midori/midori-browser.c:1320
msgid "A new window has been opened"
msgstr "تم فتح نافذة جديدة"
-#: ../midori/midori-browser.c:1327
+#: ../midori/midori-browser.c:1323
msgid "New Tab"
msgstr "تبويب جديد"
-#: ../midori/midori-browser.c:1327
+#: ../midori/midori-browser.c:1323
msgid "A new tab has been opened"
msgstr "تم فتح علامة تبويب جديدة"
-#: ../midori/midori-browser.c:1362
+#: ../midori/midori-browser.c:1358
msgid "Error opening the image!"
msgstr "حدث خطأ أثناء فتح الصورة!"
-#: ../midori/midori-browser.c:1363
+#: ../midori/midori-browser.c:1359
msgid "Can not open selected image in a default viewer."
msgstr "لا يمكن فتح الصورة المحددة في العارض الافتراضي."
-#: ../midori/midori-browser.c:1369
+#: ../midori/midori-browser.c:1365
msgid "Error downloading the image!"
msgstr "خطأ في تحميل الصورة!"
-#: ../midori/midori-browser.c:1370
+#: ../midori/midori-browser.c:1366
msgid "Can not download selected image."
msgstr "لا يمكن تنزيل الصورة المحددة."
-#: ../midori/midori-browser.c:1473
+#: ../midori/midori-browser.c:1492
msgid "Save file"
msgstr "حفظ الملف"
-#: ../midori/midori-browser.c:2327
+#: ../midori/midori-browser.c:2367
msgid "Open file"
msgstr "فتح الملف"
-#: ../midori/midori-browser.c:2458
+#: ../midori/midori-browser.c:2499
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -546,139 +520,139 @@ msgstr ""
"ويمكنك أيضاً الذهاب الى الافضليات، تطبيقات في ميدوري، وحدد مجمع الخبر. المرة "
"التالية التي تقوم فوق رمز الأخبار تغذية، ستضاف تلقائيا."
-#: ../midori/midori-browser.c:2464 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "تغدية جديدة"
-#: ../midori/midori-browser.c:2507 ../midori/midori-browser.c:5357
-#: ../panels/midori-bookmarks.c:426
+#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369
+#: ../panels/midori-bookmarks.c:427
msgid "Add a new bookmark"
msgstr "أضف علامة جديدة"
-#: ../midori/midori-browser.c:3004 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
msgid "Empty"
msgstr "فارغ"
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3469
msgid "Toggle text cursor navigation"
msgstr "تبديل مؤشر ملاحة النص"
-#: ../midori/midori-browser.c:3818 ../midori/midori-browser.c:5743
+#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "فشل في إدراج التاريخ : %s\n"
-#: ../midori/midori-browser.c:4153 ../panels/midori-bookmarks.c:742
-#: ../panels/midori-history.c:747
+#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745
+#: ../panels/midori-history.c:803
msgid "Open all in _Tabs"
msgstr "فتح الكل في تبويبات"
-#: ../midori/midori-browser.c:4160 ../panels/midori-bookmarks.c:748
-#: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751
+#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "فتح في تبو_يب جديد"
-#: ../midori/midori-browser.c:4163 ../midori/midori-view.c:2575
-#: ../midori/midori-view.c:4507 ../panels/midori-bookmarks.c:750
-#: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2690
+#: ../midori/midori-view.c:4778 ../panels/midori-bookmarks.c:753
+#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "افتح في _نافذة جديدة"
-#: ../midori/midori-browser.c:4243
+#: ../midori/midori-browser.c:4215
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4244
+#: ../midori/midori-browser.c:4216
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4245
+#: ../midori/midori-browser.c:4217
msgid "Opera"
msgstr "أوبيرا"
-#: ../midori/midori-browser.c:4246
+#: ../midori/midori-browser.c:4218
msgid "Konqueror"
msgstr "كُنكَرر"
-#: ../midori/midori-browser.c:4247
+#: ../midori/midori-browser.c:4219
msgid "Epiphany"
msgstr "إبِفَني"
-#: ../midori/midori-browser.c:4248
+#: ../midori/midori-browser.c:4220
#, c-format
msgid "Firefox (%s)"
msgstr "فيَرفُكس (%s)"
-#: ../midori/midori-browser.c:4269
-msgid "Import bookmarks..."
-msgstr "يتم الأن إستيراد العلامات..."
+#: ../midori/midori-browser.c:4241
+msgid "Import bookmarks…"
+msgstr "يتم الأن إستيراد العلامات…"
-#: ../midori/midori-browser.c:4272 ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374
msgid "_Import bookmarks"
msgstr "_إستورد العلامات"
-#: ../midori/midori-browser.c:4283
+#: ../midori/midori-browser.c:4255
msgid "_Application:"
msgstr "_تطبيق:"
-#: ../midori/midori-browser.c:4348
+#: ../midori/midori-browser.c:4320
msgid "Import from XBEL or HTML file"
msgstr "استيراد من ملف HTML أو XBEL"
-#: ../midori/midori-browser.c:4383
+#: ../midori/midori-browser.c:4355
msgid "Import from a file"
msgstr "استيراد من ملفّ"
-#: ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:4367
msgid "Failed to import bookmarks"
msgstr "فشل إستراد العلامات"
-#: ../midori/midori-browser.c:4430
+#: ../midori/midori-browser.c:4402
msgid "XBEL Bookmarks"
msgstr "العلامات XBEL"
-#: ../midori/midori-browser.c:4435
+#: ../midori/midori-browser.c:4407
msgid "Netscape Bookmarks"
msgstr "مفضلة نتسكيب"
-#: ../midori/midori-browser.c:4449
+#: ../midori/midori-browser.c:4421
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "يمكن لميدوري تصدير فقط XBEL (*.xbel) ونتسكيب (*.html)"
-#: ../midori/midori-browser.c:4464
+#: ../midori/midori-browser.c:4436
msgid "Failed to export bookmarks"
msgstr "فشل تصدير العلامات"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4586
+#: ../midori/midori-browser.c:4558
msgid "Clear Private Data"
msgstr "حذف البيانات الخاصة"
-#: ../midori/midori-browser.c:4590
+#: ../midori/midori-browser.c:4562
msgid "_Clear private data"
msgstr "_حذف البيانات الخاصة"
-#: ../midori/midori-browser.c:4603
+#: ../midori/midori-browser.c:4575
msgid "Clear the following data:"
msgstr "حذف البيانات التالية:"
-#: ../midori/midori-browser.c:4613
+#: ../midori/midori-browser.c:4585
msgid "Last open _tabs"
msgstr "أظهر آخر التبويبات المفتوحة"
-#: ../midori/midori-browser.c:4639
+#: ../midori/midori-browser.c:4611
msgid "Clear private data when _quitting Midori"
msgstr "مسح البيانات الخاصة عند الخروج من ميدوري"
-#: ../midori/midori-browser.c:4815
+#: ../midori/midori-browser.c:4806
msgid "A lightweight web browser."
msgstr "متصفح الويب الخفيف."
-#: ../midori/midori-browser.c:4816
+#: ../midori/midori-browser.c:4807
msgid "See about:version for version info."
msgstr "انظر حول:لمعلومات نسخة الإصدار."
-#: ../midori/midori-browser.c:4818
+#: ../midori/midori-browser.c:4809
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -689,410 +663,419 @@ msgstr ""
"جنو العمومية الصغرى كما نشرت من قبل مؤسسة البرمجيات الحرة ؛ إما الإصدار 2.1 "
"من الرخصة ، أو (باختيارك) أي إصدار لاحق."
-#: ../midori/midori-browser.c:4839
+#: ../midori/midori-browser.c:4830
msgid "translator-credits"
-msgstr ""
-"Arabic Xfce Translation Team (فريق تعريب إكسفس)\n"
-" Karim Oulad Chalha (كريم اولاد الشلحة) \n"
-" Mohamed Al Hargan(محمد الحرقان) "
+msgstr "Karim Oulad Chalha كريم اولاد الشلحة Mohamed Al Hargan محمد الحرقان"
-#: ../midori/midori-browser.c:5204
+#: ../midori/midori-browser.c:5216
msgid "_File"
msgstr "_ملف"
-#: ../midori/midori-browser.c:5207
+#: ../midori/midori-browser.c:5219
msgid "Open a new window"
msgstr "فتح نافذة جديدة"
-#: ../midori/midori-browser.c:5210
+#: ../midori/midori-browser.c:5222
msgid "Open a new tab"
msgstr "فتح تبويب جديد"
-#: ../midori/midori-browser.c:5212
+#: ../midori/midori-browser.c:5224
msgid "New P_rivate Browsing Window"
msgstr "نافذة تصفح جديدة خاصة"
-#: ../midori/midori-browser.c:5216
+#: ../midori/midori-browser.c:5228
msgid "Open a file"
msgstr "فتح ملف"
-#: ../midori/midori-browser.c:5218
-msgid "_Save Page As..."
-msgstr "_حفظ الصفحة باسم..."
+#: ../midori/midori-browser.c:5230
+msgid "_Save Page As…"
+msgstr "_حفظ الصفحة باسم…"
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5231
msgid "Save to a file"
msgstr "حفظ إلى ملف"
-#: ../midori/midori-browser.c:5221
+#: ../midori/midori-browser.c:5233
msgid "Add to Speed _dial"
msgstr "أضف إلى _الحوار السريع"
-#: ../midori/midori-browser.c:5225
+#: ../midori/midori-browser.c:5237
msgid "Add Shortcut to the _desktop"
msgstr "إضافة إلى اختصار سطح المكتب"
-#: ../midori/midori-browser.c:5227
+#: ../midori/midori-browser.c:5239
msgid "Create _Launcher"
msgstr "إنشاء مطلق"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5243
msgid "Subscribe to News _feed"
msgstr "الاشتراك في مصدر أخبار"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5249
msgid "_Close Tab"
msgstr "_غلق التبويب"
-#: ../midori/midori-browser.c:5238
+#: ../midori/midori-browser.c:5250
msgid "Close the current tab"
msgstr "إغلاق علامة التبويب الحالية"
-#: ../midori/midori-browser.c:5240
+#: ../midori/midori-browser.c:5252
msgid "C_lose Window"
msgstr "غلق التافذة"
-#: ../midori/midori-browser.c:5244
+#: ../midori/midori-browser.c:5256
msgid "Print the current page"
msgstr "اطبع الصفحة الحالية"
-#: ../midori/midori-browser.c:5246
+#: ../midori/midori-browser.c:5258
msgid "Close a_ll Windows"
msgstr "إغلاق جميع النوافذ"
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5261
msgid "_Edit"
msgstr "_تحرير"
-#: ../midori/midori-browser.c:5272
-msgid "_Find..."
-msgstr "_العثور على..."
+#: ../midori/midori-browser.c:5284
+msgid "_Find…"
+msgstr "_العثور على…"
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5285
msgid "Find a word or phrase in the page"
msgstr "العثور على كلمة أو عبارة في الصفحة"
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5287
msgid "Find _Next"
msgstr "العثور على التالي"
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5290
msgid "Find _Previous"
msgstr "عث_ور على السابق"
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5294
msgid "Configure the application preferences"
msgstr "تكوين تفضيلات التطبيق"
-#: ../midori/midori-browser.c:5284
+#: ../midori/midori-browser.c:5296
msgid "_View"
msgstr "_عرض"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5297
msgid "_Toolbars"
msgstr "_شريط الأدوات"
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5302
msgid "Reload page without caching"
msgstr "تحديث الصفحة دون التخزين المؤقت"
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5312
msgid "Increase the zoom level"
msgstr "زيادة مستوى التكبير"
-#: ../midori/midori-browser.c:5303
+#: ../midori/midori-browser.c:5315
msgid "Decrease the zoom level"
msgstr "انخفاض مستوى التكبير"
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:5319
msgid "_Encoding"
msgstr "_تشفير"
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:5321
msgid "View So_urce"
msgstr "عرض المصدر"
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5324
msgid "Ca_ret Browsing"
msgstr "إنشاء تصفح"
-#: ../midori/midori-browser.c:5316
+#: ../midori/midori-browser.c:5328
msgid "Toggle fullscreen view"
msgstr "تبديل لعرض ملء الشاشة"
-#: ../midori/midori-browser.c:5318
+#: ../midori/midori-browser.c:5330
msgid "Scroll _Left"
msgstr "انتقل لليسار"
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5333
msgid "Scroll _Down"
msgstr "انتقل إلى للاسفل"
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5336
msgid "Scroll _Up"
msgstr "انتقل إلى للأعلى"
-#: ../midori/midori-browser.c:5327
+#: ../midori/midori-browser.c:5339
msgid "Scroll _Right"
msgstr "انتقل إلى اليمين"
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5342
msgid "_Go"
msgstr "_إذهب"
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5345
msgid "Go back to the previous page"
msgstr "العودة إلى الصفحة السابقة"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5348
msgid "Go forward to the next page"
msgstr "المضي قدما إلى الصفحة التالية"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5352
msgid "Go to the previous sub-page"
msgstr "انتقل إلى الصفحة الفرعية السابقة"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5344
+#: ../midori/midori-browser.c:5356
msgid "Go to the next sub-page"
msgstr "انتقل إلى صفحة فرعية اللاحقة"
-#: ../midori/midori-browser.c:5347
+#: ../midori/midori-browser.c:5359
msgid "Go to your homepage"
msgstr "ذهاب إلى الصفحة الرئيسية"
-#: ../midori/midori-browser.c:5349
+#: ../midori/midori-browser.c:5361
msgid "Empty Trash"
msgstr "سلة المهملات فارغة"
-#: ../midori/midori-browser.c:5352
+#: ../midori/midori-browser.c:5364
msgid "Undo _Close Tab"
msgstr "تراجع عن إ_غلاق التبويب"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5371
msgid "Add a new _folder"
msgstr "أضف مجلد جديد"
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5377
msgid "_Export bookmarks"
msgstr "_صدّر العلامات"
-#: ../midori/midori-browser.c:5368 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497
msgid "_Manage Search Engines"
msgstr "_إدارة محركات البحث"
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5383
msgid "_Clear Private Data"
msgstr "_حذف البيانات الخاصة"
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5386
msgid "_Inspect Page"
msgstr "_معاينة الصفحة"
-#: ../midori/midori-browser.c:5378
+#: ../midori/midori-browser.c:5390
msgid "_Previous Tab"
msgstr "_التبويب السابق"
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5393
msgid "_Next Tab"
msgstr "_التبويب التالي"
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5395
msgid "Move Tab _Backward"
msgstr "نقل علامة التبويب"
-#: ../midori/midori-browser.c:5385
+#: ../midori/midori-browser.c:5397
msgid "_Move Tab Forward"
msgstr "_حرك التبويب إلى الأمام"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5400
msgid "Focus _Current Tab"
msgstr "فصل التبويب ال_حالي"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5403
msgid "Focus _Next view"
msgstr "عرض التركيز التالي"
-#: ../midori/midori-browser.c:5394
+#: ../midori/midori-browser.c:5406
msgid "Only show the Icon of the _Current Tab"
msgstr "أظهر فقط أ_يقونة التبويب الحالي"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5409
msgid "_Duplicate Current Tab"
msgstr "_مضاعفة التبويب الحالي"
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5412
msgid "Close Ot_her Tabs"
msgstr "أغلق تبويبات أخر_ى"
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5415
msgid "Open last _session"
msgstr "فتح آخر جلسة"
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5418
msgid "_Help"
msgstr "_مساعدة"
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5420
msgid "_Frequent Questions"
msgstr "_أسئلة شائعة"
-#: ../midori/midori-browser.c:5411
-msgid "_Report a Problem..."
-msgstr "_بلغ عن عله..."
-
#: ../midori/midori-browser.c:5423
+msgid "_Report a Problem…"
+msgstr "_بلغ عن عله…"
+
+#: ../midori/midori-browser.c:5435
msgid "_Menubar"
msgstr "_شريط القائمة"
-#: ../midori/midori-browser.c:5427
+#: ../midori/midori-browser.c:5439
msgid "_Navigationbar"
msgstr "_شريط التصفح"
-#: ../midori/midori-browser.c:5431
+#: ../midori/midori-browser.c:5443
msgid "Side_panel"
msgstr "لوحة ال_جانبية"
-#: ../midori/midori-browser.c:5432
+#: ../midori/midori-browser.c:5444
msgid "Sidepanel"
msgstr "لوحة جانبية"
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5447
msgid "_Bookmarkbar"
msgstr "_شريط العلامات"
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5451
msgid "_Statusbar"
msgstr "_شريط الحالة"
-#: ../midori/midori-browser.c:5448 ../midori/midori-websettings.c:303
+#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312
msgid "_Automatic"
msgstr "_تلقائي"
-#: ../midori/midori-browser.c:5451 ../midori/midori-websettings.c:228
-msgid "Chinese (BIG5)"
-msgstr "صيني (BIG5)"
+#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236
+msgid "Chinese Traditional (BIG5)"
+msgstr "صيني تقليدي (Big5)"
+
+#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237
+msgid "Chinese Simplified (GB18030)"
+msgstr "صيني مبسّط (GB18030)"
#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5455
+#: ../midori/midori-browser.c:5470
msgid "Japanese (SHIFT__JIS)"
msgstr "ياباني (_Shift-JIS)"
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:230
+#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239
msgid "Korean (EUC-KR)"
msgstr "كوري (_EUC-KR)"
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:231
+#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240
msgid "Russian (KOI8-R)"
msgstr "روسي (_KOI8-R)"
-#: ../midori/midori-browser.c:5464 ../midori/midori-websettings.c:232
+#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241
msgid "Unicode (UTF-8)"
msgstr "يونيكود (UTF-_8)"
-#: ../midori/midori-browser.c:5467 ../midori/midori-websettings.c:233
+#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242
msgid "Western (ISO-8859-1)"
msgstr "غربي (_ISO-8859-1)"
-#: ../midori/midori-browser.c:5470 ../midori/midori-websettings.c:234
-#: ../midori/midori-websettings.c:309 ../katze/katze-utils.c:635
-msgid "Custom..."
-msgstr "مخصص..."
+#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243
+#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641
+msgid "Custom…"
+msgstr "مخصص…"
-#: ../midori/midori-browser.c:5976
+#: ../midori/midori-browser.c:5991
msgid "_Separator"
msgstr "_فاصل"
-#: ../midori/midori-browser.c:5983
-msgid "_Location..."
-msgstr "_موقع..."
+#: ../midori/midori-browser.c:5998
+msgid "_Location…"
+msgstr "_موقع…"
-#: ../midori/midori-browser.c:5985
+#: ../midori/midori-browser.c:6000
msgid "Open a particular location"
msgstr "فتح موقع معين"
-#: ../midori/midori-browser.c:6007
-msgid "_Web Search..."
-msgstr "_بحث في الوِب..."
+#: ../midori/midori-browser.c:6022
+msgid "_Web Search…"
+msgstr "_بحث في الوِب…"
-#: ../midori/midori-browser.c:6009
+#: ../midori/midori-browser.c:6024
msgid "Run a web search"
msgstr "شغل البحث في الوب"
-#: ../midori/midori-browser.c:6036
+#: ../midori/midori-browser.c:6051
msgid "Reopen a previously closed tab or window"
msgstr "إعادة فتح التبويب مغلقة سابقا ، أو نافذة"
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:6068
msgid "Show the saved bookmarks"
msgstr "عرض العلامات المحفوظة"
-#: ../midori/midori-browser.c:6065
+#: ../midori/midori-browser.c:6085
msgid "_Tools"
msgstr "_أدوات"
-#: ../midori/midori-browser.c:6080
+#: ../midori/midori-browser.c:6101
msgid "_Window"
msgstr "_النافذة"
-#: ../midori/midori-browser.c:6082
+#: ../midori/midori-browser.c:6103
msgid "Show a list of all open tabs"
msgstr "أظهر قائمة كل التبويبات المفتوحة"
-#: ../midori/midori-browser.c:6096
+#: ../midori/midori-browser.c:6117
msgid "_Menu"
msgstr "_قائمة"
-#: ../midori/midori-browser.c:6098
+#: ../midori/midori-browser.c:6119
msgid "Menu"
msgstr "قائمة"
-#: ../midori/midori-browser.c:6768
+#: ../midori/midori-browser.c:6933
#, c-format
msgid "Unexpected setting '%s'"
msgstr "إعداد غير متوقع '%s'"
-#: ../midori/midori-extension.c:310
+#: ../midori/midori-extension.c:329
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "إعدادات الامتداد '%s' لا يمكن تحميلها: %s\n"
-#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818
-#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027
+#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
+#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
#: ../extensions/addons.c:1695
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "إعدادات الامتداد '%s' لا يمكن حفظها: %s\n"
-#: ../midori/midori-locationaction.c:425
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "فشل التحديد من التاريخ\n"
-
-#: ../midori/midori-locationaction.c:509
-#, c-format
-msgid "Search for %s"
-msgstr "بحث عن %s"
-
-#: ../midori/midori-locationaction.c:539
+#: ../midori/midori-locationaction.c:394
#, c-format
msgid "Search with %s"
msgstr "البحث بـ %s"
+#: ../midori/midori-locationaction.c:412
+msgid "Search with…"
+msgstr "بحث باستخدام…"
+
+#: ../midori/midori-locationaction.c:537
+#, c-format
+msgid "Failed to select from history\n"
+msgstr "فشل التحديد من التاريخ\n"
+
+#: ../midori/midori-locationaction.c:624
+#, c-format
+msgid "Search for %s"
+msgstr "بحث عن %s"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1315
+#: ../midori/midori-locationaction.c:1398
msgid "Paste and p_roceed"
msgstr "لصق ثم تابع"
-#: ../midori/midori-locationaction.c:1679
+#: ../midori/midori-locationaction.c:1739
msgid "Not verified"
msgstr "غير متحقق منه"
-#: ../midori/midori-locationaction.c:1697
+#: ../midori/midori-locationaction.c:1759
msgid "Verified and encrypted connection"
msgstr "التحقق من الاتصال وتشفيره"
+#: ../midori/midori-locationaction.c:1771
+msgid "Open, unencrypted connection"
+msgstr "اتصال مفتوح وغير مشفر"
+
#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
msgid "Align sidepanel to the right"
@@ -1106,501 +1089,501 @@ msgstr "أغلق الشريط"
msgid "Align sidepanel to the left"
msgstr "محاذاة اللوحة الجانبية إلى اليسار"
-#: ../midori/midori-websettings.c:210
+#: ../midori/midori-websettings.c:218
msgid "Show Speed Dial"
msgstr "عرض الطلب السريع"
-#: ../midori/midori-websettings.c:211
+#: ../midori/midori-websettings.c:219
msgid "Show Homepage"
msgstr "أظهر الصفحة الرئيسية"
-#: ../midori/midori-websettings.c:229
+#: ../midori/midori-websettings.c:238
msgid "Japanese (SHIFT_JIS)"
msgstr "ياباني (_Shift-JIS)"
-#: ../midori/midori-websettings.c:249
+#: ../midori/midori-websettings.c:258
msgid "New tab"
msgstr "تبويب جديد"
-#: ../midori/midori-websettings.c:250
+#: ../midori/midori-websettings.c:259
msgid "New window"
msgstr "نافذة جديدة"
-#: ../midori/midori-websettings.c:251
+#: ../midori/midori-websettings.c:260
msgid "Current tab"
msgstr "التبويب الحالي"
-#: ../midori/midori-websettings.c:266
+#: ../midori/midori-websettings.c:275
msgid "Default"
msgstr "المبدئي"
-#: ../midori/midori-websettings.c:267
+#: ../midori/midori-websettings.c:276
msgid "Icons"
msgstr "أيقونات"
-#: ../midori/midori-websettings.c:268
+#: ../midori/midori-websettings.c:277
msgid "Small icons"
msgstr "أيقونات الصغيرة"
-#: ../midori/midori-websettings.c:269
+#: ../midori/midori-websettings.c:278
msgid "Text"
msgstr "نص"
-#: ../midori/midori-websettings.c:270
+#: ../midori/midori-websettings.c:279
msgid "Icons and text"
msgstr "أيقونات ونص"
-#: ../midori/midori-websettings.c:271
+#: ../midori/midori-websettings.c:280
msgid "Text beside icons"
msgstr "نص بجانب الأيقونات"
-#: ../midori/midori-websettings.c:286
+#: ../midori/midori-websettings.c:295
msgid "Automatic (GNOME or environment)"
msgstr "تلقائي (جنوم أو environment)"
-#: ../midori/midori-websettings.c:287
+#: ../midori/midori-websettings.c:296
msgid "HTTP proxy server"
msgstr "خادم بروكسي HTTP"
-#: ../midori/midori-websettings.c:288
+#: ../midori/midori-websettings.c:297
msgid "No proxy server"
msgstr "بدون خادم بروكسي"
-#: ../midori/midori-websettings.c:305
+#: ../midori/midori-websettings.c:314
msgid "Safari"
msgstr "سافاري"
-#: ../midori/midori-websettings.c:306
+#: ../midori/midori-websettings.c:315
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:307
+#: ../midori/midori-websettings.c:316
msgid "Firefox"
msgstr "فيَرفُكس"
-#: ../midori/midori-websettings.c:308
+#: ../midori/midori-websettings.c:317
msgid "Internet Explorer"
msgstr "إنترنت إكسبلورر"
-#: ../midori/midori-websettings.c:361
+#: ../midori/midori-websettings.c:401
msgid "Remember last window size"
msgstr "نتذكر حجم الإطار الماضي"
-#: ../midori/midori-websettings.c:362
+#: ../midori/midori-websettings.c:402
msgid "Whether to save the last window size"
msgstr "إذا كنت تريد حفظ حجم الإطار الأخير"
-#: ../midori/midori-websettings.c:370
+#: ../midori/midori-websettings.c:410
msgid "Last window width"
msgstr "عرض آخر نافذة"
-#: ../midori/midori-websettings.c:371
+#: ../midori/midori-websettings.c:411
msgid "The last saved window width"
msgstr "عرض آخر نافذة محفوظة"
-#: ../midori/midori-websettings.c:379
+#: ../midori/midori-websettings.c:419
msgid "Last window height"
msgstr "آخر ارتفاع للنافذة"
-#: ../midori/midori-websettings.c:380
+#: ../midori/midori-websettings.c:420
msgid "The last saved window height"
msgstr "آخر ارتفاع محفوظ للنافذة"
-#: ../midori/midori-websettings.c:405
+#: ../midori/midori-websettings.c:445
msgid "Last panel position"
msgstr "آخر موقع للوحة"
-#: ../midori/midori-websettings.c:406
+#: ../midori/midori-websettings.c:446
msgid "The last saved panel position"
msgstr "آخر موقع محفوظ للوحة"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:415
+#: ../midori/midori-websettings.c:455
msgid "Last panel page"
msgstr "آخر صفحة للوحة"
-#: ../midori/midori-websettings.c:416
+#: ../midori/midori-websettings.c:456
msgid "The last saved panel page"
msgstr "آخر صفحة لوحة محفوظة"
-#: ../midori/midori-websettings.c:424
+#: ../midori/midori-websettings.c:464
msgid "Last Web search"
msgstr "آخر بحث إنترنت"
-#: ../midori/midori-websettings.c:425
+#: ../midori/midori-websettings.c:465
msgid "The last saved Web search"
msgstr "آخر بحث ويب محفوظ"
-#: ../midori/midori-websettings.c:434
+#: ../midori/midori-websettings.c:474
msgid "Show Menubar"
msgstr "عرض شريط القوائم"
-#: ../midori/midori-websettings.c:435
+#: ../midori/midori-websettings.c:475
msgid "Whether to show the menubar"
msgstr "إظهار شريط القوائم في كل ألأحوال"
-#: ../midori/midori-websettings.c:443
+#: ../midori/midori-websettings.c:483
msgid "Show Navigationbar"
msgstr "اظهر شريط التصفح"
-#: ../midori/midori-websettings.c:444
+#: ../midori/midori-websettings.c:484
msgid "Whether to show the navigationbar"
msgstr "إظهار شريط التصفح في كل ألأحوال"
-#: ../midori/midori-websettings.c:452
+#: ../midori/midori-websettings.c:492
msgid "Show Bookmarkbar"
msgstr "إظهار العلامات"
-#: ../midori/midori-websettings.c:453
+#: ../midori/midori-websettings.c:493
msgid "Whether to show the bookmarkbar"
msgstr "إظهار العلامات في كل ألأحوال"
-#: ../midori/midori-websettings.c:461
+#: ../midori/midori-websettings.c:501
msgid "Show Panel"
msgstr "تظهر لوحة"
-#: ../midori/midori-websettings.c:462
+#: ../midori/midori-websettings.c:502
msgid "Whether to show the panel"
msgstr "إظهار لوحة في كل ألأحوال"
-#: ../midori/midori-websettings.c:470
+#: ../midori/midori-websettings.c:510
msgid "Show Statusbar"
msgstr "عرض شريط الحالة"
-#: ../midori/midori-websettings.c:471
+#: ../midori/midori-websettings.c:511
msgid "Whether to show the statusbar"
msgstr "إظهار شريط الحالة في كل ألأحوال"
-#: ../midori/midori-websettings.c:480
+#: ../midori/midori-websettings.c:520
msgid "Toolbar Style:"
msgstr "نمط شريط الأدوات:"
-#: ../midori/midori-websettings.c:481
+#: ../midori/midori-websettings.c:521
msgid "The style of the toolbar"
msgstr "نمط شريط الأدوات"
-#: ../midori/midori-websettings.c:490
+#: ../midori/midori-websettings.c:530
msgid "Toolbar Items"
msgstr "عناصر شريط أدوات"
-#: ../midori/midori-websettings.c:491
+#: ../midori/midori-websettings.c:531
msgid "The items to show on the toolbar"
msgstr "العناصر التي تظهر على شريط الأدوات"
-#: ../midori/midori-websettings.c:499
+#: ../midori/midori-websettings.c:539
msgid "Compact Sidepanel"
msgstr "ضغط اللوحة الجانبية"
-#: ../midori/midori-websettings.c:500
+#: ../midori/midori-websettings.c:540
msgid "Whether to make the sidepanel compact"
msgstr "ضغط اللوحة الجانبية في كل ألأحوال"
-#: ../midori/midori-websettings.c:515
+#: ../midori/midori-websettings.c:555
msgid "Align sidepanel on the right"
msgstr "محاذاة اللوحة الجانبية على اليمين"
-#: ../midori/midori-websettings.c:516
+#: ../midori/midori-websettings.c:556
msgid "Whether to align the sidepanel on the right"
msgstr "محاذاة اللوحة الجانبية على اليمين في كل ألأحوال"
-#: ../midori/midori-websettings.c:531
+#: ../midori/midori-websettings.c:571
msgid "Open panels in separate windows"
msgstr "فتح اللوحات في إطارات منفصلة"
-#: ../midori/midori-websettings.c:532
+#: ../midori/midori-websettings.c:572
msgid "Whether to always open panels in separate windows"
msgstr "فتح اللوحات في إطارات منفصلة دائماً"
-#: ../midori/midori-websettings.c:541
+#: ../midori/midori-websettings.c:581
msgid "When Midori starts:"
msgstr "عندما يبدأ ميدوري:"
-#: ../midori/midori-websettings.c:542
+#: ../midori/midori-websettings.c:582
msgid "What to do when Midori starts"
msgstr "ماذا تفعل عندما يبدأ ميدوري"
-#: ../midori/midori-websettings.c:551
+#: ../midori/midori-websettings.c:591
msgid "Homepage:"
msgstr "الصفحة الرئيسية:"
-#: ../midori/midori-websettings.c:552
+#: ../midori/midori-websettings.c:592
msgid "The homepage"
msgstr "الصفحة الرئيسية"
-#: ../midori/midori-websettings.c:567
+#: ../midori/midori-websettings.c:607
msgid "Show crash dialog"
msgstr "عرض حوار التحطم"
-#: ../midori/midori-websettings.c:568
+#: ../midori/midori-websettings.c:608
msgid "Show a dialog after Midori crashed"
msgstr "عرض الحوار بعد تحطم ميدوري"
-#: ../midori/midori-websettings.c:576
+#: ../midori/midori-websettings.c:616
msgid "Save downloaded files to:"
msgstr "حفظ الملفات التي تم تحميلها في:"
-#: ../midori/midori-websettings.c:577
+#: ../midori/midori-websettings.c:617
msgid "The folder downloaded files are saved to"
msgstr "يتم حفظ ملفات التحميل في مجلد"
-#: ../midori/midori-websettings.c:585
+#: ../midori/midori-websettings.c:625
msgid "Text Editor"
msgstr "محرر المصوص"
-#: ../midori/midori-websettings.c:586
+#: ../midori/midori-websettings.c:626
msgid "An external text editor"
msgstr "محرر نص خارجي"
-#: ../midori/midori-websettings.c:601
+#: ../midori/midori-websettings.c:641
msgid "News Aggregator"
msgstr "مجمع الأخبار"
-#: ../midori/midori-websettings.c:602
+#: ../midori/midori-websettings.c:642
msgid "An external news aggregator"
msgstr "مجمع الأخبار الخارجية"
-#: ../midori/midori-websettings.c:610
+#: ../midori/midori-websettings.c:650
msgid "Location entry Search"
msgstr "دخول مكان البحث"
-#: ../midori/midori-websettings.c:611
+#: ../midori/midori-websettings.c:651
msgid "The search to perform inside the location entry"
msgstr "أداء البحث داخل الموقع"
-#: ../midori/midori-websettings.c:619
+#: ../midori/midori-websettings.c:659
msgid "Preferred Encoding"
msgstr "الترميز المفضل"
-#: ../midori/midori-websettings.c:620
+#: ../midori/midori-websettings.c:660
msgid "The preferred character encoding"
msgstr "ترميز الحرف المفضل"
-#: ../midori/midori-websettings.c:630
+#: ../midori/midori-websettings.c:670
msgid "Always Show Tabbar"
msgstr "أظهر دائما شريط التبويب"
-#: ../midori/midori-websettings.c:631
+#: ../midori/midori-websettings.c:671
msgid "Always show the tabbar"
msgstr "أظهر دائما شريط التبويب"
-#: ../midori/midori-websettings.c:639
+#: ../midori/midori-websettings.c:684
msgid "Close Buttons on Tabs"
msgstr "أزرار الإغلاق على الألسنة"
-#: ../midori/midori-websettings.c:640
+#: ../midori/midori-websettings.c:685
msgid "Whether tabs have close buttons"
msgstr "حتى إذا كانت العلامات على أزرار قريبة"
-#: ../midori/midori-websettings.c:665
+#: ../midori/midori-websettings.c:710
msgid "Open new pages in:"
msgstr "فتح صفحات جديدة في:"
-#: ../midori/midori-websettings.c:666
+#: ../midori/midori-websettings.c:711
msgid "Where to open new pages"
msgstr "أين يتم فتح صفحات جديدة"
-#: ../midori/midori-websettings.c:675
+#: ../midori/midori-websettings.c:720
msgid "Middle click opens Selection"
msgstr "نقر الزر الأوسط يفتح التحديد"
-#: ../midori/midori-websettings.c:676
+#: ../midori/midori-websettings.c:721
msgid "Load an address from the selection via middle click"
msgstr "تحميل عنوان محدد بالنقر على الزر الاوسط"
-#: ../midori/midori-websettings.c:684
+#: ../midori/midori-websettings.c:729
msgid "Open tabs in the background"
msgstr "فتح علامات التبويب في الخلفية"
-#: ../midori/midori-websettings.c:685
+#: ../midori/midori-websettings.c:730
msgid "Whether to open new tabs in the background"
msgstr "فتح علامات تبويب جديدة في الخلفية في كل الأحوال"
-#: ../midori/midori-websettings.c:693
+#: ../midori/midori-websettings.c:738
msgid "Open Tabs next to Current"
msgstr "فتح علامات بجانب الحالية"
-#: ../midori/midori-websettings.c:694
+#: ../midori/midori-websettings.c:739
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr "فتح علامات تبويب جديدة بجوار علامة التبويب الحالية أو بعد الأخيرة"
-#: ../midori/midori-websettings.c:702
+#: ../midori/midori-websettings.c:747
msgid "Open popups in tabs"
msgstr "فتح النوافذ المنبثقة في علامات تبويب"
-#: ../midori/midori-websettings.c:703
+#: ../midori/midori-websettings.c:748
msgid "Whether to open popup windows in tabs"
msgstr "فتح النوافذ المنبثقة في علامات تبويب في كل الأحوال"
-#: ../midori/midori-websettings.c:713 ../extensions/statusbar-features.c:131
+#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134
msgid "Load images automatically"
msgstr "تحميل الصور تلقائيا"
-#: ../midori/midori-websettings.c:714
+#: ../midori/midori-websettings.c:759
msgid "Load and display images automatically"
msgstr "تحميل وعرض الصور تلقائيا"
-#: ../midori/midori-websettings.c:721 ../extensions/statusbar-features.c:140
+#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143
msgid "Enable scripts"
msgstr "تمكين النصوص البرمجية"
-#: ../midori/midori-websettings.c:722
+#: ../midori/midori-websettings.c:767
msgid "Enable embedded scripting languages"
msgstr "تمكين لغات البرمجة المضمنة"
-#: ../midori/midori-websettings.c:729 ../extensions/statusbar-features.c:149
+#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154
msgid "Enable Netscape plugins"
msgstr "تمكين إضافات نتسكيب"
-#: ../midori/midori-websettings.c:730
+#: ../midori/midori-websettings.c:775
msgid "Enable embedded Netscape plugin objects"
msgstr "تمكين لغات البرمجة المضمنة في إضافات نتسكيب"
-#: ../midori/midori-websettings.c:750
+#: ../midori/midori-websettings.c:790
msgid "Enable Spell Checking"
msgstr "تمكين التدقيق الإملائي"
-#: ../midori/midori-websettings.c:751
+#: ../midori/midori-websettings.c:791
msgid "Enable spell checking while typing"
msgstr "تمكين التدقيق الإملائي أثناء الكتابة"
-#: ../midori/midori-websettings.c:757
+#: ../midori/midori-websettings.c:797
msgid "Enable HTML5 database support"
msgstr "تمكين قاعدة بيانات دعم HTML5 في كل الأحوال"
-#: ../midori/midori-websettings.c:758
+#: ../midori/midori-websettings.c:798
msgid "Whether to enable HTML5 database support"
msgstr "تمكين قاعدة بيانات دعم HTML5 في كل الأحوال"
-#: ../midori/midori-websettings.c:764
+#: ../midori/midori-websettings.c:804
msgid "Enable HTML5 local storage support"
msgstr "تمكين دعم HTML5 التخزين المحلية"
-#: ../midori/midori-websettings.c:765
+#: ../midori/midori-websettings.c:805
msgid "Whether to enable HTML5 local storage support"
msgstr "لتفعيل دعم تخزين المحلي HTML5"
-#: ../midori/midori-websettings.c:771
+#: ../midori/midori-websettings.c:811
msgid "Enable offline web application cache"
msgstr "تمكين التخزين المؤقت لتطبيق ويب"
-#: ../midori/midori-websettings.c:772
+#: ../midori/midori-websettings.c:812
msgid "Whether to enable offline web application cache"
msgstr "لتمكين تخزين المؤقت لتطبيقات الوب"
-#: ../midori/midori-websettings.c:788
+#: ../midori/midori-websettings.c:828
msgid "Flash window on background tabs"
msgstr "فتح الرابط في لسان في الخلف"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:829
msgid "Flash the browser window if a new tab was opened in the background"
msgstr "فتح علامات التبويب الجديدة في الخلفية في كل الأحوال"
-#: ../midori/midori-websettings.c:797
+#: ../midori/midori-websettings.c:837
msgid "Enable WebGL support"
msgstr "تمكين قاعدة بيانات دعم HTML5 في كل الأحوال"
-#: ../midori/midori-websettings.c:798
+#: ../midori/midori-websettings.c:838
msgid "Allow websites to use OpenGL rendering"
msgstr "السماح للمواقع باستخدام OpenGL للتقديم"
-#: ../midori/midori-websettings.c:814
+#: ../midori/midori-websettings.c:864
msgid "Zoom Text and Images"
msgstr "تكبير النص والصور"
-#: ../midori/midori-websettings.c:815
+#: ../midori/midori-websettings.c:865
msgid "Whether to zoom text and images"
msgstr "تكبير النص والصور في كل الاحوال"
-#: ../midori/midori-websettings.c:830
+#: ../midori/midori-websettings.c:880
msgid "Find inline while typing"
msgstr "العثور على السطر أثناء الكتابة"
-#: ../midori/midori-websettings.c:831
+#: ../midori/midori-websettings.c:881
msgid "Whether to automatically find inline while typing"
msgstr "العثور على السطر أثناء الكتابة في كل الاحوال"
-#: ../midori/midori-websettings.c:846
+#: ../midori/midori-websettings.c:896
msgid "Kinetic scrolling"
msgstr "حركية التمرير"
-#: ../midori/midori-websettings.c:847
+#: ../midori/midori-websettings.c:897
msgid "Whether scrolling should kinetically move according to speed"
msgstr "على كل ألأحوال حركة التمرير تناسب سرعة التنقل"
-#: ../midori/midori-websettings.c:855
+#: ../midori/midori-websettings.c:905
msgid "Delete old Cookies after:"
msgstr "حذف الكوكيز القديمة بعد:"
-#: ../midori/midori-websettings.c:856
+#: ../midori/midori-websettings.c:906
msgid "The maximum number of days to save cookies for"
msgstr "الحد الأقصى لعدد الأيام لحفظ الكوكيز"
-#: ../midori/midori-websettings.c:872
+#: ../midori/midori-websettings.c:922
msgid "Only accept Cookies from sites you visit"
msgstr "فقط قبول ملفات تعريف الارتباط من المواقع التي قمت بزيارتها"
-#: ../midori/midori-websettings.c:873
+#: ../midori/midori-websettings.c:923
msgid "Block cookies sent by third-party websites"
msgstr "حظر ملفات تعريف الارتباط المرسلة من مواقع الطرف الثالث"
-#: ../midori/midori-websettings.c:887
+#: ../midori/midori-websettings.c:937
msgid "Delete pages from history after:"
msgstr "حذف الصفحات القديمة بعد:"
-#: ../midori/midori-websettings.c:888
+#: ../midori/midori-websettings.c:938
msgid "The maximum number of days to save the history for"
msgstr "الحد الأقصى لعدد الأيام لحفظ التاريخ ل"
-#: ../midori/midori-websettings.c:903
+#: ../midori/midori-websettings.c:953
msgid "Proxy server"
msgstr "خادم بروكسي"
-#: ../midori/midori-websettings.c:904
+#: ../midori/midori-websettings.c:954
msgid "The type of proxy server to use"
msgstr "نوع الخادم الوكيل المستخدم"
-#: ../midori/midori-websettings.c:913
+#: ../midori/midori-websettings.c:963
msgid "HTTP Proxy Server"
msgstr "خادم وكيل HTTP"
-#: ../midori/midori-websettings.c:914
+#: ../midori/midori-websettings.c:964
msgid "The proxy server used for HTTP connections"
msgstr "خادم proxy المستعمل لإتصالات HTTP"
-#: ../midori/midori-websettings.c:929
+#: ../midori/midori-websettings.c:979
msgid "Port"
msgstr "المنفذ"
-#: ../midori/midori-websettings.c:930
+#: ../midori/midori-websettings.c:980
msgid "The proxy server port used for HTTP connections"
msgstr "منفذ الملقم الوكيل المستخدمة للاتصالات HTTP"
-#: ../midori/midori-websettings.c:948
+#: ../midori/midori-websettings.c:998
msgid "The maximum size of cached pages on disk"
msgstr "المساحة القصوى المخصصة لحفظ الصفحات على القرص"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:965
+#: ../midori/midori-websettings.c:1015
msgid "Identify as"
msgstr "تعرف كـ"
-#: ../midori/midori-websettings.c:966
+#: ../midori/midori-websettings.c:1016
msgid "What to identify as to web pages"
msgstr "كماذا تريد تعريف نفسك لصفحات الوب"
-#: ../midori/midori-websettings.c:982
+#: ../midori/midori-websettings.c:1032
msgid "Identification string"
msgstr "تعريف الجملة"
-#: ../midori/midori-websettings.c:983
+#: ../midori/midori-websettings.c:1033
msgid "The application identification string"
msgstr "تطبيق تعريف الجمل"
-#: ../midori/midori-websettings.c:999
+#: ../midori/midori-websettings.c:1049
msgid "Preferred languages"
msgstr "اللغات المفضلة"
-#: ../midori/midori-websettings.c:1000
+#: ../midori/midori-websettings.c:1050
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1608,286 +1591,299 @@ msgstr ""
"نقطة للفصل بين قائمة من اللغات المفضلة لجعل صفحات الوب متعددة اللغات, كمثال "
"\"ar\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1065
msgid "Clear private data"
msgstr "مسح البيانات الخاصة"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:1066
msgid "The private data selected for deletion"
msgstr "البيانات الخاصة المحددة للحذف"
-#: ../midori/midori-websettings.c:1031
+#: ../midori/midori-websettings.c:1081
msgid "Clear data"
msgstr "مسح البيانات"
-#: ../midori/midori-websettings.c:1032
+#: ../midori/midori-websettings.c:1082
msgid "The data selected for deletion"
msgstr "بيانات محددة للحذف"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1065
+#: ../midori/midori-websettings.c:1131
msgid "Strip referrer details sent to websites"
msgstr "شريط المرجعية أرسل التفاصيل إلى مواقع ويب"
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1067
+#: ../midori/midori-websettings.c:1133
msgid "Whether the \"Referer\" header should be shortened to the hostname"
msgstr "ما إذا كان ينبغي تقصير مسار \"إنعاش\" إلى اسم المضيف"
-#: ../midori/midori-websettings.c:1081
+#: ../midori/midori-websettings.c:1147
msgid "Always use my font choices"
msgstr "دائماً استخدام الخطوط التي حددت"
-#: ../midori/midori-websettings.c:1082
+#: ../midori/midori-websettings.c:1148
msgid "Override fonts picked by websites with user preferences"
msgstr "استبدل خطوط المواقع بخطوط تفضيلات المستخدم"
-#: ../midori/midori-view.c:1327
+#: ../midori/midori-view.c:1375
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s تريد حفظ قاعدة بيانات HTML5."
-#: ../midori/midori-view.c:1331 ../midori/midori-view.c:1361
+#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413
msgid "_Deny"
msgstr "_رفض"
-#: ../midori/midori-view.c:1331 ../midori/midori-view.c:1361
+#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413
msgid "_Allow"
msgstr "_سماح"
-#: ../midori/midori-view.c:1357
+#: ../midori/midori-view.c:1408
#, c-format
msgid "%s wants to know your location."
msgstr "%s يريد أن يعرف مكانك."
-#: ../midori/midori-view.c:1448
+#: ../midori/midori-view.c:1502
#, c-format
msgid "Error - %s"
msgstr "خطأ - %s"
-#: ../midori/midori-view.c:1449
+#: ../midori/midori-view.c:1503
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "هذه الصفحة '%s' لا يمكن تحميلها."
-#: ../midori/midori-view.c:1451
+#: ../midori/midori-view.c:1505
msgid "Try again"
msgstr "حاول مجددا"
-#: ../midori/midori-view.c:1613 ../midori/midori-view.c:2516
+#: ../midori/midori-view.c:1703 ../midori/midori-view.c:2625
#, c-format
msgid "Send a message to %s"
msgstr "ارسال رسالة إلى %s"
-#: ../midori/midori-view.c:2347 ../midori/midori-view.c:2665
+#: ../midori/midori-view.c:2455 ../midori/midori-view.c:2781
msgid "Inspect _Element"
msgstr "تفقد عنصر"
-#: ../midori/midori-view.c:2399
+#: ../midori/midori-view.c:2507
msgid "Open Link in New _Tab"
msgstr "فتح وصلة جديدة في لسان جديد"
-#: ../midori/midori-view.c:2403
+#: ../midori/midori-view.c:2511
msgid "Open Link in _Foreground Tab"
msgstr "فتح الرابط في لسان للأمام"
-#: ../midori/midori-view.c:2404
+#: ../midori/midori-view.c:2512
msgid "Open Link in _Background Tab"
msgstr "فتح الرابط في لسان في الخلف"
-#: ../midori/midori-view.c:2407
+#: ../midori/midori-view.c:2515
msgid "Open Link in New _Window"
msgstr "فتح الرابط في نافذة جديدة"
-#: ../midori/midori-view.c:2410
+#: ../midori/midori-view.c:2518
msgid "Open Link as Web A_pplication"
msgstr "فتح الرابط كتطبيق"
-#: ../midori/midori-view.c:2415
+#: ../midori/midori-view.c:2523
msgid "Copy Link de_stination"
msgstr "انسخ وجهة الرابط"
-#: ../midori/midori-view.c:2431
+#: ../midori/midori-view.c:2539
msgid "Open _Image in New Tab"
msgstr "فتح الصورة في لسان جديد"
-#: ../midori/midori-view.c:2434
+#: ../midori/midori-view.c:2542
msgid "Copy Image _Address"
msgstr "نسخ عنوان الصورة"
-#: ../midori/midori-view.c:2437
+#: ../midori/midori-view.c:2545
msgid "Save I_mage"
msgstr "حفظ الصورة"
-#: ../midori/midori-view.c:2440
+#: ../midori/midori-view.c:2548
msgid "Open in Image _Viewer"
msgstr "افتح في عارض الصور"
-#: ../midori/midori-view.c:2447
+#: ../midori/midori-view.c:2555
msgid "Copy Video _Address"
msgstr "نسخ عنوان الفيديو"
-#: ../midori/midori-view.c:2450
+#: ../midori/midori-view.c:2558
msgid "Save _Video"
msgstr "حفظ الفيديو"
-#: ../midori/midori-view.c:2450
+#: ../midori/midori-view.c:2558
msgid "Download _Video"
msgstr "تحميل الفيديو"
-#: ../midori/midori-view.c:2476
+#: ../midori/midori-view.c:2584
msgid "Search _with"
msgstr "بحث باستخدام"
-#: ../midori/midori-view.c:2508
+#: ../midori/midori-view.c:2616
msgid "_Search the Web"
msgstr "_بحث في الانترنت"
-#: ../midori/midori-view.c:2524
+#: ../midori/midori-view.c:2633
msgid "Open Address in New _Tab"
msgstr "فتح العنوان في لسان جديد"
-#: ../midori/midori-view.c:2815
+#: ../midori/midori-view.c:2686
+msgid "Open _Frame in New Tab"
+msgstr "فتح في لسان جديد"
+
+#: ../midori/midori-view.c:2943
msgid "Open or download file"
msgstr "فتح أو تحميل الملف"
-#: ../midori/midori-view.c:2834
+#: ../midori/midori-view.c:2964
+#, c-format
+msgid "File Name: %s"
+msgstr "اسم الملف: %s"
+
+#: ../midori/midori-view.c:2969
#, c-format
msgid "File Type: '%s'"
msgstr "نوع الملف: '%s'"
-#: ../midori/midori-view.c:2836
+#: ../midori/midori-view.c:2971
#, c-format
msgid "File Type: %s ('%s')"
msgstr "نوع الملف: %s ('%s')"
-#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2853
+#: ../midori/midori-view.c:3000
+#, c-format
+msgid "Size: %s"
+msgstr "الحجم: %s"
+
+#: ../midori/midori-view.c:3012
#, c-format
msgid "Open %s"
msgstr "فتح %s"
-#: ../midori/midori-view.c:3478
+#: ../midori/midori-view.c:3635
#, c-format
msgid "Inspect page - %s"
msgstr "فحص الصفحة - %s"
-#: ../midori/midori-view.c:3772
+#: ../midori/midori-view.c:3982
msgid "Speed Dial"
msgstr "حوار السريع"
-#: ../midori/midori-view.c:3773 ../midori/midori-view.c:3869
+#: ../midori/midori-view.c:3983 ../midori/midori-view.c:4079
msgid "Click to add a shortcut"
msgstr "انقر لإضافة اختصار"
-#: ../midori/midori-view.c:3774
+#: ../midori/midori-view.c:3984
msgid "Enter shortcut address"
msgstr "أدخل عنوان الاختصار"
-#: ../midori/midori-view.c:3775
+#: ../midori/midori-view.c:3985
msgid "Enter shortcut title"
msgstr "أدخل وسم للاختصار"
-#: ../midori/midori-view.c:3776
+#: ../midori/midori-view.c:3986
msgid "Are you sure you want to delete this shortcut?"
msgstr "هل أنت متأكد أنك تريد حذف هذا الاختصار؟"
-#: ../midori/midori-view.c:3938
+#: ../midori/midori-view.c:4148
#, c-format
msgid "No documentation installed"
msgstr "لا توجد وثائق مثبتة"
-#: ../midori/midori-view.c:4014
+#: ../midori/midori-view.c:4224
msgid "Midori doesn't store any personal data:"
msgstr "لا يخزن ميدوري أي بيانات شخصية:"
-#: ../midori/midori-view.c:4015
+#: ../midori/midori-view.c:4225
msgid "No history or web cookies are being saved."
msgstr "لم يتم حفظ التاريخ أو كعكات الويب."
-#: ../midori/midori-view.c:4016
+#: ../midori/midori-view.c:4226
msgid "Extensions are disabled."
msgstr "تعطيل الملحقات."
-#: ../midori/midori-view.c:4017
+#: ../midori/midori-view.c:4227
msgid "HTML5 storage, local database and application caches are disabled."
msgstr "يتم تعطيل تخزين HTML5، قاعدة البيانات المحلية ومخابئ التطبيق."
-#: ../midori/midori-view.c:4018
+#: ../midori/midori-view.c:4228
msgid "Midori prevents websites from tracking the user:"
msgstr "ميدوري يمنع المواقع من تعقب المستخدم:"
-#: ../midori/midori-view.c:4019
+#: ../midori/midori-view.c:4229
msgid "Referrer URLs are stripped down to the hostname."
msgstr "تجريد إحالات URLs إلى اسم المضيف."
-#: ../midori/midori-view.c:4020
+#: ../midori/midori-view.c:4230
msgid "DNS prefetching is disabled."
msgstr "تعطيل الجلب المسبق DNS."
-#: ../midori/midori-view.c:4021
+#: ../midori/midori-view.c:4231
msgid "The language and timezone are not revealed to websites."
msgstr "اللغة والمنطقة الزمنية لا يكشف عنها لمواقع ويب."
-#: ../midori/midori-view.c:4022
+#: ../midori/midori-view.c:4232
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr "فلاش وغيرها من الإضافات Netscape لا يمكن سردهابمواقع ويب."
-#: ../midori/midori-view.c:4060
+#: ../midori/midori-view.c:4302
msgid "Version numbers in brackets show the version used at runtime."
msgstr "أرقام إصدار في أقواس تظهر النسخة المستخدمة في التشغيل."
-#: ../midori/midori-view.c:4108
+#: ../midori/midori-view.c:4352
msgid "Page loading delayed"
msgstr "تأخير تحميل الصفحة"
-#: ../midori/midori-view.c:4109
+#: ../midori/midori-view.c:4353
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr "تأخر التحميل إما بسبب انهيار أو تفضيلات بدء التشغيل."
-#: ../midori/midori-view.c:4110
+#: ../midori/midori-view.c:4354
msgid "Load Page"
msgstr "تحميل الصفحة"
-#: ../midori/midori-view.c:4249
+#: ../midori/midori-view.c:4520
msgid "Blank page"
msgstr "صفحة فارغة"
-#: ../midori/midori-view.c:4511
+#: ../midori/midori-view.c:4782
msgid "_Duplicate Tab"
msgstr "_ضاعف اللسان"
-#: ../midori/midori-view.c:4516
+#: ../midori/midori-view.c:4787
msgid "Show Tab _Label"
msgstr "عرض عنوان اللسان"
-#: ../midori/midori-view.c:4516
+#: ../midori/midori-view.c:4787
msgid "Show Tab _Icon Only"
msgstr "عرض أيقونة اللسان فقط"
-#: ../midori/midori-view.c:4522
+#: ../midori/midori-view.c:4793
msgid "Close ot_her Tabs"
msgstr "غلق ألألسنه الأخري"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5176
+#: ../midori/midori-view.c:5606
msgid "previous"
msgstr "السّابق"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5195
+#: ../midori/midori-view.c:5625
msgid "next"
msgstr "التّالي"
-#: ../midori/midori-view.c:5208
+#: ../midori/midori-view.c:5638
msgid "Print background images"
msgstr "طباعة صورة الخلفية"
-#: ../midori/midori-view.c:5209
+#: ../midori/midori-view.c:5639
msgid "Whether background images should be printed"
msgstr "ما إذا كان ينبغي طباعة صور الخلفية"
-#: ../midori/midori-view.c:5241
+#: ../midori/midori-view.c:5671
msgid "Features"
msgstr "الميزّات"
@@ -1959,65 +1955,65 @@ msgid "Browsing"
msgstr "تصفح"
#. Page "Network"
-#: ../midori/midori-preferences.c:454
+#: ../midori/midori-preferences.c:456
msgid "Network"
msgstr "شبكة"
-#: ../midori/midori-preferences.c:461
+#: ../midori/midori-preferences.c:463
msgid "Hostname"
msgstr "اسم الجهاز"
-#: ../midori/midori-preferences.c:485
+#: ../midori/midori-preferences.c:487
msgid "MB"
msgstr "MB"
-#: ../midori/midori-searchaction.c:908
+#: ../midori/midori-searchaction.c:902
msgid "Add search engine"
msgstr "أضف أداة البحث"
-#: ../midori/midori-searchaction.c:908
+#: ../midori/midori-searchaction.c:902
msgid "Edit search engine"
msgstr "حرر أداة البحث"
-#: ../midori/midori-searchaction.c:937
+#: ../midori/midori-searchaction.c:931
msgid "_Name:"
msgstr "_الإسم:"
-#: ../midori/midori-searchaction.c:953
+#: ../midori/midori-searchaction.c:947
msgid "_Description:"
msgstr "_وصف:"
-#: ../midori/midori-searchaction.c:987
+#: ../midori/midori-searchaction.c:981
msgid "_Icon:"
msgstr "_ايقونة:"
-#: ../midori/midori-searchaction.c:1001
+#: ../midori/midori-searchaction.c:995
msgid "_Token:"
msgstr "_علامة:"
-#: ../midori/midori-searchaction.c:1301
+#: ../midori/midori-searchaction.c:1295
msgid "Manage Search Engines"
msgstr "إدارة أدوات البحث"
-#: ../midori/midori-searchaction.c:1401
+#: ../midori/midori-searchaction.c:1395
msgid "Use as _default"
msgstr "إستعمل _كإفتراضي"
-#: ../midori/sokoke.c:410
+#: ../midori/sokoke.c:354
msgid "Open with"
msgstr "إفتح بـ"
-#: ../midori/sokoke.c:418
+#: ../midori/sokoke.c:362
#, c-format
msgid "Choose an application or command to open \"%s\":"
msgstr "إختر تطبيقا أو أمرا لفتح \"%s\":"
-#: ../midori/sokoke.c:459 ../midori/sokoke.c:469 ../midori/sokoke.c:497
-#: ../midori/sokoke.c:526 ../midori/sokoke.c:540
+#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
+#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
msgid "Could not run external program."
msgstr "لا يمكن تشغيل البرنامج الخارجي."
-#: ../midori/sokoke.c:1677
+#: ../midori/sokoke.c:1595
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -2028,7 +2024,7 @@ msgstr[3] "%d ساعات"
msgstr[4] "%d ساعات"
msgstr[5] "%d ساعات"
-#: ../midori/sokoke.c:1678
+#: ../midori/sokoke.c:1596
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -2039,7 +2035,7 @@ msgstr[3] "%d دقائق"
msgstr[4] "%d دقائق"
msgstr[5] "%d دقائق"
-#: ../midori/sokoke.c:1679
+#: ../midori/sokoke.c:1597
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2051,50 +2047,50 @@ msgstr[4] "%d ثوان"
msgstr[5] "%d ثوان"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1687 ../panels/midori-transfers.c:267
+#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
#, c-format
msgid "%s of %s"
msgstr "%s لـ %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1696
+#: ../midori/sokoke.c:1614
msgid "?B"
msgstr "?B"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1699
+#: ../midori/sokoke.c:1617
#, c-format
msgid " (%s/s)"
msgstr " (%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1716
+#: ../midori/sokoke.c:1634
#, c-format
msgid " - %s remaining"
msgstr " - %s متبقي"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:263
+#: ../toolbars/midori-findbar.c:291
msgid "_Inline Find:"
msgstr "_بحث مضمن:"
-#: ../toolbars/midori-findbar.c:289
+#: ../toolbars/midori-findbar.c:317
msgid "Previous"
msgstr "السّابق"
-#: ../toolbars/midori-findbar.c:295
+#: ../toolbars/midori-findbar.c:323
msgid "Next"
msgstr "التّالي"
-#: ../toolbars/midori-findbar.c:299
+#: ../toolbars/midori-findbar.c:327
msgid "Match Case"
msgstr "حالة تطابق"
-#: ../toolbars/midori-findbar.c:308
+#: ../toolbars/midori-findbar.c:336
msgid "Highlight Matches"
msgstr "ميّز المتشابهات"
-#: ../toolbars/midori-findbar.c:319
+#: ../toolbars/midori-findbar.c:347
msgid "Close Findbar"
msgstr "إغلاق شريط المكتشف"
@@ -2119,56 +2115,60 @@ msgstr ""
"ارتباط مزود المجموع الاختباري غير متطابق. هذا يعني أن الملف ربما ناقص أو تم "
"تعديله."
-#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
msgid "Clear All"
msgstr "محو الكل"
-#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370
+#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
msgid "Some files are being downloaded"
msgstr "يتم تحميل بعض الملفات"
-#: ../toolbars/midori-transferbar.c:374
+#: ../toolbars/midori-transferbar.c:377
msgid "_Quit Midori"
msgstr "_خروج من ميدوري"
-#: ../toolbars/midori-transferbar.c:376
+#: ../toolbars/midori-transferbar.c:379
msgid "The transfers will be cancelled if Midori quits."
msgstr "سيتم إلغاء النقل اذا تم إنها ميدوري."
-#: ../panels/midori-bookmarks.c:113
+#: ../panels/midori-bookmarks.c:114
msgid "Bookmarks"
msgstr "العلامات"
-#: ../panels/midori-bookmarks.c:256
+#: ../panels/midori-bookmarks.c:257
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "فشل إضافة العلامة: %s\n"
-#: ../panels/midori-bookmarks.c:434
+#: ../panels/midori-bookmarks.c:435
msgid "Edit the selected bookmark"
msgstr "حرر العلامة المحددة"
-#: ../panels/midori-bookmarks.c:442
+#: ../panels/midori-bookmarks.c:443
msgid "Delete the selected bookmark"
msgstr "حذف العلامة المحددة"
-#: ../panels/midori-bookmarks.c:457
+#: ../panels/midori-bookmarks.c:458
msgid "Add a new folder"
msgstr "أضف مجلد جديد"
-#: ../panels/midori-bookmarks.c:591 ../panels/midori-history.c:579
+#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635
msgid "Separator "
msgstr "فاصل "
-#: ../panels/midori-history.c:110
+#: ../panels/midori-history.c:111
msgid "History"
msgstr "السجل"
-#: ../panels/midori-history.c:142
-msgid "A week ago"
-msgstr "قبل أسبوع"
+#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
+msgid "Today"
+msgstr "اليوم"
-#: ../panels/midori-history.c:144
+#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
+msgid "Yesterday"
+msgstr "البارحة"
+
+#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
@@ -2179,27 +2179,28 @@ msgstr[3] "%d سنوات مضت"
msgstr[4] "%d سنوات مضت"
msgstr[5] "%d سنوات مضت"
-#: ../panels/midori-history.c:147
-msgid "Today"
-msgstr "اليوم"
+#: ../panels/midori-history.c:165 ../panels/midori-history.c:184
+msgid "A week ago"
+msgstr "قبل أسبوع"
-#: ../panels/midori-history.c:149
-msgid "Yesterday"
-msgstr "البارحة"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "فشل حذف عنصر السجل: %s\n"
-#: ../panels/midori-history.c:317
+#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "هل تريد حذف كل عناصر التاريخ؟"
-#: ../panels/midori-history.c:363
+#: ../panels/midori-history.c:407
msgid "Bookmark the selected history item"
msgstr "علم التاريخ المحدد"
-#: ../panels/midori-history.c:372
+#: ../panels/midori-history.c:416
msgid "Delete the selected history item"
msgstr "حذف كل عناصر التاريخ"
-#: ../panels/midori-history.c:380
+#: ../panels/midori-history.c:424
msgid "Clear the entire history"
msgstr "مسح تاريخ الدخول"
@@ -2207,11 +2208,11 @@ msgstr "مسح تاريخ الدخول"
msgid "Transfers"
msgstr "النقل"
-#: ../panels/midori-transfers.c:467
+#: ../panels/midori-transfers.c:469
msgid "Open Destination _Folder"
msgstr "افتح الدليل الوجهة"
-#: ../panels/midori-transfers.c:470
+#: ../panels/midori-transfers.c:472
msgid "Copy Link Loc_ation"
msgstr "انسخ موقع الرابط"
@@ -2239,55 +2240,55 @@ msgstr "كلمة المرور"
msgid "_Remember password"
msgstr "_تذكّر كلمة السرّ"
-#: ../katze/katze-throbber.c:948
+#: ../katze/katze-throbber.c:949
#, c-format
msgid "Named icon '%s' couldn't be loaded"
msgstr "الأيقونة المحددة '%s' لا يمكن تحميلها"
-#: ../katze/katze-throbber.c:961
+#: ../katze/katze-throbber.c:962
#, c-format
msgid "Stock icon '%s' couldn't be loaded"
msgstr "الرمز المخزن '%s' لا يمكن تحميله"
-#: ../katze/katze-throbber.c:1041
+#: ../katze/katze-throbber.c:1042
msgid "Animation frames are broken"
msgstr "تعطل إطارات الصور المتحركة"
-#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873
+#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "خصائص '%s' غير صالحة لـ %s"
-#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514
+#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
#: ../extensions/addons.c:308
msgid "Choose file"
msgstr "إختر ملف"
-#: ../katze/katze-utils.c:500
+#: ../katze/katze-utils.c:506
msgid "Choose folder"
msgstr "إختر مجلد"
-#: ../katze/katze-utils.c:604
+#: ../katze/katze-utils.c:610
msgid "None"
msgstr "لا شيء"
-#: ../katze/katze-utils.c:719
+#: ../katze/katze-utils.c:725
msgid "1 hour"
msgstr "1 ساعة"
-#: ../katze/katze-utils.c:720
+#: ../katze/katze-utils.c:726
msgid "1 day"
msgstr "1 يوم"
-#: ../katze/katze-utils.c:721
+#: ../katze/katze-utils.c:727
msgid "1 week"
msgstr "1 أسبوع"
-#: ../katze/katze-utils.c:722
+#: ../katze/katze-utils.c:728
msgid "1 month"
msgstr "1 شهر"
-#: ../katze/katze-utils.c:723
+#: ../katze/katze-utils.c:729
msgid "1 year"
msgstr "1 سنة"
@@ -2296,11 +2297,11 @@ msgstr "1 سنة"
msgid "Preferences for %s"
msgstr "تفضيلات ل %s"
-#: ../extensions/adblock.c:467
+#: ../extensions/adblock.c:473
msgid "Configure Advertisement filters"
msgstr "تكوين فلتر الإعلانات"
-#: ../extensions/adblock.c:498
+#: ../extensions/adblock.c:504
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2309,27 +2310,27 @@ msgstr ""
"أدخل عناون القائمة ترشيحات المعدة مسبقا في النص أدخل و إضغط على \"أضف\" "
"لإضافتها إلى القائمة. يمكنك العثور على المزيد من القوائم في %s."
-#: ../extensions/adblock.c:846
+#: ../extensions/adblock.c:882
msgid "Edit rule"
msgstr "تحرير قاعد"
-#: ../extensions/adblock.c:860
+#: ../extensions/adblock.c:896
msgid "_Rule:"
msgstr "_قاعدة:"
-#: ../extensions/adblock.c:914
+#: ../extensions/adblock.c:950
msgid "Bl_ock image"
msgstr "منع الصور"
-#: ../extensions/adblock.c:919
+#: ../extensions/adblock.c:955
msgid "Bl_ock link"
msgstr "منع الروابط"
-#: ../extensions/adblock.c:1542
+#: ../extensions/adblock.c:1670
msgid "Advertisement blocker"
msgstr "منع الإعلانات"
-#: ../extensions/adblock.c:1543
+#: ../extensions/adblock.c:1671
msgid "Block advertisements according to a filter list"
msgstr "منع الإعلانات وفقا لقائمة التصفية"
@@ -2415,11 +2416,11 @@ msgstr "لا تستطيع مراقبة المجلد '%s': %s"
msgid "Support for userscripts and userstyles"
msgstr "دعم النصوص البرمجية وأنماط المستخدم"
-#: ../extensions/colorful-tabs.c:202
+#: ../extensions/colorful-tabs.c:201
msgid "Colorful Tabs"
msgstr "الألسنة الملونة"
-#: ../extensions/colorful-tabs.c:203
+#: ../extensions/colorful-tabs.c:202
msgid "Tint each tab distinctly"
msgstr "لون كل علامة تبويب"
@@ -2616,40 +2617,68 @@ msgstr "لوحة التغذية"
msgid "Read Atom/ RSS feeds"
msgstr "قراءة التغذيات Atom/ RSS"
-#: ../extensions/formhistory/formhistory.c:41
+#: ../extensions/formhistory/formhistory.c:39
#, c-format
msgid "Failed to add form value: %s\n"
msgstr "فشل في إضافة قيمة النموذج: %s\n"
-#: ../extensions/formhistory/formhistory.c:161
+#: ../extensions/formhistory/formhistory.c:95
+msgid "Form history"
+msgstr "تاريخ النموذج"
+
+#: ../extensions/formhistory/formhistory.c:112
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+"كلمة المرور الرئيسية المطلوبة \n"
+"لفتح قاعدة بيانات كلمات السر"
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember password on this page?"
+msgstr "تذكر كلمة المرور على هذه الصفحة؟"
+
+#: ../extensions/formhistory/formhistory.c:299
+msgid "Remember"
+msgstr "تذكّر"
+
+#: ../extensions/formhistory/formhistory.c:300
+msgid "Not now"
+msgstr "ليس الآن"
+
+#: ../extensions/formhistory/formhistory.c:301
+msgid "Never for this page"
+msgstr "ابدأ لهذه الصفحة"
+
+#: ../extensions/formhistory/formhistory.c:437
msgid "Toggle form history state"
msgstr "تبديل شكل التاريخ"
-#: ../extensions/formhistory/formhistory.c:162
+#: ../extensions/formhistory/formhistory.c:438
msgid "Activate or deactivate form history for the current tab."
msgstr "تنشيط أو إلغاء تنشيط نموذج التاريخ لعلامة التبويب الحالية."
-#: ../extensions/formhistory/formhistory.c:263
-#: ../extensions/formhistory/formhistory.c:267
+#: ../extensions/formhistory/formhistory.c:549
+#: ../extensions/formhistory/formhistory.c:553
#, c-format
msgid "Failed to execute database statement: %s\n"
msgstr "فشل في تنفيذ بيان قاعدة البيانات: %s\n"
-#: ../extensions/formhistory/formhistory.c:343
-msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab"
+#: ../extensions/formhistory/formhistory.c:629
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
msgstr ""
"فقط تنشيط النموذج التاريخ عن طريق مفتاح التشغيل السريع (Ctrl + Shift + F) في "
"علامة التبويب"
-#: ../extensions/formhistory/formhistory.c:399
-msgid "Stores history of entered form data"
-msgstr "تخزين تاريخ بيانات الدخول"
-
-#: ../extensions/formhistory/formhistory.c:402
+#: ../extensions/formhistory/formhistory.c:668
msgid "Form history filler"
msgstr "ترشيح صيغة التاريخ"
-#: ../extensions/formhistory/formhistory-gdom-frontend.c:219
+#: ../extensions/formhistory/formhistory.c:669
+msgid "Stores history of entered form data"
+msgstr "تخزين تاريخ بيانات الدخول"
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:225
#: ../extensions/formhistory/formhistory-js-frontend.c:106
#, c-format
msgid "Failed to select suggestions\n"
@@ -2728,15 +2757,15 @@ msgstr "تحديث الصفحة أو إيقاف تحميل"
msgid "Customize Keyboard shortcuts"
msgstr "تخصيص اختصارات لوحة المفاتيح"
-#: ../extensions/shortcuts.c:285
-msgid "Customize Sh_ortcuts..."
-msgstr "تخصيص الاختصارات..."
+#: ../extensions/shortcuts.c:283
+msgid "Customize Sh_ortcuts…"
+msgstr "تخصيص الاختصارات…"
-#: ../extensions/shortcuts.c:322
+#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
msgstr "إختصارات"
-#: ../extensions/shortcuts.c:323
+#: ../extensions/shortcuts.c:321
msgid "View and edit keyboard shortcuts"
msgstr "عرض وتحرير إختصار لوحة المفاتيح"
@@ -2748,35 +2777,35 @@ msgstr "شريط حالة الساعة"
msgid "Display date and time in the statusbar"
msgstr "عرض التاريخ والوقت في شريط الحالة"
-#: ../extensions/statusbar-features.c:128
+#: ../extensions/statusbar-features.c:131
msgid "Images"
msgstr "صور"
-#: ../extensions/statusbar-features.c:137
+#: ../extensions/statusbar-features.c:140
msgid "Scripts"
msgstr "نصوص برمجية"
-#: ../extensions/statusbar-features.c:146
+#: ../extensions/statusbar-features.c:151
msgid "Netscape plugins"
msgstr "Netscape ملحقات"
-#: ../extensions/statusbar-features.c:192
+#: ../extensions/statusbar-features.c:199
msgid "Statusbar Features"
msgstr "سمات شريط الحالة"
-#: ../extensions/statusbar-features.c:193
+#: ../extensions/statusbar-features.c:200
msgid "Easily toggle features on web pages on and off"
msgstr "تبديل ملامح بسهولة على صفحات الويب تشغيل وإيقاف"
-#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683
+#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
msgid "Tab Panel"
msgstr "لوحة التبويب"
-#: ../extensions/tab-panel.c:666
+#: ../extensions/tab-panel.c:663
msgid "T_ab Panel"
msgstr "لوحة التبويب"
-#: ../extensions/tab-panel.c:684
+#: ../extensions/tab-panel.c:681
msgid "Show tabs in a vertical panel"
msgstr "عرض علامات التبويب في لوحة عمودية"
@@ -2792,7 +2821,7 @@ msgstr "علامات التبويب الجديدة ليس لها تسمية اف
msgid "Customize Toolbar"
msgstr "تخصيص شريط الأدوات"
-#: ../extensions/toolbar-editor.c:413
+#: ../extensions/toolbar-editor.c:409
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2800,27 +2829,27 @@ msgstr ""
"تحديد عناصر ليتم عرضها على شريط الأدوات. يمكن ترتيب العناصر عن طريق السحب "
"والإفلات."
-#: ../extensions/toolbar-editor.c:429
+#: ../extensions/toolbar-editor.c:425
msgid "Available Items"
msgstr "العناصر المتوفرة"
-#: ../extensions/toolbar-editor.c:450
+#: ../extensions/toolbar-editor.c:446
msgid "Displayed Items"
msgstr "العناصر المعروضة"
-#: ../extensions/toolbar-editor.c:585
-msgid "Customize _Toolbar..."
-msgstr "ت_خصيص شريط الادوات..."
+#: ../extensions/toolbar-editor.c:581
+msgid "Customize _Toolbar…"
+msgstr "ت_خصيص شريط الادوات…"
-#: ../extensions/toolbar-editor.c:601
-msgid "_Customize..."
-msgstr "_تخصيص..."
+#: ../extensions/toolbar-editor.c:597
+msgid "_Customize…"
+msgstr "_تخصيص…"
-#: ../extensions/toolbar-editor.c:631
+#: ../extensions/toolbar-editor.c:627
msgid "Toolbar Editor"
msgstr "محرر شريط الادوات"
-#: ../extensions/toolbar-editor.c:632
+#: ../extensions/toolbar-editor.c:628
msgid "Easily edit the toolbar layout"
msgstr "تحرير شريط الادوات بسهولة"
@@ -2828,6 +2857,24 @@ msgstr "تحرير شريط الادوات بسهولة"
msgid "Cache HTTP communication on disk"
msgstr "إخفاء ملف HTTP التواصل في القرص"
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "لا يمكن حفظ العلامات. %s"
+
+#~ msgid "The specified configuration folder is invalid."
+#~ msgstr "إعداد المجلد المحدد غير صالح."
+
+#~ msgid "Cookies"
+#~ msgstr "كعكات"
+
+#~ msgid "'Flash' Cookies"
+#~ msgstr "'فلاش' كعكات"
+
+#~ msgid "HTML5 _Databases"
+#~ msgstr "HTML5 _قاعدة بيانات"
+
+#~ msgid "Offline Application Cache"
+#~ msgstr "ذاكرة التطبيقات بدون اتصال"
+
#~ msgid "Lightweight web browser"
#~ msgstr "منصفح الوب الخفيف"
@@ -2909,14 +2956,14 @@ msgstr "إخفاء ملف HTTP التواصل في القرص"
#~ msgid "Add a new bookmark folder"
#~ msgstr "أضف مجلد علامات جديد"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "أضف, حرر و إحذف أدوات البحث..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "أضف, حرر و إحذف أدوات البحث…"
-#~ msgid "Clear private data..."
-#~ msgstr "حذف البيانات الخاصة ..."
+#~ msgid "Clear private data…"
+#~ msgstr "حذف البيانات الخاصة …"
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr "معاينة تفاصيل الصفحة أدوات وصول المطورين ..."
+#~ msgid "Inspect page details and access developer tools…"
+#~ msgstr "معاينة تفاصيل الصفحة أدوات وصول المطورين …"
#~ msgid "Switch to the previous tab"
#~ msgstr "التحول إلى التبويب السابق"
@@ -3044,9 +3091,6 @@ msgstr "إخفاء ملف HTTP التواصل في القرص"
#~ msgid "External applications"
#~ msgstr "تكبيقات خارجية"
-#~ msgid "_Form History"
-#~ msgstr "صيغة الت_اريخ"
-
#~ msgid "Next Tab (History List)"
#~ msgstr "التبويب التالي (السجل)"
diff --git a/po/ast.po b/po/ast.po
index 0d011d8f..44b05631 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -594,15 +594,15 @@ msgid "_Manage Search Engines"
msgstr "_Alministrar motores de gueta"
#: ../midori/midori-browser.c:4282
-msgid "Add, edit and remove search engines..."
-msgstr "Amestar, editar y quitar motores de gueta..."
+msgid "Add, edit and remove search engines…"
+msgstr "Amestar, editar y quitar motores de gueta…"
#: ../midori/midori-browser.c:4285
msgid "_Clear Private Data"
msgstr "_Desaniciar datos privaos"
#: ../midori/midori-browser.c:4286
-msgid "Clear private data..."
+msgid "Clear private data…"
msgstr "Desaniciar datos privaos"
#: ../midori/midori-browser.c:4290
@@ -741,24 +741,24 @@ msgstr "Occidental (ISO-8859-1)"
#: ../midori/midori-browser.c:4368
#: ../midori/midori-websettings.c:219
#: ../midori/midori-websettings.c:291
-msgid "Custom..."
-msgstr "Personalizáu..."
+msgid "Custom…"
+msgstr "Personalizáu…"
#: ../midori/midori-browser.c:4806
msgid "_Separator"
msgstr "_Separtador"
#: ../midori/midori-browser.c:4813
-msgid "_Location..."
-msgstr "_Allugamientu..."
+msgid "_Location…"
+msgstr "_Allugamientu…"
#: ../midori/midori-browser.c:4815
msgid "Open a particular location"
msgstr "Abrir una direición en particular"
#: ../midori/midori-browser.c:4839
-msgid "_Web Search..."
-msgstr "_Guetar n'internet..."
+msgid "_Web Search…"
+msgstr "_Guetar n'internet…"
#: ../midori/midori-browser.c:4841
msgid "Run a web search"
@@ -1960,8 +1960,8 @@ msgid "Configure Advertisement filters"
msgstr "Configurar los filtros de publicidá"
#: ../extensions/adblock.c:304
-msgid "Configure _Advertisement filters..."
-msgstr "Configurar filtros de p_ublicidá..."
+msgid "Configure _Advertisement filters…"
+msgstr "Configurar filtros de p_ublicidá…"
#: ../extensions/adblock.c:562
msgid "Advertisement blocker"
@@ -2176,8 +2176,8 @@ msgid "Customize Keyboard shortcuts"
msgstr "Personalizar los atayos del tecláu"
#: ../extensions/shortcuts.c:264
-msgid "Customize Sh_ortcuts..."
-msgstr "Personalizar los ac_cesos direutos..."
+msgid "Customize Sh_ortcuts…"
+msgstr "Personalizar los ac_cesos direutos…"
#: ../extensions/shortcuts.c:303
msgid "Shortcuts"
@@ -2233,8 +2233,8 @@ msgid "Displayed Items"
msgstr "Elementos usaos"
#: ../extensions/toolbar-editor.c:579
-msgid "Customize _Toolbar..."
-msgstr "Personalizar la barra de _xeres..."
+msgid "Customize _Toolbar…"
+msgstr "Personalizar la barra de _xeres…"
#: ../extensions/toolbar-editor.c:611
msgid "Toolbar Editor"
@@ -2256,7 +2256,7 @@ msgstr "Editar cenciellamente el diseñu de la barra de herramienta"
#~ msgstr "Al entamar Midori cargar:"
#~ msgid "Download Folder"
#~ msgstr "Carpeta de descargues"
-#~ msgid "Configure _Toolbar..."
+#~ msgid "Configure _Toolbar…"
#~ msgstr "Configurar la _Barra de xeres"
#~ msgid "_Quick Find"
#~ msgstr "Gueta _rápida"
diff --git a/po/be.po b/po/be.po
index 62f9213e..6af162ca 100644
--- a/po/be.po
+++ b/po/be.po
@@ -2,517 +2,511 @@
# Copyright (C) 2012 Midori team
# This file is distributed under the same license as the Midori package.
# Andrej Zakharevich , 2012.
-#
+# Mikalai Udodau , 2012.
+#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: midori 0.4.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-04 17:12+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
+"POT-Creation-Date: 2012-08-18 14:42+0000\n"
+"PO-Revision-Date: 2012-08-18 19:24+0300\n"
+"Last-Translator: Mikalai Udodau \n"
+"Language-Team: Belarusian \n"
+"Language: be\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../data/midori.desktop.in.h:1
msgid "Browse the Web"
-msgstr ""
+msgstr "Аглядаць Сеціва"
#: ../data/midori.desktop.in.h:2
msgid "Internet;WWW;Explorer"
-msgstr ""
+msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:2025 ../midori/main.c:2049
+#: ../midori/main.c:2063 ../midori/midori-websettings.c:315
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Веб-браўзер Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Акно прыватнага аглядання"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1479
+msgid "New Tab"
+msgstr "Новая картка"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1476
+msgid "New Window"
+msgstr "Новае вакно"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
-msgstr ""
+msgstr "Вэб-браўзер"
#: ../data/midori-private.desktop.in.h:1
msgid "Midori Private Browsing"
-msgstr ""
+msgstr "Midori (Прыватнае агляданне)"
#: ../data/midori-private.desktop.in.h:2
msgid "Open a new private browsing window"
-msgstr ""
+msgstr "Адкрыць новае вакно прыватнага аглядання"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4505
msgid "Private Browsing"
-msgstr ""
+msgstr "Прыватнае агляданне"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
-msgstr ""
+msgstr "Немагчыма прачытаць канфігурацыю: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
-msgstr ""
+msgstr "Значэнне '%s' недапушчальнае ў %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
-msgstr ""
+msgstr "Недапушчальнае значэнне канфігурацыі '%s'"
-#: ../midori/main.c:380
+#: ../midori/main.c:375
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
-msgstr ""
+msgstr "Немагчыма адчытаць пошукавыя рухавікі. %s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:429
#, c-format
msgid "Failed to clear history: %s\n"
-msgstr ""
+msgstr "Не ўдалося ачысціць гісторыю: %s\n"
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
-msgstr ""
+msgstr "Памылка адкрыцця базы звестак: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:523
#, c-format
msgid "Failed to remove old history items: %s\n"
-msgstr ""
+msgstr "Памылка сцірання старых элементаў гісторыі: %s\n"
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr ""
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr ""
-
-#: ../midori/main.c:633
+#: ../midori/main.c:545
#, c-format
msgid "The configuration couldn't be saved. %s"
-msgstr ""
+msgstr "Немагчыма запісаць канфігурацыю. %s"
-#: ../midori/main.c:668
+#: ../midori/main.c:571
#, c-format
msgid "The search engines couldn't be saved. %s"
-msgstr ""
+msgstr "Немагчыма запісаць пошукавыя рухавікі. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:608
#, c-format
msgid "The trash couldn't be saved. %s"
-msgstr ""
+msgstr "Немагчыма запісаць гэту сметніцу. %s"
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
+#: ../midori/main.c:681 ../panels/midori-extensions.c:90
msgid "Extensions"
-msgstr "Пашырэнні"
+msgstr "Прыстаўкі"
-#: ../midori/main.c:760
+#: ../midori/main.c:695
msgid "Privacy"
msgstr "Прыватнасць"
-#: ../midori/main.c:772
+#: ../midori/main.c:707
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
msgstr ""
+"Кукісы захоўваюць звесткі пра ўваходы, запісы гульняў, ці профіль "
+"карыстальніка, у рэкламных мэтах."
-#: ../midori/main.c:828
+#: ../midori/main.c:763
#, c-format
msgid "The session couldn't be saved. %s"
-msgstr ""
+msgstr "Немагчыма запісаць гэты сеанс. %s"
-#: ../midori/main.c:1046
+#: ../midori/main.c:1001
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
+"Не знойдзены файл каранёвага сертыфіката. SSL-сертыфікаты нельга спраўдзіць."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1093
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
msgstr ""
+"Падобна на тое, што мела месца аварыйнае заканчэнне Midori падчас апошняга "
+"сеансу працы. Калі праблема паўтараецца, паспрабуйце адну з ніжэйпададзеных "
+"опцый для вырашэння."
-#: ../midori/main.c:1134
+#: ../midori/main.c:1112
msgid "Modify _preferences"
-msgstr ""
+msgstr "_Правіць настаўленні"
-#: ../midori/main.c:1138
+#: ../midori/main.c:1116
msgid "Disable all _extensions"
-msgstr ""
+msgstr "Выключыць _усе прыстаўкі"
-#: ../midori/main.c:1151
+#: ../midori/main.c:1129
msgid "Discard old tabs"
-msgstr ""
+msgstr "Адкінуць старыя карткі"
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1130 ../midori/midori-websettings.c:223
msgid "Show last tabs without loading"
-msgstr ""
+msgstr "Паказаць апошнія карткі без адкрыцця"
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1131 ../midori/midori-websettings.c:222
msgid "Show last open tabs"
-msgstr ""
+msgstr "Паказаць апошнія адкрытыя карткі"
-#: ../midori/main.c:1400 ../midori/main.c:2464
+#: ../midori/main.c:1379 ../midori/main.c:2433
#, c-format
msgid "The session couldn't be loaded: %s\n"
-msgstr ""
+msgstr "Немагчыма прачытаць сеанс: %s\n"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1517
#, c-format
msgid "Snapshot saved to: %s\n"
-msgstr ""
+msgstr "Здымак запісаны ў: %s\n"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1933
msgid "Run ADDRESS as a web application"
-msgstr ""
+msgstr "Выканаць АДРАС як вэб-прыкладанне"
+
+#: ../midori/main.c:1933
+msgid "ADDRESS"
+msgstr "АДРАС"
+
+#: ../midori/main.c:1936
+msgid "Use FOLDER as configuration folder"
+msgstr "Ужыць КАТАЛОГ як каталог канфігурацыі"
+
+#: ../midori/main.c:1936
+msgid "FOLDER"
+msgstr "КАТАЛОГ"
+
+#: ../midori/main.c:1939
+msgid "Private browsing, no changes are saved"
+msgstr "Прыватнае агляданне, ніякія змены не запісваюцца"
+
+#: ../midori/main.c:1941
+msgid "Show a diagnostic dialog"
+msgstr "Паказаць дыягнастычны дыялог"
+
+#: ../midori/main.c:1943
+msgid "Run the specified filename as javascript"
+msgstr "Выканаць азначаны файл як скрыпт javascript"
+
+#: ../midori/main.c:1945
+msgid "Take a snapshot of the specified URI"
+msgstr "Зрабіць здымак зададзенага адраса URI"
+
+#: ../midori/main.c:1947
+msgid "Execute the specified command"
+msgstr "Выканаць азначаны загад"
+
+#: ../midori/main.c:1949
+msgid "List available commands to execute with -e/ --execute"
+msgstr "Спіс даступных для выканання загадаў з -e/ --execute"
#: ../midori/main.c:1951
-msgid "ADDRESS"
-msgstr ""
-
-#: ../midori/main.c:1954
-msgid "Use FOLDER as configuration folder"
-msgstr ""
-
-#: ../midori/main.c:1954
-msgid "FOLDER"
-msgstr ""
-
-#: ../midori/main.c:1957
-msgid "Private browsing, no changes are saved"
-msgstr ""
-
-#: ../midori/main.c:1959
-msgid "Show a diagnostic dialog"
-msgstr ""
-
-#: ../midori/main.c:1961
-msgid "Run the specified filename as javascript"
-msgstr ""
-
-#: ../midori/main.c:1963
-msgid "Take a snapshot of the specified URI"
-msgstr ""
-
-#: ../midori/main.c:1965
-msgid "Execute the specified command"
-msgstr ""
-
-#: ../midori/main.c:1967
-msgid "List available commands to execute with -e/ --execute"
-msgstr ""
-
-#: ../midori/main.c:1969
msgid "Display program version"
-msgstr ""
+msgstr "Паказаць версію праграмы"
-#: ../midori/main.c:1971
+#: ../midori/main.c:1953
msgid "Addresses"
-msgstr ""
+msgstr "Адрасы"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1955
msgid "Block URIs according to regular expression PATTERN"
-msgstr ""
+msgstr "Блакаваць URI спасылкі згодна з рэгулярным выразам ПРЫКЛАД"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1955
msgid "PATTERN"
-msgstr ""
+msgstr "ПРЫКЛАД"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:1959
msgid "Reset Midori after SECONDS seconds of inactivity"
-msgstr ""
+msgstr "Скінуць Midori пасля СЕКУНД секундаў неактыўнасці"
-#: ../midori/main.c:1977
+#: ../midori/main.c:1959
msgid "SECONDS"
-msgstr ""
+msgstr "СЕКУНД"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1962
msgid "Redirects console warnings to the specified FILENAME"
-msgstr ""
+msgstr "Перанакіраваць папярэджанні з кансолі ў зададзены ФАЙЛ"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1962
msgid "FILENAME"
-msgstr ""
+msgstr "ФАЙЛ"
-#: ../midori/main.c:2045
-msgid "[Addresses]"
-msgstr ""
-
-#: ../midori/main.c:2087
+#: ../midori/main.c:2064
msgid "Please report comments, suggestions and bugs to:"
msgstr ""
+"Калі ласка, дасылайце каментарыі, прапановы і паведамленні пра памылкі на:"
-#: ../midori/main.c:2089
+#: ../midori/main.c:2066
msgid "Check for new versions at:"
-msgstr ""
+msgstr "Спраўдзіць новую версію:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
+#: ../midori/main.c:2161
msgid "Saved logins and _passwords"
-msgstr ""
+msgstr "Запісаныя ўліковыя _запісы і паролі"
-#: ../midori/main.c:2175
+#: ../midori/main.c:2163
msgid "Cookies and Website data"
-msgstr ""
+msgstr "Кукісы і звесткі вэб-сайтаў"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
+#: ../midori/main.c:2167 ../midori/midori-websettings.c:1020
#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
-msgstr ""
+msgstr "Вэб-кэш"
-#: ../midori/main.c:2182
+#: ../midori/main.c:2170
msgid "Website icons"
-msgstr ""
+msgstr "Значкі вэб-сайтаў"
-#: ../midori/main.c:2288
+#: ../midori/main.c:2274
msgid "An unknown error occured"
-msgstr ""
+msgstr "Здарылася невядомая памылка"
-#: ../midori/main.c:2395
+#: ../midori/main.c:2381
msgid "An instance of Midori is already running but not responding.\n"
-msgstr ""
+msgstr "Экзэмпляр Midori ўжо запушчаны, але не адказвае.\n"
-#: ../midori/main.c:2431
+#: ../midori/main.c:2415
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
-msgstr ""
+msgstr "Немагчыма прачытаць закладкі: %s\n"
-#: ../midori/main.c:2479
+#: ../midori/main.c:2448
#, c-format
msgid "The trash couldn't be loaded: %s\n"
-msgstr ""
+msgstr "Немагчыма прачытаць сметніцу: %s\n"
-#: ../midori/main.c:2492
+#: ../midori/main.c:2461
#, c-format
msgid "The history couldn't be loaded: %s\n"
-msgstr ""
+msgstr "Немагчыма прачытаць гісторыю: %s\n"
-#: ../midori/main.c:2508
+#: ../midori/main.c:2476
msgid "The following errors occured:"
-msgstr ""
+msgstr "Здарылася наступная памылка:"
-#: ../midori/main.c:2524
+#: ../midori/main.c:2492
msgid "_Ignore"
-msgstr ""
+msgstr "_Ігнараваць"
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr ""
+#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:545
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Нечаканае дзеянне '%s'."
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060
+#: ../midori/midori-app.c:1459 ../midori/midori-browser.c:6435
msgid "_Bookmarks"
-msgstr ""
+msgstr "_Закладкі"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1460
msgid "Add Boo_kmark"
-msgstr ""
+msgstr "Зак_ладку на гэту старонку"
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr ""
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1461
msgid "_Extensions"
-msgstr ""
+msgstr "_Прыстаўкі"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589
+#: ../midori/midori-app.c:1462 ../midori/midori-browser.c:4891
msgid "_History"
-msgstr ""
+msgstr "_Гісторыя"
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr ""
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1463
msgid "_Userscripts"
-msgstr ""
+msgstr "_Карыстальніцкія скрыпты"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1464
+msgid "User_styles"
+msgstr "Карыстальніцкія стылі"
+
+#: ../midori/midori-app.c:1465
msgid "New _Tab"
-msgstr ""
+msgstr "Новая _картка"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1466
msgid "_Transfers"
-msgstr ""
+msgstr "П_ерасыланні"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1467
msgid "Netscape p_lugins"
-msgstr ""
+msgstr "П_лагіны Netscape"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1468
msgid "_Closed Tabs"
-msgstr ""
+msgstr "_Закрытыя карткі"
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216
+#: ../midori/midori-app.c:1469 ../midori/midori-browser.c:5574
msgid "New _Window"
-msgstr ""
+msgstr "Новае _вакно"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1470
msgid "New _Folder"
-msgstr ""
+msgstr "Новы к_аталог"
+
+#: ../midori/midori-app.c:1499
+msgid "[Addresses]"
+msgstr "[Адрасы]"
#: ../midori/midori-array.c:522
msgid "File not found."
-msgstr ""
+msgstr "Файл не знойдзены."
#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
msgid "Malformed document."
-msgstr ""
+msgstr "Памылковы дакумент."
#: ../midori/midori-array.c:628
msgid "Unrecognized bookmark format."
-msgstr ""
+msgstr "Нераспазнаны фармат закладак."
#: ../midori/midori-array.c:915
msgid "Writing failed."
-msgstr ""
+msgstr "Запісанне схібіла."
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5662
+#: ../midori/midori-browser.c:5671
msgid "Reload the current page"
-msgstr ""
+msgstr "Перачытаць бягучую старонку"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:373 ../midori/midori-browser.c:5668
msgid "Stop loading the current page"
-msgstr ""
+msgstr "Спыніць чытанне бягучай старонкі"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:530
#, c-format
msgid "Failed to update title: %s\n"
-msgstr ""
+msgstr "Памылка абнаўлення загалоўка: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr ""
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:625
#, c-format
msgid "%s (Private Browsing)"
-msgstr ""
+msgstr "%s (Прыватнае агляданне)"
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr ""
+#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Закладкі"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:837
msgid "New folder"
-msgstr ""
+msgstr "Новы каталог"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:837
msgid "Edit folder"
-msgstr ""
+msgstr "Рэдагаваць каталог"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:839
msgid "New bookmark"
-msgstr ""
+msgstr "Новая закладка"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:839
msgid "Edit bookmark"
-msgstr ""
+msgstr "Рэдагаваць закладкі"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr ""
+#: ../midori/midori-browser.c:873
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Увядзіце назву для гэтай закладкі і выберыце, дзе яе захоўваць."
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr ""
-
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326
-msgid "_Folder:"
-msgstr ""
-
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:934
msgid "Add to _Speed Dial"
-msgstr ""
+msgstr "Дадаць у хуткі в_ыбар"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:940
msgid "Show in the tool_bar"
-msgstr ""
+msgstr "Паказваць на с_тужцы прылад"
-#: ../midori/midori-browser.c:905
+#: ../midori/midori-browser.c:948
msgid "Run as _web application"
-msgstr ""
+msgstr "Выкана_ць як вэб-прыкладанне"
-#: ../midori/midori-browser.c:976
+#: ../midori/midori-browser.c:1019
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
-msgstr ""
+msgstr "Файл \"%s\" нельга запісаць у гэтым каталогу."
-#: ../midori/midori-browser.c:978
+#: ../midori/midori-browser.c:1021
#, c-format
msgid "You don't have permission to write in this location."
-msgstr ""
+msgstr "Вы не маеце дазволу на запіс у гэтым месцы."
-#: ../midori/midori-browser.c:985
+#: ../midori/midori-browser.c:1028
#, c-format
msgid "There is not enough free space to download \"%s\"."
-msgstr ""
+msgstr "Не хапае вольнага месца, каб сцягнуць \"%s\"."
-#: ../midori/midori-browser.c:988
+#: ../midori/midori-browser.c:1031
#, c-format
msgid "The file needs %s but only %s are left."
-msgstr ""
+msgstr "Для файла трэба %s, але толькі %s засталося."
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:1167 ../midori/midori-browser.c:4695
msgid "Save file as"
-msgstr ""
+msgstr "Запісаць файл як"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr ""
+#: ../midori/midori-browser.c:1173
+msgid "Save associated _resources"
+msgstr "Запісаць звязаныя рэсурсы"
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1476
msgid "A new window has been opened"
-msgstr ""
+msgstr "Адкрыта новае вакно"
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr ""
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1479
msgid "A new tab has been opened"
-msgstr ""
+msgstr "Адкрыта новая картка"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1496
msgid "Error opening the image!"
-msgstr ""
+msgstr "Памылка адкрыцця выявы!"
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1497
msgid "Can not open selected image in a default viewer."
-msgstr ""
+msgstr "Немагчыма адкрыць вылучаную выяву ў прадвызначаным праглядніку."
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1503
msgid "Error downloading the image!"
-msgstr ""
+msgstr "Памылка сцягвання выявы!"
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1504
msgid "Can not download selected image."
-msgstr ""
+msgstr "Немагчыма сцягнуць вылучаную выяву."
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1625
msgid "Save file"
-msgstr ""
+msgstr "Запісаць файл"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2528
msgid "Open file"
-msgstr ""
+msgstr "Адкрыць файл"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2660
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -520,1904 +514,2065 @@ msgid ""
"Aggregator. Next time you click the news feed icon, it will be added "
"automatically."
msgstr ""
+"Каб скарыстацца URI-спасылкай вышэй, адкрыйце агрэгатар навін. Звычайна ў ім "
+"ёсць меню ці кнопка \"Дадаць падпіску\", \"Новы канал\" ці падобнае.\n"
+"Іначай, зайдзіце ў Настаўленні, Праграмы ў Midori, і выберыце Агрэгатар "
+"навін. Калі ў наступны раз вы націсніце на значок канал навін, ён дадасца "
+"аўтаматычна."
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2666 ../extensions/feed-panel/main.c:365
msgid "New feed"
-msgstr ""
+msgstr "Новы канал"
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2709 ../midori/midori-browser.c:5734
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
-msgstr ""
+msgstr "Дадаць закладку"
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3253 ../midori/midori-searchaction.c:487
msgid "Empty"
-msgstr ""
+msgstr "Пуста"
-#: ../midori/midori-browser.c:3467
+#: ../midori/midori-browser.c:3699 ../midori/midori-browser.c:3700
msgid "Toggle text cursor navigation"
-msgstr ""
+msgstr "Пераключыць навігацыю тэкставым курсорам"
-#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753
+#: ../midori/midori-browser.c:3702
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Націсканне F7 пераключае рэжым навігацыі тэкставым курсорам. Калі ён "
+"актыўны, тэкставы курсор адлюстроўваецца на ўсіх вэб-старонках."
+
+#: ../midori/midori-browser.c:3705
+msgid "_Enable Caret Browsing"
+msgstr "Навігацыя тэкставым к_урсорам"
+
+#: ../midori/midori-browser.c:4095 ../midori/midori-browser.c:6128
#, c-format
msgid "Failed to insert new history item: %s\n"
-msgstr ""
+msgstr "Памылка дадання новага элемента гісторыі: %s\n"
-#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4421 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
-msgstr ""
+msgstr "Адкрыць усё ў картках"
-#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4428 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
-msgstr ""
+msgstr "Адкрыць у новай _картцы"
-#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657
-#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4431 ../midori/midori-view.c:2944
+#: ../midori/midori-view.c:5082 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
-msgstr ""
+msgstr "Адкры_ць у новым акне"
-#: ../midori/midori-browser.c:4213
+#: ../midori/midori-browser.c:4520
msgid "Arora"
-msgstr ""
+msgstr "Arora"
-#: ../midori/midori-browser.c:4214
+#: ../midori/midori-browser.c:4521
msgid "Kazehakase"
-msgstr ""
+msgstr "Казахеказэ"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4522
msgid "Opera"
-msgstr ""
+msgstr "Opera"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4523
msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4524
msgid "Epiphany"
-msgstr ""
+msgstr "Epiphany"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4525
#, c-format
msgid "Firefox (%s)"
-msgstr ""
+msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4239
-msgid "Import bookmarks..."
-msgstr ""
+#: ../midori/midori-browser.c:4526
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:4547
+msgid "Import bookmarks…"
+msgstr "Імпарт закладак…"
+
+#: ../midori/midori-browser.c:4550 ../midori/midori-browser.c:5739
msgid "_Import bookmarks"
-msgstr ""
+msgstr "_Імпартаваць закладкі"
-#: ../midori/midori-browser.c:4253
+#: ../midori/midori-browser.c:4561
msgid "_Application:"
-msgstr ""
+msgstr "_Праграма:"
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4626
msgid "Import from XBEL or HTML file"
-msgstr ""
+msgstr "Імпарт з XBEL ці HTML файла"
-#: ../midori/midori-browser.c:4353
+#: ../midori/midori-browser.c:4654
msgid "Import from a file"
-msgstr ""
+msgstr "Імпартаваць з файла"
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4666
msgid "Failed to import bookmarks"
-msgstr ""
+msgstr "Памылка імпартавання закладак"
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4700
msgid "XBEL Bookmarks"
-msgstr ""
+msgstr "XBEL-закладкі"
-#: ../midori/midori-browser.c:4405
+#: ../midori/midori-browser.c:4705
msgid "Netscape Bookmarks"
-msgstr ""
+msgstr "Закладкі Netscape"
-#: ../midori/midori-browser.c:4419
+#: ../midori/midori-browser.c:4719
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
-msgstr ""
+msgstr "Midori можа экспартаваць толькі ў XBEL (*.xbel) або Netscape (*.html)"
-#: ../midori/midori-browser.c:4434
+#: ../midori/midori-browser.c:4734
msgid "Failed to export bookmarks"
-msgstr ""
+msgstr "Памылка экспартавання закладак"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4556
+#: ../midori/midori-browser.c:4856
msgid "Clear Private Data"
-msgstr ""
+msgstr "Сцерці асабовыя звесткі"
-#: ../midori/midori-browser.c:4560
+#: ../midori/midori-browser.c:4860
msgid "_Clear private data"
-msgstr ""
+msgstr "Сц_ерці"
-#: ../midori/midori-browser.c:4573
+#: ../midori/midori-browser.c:4875
msgid "Clear the following data:"
-msgstr ""
+msgstr "Сцерці наступныя звесткі:"
-#: ../midori/midori-browser.c:4583
+#: ../midori/midori-browser.c:4885
msgid "Last open _tabs"
-msgstr ""
+msgstr "Апошнія адкрытыя карткі"
-#: ../midori/midori-browser.c:4609
+#: ../midori/midori-browser.c:4911
msgid "Clear private data when _quitting Midori"
-msgstr ""
+msgstr "С_ціраць асабовыя звесткі пры выхадзе з Midori"
-#: ../midori/midori-browser.c:4804
+#: ../midori/midori-browser.c:5126
msgid "A lightweight web browser."
-msgstr ""
+msgstr "Лёгкі вэб-браўзер."
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:5127
msgid "See about:version for version info."
-msgstr ""
+msgstr "Гл. about:version за звесткамі пра версію."
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:5129
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
"Free Software Foundation; either version 2.1 of the License, or (at your "
"option) any later version."
msgstr ""
+"Гэта праграма - свабоднае праграмнае забеспячэнне; Вы можаце распаўсюджваць "
+"і/альбо змяняць яе, згодна з умовамі Агульнай Грамадскай Ліцэнзіі GNU (GNU "
+"GPL), выдадзенай Фондам Свабодных Праграм (FSF); як версіі 2.1, так і (на "
+"ваш выбар) якой-колечы пазнейшай версіі."
-#: ../midori/midori-browser.c:4828
+#: ../midori/midori-browser.c:5159
msgid "translator-credits"
-msgstr ""
+msgstr "Мікалай Удодаў "
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5572
msgid "_File"
-msgstr ""
+msgstr "Ф_айл"
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5575
msgid "Open a new window"
-msgstr ""
+msgstr "Адкрыць новае вакно"
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5578
msgid "Open a new tab"
-msgstr ""
+msgstr "Дадаць картку"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5580
msgid "New P_rivate Browsing Window"
-msgstr ""
+msgstr "Новае ва_кно, прыватнае агляданне"
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5584
msgid "Open a file"
-msgstr ""
+msgstr "Адкрыць файл"
-#: ../midori/midori-browser.c:5228
-msgid "_Save Page As..."
-msgstr ""
+#: ../midori/midori-browser.c:5586
+msgid "_Save Page As…"
+msgstr "Запісаць старонку як…"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5587
msgid "Save to a file"
-msgstr ""
+msgstr "Запісаць у файл"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5589
msgid "Add to Speed _dial"
-msgstr ""
+msgstr "Дадаць у _хуткі выбар"
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5593
msgid "Add Shortcut to the _desktop"
-msgstr ""
+msgstr "Дадаць цэтлік на дэсктоп"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5595
msgid "Create _Launcher"
-msgstr ""
+msgstr "Зрабіць цэт_лік"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5599
msgid "Subscribe to News _feed"
-msgstr ""
+msgstr "Падпісацца на к_анал навін"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5605
msgid "_Close Tab"
-msgstr ""
+msgstr "Закрыць _картку"
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5606
msgid "Close the current tab"
-msgstr ""
+msgstr "Закрыць бягучую картку"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5608
msgid "C_lose Window"
-msgstr ""
+msgstr "_Закрыць акно"
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5612
+msgid "_Share"
+msgstr "Падзяліцца"
+
+#: ../midori/midori-browser.c:5617
msgid "Print the current page"
-msgstr ""
+msgstr "Друкаваць бягучую старонку"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5620
msgid "Close a_ll Windows"
-msgstr ""
+msgstr "Закры_ць усе вокны"
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5623
msgid "_Edit"
-msgstr ""
+msgstr "_Праца"
-#: ../midori/midori-browser.c:5282
-msgid "_Find..."
-msgstr ""
+#: ../midori/midori-browser.c:5646
+msgid "_Find…"
+msgstr "Зн_айсці…"
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5647
msgid "Find a word or phrase in the page"
-msgstr ""
+msgstr "Шукаць слова ці выраз на старонцы"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5649
msgid "Find _Next"
-msgstr ""
+msgstr "Знайсці нас_тупнае"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5652
msgid "Find _Previous"
-msgstr ""
+msgstr "_Знайсці папярэдняе"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5656
msgid "Configure the application preferences"
-msgstr ""
+msgstr "Наставіць праграмныя пераважанні"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5658
msgid "_View"
-msgstr ""
+msgstr "_Выгляд"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5659
msgid "_Toolbars"
-msgstr ""
+msgstr "_Стужкі прылад"
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5664
msgid "Reload page without caching"
-msgstr ""
+msgstr "Перачытаць старонку без кэшавання"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5674
msgid "Increase the zoom level"
-msgstr ""
+msgstr "Павысіць узровень павелічэння"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5677
msgid "Decrease the zoom level"
-msgstr ""
+msgstr "Знізіць узровень павелічэння"
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5681
msgid "_Encoding"
-msgstr ""
+msgstr "_Знаказбор"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5683
msgid "View So_urce"
-msgstr ""
+msgstr "_Паказаць выточны тэкст"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5686
msgid "Ca_ret Browsing"
-msgstr ""
+msgstr "Навігацыя тэкставым курсорам"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5690
msgid "Toggle fullscreen view"
-msgstr ""
+msgstr "Пераключыць від на поўны экран"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5692
msgid "Scroll _Left"
-msgstr ""
+msgstr "Пракруціць у_лева"
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5695
msgid "Scroll _Down"
-msgstr ""
+msgstr "Пракруціць у_ніз"
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5698
msgid "Scroll _Up"
-msgstr ""
+msgstr "Пракруціць у_верх"
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5701
msgid "Scroll _Right"
-msgstr ""
+msgstr "Пра_круціць управа"
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5704
+msgid "_Readable"
+msgstr "Чытэльны"
+
+#: ../midori/midori-browser.c:5707
msgid "_Go"
-msgstr ""
+msgstr "_Пераход"
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5710
msgid "Go back to the previous page"
-msgstr ""
+msgstr "Перайсці да папярэдняй старонкі"
-#: ../midori/midori-browser.c:5346
+#: ../midori/midori-browser.c:5713
msgid "Go forward to the next page"
-msgstr ""
+msgstr "Перайсці да наступнай старонкі"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5717
msgid "Go to the previous sub-page"
-msgstr ""
+msgstr "Ісці да папярэдняй падстаронкі"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5354
+#: ../midori/midori-browser.c:5721
msgid "Go to the next sub-page"
-msgstr ""
+msgstr "Ісці да наступнай падстаронкі"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5723
+msgid "_Homepage"
+msgstr "_Хатняя старонка"
+
+#: ../midori/midori-browser.c:5724
msgid "Go to your homepage"
-msgstr ""
+msgstr "Перайсці да хатняй старонкі"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5726
msgid "Empty Trash"
-msgstr ""
+msgstr "Ачысціць сметніцу"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5729
msgid "Undo _Close Tab"
-msgstr ""
+msgstr "Адкаціць закрыццё кар_ткі"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5736
msgid "Add a new _folder"
-msgstr ""
+msgstr "Стварыць к_аталог"
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5742
msgid "_Export bookmarks"
-msgstr ""
+msgstr "_Экспартаваць закладкі"
-#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5745 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
-msgstr ""
+msgstr "_Распараджацца пошукам"
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5748
msgid "_Clear Private Data"
-msgstr ""
+msgstr "_Сцерці асабовыя звесткі"
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5751
msgid "_Inspect Page"
-msgstr ""
+msgstr "Выточны тэкст старонкі"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5755
msgid "_Previous Tab"
-msgstr ""
+msgstr "_Папярэдняя картка"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5758
msgid "_Next Tab"
-msgstr ""
+msgstr "_Наступная картка"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5760
msgid "Move Tab _Backward"
-msgstr ""
+msgstr "Перамясціць картку назад"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5762
msgid "_Move Tab Forward"
-msgstr ""
+msgstr "Пасунуць картку наперад"
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5765
msgid "Focus _Current Tab"
-msgstr ""
+msgstr "Бягучая _картка"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5768
msgid "Focus _Next view"
-msgstr ""
+msgstr "_Наступны від"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5771
msgid "Only show the Icon of the _Current Tab"
-msgstr ""
+msgstr "Паказваць толькі значок _бягучай карткі"
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5774
msgid "_Duplicate Current Tab"
-msgstr ""
+msgstr "Прадубля_ваць бягучую картку"
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5777
msgid "Close Ot_her Tabs"
-msgstr ""
+msgstr "Закрыць усе іншыя ка_рткі"
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5780
msgid "Open last _session"
-msgstr ""
+msgstr "Адкр_ыць апошні сеанс"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5783
msgid "_Help"
-msgstr ""
+msgstr "_Даведка"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5785
msgid "_Frequent Questions"
-msgstr ""
+msgstr "_Частыя пытанні"
-#: ../midori/midori-browser.c:5421
-msgid "_Report a Problem..."
-msgstr ""
+#: ../midori/midori-browser.c:5788
+msgid "_Report a Problem…"
+msgstr "Паведаміць пра памыл_ку…"
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5793 ../midori/midori-browser.c:6454
+msgid "_Tools"
+msgstr "_Прылады"
+
+#: ../midori/midori-browser.c:5800
msgid "_Menubar"
-msgstr ""
+msgstr "_Стужка меню"
-#: ../midori/midori-browser.c:5437
+#: ../midori/midori-browser.c:5804
msgid "_Navigationbar"
-msgstr ""
+msgstr "_Стужка навігацыі"
-#: ../midori/midori-browser.c:5441
+#: ../midori/midori-browser.c:5808
msgid "Side_panel"
-msgstr ""
+msgstr "Бакавая панэль"
-#: ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:5809
msgid "Sidepanel"
-msgstr ""
+msgstr "Бакавая панэль"
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5812
msgid "_Bookmarkbar"
-msgstr ""
+msgstr "_Стужка закладак"
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5816
msgid "_Statusbar"
-msgstr ""
+msgstr "_Стужка статусу"
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311
+#: ../midori/midori-browser.c:5825 ../midori/midori-websettings.c:314
msgid "_Automatic"
-msgstr ""
+msgstr "_Аўтаматычна"
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr ""
+#: ../midori/midori-browser.c:5828 ../midori/midori-websettings.c:238
+msgid "Chinese Traditional (BIG5)"
+msgstr "Кітайскі традыцыйны (BIG5)"
+
+#: ../midori/midori-browser.c:5831 ../midori/midori-websettings.c:239
+msgid "Chinese Simplified (GB18030)"
+msgstr "Кітайскі спрошчаны (GB18030)"
#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5465
+#: ../midori/midori-browser.c:5835
msgid "Japanese (SHIFT__JIS)"
-msgstr ""
+msgstr "Японскі (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238
+#: ../midori/midori-browser.c:5838 ../midori/midori-websettings.c:241
msgid "Korean (EUC-KR)"
-msgstr ""
+msgstr "Карэйскі (EUC-KR)"
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5841 ../midori/midori-websettings.c:242
msgid "Russian (KOI8-R)"
-msgstr ""
+msgstr "Рускі (KOI8-R)"
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5844 ../midori/midori-websettings.c:243
msgid "Unicode (UTF-8)"
-msgstr ""
+msgstr "Унікод (UTF-8)"
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5847 ../midori/midori-websettings.c:244
msgid "Western (ISO-8859-1)"
-msgstr ""
+msgstr "Заходні (ISO-8859-1)"
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242
-#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr ""
+#: ../midori/midori-browser.c:5850
+msgid "Custom…"
+msgstr "Адмысловы…"
-#: ../midori/midori-browser.c:5985
+#: ../midori/midori-browser.c:6360
msgid "_Separator"
-msgstr ""
+msgstr "_Раздзельнік"
-#: ../midori/midori-browser.c:5992
-msgid "_Location..."
-msgstr ""
+#: ../midori/midori-browser.c:6367
+msgid "_Location…"
+msgstr "А_драс…"
-#: ../midori/midori-browser.c:5994
+#: ../midori/midori-browser.c:6369
msgid "Open a particular location"
-msgstr ""
+msgstr "Адкрыць пэўнае месцазнаходжанне"
-#: ../midori/midori-browser.c:6016
-msgid "_Web Search..."
-msgstr ""
+#: ../midori/midori-browser.c:6391
+msgid "_Web Search…"
+msgstr "Пошук у Се_ціве…"
-#: ../midori/midori-browser.c:6018
+#: ../midori/midori-browser.c:6393
msgid "Run a web search"
-msgstr ""
+msgstr "Запусціць сеціўны пошук"
-#: ../midori/midori-browser.c:6045
+#: ../midori/midori-browser.c:6420
msgid "Reopen a previously closed tab or window"
-msgstr ""
+msgstr "Адкрыць раней закрытыя карткі ці вокны"
-#: ../midori/midori-browser.c:6062
+#: ../midori/midori-browser.c:6437
msgid "Show the saved bookmarks"
-msgstr ""
+msgstr "Паказаць запісаныя закладкі"
-#: ../midori/midori-browser.c:6079
-msgid "_Tools"
-msgstr ""
-
-#: ../midori/midori-browser.c:6095
+#: ../midori/midori-browser.c:6470
msgid "_Window"
-msgstr ""
+msgstr "_Вокны"
-#: ../midori/midori-browser.c:6097
+#: ../midori/midori-browser.c:6472
msgid "Show a list of all open tabs"
-msgstr ""
+msgstr "Паказаць спіс усіх адкрытых картак"
-#: ../midori/midori-browser.c:6111
+#: ../midori/midori-browser.c:6486
msgid "_Menu"
-msgstr ""
+msgstr "_Меню"
-#: ../midori/midori-browser.c:6113
+#: ../midori/midori-browser.c:6488
msgid "Menu"
-msgstr ""
+msgstr "Меню"
-#: ../midori/midori-browser.c:6927
+#: ../midori/midori-browser.c:7313
#, c-format
msgid "Unexpected setting '%s'"
-msgstr ""
+msgstr "Нечаканае настаўленне '%s'"
#: ../midori/midori-extension.c:329
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
-msgstr ""
+msgstr "Немагчыма прачытаць канфігурацыю прыстаўкі '%s': %s\n"
#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../extensions/addons.c:1688
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
-msgstr ""
+msgstr "Для прыстаўкі '%s' немагчыма запісаць настаўленні: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
-msgstr ""
+msgstr "Шукаць на %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr ""
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "Шукаць на…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
-msgstr ""
+msgstr "Не ўдалося выбраць з гісторыі\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
+msgstr "Шукаць %s"
+
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "Экспартаваць сертыфікаты"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "Сертыфікат падпісаны невядомай установай."
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
msgstr ""
+"Сертыфікат не супадае з меркаванай ідэнтыфікацыяй пляцоўкі, з якой ён "
+"атрыманы."
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "Час актывацыі сертыфіката ўсё яшчэ ў будучыні."
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "Сертыфікат пратэрмінаваны"
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"Сертыфікат быў перагледжаны, згодна з спісам перагледжаных сертыфікатаў "
+"GTlsConnection."
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Алгарытм сертыфіката меркаваны небяспечным."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "Нейкія памылкі здарыліся падчас спраўджвання сертыфіката."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "_Экспартаваць сертыфікаты"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "Самападпісаны"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "Падрабязнасці прыватнасці"
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
-msgstr ""
+msgstr "Уставіць і перайсці"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
-msgstr ""
+msgstr "Не пацверджана"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
-msgstr ""
+msgstr "Пацверджанае і зашыфраванае злучэнне"
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1989
msgid "Open, unencrypted connection"
-msgstr ""
+msgstr "Адкрытае, нешыфраванае злучэнне"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
-msgstr ""
+msgstr "Трымаць бакавую панэль справа"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
-msgstr ""
+msgstr "Закрыць панэль"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
-msgstr ""
+msgstr "Трымаць бакавую панэль злева"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:220
msgid "Show Speed Dial"
-msgstr ""
+msgstr "Паказаць панэль хуткага запуску"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:221
msgid "Show Homepage"
-msgstr ""
+msgstr "Паказаць хатнюю старонку"
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:240
msgid "Japanese (SHIFT_JIS)"
-msgstr ""
+msgstr "Японскі (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Адмысловы..."
+
+#: ../midori/midori-websettings.c:260
msgid "New tab"
-msgstr ""
+msgstr "Новая картка"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:261
msgid "New window"
-msgstr ""
+msgstr "Новае вакно"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:262
msgid "Current tab"
-msgstr ""
-
-#: ../midori/midori-websettings.c:274
-msgid "Default"
-msgstr ""
-
-#: ../midori/midori-websettings.c:275
-msgid "Icons"
-msgstr ""
-
-#: ../midori/midori-websettings.c:276
-msgid "Small icons"
-msgstr ""
+msgstr "Бягучая картка"
#: ../midori/midori-websettings.c:277
-msgid "Text"
-msgstr ""
+msgid "Default"
+msgstr "Прадвызначаны"
#: ../midori/midori-websettings.c:278
-msgid "Icons and text"
-msgstr ""
+msgid "Icons"
+msgstr "Значкі"
#: ../midori/midori-websettings.c:279
+msgid "Small icons"
+msgstr "Малыя значкі"
+
+#: ../midori/midori-websettings.c:280
+msgid "Text"
+msgstr "Тэкст"
+
+#: ../midori/midori-websettings.c:281
+msgid "Icons and text"
+msgstr "Значкі і тэкст"
+
+#: ../midori/midori-websettings.c:282
msgid "Text beside icons"
-msgstr ""
+msgstr "Тэкст побач са значкамі"
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:297
msgid "Automatic (GNOME or environment)"
-msgstr ""
+msgstr "Аўтаматычна (GNOME ці асяроддзе)"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:298
msgid "HTTP proxy server"
-msgstr ""
+msgstr "Проксі-сервер HTTP"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:299
msgid "No proxy server"
-msgstr ""
-
-#: ../midori/midori-websettings.c:313
-msgid "Safari"
-msgstr ""
-
-#: ../midori/midori-websettings.c:314
-msgid "iPhone"
-msgstr ""
-
-#: ../midori/midori-websettings.c:315
-msgid "Firefox"
-msgstr ""
+msgstr "Без проксі-сервера"
#: ../midori/midori-websettings.c:316
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:317
+msgid "Safari"
+msgstr "Safari"
+
+#: ../midori/midori-websettings.c:318
+msgid "iPhone"
+msgstr "iPhone"
+
+#: ../midori/midori-websettings.c:319
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../midori/midori-websettings.c:320
msgid "Internet Explorer"
-msgstr ""
+msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:400
+#: ../midori/midori-websettings.c:404
msgid "Remember last window size"
-msgstr ""
+msgstr "Памятаць апошні памер акна"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:405
msgid "Whether to save the last window size"
-msgstr ""
+msgstr "Ці запісваць памеры апошняга вакна"
-#: ../midori/midori-websettings.c:409
+#: ../midori/midori-websettings.c:413
msgid "Last window width"
-msgstr ""
+msgstr "Апошняя шырыня вакна"
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:414
msgid "The last saved window width"
-msgstr ""
+msgstr "Шырыня апошняга запісанага вакна"
-#: ../midori/midori-websettings.c:418
+#: ../midori/midori-websettings.c:422
msgid "Last window height"
-msgstr ""
+msgstr "Апошняя вышыня вакна"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:423
msgid "The last saved window height"
-msgstr ""
+msgstr "Вышыня апошняга запісанага вакна"
-#: ../midori/midori-websettings.c:444
+#: ../midori/midori-websettings.c:448
msgid "Last panel position"
-msgstr ""
+msgstr "Апошняя пазіцыя панэлі"
-#: ../midori/midori-websettings.c:445
+#: ../midori/midori-websettings.c:449
msgid "The last saved panel position"
-msgstr ""
+msgstr "Апошняя запісаная пазіцыя панэлі"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
+#: ../midori/midori-websettings.c:458
msgid "Last panel page"
-msgstr ""
+msgstr "Апошняя старонка панэлі"
-#: ../midori/midori-websettings.c:455
+#: ../midori/midori-websettings.c:459
msgid "The last saved panel page"
-msgstr ""
+msgstr "Апошняя запісаная старонка панэлі"
-#: ../midori/midori-websettings.c:463
+#: ../midori/midori-websettings.c:467
msgid "Last Web search"
-msgstr ""
+msgstr "Апошні сеціўны пошук"
-#: ../midori/midori-websettings.c:464
+#: ../midori/midori-websettings.c:468
msgid "The last saved Web search"
-msgstr ""
-
-#: ../midori/midori-websettings.c:473
-msgid "Show Menubar"
-msgstr ""
-
-#: ../midori/midori-websettings.c:474
-msgid "Whether to show the menubar"
-msgstr ""
-
-#: ../midori/midori-websettings.c:482
-msgid "Show Navigationbar"
-msgstr ""
-
-#: ../midori/midori-websettings.c:483
-msgid "Whether to show the navigationbar"
-msgstr ""
-
-#: ../midori/midori-websettings.c:491
-msgid "Show Bookmarkbar"
-msgstr ""
+msgstr "Апошні запісаны сеціўны пошук"
#: ../midori/midori-websettings.c:492
-msgid "Whether to show the bookmarkbar"
-msgstr ""
+msgid "Show Menubar"
+msgstr "Паказваць стужку меню"
-#: ../midori/midori-websettings.c:500
-msgid "Show Panel"
-msgstr ""
+#: ../midori/midori-websettings.c:493
+msgid "Whether to show the menubar"
+msgstr "Ці паказваць стужку меню"
#: ../midori/midori-websettings.c:501
-msgid "Whether to show the panel"
-msgstr ""
+msgid "Show Navigationbar"
+msgstr "Паказваць стужку навігацыі"
-#: ../midori/midori-websettings.c:509
-msgid "Show Statusbar"
-msgstr ""
+#: ../midori/midori-websettings.c:502
+msgid "Whether to show the navigationbar"
+msgstr "Ці паказваць стужку навігацыі"
#: ../midori/midori-websettings.c:510
-msgid "Whether to show the statusbar"
-msgstr ""
+msgid "Show Bookmarkbar"
+msgstr "Паказаць закладкі"
+
+#: ../midori/midori-websettings.c:511
+msgid "Whether to show the bookmarkbar"
+msgstr "Ці паказваць стужку закладак"
#: ../midori/midori-websettings.c:519
-msgid "Toolbar Style:"
-msgstr ""
+msgid "Show Panel"
+msgstr "Паказаць панэль"
#: ../midori/midori-websettings.c:520
-msgid "The style of the toolbar"
-msgstr ""
+msgid "Whether to show the panel"
+msgstr "Ці паказваць панэль"
+
+#: ../midori/midori-websettings.c:528
+msgid "Show Statusbar"
+msgstr "Паказваць радок статусу"
#: ../midori/midori-websettings.c:529
-msgid "Toolbar Items"
-msgstr ""
-
-#: ../midori/midori-websettings.c:530
-msgid "The items to show on the toolbar"
-msgstr ""
+msgid "Whether to show the statusbar"
+msgstr "Ці паказваць стужку статусу"
#: ../midori/midori-websettings.c:538
-msgid "Compact Sidepanel"
-msgstr ""
+msgid "Toolbar Style:"
+msgstr "Стыль стужкі прылад:"
#: ../midori/midori-websettings.c:539
+msgid "The style of the toolbar"
+msgstr "Стыль стужкі прылад"
+
+#: ../midori/midori-websettings.c:548
+msgid "Toolbar Items"
+msgstr "Элементы стужкі прылад"
+
+#: ../midori/midori-websettings.c:549
+msgid "The items to show on the toolbar"
+msgstr "Элементы, якія паказваць на стужцы прылад"
+
+#: ../midori/midori-websettings.c:557
+msgid "Compact Sidepanel"
+msgstr "Кампактная бакавая панэль"
+
+#: ../midori/midori-websettings.c:558
msgid "Whether to make the sidepanel compact"
-msgstr ""
+msgstr "Ці рабіць бакавую панэль кампактнай"
-#: ../midori/midori-websettings.c:554
+#: ../midori/midori-websettings.c:573
msgid "Align sidepanel on the right"
-msgstr ""
+msgstr "Трымаць бакавую панэль справа"
-#: ../midori/midori-websettings.c:555
+#: ../midori/midori-websettings.c:574
msgid "Whether to align the sidepanel on the right"
-msgstr ""
+msgstr "Ці выраўніваць бакавую панэль па праваму боку"
-#: ../midori/midori-websettings.c:570
+#: ../midori/midori-websettings.c:589
msgid "Open panels in separate windows"
-msgstr ""
-
-#: ../midori/midori-websettings.c:571
-msgid "Whether to always open panels in separate windows"
-msgstr ""
-
-#: ../midori/midori-websettings.c:580
-msgid "When Midori starts:"
-msgstr ""
-
-#: ../midori/midori-websettings.c:581
-msgid "What to do when Midori starts"
-msgstr ""
+msgstr "Адкрываць панэлі ў асобных вокнах"
#: ../midori/midori-websettings.c:590
+msgid "Whether to always open panels in separate windows"
+msgstr "Ці адкрываць заўжды панэлі ў асобных вокнах"
+
+#: ../midori/midori-websettings.c:599
+msgid "When Midori starts:"
+msgstr "Па запуску Midori:"
+
+#: ../midori/midori-websettings.c:600
+msgid "What to do when Midori starts"
+msgstr "Што рабіць падчас запуску Midori"
+
+#: ../midori/midori-websettings.c:609
msgid "Homepage:"
-msgstr ""
+msgstr "Хатняя старонка:"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:610
msgid "The homepage"
-msgstr ""
-
-#: ../midori/midori-websettings.c:606
-msgid "Show crash dialog"
-msgstr ""
-
-#: ../midori/midori-websettings.c:607
-msgid "Show a dialog after Midori crashed"
-msgstr ""
-
-#: ../midori/midori-websettings.c:615
-msgid "Save downloaded files to:"
-msgstr ""
-
-#: ../midori/midori-websettings.c:616
-msgid "The folder downloaded files are saved to"
-msgstr ""
-
-#: ../midori/midori-websettings.c:624
-msgid "Text Editor"
-msgstr ""
+msgstr "Хатняя старонка"
#: ../midori/midori-websettings.c:625
+msgid "Show crash dialog"
+msgstr "Паказваць гэты дыялог пасля падзення"
+
+#: ../midori/midori-websettings.c:626
+msgid "Show a dialog after Midori crashed"
+msgstr "Паказваць гэты дыялог пасля аварыйнага завяршэння Midori"
+
+#: ../midori/midori-websettings.c:634
+msgid "Save downloaded files to:"
+msgstr "Запісваць сцягнутыя файлы ў:"
+
+#: ../midori/midori-websettings.c:635
+msgid "The folder downloaded files are saved to"
+msgstr "Каталог, у які запісваюцца сцягнутыя файлы"
+
+#: ../midori/midori-websettings.c:643
+msgid "Text Editor"
+msgstr "Тэкставы рэдактар"
+
+#: ../midori/midori-websettings.c:644
msgid "An external text editor"
-msgstr ""
-
-#: ../midori/midori-websettings.c:640
-msgid "News Aggregator"
-msgstr ""
-
-#: ../midori/midori-websettings.c:641
-msgid "An external news aggregator"
-msgstr ""
-
-#: ../midori/midori-websettings.c:649
-msgid "Location entry Search"
-msgstr ""
-
-#: ../midori/midori-websettings.c:650
-msgid "The search to perform inside the location entry"
-msgstr ""
-
-#: ../midori/midori-websettings.c:658
-msgid "Preferred Encoding"
-msgstr ""
+msgstr "Вонкавы тэкставы рэдактар"
#: ../midori/midori-websettings.c:659
-msgid "The preferred character encoding"
-msgstr ""
+msgid "News Aggregator"
+msgstr "Агрэгатар навін"
+
+#: ../midori/midori-websettings.c:660
+msgid "An external news aggregator"
+msgstr "Вонкавы агрэгатар навін"
+
+#: ../midori/midori-websettings.c:668
+msgid "Location entry Search"
+msgstr "Пошук уваходжання лакацыі"
#: ../midori/midori-websettings.c:669
+msgid "The search to perform inside the location entry"
+msgstr "Выконваць пошук у полі адраса"
+
+#: ../midori/midori-websettings.c:677
+msgid "Preferred Encoding"
+msgstr "Пераважны знаказбор"
+
+#: ../midori/midori-websettings.c:678
+msgid "The preferred character encoding"
+msgstr "Пераважнае кадаванне сімвалаў"
+
+#: ../midori/midori-websettings.c:688
msgid "Always Show Tabbar"
-msgstr ""
+msgstr "Заўсёды паказваць карткі"
-#: ../midori/midori-websettings.c:670
+#: ../midori/midori-websettings.c:689
msgid "Always show the tabbar"
-msgstr ""
+msgstr "Заўсёды паказваць карткі"
-#: ../midori/midori-websettings.c:683
+#: ../midori/midori-websettings.c:702
msgid "Close Buttons on Tabs"
-msgstr ""
+msgstr "Кнопкі закрыцця на картках"
-#: ../midori/midori-websettings.c:684
+#: ../midori/midori-websettings.c:703
msgid "Whether tabs have close buttons"
-msgstr ""
-
-#: ../midori/midori-websettings.c:709
-msgid "Open new pages in:"
-msgstr ""
-
-#: ../midori/midori-websettings.c:710
-msgid "Where to open new pages"
-msgstr ""
-
-#: ../midori/midori-websettings.c:719
-msgid "Middle click opens Selection"
-msgstr ""
-
-#: ../midori/midori-websettings.c:720
-msgid "Load an address from the selection via middle click"
-msgstr ""
+msgstr "Ці паказваць кнопкі закрыцця на картках"
#: ../midori/midori-websettings.c:728
-msgid "Open tabs in the background"
-msgstr ""
+msgid "Open new pages in:"
+msgstr "Адкрываць новыя старонкі ў:"
#: ../midori/midori-websettings.c:729
-msgid "Whether to open new tabs in the background"
-msgstr ""
-
-#: ../midori/midori-websettings.c:737
-msgid "Open Tabs next to Current"
-msgstr ""
+msgid "Where to open new pages"
+msgstr "Дзе адкрываць новыя старонкі"
#: ../midori/midori-websettings.c:738
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr ""
+msgid "Middle click opens Selection"
+msgstr "Сярэдняя кнопка адкрывае вылучэнне"
-#: ../midori/midori-websettings.c:746
-msgid "Open popups in tabs"
-msgstr ""
+#: ../midori/midori-websettings.c:739
+msgid "Load an address from the selection via middle click"
+msgstr "Чытанне адрасу з вылучэння праз націсканне сярэдняй кнопкі мышы"
#: ../midori/midori-websettings.c:747
-msgid "Whether to open popup windows in tabs"
-msgstr ""
+msgid "Open tabs in the background"
+msgstr "Адкрываць карткі ў фоне"
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr ""
+#: ../midori/midori-websettings.c:748
+msgid "Whether to open new tabs in the background"
+msgstr "Ці адкрываць новыя карткі ў фоне"
-#: ../midori/midori-websettings.c:758
-msgid "Load and display images automatically"
-msgstr ""
+#: ../midori/midori-websettings.c:756
+msgid "Open Tabs next to Current"
+msgstr "Адкрываць карткі следам за бягучай"
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr ""
+#: ../midori/midori-websettings.c:757
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr "Ці адкрываць новыя карткі побач з бягучай карткай або пасля апошняй"
+
+#: ../midori/midori-websettings.c:765
+msgid "Open popups in tabs"
+msgstr "Адкрываць усплыўныя вокны як карткі"
#: ../midori/midori-websettings.c:766
+msgid "Whether to open popup windows in tabs"
+msgstr "Ці адкрываць усплыўныя вокны ў картках"
+
+#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Аўтаматычна паказваць выявы"
+
+#: ../midori/midori-websettings.c:777
+msgid "Load and display images automatically"
+msgstr "Адчытваць і паказваць выявы аўтаматычна"
+
+#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Дазволіць скрыпты"
+
+#: ../midori/midori-websettings.c:785
msgid "Enable embedded scripting languages"
-msgstr ""
+msgstr "Уключыць убудаваныя скрыптавыя мовы"
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
+#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177
msgid "Enable Netscape plugins"
-msgstr ""
+msgstr "Уключыць плагіны Netscape"
-#: ../midori/midori-websettings.c:774
+#: ../midori/midori-websettings.c:793
msgid "Enable embedded Netscape plugin objects"
-msgstr ""
+msgstr "Уключыць убудаваныя аб'екты плагінаў Netscape"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:808
msgid "Enable Spell Checking"
-msgstr ""
+msgstr "Уключыць праверку правапісу"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:809
msgid "Enable spell checking while typing"
-msgstr ""
+msgstr "Уключыць праверку правапісу падчас упісвання"
-#: ../midori/midori-websettings.c:796
+#: ../midori/midori-websettings.c:815
msgid "Enable HTML5 database support"
-msgstr ""
+msgstr "Падтрымка баз звестак HTML5"
-#: ../midori/midori-websettings.c:797
+#: ../midori/midori-websettings.c:816
msgid "Whether to enable HTML5 database support"
-msgstr ""
+msgstr "Ці дазваляць падтрымку баз звестак HTML5"
-#: ../midori/midori-websettings.c:803
+#: ../midori/midori-websettings.c:822
msgid "Enable HTML5 local storage support"
-msgstr ""
+msgstr "Падтрымка лакальных сховішчаў HTML5"
-#: ../midori/midori-websettings.c:804
+#: ../midori/midori-websettings.c:823
msgid "Whether to enable HTML5 local storage support"
-msgstr ""
+msgstr "Ці дазволіць лакальную падтрымку HTML5-назапашвальнікаў"
-#: ../midori/midori-websettings.c:810
+#: ../midori/midori-websettings.c:829
msgid "Enable offline web application cache"
-msgstr ""
+msgstr "Пазасеткавы кэш вэб-прыкладанняў"
-#: ../midori/midori-websettings.c:811
+#: ../midori/midori-websettings.c:830
msgid "Whether to enable offline web application cache"
-msgstr ""
+msgstr "Ці дазволіць пазасеткавы кэш вэб-прыкладанняў"
-#: ../midori/midori-websettings.c:827
+#: ../midori/midori-websettings.c:851
msgid "Flash window on background tabs"
-msgstr ""
+msgstr "Мігценне па адкрыцці карткі ў фоне"
-#: ../midori/midori-websettings.c:828
+#: ../midori/midori-websettings.c:852
msgid "Flash the browser window if a new tab was opened in the background"
msgstr ""
+"Загаловак акна браўзера будзе мігцець, калі адкрыта новая фонавая картка"
-#: ../midori/midori-websettings.c:836
+#: ../midori/midori-websettings.c:860
msgid "Enable WebGL support"
-msgstr ""
+msgstr "Уключыць падтрымку WebGL"
-#: ../midori/midori-websettings.c:837
+#: ../midori/midori-websettings.c:861
msgid "Allow websites to use OpenGL rendering"
-msgstr ""
+msgstr "Дазволіць вэб-пляцоўкам выкарыстоўваць OpenGL"
-#: ../midori/midori-websettings.c:863
+#: ../midori/midori-websettings.c:887
msgid "Zoom Text and Images"
-msgstr ""
+msgstr "Павялічваць тэкст і выявы"
-#: ../midori/midori-websettings.c:864
+#: ../midori/midori-websettings.c:888
msgid "Whether to zoom text and images"
-msgstr ""
+msgstr "Павялічваць, ці не, тэкст і выявы"
-#: ../midori/midori-websettings.c:879
+#: ../midori/midori-websettings.c:903
msgid "Find inline while typing"
-msgstr ""
-
-#: ../midori/midori-websettings.c:880
-msgid "Whether to automatically find inline while typing"
-msgstr ""
-
-#: ../midori/midori-websettings.c:895
-msgid "Kinetic scrolling"
-msgstr ""
-
-#: ../midori/midori-websettings.c:896
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr ""
+msgstr "Інкрэментальны пошук падчас упісвання"
#: ../midori/midori-websettings.c:904
+msgid "Whether to automatically find inline while typing"
+msgstr "Ці рабіць аўтаматычны пошук падчас упісвання"
+
+#: ../midori/midori-websettings.c:919
+msgid "Kinetic scrolling"
+msgstr "Кінетычны скролінг"
+
+#: ../midori/midori-websettings.c:920
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr "Ці мусіць пракрутка рухацца з паскарэннем у залежнасці ад хуткасці"
+
+#: ../midori/midori-websettings.c:928
msgid "Delete old Cookies after:"
-msgstr ""
+msgstr "Сціраць старыя кукісы праз:"
-#: ../midori/midori-websettings.c:905
+#: ../midori/midori-websettings.c:929
msgid "The maximum number of days to save cookies for"
-msgstr ""
+msgstr "Максімальная працягласць захоўвання кукісаў у днях"
-#: ../midori/midori-websettings.c:921
+#: ../midori/midori-websettings.c:945
msgid "Only accept Cookies from sites you visit"
-msgstr ""
+msgstr "Прымаць кукісы толькі з наведаных пляцовак"
-#: ../midori/midori-websettings.c:922
+#: ../midori/midori-websettings.c:946
msgid "Block cookies sent by third-party websites"
-msgstr ""
+msgstr "Блакаваць кукісы, дасланыя пляцоўкамі трэцяга боку"
-#: ../midori/midori-websettings.c:936
+#: ../midori/midori-websettings.c:960
msgid "Delete pages from history after:"
-msgstr ""
+msgstr "Сціраць старонкі з гісторыі праз:"
-#: ../midori/midori-websettings.c:937
+#: ../midori/midori-websettings.c:961
msgid "The maximum number of days to save the history for"
-msgstr ""
+msgstr "Максімальная колькасць дзён, цягам якіх захоўваць гісторыю"
-#: ../midori/midori-websettings.c:952
+#: ../midori/midori-websettings.c:976
msgid "Proxy server"
-msgstr ""
+msgstr "Проксі-сервер"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:977
msgid "The type of proxy server to use"
-msgstr ""
+msgstr "Тып проксі-сервера"
-#: ../midori/midori-websettings.c:962
+#: ../midori/midori-websettings.c:986
msgid "HTTP Proxy Server"
-msgstr ""
+msgstr "Проксі-сервер HTTP"
-#: ../midori/midori-websettings.c:963
+#: ../midori/midori-websettings.c:987
msgid "The proxy server used for HTTP connections"
-msgstr ""
+msgstr "Проксі-сервер, ужываны для HTTP-злучэнняў"
-#: ../midori/midori-websettings.c:978
+#: ../midori/midori-websettings.c:1002
msgid "Port"
-msgstr ""
+msgstr "Порт"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:1003
msgid "The proxy server port used for HTTP connections"
-msgstr ""
+msgstr "Порт проксі-сервера, ужываны для HTTP-злучэнняў"
-#: ../midori/midori-websettings.c:997
+#: ../midori/midori-websettings.c:1021
msgid "The maximum size of cached pages on disk"
-msgstr ""
+msgstr "Максімальны памер кэшаваных старонак на дыску"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
+#: ../midori/midori-websettings.c:1038
msgid "Identify as"
-msgstr ""
+msgstr "Ідэнтыфікавацца як"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1039
msgid "What to identify as to web pages"
-msgstr ""
+msgstr "Як прадстаўляцца вэб-пляцоўкам"
-#: ../midori/midori-websettings.c:1031
+#: ../midori/midori-websettings.c:1055
msgid "Identification string"
-msgstr ""
+msgstr "Радок ідэнтыфікацыі"
-#: ../midori/midori-websettings.c:1032
+#: ../midori/midori-websettings.c:1056
msgid "The application identification string"
-msgstr ""
+msgstr "Радок ідэнтыфікацыі праграмы"
-#: ../midori/midori-websettings.c:1048
+#: ../midori/midori-websettings.c:1072
msgid "Preferred languages"
-msgstr ""
+msgstr "Пераважныя мовы"
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:1073
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
msgstr ""
+"Раздзелены коскамі спіс пераважных моў для адлюстравання шматмоўных старонак "
+"сеціва, напрыклад \"be\", \"pl,ru\" ці \"en-us;q=1.0, fr-fr;q=0.667\""
-#: ../midori/midori-websettings.c:1064
+#: ../midori/midori-websettings.c:1088
msgid "Clear private data"
-msgstr ""
+msgstr "Сцерці асабовыя звесткі"
-#: ../midori/midori-websettings.c:1065
+#: ../midori/midori-websettings.c:1089
msgid "The private data selected for deletion"
-msgstr ""
+msgstr "Асабовыя звесткі пазначаны да сцірання"
-#: ../midori/midori-websettings.c:1080
+#: ../midori/midori-websettings.c:1104
msgid "Clear data"
-msgstr ""
+msgstr "Сцерці звесткі"
-#: ../midori/midori-websettings.c:1081
+#: ../midori/midori-websettings.c:1105
msgid "The data selected for deletion"
-msgstr ""
+msgstr "Звесткі, вылучаныя для сцірання"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
+#: ../midori/midori-websettings.c:1154
msgid "Strip referrer details sent to websites"
-msgstr ""
+msgstr "Выразаць дэталі рэферэра"
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
+#: ../midori/midori-websettings.c:1156
msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr ""
+msgstr "Скарачаць, ці не, загаловак \"Referer\" да назвы хоста"
-#: ../midori/midori-websettings.c:1146
+#: ../midori/midori-websettings.c:1170
msgid "Always use my font choices"
-msgstr ""
+msgstr "Заўжды ўжываць выбраныя шрыфты"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:1171
msgid "Override fonts picked by websites with user preferences"
msgstr ""
+"Перасягаць шрыфты, пададзеныя вэб-пляцоўкай, пераважнымі карыстальніцкімі"
-#: ../midori/midori-view.c:1360
+#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140
+msgid "Trust this website"
+msgstr "Давяраць гэтай пляцоўцы"
+
+#: ../midori/midori-view.c:1138
+msgid "Security unknown"
+msgstr "Прыватнасць невядомая"
+
+#: ../midori/midori-view.c:1436
#, c-format
msgid "%s wants to save an HTML5 database."
-msgstr ""
+msgstr "%s хоча запісаць HTML5 базу звестак."
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Deny"
-msgstr ""
+msgstr "_Забараніць"
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Allow"
-msgstr ""
+msgstr "_Дазволіць"
-#: ../midori/midori-view.c:1392
+#: ../midori/midori-view.c:1469
#, c-format
msgid "%s wants to know your location."
-msgstr ""
+msgstr "%s хоча ведаць ваша месцазнаходжанне."
-#: ../midori/midori-view.c:1485
+#: ../midori/midori-view.c:1565
#, c-format
msgid "Error - %s"
-msgstr ""
+msgstr "Памылка - %s"
-#: ../midori/midori-view.c:1486
+#: ../midori/midori-view.c:1566
#, c-format
msgid "The page '%s' couldn't be loaded."
-msgstr ""
+msgstr "Немагчыма прачытаць старонку '%s'."
-#: ../midori/midori-view.c:1488
+#: ../midori/midori-view.c:1568
msgid "Try again"
-msgstr ""
+msgstr "Паспрабаваць ізноў"
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
+#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2879
#, c-format
msgid "Send a message to %s"
-msgstr ""
+msgstr "Даслаць паведамленне да %s"
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
+#: ../midori/midori-view.c:2665
+msgid "Add _search engine..."
+msgstr "Дадаць пошукав_ы рухавік..."
+
+#: ../midori/midori-view.c:2709 ../midori/midori-view.c:3035
msgid "Inspect _Element"
-msgstr ""
+msgstr "Інспектаваць эл_емент"
-#: ../midori/midori-view.c:2480
+#: ../midori/midori-view.c:2761
msgid "Open Link in New _Tab"
-msgstr ""
+msgstr "Адкрыць у новай _картцы"
-#: ../midori/midori-view.c:2484
+#: ../midori/midori-view.c:2765
msgid "Open Link in _Foreground Tab"
-msgstr ""
+msgstr "Адкрыць у _бягучай картцы"
-#: ../midori/midori-view.c:2485
+#: ../midori/midori-view.c:2766
msgid "Open Link in _Background Tab"
-msgstr ""
+msgstr "Адкрыць у фонавай кар_тцы"
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2769
msgid "Open Link in New _Window"
-msgstr ""
+msgstr "Адкры_ць у новым акне"
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2772
msgid "Open Link as Web A_pplication"
-msgstr ""
+msgstr "Адкрыць як в_эб-прыкладанне"
-#: ../midori/midori-view.c:2496
+#: ../midori/midori-view.c:2777
msgid "Copy Link de_stination"
-msgstr ""
+msgstr "Капіраваць адрас спас_ылкі"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2793
msgid "Open _Image in New Tab"
-msgstr ""
+msgstr "Адкрыць _выяву ў новай картцы"
-#: ../midori/midori-view.c:2515
+#: ../midori/midori-view.c:2796
msgid "Copy Image _Address"
-msgstr ""
+msgstr "Капіраваць адрас _выявы"
-#: ../midori/midori-view.c:2518
+#: ../midori/midori-view.c:2799
msgid "Save I_mage"
-msgstr ""
+msgstr "Запісац_ь выяву"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2802
msgid "Open in Image _Viewer"
-msgstr ""
+msgstr "Адкрыць у праглядніку _выяў"
-#: ../midori/midori-view.c:2528
+#: ../midori/midori-view.c:2809
msgid "Copy Video _Address"
-msgstr ""
+msgstr "Капіраваць _адрас відэа"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2812
msgid "Save _Video"
-msgstr ""
+msgstr "Запісаць в_ідэа"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2812
msgid "Download _Video"
-msgstr ""
+msgstr "Сцягнуць _відэа"
-#: ../midori/midori-view.c:2557
+#: ../midori/midori-view.c:2838
msgid "Search _with"
-msgstr ""
+msgstr "Шукаць _на"
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:2870
msgid "_Search the Web"
-msgstr ""
+msgstr "Шука_ць у Сеціве"
-#: ../midori/midori-view.c:2606
+#: ../midori/midori-view.c:2887
msgid "Open Address in New _Tab"
-msgstr ""
+msgstr "Адкрыць адрас у новай _картцы"
-#: ../midori/midori-view.c:2909
-msgid "Open or download file"
-msgstr ""
+#: ../midori/midori-view.c:2940
+msgid "Open _Frame in New Tab"
+msgstr "_Адкрыць фрэйм у новай картцы"
-#: ../midori/midori-view.c:2929
+#: ../midori/midori-view.c:3201
#, c-format
-msgid "File Type: '%s'"
-msgstr ""
+msgid "Open or download file from %s"
+msgstr "Адкрыць ці сцягнуць файл з %s"
-#: ../midori/midori-view.c:2931
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr ""
-
-#: ../midori/midori-view.c:2935
+#: ../midori/midori-view.c:3225
#, c-format
msgid "File Name: %s"
-msgstr ""
+msgstr "Назва файла: %s"
-#: ../midori/midori-view.c:2955
+#: ../midori/midori-view.c:3230
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Тып файла: '%s'"
+
+#: ../midori/midori-view.c:3232
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Тып файла: %s ('%s')"
+
+#: ../midori/midori-view.c:3267
+#, c-format
+msgid "Size: %s"
+msgstr "Памер: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3278
#, c-format
msgid "Open %s"
-msgstr ""
+msgstr "Адкрыць %s"
-#: ../midori/midori-view.c:3576
+#: ../midori/midori-view.c:3897
#, c-format
msgid "Inspect page - %s"
-msgstr ""
+msgstr "Інспектаванне старонкі - %s"
-#: ../midori/midori-view.c:3923
+#: ../midori/midori-view.c:4252
msgid "Speed Dial"
-msgstr ""
+msgstr "Хуткі выбар"
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
+#: ../midori/midori-view.c:4253 ../midori/midori-view.c:4359
msgid "Click to add a shortcut"
-msgstr ""
+msgstr "Націсніце, каб дадаць цэтлік"
-#: ../midori/midori-view.c:3925
+#: ../midori/midori-view.c:4254
msgid "Enter shortcut address"
-msgstr ""
+msgstr "Увядзіце адрас цэтліка"
-#: ../midori/midori-view.c:3926
+#: ../midori/midori-view.c:4255
msgid "Enter shortcut title"
-msgstr ""
+msgstr "Увядзіце назву цэтліка"
-#: ../midori/midori-view.c:3927
+#: ../midori/midori-view.c:4256
msgid "Are you sure you want to delete this shortcut?"
-msgstr ""
+msgstr "Вы ўпэўнены, што хочаце сцерці гэты цэтлік?"
-#: ../midori/midori-view.c:4089
+#: ../midori/midori-view.c:4429
#, c-format
msgid "No documentation installed"
-msgstr ""
+msgstr "Дакументацыя не ўстаноўлена"
-#: ../midori/midori-view.c:4165
+#: ../midori/midori-view.c:4506
msgid "Midori doesn't store any personal data:"
-msgstr ""
+msgstr "Midori не запісвае ніякіх асабовых звестак:"
-#: ../midori/midori-view.c:4166
+#: ../midori/midori-view.c:4507
msgid "No history or web cookies are being saved."
-msgstr ""
+msgstr "Не запісваюцца кукісы і гісторыя."
-#: ../midori/midori-view.c:4167
+#: ../midori/midori-view.c:4508
msgid "Extensions are disabled."
-msgstr ""
+msgstr "Прыстаўкі адключаны."
-#: ../midori/midori-view.c:4168
+#: ../midori/midori-view.c:4509
msgid "HTML5 storage, local database and application caches are disabled."
-msgstr ""
+msgstr "HTML5-сховішчы, лакальныя базы звестак і праграмныя кэшы адключаны."
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4510
msgid "Midori prevents websites from tracking the user:"
-msgstr ""
+msgstr "Midori забараняе вэб-пляцоўкам асочваць карыстальніка:"
-#: ../midori/midori-view.c:4170
+#: ../midori/midori-view.c:4511
msgid "Referrer URLs are stripped down to the hostname."
-msgstr ""
+msgstr "URL-спасылкі рэферэра скарачаюцца да назвы хоста."
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:4512
msgid "DNS prefetching is disabled."
-msgstr ""
+msgstr "Папярэдняе атрыманне звестак DNS адключана."
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:4513
msgid "The language and timezone are not revealed to websites."
-msgstr ""
+msgstr "Вэб-пляцоўкі не могуць высветліць мову і часавы пояс."
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:4514
msgid "Flash and other Netscape plugins cannot be listed by websites."
-msgstr ""
+msgstr "Вэб-пляцоўкі не могуць атрымаць спіс флэш і іншых плагінаў Netscape"
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:4603
msgid "Version numbers in brackets show the version used at runtime."
-msgstr ""
+msgstr "Нумары версій у дужках паказваюць версіі, ужытыя пры запуску."
-#: ../midori/midori-view.c:4278
+#: ../midori/midori-view.c:4653
msgid "Page loading delayed"
-msgstr ""
+msgstr "Чытанне старонкі адкладзена"
-#: ../midori/midori-view.c:4279
+#: ../midori/midori-view.c:4654
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
+"Чытанне адкладзена з-за нядаўняга падзення ці з-за настаўленняў запуску"
-#: ../midori/midori-view.c:4280
+#: ../midori/midori-view.c:4655
msgid "Load Page"
-msgstr ""
+msgstr "Чытаць старонку"
-#: ../midori/midori-view.c:4446
+#: ../midori/midori-view.c:4822
msgid "Blank page"
-msgstr ""
+msgstr "Пустая старонка"
-#: ../midori/midori-view.c:4708
+#: ../midori/midori-view.c:5086
msgid "_Duplicate Tab"
-msgstr ""
+msgstr "Прадубля_ваць картку"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:5091
msgid "Show Tab _Label"
-msgstr ""
+msgstr "Паказваць по_дпісы картак"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:5091
msgid "Show Tab _Icon Only"
-msgstr ""
+msgstr "Паказваць толькі _значок карткі"
-#: ../midori/midori-view.c:4719
-msgid "Close ot_her Tabs"
-msgstr ""
+#: ../midori/midori-view.c:5098
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Закрыць іншую ка_ртку"
+msgstr[1] "Закрыць іншыя ка_рткі"
+msgstr[2] "Закрыць іншыя ка_рткі"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5532
+#: ../midori/midori-view.c:5934
msgid "previous"
-msgstr ""
+msgstr "папярэдняя"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5551
+#: ../midori/midori-view.c:5953
msgid "next"
-msgstr ""
+msgstr "наступная"
-#: ../midori/midori-view.c:5564
+#: ../midori/midori-view.c:5966
msgid "Print background images"
-msgstr ""
+msgstr "Друкаваць фонавыя выявы"
-#: ../midori/midori-view.c:5565
+#: ../midori/midori-view.c:5967
msgid "Whether background images should be printed"
-msgstr ""
+msgstr "Друкаваць, ці не, фонавыя выявы старонак"
-#: ../midori/midori-view.c:5597
+#: ../midori/midori-view.c:5999
msgid "Features"
-msgstr ""
+msgstr "Магчымасці"
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:298
msgid "Startup"
-msgstr ""
+msgstr "Запуск"
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:311
msgid "Use _current page"
-msgstr ""
+msgstr "Ужыць бягучую _старонку"
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:315
msgid "Use current page as homepage"
-msgstr ""
+msgstr "Ужыць бягучую старонку як хатнюю"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:324
msgid "Fonts"
-msgstr ""
+msgstr "Шрыфты"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:327
msgid "Proportional Font Family"
-msgstr ""
+msgstr "Прапарцыянальны шрыфт"
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:331
msgid "The default font family used to display text"
-msgstr ""
+msgstr "Прадвызначаны шрыфт для адлюстравання тэксту"
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:334
msgid "The default font size used to display text"
-msgstr ""
+msgstr "Прадвызначаны памер шрыфту для адлюстравання тэксту"
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:336
msgid "Fixed-width Font Family"
-msgstr ""
+msgstr "Монашырынны шрыфт"
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:340
msgid "The font family used to display fixed-width text"
-msgstr ""
+msgstr "Прадвызначаны шрыфт для адлюстравання тэксту фіксаванай шырыні"
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:343
msgid "The font size used to display fixed-width text"
-msgstr ""
+msgstr "Прадвызначаны памер шрыфту для адлюстравання тэксту фіксаванай шырыні"
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:345
msgid "Minimum Font Size"
-msgstr ""
+msgstr "Мінімальны памер шрыфту"
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:349
msgid "The minimum font size used to display text"
-msgstr ""
+msgstr "Мінімальны памер шрыфту для адлюстравання тэксту"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:360
msgid "Behavior"
-msgstr ""
-
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
-msgstr ""
+msgstr "Паводзіны"
#: ../midori/midori-preferences.c:386
+msgid "Allow scripts to open popups"
+msgstr "Дазволіць скрыптам адкрываць вокны"
+
+#: ../midori/midori-preferences.c:387
msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr ""
+msgstr "Дазваляць, ці не, скрыптам адкрываць усплыўныя вокны аўтаматычна"
#. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:418
msgid "Browsing"
-msgstr ""
+msgstr "Навігацыя"
#. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:458
msgid "Network"
-msgstr ""
+msgstr "Сетка"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:465
msgid "Hostname"
-msgstr ""
+msgstr "Назва хоста"
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:489
msgid "MB"
-msgstr ""
+msgstr "МБ"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Add search engine"
-msgstr ""
+msgstr "Дадаць пошукавы рухавік"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Edit search engine"
-msgstr ""
+msgstr "Рэдагаваць пошукавыя рухавікі"
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:985
msgid "_Name:"
-msgstr ""
+msgstr "_Назва:"
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1000
msgid "_Description:"
-msgstr ""
+msgstr "_Апісанне:"
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr ""
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Адрас:"
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1032
msgid "_Token:"
-msgstr ""
+msgstr "_Токен:"
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1330
msgid "Manage Search Engines"
-msgstr ""
+msgstr "Кіраванне пошукавымі рухавікамі"
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1432
msgid "Use as _default"
-msgstr ""
+msgstr "Ужыць як база_вы"
+
+#: ../midori/sokoke.c:346
+msgid "Open with"
+msgstr "Адкрыць з"
#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr ""
-
-#: ../midori/sokoke.c:362
#, c-format
msgid "Choose an application or command to open \"%s\":"
-msgstr ""
+msgstr "Выберыце праграму ці загад для адкрыцця \"%s\":"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
+#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
msgid "Could not run external program."
-msgstr ""
+msgstr "Немагчыма запусціць вонкавую праграму."
-#: ../midori/sokoke.c:1595
+#: ../midori/sokoke.c:1529
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d гадзіна"
+msgstr[1] "%d гадзіны"
+msgstr[2] "%d гадзін"
-#: ../midori/sokoke.c:1596
+#: ../midori/sokoke.c:1530
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d хвіліна"
+msgstr[1] "%d хвіліны"
+msgstr[2] "%d хвілін"
-#: ../midori/sokoke.c:1597
+#: ../midori/sokoke.c:1531
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%'d секунда"
+msgstr[1] "%'d секунды"
+msgstr[2] "%'d секунд"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
+#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:268
#, c-format
msgid "%s of %s"
-msgstr ""
+msgstr "%s з %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
+#: ../midori/sokoke.c:1548
msgid "?B"
-msgstr ""
+msgstr "?Б"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
+#: ../midori/sokoke.c:1551
#, c-format
msgid " (%s/s)"
-msgstr ""
+msgstr " (%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/sokoke.c:1568
#, c-format
msgid " - %s remaining"
-msgstr ""
+msgstr " - %s засталося"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:265
msgid "_Inline Find:"
-msgstr ""
+msgstr "_Шукаць:"
+
+#: ../toolbars/midori-findbar.c:287
+msgid "Previous"
+msgstr "Папярэдняе"
+
+#: ../toolbars/midori-findbar.c:293
+msgid "Next"
+msgstr "Наступнае"
+
+#: ../toolbars/midori-findbar.c:297
+msgid "Match Case"
+msgstr "З улікам рэгістру"
+
+#: ../toolbars/midori-findbar.c:306
+msgid "Highlight Matches"
+msgstr "Вылучыць супадзенні"
#: ../toolbars/midori-findbar.c:317
-msgid "Previous"
-msgstr ""
-
-#: ../toolbars/midori-findbar.c:323
-msgid "Next"
-msgstr ""
-
-#: ../toolbars/midori-findbar.c:327
-msgid "Match Case"
-msgstr ""
-
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr ""
-
-#: ../toolbars/midori-findbar.c:347
msgid "Close Findbar"
-msgstr ""
+msgstr "Закрыць форму пошуку"
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:124
#, c-format
msgid "The file '%s ' has been downloaded."
-msgstr ""
+msgstr "Перасыланне файла '%s ' скончана."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:129
msgid "Transfer completed"
-msgstr ""
+msgstr "Перасыланне скончана"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:201
msgid "The downloaded file is erroneous."
-msgstr ""
+msgstr "Атрыманы файл - памылковы."
-#: ../toolbars/midori-transferbar.c:194
+#: ../toolbars/midori-transferbar.c:202
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
msgstr ""
+"Кантрольная сума, пададзеная спасылкай, не супадае. Гэта азначае, што файл "
+"магчыма няпоўны, ці быў зменены пасля атрымання."
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:345 ../panels/midori-transfers.c:142
msgid "Clear All"
-msgstr ""
+msgstr "Ачысціць усё"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384
msgid "Some files are being downloaded"
-msgstr ""
+msgstr "Некаторыя файлы яшчэ цягнуцца"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:388
msgid "_Quit Midori"
-msgstr ""
+msgstr "Вы_йсці з Midori"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:390
msgid "The transfers will be cancelled if Midori quits."
-msgstr ""
+msgstr "Перасыланні будуць скасаваныя, калі выйсці з Midori."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr ""
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
-msgstr ""
+msgstr "Не ўдалося дадаць закладку: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Не ўдалося абнавіць закладку: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
-msgstr ""
+msgstr "Рэдагаваць вылучаную закладку"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
-msgstr ""
+msgstr "Сцерці вылучаную закладку"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
-msgstr ""
+msgstr "Дадаць каталог"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
-msgstr ""
+msgstr "Раздзяляльнік "
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Шукаць у закладках"
#: ../panels/midori-history.c:111
msgid "History"
-msgstr ""
+msgstr "Гісторыя"
#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
msgid "Today"
-msgstr ""
+msgstr "Сёння"
#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
msgid "Yesterday"
-msgstr ""
+msgstr "Учора"
#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d дзень таму"
+msgstr[1] "%d дні таму"
+msgstr[2] "%d дзён таму"
#: ../panels/midori-history.c:165 ../panels/midori-history.c:184
msgid "A week ago"
-msgstr ""
+msgstr "Тыдзень таму"
+
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Памылка сцірання элемента гісторыі: %s\n"
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
-msgstr ""
+msgstr "Вы ўпэўнены, што хочаце сцерці ўсе запісы з гісторыі?"
#: ../panels/midori-history.c:407
msgid "Bookmark the selected history item"
-msgstr ""
+msgstr "Зрабіць закладку на вылучаны элемент гісторыі"
#: ../panels/midori-history.c:416
msgid "Delete the selected history item"
-msgstr ""
+msgstr "Сцерці вылучаны запіс гісторыі"
#: ../panels/midori-history.c:424
msgid "Clear the entire history"
-msgstr ""
+msgstr "Сцерці ўсю гісторыю"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Шукаць у гісторыі"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
-msgstr ""
+msgstr "Перасыланні"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
-msgstr ""
+msgstr "Адкрыць к_аталог прызначэння"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
-msgstr ""
+msgstr "Капіраваць мес_цазнаходжанне спасылкі"
#: ../katze/katze-http-auth.c:210
msgid "Authentication Required"
-msgstr ""
+msgstr "Патрэбна аўтарызацыя"
#: ../katze/katze-http-auth.c:226
msgid ""
"A username and a password are required\n"
"to open this location:"
msgstr ""
+"Трэба ўвесці імя карыстальніка і пароль,\n"
+"каб адкрыць гэта месцазнаходжанне:"
#: ../katze/katze-http-auth.c:240
msgid "Username"
-msgstr ""
+msgstr "Імя карыстальніка"
#: ../katze/katze-http-auth.c:253
msgid "Password"
-msgstr ""
+msgstr "Пароль"
#: ../katze/katze-http-auth.c:267
msgid "_Remember password"
-msgstr ""
+msgstr "_Захаваць пароль"
#: ../katze/katze-throbber.c:949
#, c-format
msgid "Named icon '%s' couldn't be loaded"
-msgstr ""
+msgstr "Названы значок '%s' нельга прачытаць"
#: ../katze/katze-throbber.c:962
#, c-format
msgid "Stock icon '%s' couldn't be loaded"
-msgstr ""
+msgstr "Немагчыма прачытаць значок '%s' сховішча"
#: ../katze/katze-throbber.c:1042
msgid "Animation frames are broken"
-msgstr ""
+msgstr "Фрэймы анімацыі пашкоджаны"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
#, c-format
msgid "Property '%s' is invalid for %s"
-msgstr ""
+msgstr "Уласцівасць '%s' недапушчальная для %s"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
#: ../extensions/addons.c:308
msgid "Choose file"
-msgstr ""
+msgstr "Выберыце файл"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
-msgstr ""
+msgstr "Выберыце каталог"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
-msgstr ""
+msgstr "Няма"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
-msgstr ""
+msgstr "1 гадзіну"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
-msgstr ""
+msgstr "1 дзень"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
-msgstr ""
+msgstr "1 тыдзень"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
-msgstr ""
+msgstr "1 месяц"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
-msgstr ""
+msgstr "1 год"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
-msgstr ""
+msgstr "Настаўленні %s"
-#: ../extensions/adblock.c:473
+#: ../extensions/adblock.c:470
msgid "Configure Advertisement filters"
-msgstr ""
+msgstr "Наставіць фільтры рэкламы"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:503
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
"\"Add\" to add it to the list. You can find more lists at %s."
msgstr ""
+"Напішыце адрас гатовага спіса фільтравання ў наступнае поле і націсніце "
+"\"Дадаць\", каб дадаць яго ў спіс. Больш спісаў можна знайсці на %s."
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:917
msgid "Edit rule"
-msgstr ""
+msgstr "Рэдагаваць правіла"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:931
msgid "_Rule:"
-msgstr ""
+msgstr "_Правіла:"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:985
msgid "Bl_ock image"
-msgstr ""
+msgstr "Блакаванне выя_ў"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:990
msgid "Bl_ock link"
-msgstr ""
+msgstr "Блакаван_не спасылак"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1689
msgid "Advertisement blocker"
-msgstr ""
+msgstr "Блакавальнік рэкламы"
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1690
msgid "Block advertisements according to a filter list"
-msgstr ""
+msgstr "Блакаванне рэкламы згодна з спісам фільтравання"
#. i18n: An infobar shows up when viewing a script on userscripts.org
#: ../extensions/addons.c:221
msgid "This page appears to contain a user script. Do you wish to install it?"
msgstr ""
+"Гэта старонка ўтрымлівае карыстальніцкі скрыпт. Ці хочаце ўстанавіць яго?"
#: ../extensions/addons.c:222
msgid "_Install user script"
-msgstr ""
+msgstr "_Устанавіць карыстальніцкі скрыпт"
#. i18n: An infobar shows up when viewing a style on userstyles.org
#: ../extensions/addons.c:227
msgid "This page appears to contain a user style. Do you wish to install it?"
msgstr ""
+"Гэта старонка ўтрымлівае карыстальніцкі стыль. Ці хочаце ўстанавіць яго?"
#: ../extensions/addons.c:228
msgid "_Install user style"
-msgstr ""
+msgstr "_Устанавіць карыстальніцкі стыль"
#: ../extensions/addons.c:236
msgid "Don't install"
-msgstr ""
+msgstr "Не ўстанаўляць"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:677
msgid "Userscripts"
-msgstr ""
+msgstr "Карыстальніцкія скрыпты"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:679
msgid "Userstyles"
-msgstr ""
+msgstr "Карыстальніцкія стылі"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
#: ../extensions/feed-panel/main.c:129
msgid "Error"
-msgstr ""
+msgstr "Памылка"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr "Вы хочаце сцерці '%s'?"
+
+#: ../extensions/addons.c:417
+msgid "Delete user script"
+msgstr "Сцерці карыстальніцкі скрыпт"
+
+#: ../extensions/addons.c:418
+msgid "Delete user style"
+msgstr "Сцерці карыстальніцкі стыль"
#: ../extensions/addons.c:421
#, c-format
-msgid "Do you want to delete '%s'?"
-msgstr ""
-
-#: ../extensions/addons.c:427
-msgid "Delete user script"
-msgstr ""
-
-#: ../extensions/addons.c:428
-msgid "Delete user style"
-msgstr ""
-
-#: ../extensions/addons.c:431
-#, c-format
msgid "The file %s will be permanently deleted."
-msgstr ""
+msgstr "Файл %s будзе сцёрты без магчымасці ўзнаўлення."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:566 ../extensions/addons.c:643
msgid "Open in Text Editor"
-msgstr ""
+msgstr "Адкрыць у тэкставым рэдактары"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:568 ../extensions/addons.c:652
msgid "Open Target Folder"
-msgstr ""
+msgstr "Адкрыць мэтавы каталог"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:634
msgid "Add new addon"
-msgstr ""
+msgstr "Дадаць прыстаўку"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:660
msgid "Remove selected addon"
-msgstr ""
+msgstr "Сцерці вылучаную прыстаўку"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
msgid "User addons"
-msgstr ""
+msgstr "Карыстальніцкія прыстаўкі"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1819
#, c-format
msgid "Can't monitor folder '%s': %s"
-msgstr ""
+msgstr "Нельга назіраць за каталогам '%s': %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1908
msgid "Support for userscripts and userstyles"
-msgstr ""
+msgstr "Падтрымка карыстальніцкіх скрыптаў і стыляў"
#: ../extensions/colorful-tabs.c:201
msgid "Colorful Tabs"
-msgstr ""
+msgstr "Каляровыя карткі"
#: ../extensions/colorful-tabs.c:202
msgid "Tint each tab distinctly"
-msgstr ""
+msgstr "Асобная афарбоўка для кожнай карткі"
#: ../extensions/cookie-manager/cookie-manager-page.c:73
#: ../extensions/cookie-manager/main.c:35
msgid "Cookie Manager"
-msgstr ""
+msgstr "Распараднік кукісаў"
#: ../extensions/cookie-manager/cookie-manager-page.c:103
msgid "Delete All"
-msgstr ""
+msgstr "Сцерці ўсё"
#: ../extensions/cookie-manager/cookie-manager-page.c:105
msgid ""
"Deletes all shown cookies. If a filter is set, only those cookies are "
"deleted which match the filter."
msgstr ""
+"Сцірае ўсе паказаныя кукісы. Калі ўстаноўлены фільтр, будуць сцёртыя толькі "
+"тыя кукісы, што адпавядаюць фільтру."
#: ../extensions/cookie-manager/cookie-manager-page.c:120
msgid "Expand All"
-msgstr ""
+msgstr "Разгарнуць усё"
#: ../extensions/cookie-manager/cookie-manager-page.c:127
msgid "Collapse All"
-msgstr ""
+msgstr "Згарнуць усё"
#: ../extensions/cookie-manager/cookie-manager-page.c:572
msgid "Do you really want to delete all cookies?"
-msgstr ""
+msgstr "Вы сапраўды хочаце сцерці ўсе кукісы?"
#: ../extensions/cookie-manager/cookie-manager-page.c:574
msgid "Question"
-msgstr ""
+msgstr "Пытанне"
#: ../extensions/cookie-manager/cookie-manager-page.c:583
msgid "Only cookies which match the filter will be deleted."
-msgstr ""
+msgstr "Толькі тыя кукісы, што адпавядаюць фільтру, будуць сцёртыя."
#: ../extensions/cookie-manager/cookie-manager-page.c:671
msgid "At the end of the session"
-msgstr ""
+msgstr "У канцы сеанса"
#: ../extensions/cookie-manager/cookie-manager-page.c:674
#, c-format
@@ -2429,14 +2584,20 @@ msgid ""
"Secure : %s\n"
"Expires : %s"
msgstr ""
+"Хост : %s\n"
+"Назва : %s\n"
+"Значэнне : %s\n"
+"Шлях : %s\n"
+"Бяспека : %s\n"
+"Згасае : %s"
#: ../extensions/cookie-manager/cookie-manager-page.c:680
msgid "Yes"
-msgstr ""
+msgstr "Так"
#: ../extensions/cookie-manager/cookie-manager-page.c:680
msgid "No"
-msgstr ""
+msgstr "Не"
#: ../extensions/cookie-manager/cookie-manager-page.c:694
#, c-format
@@ -2444,355 +2605,670 @@ msgid ""
"Domain : %s\n"
"Cookies : %d"
msgstr ""
+"Дамен : %s\n"
+"Кукісы : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
-msgstr ""
+msgstr "Назва"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
+msgid "_Expand All"
+msgstr "Расцягн_уць усё"
#: ../extensions/cookie-manager/cookie-manager-page.c:1077
-msgid "_Expand All"
-msgstr ""
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
msgid "_Collapse All"
-msgstr ""
+msgstr "Згарну_ць усё"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr ""
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Шукаць кукісы па назве ці дамену"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
-msgstr ""
+msgstr "Вывад, прагляд і сціранне кукісаў"
#: ../extensions/copy-tabs.c:38
msgid "Copy Tab _Addresses"
-msgstr ""
+msgstr "Капіраваць _адрасы картак"
#: ../extensions/copy-tabs.c:95
msgid "Copy Addresses of Tabs"
-msgstr ""
+msgstr "Капіраваць адрасы картак"
#: ../extensions/copy-tabs.c:96
msgid "Copy the addresses of all tabs to the clipboard"
-msgstr ""
+msgstr "Капіраваць адрасы ўсіх картак у буфер абмену"
#: ../extensions/feed-panel/feed-atom.c:209
msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr ""
+msgstr "Не ўдалося знайсці \"channel\"-элемент у звестках XML."
#: ../extensions/feed-panel/feed-atom.c:315
msgid "Failed to find required Atom \"feed\" elements in XML data."
-msgstr ""
+msgstr "Не ўдалося знайсці неабходны элемент Атам \"feed\" у звестках XML."
#. i18n: The local date a feed was last updated
#: ../extensions/feed-panel/feed-panel.c:387
#, c-format
msgctxt "Feed"
msgid "Last updated: %s."
-msgstr ""
+msgstr "Апошняе абнаўленне: %s."
#: ../extensions/feed-panel/feed-panel.c:653
msgid "Feeds"
-msgstr ""
+msgstr "Каналы"
#: ../extensions/feed-panel/feed-panel.c:706
msgid "Add new feed"
-msgstr ""
+msgstr "Дадаць канал"
#: ../extensions/feed-panel/feed-panel.c:713
msgid "Delete feed"
-msgstr ""
+msgstr "Сцерці канал"
#: ../extensions/feed-panel/feed-panel.c:795
msgid "_Feeds"
-msgstr ""
+msgstr "К_аналы"
#: ../extensions/feed-panel/feed-parse.c:195
#, c-format
msgid "Failed to find root element in feed XML data."
-msgstr ""
+msgstr "Не ўдалося знайсці каранёвы элемент у звестках XML."
#: ../extensions/feed-panel/feed-parse.c:235
#, c-format
msgid "Unsupported feed format."
-msgstr ""
+msgstr "Фармат канала не падтрымліваецца."
#: ../extensions/feed-panel/feed-parse.c:265
#, c-format
msgid "Failed to parse XML feed: %s"
-msgstr ""
+msgstr "Памылка разбору XML канала: %s"
#: ../extensions/feed-panel/feed-rss.c:46
msgid "Failed to find \"channel\" element in RSS XML data."
-msgstr ""
+msgstr "Не ўдалося знайсці \"channel\"-элемент у звестках XML канала."
#: ../extensions/feed-panel/feed-rss.c:51
msgid "Unsupported RSS version found."
-msgstr ""
+msgstr "Знойдзеная версія RSS не падтрымліваецца."
#: ../extensions/feed-panel/feed-rss.c:148
msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr ""
+msgstr "Не ўдалося знайсці неабходны элемент RSS \"item\" у звестках XML."
#: ../extensions/feed-panel/feed-rss.c:248
msgid "Failed to find required RSS \"channel\" elements in XML data."
-msgstr ""
+msgstr "Не ўдалося знайсці неабходны элемент RSS \"channel\" у звестках XML."
#: ../extensions/feed-panel/main.c:131
#, c-format
msgid "Feed '%s' already exists"
-msgstr ""
+msgstr "Канал '%s' ужо існуе"
#: ../extensions/feed-panel/main.c:208
#, c-format
msgid "Error loading feed '%s'"
-msgstr ""
+msgstr "Памылка чытання канала '%s'"
#: ../extensions/feed-panel/main.c:518
msgid "Feed Panel"
-msgstr ""
+msgstr "Панэль каналаў"
#: ../extensions/feed-panel/main.c:519
msgid "Read Atom/ RSS feeds"
-msgstr ""
+msgstr "Чытаць Atom-/ RSS-каналы (feeds)"
#: ../extensions/formhistory/formhistory.c:39
#, c-format
msgid "Failed to add form value: %s\n"
-msgstr ""
+msgstr "Не ўдалося дадаць значэнне формы: %s\n"
#: ../extensions/formhistory/formhistory.c:95
msgid "Form history"
-msgstr ""
+msgstr "Гісторыя формаў"
#: ../extensions/formhistory/formhistory.c:112
msgid ""
"Master password required\n"
"to open password database"
msgstr ""
+"Трэба ўвесці майстар-пароль,\n"
+"каб адкрыць базу пароляў"
#: ../extensions/formhistory/formhistory.c:294
msgid "Remember password on this page?"
-msgstr ""
+msgstr "Захаваць пароль на гэтай старонцы?"
#: ../extensions/formhistory/formhistory.c:299
msgid "Remember"
-msgstr ""
+msgstr "Захаваць"
#: ../extensions/formhistory/formhistory.c:300
msgid "Not now"
-msgstr ""
+msgstr "Не зараз"
#: ../extensions/formhistory/formhistory.c:301
msgid "Never for this page"
-msgstr ""
+msgstr "Ніколі на гэтай старонцы"
#: ../extensions/formhistory/formhistory.c:437
msgid "Toggle form history state"
-msgstr ""
+msgstr "Пераключэнне стану гісторыі формаў"
#: ../extensions/formhistory/formhistory.c:438
msgid "Activate or deactivate form history for the current tab."
-msgstr ""
+msgstr "Уключэнне ці выключэнне гісторыі формаў для бягучай карткі."
#: ../extensions/formhistory/formhistory.c:549
#: ../extensions/formhistory/formhistory.c:553
#, c-format
msgid "Failed to execute database statement: %s\n"
-msgstr ""
+msgstr "Не ўдалося выканаць заяву базы звестак: %s\n"
#: ../extensions/formhistory/formhistory.c:629
msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
-msgstr ""
+msgstr "Уключаць гісторыю форм кнопкамі (Ctrl+Shift+F) у кожнай картцы"
#: ../extensions/formhistory/formhistory.c:668
msgid "Form history filler"
-msgstr ""
+msgstr "Гісторыя запаўнення формаў"
#: ../extensions/formhistory/formhistory.c:669
msgid "Stores history of entered form data"
-msgstr ""
+msgstr "Захоўваць звесткі па запаўненню формаў"
#: ../extensions/formhistory/formhistory-gdom-frontend.c:225
#: ../extensions/formhistory/formhistory-js-frontend.c:106
#, c-format
msgid "Failed to select suggestions\n"
-msgstr ""
+msgstr "Не ўдалося выбраць прапановы\n"
#: ../extensions/history-list.vala:197
msgid "There are no unvisited tabs"
-msgstr ""
+msgstr "Няма ненаведаных картак"
#: ../extensions/history-list.vala:235
#, c-format
msgid "History-List"
-msgstr ""
+msgstr "Спіс гісторыі"
#: ../extensions/history-list.vala:275
msgid "Tab closing behavior"
-msgstr ""
+msgstr "Па закрыцці карткі"
#: ../extensions/history-list.vala:283
msgid "Do nothing"
-msgstr ""
+msgstr "Нічога не рабіць"
#: ../extensions/history-list.vala:289
msgid "Switch to last viewed tab"
-msgstr ""
+msgstr "Перайсці да апошняй прагляданай карткі"
#: ../extensions/history-list.vala:295
msgid "Switch to newest tab"
-msgstr ""
+msgstr "Перайсці да найноўшай карткі"
#: ../extensions/history-list.vala:423
msgid "Next new Tab (History List)"
-msgstr ""
+msgstr "Наступная новая картка (Спіс гісторыі)"
#: ../extensions/history-list.vala:424
msgid "Next new tab from history"
-msgstr ""
+msgstr "Наступная новая картка з гісторыі"
#: ../extensions/history-list.vala:433
msgid "Previous new Tab (History List)"
-msgstr ""
+msgstr "Папярэдняя новая картка (Спіс гісторыі)"
#: ../extensions/history-list.vala:434
msgid "Previous new tab from history"
-msgstr ""
+msgstr "Папярэдняя новая картка з гісторыі"
#: ../extensions/history-list.vala:443
msgid "Display tab in background (History List)"
-msgstr ""
+msgstr "Паказваць картку ў фоне (Спіс гісторы)"
#: ../extensions/history-list.vala:444
msgid "Display the current selected tab in background"
-msgstr ""
+msgstr "Паказваць бягучую вылучаную картку ў фоне"
#: ../extensions/history-list.vala:569
msgid "History List"
-msgstr ""
+msgstr "Спіс гісторыі"
#: ../extensions/history-list.vala:570
msgid "Move to the last used tab when switching or closing tabs"
-msgstr ""
+msgstr "Ісці да апошняй ужытай карткі па пераключэнні ці закрыцці"
#: ../extensions/mouse-gestures.c:301
msgid "Mouse Gestures"
-msgstr ""
+msgstr "Жэсты мышшу"
#: ../extensions/mouse-gestures.c:302
msgid "Control Midori by moving the mouse"
-msgstr ""
+msgstr "Кіраванне Midori рухамі мышы"
#: ../extensions/shortcuts.c:109
msgid "Reload page or stop loading"
-msgstr ""
+msgstr "Перачытаць старонку або спыніць чытанне"
#: ../extensions/shortcuts.c:176
msgid "Customize Keyboard shortcuts"
-msgstr ""
+msgstr "Наставіць клавіятурныя скароты"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr ""
+msgstr "Наста_ўленне скаротаў..."
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
-msgstr ""
+msgstr "Скарачэнні"
#: ../extensions/shortcuts.c:321
msgid "View and edit keyboard shortcuts"
-msgstr ""
+msgstr "Глядзець і рэдагаваць клавіятурныя скароты"
#: ../extensions/status-clock.c:174
msgid "Statusbar Clock"
-msgstr ""
+msgstr "Гадзіннік на стужцы статусу"
#: ../extensions/status-clock.c:175
msgid "Display date and time in the statusbar"
-msgstr ""
+msgstr "Паказваць дату і час у стужцы статусу"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
-msgstr ""
+msgstr "Выявы"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
-msgstr ""
+msgstr "Скрыпты"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
-msgstr ""
+msgstr "Плагіны Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
-msgstr ""
+msgstr "Магчымасці стужкі статусу"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
-msgstr ""
+msgstr "Зручнае ўключэнне-выключэнне магчымасцей вэб-старонак"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
-msgstr ""
+msgstr "Панэль картак"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
-msgstr ""
+msgstr "Панэль к_артак"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
-msgstr ""
+msgstr "Паказваць карткі ў вертыкальнай панэлі"
#: ../extensions/tabs-minimized.c:76
msgid "Only Icons on Tabs by default"
-msgstr ""
+msgstr "Толькі значкі на новых картках"
#: ../extensions/tabs-minimized.c:77
msgid "New tabs have no label by default"
-msgstr ""
+msgstr "Новыя карткі не падпісаныя"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
-msgstr ""
+msgstr "Наставіць стужку прылад"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
msgstr ""
+"Выберыце элементы, якія трэба паказваць на стужцы прылад. Элементы можна "
+"парадкаваць перацягваннем."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
-msgstr ""
+msgstr "Даступныя элементы"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
-msgstr ""
+msgstr "Паказаныя элементы"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr ""
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "На_ставіць стужку прылад…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr ""
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
-msgstr ""
+msgstr "Рэдактар стужкі прылад"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
-msgstr ""
+msgstr "Зручнае рэдагаванне выкладу стужкі прылад"
#: ../extensions/web-cache.c:463
msgid "Cache HTTP communication on disk"
-msgstr ""
+msgstr "Запісваць HTTP-перасыланні ў дыскавы кэш"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Зак_рыць іншыя карткі"
+
+#~ msgid "Filter:"
+#~ msgstr "Фільтр:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Увядзіце радок фільтра, каб паказваць толькі тыя кукісы, дзе назва ці "
+#~ "дамен адпавядаюць фільтру"
+
+#~ msgid "'Flash' Cookies"
+#~ msgstr "«Flash» Кукісы"
+
+#~ msgid "Accept cookies"
+#~ msgstr "Прымаць кукі"
+
+#~ msgid "Add a new bookmark folder"
+#~ msgstr "Дадаць каталог закладак"
+
+#~ msgid "Add shortcut to speed dial"
+#~ msgstr "Дадаць цэтлік хуткага запуску"
+
+#~ msgid "Add shortcut to the desktop"
+#~ msgstr "Дадаць цэтлік на працоўную прастору"
+
+#~ msgid "Add, edit and remove search engines..."
+#~ msgstr "Даданне, змяненне і выдаленне пошукавых рухавікоў..."
+
+#~ msgid "All cookies"
+#~ msgstr "Усе кукісы"
+
+#~ msgid "An external download manager"
+#~ msgstr "Вонкавы распараднік перасыланняў"
+
+#~ msgid "Appearance"
+#~ msgstr "Выгляд"
+
+#~ msgid "Big"
+#~ msgstr "Вялікі"
+
+#~ msgid "Clear private data..."
+#~ msgstr "Сціранне асабовых звестак..."
+
+#~ msgid "Close all open windows"
+#~ msgstr "Закрыць усе адкрытыя вокны"
+
+#~ msgid "Close all tabs except the current tab"
+#~ msgstr "Закрыць усе карткі, акрамя бягучай"
+
+#~ msgid "Close this window"
+#~ msgstr "Закрыць гэта вакно"
+
+#~ msgid "Configure _Advertisement filters..."
+#~ msgstr "Настаўленне _фільтра рэкламы..."
+
+#~ msgid "Cookies"
+#~ msgstr "Кукісы/Cookies"
+
+#~ msgid "Copy the selected text"
+#~ msgstr "Капіраваць вылучаны тэкст"
+
+#~ msgid "Create a launcher"
+#~ msgstr "Стварыць пускальнік"
+
+#~ msgid "Customize _Toolbar..."
+#~ msgstr "_Настаўленне стужкі прылад..."
+
+#~ msgid "Cut the selected text"
+#~ msgstr "Выразаць вылучаны тэкст"
+
+#~ msgid "Cycle focus between views"
+#~ msgstr "Цыклічнае пераключэнне відаў"
+
+#~ msgid "Delete old cookies after 1 hour"
+#~ msgstr "Сціраць старыя кукісы праз 1 гадзіну"
+
+#~ msgid "Delete old cookies after 1 month"
+#~ msgstr "Сціраць старыя кукісы пасля 1 месяца"
+
+#~ msgid "Delete old cookies after 1 week"
+#~ msgstr "Сціраць старыя кукісы пасля 1 тыдня"
+
+#~ msgid "Delete old cookies after 1 year"
+#~ msgstr "Сціраць старыя кукісы пасля 1 года"
+
+#~ msgid "Delete the contents of the trash"
+#~ msgstr "Сцерці змест сметніцы"
+
+#~ msgid "Delete the selected text"
+#~ msgstr "Сцерці вылучаны тэкст"
+
+#~ msgid "Document cannot be displayed"
+#~ msgstr "Дакумент не можа быць паказаны"
+
+#~ msgid "Don't save any private data while browsing"
+#~ msgstr "Не запісваць ніякіх асабовых звестак падчас аглядання"
+
+#~ msgid "Download Manager"
+#~ msgstr "Менеджар перасыланняў"
+
+#~ msgid "Duplicate the current tab"
+#~ msgstr "Прадубліраваць бягучую картку"
+
+#~ msgid "Enforce 96 dots per inch"
+#~ msgstr "Прымусова выставіць 96 кропак на цалю"
+
+#~ msgid "Enforce a video dot density of 96 DPI"
+#~ msgstr "Прымусова выставіць шчыльнасць відэа 96 DPI"
+
+#~ msgid "Enter number of columns and rows:"
+#~ msgstr "Увесці колькасць слупкоў і радкоў:"
+
+#~ msgid "Find the next occurrence of a word or phrase"
+#~ msgstr "Знайсці наступнае ўваходжанне слова ці выразу"
+
+#~ msgid "Find the previous occurrence of a word or phrase"
+#~ msgstr "Знайсці папярэдняе ўваходжанне слова ці выразу"
+
+#~ msgid "Focus the current tab"
+#~ msgstr "Бягучая картка"
+
+#~ msgid "HTML5 _Databases"
+#~ msgstr "База з_вестак HTML5"
+
+#~ msgid "Import bookmarks..."
+#~ msgstr "Імпартаванне закладак..."
+
+#~ msgid "Inspect page details and access developer tools..."
+#~ msgstr "Інспектаванне дэталяў старонкі, прылады распрацоўніка..."
+
+#~ msgid "Invalid input for the size of the speed dial"
+#~ msgstr "Недапушчальны ўвод для памераў хуткага выбару"
+
+#~ msgid "Lightweight web browser"
+#~ msgstr "Лёгкі вэб-браўзер"
+
+#~ msgid "MD5-Checksum:"
+#~ msgstr "Кантрольная сума MD5:"
+
+#~ msgid "Maximum cookie age"
+#~ msgstr "Максімальны узрост кукісаў"
+
+#~ msgid "Maximum history age"
+#~ msgstr "Максімальная даўжыня гісторыі"
+
+#~ msgid "Medium"
+#~ msgstr "Сярэдні"
+
+#~ msgid "Move tab behind the previous tab"
+#~ msgstr "Перамясціць картку за папярэднюю"
+
+#~ msgid "Move tab in front of the next tab"
+#~ msgstr "Перамясціць картку перад наступнай"
+
+#~ msgid "No filename specified"
+#~ msgstr "Не уведзена назва файла"
+
+#~ msgid "Not available: %s"
+#~ msgstr "Недаступна: %s"
+
+#~ msgid "Not found - %s"
+#~ msgstr "Не знойдзена - %s"
+
+#~ msgid "Offline Application Cache"
+#~ msgstr "Пазасеткавы кэш прыкладанняў"
+
+#~ msgid "Only show the icon of the current tab"
+#~ msgstr "Паказваць толькі значок на бягучай картцы"
+
+#~ msgid "Open Midori's bug tracker"
+#~ msgstr "Адкрыць баг-трэкер Midori"
+
+#~ msgid "Open external pages in:"
+#~ msgstr "Адкрываць вонкавыя старонкі ў:"
+
+#~ msgid "Open the last closed tab"
+#~ msgstr "Адкрыць апошнюю закрытую картку"
+
+#~ msgid "Open the tabs saved in the last session"
+#~ msgstr "Адкрываць карткі, запісаныя ў апошнім сеансе"
+
+#~ msgid "Paste text from the clipboard"
+#~ msgstr "Уставіць тэкст з буфера абмену"
+
+#~ msgid "Redo the last modification"
+#~ msgstr "Узнавіць апошняе змяненне"
+
+#~ msgid "Remember last downloaded files"
+#~ msgstr "Памятаваць апошнія сцягнутыя файлы"
+
+#~ msgid "Reset the last _session"
+#~ msgstr "Скінуць апошні се_анс"
+
+#~ msgid "Reset the zoom level"
+#~ msgstr "Скінуць узровень павелічэння"
+
+#~ msgid "Resource files not installed"
+#~ msgstr "Файлы рэсурсаў не ўстаноўлены"
+
+#~ msgid "SHA1-Checksum:"
+#~ msgstr "Кантрольная сума SHA1:"
+
+#~ msgid "Scroll down"
+#~ msgstr "Пракруціць уніз"
+
+#~ msgid "Scroll to the left"
+#~ msgstr "Пракруціць улева"
+
+#~ msgid "Scroll to the right"
+#~ msgstr "Пракруціць управа"
+
+#~ msgid "Scroll up"
+#~ msgstr "Пракруціць уверх"
+
+#~ msgid "Search engines in location completion"
+#~ msgstr "Пошукавыя рухавікі ў дапаўненні адрасоў"
+
+#~ msgid "Select all text"
+#~ msgstr "Вылучыць увесь тэкст"
+
+#~ msgid "Session cookies"
+#~ msgstr "Кукі сеанса"
+
+#~ msgid "Set number of columns and rows"
+#~ msgstr "Задаць колькасць слупкоў і радкоў"
+
+#~ msgid "Show Transferbar"
+#~ msgstr "Паказваць стужку перасыланняў"
+
+#~ msgid "Show bookmarkbar"
+#~ msgstr "Паказваць панэль закладак"
+
+#~ msgid "Show information about the program"
+#~ msgstr "Паказваць звесткі пра праграму"
+
+#~ msgid "Show menubar"
+#~ msgstr "Паказаць радок меню"
+
+#~ msgid "Show navigationbar"
+#~ msgstr "Паказаць панэль навігацыі"
+
+#~ msgid "Show operating controls of the panel"
+#~ msgstr "Паказваць аперацыйныя кантрольнікі панэлі"
+
+#~ msgid "Show sidepanel"
+#~ msgstr "Паказаць бакавую панэль"
+
+#~ msgid "Show speed dial in new tabs"
+#~ msgstr "Паказваць хуткі выбар у новай картцы"
+
+#~ msgid "Show speed dial in newly opened tabs"
+#~ msgstr "Паказваць хуткі выбар у наноў адкрытых картках"
+
+#~ msgid "Show statusbar"
+#~ msgstr "Паказваць стужку статусу"
+
+#~ msgid "Show the Frequently Asked Questions"
+#~ msgstr "Паказаць Частыя Пытанні"
+
+#~ msgid "Small"
+#~ msgstr "Малы"
+
+#~ msgid "Subscribe to this news feed"
+#~ msgstr "Падпісацца на гэты канал навін"
+
+#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
+#~ msgstr "Пераключаць карткі па Strg+Tab парадкуючы па апошнім ужыванні"
+
+#~ msgid "Switch to the previous tab"
+#~ msgstr "Перайсці да папярэдняй карткі"
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Немагчыма захаваць закладкі. %s"
+
+#~ msgid "Thumb size:"
+#~ msgstr "Памер значкоў:"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Верхні ўзровень"
+
+#~ msgid "View the source code of the page"
+#~ msgstr "Глядзець выточны тэкст старонкі"
+
+#~ msgid "Whether the last downloaded files are saved"
+#~ msgstr "Ці запісваць апошнія сцягнутыя файлы"
+
+#~ msgid "Whether to show search engines in the location completion"
+#~ msgstr "Ці паказваць пошукавыя рухавікі ў дапаўненні адрасоў"
+
+#~ msgid "Whether to show the operating controls of the panel"
+#~ msgstr "Ці паказваць аперацыйныя кантрольнікі на панэлі"
+
+#~ msgid "Whether to show the transferbar"
+#~ msgstr "Ці паказваць стужку перасыланняў"
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Закладка"
+
+#~ msgid "_Console"
+#~ msgstr "_Сonsole"
+
+#~ msgid "_Customize..."
+#~ msgstr "_Наставіць…"
+
+#~ msgid "_Folder:"
+#~ msgstr "К_аталог:"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Значок:"
+
+#~ msgid "_Title:"
+#~ msgstr "_Загаловак:"
+
+#~ msgid "days"
+#~ msgstr "дні"
diff --git a/po/ca.po b/po/ca.po
index 3f6ebeed..0e30b8d0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -604,7 +604,7 @@ msgid "Firefox (%s)"
msgstr "Firefox (%s)"
#: ../midori/midori-browser.c:4239
-msgid "Import bookmarks..."
+msgid "Import bookmarks…"
msgstr "Importa les adreces d'interès…"
#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
@@ -711,8 +711,8 @@ msgid "Open a file"
msgstr "Obre un fitxer"
#: ../midori/midori-browser.c:5228
-msgid "_Save Page As..."
-msgstr "_Desa pàgina com..."
+msgid "_Save Page As…"
+msgstr "_Desa pàgina com…"
#: ../midori/midori-browser.c:5229
msgid "Save to a file"
@@ -759,7 +759,7 @@ msgid "_Edit"
msgstr "_Edita"
#: ../midori/midori-browser.c:5282
-msgid "_Find..."
+msgid "_Find…"
msgstr "_Cerca…"
#: ../midori/midori-browser.c:5283
@@ -933,7 +933,7 @@ msgid "_Frequent Questions"
msgstr "_Preguntes freqüents"
#: ../midori/midori-browser.c:5421
-msgid "_Report a Problem..."
+msgid "_Report a Problem…"
msgstr "Informa d'un _error…"
#: ../midori/midori-browser.c:5433
@@ -991,7 +991,7 @@ msgstr "Occidental (ISO-8859-1)"
#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242
#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
+msgid "Custom…"
msgstr "Personalitzat…"
#: ../midori/midori-browser.c:5985
@@ -999,7 +999,7 @@ msgid "_Separator"
msgstr "_Separador"
#: ../midori/midori-browser.c:5992
-msgid "_Location..."
+msgid "_Location…"
msgstr "_Ubicació…"
#: ../midori/midori-browser.c:5994
@@ -1007,7 +1007,7 @@ msgid "Open a particular location"
msgstr "Obre una ubicació"
#: ../midori/midori-browser.c:6016
-msgid "_Web Search..."
+msgid "_Web Search…"
msgstr "Cerca _web…"
#: ../midori/midori-browser.c:6018
@@ -1065,7 +1065,7 @@ msgid "Search with %s"
msgstr "Cerca amb %s"
#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
+msgid "Search with…"
msgstr "Cerca amb…"
#: ../midori/midori-locationaction.c:537
@@ -2761,7 +2761,7 @@ msgid "Customize Keyboard shortcuts"
msgstr "Configura les dreceres de teclat"
#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
+msgid "Customize Sh_ortcuts…"
msgstr "Configura les _dreceres…"
#: ../extensions/shortcuts.c:320
@@ -2841,11 +2841,11 @@ msgid "Displayed Items"
msgstr "Elements mostrats"
#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
+msgid "Customize _Toolbar…"
msgstr "Personalitza la barra d'e_ines…"
#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
+msgid "_Customize…"
msgstr "_Configura…"
#: ../extensions/toolbar-editor.c:627
@@ -2956,13 +2956,13 @@ msgstr "Empra el disc com a memòria cau de comunicacions HTTP"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Afegeix una carpeta d'adreces d'interès"
-#~ msgid "Add, edit and remove search engines..."
+#~ msgid "Add, edit and remove search engines…"
#~ msgstr "Afegeix, edita o treu ginys de cerca…"
-#~ msgid "Clear private data..."
+#~ msgid "Clear private data…"
#~ msgstr "Neteja les dades privades…"
-#~ msgid "Inspect page details and access developer tools..."
+#~ msgid "Inspect page details and access developer tools…"
#~ msgstr ""
#~ "Inspecciona els detalls de la pàgina i accedeix a les eines per "
#~ "desenvolupadors…"
@@ -3221,7 +3221,7 @@ msgstr "Empra el disc com a memòria cau de comunicacions HTTP"
#~ msgid "Delete old cookies after 1 year"
#~ msgstr "Esborrar les galetes antigues després d'un any"
-#~ msgid "Configure _Advertisement filters..."
+#~ msgid "Configure _Advertisement filters…"
#~ msgstr "Configura els filtres de _publicitat…"
#~ msgid "Open target folder for selected addon"
diff --git a/po/cs.po b/po/cs.po
index dcf40db0..8387ae48 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: midori 0.2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-14 02:09+0000\n"
+"POT-Creation-Date: 2012-09-17 06:15+0000\n"
"PO-Revision-Date: 2012-02-24 01:20+0100\n"
"Last-Translator: Michal Várady \n"
"Language-Team: Czech < >\n"
@@ -28,12 +28,28 @@ msgstr "Prohlížet internet"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996
-#: ../midori/main.c:2010 ../midori/midori-websettings.c:313
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1922 ../midori/main.c:1946
+#: ../midori/main.c:1960 ../midori/midori-websettings.c:200
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Internetový prohlížeč Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Nové okno soukromého prohlížení"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326
+msgid "New Tab"
+msgstr "Nová karta"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323
+msgid "New Window"
+msgstr "Nové okno"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Internetový prohlížeč"
@@ -45,71 +61,87 @@ msgstr "Midori - soukromé prohlížení"
msgid "Open a new private browsing window"
msgstr "Nové okno soukromého prohlížení"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4288
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4355
msgid "Private Browsing"
msgstr "Soukromé prohlížení"
-#: ../midori/main.c:97 ../midori/main.c:103
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Konfiguraci nelze načíst: %s\n"
-#: ../midori/main.c:151
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Hodnota '%s' je pro %s neplatná"
-#: ../midori/main.c:156 ../midori/main.c:260
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Neplatná hodnota '%s' konfigurace"
-#: ../midori/main.c:381
+#: ../midori/main.c:365
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Vyhledávací nástroje nelze načíst.%s\n"
-#: ../midori/main.c:435
+#: ../midori/main.c:419
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Nepodařilo se smazat historii: %s\n"
-#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Nepodařilo se otevřít databázi: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:525
+#: ../midori/main.c:513
#, 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:547
+#: ../midori/main.c:535
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Konfiguraci nelze uložit. %s"
-#: ../midori/main.c:582
+#: ../midori/main.c:561
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Vyhledávací nástroj nelze uložit. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:619
+#: ../midori/main.c:598
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Seznam zavřených karet nelze uložit. %s"
-#: ../midori/main.c:660 ../panels/midori-extensions.c:91
+#: ../midori/main.c:671 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Rozšíření"
-#: ../midori/main.c:674
+#: ../midori/main.c:685
msgid "Privacy"
msgstr "Soukromí"
-#: ../midori/main.c:686
+#: ../midori/main.c:687
+msgid "Delete old Cookies after:"
+msgstr "Smazat stará cookies po:"
+
+#: ../midori/main.c:689 ../midori/main.c:692
+msgid "The maximum number of days to save cookies for"
+msgstr "Maximální počet dní, po které jsou cookies platná."
+
+#: ../midori/main.c:696
+msgid "Only accept Cookies from sites you visit"
+msgstr "Přijímat cookies pouze z navštívených stránek"
+
+#: ../midori/main.c:697
+msgid "Block cookies sent by third-party websites"
+msgstr "Blokovat cookies z jiných stránek"
+
+#: ../midori/main.c:702
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -117,18 +149,47 @@ msgstr ""
"V cookies se ukládají přihlašovací údaje, stavy her nebo uživatelská data "
"pro reklamní účely."
-#: ../midori/main.c:742
+#: ../midori/main.c:709
+msgid "Enable offline web application cache"
+msgstr "Povolit mezipaměť pro offline aplikace"
+
+#: ../midori/main.c:712
+msgid "Enable HTML5 local storage support"
+msgstr "Povolit místní úložiště pro HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/main.c:716
+msgid "Strip referrer details sent to websites"
+msgstr "Odstranit detaily o referující adrese při odesílání"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/main.c:718
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+"Určuje, zda bude referenční hlavička \"Referer\" zkrácena na pouhý název "
+"hostitele"
+
+#: ../midori/main.c:721
+msgid "Delete pages from history after:"
+msgstr "Smazat stránky z historie po:"
+
+#: ../midori/main.c:723 ../midori/main.c:726
+msgid "The maximum number of days to save the history for"
+msgstr ""
+"Maximální počet dní, po které se bude uchovávat historie navštívených stránek"
+
+#: ../midori/main.c:767
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Relaci nelze uložit. %s"
-#: ../midori/main.c:960
+#: ../midori/main.c:989
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Nejsou k dispozici žádné kořenové certifikáty. SSL certifikáty nelze ověřit."
-#: ../midori/main.c:1036
+#: ../midori/main.c:1084
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -136,141 +197,149 @@ msgstr ""
"Aplikace Midori zřejmě minule nebyla řádně ukončena. V případě opakujících "
"se potíží použijte k jejich odstranění následující možnosti."
-#: ../midori/main.c:1055
+#: ../midori/main.c:1103
msgid "Modify _preferences"
msgstr "Změnit _nastavení"
-#: ../midori/main.c:1059
+#: ../midori/main.c:1107
msgid "Disable all _extensions"
msgstr "Zakázat všechna _rozšíření"
-#: ../midori/main.c:1072
+#: ../midori/main.c:1116
+msgid "Show a dialog after Midori crashed"
+msgstr "Zobrazit dialog po pádu aplikace Midori"
+
+#: ../midori/main.c:1121
msgid "Discard old tabs"
msgstr "Zahodit staré karty"
-#: ../midori/main.c:1073 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1122 ../midori/midori-websettings.c:108
msgid "Show last tabs without loading"
msgstr "zobrazit naposledy otevřené karty bez načtení"
-#: ../midori/main.c:1074 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1123 ../midori/midori-websettings.c:107
msgid "Show last open tabs"
msgstr "zobrazit naposledy otevřené karty"
-#: ../midori/main.c:1321 ../midori/main.c:2399
+#: ../midori/main.c:1370 ../midori/main.c:2382
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Relaci nelze načíst: %s\n"
-#: ../midori/main.c:1459
+#: ../midori/main.c:1508
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Snímek uložen do: %s\n"
-#: ../midori/main.c:1875
+#: ../midori/main.c:1837
msgid "Run ADDRESS as a web application"
msgstr "Spustit řetězec ADRESA jako webovou aplikaci"
-#: ../midori/main.c:1875
+#: ../midori/main.c:1837
msgid "ADDRESS"
msgstr "ADRESA"
-#: ../midori/main.c:1878
+#: ../midori/main.c:1840
msgid "Use FOLDER as configuration folder"
msgstr "Použít řetězec SLOŽKA jako složku konfigurace"
-#: ../midori/main.c:1878
+#: ../midori/main.c:1840
msgid "FOLDER"
msgstr "SLOŽKA"
-#: ../midori/main.c:1881
+#: ../midori/main.c:1843
msgid "Private browsing, no changes are saved"
msgstr "Soukromé prohlížení, bez uložení změn"
-#: ../midori/main.c:1883
+#: ../midori/main.c:1846
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Přenosný mód, všechny soubory jsou na jednom místě"
+
+#: ../midori/main.c:1849
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Obyčejné okno s jádrem WebKit, obdoba GtkLauncher"
+
+#: ../midori/main.c:1851
msgid "Show a diagnostic dialog"
msgstr "Zobrazit diagnostické dialogové okno"
-#: ../midori/main.c:1885
+#: ../midori/main.c:1853
msgid "Run the specified filename as javascript"
msgstr "Spustit zadaný soubor jako javascript"
-#: ../midori/main.c:1887
+#: ../midori/main.c:1855
msgid "Take a snapshot of the specified URI"
msgstr "Získat snímek zadané adresy URI"
-#: ../midori/main.c:1889
+#: ../midori/main.c:1857
msgid "Execute the specified command"
msgstr "Spustit zadaný příkaz"
-#: ../midori/main.c:1891
+#: ../midori/main.c:1859
msgid "List available commands to execute with -e/ --execute"
msgstr "Seznam dostupných příkazů spustitelných s parametrem -e / --execute"
-#: ../midori/main.c:1893
+#: ../midori/main.c:1861
msgid "Display program version"
msgstr "Zobrazit verzi programu"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1863
msgid "Addresses"
msgstr "Adresy"
-#: ../midori/main.c:1897
+#: ../midori/main.c:1865
msgid "Block URIs according to regular expression PATTERN"
msgstr "Blokovat adresy URI pomocí regulárního výrazu REGVÝRAZ"
-#: ../midori/main.c:1897
+#: ../midori/main.c:1865
msgid "PATTERN"
msgstr "REGVÝRAZ"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1901
+#: ../midori/main.c:1869
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Restartovat aplikaci Midori po SEKUNDY sekund neaktivity"
-#: ../midori/main.c:1901
+#: ../midori/main.c:1869
msgid "SECONDS"
msgstr "SEKUNDY"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1872
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Přesměruje varování z konzoly do souboru SOUBOR"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1872
msgid "FILENAME"
msgstr "SOUBOR"
-#: ../midori/main.c:1969
-msgid "[Addresses]"
-msgstr "[Adresy]"
-
-#: ../midori/main.c:2011
+#: ../midori/main.c:1961
msgid "Please report comments, suggestions and bugs to:"
msgstr "Komentáře, požadavky a hlášení o chybách posílejte na:"
-#: ../midori/main.c:2013
+#: ../midori/main.c:1963
msgid "Check for new versions at:"
msgstr "Zjistěte dostupnost nové verze na:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2108
+#: ../midori/main.c:2102
msgid "Saved logins and _passwords"
msgstr "Uložené _přihlašovací údaje"
-#: ../midori/main.c:2110
+#: ../midori/main.c:2104
msgid "Cookies and Website data"
msgstr "Cookies a data stránek"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2114 ../midori/midori-websettings.c:997
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
+#: ../midori/main.c:2108 ../midori/midori-preferences.c:505
+#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470
msgid "Web Cache"
msgstr "Mezipaměť stránek"
-#: ../midori/main.c:2117
+#: ../midori/main.c:2111
msgid "Website icons"
msgstr "Ikony webových stránek"
-#: ../midori/main.c:2223
+#: ../midori/main.c:2215
msgid "An unknown error occured"
msgstr "Došlo k neznámé chybě"
@@ -278,86 +347,87 @@ msgstr "Došlo k neznámé chybě"
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Instance aplikace Midori je již spuštěna, ale neodpovídá.\n"
-#: ../midori/main.c:2366
+#: ../midori/main.c:2364
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Záložky nelze načíst: %s\n"
-#: ../midori/main.c:2414
+#: ../midori/main.c:2397
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Zavřené karty nelze načíst: %s\n"
-#: ../midori/main.c:2427
+#: ../midori/main.c:2410
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Historii nelze načíst: %s\n"
-#: ../midori/main.c:2443
+#: ../midori/main.c:2425
msgid "The following errors occured:"
msgstr "Došlo k následujícím chybám:"
-#: ../midori/main.c:2459
+#: ../midori/main.c:2441
msgid "_Ignore"
msgstr "_Ignorovat"
-#: ../midori/midori-app.c:1339
-msgid "_Bookmark"
-msgstr "_Záložky"
+#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:534
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Neočekávaná akce '%s'."
-#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066
+#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6251
msgid "_Bookmarks"
msgstr "_Záložky"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1373
msgid "Add Boo_kmark"
msgstr "_Přidat záložku"
-#: ../midori/midori-app.c:1342
-msgid "_Console"
-msgstr "_Konzola"
-
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1374
msgid "_Extensions"
msgstr "_Rozšíření"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591
+#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700
msgid "_History"
msgstr "_Historie"
-#: ../midori/midori-app.c:1345
-msgid "_Homepage"
-msgstr "_Domovská stránka"
-
-#: ../midori/midori-app.c:1346
+#: ../midori/midori-app.c:1376
msgid "_Userscripts"
msgstr "_Uživatelské skripty"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1377
+msgid "User_styles"
+msgstr "Uživatelské _styly"
+
+#: ../midori/midori-app.c:1378
msgid "New _Tab"
msgstr "Nová _karta"
-#: ../midori/midori-app.c:1348
+#: ../midori/midori-app.c:1379
msgid "_Transfers"
msgstr "_Přenosy"
-#: ../midori/midori-app.c:1349
+#: ../midori/midori-app.c:1380
msgid "Netscape p_lugins"
msgstr "Zásuvné moduly ap_likace Netscape"
-#: ../midori/midori-app.c:1350
+#: ../midori/midori-app.c:1381
msgid "_Closed Tabs"
msgstr "_Zavřené karty"
-#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218
+#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387
msgid "New _Window"
msgstr "Nové _okno"
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1383
msgid "New _Folder"
msgstr "Nová _složka"
+#: ../midori/midori-app.c:1437
+msgid "[Addresses]"
+msgstr "[Adresy]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Soubor nebyl nalezen."
@@ -375,140 +445,113 @@ msgstr "Neznámý formát záložek."
msgid "Writing failed."
msgstr "Zápis se nezdařil."
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526
+msgid "Go forward to the next page"
+msgstr "Přejít vpřed (na následující stránku)"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:354 ../midori/midori-browser.c:5534
+#: ../midori/midori-browser.c:5537
+msgid "Go to the next sub-page"
+msgstr "Přejít na následující podstránku"
+
+#: ../midori/midori-browser.c:441 ../midori/midori-browser.c:5475
+#: ../midori/midori-browser.c:5484
msgid "Reload the current page"
msgstr "Znovu načíst tuto stránku"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481
msgid "Stop loading the current page"
msgstr "Zastavit načítání této stránky"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:519
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Nepodařilo se aktualizovat titulek: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Neočekávaná akce '%s'."
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:614
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Soukromé prohlížení)"
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "Složka nejvyšší úrovně"
+#: ../midori/midori-browser.c:724 ../midori/midori-browser.c:766
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Záložky"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:826
msgid "New folder"
msgstr "Nová složka"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:826
msgid "Edit folder"
msgstr "Upravit složku"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:828
msgid "New bookmark"
msgstr "Nová záložka"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:828
msgid "Edit bookmark"
msgstr "Upravit záložku"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Nadpis:"
+#: ../midori/midori-browser.c:862
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Zadejte název záložky a zařaďte ji."
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Adresa:"
-
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328
-msgid "_Folder:"
-msgstr "Složk_a:"
-
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:923
msgid "Add to _Speed Dial"
msgstr "Přidat do _rychlého přístupu"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:929
msgid "Show in the tool_bar"
msgstr "Zobrazit v panelu _nástrojů"
-#: ../midori/midori-browser.c:905
+#: ../midori/midori-browser.c:937
msgid "Run as _web application"
msgstr "Spustit jako _webovou aplikaci"
-#: ../midori/midori-browser.c:976
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "Soubor \"%s\" nelze uložit do této složky."
-
-#: ../midori/midori-browser.c:978
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "Nemáte oprávnění k zápisu do tohoto umístění."
-
-#: ../midori/midori-browser.c:985
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "Ke stažení \"%s\" není k dispozici dostatek místa."
-
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "Požaduje se %s, ale k dispozici je pouze %s."
-
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397
+#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504
msgid "Save file as"
msgstr "Uložit soubor jako"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Nové okno"
+#: ../midori/midori-browser.c:1065
+msgid "Save associated _resources"
+msgstr "Uložit připojené _zdroje"
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1323
msgid "A new window has been opened"
msgstr "Bylo otevřeno nové okno"
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Nová karta"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1326
msgid "A new tab has been opened"
msgstr "Byla otevřena nová karta"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1343
msgid "Error opening the image!"
msgstr "Chyba při otevírání obrázku!"
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1344
msgid "Can not open selected image in a default viewer."
msgstr "Vybraný obrázek nelze otevřít ve výchozím prohlížeči obrázků."
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1350
msgid "Error downloading the image!"
msgstr "Chyba při stahování obrázku."
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1351
msgid "Can not download selected image."
msgstr "Vybraný obrázek se nepodařilo stáhnout."
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1408
msgid "Save file"
msgstr "Uložit soubor"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2335
msgid "Open file"
msgstr "Otevřít soubor"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2467
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -522,141 +565,157 @@ msgstr ""
"Midori (Upravit -> Nastavení -> záložka Aplikace, položka Čtečka RSS). "
"Dalším kliknutím na ikonu RSS přidáte kanál přímo do čtečky."
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2473 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Nový kanál"
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5550
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Přidat novou záložku"
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Prázdné"
-#: ../midori/midori-browser.c:3469
+#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507
msgid "Toggle text cursor navigation"
msgstr "Přepíná navigaci pomocí kurzoru"
-#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759
+#: ../midori/midori-browser.c:3509
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Stisk klávesy F7 přepíná funkci ovládání pomocí kurzoru. Když je aktivní, na "
+"všech stránkách se objevuje kurzor."
+
+#: ../midori/midori-browser.c:3512
+msgid "_Enable Caret Browsing"
+msgstr "Povolit ovládání ku_rzorem"
+
+#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944
#, 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:4116 ../panels/midori-bookmarks.c:745
-#: ../panels/midori-history.c:803
+#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Otevřít všechny v _kartách"
-#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Otevřít v nové _kartě"
-#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2688
-#: ../midori/midori-view.c:4848 ../panels/midori-bookmarks.c:753
-#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2952
+#: ../midori/midori-view.c:4928 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Otevřít v novém _okně"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4329
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4330
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4331
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4332
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4219
+#: ../midori/midori-browser.c:4333
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4220
+#: ../midori/midori-browser.c:4334
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4241
-msgid "Import bookmarks..."
-msgstr "Importovat záložky..."
+#: ../midori/midori-browser.c:4335
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:4356
+msgid "Import bookmarks…"
+msgstr "Importovat záložky…"
+
+#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555
msgid "_Import bookmarks"
msgstr "_Importovat záložky"
-#: ../midori/midori-browser.c:4255
+#: ../midori/midori-browser.c:4370
msgid "_Application:"
msgstr "_Aplikace:"
-#: ../midori/midori-browser.c:4320
+#: ../midori/midori-browser.c:4435
msgid "Import from XBEL or HTML file"
msgstr "Importovat ze souboru typu XBEL, nebo HTML"
-#: ../midori/midori-browser.c:4355
+#: ../midori/midori-browser.c:4463
msgid "Import from a file"
msgstr "Importovat ze souboru"
-#: ../midori/midori-browser.c:4367
+#: ../midori/midori-browser.c:4475
msgid "Failed to import bookmarks"
msgstr "Nepodařilo se naimportovat záložky"
-#: ../midori/midori-browser.c:4402
+#: ../midori/midori-browser.c:4509
msgid "XBEL Bookmarks"
msgstr "Záložky ve formátu XBEL"
-#: ../midori/midori-browser.c:4407
+#: ../midori/midori-browser.c:4514
msgid "Netscape Bookmarks"
msgstr "Záložky z aplikace Netscape"
-#: ../midori/midori-browser.c:4421
+#: ../midori/midori-browser.c:4528
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr ""
"Z aplikace Midori lze exportovat záložky pouze ve formátech XBEL (*.xbel) a "
"Netscape (*.html)"
-#: ../midori/midori-browser.c:4436
+#: ../midori/midori-browser.c:4543
msgid "Failed to export bookmarks"
msgstr "Nepodařilo se exportovat záložky"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4558
+#: ../midori/midori-browser.c:4665
msgid "Clear Private Data"
msgstr "Vymazat osobní data"
-#: ../midori/midori-browser.c:4562
+#: ../midori/midori-browser.c:4669
msgid "_Clear private data"
msgstr "_Vymazat osobní data"
-#: ../midori/midori-browser.c:4575
+#: ../midori/midori-browser.c:4684
msgid "Clear the following data:"
msgstr "Vymazat následující data:"
-#: ../midori/midori-browser.c:4585
+#: ../midori/midori-browser.c:4694
msgid "Last open _tabs"
msgstr "Naposledy otevřené _karty"
-#: ../midori/midori-browser.c:4611
+#: ../midori/midori-browser.c:4720
msgid "Clear private data when _quitting Midori"
msgstr "Vymazat _osobní data při ukončení aplikace Midori"
-#: ../midori/midori-browser.c:4806
+#: ../midori/midori-browser.c:4935
msgid "A lightweight web browser."
msgstr "Odlehčený internetový prohlížeč."
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:4936
msgid "See about:version for version info."
msgstr "about:version zobrazí informace o verzi"
-#: ../midori/midori-browser.c:4809
+#: ../midori/midori-browser.c:4938
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -667,932 +726,605 @@ msgstr ""
"práv GNU Lesser General Public License jak byla publikována Free Software "
"Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze."
-#: ../midori/midori-browser.c:4830
+#: ../midori/midori-browser.c:4968
msgid "translator-credits"
msgstr ""
"David Štancl \n"
"Michal Várady "
-#: ../midori/midori-browser.c:5216
+#: ../midori/midori-browser.c:5385
msgid "_File"
msgstr "_Soubor"
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5388
msgid "Open a new window"
msgstr "Otevřít nové okno"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5391
msgid "Open a new tab"
msgstr "Otevřít novou kartu"
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5393
msgid "New P_rivate Browsing Window"
msgstr "Nové okno souk_romého prohlížení"
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5397
msgid "Open a file"
msgstr "Otevřít soubor"
-#: ../midori/midori-browser.c:5230
-msgid "_Save Page As..."
-msgstr "Uložit stránku j_ako..."
+#: ../midori/midori-browser.c:5399
+msgid "_Save Page As…"
+msgstr "Uložit stránku j_ako…"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5400
msgid "Save to a file"
msgstr "Uložit do souboru"
-#: ../midori/midori-browser.c:5233
+#: ../midori/midori-browser.c:5402
msgid "Add to Speed _dial"
msgstr "Přidat do rychlého _přístupu"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5406
msgid "Add Shortcut to the _desktop"
msgstr "Přidat záložku na _plochu"
-#: ../midori/midori-browser.c:5239
+#: ../midori/midori-browser.c:5408
msgid "Create _Launcher"
msgstr "Vytvořit _spouštěč"
-#: ../midori/midori-browser.c:5243
+#: ../midori/midori-browser.c:5412
msgid "Subscribe to News _feed"
msgstr "Přihlásit se k odběru _kanálu"
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5418
msgid "_Close Tab"
msgstr "_Zavřít kartu"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5419
msgid "Close the current tab"
msgstr "Zavřít aktivní kartu"
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5421
msgid "C_lose Window"
msgstr "Z_avřít okno"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5425
+msgid "_Share"
+msgstr "_Sdílet"
+
+#: ../midori/midori-browser.c:5430
msgid "Print the current page"
msgstr "Vytisknout tuto stránku"
-#: ../midori/midori-browser.c:5258
+#: ../midori/midori-browser.c:5433
msgid "Close a_ll Windows"
msgstr "Zavřít _všechna okna"
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5436
msgid "_Edit"
msgstr "_Upravit"
-#: ../midori/midori-browser.c:5284
-msgid "_Find..."
-msgstr "Na_jít..."
+#: ../midori/midori-browser.c:5459
+msgid "_Find…"
+msgstr "Na_jít…"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5460
msgid "Find a word or phrase in the page"
msgstr "Najít slovo nebo frázi na stránce"
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5462
msgid "Find _Next"
msgstr "Najít _další"
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5465
msgid "Find _Previous"
msgstr "Najít _předchozí"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5469
msgid "Configure the application preferences"
msgstr "Změnit nastavení aplikace"
-#: ../midori/midori-browser.c:5296
+#: ../midori/midori-browser.c:5471
msgid "_View"
msgstr "_Zobrazit"
-#: ../midori/midori-browser.c:5297
+#: ../midori/midori-browser.c:5472
msgid "_Toolbars"
msgstr "Pane_ly nástrojů"
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5477
msgid "Reload page without caching"
msgstr "Znovu načíst stránku bez použití mezipaměti"
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5487
msgid "Increase the zoom level"
msgstr "Přiblížit"
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5490
msgid "Decrease the zoom level"
msgstr "Oddálit"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5494
msgid "_Encoding"
msgstr "_Kódování"
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5496
msgid "View So_urce"
msgstr "Zobrazit zdro_jový kód"
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5499
msgid "Ca_ret Browsing"
msgstr "Prohlížení ku_rzorem"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5503
msgid "Toggle fullscreen view"
msgstr "Přepnout zobrazení na celou obrazovku"
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5505
msgid "Scroll _Left"
msgstr "Posunout v_levo"
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5508
msgid "Scroll _Down"
msgstr "Posunout _dolů"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5511
msgid "Scroll _Up"
msgstr "Posunout nahor_u"
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5514
msgid "Scroll _Right"
msgstr "Posunout vp_ravo"
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5517
+msgid "_Readable"
+msgstr "Č_tecí mód"
+
+#: ../midori/midori-browser.c:5520
msgid "_Go"
msgstr "_Přejít"
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5523
msgid "Go back to the previous page"
msgstr "Přejít zpět (na předchozí stránku)"
-#: ../midori/midori-browser.c:5348
-msgid "Go forward to the next page"
-msgstr "Přejít vpřed (na následující stránku)"
-
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5352
+#: ../midori/midori-browser.c:5530
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:5356
-msgid "Go to the next sub-page"
-msgstr "Přejít na následující podstránku"
+#: ../midori/midori-browser.c:5539
+msgid "_Homepage"
+msgstr "_Domovská stránka"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5540
msgid "Go to your homepage"
msgstr "Přejít na domovskou stránku"
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5542
msgid "Empty Trash"
msgstr "Vyprázdnit seznam zavřených karet"
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5545
msgid "Undo _Close Tab"
msgstr "_Znovu otevřít zavřenou kartu"
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5552
msgid "Add a new _folder"
msgstr "Přidat novou _složku"
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5558
msgid "_Export bookmarks"
msgstr "_Exportovat záložky"
-#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "Nastavit vy_hledávací nástroje"
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5564
msgid "_Clear Private Data"
msgstr "_Vymazat osobní data"
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5567
msgid "_Inspect Page"
msgstr "Pro_zkoumat stránku"
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5571
msgid "_Previous Tab"
msgstr "_Předchozí karta"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5574
msgid "_Next Tab"
msgstr "_Další karta"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5576
msgid "Move Tab _Backward"
msgstr "Přesunout kartu v_zad"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5578
msgid "_Move Tab Forward"
msgstr "Přesunout kartu v_před"
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5581
msgid "Focus _Current Tab"
msgstr "_Přepnout kurzor na tuto kartu"
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5584
msgid "Focus _Next view"
msgstr "Přepnout na _další"
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5587
msgid "Only show the Icon of the _Current Tab"
msgstr "Zobrazit pouze ikonu a_ktuální karty"
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5590
msgid "_Duplicate Current Tab"
msgstr "Z_dvojit aktuální kartu"
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5593
msgid "Close Ot_her Tabs"
msgstr "_Zavřít ostatní karty"
-#: ../midori/midori-browser.c:5415
+#: ../midori/midori-browser.c:5596
msgid "Open last _session"
msgstr "Otevřít poslední _relaci"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5599
msgid "_Help"
msgstr "_Nápověda"
-#: ../midori/midori-browser.c:5420
+#: ../midori/midori-browser.c:5601
msgid "_Frequent Questions"
msgstr "Časté _otázky"
-#: ../midori/midori-browser.c:5423
-msgid "_Report a Problem..."
-msgstr "Ohlásit chy_bu..."
+#: ../midori/midori-browser.c:5604
+msgid "_Report a Problem…"
+msgstr "Ohlásit chy_bu…"
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270
+msgid "_Tools"
+msgstr "Ná_stroje"
+
+#: ../midori/midori-browser.c:5616
msgid "_Menubar"
msgstr "_Nabídka"
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5620
msgid "_Navigationbar"
msgstr "_Navigační panel"
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5624
msgid "Side_panel"
msgstr "Postranní _panel"
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:5625
msgid "Sidepanel"
msgstr "Postranní panel"
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5628
msgid "_Bookmarkbar"
msgstr "Panel _záložek"
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5632
msgid "_Statusbar"
msgstr "_Stavový panel"
-#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312
+#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199
msgid "_Automatic"
msgstr "_Automatické"
-#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236
+#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123
msgid "Chinese Traditional (BIG5)"
msgstr "Čínské tradiční (BIG5)"
-#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237
+#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124
msgid "Chinese Simplified (GB18030)"
msgstr "Čínské zjednodušené (GB18030)"
#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5470
+#: ../midori/midori-browser.c:5651
msgid "Japanese (SHIFT__JIS)"
msgstr "Japonské (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126
msgid "Korean (EUC-KR)"
msgstr "Korejské (EUC-KR)"
-#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127
msgid "Russian (KOI8-R)"
msgstr "Ruské (KOI8-R)"
-#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242
+#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129
msgid "Western (ISO-8859-1)"
msgstr "Západní (ISO-8859-1)"
-#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243
-#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Vlastní..."
+#: ../midori/midori-browser.c:5666
+msgid "Custom…"
+msgstr "Vlastní…"
-#: ../midori/midori-browser.c:5991
+#: ../midori/midori-browser.c:6176
msgid "_Separator"
msgstr "_Oddělovač"
-#: ../midori/midori-browser.c:5998
-msgid "_Location..."
-msgstr "U_místění..."
+#: ../midori/midori-browser.c:6183
+msgid "_Location…"
+msgstr "U_místění…"
-#: ../midori/midori-browser.c:6000
+#: ../midori/midori-browser.c:6185
msgid "Open a particular location"
msgstr "Otevřít konkrétní umístění"
-#: ../midori/midori-browser.c:6022
-msgid "_Web Search..."
-msgstr "_Hledat na webu..."
+#: ../midori/midori-browser.c:6207
+msgid "_Web Search…"
+msgstr "_Hledat na webu…"
-#: ../midori/midori-browser.c:6024
+#: ../midori/midori-browser.c:6209
msgid "Run a web search"
msgstr "Spustí vyhledávání na webu"
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:6236
msgid "Reopen a previously closed tab or window"
msgstr "Znovu otevřít zavřenou kartu nebo okno"
-#: ../midori/midori-browser.c:6068
+#: ../midori/midori-browser.c:6253
msgid "Show the saved bookmarks"
msgstr "Zobrazit uložené záložky"
-#: ../midori/midori-browser.c:6085
-msgid "_Tools"
-msgstr "Ná_stroje"
-
-#: ../midori/midori-browser.c:6101
+#: ../midori/midori-browser.c:6286
msgid "_Window"
msgstr "_Okno"
-#: ../midori/midori-browser.c:6103
+#: ../midori/midori-browser.c:6288
msgid "Show a list of all open tabs"
msgstr "Zobrazit seznam všech otevřených karet"
-#: ../midori/midori-browser.c:6117
+#: ../midori/midori-browser.c:6302
msgid "_Menu"
msgstr "_Nabídka"
-#: ../midori/midori-browser.c:6119
+#: ../midori/midori-browser.c:6304
msgid "Menu"
msgstr "Nabídka"
-#: ../midori/midori-browser.c:6933
+#: ../midori/midori-browser.c:7134
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Neočekávané nastavení '%s'"
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:330
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "Nastavení rozšíření '%s' nelze načíst: %s\n"
-#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
-#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:752 ../midori/midori-extension.c:849
+#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058
+#: ../extensions/addons.c:1686
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "Nastavení rozšíření '%s' nelze uložit: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "Hledat %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Hledat pomocí..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "Hledat pomocí…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "Nepodařilo se načíst údaje z historie\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "Vyhledat %s"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "Exportovat certifikát"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "Podepsaný certifikát není znám."
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "Certifikát neodpovídá zobrazené stránce (byl vydán pro jiný web)."
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "Datum zahájení platnosti certifikátu je v budoucnu."
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "Platnost certifikátu vypršela"
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"Certifikát byl odmítnut na základě seznamu odvolaných certifikátů od "
+"GTIsConnection."
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Certifikační algoritmus není považován za důvěryhodný."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "Při ověřování certifikátu došlo k chybě."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "_Exportovat certifikát"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "Podepsán sebou samým (self-signed)"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "Podrobnosti o zabezpečení"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "Vložit a s_pustit"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "Neověřené spojení"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "Ověřené a šifrované spojení"
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1989
msgid "Open, unencrypted connection"
msgstr "Ověřené, nešifrované spojení"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Umístit postranní panel vpravo"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Zavřít panel"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Umístit postranní panel vlevo"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:105
msgid "Show Speed Dial"
msgstr "zobrazit rychlý přístup"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:106
msgid "Show Homepage"
msgstr "zobrazit domovskou stránku"
-#: ../midori/midori-websettings.c:238
+#: ../midori/midori-websettings.c:125
msgid "Japanese (SHIFT_JIS)"
msgstr "Japonské (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Vlastní…"
+
+#: ../midori/midori-websettings.c:145
msgid "New tab"
msgstr "nové kartě"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:146
msgid "New window"
msgstr "novém okně"
-#: ../midori/midori-websettings.c:260
+#: ../midori/midori-websettings.c:147
msgid "Current tab"
msgstr "aktuální kartě"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:162
msgid "Default"
msgstr "výchozí"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:163
msgid "Icons"
msgstr "ikony"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:164
msgid "Small icons"
msgstr "malé ikony"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:165
msgid "Text"
msgstr "text"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:166
msgid "Icons and text"
msgstr "ikony a text"
-#: ../midori/midori-websettings.c:280
+#: ../midori/midori-websettings.c:167
msgid "Text beside icons"
msgstr "text pod ikonami"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:182
msgid "Automatic (GNOME or environment)"
msgstr "automaticky (GNOME, nebo jiné prostředí)"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:183
msgid "HTTP proxy server"
msgstr "server proxy HTTP"
-#: ../midori/midori-websettings.c:297
+#: ../midori/midori-websettings.c:184
msgid "No proxy server"
msgstr "žádný server proxy"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:201
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:202
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:203
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:204
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:317
+#: ../midori/midori-websettings.c:205
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:401
-msgid "Remember last window size"
-msgstr "Pamatovat si velikost okna"
-
-#: ../midori/midori-websettings.c:402
-msgid "Whether to save the last window size"
-msgstr "Určuje, zda se budou ukládat rozměry okna"
-
-#: ../midori/midori-websettings.c:410
-msgid "Last window width"
-msgstr "Poslední šířka okna"
-
-#: ../midori/midori-websettings.c:411
-msgid "The last saved window width"
-msgstr "Naposledy uložená šířka okna"
-
-#: ../midori/midori-websettings.c:419
-msgid "Last window height"
-msgstr "Poslední výška okna"
-
-#: ../midori/midori-websettings.c:420
-msgid "The last saved window height"
-msgstr "Naposledy uložená výška okna"
-
-#: ../midori/midori-websettings.c:445
-msgid "Last panel position"
-msgstr "Poslední pozice panelu"
-
-#: ../midori/midori-websettings.c:446
-msgid "The last saved panel position"
-msgstr "Naposledy uložená pozice panelu"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:455
-msgid "Last panel page"
-msgstr "Poslední stránka panelu"
-
-#: ../midori/midori-websettings.c:456
-msgid "The last saved panel page"
-msgstr "Naposledy uložená stránka panelu"
-
-#: ../midori/midori-websettings.c:464
-msgid "Last Web search"
-msgstr "Poslední hledání na webu"
-
-#: ../midori/midori-websettings.c:465
-msgid "The last saved Web search"
-msgstr "Poslední uložené vyhledávání na webu"
-
-#: ../midori/midori-websettings.c:474
-msgid "Show Menubar"
-msgstr "Zobrazit panel nabídky"
-
-#: ../midori/midori-websettings.c:475
-msgid "Whether to show the menubar"
-msgstr "Určuje, zda se bude zobrazovat panel nabídky"
-
-#: ../midori/midori-websettings.c:483
-msgid "Show Navigationbar"
-msgstr "Zobrazit panel vyhledávání"
-
-#: ../midori/midori-websettings.c:484
-msgid "Whether to show the navigationbar"
-msgstr "Určuje, zda se bude zobrazovat panel vyhledávání"
-
-#: ../midori/midori-websettings.c:492
-msgid "Show Bookmarkbar"
-msgstr "Zobrazit záložky"
-
-#: ../midori/midori-websettings.c:493
-msgid "Whether to show the bookmarkbar"
-msgstr "Určuje, zda se bude zobrazovat panel záložek"
-
-#: ../midori/midori-websettings.c:501
-msgid "Show Panel"
-msgstr "Zobrazit panel"
-
-#: ../midori/midori-websettings.c:502
-msgid "Whether to show the panel"
-msgstr "Určuje, zda se bude zobrazovat panel"
-
-#: ../midori/midori-websettings.c:510
-msgid "Show Statusbar"
-msgstr "Zobrazit stavový řádek"
-
-#: ../midori/midori-websettings.c:511
-msgid "Whether to show the statusbar"
-msgstr "Určuje, zda se bude zobrazovat panel stavu"
-
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:278
msgid "Toolbar Style:"
msgstr "Styl panelu nástrojů:"
-#: ../midori/midori-websettings.c:521
+#: ../midori/midori-websettings.c:279
msgid "The style of the toolbar"
msgstr "Styl panelu nástrojů"
-#: ../midori/midori-websettings.c:530
-msgid "Toolbar Items"
-msgstr "Položky panelu nástrojů"
-
-#: ../midori/midori-websettings.c:531
-msgid "The items to show on the toolbar"
-msgstr "Položky zobrazované na panelu nástrojů"
-
-#: ../midori/midori-websettings.c:539
-msgid "Compact Sidepanel"
-msgstr "Kompaktní postranní panel"
-
-#: ../midori/midori-websettings.c:540
-msgid "Whether to make the sidepanel compact"
-msgstr "Určuje, zda bude postranní panel zobrazen ve zjednodušené podobě"
-
-#: ../midori/midori-websettings.c:555
-msgid "Align sidepanel on the right"
-msgstr "Umístit postranní panel vpravo"
-
-#: ../midori/midori-websettings.c:556
-msgid "Whether to align the sidepanel on the right"
-msgstr "Určuje, zda bude postranní panel umístěn napravo"
-
-#: ../midori/midori-websettings.c:571
-msgid "Open panels in separate windows"
-msgstr "Otevírat panely v samostatných oknech"
-
-#: ../midori/midori-websettings.c:572
-msgid "Whether to always open panels in separate windows"
-msgstr "Určuje, zda se budou panely vždy otevírat v samostatných oknech"
-
-#: ../midori/midori-websettings.c:581
+#: ../midori/midori-websettings.c:288
msgid "When Midori starts:"
msgstr "Po spuštění aplikace Midori:"
-#: ../midori/midori-websettings.c:582
-msgid "What to do when Midori starts"
-msgstr "Co se stane po spuštění aplikace Midori"
-
-#: ../midori/midori-websettings.c:591
-msgid "Homepage:"
-msgstr "Domovská stránka:"
-
-#: ../midori/midori-websettings.c:592
-msgid "The homepage"
-msgstr "Domovská stránka"
-
-#: ../midori/midori-websettings.c:607
-msgid "Show crash dialog"
-msgstr "Zobrazit dialog po pádu"
-
-#: ../midori/midori-websettings.c:608
-msgid "Show a dialog after Midori crashed"
-msgstr "Zobrazit dialog po pádu aplikace Midori"
-
-#: ../midori/midori-websettings.c:616
-msgid "Save downloaded files to:"
-msgstr "Ukládat stažené soubory do:"
-
-#: ../midori/midori-websettings.c:617
-msgid "The folder downloaded files are saved to"
-msgstr "Složka, do níž se budou ukládat stažené soubory"
-
-#: ../midori/midori-websettings.c:625
-msgid "Text Editor"
-msgstr "Textový editor"
-
-#: ../midori/midori-websettings.c:626
-msgid "An external text editor"
-msgstr "Externí textový editor"
-
-#: ../midori/midori-websettings.c:641
-msgid "News Aggregator"
-msgstr "Čtečka RSS"
-
-#: ../midori/midori-websettings.c:642
-msgid "An external news aggregator"
-msgstr "Externí čtečka zpráv RSS"
-
-#: ../midori/midori-websettings.c:650
-msgid "Location entry Search"
-msgstr "Vyhledávání v adresním řádku"
-
-#: ../midori/midori-websettings.c:651
-msgid "The search to perform inside the location entry"
-msgstr "Vyhledávání použité v řádku s adresou"
-
-#: ../midori/midori-websettings.c:659
+#: ../midori/midori-websettings.c:298
msgid "Preferred Encoding"
msgstr "Upřednostňované kódování"
-#: ../midori/midori-websettings.c:660
-msgid "The preferred character encoding"
-msgstr "Upřednostňované kódování stránek"
-
-#: ../midori/midori-websettings.c:670
-msgid "Always Show Tabbar"
-msgstr "Vždy zobrazit panel karet"
-
-#: ../midori/midori-websettings.c:671
-msgid "Always show the tabbar"
-msgstr "Vždy zobrazit panel karet"
-
-#: ../midori/midori-websettings.c:684
-msgid "Close Buttons on Tabs"
-msgstr "Ikona zavření karty"
-
-#: ../midori/midori-websettings.c:685
-msgid "Whether tabs have close buttons"
-msgstr "Určuje, zda budou na kartách přítomna tlačítka pro jejich zavření"
-
-#: ../midori/midori-websettings.c:710
+#: ../midori/midori-websettings.c:325
msgid "Open new pages in:"
msgstr "Nové stránky otevírat v:"
-#: ../midori/midori-websettings.c:711
-msgid "Where to open new pages"
-msgstr "Kde se budou otevírat nové stránky"
-
-#: ../midori/midori-websettings.c:720
-msgid "Middle click opens Selection"
-msgstr "Kliknutí prostředního tlačítka otevře vybraný text"
-
-#: ../midori/midori-websettings.c:721
-msgid "Load an address from the selection via middle click"
-msgstr "Prostřední tlačítko myši otevře adresu obsaženou ve vybraném textu"
-
-#: ../midori/midori-websettings.c:729
-msgid "Open tabs in the background"
-msgstr "Otevírat karty na pozadí"
-
-#: ../midori/midori-websettings.c:730
-msgid "Whether to open new tabs in the background"
-msgstr "Určuje, zda se budou nové karty otevírat na pozadí"
-
-#: ../midori/midori-websettings.c:738
-msgid "Open Tabs next to Current"
-msgstr "Otevřít kartu vedle aktivní"
-
-#: ../midori/midori-websettings.c:739
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr ""
-"Určuje, zda se budou nové karty otevírat vedle aktivní nebo vedle poslední "
-"karty"
-
-#: ../midori/midori-websettings.c:747
-msgid "Open popups in tabs"
-msgstr "Otevírat vyskakovací okna v kartách"
-
-#: ../midori/midori-websettings.c:748
-msgid "Whether to open popup windows in tabs"
-msgstr "Určuje, zda se vyskakovací okno otevře v kartě"
-
-#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Automaticky načítat obrázky"
-
-#: ../midori/midori-websettings.c:759
-msgid "Load and display images automatically"
-msgstr "Automaticky načítat a zobrazovat obrázky"
-
-#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Povolit skripty"
-
-#: ../midori/midori-websettings.c:767
-msgid "Enable embedded scripting languages"
-msgstr "Povolit vložené skriptové jazyky"
-
-#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Povolit zásuvné moduly aplikace Netscape"
-
-#: ../midori/midori-websettings.c:775
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Povolit objekty zásuvných modulů aplikace Netscape"
-
-#: ../midori/midori-websettings.c:790
-msgid "Enable Spell Checking"
-msgstr "Povolit kontrolu pravopisu"
-
-#: ../midori/midori-websettings.c:791
-msgid "Enable spell checking while typing"
-msgstr "Povolit kontrolu pravopisu při psaní"
-
-#: ../midori/midori-websettings.c:797
-msgid "Enable HTML5 database support"
-msgstr "Povolit podporu databází HTML5"
-
-#: ../midori/midori-websettings.c:798
-msgid "Whether to enable HTML5 database support"
-msgstr "Určuje, zda bude povolena podpora databází v jazyku HTML5"
-
-#: ../midori/midori-websettings.c:804
-msgid "Enable HTML5 local storage support"
-msgstr "Povolit místní úložiště pro HTML5"
-
-#: ../midori/midori-websettings.c:805
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Určuje, zda budou povolena místní úložiště v jazyku HTML5"
-
-#: ../midori/midori-websettings.c:811
-msgid "Enable offline web application cache"
-msgstr "Povolit mezipaměť pro offline aplikace"
-
-#: ../midori/midori-websettings.c:812
-msgid "Whether to enable offline web application cache"
-msgstr "Určuje, zda bude povoleno používání mezipaměti pro offline aplikace"
-
-#: ../midori/midori-websettings.c:828
-msgid "Flash window on background tabs"
-msgstr "Blikání okna při otevření karty na pozadí"
-
-#: ../midori/midori-websettings.c:829
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr "Okno prohlížeče blikne při otevření nové karty na pozadí"
-
-#: ../midori/midori-websettings.c:837
-msgid "Enable WebGL support"
-msgstr "Povolit podporu WebGL"
-
-#: ../midori/midori-websettings.c:838
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Umožnit webovým stránkám použití vykreslování pomocí knihovny OpenGL"
-
-#: ../midori/midori-websettings.c:864
-msgid "Zoom Text and Images"
-msgstr "Zvětšovat text i obrázky"
-
-#: ../midori/midori-websettings.c:865
-msgid "Whether to zoom text and images"
-msgstr "Určuje, zda se bude měnit velikost textu i obrázků"
-
-#: ../midori/midori-websettings.c:880
-msgid "Find inline while typing"
-msgstr "Hledat při psaní"
-
-#: ../midori/midori-websettings.c:881
-msgid "Whether to automatically find inline while typing"
-msgstr "Určuje, zda se v textu bude automaticky vyhledávat během psaní"
-
-#: ../midori/midori-websettings.c:896
-msgid "Kinetic scrolling"
-msgstr "Kinetické posouvání"
-
-#: ../midori/midori-websettings.c:897
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Určuje, zda bude posouvání ovlivněno rychloistí"
-
-#: ../midori/midori-websettings.c:905
-msgid "Delete old Cookies after:"
-msgstr "Smazat stará cookies po:"
-
-#: ../midori/midori-websettings.c:906
-msgid "The maximum number of days to save cookies for"
-msgstr "Maximální počet dní, po které jsou cookies platná."
-
-#: ../midori/midori-websettings.c:922
-msgid "Only accept Cookies from sites you visit"
-msgstr "Přijímat cookies pouze z navštívených stránek"
-
-#: ../midori/midori-websettings.c:923
-msgid "Block cookies sent by third-party websites"
-msgstr "Blokovat cookies z jiných stránek"
-
-#: ../midori/midori-websettings.c:937
-msgid "Delete pages from history after:"
-msgstr "Smazat stránky z historie po:"
-
-#: ../midori/midori-websettings.c:938
-msgid "The maximum number of days to save the history for"
-msgstr ""
-"Maximální počet dní, po které se bude uchovávat historie navštívených stránek"
-
-#: ../midori/midori-websettings.c:953
-msgid "Proxy server"
-msgstr "Server proxy"
-
-#: ../midori/midori-websettings.c:954
-msgid "The type of proxy server to use"
-msgstr "Jaký typ serveru proxy chcete použít"
-
-#: ../midori/midori-websettings.c:963
-msgid "HTTP Proxy Server"
-msgstr "Serverproxy HTTP"
-
-#: ../midori/midori-websettings.c:964
-msgid "The proxy server used for HTTP connections"
-msgstr "Server proxy, který bude použit pro spojení HTTP"
-
-#: ../midori/midori-websettings.c:979
-msgid "Port"
-msgstr "Port"
-
-#: ../midori/midori-websettings.c:980
-msgid "The proxy server port used for HTTP connections"
-msgstr "Port serveru proxy, který bude použit pro spojení HTTP"
-
-#: ../midori/midori-websettings.c:998
-msgid "The maximum size of cached pages on disk"
-msgstr "Maximální velikost diskové mezipaměti stránek"
-
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:388
msgid "Identify as"
msgstr "Hlásit se jako"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:389
msgid "What to identify as to web pages"
msgstr "Určuje, jak se bude aplikace identifikovat webovým stránkám"
-#: ../midori/midori-websettings.c:1032
-msgid "Identification string"
-msgstr "Identifikační řetězec"
-
-#: ../midori/midori-websettings.c:1033
-msgid "The application identification string"
-msgstr "Identifikační řetězec aplikace"
-
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:422
msgid "Preferred languages"
msgstr "Upřednostňované jazyky"
-#: ../midori/midori-websettings.c:1050
+#: ../midori/midori-websettings.c:423
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1600,431 +1332,284 @@ 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:1065
-msgid "Clear private data"
-msgstr "Vymazat osobní údaje"
-
-#: ../midori/midori-websettings.c:1066
-msgid "The private data selected for deletion"
-msgstr "Osobní údaje byly označeny ke smazání"
-
-#: ../midori/midori-websettings.c:1081
-msgid "Clear data"
-msgstr "Vymazat údaje"
-
-#: ../midori/midori-websettings.c:1082
-msgid "The data selected for deletion"
-msgstr "Údaje označené pro vymazání"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1131
-msgid "Strip referrer details sent to websites"
-msgstr "Odstranit detaily o referující adrese při odesílání"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1133
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr ""
-"Určuje, zda bude referenční hlavička \"Referer\" zkrácena na pouhý název "
-"hostitele"
-
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:472
msgid "Always use my font choices"
msgstr "Vždy použít mnou zvolená písma"
-#: ../midori/midori-websettings.c:1148
+#: ../midori/midori-websettings.c:473
msgid "Override fonts picked by websites with user preferences"
msgstr "Vybraná písma se použijí vždy bez ohledu na požadavky stránky"
-#: ../midori/midori-view.c:1375
+#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151
+msgid "Trust this website"
+msgstr "Důvěřovat tomuto webu"
+
+#: ../midori/midori-view.c:1149
+msgid "Security unknown"
+msgstr "Neznámé zabezpečení"
+
+#: ../midori/midori-view.c:1447
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s chce uložit data do databáze HTML5."
-#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Deny"
msgstr "_Zakázat"
-#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Allow"
msgstr "_Povolit"
-#: ../midori/midori-view.c:1407
+#: ../midori/midori-view.c:1480
#, c-format
msgid "%s wants to know your location."
msgstr "%s chce zjistit vaši polohu."
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1576
#, c-format
msgid "Error - %s"
msgstr "Chyba - %s"
-#: ../midori/midori-view.c:1501
+#: ../midori/midori-view.c:1577
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Stránku '%s' nelze načíst."
-#: ../midori/midori-view.c:1503
+#: ../midori/midori-view.c:1579
msgid "Try again"
msgstr "Zkusit znovu"
-#: ../midori/midori-view.c:1701 ../midori/midori-view.c:2623
+#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887
#, c-format
msgid "Send a message to %s"
msgstr "Poslat zprávu pro %s"
-#: ../midori/midori-view.c:2453 ../midori/midori-view.c:2779
+#: ../midori/midori-view.c:2673
+msgid "Add _search engine..."
+msgstr "Přidat vy_hledávací nástroj..."
+
+#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043
msgid "Inspect _Element"
msgstr "Prozkouma_t prvek"
-#: ../midori/midori-view.c:2505
+#: ../midori/midori-view.c:2769
msgid "Open Link in New _Tab"
msgstr "Otevřít odkaz v nové _kartě"
-#: ../midori/midori-view.c:2509
+#: ../midori/midori-view.c:2773
msgid "Open Link in _Foreground Tab"
msgstr "Otevřít odkaz v nové kartě a _zobrazit ji"
-#: ../midori/midori-view.c:2510
+#: ../midori/midori-view.c:2774
msgid "Open Link in _Background Tab"
msgstr "Otevřít odkaz v nové kartě na _pozadí"
-#: ../midori/midori-view.c:2513
+#: ../midori/midori-view.c:2777
msgid "Open Link in New _Window"
msgstr "Otevřít odkaz v novém _okně"
-#: ../midori/midori-view.c:2516
+#: ../midori/midori-view.c:2780
msgid "Open Link as Web A_pplication"
msgstr "Otevřít odkaz jako _webovou aplikaci"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2785
msgid "Copy Link de_stination"
msgstr "Zkopírovat _cíl odkazu"
-#: ../midori/midori-view.c:2537
+#: ../midori/midori-view.c:2801
msgid "Open _Image in New Tab"
msgstr "Otevřít _obrázek v nové kartě"
-#: ../midori/midori-view.c:2540
+#: ../midori/midori-view.c:2804
msgid "Copy Image _Address"
msgstr "Zkopírovat _adresu obrázku"
-#: ../midori/midori-view.c:2543
+#: ../midori/midori-view.c:2807
msgid "Save I_mage"
msgstr "Uložit o_brázek"
-#: ../midori/midori-view.c:2546
+#: ../midori/midori-view.c:2810
msgid "Open in Image _Viewer"
msgstr "Otevřít v prohlížeči _obrázků"
-#: ../midori/midori-view.c:2553
+#: ../midori/midori-view.c:2817
msgid "Copy Video _Address"
msgstr "Zkopírovat _adresu videa"
-#: ../midori/midori-view.c:2556
+#: ../midori/midori-view.c:2820
msgid "Save _Video"
msgstr "Uložit _video"
-#: ../midori/midori-view.c:2556
+#: ../midori/midori-view.c:2820
msgid "Download _Video"
msgstr "Stáhnout _video"
-#: ../midori/midori-view.c:2582
+#: ../midori/midori-view.c:2846
msgid "Search _with"
msgstr "Hledat _pomocí"
-#: ../midori/midori-view.c:2614
+#: ../midori/midori-view.c:2878
msgid "_Search the Web"
msgstr "_Hledat na webu"
-#: ../midori/midori-view.c:2631
+#: ../midori/midori-view.c:2895
msgid "Open Address in New _Tab"
msgstr "Otevřít adresu v nové _kartě"
-#: ../midori/midori-view.c:2684
+#: ../midori/midori-view.c:2948
msgid "Open _Frame in New Tab"
msgstr "Otevřít _rám v nové kartě"
-#: ../midori/midori-view.c:2988
-msgid "Open or download file"
-msgstr "Otevřít nebo stáhnout soubor"
-
-#: ../midori/midori-view.c:3008
+#: ../midori/midori-view.c:3203
#, c-format
-msgid "File Type: '%s'"
-msgstr "Typ souboru: '%s'"
+msgid "Open or download file from %s"
+msgstr "Otevřít nebo stáhnout soubor z %s"
-#: ../midori/midori-view.c:3010
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Typ souboru: %s ('%s')"
-
-#: ../midori/midori-view.c:3014
+#: ../midori/midori-view.c:3216
#, c-format
msgid "File Name: %s"
msgstr "Název souboru: %s"
-#: ../midori/midori-view.c:3041
+#: ../midori/midori-view.c:3221
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Typ souboru: '%s'"
+
+#: ../midori/midori-view.c:3223
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Typ souboru: %s ('%s')"
+
+#: ../midori/midori-view.c:3260
+#, c-format
+msgid "Size: %s"
+msgstr "Velikost: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3271
#, c-format
msgid "Open %s"
msgstr "Otevřít %s"
-#: ../midori/midori-view.c:3700
+#: ../midori/midori-view.c:3882
#, c-format
msgid "Inspect page - %s"
msgstr "Prohlížení stránky - %s"
-#: ../midori/midori-view.c:4047
-msgid "Speed Dial"
-msgstr "Rychlý přístup"
-
-#: ../midori/midori-view.c:4048 ../midori/midori-view.c:4144
-msgid "Click to add a shortcut"
-msgstr "Kliknutím přidáte záložku "
-
-#: ../midori/midori-view.c:4049
-msgid "Enter shortcut address"
-msgstr "Vložte adresu záložky"
-
-#: ../midori/midori-view.c:4050
-msgid "Enter shortcut title"
-msgstr "Vložte název záložky"
-
-#: ../midori/midori-view.c:4051
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "Opravdu chcete smazat tuto záložku?"
-
-#: ../midori/midori-view.c:4213
+#: ../midori/midori-view.c:4279
#, c-format
msgid "No documentation installed"
msgstr "Dokumentace není nainstalována"
-#: ../midori/midori-view.c:4289
+#: ../midori/midori-view.c:4356
msgid "Midori doesn't store any personal data:"
msgstr "Aplikace Midori neukládá žádné osobní údaje:"
-#: ../midori/midori-view.c:4290
+#: ../midori/midori-view.c:4357
msgid "No history or web cookies are being saved."
msgstr "Neukládá se historie, ani cookies."
-#: ../midori/midori-view.c:4291
+#: ../midori/midori-view.c:4358
msgid "Extensions are disabled."
msgstr "Rozšíření jsou zakázána."
-#: ../midori/midori-view.c:4292
+#: ../midori/midori-view.c:4359
msgid "HTML5 storage, local database and application caches are disabled."
msgstr "Zakázáno úložiště HTML5, lokální databáze a aplikační mezipaměťi."
-#: ../midori/midori-view.c:4293
+#: ../midori/midori-view.c:4360
msgid "Midori prevents websites from tracking the user:"
msgstr "Aplikace Midori zabraňuje webovým stránkám sledovat uživatele:"
-#: ../midori/midori-view.c:4294
+#: ../midori/midori-view.c:4361
msgid "Referrer URLs are stripped down to the hostname."
msgstr "Adresy URL referentů jsou zkráceny na pouhý název hostitele."
-#: ../midori/midori-view.c:4295
+#: ../midori/midori-view.c:4362
msgid "DNS prefetching is disabled."
msgstr "Přednačítání DNS záznamů je zakázáno."
-#: ../midori/midori-view.c:4296
+#: ../midori/midori-view.c:4363
msgid "The language and timezone are not revealed to websites."
msgstr "Stránkám nejsou poskytovány údaje o jazyku a časovém pásmu."
-#: ../midori/midori-view.c:4297
+#: ../midori/midori-view.c:4364
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr ""
"Stránky nemohou získat seznam zásuvných modulů Flash ani modulů aplikace "
"Netscape."
-#: ../midori/midori-view.c:4370
+#: ../midori/midori-view.c:4450
msgid "Version numbers in brackets show the version used at runtime."
msgstr "Čísla verzí v závorce jsou verze použité při běhu programu."
-#: ../midori/midori-view.c:4422
+#: ../midori/midori-view.c:4499
msgid "Page loading delayed"
msgstr "Načítání stránky pozdrženo"
-#: ../midori/midori-view.c:4423
+#: ../midori/midori-view.c:4500
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"Načtení stránky bylo pozdrženo kvůli nedávnému pádu aplikace, nebo kvůli "
"nastavení po spuštění."
-#: ../midori/midori-view.c:4424
+#: ../midori/midori-view.c:4501
msgid "Load Page"
msgstr "Načíst stránku"
-#: ../midori/midori-view.c:4590
+#: ../midori/midori-view.c:4668
msgid "Blank page"
msgstr "Prázdná stránka"
-#: ../midori/midori-view.c:4852
+#: ../midori/midori-view.c:4932
msgid "_Duplicate Tab"
msgstr "Z_dvojit kartu"
-#: ../midori/midori-view.c:4857
+#: ../midori/midori-view.c:4937
msgid "Show Tab _Label"
msgstr "Zobrazit _popisek karty"
-#: ../midori/midori-view.c:4857
+#: ../midori/midori-view.c:4937
msgid "Show Tab _Icon Only"
msgstr "Zobrazit jen _ikonu karty"
-#: ../midori/midori-view.c:4863
-msgid "Close ot_her Tabs"
-msgstr "_Zavřít ostatní karty"
+#: ../midori/midori-view.c:4944
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "_Zavřít druhou kartu"
+msgstr[1] "_Zavřít ostatní karty"
+msgstr[2] "_Zavřít ostatní karty"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5676
+#: ../midori/midori-view.c:5701
msgid "previous"
msgstr "předchozí"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5695
+#: ../midori/midori-view.c:5720
msgid "next"
msgstr "následující"
-#: ../midori/midori-view.c:5708
+#: ../midori/midori-view.c:5733
msgid "Print background images"
msgstr "Tisknout obrázky na pozadí"
-#: ../midori/midori-view.c:5709
+#: ../midori/midori-view.c:5734
msgid "Whether background images should be printed"
msgstr "Určuje, zda se vytisknou obrázky na pozadí"
-#: ../midori/midori-view.c:5741
+#: ../midori/midori-view.c:5766
msgid "Features"
msgstr "Rozšíření"
-#: ../midori/midori-preferences.c:297
-msgid "Startup"
-msgstr "Při spuštění"
-
-#: ../midori/midori-preferences.c:310
-msgid "Use _current page"
-msgstr "Použít _stávající stránku"
-
-#: ../midori/midori-preferences.c:314
-msgid "Use current page as homepage"
-msgstr "Použít stávající stránku jako domovskou"
-
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
-msgid "Fonts"
-msgstr "Písma"
-
-#: ../midori/midori-preferences.c:326
-msgid "Proportional Font Family"
-msgstr "Proporcionální písmo"
-
-#: ../midori/midori-preferences.c:330
-msgid "The default font family used to display text"
-msgstr "Výchozí písmo pro zobrazení textu"
-
-#: ../midori/midori-preferences.c:333
-msgid "The default font size used to display text"
-msgstr "Výchozí velikost písma pro zobrazení textu"
-
-#: ../midori/midori-preferences.c:335
-msgid "Fixed-width Font Family"
-msgstr "Neproporcionální písmo"
-
-#: ../midori/midori-preferences.c:339
-msgid "The font family used to display fixed-width text"
-msgstr "Písmo pro zobrazení textu se stejnou šířkou písmen"
-
-#: ../midori/midori-preferences.c:342
-msgid "The font size used to display fixed-width text"
-msgstr "Velikost písma pro zobrazení textu se stejnou šířkou písmen"
-
-#: ../midori/midori-preferences.c:344
-msgid "Minimum Font Size"
-msgstr "Minimální velikost písma"
-
-#: ../midori/midori-preferences.c:348
-msgid "The minimum font size used to display text"
-msgstr "Minimální velikost fontu použitého pro zobrazení"
-
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
-msgid "Behavior"
-msgstr "Chování"
-
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
-msgstr "Povolit skriptům otevírat vyskakovací okna"
-
-#: ../midori/midori-preferences.c:386
-msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr ""
-"Určuje, zda bude skriptům povoleno automaticky otevírat vyskakovací okna"
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:416
-msgid "Browsing"
-msgstr "Prohlížení"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:456
-msgid "Network"
-msgstr "Síť"
-
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "Název hostitele"
-
-#: ../midori/midori-preferences.c:487
-msgid "MB"
-msgstr "MB"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Add search engine"
-msgstr "Přidat vyhledávací nástroj"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Edit search engine"
-msgstr "Upravit vyhledávací nástroj"
-
-#: ../midori/midori-searchaction.c:931
-msgid "_Name:"
-msgstr "_Název:"
-
-#: ../midori/midori-searchaction.c:947
-msgid "_Description:"
-msgstr "_Popis:"
-
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Ikona:"
-
-#: ../midori/midori-searchaction.c:995
-msgid "_Token:"
-msgstr "_Zkratka:"
-
-#: ../midori/midori-searchaction.c:1295
-msgid "Manage Search Engines"
-msgstr "Spravovat vyhledávací nástroje"
-
-#: ../midori/midori-searchaction.c:1395
-msgid "Use as _default"
-msgstr "Použít jako _výchozí"
-
-#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr "Otevřít s"
-
-#: ../midori/sokoke.c:362
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:48
#, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Vyberte aplikaci, nebo příkaz k otevření \"%s\":"
+msgid "%s of %s"
+msgstr "%s z %s"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
-msgid "Could not run external program."
-msgstr "Nelze spustit externí program."
-
-#: ../midori/sokoke.c:1595
+#: ../midori/midori-download.vala:64
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -2032,7 +1617,7 @@ msgstr[0] "%d hodina"
msgstr[1] "%d hodiny"
msgstr[2] "%d hodin"
-#: ../midori/sokoke.c:1596
+#: ../midori/midori-download.vala:65
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -2040,7 +1625,7 @@ msgstr[0] "%d minuta"
msgstr[1] "%d minuty"
msgstr[2] "%d minut"
-#: ../midori/sokoke.c:1597
+#: ../midori/midori-download.vala:66
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2048,68 +1633,28 @@ msgstr[0] "%d sekunda"
msgstr[1] "%d sekundy"
msgstr[2] "%d sekund"
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
-#, c-format
-msgid "%s of %s"
-msgstr "%s z %s"
-
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
-msgid "?B"
-msgstr "? B"
-
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
-#, c-format
-msgid " (%s/s)"
-msgstr "(%s/s)"
-
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/midori-download.vala:82
#, c-format
msgid " - %s remaining"
msgstr "- zbývá %s"
-#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
-msgid "_Inline Find:"
-msgstr "_Rychlé hledání"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:92
+msgid "?B"
+msgstr "? B"
-#: ../toolbars/midori-findbar.c:317
-msgid "Previous"
-msgstr "Předchozí"
-
-#: ../toolbars/midori-findbar.c:323
-msgid "Next"
-msgstr "Následující"
-
-#: ../toolbars/midori-findbar.c:327
-msgid "Match Case"
-msgstr "Rozlišovat velikost písmen"
-
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr "Zvýraznit nalezené"
-
-#: ../toolbars/midori-findbar.c:347
-msgid "Close Findbar"
-msgstr "Zavřít panel hledání"
-
-#: ../toolbars/midori-transferbar.c:122
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:94
#, c-format
-msgid "The file '%s ' has been downloaded."
-msgstr "Soubor %s byl stažen."
+msgid " (%s/s)"
+msgstr "(%s/s)"
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "Přenos dokončen"
-
-#: ../toolbars/midori-transferbar.c:193
+#: ../midori/midori-download.vala:188
msgid "The downloaded file is erroneous."
msgstr "Stažený soubor obsahuje chyby."
-#: ../toolbars/midori-transferbar.c:194
+#: ../midori/midori-download.vala:189
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2117,47 +1662,346 @@ msgstr ""
"Kontrolní součet poskytovaný ke stahovanému souboru se neshoduje. To "
"znamená, že stažený soubor pravděpodobně není celý nebo byl pozměněn."
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../midori/midori-download.vala:300
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Soubor \"%s\" nelze uložit do této složky."
+
+#: ../midori/midori-download.vala:302
+msgid "You don't have permission to write in this location."
+msgstr "Nemáte oprávnění k zápisu do tohoto umístění."
+
+#: ../midori/midori-download.vala:305
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Ke stažení \"%s\" není k dispozici dostatek místa."
+
+#: ../midori/midori-download.vala:307
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Požaduje se %s, ale k dispozici je pouze %s."
+
+#: ../midori/midori-speeddial.vala:180
+msgid "Speed Dial"
+msgstr "Rychlý přístup"
+
+#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+msgid "Click to add a shortcut"
+msgstr "Záložku přidáte kliknutím"
+
+#: ../midori/midori-speeddial.vala:182
+msgid "Enter shortcut address"
+msgstr "Vložte adresu záložky"
+
+#: ../midori/midori-speeddial.vala:183
+msgid "Enter shortcut title"
+msgstr "Vložte název záložky"
+
+#: ../midori/midori-speeddial.vala:184
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Opravdu chcete smazat tuto záložku?"
+
+#: ../midori/midori-preferences.c:299
+msgid "Startup"
+msgstr "Při spuštění"
+
+#: ../midori/midori-preferences.c:305
+msgid "Homepage:"
+msgstr "Domovská stránka:"
+
+#: ../midori/midori-preferences.c:313
+msgid "Use _current page"
+msgstr "Použít _stávající stránku"
+
+#: ../midori/midori-preferences.c:317
+msgid "Use current page as homepage"
+msgstr "Použít stávající stránku jako domovskou"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:326
+msgid "Fonts"
+msgstr "Písma"
+
+#: ../midori/midori-preferences.c:329
+msgid "Proportional Font Family"
+msgstr "Proporcionální písmo"
+
+#: ../midori/midori-preferences.c:333
+msgid "The default font family used to display text"
+msgstr "Výchozí písmo pro zobrazení textu"
+
+#: ../midori/midori-preferences.c:336
+msgid "The default font size used to display text"
+msgstr "Výchozí velikost písma pro zobrazení textu"
+
+#: ../midori/midori-preferences.c:338
+msgid "Fixed-width Font Family"
+msgstr "Neproporcionální písmo"
+
+#: ../midori/midori-preferences.c:342
+msgid "The font family used to display fixed-width text"
+msgstr "Písmo pro zobrazení textu se stejnou šířkou písmen"
+
+#: ../midori/midori-preferences.c:345
+msgid "The font size used to display fixed-width text"
+msgstr "Velikost písma pro zobrazení textu se stejnou šířkou písmen"
+
+#: ../midori/midori-preferences.c:347
+msgid "Minimum Font Size"
+msgstr "Minimální velikost písma"
+
+#: ../midori/midori-preferences.c:351
+msgid "The minimum font size used to display text"
+msgstr "Minimální velikost fontu použitého pro zobrazení"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:362
+msgid "Behavior"
+msgstr "Chování"
+
+#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Automaticky načítat obrázky"
+
+#: ../midori/midori-preferences.c:369
+msgid "Enable Spell Checking"
+msgstr "Povolit kontrolu pravopisu"
+
+#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Povolit skripty"
+
+#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Povolit zásuvné moduly aplikace Netscape"
+
+#: ../midori/midori-preferences.c:391
+msgid "Zoom Text and Images"
+msgstr "Zvětšovat text i obrázky"
+
+#: ../midori/midori-preferences.c:394
+msgid "Allow scripts to open popups"
+msgstr "Povolit skriptům otevírat vyskakovací okna"
+
+#: ../midori/midori-preferences.c:395
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+"Určuje, zda bude skriptům povoleno automaticky otevírat vyskakovací okna"
+
+#: ../midori/midori-preferences.c:401
+msgid "Kinetic scrolling"
+msgstr "Kinetické posouvání"
+
+#: ../midori/midori-preferences.c:402
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr "Určuje, zda bude posouvání ovlivněno rychloistí"
+
+#: ../midori/midori-preferences.c:407
+msgid "Middle click opens Selection"
+msgstr "Kliknutí prostředního tlačítka otevře vybraný text"
+
+#: ../midori/midori-preferences.c:408
+msgid "Load an address from the selection via middle click"
+msgstr "Prostřední tlačítko myši otevře adresu obsaženou ve vybraném textu"
+
+#: ../midori/midori-preferences.c:414
+msgid "Enable WebGL support"
+msgstr "Povolit podporu WebGL"
+
+#: ../midori/midori-preferences.c:419
+msgid "Flash window on background tabs"
+msgstr "Blikání okna při otevření karty na pozadí"
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Ukládat stažené soubory do:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Prohlížení"
+
+#: ../midori/midori-preferences.c:451
+msgid "Close Buttons on Tabs"
+msgstr "Ikona zavření karty"
+
+#: ../midori/midori-preferences.c:455
+msgid "Always Show Tabbar"
+msgstr "Vždy zobrazit panel karet"
+
+#: ../midori/midori-preferences.c:459
+msgid "Open Tabs next to Current"
+msgstr "Otevřít kartu vedle aktivní"
+
+#: ../midori/midori-preferences.c:460
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Určuje, zda se budou nové karty otevírat vedle aktivní nebo vedle poslední "
+"karty"
+
+#: ../midori/midori-preferences.c:463
+msgid "Open tabs in the background"
+msgstr "Otevírat karty na pozadí"
+
+#: ../midori/midori-preferences.c:467
+msgid "Text Editor"
+msgstr "Textový editor"
+
+#: ../midori/midori-preferences.c:472
+msgid "News Aggregator"
+msgstr "Čtečka RSS"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:479
+msgid "Network"
+msgstr "Síť"
+
+#: ../midori/midori-preferences.c:481
+msgid "Proxy server"
+msgstr "Server proxy"
+
+#: ../midori/midori-preferences.c:486
+msgid "Hostname"
+msgstr "Název hostitele"
+
+#: ../midori/midori-preferences.c:494
+msgid "Port"
+msgstr "Port"
+
+#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509
+msgid "The maximum size of cached pages on disk"
+msgstr "Maximální velikost diskové mezipaměti stránek"
+
+#: ../midori/midori-preferences.c:511
+msgid "MB"
+msgstr "MB"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Add search engine"
+msgstr "Přidat vyhledávací nástroj"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Edit search engine"
+msgstr "Upravit vyhledávací nástroj"
+
+#: ../midori/midori-searchaction.c:985
+msgid "_Name:"
+msgstr "_Název:"
+
+#: ../midori/midori-searchaction.c:1000
+msgid "_Description:"
+msgstr "_Popis:"
+
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Adresa:"
+
+#: ../midori/midori-searchaction.c:1032
+msgid "_Token:"
+msgstr "_Zkratka:"
+
+#: ../midori/midori-searchaction.c:1330
+msgid "Manage Search Engines"
+msgstr "Spravovat vyhledávací nástroje"
+
+#: ../midori/midori-searchaction.c:1432
+msgid "Use as _default"
+msgstr "Použít jako _výchozí"
+
+#: ../midori/sokoke.c:353
+msgid "Open with"
+msgstr "Otevřít s"
+
+#: ../midori/sokoke.c:361
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Vyberte aplikaci, nebo příkaz k otevření \"%s\":"
+
+#: ../midori/sokoke.c:476 ../midori/sokoke.c:490
+msgid "Could not run external program."
+msgstr "Nelze spustit externí program."
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:265
+msgid "_Inline Find:"
+msgstr "_Rychlé hledání"
+
+#: ../toolbars/midori-findbar.c:287
+msgid "Previous"
+msgstr "Předchozí"
+
+#: ../toolbars/midori-findbar.c:293
+msgid "Next"
+msgstr "Následující"
+
+#: ../toolbars/midori-findbar.c:297
+msgid "Match Case"
+msgstr "Rozlišovat velikost písmen"
+
+#: ../toolbars/midori-findbar.c:306
+msgid "Highlight Matches"
+msgstr "Zvýraznit nalezené"
+
+#: ../toolbars/midori-findbar.c:317
+msgid "Close Findbar"
+msgstr "Zavřít panel hledání"
+
+#: ../toolbars/midori-transferbar.c:109
+#, c-format
+msgid "The file '%s ' has been downloaded."
+msgstr "Soubor %s byl stažen."
+
+#: ../toolbars/midori-transferbar.c:114
+msgid "Transfer completed"
+msgstr "Přenos dokončen"
+
+#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
msgid "Clear All"
msgstr "Smazat vše"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
msgid "Some files are being downloaded"
msgstr "Některé soubory se stále stahují"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:278
msgid "_Quit Midori"
msgstr "U_končit aplikaci Midori"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:280
msgid "The transfers will be cancelled if Midori quits."
msgstr "Pokud bude aplikace Midori ukončena, stahování se stornuje."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Záložky"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Přidání záložky se nezdařilo: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Nepodařilo se aktualizovat záložku: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Upravit vybranou záložku"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Smazat vybranou záložku"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Přidat novou složku"
-#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Oddělovač "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Hledat v záložkách"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Historie"
@@ -2203,15 +2047,20 @@ msgstr "Smazat vybranou položku historie"
msgid "Clear the entire history"
msgstr "Smazat celou historii"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Hledat v historii"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Přenosy"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:435
msgid "Open Destination _Folder"
msgstr "Otevřít cílovou _složku"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:438
msgid "Copy Link Loc_ation"
msgstr "Kopírovat umís_tění odkazu"
@@ -2253,54 +2102,62 @@ msgstr "Uloženou ikonu '%s' nelze načíst"
msgid "Animation frames are broken"
msgstr "Snímky animace jsou porušené"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Vlastnost '%s' je pro %s neplatná"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
-#: ../extensions/addons.c:308
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:309
msgid "Choose file"
msgstr "Zvolit soubor"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Zvolit složku"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "není"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 hodině"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 dni"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 týdnu"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 měsíci"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 roce"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Nastavení pro %s"
-#: ../extensions/adblock.c:473
+#: ../katze/midori-uri.vala:173
+msgid "MD5-Checksum:"
+msgstr "Kontrolní součet MD5:"
+
+#: ../katze/midori-uri.vala:180
+msgid "SHA1-Checksum:"
+msgstr "Kontrolní součet SHA1:"
+
+#: ../extensions/adblock.c:495
msgid "Configure Advertisement filters"
msgstr "Nastavení filtrů blokování reklamy"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:528
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2310,109 +2167,109 @@ msgstr ""
"tlačítko \"Přidat\" ji přidáte do seznamu. Více připravených filtrů "
"naleznete na adrese %s."
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:944
msgid "Edit rule"
msgstr "Upravit pravidlo"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:958
msgid "_Rule:"
msgstr "P_ravidlo:"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:1012
msgid "Bl_ock image"
msgstr "Bl_okovat obrázek"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:1017
msgid "Bl_ock link"
msgstr "Bl_okovat odkaz"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1915
msgid "Advertisement blocker"
msgstr "Blokování reklamy"
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1916
msgid "Block advertisements according to a filter list"
msgstr "Blokuvat reklamu podle seznamu filtrů"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
+#: ../extensions/addons.c:222
msgid "This page appears to contain a user script. Do you wish to install it?"
msgstr "Tato stránka obsahuje uživatelský skript. Chcete jej nainstalovat?"
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
msgid "_Install user script"
msgstr "_Instalovat uživatelský skript"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
msgid "This page appears to contain a user style. Do you wish to install it?"
msgstr "Tato stránka obsahuje uživatelský styl. Chcete jej nainstalovat?"
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
msgid "_Install user style"
msgstr "_Instalovat uživatelský styl"
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
msgid "Don't install"
msgstr "Neinstalovat"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:320 ../extensions/addons.c:675
msgid "Userscripts"
msgstr "Uživatelské skripty"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:325 ../extensions/addons.c:677
msgid "Userstyles"
msgstr "Uživatelské styly"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:371 ../extensions/addons.c:450
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Chyba"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:412
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Chcete smazat %s?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:418
msgid "Delete user script"
msgstr "Smazat uživatelský skript"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:419
msgid "Delete user style"
msgstr "Smazat uživatelský styl"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:422
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Soubor %s bude smazán."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:564 ../extensions/addons.c:641
msgid "Open in Text Editor"
msgstr "Otevřít v textovém editoru"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:566 ../extensions/addons.c:650
msgid "Open Target Folder"
msgstr "Otevřít cílovou složku"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:632
msgid "Add new addon"
msgstr "Přidat nový zásuvný přídavek"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:658
msgid "Remove selected addon"
msgstr "Odstranit vybraný přídavek"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1687 ../extensions/addons.c:1905
msgid "User addons"
msgstr "Uživatelské přídavky"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1817
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Nelze sledovat složku '%s': %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1906
msgid "Support for userscripts and userstyles"
msgstr "Podpora uživatelských skriptů a stylů."
@@ -2499,29 +2356,21 @@ msgstr ""
"Doména : %s\n"
"Cookies : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Název"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "Rozbalit _vše"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "_Sbalit vše"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filtr:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Vložte řetězec, podle kterého se budou cookies filtrovat. Filtruje se podle "
-"názvu nebo domény"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Hledat cookies podle názvu nebo domény"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2733,11 +2582,11 @@ msgstr "Zobrazit kartu na pozadí (Seznam historie)"
msgid "Display the current selected tab in background"
msgstr "Zobrazí vybranou kartu na pozadí"
-#: ../extensions/history-list.vala:569
+#: ../extensions/history-list.vala:566
msgid "History List"
msgstr "Seznam historie"
-#: ../extensions/history-list.vala:570
+#: ../extensions/history-list.vala:567
msgid "Move to the last used tab when switching or closing tabs"
msgstr "Při přepínání nebo zavírání karet přesunout do naposledy použitých"
@@ -2759,7 +2608,7 @@ msgstr "Přizpůsobení klávesových zkratek"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "Přizpůsobení klávesových _zkratek..."
+msgstr "Přizpůsobení klávesových _zkratek…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2777,35 +2626,35 @@ msgstr "Hodiny ve stavovém řádku"
msgid "Display date and time in the statusbar"
msgstr "Zobrazuje datum a čas ve stavovém řádku"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Obrázky"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Uživatelské skripty"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Zásuvné moduly aplikace Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Rozšíření stavové lišty"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
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:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Panel karet"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "Panel _karet"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Zobrazí karty ve svislém panelu"
@@ -2817,11 +2666,11 @@ msgstr "Ve výchozím stavu na kartách zobrazovat pouze ikony "
msgid "New tabs have no label by default"
msgstr "Nové karty nebudou mít ve výchozím stavu popisek"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Upravit panel nástrojů"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2829,34 +2678,269 @@ msgstr ""
"Vybrané položky se zobrazí na panelu nástrojů. Změnu pořadí položek "
"provedete přetažením."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Dostupné položky"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Zobrazené položky"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Upravit pane_l nástrojů..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "Upravit pane_l nástrojů…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Vlastní..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Editor panelu nástrojů"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Umožňuje jednoduše změnit rozvržení panelu nástrojů"
-#: ../extensions/web-cache.c:463
+#: ../extensions/web-cache.c:462
msgid "Cache HTTP communication on disk"
msgstr "Ukládá komunikaci HTTP do diskové mezipaměti"
+#~ msgid "Remember last window size"
+#~ msgstr "Pamatovat si velikost okna"
+
+#~ msgid "Whether to save the last window size"
+#~ msgstr "Určuje, zda se budou ukládat rozměry okna"
+
+#~ msgid "Last window width"
+#~ msgstr "Poslední šířka okna"
+
+#~ msgid "The last saved window width"
+#~ msgstr "Naposledy uložená šířka okna"
+
+#~ msgid "Last window height"
+#~ msgstr "Poslední výška okna"
+
+#~ msgid "The last saved window height"
+#~ msgstr "Naposledy uložená výška okna"
+
+#~ msgid "Last panel position"
+#~ msgstr "Poslední pozice panelu"
+
+#~ msgid "The last saved panel position"
+#~ msgstr "Naposledy uložená pozice panelu"
+
+#~ msgid "Last panel page"
+#~ msgstr "Poslední stránka panelu"
+
+#~ msgid "The last saved panel page"
+#~ msgstr "Naposledy uložená stránka panelu"
+
+#~ msgid "Last Web search"
+#~ msgstr "Poslední hledání na webu"
+
+#~ msgid "The last saved Web search"
+#~ msgstr "Poslední uložené vyhledávání na webu"
+
+#~ msgid "Show Menubar"
+#~ msgstr "Zobrazit panel nabídky"
+
+#~ msgid "Whether to show the menubar"
+#~ msgstr "Určuje, zda se bude zobrazovat panel nabídky"
+
+#~ msgid "Show Navigationbar"
+#~ msgstr "Zobrazit panel vyhledávání"
+
+#~ msgid "Whether to show the navigationbar"
+#~ msgstr "Určuje, zda se bude zobrazovat panel vyhledávání"
+
+#~ msgid "Show Bookmarkbar"
+#~ msgstr "Zobrazit záložky"
+
+#~ msgid "Whether to show the bookmarkbar"
+#~ msgstr "Určuje, zda se bude zobrazovat panel záložek"
+
+#~ msgid "Show Panel"
+#~ msgstr "Zobrazit panel"
+
+#~ msgid "Whether to show the panel"
+#~ msgstr "Určuje, zda se bude zobrazovat panel"
+
+#~ msgid "Show Statusbar"
+#~ msgstr "Zobrazit stavový řádek"
+
+#~ msgid "Whether to show the statusbar"
+#~ msgstr "Určuje, zda se bude zobrazovat panel stavu"
+
+#~ msgid "Toolbar Items"
+#~ msgstr "Položky panelu nástrojů"
+
+#~ msgid "The items to show on the toolbar"
+#~ msgstr "Položky zobrazované na panelu nástrojů"
+
+#~ msgid "Compact Sidepanel"
+#~ msgstr "Kompaktní postranní panel"
+
+#~ msgid "Whether to make the sidepanel compact"
+#~ msgstr "Určuje, zda bude postranní panel zobrazen ve zjednodušené podobě"
+
+#~ msgid "Align sidepanel on the right"
+#~ msgstr "Umístit postranní panel vpravo"
+
+#~ msgid "Whether to align the sidepanel on the right"
+#~ msgstr "Určuje, zda bude postranní panel umístěn napravo"
+
+#~ msgid "Open panels in separate windows"
+#~ msgstr "Otevírat panely v samostatných oknech"
+
+#~ msgid "Whether to always open panels in separate windows"
+#~ msgstr "Určuje, zda se budou panely vždy otevírat v samostatných oknech"
+
+#~ msgid "What to do when Midori starts"
+#~ msgstr "Co se stane po spuštění aplikace Midori"
+
+#~ msgid "The homepage"
+#~ msgstr "Domovská stránka"
+
+#~ msgid "Show crash dialog"
+#~ msgstr "Zobrazit dialog po pádu"
+
+#~ msgid "The folder downloaded files are saved to"
+#~ msgstr "Složka, do níž se budou ukládat stažené soubory"
+
+#~ msgid "An external text editor"
+#~ msgstr "Externí textový editor"
+
+#~ msgid "An external news aggregator"
+#~ msgstr "Externí čtečka zpráv RSS"
+
+#~ msgid "Location entry Search"
+#~ msgstr "Vyhledávání v adresním řádku"
+
+#~ msgid "The search to perform inside the location entry"
+#~ msgstr "Vyhledávání použité v řádku s adresou"
+
+#~ msgid "The preferred character encoding"
+#~ msgstr "Upřednostňované kódování stránek"
+
+#~ msgid "Always show the tabbar"
+#~ msgstr "Vždy zobrazit panel karet"
+
+#~ msgid "Whether tabs have close buttons"
+#~ msgstr "Určuje, zda budou na kartách přítomna tlačítka pro jejich zavření"
+
+#~ msgid "Where to open new pages"
+#~ msgstr "Kde se budou otevírat nové stránky"
+
+#~ msgid "Whether to open new tabs in the background"
+#~ msgstr "Určuje, zda se budou nové karty otevírat na pozadí"
+
+#~ msgid "Open popups in tabs"
+#~ msgstr "Otevírat vyskakovací okna v kartách"
+
+#~ msgid "Whether to open popup windows in tabs"
+#~ msgstr "Určuje, zda se vyskakovací okno otevře v kartě"
+
+#~ msgid "Load and display images automatically"
+#~ msgstr "Automaticky načítat a zobrazovat obrázky"
+
+#~ msgid "Enable embedded scripting languages"
+#~ msgstr "Povolit vložené skriptové jazyky"
+
+#~ msgid "Enable embedded Netscape plugin objects"
+#~ msgstr "Povolit objekty zásuvných modulů aplikace Netscape"
+
+#~ msgid "Enable spell checking while typing"
+#~ msgstr "Povolit kontrolu pravopisu při psaní"
+
+#~ msgid "Enable HTML5 database support"
+#~ msgstr "Povolit podporu databází HTML5"
+
+#~ msgid "Whether to enable HTML5 database support"
+#~ msgstr "Určuje, zda bude povolena podpora databází v jazyku HTML5"
+
+#~ msgid "Whether to enable HTML5 local storage support"
+#~ msgstr "Určuje, zda budou povolena místní úložiště v jazyku HTML5"
+
+#~ msgid "Whether to enable offline web application cache"
+#~ msgstr "Určuje, zda bude povoleno používání mezipaměti pro offline aplikace"
+
+#~ msgid "Flash the browser window if a new tab was opened in the background"
+#~ msgstr "Okno prohlížeče blikne při otevření nové karty na pozadí"
+
+#~ msgid "Allow websites to use OpenGL rendering"
+#~ msgstr ""
+#~ "Umožnit webovým stránkám použití vykreslování pomocí knihovny OpenGL"
+
+#~ msgid "Whether to zoom text and images"
+#~ msgstr "Určuje, zda se bude měnit velikost textu i obrázků"
+
+#~ msgid "Find inline while typing"
+#~ msgstr "Hledat při psaní"
+
+#~ msgid "Whether to automatically find inline while typing"
+#~ msgstr "Určuje, zda se v textu bude automaticky vyhledávat během psaní"
+
+#~ msgid "The type of proxy server to use"
+#~ msgstr "Jaký typ serveru proxy chcete použít"
+
+#~ msgid "HTTP Proxy Server"
+#~ msgstr "Serverproxy HTTP"
+
+#~ msgid "The proxy server used for HTTP connections"
+#~ msgstr "Server proxy, který bude použit pro spojení HTTP"
+
+#~ msgid "The proxy server port used for HTTP connections"
+#~ msgstr "Port serveru proxy, který bude použit pro spojení HTTP"
+
+#~ msgid "Identification string"
+#~ msgstr "Identifikační řetězec"
+
+#~ msgid "The application identification string"
+#~ msgstr "Identifikační řetězec aplikace"
+
+#~ msgid "Clear private data"
+#~ msgstr "Vymazat osobní údaje"
+
+#~ msgid "The private data selected for deletion"
+#~ msgstr "Osobní údaje byly označeny ke smazání"
+
+#~ msgid "Clear data"
+#~ msgstr "Vymazat údaje"
+
+#~ msgid "The data selected for deletion"
+#~ msgstr "Údaje označené pro vymazání"
+
+#~ msgid "Filter:"
+#~ msgstr "Filtr:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Vložte řetězec, podle kterého se budou cookies filtrovat. Filtruje se "
+#~ "podle názvu nebo domény"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "_Zavřít ostatní karty"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Ikona:"
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Záložky"
+
+#~ msgid "_Console"
+#~ msgstr "_Konzola"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Složka nejvyšší úrovně"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Vlastní…"
+
+#~ msgid "_Title:"
+#~ msgstr "_Nadpis:"
+
+#~ msgid "_Folder:"
+#~ msgstr "Složk_a:"
+
#~ msgid "The bookmarks couldn't be saved. %s"
#~ msgstr "Záložky nelze uložit. %s"
@@ -2959,14 +3043,14 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Přidá novou složku do záložek"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Přidává, upravuje a maže vyhledávací nástroje..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Přidává, upravuje a maže vyhledávací nástroje…"
-#~ msgid "Clear private data..."
-#~ msgstr "Vymaže osobní data..."
+#~ msgid "Clear private data…"
+#~ msgstr "Vymaže osobní data…"
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr "Zobrazí stránku ve vývojářském nástroji..."
+#~ msgid "Inspect page details and access developer tools…"
+#~ msgstr "Zobrazí stránku ve vývojářském nástroji…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Přepnout na předchozí kartu"
@@ -3022,12 +3106,6 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti"
#~ msgid "Show statusbar"
#~ msgstr "Zobrazit stavovou lištu"
-#~ msgid "MD5-Checksum:"
-#~ msgstr "Kontrolní součet MD5:"
-
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "Kontrolní součet SHA1:"
-
#~ msgid "No filename specified"
#~ msgstr "Nebyl zadán název souboru"
@@ -3055,7 +3133,7 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti"
#~ msgid "Reset the last _session"
#~ msgstr "Vymazat poslední _sezení"
-#~ msgid "Configure _Advertisement filters..."
+#~ msgid "Configure _Advertisement filters…"
#~ msgstr "_Blokování reklamy"
#~ msgid "Not found - %s"
@@ -3421,9 +3499,6 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti"
#~ msgid "Encoding"
#~ msgstr "Kódování"
-#~ msgid "User_styles"
-#~ msgstr "Uživatelské _styly"
-
#~ msgid "Resizable text areas"
#~ msgstr "Roztažitelné oblasti pro text"
@@ -3439,8 +3514,8 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti"
#~ msgid "Load on Startup"
#~ msgstr "Načíst při startu"
-#~ msgid "Configure _Toolbar..."
-#~ msgstr "Upravit _lištu..."
+#~ msgid "Configure _Toolbar…"
+#~ msgstr "Upravit _lištu…"
#~ msgid "_Quick Find"
#~ msgstr "_Rychlé hledání"
@@ -3454,9 +3529,6 @@ msgstr "Ukládá komunikaci HTTP do diskové mezipaměti"
#~ msgid "Warning: You are using a superuser account!"
#~ msgstr "Varování: jste přihlášen(a) jako superuživatel (root)!"
-#~ msgid "_Enable"
-#~ msgstr "_Povolit"
-
#~ msgid "Enable"
#~ msgstr "Povolit"
diff --git a/po/da.po b/po/da.po
index aa5f0ae1..b8e723fe 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,17 +8,17 @@ msgid ""
msgstr ""
"Project-Id-Version: midori 0.2.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-12 07:21+0000\n"
+"POT-Creation-Date: 2012-08-06 19:09+0000\n"
"PO-Revision-Date: 2010-02-20 00:37+0100\n"
"Last-Translator: Per Kongstad \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Country: Denmark\n"
"Language: da\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Poedit-Language: Danish\n"
-"X-Poedit-Country: Denmark\n"
#: ../data/midori.desktop.in.h:1
msgid "Browse the Web"
@@ -28,12 +28,28 @@ msgstr "Gennemse internettet"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Stifinder"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:1962 ../midori/main.c:1986
-#: ../midori/main.c:2000 ../midori/midori-websettings.c:313
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:2025 ../midori/main.c:2049
+#: ../midori/main.c:2063 ../midori/midori-websettings.c:315
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Midori webbrowser"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Nyt \"P_rivat browsing\"-vindue"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1478
+msgid "New Tab"
+msgstr "Nyt faneblad"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1475
+msgid "New Window"
+msgstr "Nyt vindue"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Webbrowser"
@@ -45,71 +61,71 @@ msgstr "Midori Privat browsing"
msgid "Open a new private browsing window"
msgstr "Åbn nyt vindue til privat browsing"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4172
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4494
msgid "Private Browsing"
msgstr "Privat browsing"
-#: ../midori/main.c:97 ../midori/main.c:103
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Indstillingen kunne ikke indlæses: %s\n"
-#: ../midori/main.c:151
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Værdien '%s' er ikke gyldig til %s"
-#: ../midori/main.c:156 ../midori/main.c:260
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Ugyldig indstillingsværdi '%s'"
-#: ../midori/main.c:381
+#: ../midori/main.c:375
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Søgemaskinerne kunne ikke indlæses. %s\n"
-#: ../midori/main.c:435
+#: ../midori/main.c:429
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Kunne ikke fjerne historik: %s\n"
-#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Kunne ikke åbne databasen: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:525
+#: ../midori/main.c:523
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Kunne ikke fjerne gamle historikelementer: %s\n"
-#: ../midori/main.c:547
+#: ../midori/main.c:545
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Indstillingen kunne ikke gemmes. %s"
-#: ../midori/main.c:582
+#: ../midori/main.c:571
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Søgemaskinerne kunne ikke gemmes. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:619
+#: ../midori/main.c:608
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Papirkurven kunne ikke fyldes. %s"
-#: ../midori/main.c:660 ../panels/midori-extensions.c:91
+#: ../midori/main.c:681 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Udvidelser"
-#: ../midori/main.c:674
+#: ../midori/main.c:695
msgid "Privacy"
msgstr "Beskyttelse af privatliv"
-#: ../midori/main.c:686
+#: ../midori/main.c:707
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -117,18 +133,18 @@ msgstr ""
"Cookies gemmer loginddata, gemte spil eller brugerprofiler for "
"marketingsformål"
-#: ../midori/main.c:742
+#: ../midori/main.c:763
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Sessionen kunne ikke gemmes. %s"
-#: ../midori/main.c:960
+#: ../midori/main.c:1001
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Ingen rodcertifikatfil er tilgængelig. SSL certifikater kan ikke verificeres."
-#: ../midori/main.c:1029
+#: ../midori/main.c:1093
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -137,228 +153,225 @@ msgstr ""
"dette er sket gentagne gange, foreslås det at prøve de følgende muligheder "
"for at løse problemet."
-#: ../midori/main.c:1048
+#: ../midori/main.c:1112
msgid "Modify _preferences"
msgstr "Ændre _indstillinger"
-#: ../midori/main.c:1052
+#: ../midori/main.c:1116
msgid "Disable all _extensions"
msgstr "Slå alle _udvidelser fra"
-#: ../midori/main.c:1065
+#: ../midori/main.c:1129
msgid "Discard old tabs"
msgstr "Kassér gamle faneblade"
-#: ../midori/main.c:1066 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1130 ../midori/midori-websettings.c:223
msgid "Show last tabs without loading"
msgstr "Vis sidste faneblad uden at indlæse"
-#: ../midori/main.c:1067 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1131 ../midori/midori-websettings.c:222
msgid "Show last open tabs"
msgstr "Vis sidste åbne faneblade"
-#: ../midori/main.c:1314 ../midori/main.c:2378
+#: ../midori/main.c:1379 ../midori/main.c:2433
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Sessionen kunne ikke indlæses: %s\n"
-#: ../midori/main.c:1452
+#: ../midori/main.c:1517
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Øjebliksbillede gem til: %s\n"
-#: ../midori/main.c:1865
+#: ../midori/main.c:1933
msgid "Run ADDRESS as a web application"
msgstr "Kør ADRESSE som et webprogram"
-#: ../midori/main.c:1865
+#: ../midori/main.c:1933
msgid "ADDRESS"
msgstr "ADRESSE"
-#: ../midori/main.c:1868
+#: ../midori/main.c:1936
msgid "Use FOLDER as configuration folder"
msgstr "Brug MAPPE som en indstillingsmappe"
-#: ../midori/main.c:1868
+#: ../midori/main.c:1936
msgid "FOLDER"
msgstr "MAPPE"
-#: ../midori/main.c:1871
+#: ../midori/main.c:1939
msgid "Private browsing, no changes are saved"
msgstr "Privat browsing. Ingen ændringer bliver gemt"
-#: ../midori/main.c:1873
+#: ../midori/main.c:1941
msgid "Show a diagnostic dialog"
msgstr "Vis en nedbrudsdialog"
-#: ../midori/main.c:1875
+#: ../midori/main.c:1943
msgid "Run the specified filename as javascript"
msgstr "Kør det angivne filnavn som javascript"
-#: ../midori/main.c:1877
+#: ../midori/main.c:1945
msgid "Take a snapshot of the specified URI"
msgstr "Tag et øjebliksbillede at det angivne URI"
-#: ../midori/main.c:1879
+#: ../midori/main.c:1947
msgid "Execute the specified command"
msgstr "Kør den angivne kommando"
-#: ../midori/main.c:1881
+#: ../midori/main.c:1949
msgid "List available commands to execute with -e/ --execute"
msgstr "Vis tilgængelige kommandoer for kør med -e/ --execute"
-#: ../midori/main.c:1883
+#: ../midori/main.c:1951
msgid "Display program version"
msgstr "Vis programversion"
-#: ../midori/main.c:1885
+#: ../midori/main.c:1953
msgid "Addresses"
msgstr "Adresser"
-#: ../midori/main.c:1887
+#: ../midori/main.c:1955
msgid "Block URIs according to regular expression PATTERN"
msgstr "Blokér URI'er i overensstemmelse med regulære udtryks-MØNSTRE"
-#: ../midori/main.c:1887
+#: ../midori/main.c:1955
msgid "PATTERN"
msgstr "MØNSTRE"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1891
+#: ../midori/main.c:1959
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Nulstil Midori efter SECONDS sekunders inaktivitet"
-#: ../midori/main.c:1891
+#: ../midori/main.c:1959
msgid "SECONDS"
msgstr "SEKUNDER"
-#: ../midori/main.c:1894
+#: ../midori/main.c:1962
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Videresender konsoladvarsler til det angivne FILENAME"
-#: ../midori/main.c:1894
+#: ../midori/main.c:1962
msgid "FILENAME"
msgstr "FILENAME"
-#: ../midori/main.c:1959
-msgid "[Addresses]"
-msgstr "[Adresser]"
-
-#: ../midori/main.c:2001
+#: ../midori/main.c:2064
msgid "Please report comments, suggestions and bugs to:"
msgstr "Rapportér venligst kommentarer, forslag og fejl til:"
-#: ../midori/main.c:2003
+#: ../midori/main.c:2066
msgid "Check for new versions at:"
msgstr "Tjek for nye versioner hos:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2087
+#: ../midori/main.c:2161
msgid "Saved logins and _passwords"
msgstr "Gemte logins og _adgangskoder"
-#: ../midori/main.c:2089
+#: ../midori/main.c:2163
msgid "Cookies and Website data"
msgstr "Cookies og websideinformation"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2093 ../midori/midori-websettings.c:997
+#: ../midori/main.c:2167 ../midori/midori-websettings.c:1020
#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
msgstr "Webcache"
-#: ../midori/main.c:2096
+#: ../midori/main.c:2170
msgid "Website icons"
msgstr "Webstedikoner"
-#: ../midori/main.c:2202
+#: ../midori/main.c:2274
msgid "An unknown error occured"
msgstr "En ukendt fejl opstod"
-#: ../midori/main.c:2309
+#: ../midori/main.c:2381
msgid "An instance of Midori is already running but not responding.\n"
msgstr "En instans af Midori kører allerede men reagerer ikke.\n"
-#: ../midori/main.c:2345
+#: ../midori/main.c:2415
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Bogmærkerne kunne ikke indlæses: %s\n"
-#: ../midori/main.c:2393
+#: ../midori/main.c:2448
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Papirkurven kunne ikke indlæses: %s\n"
-#: ../midori/main.c:2406
+#: ../midori/main.c:2461
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Historikken kunne ikke indlæses: %s\n"
-#: ../midori/main.c:2422
+#: ../midori/main.c:2476
msgid "The following errors occured:"
msgstr "De følgende fejl opstod:"
-#: ../midori/main.c:2438
+#: ../midori/main.c:2492
msgid "_Ignore"
msgstr "_Ignorér"
-#: ../midori/midori-app.c:1339
-msgid "_Bookmark"
-msgstr "_Bogmærke"
+#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:545
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Uventet handling '%s'."
-#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066
+#: ../midori/midori-app.c:1457 ../midori/midori-browser.c:6431
msgid "_Bookmarks"
msgstr "_Bogmærker"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1458
msgid "Add Boo_kmark"
msgstr "_Tilføj bogmærke"
-#: ../midori/midori-app.c:1342
-msgid "_Console"
-msgstr "_Konsol"
-
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1459
msgid "_Extensions"
msgstr "_Udvidelser"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591
+#: ../midori/midori-app.c:1460 ../midori/midori-browser.c:4887
msgid "_History"
msgstr "Hi_storik"
-#: ../midori/midori-app.c:1345
-msgid "_Homepage"
-msgstr "_Hjemmeside"
-
-#: ../midori/midori-app.c:1346
+#: ../midori/midori-app.c:1461
msgid "_Userscripts"
msgstr "Brugerskri_pter"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1462
+msgid "User_styles"
+msgstr "Bruger_grænseflader"
+
+#: ../midori/midori-app.c:1463
msgid "New _Tab"
msgstr "Nyt _faneblad"
-#: ../midori/midori-app.c:1348
+#: ../midori/midori-app.c:1464
msgid "_Transfers"
msgstr "_Overførsler"
-#: ../midori/midori-app.c:1349
+#: ../midori/midori-app.c:1465
msgid "Netscape p_lugins"
msgstr "Netscape-u_dvidelsesmoduler"
-#: ../midori/midori-app.c:1350
+#: ../midori/midori-app.c:1466
msgid "_Closed Tabs"
msgstr "_Luk faneblade"
-#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218
+#: ../midori/midori-app.c:1467 ../midori/midori-browser.c:5570
msgid "New _Window"
msgstr "Nyt _vindue"
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1468
msgid "New _Folder"
msgstr "Ny __mappe"
+#: ../midori/midori-app.c:1497
+msgid "[Addresses]"
+msgstr "[Adresser]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Fil blev ikke fundet."
@@ -376,140 +389,123 @@ msgstr "Ukendt bogmærkeformat."
msgid "Writing failed."
msgstr "Skrivning fejlede."
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5658
+#: ../midori/midori-browser.c:5667
msgid "Reload the current page"
msgstr "Genindlæs den nuværende side"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:373 ../midori/midori-browser.c:5664
msgid "Stop loading the current page"
msgstr "Stop indlæsning af nuværende side"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:530
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Kunne ikke opdatere titel: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Uventet handling '%s'."
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:625
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Privat browsing)"
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "Øverste mappe"
+#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Bogmærker"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:837
msgid "New folder"
msgstr "Ny mappe"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:837
msgid "Edit folder"
msgstr "Redigér mappe"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:839
msgid "New bookmark"
msgstr "Nyt bogmærke"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:839
msgid "Edit bookmark"
msgstr "Redigér bogmærke"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Titel:"
+#: ../midori/midori-browser.c:873
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Indtast et navn til dette bogmærker og vælg hvor det skal gemmes."
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Adresse:"
-
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328
-msgid "_Folder:"
-msgstr "_Mappe:"
-
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:934
msgid "Add to _Speed Dial"
msgstr "Tilføj til hurtig_opkald"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:940
msgid "Show in the tool_bar"
msgstr "Vis på vær_ktøjsbjælken"
-#: ../midori/midori-browser.c:905
+#: ../midori/midori-browser.c:948
msgid "Run as _web application"
msgstr "Kør so_m et webprogram"
-#: ../midori/midori-browser.c:976
+#: ../midori/midori-browser.c:1019
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "Filen \"%s\" kan ikke gemmes i denne mapp."
-#: ../midori/midori-browser.c:978
+#: ../midori/midori-browser.c:1021
#, c-format
msgid "You don't have permission to write in this location."
msgstr "Du har ikke skriverettigheder til dette sted."
-#: ../midori/midori-browser.c:985
+#: ../midori/midori-browser.c:1028
#, c-format
msgid "There is not enough free space to download \"%s\"."
msgstr "Der er ikke tilstrækkelig fri plads til at hente \"%s\"."
-#: ../midori/midori-browser.c:988
+#: ../midori/midori-browser.c:1031
#, c-format
msgid "The file needs %s but only %s are left."
msgstr "Filen behøver %s men der er kun %s fri plads"
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397
+#: ../midori/midori-browser.c:1167 ../midori/midori-browser.c:4691
msgid "Save file as"
msgstr "Gem fil som"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Nyt vindue"
+#: ../midori/midori-browser.c:1173
+msgid "Save associated _resources"
+msgstr "Gem associerede _ressourcer"
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1475
msgid "A new window has been opened"
msgstr "Et nyt vindue er blevet åbnet"
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Nyt faneblad"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1478
msgid "A new tab has been opened"
msgstr "Et nyt faneblad er blevet åbnet"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1495
msgid "Error opening the image!"
msgstr "Fejl ved åbning af billedet!"
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1496
msgid "Can not open selected image in a default viewer."
msgstr "Kan ikke åbne billedet i standardfremviser."
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1502
msgid "Error downloading the image!"
msgstr "Fejl ved hentning af billedet!"
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1503
msgid "Can not download selected image."
msgstr "Kan ikke hente valgte billede."
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1624
msgid "Save file"
msgstr "Gem fil"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2527
msgid "Open file"
msgstr "Åbn fil"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2659
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -524,139 +520,153 @@ msgstr ""
"nyhedslæser. Næste kan man trykker på ikonet med nyhedsfeed, vil det "
"automatisk blive tilføjet."
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2665 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Nyt feed"
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2708 ../midori/midori-browser.c:5730
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Tilføj et nyt bogmærke"
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3252 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Tom"
-#: ../midori/midori-browser.c:3469
+#: ../midori/midori-browser.c:3695 ../midori/midori-browser.c:3696
msgid "Toggle text cursor navigation"
msgstr "Slå cursorbaseret navigation til og fra"
-#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759
+#: ../midori/midori-browser.c:3698
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3701
+msgid "_Enable Caret Browsing"
+msgstr "Slå Ca_ret browsing til"
+
+#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6124
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Kunne ikke indsætte nyt historikelement: %s\n"
-#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4417 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Åbn alt i _faneblade"
-#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Åbn i nyt _faneblad"
-#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2661
-#: ../midori/midori-view.c:4712 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4427 ../midori/midori-view.c:2940
+#: ../midori/midori-view.c:5071 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Åbn i nyt _vindue"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4516
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4517
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4518
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4519
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4219
+#: ../midori/midori-browser.c:4520
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4220
+#: ../midori/midori-browser.c:4521
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4241
-msgid "Import bookmarks..."
-msgstr "Importér bogmærker..."
+#: ../midori/midori-browser.c:4522
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:4543
+msgid "Import bookmarks…"
+msgstr "Importér bogmærker…"
+
+#: ../midori/midori-browser.c:4546 ../midori/midori-browser.c:5735
msgid "_Import bookmarks"
msgstr "_Importér bogmærker"
-#: ../midori/midori-browser.c:4255
+#: ../midori/midori-browser.c:4557
msgid "_Application:"
msgstr "_Program:"
-#: ../midori/midori-browser.c:4320
+#: ../midori/midori-browser.c:4622
msgid "Import from XBEL or HTML file"
msgstr "Importér fra XBEL- eller HTML-fil"
-#: ../midori/midori-browser.c:4355
+#: ../midori/midori-browser.c:4650
msgid "Import from a file"
msgstr "Importér fra en fil"
-#: ../midori/midori-browser.c:4367
+#: ../midori/midori-browser.c:4662
msgid "Failed to import bookmarks"
msgstr "Kunne ikke importere bogmærker"
-#: ../midori/midori-browser.c:4402
+#: ../midori/midori-browser.c:4696
msgid "XBEL Bookmarks"
msgstr "XBEL bogmærker"
-#: ../midori/midori-browser.c:4407
+#: ../midori/midori-browser.c:4701
msgid "Netscape Bookmarks"
msgstr "Netscape bogmærker"
-#: ../midori/midori-browser.c:4421
+#: ../midori/midori-browser.c:4715
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "Midori kan kun eksportere til XBEL (*.xbel) og Netscape (*.html)"
-#: ../midori/midori-browser.c:4436
+#: ../midori/midori-browser.c:4730
msgid "Failed to export bookmarks"
msgstr "Kunne ikke eksportere bogmærker"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4558
+#: ../midori/midori-browser.c:4852
msgid "Clear Private Data"
msgstr "Ryd private data"
-#: ../midori/midori-browser.c:4562
+#: ../midori/midori-browser.c:4856
msgid "_Clear private data"
msgstr "_Ryd private data"
-#: ../midori/midori-browser.c:4575
+#: ../midori/midori-browser.c:4871
msgid "Clear the following data:"
msgstr "Ryd de følgende data:"
-#: ../midori/midori-browser.c:4585
+#: ../midori/midori-browser.c:4881
msgid "Last open _tabs"
msgstr "Sidste åbne _faneblade"
-#: ../midori/midori-browser.c:4611
+#: ../midori/midori-browser.c:4907
msgid "Clear private data when _quitting Midori"
msgstr "_Ryd private data når Midori afsluttes"
-#: ../midori/midori-browser.c:4806
+#: ../midori/midori-browser.c:5122
msgid "A lightweight web browser."
msgstr "En letvægt-webbrowser."
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:5123
msgid "See about:version for version info."
msgstr "Se about:version for versionsinfo."
-#: ../midori/midori-browser.c:4809
+#: ../midori/midori-browser.c:5125
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 "
@@ -668,7 +678,7 @@ msgstr ""
"publiceret af Free Software Foundation: Enten version 2.1 af licensen eller "
"(dit frie valg) en senere version."
-#: ../midori/midori-browser.c:4830
+#: ../midori/midori-browser.c:5155
msgid "translator-credits"
msgstr ""
"Per Kongstad \n"
@@ -676,363 +686,374 @@ msgstr ""
"Dansk-gruppen \n"
"Mere info: http://www.dansk-gruppen.dk"
-#: ../midori/midori-browser.c:5216
+#: ../midori/midori-browser.c:5568
msgid "_File"
msgstr "_Fil"
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5571
msgid "Open a new window"
msgstr "Åbn et nyt vindue"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5574
msgid "Open a new tab"
msgstr "Åbn et nyt faneblad"
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5576
msgid "New P_rivate Browsing Window"
msgstr "Nyt vindue til p_rivat browsing"
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5580
msgid "Open a file"
msgstr "Åbn en fil"
-#: ../midori/midori-browser.c:5230
-msgid "_Save Page As..."
-msgstr "Gem side _som..."
+#: ../midori/midori-browser.c:5582
+msgid "_Save Page As…"
+msgstr "Gem side _som…"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5583
msgid "Save to a file"
msgstr "Gem til en fil"
-#: ../midori/midori-browser.c:5233
+#: ../midori/midori-browser.c:5585
msgid "Add to Speed _dial"
msgstr "Tilføj til hurtig_opkald"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5589
msgid "Add Shortcut to the _desktop"
msgstr "Tilføj genvej til _skrivebordet"
-#: ../midori/midori-browser.c:5239
+#: ../midori/midori-browser.c:5591
msgid "Create _Launcher"
msgstr "Opret _opstarter"
-#: ../midori/midori-browser.c:5243
+#: ../midori/midori-browser.c:5595
msgid "Subscribe to News _feed"
msgstr "Abonnér på _nyhedskilder"
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5601
msgid "_Close Tab"
msgstr "_Luk faneblad"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5602
msgid "Close the current tab"
msgstr "Luk nuværende faneblad"
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5604
msgid "C_lose Window"
msgstr "Lu_k vinduet"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5608
+msgid "_Share"
+msgstr "_Del"
+
+#: ../midori/midori-browser.c:5613
msgid "Print the current page"
msgstr "Udskriv nuværende side"
-#: ../midori/midori-browser.c:5258
+#: ../midori/midori-browser.c:5616
msgid "Close a_ll Windows"
msgstr "Luk a_lle vinduer"
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5619
msgid "_Edit"
msgstr "_Redigér"
-#: ../midori/midori-browser.c:5284
-msgid "_Find..."
-msgstr "_Find..."
+#: ../midori/midori-browser.c:5642
+msgid "_Find…"
+msgstr "_Find…"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5643
msgid "Find a word or phrase in the page"
msgstr "Find et ord eller sætning på siden"
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5645
msgid "Find _Next"
msgstr "Find _næste"
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5648
msgid "Find _Previous"
msgstr "Find _forrige"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5652
msgid "Configure the application preferences"
msgstr "Indstil programindstillingerne"
-#: ../midori/midori-browser.c:5296
+#: ../midori/midori-browser.c:5654
msgid "_View"
msgstr "_Vis"
-#: ../midori/midori-browser.c:5297
+#: ../midori/midori-browser.c:5655
msgid "_Toolbars"
msgstr "_Værktøjsbjælker"
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5660
msgid "Reload page without caching"
msgstr "Genindlæs side uden caching"
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5670
msgid "Increase the zoom level"
msgstr "Forøg forstørrelsesniveauet"
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5673
msgid "Decrease the zoom level"
msgstr "Formindsk forstørrelsesniveauet"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5677
msgid "_Encoding"
msgstr "_Kodning"
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5679
msgid "View So_urce"
msgstr "Vis _kilde"
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5682
msgid "Ca_ret Browsing"
msgstr "Ca_ret browsing"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5686
msgid "Toggle fullscreen view"
msgstr "Slå fuldskærmstilstande til/fra"
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5688
msgid "Scroll _Left"
msgstr "Rul til _venstre"
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5691
msgid "Scroll _Down"
msgstr "Rul _ned"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5694
msgid "Scroll _Up"
msgstr "Rul _op"
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5697
msgid "Scroll _Right"
msgstr "Rul til _højre"
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5700
+msgid "_Readable"
+msgstr "_Læsbar"
+
+#: ../midori/midori-browser.c:5703
msgid "_Go"
msgstr "_Gå til"
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5706
msgid "Go back to the previous page"
msgstr "Gå til forrige side"
-#: ../midori/midori-browser.c:5348
+#: ../midori/midori-browser.c:5709
msgid "Go forward to the next page"
msgstr "Gå til næste side"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5352
+#: ../midori/midori-browser.c:5713
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:5356
+#: ../midori/midori-browser.c:5717
msgid "Go to the next sub-page"
msgstr "Gå til den næste underside"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5719
+msgid "_Homepage"
+msgstr "_Hjemmeside"
+
+#: ../midori/midori-browser.c:5720
msgid "Go to your homepage"
msgstr "Gå til din hjemmeside"
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5722
msgid "Empty Trash"
msgstr "Tøm papirkurven"
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5725
msgid "Undo _Close Tab"
msgstr "Fortryd lu_k faneblad"
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5732
msgid "Add a new _folder"
msgstr "Tilføj en ny _mappe"
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5738
msgid "_Export bookmarks"
msgstr "_Eksportér bogmærker"
-#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5741 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "_Håndtér søgemaskiner"
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5744
msgid "_Clear Private Data"
msgstr "_Ryd private data"
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5747
msgid "_Inspect Page"
msgstr "_Undersøg side"
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5751
msgid "_Previous Tab"
msgstr "_Forrige faneblad"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5754
msgid "_Next Tab"
msgstr "_Næste faneblad"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5756
msgid "Move Tab _Backward"
msgstr "Flyt faneblad _tilbage"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5758
msgid "_Move Tab Forward"
msgstr "Flyt faneblad _frem"
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5761
msgid "Focus _Current Tab"
msgstr "Fokus på _nuværende faneblad"
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5764
msgid "Focus _Next view"
msgstr "Fokus _næste visning"
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5767
msgid "Only show the Icon of the _Current Tab"
msgstr "Vis kun ikonet for _nuværende faneblad"
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5770
msgid "_Duplicate Current Tab"
msgstr "_Dublér nuværende faneblad"
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5773
msgid "Close Ot_her Tabs"
msgstr "Luk a_ndre faneblade"
-#: ../midori/midori-browser.c:5415
+#: ../midori/midori-browser.c:5776
msgid "Open last _session"
msgstr "Åbn den sidste _session"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5779
msgid "_Help"
msgstr "_Hjælp"
-#: ../midori/midori-browser.c:5420
+#: ../midori/midori-browser.c:5781
msgid "_Frequent Questions"
msgstr "_Ofte stillede spørgsmål"
-#: ../midori/midori-browser.c:5423
-msgid "_Report a Problem..."
-msgstr "_Rapportér en fejl..."
+#: ../midori/midori-browser.c:5784
+msgid "_Report a Problem…"
+msgstr "_Rapportér en fejl…"
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5789 ../midori/midori-browser.c:6450
+msgid "_Tools"
+msgstr "Værk_tøjer"
+
+#: ../midori/midori-browser.c:5796
msgid "_Menubar"
msgstr "_Menubjælke"
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5800
msgid "_Navigationbar"
msgstr "_Navigeringsbjælke"
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5804
msgid "Side_panel"
msgstr "Side_panel"
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:5805
msgid "Sidepanel"
msgstr "Sidepanel"
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5808
msgid "_Bookmarkbar"
msgstr "_Bogmærkebjælke"
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5812
msgid "_Statusbar"
msgstr "_Statusbjælke"
-#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312
+#: ../midori/midori-browser.c:5821 ../midori/midori-websettings.c:314
msgid "_Automatic"
msgstr "_Automatisk"
-#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236
+#: ../midori/midori-browser.c:5824 ../midori/midori-websettings.c:238
msgid "Chinese Traditional (BIG5)"
msgstr "Traditionel kinesisk (BIG5)"
-#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237
+#: ../midori/midori-browser.c:5827 ../midori/midori-websettings.c:239
msgid "Chinese Simplified (GB18030)"
msgstr "Simpelt kinesisk (GB18030)"
#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5470
+#: ../midori/midori-browser.c:5831
msgid "Japanese (SHIFT__JIS)"
msgstr "Japansk (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5834 ../midori/midori-websettings.c:241
msgid "Korean (EUC-KR)"
msgstr "Koreansk (EUC-KR)"
-#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5837 ../midori/midori-websettings.c:242
msgid "Russian (KOI8-R)"
msgstr "Russisk (KOI8-R)"
-#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5840 ../midori/midori-websettings.c:243
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242
+#: ../midori/midori-browser.c:5843 ../midori/midori-websettings.c:244
msgid "Western (ISO-8859-1)"
msgstr "Vestlig (ISO-8859-1)"
-#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243
-#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Tilpasset..."
+#: ../midori/midori-browser.c:5846
+msgid "Custom…"
+msgstr "Tilpasset…"
-#: ../midori/midori-browser.c:5991
+#: ../midori/midori-browser.c:6356
msgid "_Separator"
msgstr "_Separator"
-#: ../midori/midori-browser.c:5998
-msgid "_Location..."
-msgstr "_Sted..."
+#: ../midori/midori-browser.c:6363
+msgid "_Location…"
+msgstr "_Sted…"
-#: ../midori/midori-browser.c:6000
+#: ../midori/midori-browser.c:6365
msgid "Open a particular location"
msgstr "Åbn et særligt sted"
-#: ../midori/midori-browser.c:6022
-msgid "_Web Search..."
-msgstr "_Websøgning..."
+#: ../midori/midori-browser.c:6387
+msgid "_Web Search…"
+msgstr "_Websøgning…"
-#: ../midori/midori-browser.c:6024
+#: ../midori/midori-browser.c:6389
msgid "Run a web search"
msgstr "Kør en websøgnig"
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:6416
msgid "Reopen a previously closed tab or window"
msgstr "Genåbn et tidligere lukket faneblad eller vindue"
-#: ../midori/midori-browser.c:6068
+#: ../midori/midori-browser.c:6433
msgid "Show the saved bookmarks"
msgstr "Vis de gemte bogmærker"
-#: ../midori/midori-browser.c:6085
-msgid "_Tools"
-msgstr "Værk_tøjer"
-
-#: ../midori/midori-browser.c:6101
+#: ../midori/midori-browser.c:6466
msgid "_Window"
msgstr "Vin_due"
-#: ../midori/midori-browser.c:6103
+#: ../midori/midori-browser.c:6468
msgid "Show a list of all open tabs"
msgstr "Vis en liste med alle åbne faneblade"
-#: ../midori/midori-browser.c:6117
+#: ../midori/midori-browser.c:6482
msgid "_Menu"
msgstr "_Menu"
-#: ../midori/midori-browser.c:6119
+#: ../midori/midori-browser.c:6484
msgid "Menu"
msgstr "Menu"
-#: ../midori/midori-browser.c:6933
+#: ../midori/midori-browser.c:7309
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Uventet indstilling '%s'"
@@ -1044,7 +1065,7 @@ msgstr "Indstillingen af udvidelsesmodulet '%s' kunne ikke indlæses: %s\n"
#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../extensions/addons.c:1688
#, 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"
@@ -1054,547 +1075,604 @@ msgstr "Indstillingen af udvidelsesmodulet '%s' kunne ikke gemmes: %s\n"
msgid "Search with %s"
msgstr "Søg med %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Søg med..."
+#: ../midori/midori-locationaction.c:414
+msgid "Search with…"
+msgstr "Søg med…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:541
#, c-format
msgid "Failed to select from history\n"
msgstr "Kunne ikke vælge fra historik\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:628
#, c-format
msgid "Search for %s"
msgstr "Søg efter %s"
+#: ../midori/midori-locationaction.c:1195
+msgid "Export certificate"
+msgstr "Eksportér certifikat"
+
+#: ../midori/midori-locationaction.c:1227
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1229
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1231
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1233
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1235
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1237
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1239
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1286
+msgid "_Export certificate"
+msgstr "_Eksportér certifikat"
+
+#: ../midori/midori-locationaction.c:1301
+msgid "Self-signed"
+msgstr "Selv-signeret"
+
+#: ../midori/midori-locationaction.c:1335
+msgid "Security details"
+msgstr "Sikkerhedsdetaljer"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1618
msgid "Paste and p_roceed"
msgstr "Indsæt og f_ortsæt"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1942
msgid "Not verified"
msgstr "Ikke bekræftet"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1950
msgid "Verified and encrypted connection"
msgstr "Bekræftet og kodet forbindelse"
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1957
msgid "Open, unencrypted connection"
msgstr "Åben og ukrypteret forbindelse"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Opstil sidepanel til højre"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Luk panel"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Opstil sidepanel til venstre"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:220
msgid "Show Speed Dial"
msgstr "Vis hurtigopkald"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:221
msgid "Show Homepage"
msgstr "Vis hjemmeside"
-#: ../midori/midori-websettings.c:238
+#: ../midori/midori-websettings.c:240
msgid "Japanese (SHIFT_JIS)"
msgstr "Japansk (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Tilpasset…"
+
+#: ../midori/midori-websettings.c:260
msgid "New tab"
msgstr "Nyt faneblad"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:261
msgid "New window"
msgstr "Nyt vindue"
-#: ../midori/midori-websettings.c:260
+#: ../midori/midori-websettings.c:262
msgid "Current tab"
msgstr "Nuværende faneblad"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:277
msgid "Default"
msgstr "Standard"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:278
msgid "Icons"
msgstr "Ikoner"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:279
msgid "Small icons"
msgstr "Små ikoner"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:280
msgid "Text"
msgstr "Tekst"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:281
msgid "Icons and text"
msgstr "Ikoner og tekst"
-#: ../midori/midori-websettings.c:280
+#: ../midori/midori-websettings.c:282
msgid "Text beside icons"
msgstr "Tekst ved siden af ikoner"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:297
msgid "Automatic (GNOME or environment)"
msgstr "Automatisk (GNOME eller miljø)"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:298
msgid "HTTP proxy server"
msgstr "HTTP-proxyserver"
-#: ../midori/midori-websettings.c:297
+#: ../midori/midori-websettings.c:299
msgid "No proxy server"
msgstr "Ingen proxyserver"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:316
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:317
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:318
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:319
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:317
+#: ../midori/midori-websettings.c:320
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:404
msgid "Remember last window size"
msgstr "Husk sidste vinduesstørrelse"
-#: ../midori/midori-websettings.c:402
+#: ../midori/midori-websettings.c:405
msgid "Whether to save the last window size"
msgstr "Skal sidste vinduesstørrelse gemmes"
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:413
msgid "Last window width"
msgstr "Sidste vinduesbredde"
-#: ../midori/midori-websettings.c:411
+#: ../midori/midori-websettings.c:414
msgid "The last saved window width"
msgstr "Sidste gemte vinduesbredde"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:422
msgid "Last window height"
msgstr "Sidste vindueshøjde"
-#: ../midori/midori-websettings.c:420
+#: ../midori/midori-websettings.c:423
msgid "The last saved window height"
msgstr "Sidste gemte vindueshøjde"
-#: ../midori/midori-websettings.c:445
+#: ../midori/midori-websettings.c:448
msgid "Last panel position"
msgstr "Sidste panelplacering"
-#: ../midori/midori-websettings.c:446
+#: ../midori/midori-websettings.c:449
msgid "The last saved panel position"
msgstr "Sidste gemte panelplacering"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:455
+#: ../midori/midori-websettings.c:458
msgid "Last panel page"
msgstr "Sidste panelside"
-#: ../midori/midori-websettings.c:456
+#: ../midori/midori-websettings.c:459
msgid "The last saved panel page"
msgstr "Sidste gemte panelside"
-#: ../midori/midori-websettings.c:464
+#: ../midori/midori-websettings.c:467
msgid "Last Web search"
msgstr "Sidste websøgning"
-#: ../midori/midori-websettings.c:465
+#: ../midori/midori-websettings.c:468
msgid "The last saved Web search"
msgstr "Den sidste gemte websøgning"
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:492
msgid "Show Menubar"
msgstr "Vis menubjælke"
-#: ../midori/midori-websettings.c:475
+#: ../midori/midori-websettings.c:493
msgid "Whether to show the menubar"
msgstr "Om menubjælke vises"
-#: ../midori/midori-websettings.c:483
+#: ../midori/midori-websettings.c:501
msgid "Show Navigationbar"
msgstr "Vis navigeringsbjælke"
-#: ../midori/midori-websettings.c:484
+#: ../midori/midori-websettings.c:502
msgid "Whether to show the navigationbar"
msgstr "Om navigeringsbjælke vises"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:510
msgid "Show Bookmarkbar"
msgstr "Vis bogmærkebjælke"
-#: ../midori/midori-websettings.c:493
+#: ../midori/midori-websettings.c:511
msgid "Whether to show the bookmarkbar"
msgstr "Om bogmærkebjælke vises"
-#: ../midori/midori-websettings.c:501
+#: ../midori/midori-websettings.c:519
msgid "Show Panel"
msgstr "Vis panel"
-#: ../midori/midori-websettings.c:502
+#: ../midori/midori-websettings.c:520
msgid "Whether to show the panel"
msgstr "Om panel vises"
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:528
msgid "Show Statusbar"
msgstr "Vis statusbjælke"
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:529
msgid "Whether to show the statusbar"
msgstr "Om statusbjælke vises"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:538
msgid "Toolbar Style:"
msgstr "Værktøjsbjælkestil:"
-#: ../midori/midori-websettings.c:521
+#: ../midori/midori-websettings.c:539
msgid "The style of the toolbar"
msgstr "Stilen for værktøjsbjælke"
-#: ../midori/midori-websettings.c:530
+#: ../midori/midori-websettings.c:548
msgid "Toolbar Items"
msgstr "Værktøjsbjælkes elementer"
-#: ../midori/midori-websettings.c:531
+#: ../midori/midori-websettings.c:549
msgid "The items to show on the toolbar"
msgstr "Elementer der vises på værktøjsbjælken"
-#: ../midori/midori-websettings.c:539
+#: ../midori/midori-websettings.c:557
msgid "Compact Sidepanel"
msgstr "Kompakt sidepanel"
-#: ../midori/midori-websettings.c:540
+#: ../midori/midori-websettings.c:558
msgid "Whether to make the sidepanel compact"
msgstr "Om sidepanelet skal være kompakt"
-#: ../midori/midori-websettings.c:555
+#: ../midori/midori-websettings.c:573
msgid "Align sidepanel on the right"
msgstr "Opstil sidepanel til højre"
-#: ../midori/midori-websettings.c:556
+#: ../midori/midori-websettings.c:574
msgid "Whether to align the sidepanel on the right"
msgstr "Om sidepanelet skal være opstilles til højre"
-#: ../midori/midori-websettings.c:571
+#: ../midori/midori-websettings.c:589
msgid "Open panels in separate windows"
msgstr "Åbn paneler i separate vinduer"
-#: ../midori/midori-websettings.c:572
+#: ../midori/midori-websettings.c:590
msgid "Whether to always open panels in separate windows"
msgstr "Om paneler altid skal åbnes i separate vinduer"
-#: ../midori/midori-websettings.c:581
+#: ../midori/midori-websettings.c:599
msgid "When Midori starts:"
msgstr "Når Midori starter:"
-#: ../midori/midori-websettings.c:582
+#: ../midori/midori-websettings.c:600
msgid "What to do when Midori starts"
msgstr "Hvad der skal ske når Midori startes"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:609
msgid "Homepage:"
msgstr "Hjemmeside:"
-#: ../midori/midori-websettings.c:592
+#: ../midori/midori-websettings.c:610
msgid "The homepage"
msgstr "Hjemmesiden"
-#: ../midori/midori-websettings.c:607
+#: ../midori/midori-websettings.c:625
msgid "Show crash dialog"
msgstr "Vis nedbrudsdialog"
-#: ../midori/midori-websettings.c:608
+#: ../midori/midori-websettings.c:626
msgid "Show a dialog after Midori crashed"
msgstr "Vis en dialog efter nedbrud af Midori"
-#: ../midori/midori-websettings.c:616
+#: ../midori/midori-websettings.c:634
msgid "Save downloaded files to:"
msgstr "Gem hentede filer til:"
-#: ../midori/midori-websettings.c:617
+#: ../midori/midori-websettings.c:635
msgid "The folder downloaded files are saved to"
msgstr "Mappen hvor nedhentede filer skal gemmes"
-#: ../midori/midori-websettings.c:625
+#: ../midori/midori-websettings.c:643
msgid "Text Editor"
msgstr "Tekstbehandler"
-#: ../midori/midori-websettings.c:626
+#: ../midori/midori-websettings.c:644
msgid "An external text editor"
msgstr "En ekstern tekstbehandler"
-#: ../midori/midori-websettings.c:641
+#: ../midori/midori-websettings.c:659
msgid "News Aggregator"
msgstr "Nyhedssamler"
-#: ../midori/midori-websettings.c:642
+#: ../midori/midori-websettings.c:660
msgid "An external news aggregator"
msgstr "En ekstern nyhedssamler"
-#: ../midori/midori-websettings.c:650
+#: ../midori/midori-websettings.c:668
msgid "Location entry Search"
msgstr "Søg for stedindgang"
-#: ../midori/midori-websettings.c:651
+#: ../midori/midori-websettings.c:669
msgid "The search to perform inside the location entry"
msgstr "Søgningen som skal foretages i placeringsindgang"
-#: ../midori/midori-websettings.c:659
+#: ../midori/midori-websettings.c:677
msgid "Preferred Encoding"
msgstr "Foretrukne tegnsæt"
-#: ../midori/midori-websettings.c:660
+#: ../midori/midori-websettings.c:678
msgid "The preferred character encoding"
msgstr "Foretrukne tegnsæt"
-#: ../midori/midori-websettings.c:670
+#: ../midori/midori-websettings.c:688
msgid "Always Show Tabbar"
msgstr "Vis altid fanebladsbjælke"
-#: ../midori/midori-websettings.c:671
+#: ../midori/midori-websettings.c:689
msgid "Always show the tabbar"
msgstr "Vis altid fanebladsbjælken"
-#: ../midori/midori-websettings.c:684
+#: ../midori/midori-websettings.c:702
msgid "Close Buttons on Tabs"
msgstr "Lukkeknapper på faneblade"
-#: ../midori/midori-websettings.c:685
+#: ../midori/midori-websettings.c:703
msgid "Whether tabs have close buttons"
msgstr "Om faneblade har lukkeknapper"
-#: ../midori/midori-websettings.c:710
+#: ../midori/midori-websettings.c:728
msgid "Open new pages in:"
msgstr "Åbn nye sider i:"
-#: ../midori/midori-websettings.c:711
+#: ../midori/midori-websettings.c:729
msgid "Where to open new pages"
msgstr "Hvor skal nye sider åbnes"
-#: ../midori/midori-websettings.c:720
+#: ../midori/midori-websettings.c:738
msgid "Middle click opens Selection"
msgstr "Midterklik åbner for markering"
-#: ../midori/midori-websettings.c:721
+#: ../midori/midori-websettings.c:739
msgid "Load an address from the selection via middle click"
msgstr "Indlæs en adresse fra markeringen med midterklik"
-#: ../midori/midori-websettings.c:729
+#: ../midori/midori-websettings.c:747
msgid "Open tabs in the background"
msgstr "Åbn faneblade i baggrunden"
-#: ../midori/midori-websettings.c:730
+#: ../midori/midori-websettings.c:748
msgid "Whether to open new tabs in the background"
msgstr "Om nye faneblade skal åbnes i baggrunden"
-#: ../midori/midori-websettings.c:738
+#: ../midori/midori-websettings.c:756
msgid "Open Tabs next to Current"
msgstr "Åbn faneblad ved siden af nuværende"
-#: ../midori/midori-websettings.c:739
+#: ../midori/midori-websettings.c:757
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:747
+#: ../midori/midori-websettings.c:765
msgid "Open popups in tabs"
msgstr "Åbn pop op i faneblade"
-#: ../midori/midori-websettings.c:748
+#: ../midori/midori-websettings.c:766
msgid "Whether to open popup windows in tabs"
msgstr "Om pop op-vinduer skal åbnes i faneblade"
-#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134
+#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155
msgid "Load images automatically"
msgstr "Indlæs billeder automatisk"
-#: ../midori/midori-websettings.c:759
+#: ../midori/midori-websettings.c:777
msgid "Load and display images automatically"
msgstr "Indlæs og vis billeder automatisk"
-#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143
+#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165
msgid "Enable scripts"
msgstr "Brug skripter"
-#: ../midori/midori-websettings.c:767
+#: ../midori/midori-websettings.c:785
msgid "Enable embedded scripting languages"
msgstr "Slå indlejret skriptsprog til"
-#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154
+#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177
msgid "Enable Netscape plugins"
msgstr "Slå Netscape-udvidelsesmoduler til"
-#: ../midori/midori-websettings.c:775
+#: ../midori/midori-websettings.c:793
msgid "Enable embedded Netscape plugin objects"
msgstr "Slå indlejrede Netscape-udvidelsesobjekter til"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:808
msgid "Enable Spell Checking"
msgstr "Slå stavekontrol til"
-#: ../midori/midori-websettings.c:791
+#: ../midori/midori-websettings.c:809
msgid "Enable spell checking while typing"
msgstr "Slå stavekontrol til mens du taster"
-#: ../midori/midori-websettings.c:797
+#: ../midori/midori-websettings.c:815
msgid "Enable HTML5 database support"
msgstr "Slå HTML5 databaseunderstøttelse til"
-#: ../midori/midori-websettings.c:798
+#: ../midori/midori-websettings.c:816
msgid "Whether to enable HTML5 database support"
msgstr "Om understøttelse af database til HTML5 skal slås til"
-#: ../midori/midori-websettings.c:804
+#: ../midori/midori-websettings.c:822
msgid "Enable HTML5 local storage support"
msgstr "Slå understøttelse af lokal lagring af HTML5 til"
-#: ../midori/midori-websettings.c:805
+#: ../midori/midori-websettings.c:823
msgid "Whether to enable HTML5 local storage support"
msgstr "Om understøttelse af lokal lagring af HTML5 skal slås til"
-#: ../midori/midori-websettings.c:811
+#: ../midori/midori-websettings.c:829
msgid "Enable offline web application cache"
msgstr "Slå ikke forbundet webprograms mellemlager til"
-#: ../midori/midori-websettings.c:812
+#: ../midori/midori-websettings.c:830
msgid "Whether to enable offline web application cache"
msgstr "Om ikke forbundet webprograms mellemlager skal slås til"
-#: ../midori/midori-websettings.c:828
+#: ../midori/midori-websettings.c:851
msgid "Flash window on background tabs"
msgstr "Lad vindue på baggrundsfaneblade blinke"
-#: ../midori/midori-websettings.c:829
+#: ../midori/midori-websettings.c:852
msgid "Flash the browser window if a new tab was opened in the background"
msgstr "Lad browservinduet blinke hvis et nyt faneblad blev åbnet i baggrunden"
-#: ../midori/midori-websettings.c:837
+#: ../midori/midori-websettings.c:860
msgid "Enable WebGL support"
msgstr "Slå WebGL databaseunderstøttelse til"
-#: ../midori/midori-websettings.c:838
+#: ../midori/midori-websettings.c:861
msgid "Allow websites to use OpenGL rendering"
msgstr "Tillad netsider at bruge OpenGL-rendering"
-#: ../midori/midori-websettings.c:864
+#: ../midori/midori-websettings.c:887
msgid "Zoom Text and Images"
msgstr "Zoom tekst og billeder"
-#: ../midori/midori-websettings.c:865
+#: ../midori/midori-websettings.c:888
msgid "Whether to zoom text and images"
msgstr "Om zoom af tekst og billeder"
-#: ../midori/midori-websettings.c:880
+#: ../midori/midori-websettings.c:903
msgid "Find inline while typing"
msgstr "Find indlejret mens du taster"
-#: ../midori/midori-websettings.c:881
+#: ../midori/midori-websettings.c:904
msgid "Whether to automatically find inline while typing"
msgstr "Om indlejret skal findes automatisk, mens du taster"
-#: ../midori/midori-websettings.c:896
+#: ../midori/midori-websettings.c:919
msgid "Kinetic scrolling"
msgstr "Bevægelsesrulning"
-#: ../midori/midori-websettings.c:897
+#: ../midori/midori-websettings.c:920
msgid "Whether scrolling should kinetically move according to speed"
msgstr "Om rulning skal ske med bevægelseshastighed eller ej"
-#: ../midori/midori-websettings.c:905
+#: ../midori/midori-websettings.c:928
msgid "Delete old Cookies after:"
msgstr "Slet gamle cookies efter:"
-#: ../midori/midori-websettings.c:906
+#: ../midori/midori-websettings.c:929
msgid "The maximum number of days to save cookies for"
msgstr "Maksimal antal dage cookies skal gemmes"
-#: ../midori/midori-websettings.c:922
+#: ../midori/midori-websettings.c:945
msgid "Only accept Cookies from sites you visit"
msgstr "Tillad kun cookies fra sider du besøger"
-#: ../midori/midori-websettings.c:923
+#: ../midori/midori-websettings.c:946
msgid "Block cookies sent by third-party websites"
msgstr "Blokér cookies send fra trejdepartsider"
-#: ../midori/midori-websettings.c:937
+#: ../midori/midori-websettings.c:960
msgid "Delete pages from history after:"
msgstr "Slet sider fra historik efter:"
-#: ../midori/midori-websettings.c:938
+#: ../midori/midori-websettings.c:961
msgid "The maximum number of days to save the history for"
msgstr "Maksimale antal dage som historik skal gemmes"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:976
msgid "Proxy server"
msgstr "Proxyserver"
-#: ../midori/midori-websettings.c:954
+#: ../midori/midori-websettings.c:977
msgid "The type of proxy server to use"
msgstr "Proxyservertypen som skal bruges"
-#: ../midori/midori-websettings.c:963
+#: ../midori/midori-websettings.c:986
msgid "HTTP Proxy Server"
msgstr "HTTP-proxyserver"
-#: ../midori/midori-websettings.c:964
+#: ../midori/midori-websettings.c:987
msgid "The proxy server used for HTTP connections"
msgstr "Proxyserveren som bruges til HTTP-forbindelser"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:1002
msgid "Port"
msgstr "Port"
-#: ../midori/midori-websettings.c:980
+#: ../midori/midori-websettings.c:1003
msgid "The proxy server port used for HTTP connections"
msgstr "Porten på proxyserveren som bruges til HTTP-forbindelser"
-#: ../midori/midori-websettings.c:998
+#: ../midori/midori-websettings.c:1021
msgid "The maximum size of cached pages on disk"
msgstr "Den maksimale størrelse af cache-sider på disken"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1038
msgid "Identify as"
msgstr "Identificér som"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:1039
msgid "What to identify as to web pages"
msgstr "Hvad skal genkendes som web-sider"
-#: ../midori/midori-websettings.c:1032
+#: ../midori/midori-websettings.c:1055
msgid "Identification string"
msgstr "Identifikationsstreng"
-#: ../midori/midori-websettings.c:1033
+#: ../midori/midori-websettings.c:1056
msgid "The application identification string"
msgstr "Programmets identifikationsstreng"
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:1072
msgid "Preferred languages"
msgstr "Foretrukne sprog"
-#: ../midori/midori-websettings.c:1050
+#: ../midori/midori-websettings.c:1073
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1602,438 +1680,461 @@ 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:1065
+#: ../midori/midori-websettings.c:1088
msgid "Clear private data"
msgstr "Ryd private data"
-#: ../midori/midori-websettings.c:1066
+#: ../midori/midori-websettings.c:1089
msgid "The private data selected for deletion"
msgstr "De private data valgt til sletning"
-#: ../midori/midori-websettings.c:1081
+#: ../midori/midori-websettings.c:1104
msgid "Clear data"
msgstr "Ryd data"
-#: ../midori/midori-websettings.c:1082
+#: ../midori/midori-websettings.c:1105
msgid "The data selected for deletion"
msgstr "Data valgt til sletning"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1131
+#: ../midori/midori-websettings.c:1154
msgid "Strip referrer details sent to websites"
msgstr "Fjern referrer-oplysninger sendt til netsider"
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1133
+#: ../midori/midori-websettings.c:1156
msgid "Whether the \"Referer\" header should be shortened to the hostname"
msgstr "Hvorvidt \"Referer\"-headeren skal beskæres til værtsnavnet"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:1170
msgid "Always use my font choices"
msgstr "Brug altid mit valg af fonte"
-#: ../midori/midori-websettings.c:1148
+#: ../midori/midori-websettings.c:1171
msgid "Override fonts picked by websites with user preferences"
msgstr "Brug mine fonte fremfor fonte fra internetsider"
-#: ../midori/midori-view.c:1363
+#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140
+msgid "Trust this website"
+msgstr "Betro denne webside"
+
+#: ../midori/midori-view.c:1138
+msgid "Security unknown"
+msgstr "Sikkerhed ukendt"
+
+#: ../midori/midori-view.c:1436
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s ønsker at gemme en HTML5-database."
-#: ../midori/midori-view.c:1367 ../midori/midori-view.c:1399
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Deny"
msgstr "_Afvis"
-#: ../midori/midori-view.c:1367 ../midori/midori-view.c:1399
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Allow"
msgstr "_Tillad"
-#: ../midori/midori-view.c:1395
+#: ../midori/midori-view.c:1469
#, c-format
msgid "%s wants to know your location."
msgstr "%s ønsker at kende dit sted."
-#: ../midori/midori-view.c:1488
+#: ../midori/midori-view.c:1565
#, c-format
msgid "Error - %s"
msgstr "Fejl - %s"
-#: ../midori/midori-view.c:1489
+#: ../midori/midori-view.c:1566
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Siden '%s' kunne ikke indlæses."
-#: ../midori/midori-view.c:1491
+#: ../midori/midori-view.c:1568
msgid "Try again"
msgstr "Prøv igen"
-#: ../midori/midori-view.c:1689 ../midori/midori-view.c:2602
+#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875
#, c-format
msgid "Send a message to %s"
msgstr "Send en besked til %s"
-#: ../midori/midori-view.c:2432 ../midori/midori-view.c:2752
+#: ../midori/midori-view.c:2661
+msgid "Add _search engine..."
+msgstr "Tilføj _søgemaskine..."
+
+#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031
msgid "Inspect _Element"
msgstr "Undersøg _element"
-#: ../midori/midori-view.c:2484
+#: ../midori/midori-view.c:2757
msgid "Open Link in New _Tab"
msgstr "Åbn henvisning i nyt _faneblad"
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2761
msgid "Open Link in _Foreground Tab"
msgstr "Åbn henvisning i _fanebladet i forgrunden"
-#: ../midori/midori-view.c:2489
+#: ../midori/midori-view.c:2762
msgid "Open Link in _Background Tab"
msgstr "Åbn henvisning i _faneblad i baggrunden"
-#: ../midori/midori-view.c:2492
+#: ../midori/midori-view.c:2765
msgid "Open Link in New _Window"
msgstr "Åbn henvisning i nyt _vindue"
-#: ../midori/midori-view.c:2495
+#: ../midori/midori-view.c:2768
msgid "Open Link as Web A_pplication"
msgstr "Åbn henvisning som et _webprogram"
-#: ../midori/midori-view.c:2500
+#: ../midori/midori-view.c:2773
msgid "Copy Link de_stination"
msgstr "Kopiér _henvisningsdestination"
-#: ../midori/midori-view.c:2516
+#: ../midori/midori-view.c:2789
msgid "Open _Image in New Tab"
msgstr "Åbn _billede i nyt faneblad"
-#: ../midori/midori-view.c:2519
+#: ../midori/midori-view.c:2792
msgid "Copy Image _Address"
msgstr "Kopiér billed_adresse"
-#: ../midori/midori-view.c:2522
+#: ../midori/midori-view.c:2795
msgid "Save I_mage"
msgstr "Gem _billede"
-#: ../midori/midori-view.c:2525
+#: ../midori/midori-view.c:2798
msgid "Open in Image _Viewer"
msgstr "Åbn i Image_Viewer"
-#: ../midori/midori-view.c:2532
+#: ../midori/midori-view.c:2805
msgid "Copy Video _Address"
msgstr "Kopiér vide_oadresse"
-#: ../midori/midori-view.c:2535
+#: ../midori/midori-view.c:2808
msgid "Save _Video"
msgstr "Gem _video"
-#: ../midori/midori-view.c:2535
+#: ../midori/midori-view.c:2808
msgid "Download _Video"
msgstr "Hent _video"
-#: ../midori/midori-view.c:2561
+#: ../midori/midori-view.c:2834
msgid "Search _with"
msgstr "Søg _med"
-#: ../midori/midori-view.c:2593
+#: ../midori/midori-view.c:2866
msgid "_Search the Web"
msgstr "_Søg internettet"
-#: ../midori/midori-view.c:2610
+#: ../midori/midori-view.c:2883
msgid "Open Address in New _Tab"
msgstr "Åbn adresse i nyt _faneblad"
-#: ../midori/midori-view.c:2917
+#: ../midori/midori-view.c:2936
+msgid "Open _Frame in New Tab"
+msgstr "Åbn _ramme i nyt faneblad"
+
+#: ../midori/midori-view.c:3190
msgid "Open or download file"
msgstr "Åbn eller hent fil"
-#: ../midori/midori-view.c:2937
-#, c-format
-msgid "File Type: '%s'"
-msgstr "Filtype: '%s'"
-
-#: ../midori/midori-view.c:2939
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Filtype: %s ('%s')"
-
-#: ../midori/midori-view.c:2943
+#: ../midori/midori-view.c:3214
#, c-format
msgid "File Name: %s"
msgstr "Filnavn: %s"
-#: ../midori/midori-view.c:2963
+#: ../midori/midori-view.c:3219
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Filtype: '%s'"
+
+#: ../midori/midori-view.c:3221
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Filtype: %s ('%s')"
+
+#: ../midori/midori-view.c:3256
+#, c-format
+msgid "Size: %s"
+msgstr "Størrelse: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3267
#, c-format
msgid "Open %s"
msgstr "Åbn %s"
-#: ../midori/midori-view.c:3584
+#: ../midori/midori-view.c:3886
#, c-format
msgid "Inspect page - %s"
msgstr "Undersøg side - %s"
-#: ../midori/midori-view.c:3931
+#: ../midori/midori-view.c:4241
msgid "Speed Dial"
msgstr "Hurtigopkald"
-#: ../midori/midori-view.c:3932 ../midori/midori-view.c:4028
+#: ../midori/midori-view.c:4242 ../midori/midori-view.c:4348
msgid "Click to add a shortcut"
msgstr "Klik for at tilføje en genvej"
-#: ../midori/midori-view.c:3933
+#: ../midori/midori-view.c:4243
msgid "Enter shortcut address"
msgstr "Tast genvejsadresse"
-#: ../midori/midori-view.c:3934
+#: ../midori/midori-view.c:4244
msgid "Enter shortcut title"
msgstr "Tast en genvejstitel"
-#: ../midori/midori-view.c:3935
+#: ../midori/midori-view.c:4245
msgid "Are you sure you want to delete this shortcut?"
msgstr "Er du sikker på, at du ønsker at fjerne denne genvej?"
-#: ../midori/midori-view.c:4097
+#: ../midori/midori-view.c:4418
#, c-format
msgid "No documentation installed"
msgstr "Ingen dokumentation installeret"
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:4495
msgid "Midori doesn't store any personal data:"
msgstr "Midori gemmer ikke nogen personlige data:"
-#: ../midori/midori-view.c:4174
+#: ../midori/midori-view.c:4496
msgid "No history or web cookies are being saved."
msgstr "Ingen historik eller internet-cookies bliver gemt."
-#: ../midori/midori-view.c:4175
+#: ../midori/midori-view.c:4497
msgid "Extensions are disabled."
msgstr "Udvidelser er slået fra."
-#: ../midori/midori-view.c:4176
+#: ../midori/midori-view.c:4498
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
"HTML5 opbevaring, lokale databaser og programmellemlagringer er slået fra."
-#: ../midori/midori-view.c:4177
+#: ../midori/midori-view.c:4499
msgid "Midori prevents websites from tracking the user:"
msgstr "Midori beskytter mod netsiders sporing' af brugere:"
-#: ../midori/midori-view.c:4178
+#: ../midori/midori-view.c:4500
msgid "Referrer URLs are stripped down to the hostname."
msgstr "Referende URL-er er forkortet til værtsnavnet."
-#: ../midori/midori-view.c:4179
+#: ../midori/midori-view.c:4501
msgid "DNS prefetching is disabled."
msgstr "Hent på forhånd DNS er slået fra."
-#: ../midori/midori-view.c:4180
+#: ../midori/midori-view.c:4502
msgid "The language and timezone are not revealed to websites."
msgstr "Sprogindstillingen og tidzone bliver ikke oplyst til internetsider."
-#: ../midori/midori-view.c:4181
+#: ../midori/midori-view.c:4503
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr ""
"Flash og andre Netscape udvidelsesmoduler kan ikke blive oplistet af "
"internetsider."
-#: ../midori/midori-view.c:4230
+#: ../midori/midori-view.c:4592
msgid "Version numbers in brackets show the version used at runtime."
msgstr "Versionsnumre i parenteser viser versionen brugt under kørsel."
-#: ../midori/midori-view.c:4286
+#: ../midori/midori-view.c:4642
msgid "Page loading delayed"
msgstr "Forsinket sideindlæsning"
-#: ../midori/midori-view.c:4287
+#: ../midori/midori-view.c:4643
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"Indlæsning forsinket pga. et nyligt sammenbrud eller startopindstillinger."
-#: ../midori/midori-view.c:4288
+#: ../midori/midori-view.c:4644
msgid "Load Page"
msgstr "Indlæs side"
-#: ../midori/midori-view.c:4454
+#: ../midori/midori-view.c:4811
msgid "Blank page"
msgstr "Blank side"
-#: ../midori/midori-view.c:4716
+#: ../midori/midori-view.c:5075
msgid "_Duplicate Tab"
msgstr "_Dublér faneblad"
-#: ../midori/midori-view.c:4721
+#: ../midori/midori-view.c:5080
msgid "Show Tab _Label"
msgstr "Vis faneblad_titel"
-#: ../midori/midori-view.c:4721
+#: ../midori/midori-view.c:5080
msgid "Show Tab _Icon Only"
msgstr "Vis kun faneblad_ikon"
-#: ../midori/midori-view.c:4727
-msgid "Close ot_her Tabs"
-msgstr "Luk a_ndre faneblade"
+#: ../midori/midori-view.c:5087
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Luk a_ndet faneblad"
+msgstr[1] "Luk a_ndre faneblade"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5540
+#: ../midori/midori-view.c:5923
msgid "previous"
msgstr "forrige"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5559
+#: ../midori/midori-view.c:5942
msgid "next"
msgstr "næste"
-#: ../midori/midori-view.c:5572
+#: ../midori/midori-view.c:5955
msgid "Print background images"
msgstr "Udskriv baggrundsbilleder"
-#: ../midori/midori-view.c:5573
+#: ../midori/midori-view.c:5956
msgid "Whether background images should be printed"
msgstr "Om baggrundsbilleder skal udskrives"
-#: ../midori/midori-view.c:5605
+#: ../midori/midori-view.c:5988
msgid "Features"
msgstr "Funktionalitet"
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:298
msgid "Startup"
msgstr "Opstart"
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:311
msgid "Use _current page"
msgstr "Anvend _nuværende side"
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:315
msgid "Use current page as homepage"
msgstr "Brug nuværende side som hjemmeside"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:324
msgid "Fonts"
msgstr "Skrifttyper"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:327
msgid "Proportional Font Family"
msgstr "Proportionel skrifttypefamilie"
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:331
msgid "The default font family used to display text"
msgstr "Standard skrifttype til visning af tekst"
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:334
msgid "The default font size used to display text"
msgstr "Størrelse af standardskriftstype er brugt til at vise tekst"
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:336
msgid "Fixed-width Font Family"
msgstr "Fastbredde skrifttype"
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:340
msgid "The font family used to display fixed-width text"
msgstr "Skrifttypen til visning af fastbredde tekst"
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:343
msgid "The font size used to display fixed-width text"
msgstr "Skrifttypen til visning af tekst med fastbredde"
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:345
msgid "Minimum Font Size"
msgstr "Minimal skriftstørrelse"
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:349
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:359
+#: ../midori/midori-preferences.c:360
msgid "Behavior"
msgstr "Opførsel"
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:386
msgid "Allow scripts to open popups"
msgstr "Tillad skripter at åbne pop op."
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:387
msgid "Whether scripts are allowed to open popup windows automatically"
msgstr "Om skripter er tilladt at åbne pop opvinduer automatisk"
#. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:418
msgid "Browsing"
msgstr "Browsing"
#. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:458
msgid "Network"
msgstr "Netværk"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:465
msgid "Hostname"
msgstr "Værtsnavn"
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:489
msgid "MB"
msgstr "MB"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Add search engine"
msgstr "Tilføj søgemaskine"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Edit search engine"
msgstr "Redigér søgemaskine"
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:985
msgid "_Name:"
msgstr "_Navn:"
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1000
msgid "_Description:"
msgstr "_Beskrivelse:"
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Ikon:"
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Adresse:"
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1032
msgid "_Token:"
msgstr "_Symbol:"
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1330
msgid "Manage Search Engines"
msgstr "Håndtér søgemaskiner"
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1432
msgid "Use as _default"
msgstr "Brug som _standard"
-#: ../midori/sokoke.c:354
+#: ../midori/sokoke.c:346
msgid "Open with"
msgstr "Åbn med"
-#: ../midori/sokoke.c:362
+#: ../midori/sokoke.c:354
#, c-format
msgid "Choose an application or command to open \"%s\":"
msgstr "Vælg et program eller en kommando til at åbne \"%s\":"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
+#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
msgid "Could not run external program."
msgstr "Kunne ikke køre eksternt program."
-#: ../midori/sokoke.c:1595
+#: ../midori/sokoke.c:1529
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d time"
msgstr[1] "%d timer"
-#: ../midori/sokoke.c:1596
+#: ../midori/sokoke.c:1530
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minut"
msgstr[1] "%d minutter"
-#: ../midori/sokoke.c:1597
+#: ../midori/sokoke.c:1531
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2041,67 +2142,67 @@ msgstr[0] "%d sekund"
msgstr[1] "%d sekunder"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
+#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269
#, c-format
msgid "%s of %s"
msgstr "%s af %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
+#: ../midori/sokoke.c:1548
msgid "?B"
msgstr "?B"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
+#: ../midori/sokoke.c:1551
#, c-format
msgid " (%s/s)"
msgstr "(%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/sokoke.c:1568
#, c-format
msgid " - %s remaining"
msgstr " - %s tilbage"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:265
msgid "_Inline Find:"
msgstr "_Indlejret søgning:"
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:287
msgid "Previous"
msgstr "Forrige"
-#: ../toolbars/midori-findbar.c:323
+#: ../toolbars/midori-findbar.c:293
msgid "Next"
msgstr "Næste"
-#: ../toolbars/midori-findbar.c:327
+#: ../toolbars/midori-findbar.c:297
msgid "Match Case"
msgstr "Versalfølsom"
-#: ../toolbars/midori-findbar.c:336
+#: ../toolbars/midori-findbar.c:306
msgid "Highlight Matches"
msgstr "Fremhæv fundne"
-#: ../toolbars/midori-findbar.c:347
+#: ../toolbars/midori-findbar.c:317
msgid "Close Findbar"
msgstr "Luk søgebjælke"
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:124
#, c-format
msgid "The file '%s ' has been downloaded."
msgstr "Filen '%s ' er blevet hentet."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:129
msgid "Transfer completed"
msgstr "Overførsel gennemført"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:201
msgid "The downloaded file is erroneous."
msgstr "Den hentede fil indeholder fejl."
-#: ../toolbars/midori-transferbar.c:194
+#: ../toolbars/midori-transferbar.c:202
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2109,47 +2210,53 @@ msgstr ""
"Checksummen opgivet med linket stemmer ikke. Dette betyder, at filen "
"formentligt er ufuldendt eller blev modificeret efterfølgende."
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:345 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Ryd alle"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384
msgid "Some files are being downloaded"
msgstr "Nogle filer bliver overført"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:388
msgid "_Quit Midori"
msgstr "_Afslut Midori"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:390
msgid "The transfers will be cancelled if Midori quits."
msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Bogmærker"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Kunne ikke tilføje historikelementet: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Kunne ikke opdatere bogmærke: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Redigér det valgte bogmærke"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Slet det valgte bogmærke"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Tilføj en ny mappe"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Separator "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Søg i bogmærker"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Historik"
@@ -2194,15 +2301,20 @@ msgstr "Slet det valgte historikelement"
msgid "Clear the entire history"
msgstr "Ryd hele historikken"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Søg i historik"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Overførsler"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
msgstr "Åbn mål_mappen"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
msgstr "Kopiér henvisnings_sted"
@@ -2244,54 +2356,54 @@ msgstr "Lagerikon '%s' kunne ikke indlæses"
msgid "Animation frames are broken"
msgstr "Animeringsrammer er ødelagt"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Egenskab '%s' er ikke gyldig for %s"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
#: ../extensions/addons.c:308
msgid "Choose file"
msgstr "Vælg fil"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Vælg mappe"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Ingen"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 time"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 dag"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 uge"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 måned"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 år"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Indstillinger for %s"
-#: ../extensions/adblock.c:473
+#: ../extensions/adblock.c:470
msgid "Configure Advertisement filters"
msgstr "Indstil reklamefiltre"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:503
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2300,27 +2412,27 @@ msgstr ""
"Indtast adressen til en forudindstillet filterliste i tekstfeltet og tryk "
"\"Tilføj\" for at føje det til listen. Du kan finde flere lister på %s."
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:917
msgid "Edit rule"
msgstr "Redigér regel"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:931
msgid "_Rule:"
msgstr "_Regel:"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:985
msgid "Bl_ock image"
msgstr "Bl_okér billede"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:990
msgid "Bl_ock link"
msgstr "Bl_okér henvisning"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1689
msgid "Advertisement blocker"
msgstr "Blokering af reklamer"
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1690
msgid "Block advertisements according to a filter list"
msgstr "Blokér reklamer i henhold til en filterliste"
@@ -2350,63 +2462,63 @@ msgstr "_Installér brugerstil"
msgid "Don't install"
msgstr "Undlad at installere"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:677
msgid "Userscripts"
msgstr "Brugerskripter"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:679
msgid "Userstyles"
msgstr "Brugerstile"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Fejl"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Er du sikker på du vil slette '%s'?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
msgid "Delete user script"
msgstr "Slet brugerskript"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
msgid "Delete user style"
msgstr "Slet brugerstil"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Filen %s vil blive slettet for bestandigt."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:566 ../extensions/addons.c:643
msgid "Open in Text Editor"
msgstr "Åbn i tekstbehandler"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:568 ../extensions/addons.c:652
msgid "Open Target Folder"
msgstr "Åbn målmappen"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:634
msgid "Add new addon"
msgstr "Tilføj nye moduler"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:660
msgid "Remove selected addon"
msgstr "Fjern valgte modul"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
msgid "User addons"
msgstr "Brugers udvidelsesmoduler"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1819
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Kan ikke overvåge mappe '%s': %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1908
msgid "Support for userscripts and userstyles"
msgstr "Understøttelse af brugerskripter og brugerstile"
@@ -2494,29 +2606,21 @@ msgstr ""
"Domæne : %s\n"
"Cookies : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Navn"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "_Udfold alle"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "_Fold alle"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filter:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Indtast en filterstreng for at vise kun cookies hvis navn eller domænefelt "
-"passer til det indtastede filter"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Søg cookies efter navn eller domæne"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2756,7 +2860,7 @@ msgstr "Tilpas tastaturgenveje"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "Tilpas gen_veje..."
+msgstr "Tilpas gen_veje…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2774,35 +2878,35 @@ msgstr "Statusbjælkens ur"
msgid "Display date and time in the statusbar"
msgstr "Vis dato og tid på statusbjælken"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Billeder"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Skripter"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Netscape-udvidelsesmoduler"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Status funktioner"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "Slå nemt netsiders funktioner til/fra"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Fanebladpanel"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "Faneblad_panel"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Vis faneblade i et lodret panel"
@@ -2814,11 +2918,11 @@ msgstr "Kun ikoner på faneblade som standard"
msgid "New tabs have no label by default"
msgstr "Nye faneblade har ingen titel som standard"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Tilpas værktøjsbjælke"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2826,27 +2930,23 @@ msgstr ""
"Vælg elementer til visning på værktøjsbjælken. Rækkefølge af elementerne kan "
"ændres med træk og slip."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Tilgængelige elementer"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Viste elementer"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Tilpas _værktøjsbjælke..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "_Tilpas værktøjsbjælke…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Tilpasset..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Redigering af værktøjsbjælke"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Redigér nemt layout af værktøjsbjælken"
@@ -2854,6 +2954,40 @@ msgstr "Redigér nemt layout af værktøjsbjælken"
msgid "Cache HTTP communication on disk"
msgstr "Cache HTTP-kommunikation på disk"
+#~ msgid "_Bookmark"
+#~ msgstr "_Bogmærke"
+
+#~ msgid "_Console"
+#~ msgstr "_Konsol"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Øverste mappe"
+
+#~ msgid "_Title:"
+#~ msgstr "_Titel:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Mappe:"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Luk a_ndre faneblade"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Ikon:"
+
+#~ msgid "Filter:"
+#~ msgstr "Filter:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Indtast en filterstreng for at vise kun cookies hvis navn eller "
+#~ "domænefelt passer til det indtastede filter"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Tilpasset…"
+
#~ msgid "The bookmarks couldn't be saved. %s"
#~ msgstr "Bogmærkerne kunne ikke gemmes. %s"
@@ -2956,14 +3090,14 @@ msgstr "Cache HTTP-kommunikation på disk"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Tilføj en ny bogmærkemappe"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Tilføj, redigér og fjern søgemaskiner..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Tilføj, redigér og fjern søgemaskiner…"
-#~ msgid "Clear private data..."
-#~ msgstr "Ryd private data..."
+#~ msgid "Clear private data…"
+#~ msgstr "Ryd private data…"
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne..."
+#~ msgid "Inspect page details and access developer tools…"
+#~ msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Skift til det forrige faneblad"
@@ -3052,8 +3186,8 @@ msgstr "Cache HTTP-kommunikation på disk"
#~ msgid "Reset the last _session"
#~ msgstr "Nulstil den sidste _session"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Indstil _reklamefiltre..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Indstil _reklamefiltre…"
#~ msgid "Not found - %s"
#~ msgstr "Ikke fundet - %s"
@@ -3405,9 +3539,6 @@ msgstr "Cache HTTP-kommunikation på disk"
#~ msgid "Whether text areas are resizable"
#~ msgstr "Om tekstområder kan ændre størrelse"
-#~ msgid "User_styles"
-#~ msgstr "Bruger_grænseflader"
-
#~ msgid "_Quick Find"
#~ msgstr "_Find hurtigt"
@@ -3429,9 +3560,6 @@ msgstr "Cache HTTP-kommunikation på disk"
#~ msgid "Warning: You are using a superuser account!"
#~ msgstr "Advarsel: Du bruger en superbruger-konto!"
-#~ msgid "_Enable"
-#~ msgstr "_Slå til"
-
#~ msgid "Enable"
#~ msgstr "Slå til"
diff --git a/po/de.po b/po/de.po
index 5e0ee64a..097a15f1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,36 +8,50 @@ msgid ""
msgstr ""
"Project-Id-Version: midori 0.3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-25 11:18+0000\n"
+"POT-Creation-Date: 2012-09-08 08:15+0000\n"
"PO-Revision-Date: 2009-04-30 00:15+0100\n"
"Last-Translator: Christian Dywan \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/midori.desktop.in.h:1
-#, fuzzy
msgid "Browse the Web"
-msgstr "Im Internet surfen"
+msgstr "Im Web surfen"
#: ../data/midori.desktop.in.h:2
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorer;Browser"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1926 ../midori/main.c:1950
+#: ../midori/main.c:1964 ../midori/midori-websettings.c:199
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Webbrowser"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Neues Fenster zum privaten Surfen"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1406
+msgid "New Tab"
+msgstr "Neuer Reiter"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1403
+msgid "New Window"
+msgstr "Neues Fenster"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Internetbetrachter"
#: ../data/midori-private.desktop.in.h:1
-#, fuzzy
msgid "Midori Private Browsing"
msgstr "Privates Surfen"
@@ -45,82 +59,87 @@ msgstr "Privates Surfen"
msgid "Open a new private browsing window"
msgstr "Neues Fenster zum privaten Surfen öffnen"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4364
msgid "Private Browsing"
msgstr "Privat surfen"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Die Konfiguration konnte nicht geladen werden: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Wert »%s« ist ungültig für %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Ungültiger Einstellungswert »%s«"
-#: ../midori/main.c:380
+#: ../midori/main.c:365
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:419
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Verlauf konnte nicht geleert werden: %s\n"
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Datenbank konnte nicht geöffnet werden: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:513
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n"
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Die Lesezeichen konnten nicht gespeichert werden. %s"
-
-#: ../midori/main.c:633
+#: ../midori/main.c:535
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Die Konfiguration konnte nicht gespeichert werden. %s"
-#: ../midori/main.c:668
+#: ../midori/main.c:561
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Die Suchmaschinen konnten nicht gespeichert werden. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:598
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Der Papierkorb konnte nicht gespeichert werden. %s"
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
+#: ../midori/main.c:671 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Erweiterungen"
-#: ../midori/main.c:760
+#: ../midori/main.c:685
msgid "Privacy"
msgstr "Privatsphäre"
-#: ../midori/main.c:772
+#: ../midori/main.c:687
+msgid "Delete old Cookies after:"
+msgstr "Alte Cookies löschen nach:"
+
+#: ../midori/main.c:689 ../midori/main.c:692
+msgid "The maximum number of days to save cookies for"
+msgstr "Die maximale Anzahl an Tagen, für die Cookies gespeichert werden"
+
+#: ../midori/main.c:696
+msgid "Only accept Cookies from sites you visit"
+msgstr "Nur Cookies von Seiten annehmen, die ich besuche"
+
+#: ../midori/main.c:697
+msgid "Block cookies sent by third-party websites"
+msgstr "Cookies von Drittanbietern blockieren"
+
+#: ../midori/main.c:702
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -128,19 +147,47 @@ msgstr ""
"Cookies sind Profildateien, die Anmeldedaten, Spielstände oder "
"Benutzerprofile zu Werbezwecken speichern."
-#: ../midori/main.c:828
+#: ../midori/main.c:709
+msgid "Enable offline web application cache"
+msgstr "HTML5-Anwendungsspeicher einschalten"
+
+#: ../midori/main.c:712
+msgid "Enable HTML5 local storage support"
+msgstr "HTML5-Lokalspeicher einschalten"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/main.c:716
+msgid "Strip referrer details sent to websites"
+msgstr "Herkunftsdetails beim Seitenwechsel kürzen"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/main.c:718
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+"Legt fest, ob die »Referer«-Kopfzeile auf den Rechnernamen verkürzt werden "
+"soll"
+
+#: ../midori/main.c:721
+msgid "Delete pages from history after:"
+msgstr "Seiten aus dem Verlauf löschen nach:"
+
+#: ../midori/main.c:723 ../midori/main.c:726
+msgid "The maximum number of days to save the history for"
+msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gespeichert wird"
+
+#: ../midori/main.c:767
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Die Sitzung konnte nicht gespeichert werden. %s"
-#: ../midori/main.c:1046
+#: ../midori/main.c:993
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Es ist kein Stammzertifikat verfügbar. SSL-Zertifikate können nicht "
"überprüft werden."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1088
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."
@@ -148,229 +195,237 @@ 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:1134
+#: ../midori/main.c:1107
msgid "Modify _preferences"
msgstr "_Einstellungen bearbeiten"
-#: ../midori/main.c:1138
+#: ../midori/main.c:1111
msgid "Disable all _extensions"
msgstr "Alle Er_weiterungen ausschalten"
-#: ../midori/main.c:1151
+#: ../midori/main.c:1120
+msgid "Show a dialog after Midori crashed"
+msgstr "Absturzdialog anzeigen, nachdem Midori abgestürzt ist"
+
+#: ../midori/main.c:1125
msgid "Discard old tabs"
msgstr "Alte Reiter verwerfen"
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1126 ../midori/midori-websettings.c:107
msgid "Show last tabs without loading"
-msgstr "Letzte Reiter zeigen ohne sie zu laden"
+msgstr "Letzte Reiter zeigen, ohne sie zu laden"
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1127 ../midori/midori-websettings.c:106
msgid "Show last open tabs"
msgstr "Zuletzt geöffnete Reiter anzeigen"
-#: ../midori/main.c:1400 ../midori/main.c:2464
+#: ../midori/main.c:1374 ../midori/main.c:2378
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Die Sitzung konnte nicht geladen werden: %s\n"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1512
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Schnappschuss gespeichert: %s\n"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1841
msgid "Run ADDRESS as a web application"
msgstr "ADRESSE als Internetanwendung starten"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1841
msgid "ADDRESS"
msgstr "ADRESSE"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1844
msgid "Use FOLDER as configuration folder"
msgstr "ORDNER als Konfigurationsordner benutzen"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1844
msgid "FOLDER"
msgstr "ORDNER"
-#: ../midori/main.c:1957
+#: ../midori/main.c:1847
msgid "Private browsing, no changes are saved"
msgstr "Privat surfen, Änderungen werden nicht gespeichert"
-#: ../midori/main.c:1959
+#: ../midori/main.c:1850
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Portabler Modus, alle Laufzeitdateien werden an einem Ort gespeichert"
+
+#: ../midori/main.c:1853
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Einfaches GTK+-Fenster mit WebKit, verwandt mit GtkLauncher"
+
+#: ../midori/main.c:1855
msgid "Show a diagnostic dialog"
msgstr "Diagnosedialog anzeigen"
-#: ../midori/main.c:1961
+#: ../midori/main.c:1857
msgid "Run the specified filename as javascript"
-msgstr "Angegebenen Dateinamen als Javaskript ausführen"
+msgstr "Angegebenen Dateinamen als Javascript ausführen"
-#: ../midori/main.c:1963
+#: ../midori/main.c:1859
msgid "Take a snapshot of the specified URI"
-msgstr "Schnappschuss der angegebenen URI aufnehmen"
+msgstr "Schnappschuss der angegebenen Adresse aufnehmen"
-#: ../midori/main.c:1965
+#: ../midori/main.c:1861
msgid "Execute the specified command"
msgstr "Den angegebenen Befehl ausführen"
-#: ../midori/main.c:1967
+#: ../midori/main.c:1863
msgid "List available commands to execute with -e/ --execute"
msgstr "Alle Befehle auflisten, die mit -e/ --execute ausgeführt werden können"
-#: ../midori/main.c:1969
+#: ../midori/main.c:1865
msgid "Display program version"
msgstr "Programmversion anzeigen"
-#: ../midori/main.c:1971
+#: ../midori/main.c:1867
msgid "Addresses"
msgstr "Adressen"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1869
msgid "Block URIs according to regular expression PATTERN"
msgstr "URIs anhand des regulären Ausdrucks MUSTER blockieren"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1869
msgid "PATTERN"
msgstr "MUSTER"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:1873
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Midori nach SEKUNDEN Sekunden Untätigkeit zurücksetzen"
-#: ../midori/main.c:1977
+#: ../midori/main.c:1873
msgid "SECONDS"
msgstr "SEKUNDEN"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1876
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Konsolenwarnungen in DATEINAME umleiten"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1876
msgid "FILENAME"
msgstr "Dateiname"
-#: ../midori/main.c:2045
-msgid "[Addresses]"
-msgstr "[Adressen]"
-
-#: ../midori/main.c:2087
+#: ../midori/main.c:1965
msgid "Please report comments, suggestions and bugs to:"
msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:"
-#: ../midori/main.c:2089
+#: ../midori/main.c:1967
msgid "Check for new versions at:"
msgstr "Informieren Sie sich über neue Versionen unter:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
+#: ../midori/main.c:2098
msgid "Saved logins and _passwords"
msgstr "Gespeicherte Anmeldungen und Passwörter"
-#: ../midori/main.c:2175
-#, fuzzy
+#: ../midori/main.c:2100
msgid "Cookies and Website data"
msgstr "Cookies und Webseitendaten"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
+#: ../midori/main.c:2104 ../midori/midori-preferences.c:505
+#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470
msgid "Web Cache"
msgstr "Zwischenspeicher"
-#: ../midori/main.c:2182
+#: ../midori/main.c:2107
msgid "Website icons"
msgstr "Symbole von Internetseiten"
-#: ../midori/main.c:2288
+#: ../midori/main.c:2211
msgid "An unknown error occured"
msgstr "Ein unbekannter Fehler ist aufgetreten."
-#: ../midori/main.c:2395
+#: ../midori/main.c:2326
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:2431
+#: ../midori/main.c:2360
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n"
-#: ../midori/main.c:2479
+#: ../midori/main.c:2393
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Der Papierkorb konnte nicht geladen werden: %s\n"
-#: ../midori/main.c:2492
+#: ../midori/main.c:2406
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Der Verlauf konnte nicht geladen werden: %s\n"
-#: ../midori/main.c:2508
+#: ../midori/main.c:2421
msgid "The following errors occured:"
msgstr "Folgende Fehler sind aufgetreten:"
-#: ../midori/main.c:2524
+#: ../midori/main.c:2437
msgid "_Ignore"
msgstr "_Ignorieren"
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "_Lesezeichen"
+#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:533
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Unerwartete Aktion »%s«."
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060
+#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6368
msgid "_Bookmarks"
msgstr "_Lesezeichen"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1373
msgid "Add Boo_kmark"
msgstr "Lesezeichen _hinzufügen"
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_Konsole"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1374
msgid "_Extensions"
msgstr "_Erweiterungen"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589
+#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4821
msgid "_History"
msgstr "_Verlauf"
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "_Startseite"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1376
msgid "_Userscripts"
msgstr "_Benutzerskripte"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1377
+msgid "User_styles"
+msgstr "Benutzer_stile"
+
+#: ../midori/midori-app.c:1378
msgid "New _Tab"
msgstr "Neuer _Reiter"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1379
msgid "_Transfers"
msgstr "Über_tragungen"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1380
msgid "Netscape p_lugins"
-msgstr "Netscape-Module"
+msgstr "Netscape-Modu_le"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1381
msgid "_Closed Tabs"
msgstr "Ges_chlossene Reiter"
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216
+#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5504
msgid "New _Window"
msgstr "Neues _Fenster"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1383
msgid "New _Folder"
msgstr "Neuer _Ordner"
+#: ../midori/midori-app.c:1437
+msgid "[Addresses]"
+msgstr "[Adressen]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Datei nicht gefunden."
@@ -378,7 +433,7 @@ msgstr "Datei nicht gefunden."
#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
msgid "Malformed document."
-msgstr "Fehlerhaftes Dokument"
+msgstr "Fehlerhaftes Dokument."
#: ../midori/midori-array.c:628
msgid "Unrecognized bookmark format."
@@ -388,141 +443,135 @@ msgstr "Unbekanntes Lesezeichenformat."
msgid "Writing failed."
msgstr "Schreiben fehlgeschlagen."
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5643
+msgid "Go forward to the next page"
+msgstr "Gehe weiter zur nächsten Seite"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:353 ../midori/midori-browser.c:5651
+#: ../midori/midori-browser.c:5654
+msgid "Go to the next sub-page"
+msgstr "Gehe weiter zur nächsten Unterseite"
+
+#: ../midori/midori-browser.c:440 ../midori/midori-browser.c:5592
+#: ../midori/midori-browser.c:5601
msgid "Reload the current page"
msgstr "Diese Seite neu laden"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:448 ../midori/midori-browser.c:5598
msgid "Stop loading the current page"
msgstr "Laden dieser Seite abbrechen"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:518
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Titel konnte nicht aktualisiert werden: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Unerwartete Aktion »%s«."
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:613
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Privat surfen)"
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "Oberster Ordner"
+#: ../midori/midori-browser.c:723 ../midori/midori-browser.c:765
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Lesezeichen"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:825
msgid "New folder"
msgstr "Neuer Ordner"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:825
msgid "Edit folder"
msgstr "Ordner bearbeiten"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:827
msgid "New bookmark"
msgstr "Neues Lesezeichen"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:827
msgid "Edit bookmark"
msgstr "Lesezeichen bearbeiten"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Titel:"
+#: ../midori/midori-browser.c:861
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr ""
+"Namen des Lesezeichens eingeben und angeben, wo es gespeichert werden soll."
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Adresse:"
-
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326
-msgid "_Folder:"
-msgstr "_Ordner:"
-
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:922
msgid "Add to _Speed Dial"
msgstr "Zu Schnell_wahl hinzufügen"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:928
msgid "Show in the tool_bar"
msgstr "In der Werkzeug_leiste anzeigen"
-#: ../midori/midori-browser.c:905
+#: ../midori/midori-browser.c:936
msgid "Run as _web application"
msgstr "Als _Internetanwendung starten"
-#: ../midori/midori-browser.c:976
+#: ../midori/midori-browser.c:1007
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "Die Datei «%s» kann in diesem Ornder nicht gespeichert werden."
-#: ../midori/midori-browser.c:978
+#: ../midori/midori-browser.c:1009
#, c-format
msgid "You don't have permission to write in this location."
msgstr "Sie haben an diesem Ort keine Schreibberechtigung."
-#: ../midori/midori-browser.c:985
+#: ../midori/midori-browser.c:1016
#, c-format
msgid "There is not enough free space to download \"%s\"."
-msgstr "Der freie Speichersplatz reicht nicht aus, um «%s» herunterzuladen."
+msgstr "Der freie Speichersplatz reicht nicht aus, um »%s« herunterzuladen."
-#: ../midori/midori-browser.c:988
+#: ../midori/midori-browser.c:1019
#, 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:1026 ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:1155 ../midori/midori-browser.c:4625
msgid "Save file as"
msgstr "Datei speichern unter"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Neues Fenster"
+#: ../midori/midori-browser.c:1161
+msgid "Save associated _resources"
+msgstr "Zugehörige _Ressourcen speichern"
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1403
msgid "A new window has been opened"
msgstr "Ein neues Fenster wurde geöffnet"
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Neuer Reiter"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1406
msgid "A new tab has been opened"
msgstr "Ein neuer Reiter wurde geöffnet"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1423
msgid "Error opening the image!"
msgstr "Fehler beim Öffnen des Bildes!"
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1424
msgid "Can not open selected image in a default viewer."
msgstr ""
"Das ausgewählte Bild kann nicht im Standardbildbetrachter geöffnet werden."
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1430
msgid "Error downloading the image!"
-msgstr "Fehler beim Laden des Bildes!"
+msgstr "Fehler beim Herunterladen des Bildes!"
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1431
msgid "Can not download selected image."
msgstr "Das Bild kann nicht heruntergeladen werden"
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1553
msgid "Save file"
msgstr "Datei speichern"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2456
msgid "Open file"
msgstr "Datei öffnen"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2588
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -537,139 +586,155 @@ msgstr ""
"Nachrichtenaggregator auswählen. Dann wird beim nächsten Klick auf das "
"Symbol für Nachrichtenquellen die Addresse automatisch hinzugefügt."
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2594 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Neue Nachrichtenquelle"
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2637 ../midori/midori-browser.c:5667
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Ein neues Lesezeichen hinzufügen"
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3181 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Leer"
-#: ../midori/midori-browser.c:3467
+#: ../midori/midori-browser.c:3627 ../midori/midori-browser.c:3628
msgid "Toggle text cursor navigation"
msgstr "Navigation mit Textmarke einschalten"
-#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753
+#: ../midori/midori-browser.c:3630
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Drücken von F7 aktiviert bzw. deaktiviert Caret Browsing. Falls aktiviert "
+"wird auf allen Internetseiten ein Textcursor angezeigt."
+
+#: ../midori/midori-browser.c:3633
+msgid "_Enable Caret Browsing"
+msgstr "Navigation mit Textcursor"
+
+#: ../midori/midori-browser.c:4025 ../midori/midori-browser.c:6061
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n"
-#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4351 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Alle in neuen _Reitern öffnen"
-#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4358 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "In neuem _Reiter öffnen"
-#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657
-#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4361 ../midori/midori-view.c:2953
+#: ../midori/midori-view.c:4937 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "In neuem _Fenster öffnen"
-#: ../midori/midori-browser.c:4213
+#: ../midori/midori-browser.c:4450
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4214
+#: ../midori/midori-browser.c:4451
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4452
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4453
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4454
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4455
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4239
-msgid "Import bookmarks..."
-msgstr "Lesezeichen importieren..."
+#: ../midori/midori-browser.c:4456
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:4477
+msgid "Import bookmarks…"
+msgstr "Lesezeichen importieren …"
+
+#: ../midori/midori-browser.c:4480 ../midori/midori-browser.c:5672
msgid "_Import bookmarks"
msgstr "Lesezeichen _importieren"
-#: ../midori/midori-browser.c:4253
+#: ../midori/midori-browser.c:4491
msgid "_Application:"
msgstr "_Anwendung:"
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4556
msgid "Import from XBEL or HTML file"
msgstr "Aus einer XBEL- oder HTML-Datei importieren"
-#: ../midori/midori-browser.c:4353
+#: ../midori/midori-browser.c:4584
msgid "Import from a file"
msgstr "Aus einer Datei importieren"
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4596
msgid "Failed to import bookmarks"
msgstr "Fehler beim Importieren der Lesezeichen"
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4630
msgid "XBEL Bookmarks"
msgstr "XBEL-Lesezeichen"
-#: ../midori/midori-browser.c:4405
+#: ../midori/midori-browser.c:4635
msgid "Netscape Bookmarks"
msgstr "Netscape-Lesezeichen"
-#: ../midori/midori-browser.c:4419
+#: ../midori/midori-browser.c:4649
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "Midori kann nur zu XBEL (*.xbel) oder Netscape (*.html) exportieren"
-#: ../midori/midori-browser.c:4434
+#: ../midori/midori-browser.c:4664
msgid "Failed to export bookmarks"
msgstr "Fehler beim Exportieren der Lesezeichen"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4556
+#: ../midori/midori-browser.c:4786
msgid "Clear Private Data"
msgstr "Private Daten löschen"
-#: ../midori/midori-browser.c:4560
+#: ../midori/midori-browser.c:4790
msgid "_Clear private data"
msgstr "_Private Daten löschen"
-#: ../midori/midori-browser.c:4573
+#: ../midori/midori-browser.c:4805
msgid "Clear the following data:"
msgstr "Folgende Daten löschen:"
-#: ../midori/midori-browser.c:4583
+#: ../midori/midori-browser.c:4815
msgid "Last open _tabs"
msgstr "_Zuletzt geöffnete Seiten"
-#: ../midori/midori-browser.c:4609
+#: ../midori/midori-browser.c:4841
msgid "Clear private data when _quitting Midori"
msgstr "Private Daten beim _Beenden von Midori löschen"
-#: ../midori/midori-browser.c:4804
+#: ../midori/midori-browser.c:5056
msgid "A lightweight web browser."
msgstr "Ein schlanker Internetbetrachter."
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:5057
msgid "See about:version for version info."
msgstr "Siehe about:version für Versionsinformationen."
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:5059
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 "
@@ -681,930 +746,610 @@ msgstr ""
"veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version "
"2.1 der Lizenz oder (wahlweise) jeder späteren Version."
-#: ../midori/midori-browser.c:4828
+#: ../midori/midori-browser.c:5089
msgid "translator-credits"
msgstr ""
"Enrico Tröger \n"
"Christian Dywan "
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5502
msgid "_File"
msgstr "_Datei"
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5505
msgid "Open a new window"
msgstr "Ein neues Fenster öffnen"
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5508
msgid "Open a new tab"
msgstr "Einen neuen Reiter öffnen"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5510
msgid "New P_rivate Browsing Window"
msgstr "Neues Fenster zum _privaten Surfen"
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5514
msgid "Open a file"
msgstr "Eine Datei öffnen"
-#: ../midori/midori-browser.c:5228
-msgid "_Save Page As..."
-msgstr "_Seite speichern unter…"
+#: ../midori/midori-browser.c:5516
+msgid "_Save Page As…"
+msgstr "_Seite speichern unter …"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5517
msgid "Save to a file"
msgstr "In Datei speichern"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5519
msgid "Add to Speed _dial"
msgstr "Zu Schnell_wahl hinzufügen"
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5523
msgid "Add Shortcut to the _desktop"
msgstr "Verknüpfung auf dem _Schreibtisch"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5525
msgid "Create _Launcher"
msgstr "_Starter erstellen"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5529
msgid "Subscribe to News _feed"
msgstr "Nachrichten_quelle abonnieren"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5535
msgid "_Close Tab"
msgstr "Reiter s_chließen"
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5536
msgid "Close the current tab"
msgstr "Den aktuellen Reiter schließen"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5538
msgid "C_lose Window"
msgstr "_Fenster schließen"
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5542
+msgid "_Share"
+msgstr "_Freigeben"
+
+#: ../midori/midori-browser.c:5547
msgid "Print the current page"
msgstr "Aktuelle Seite ausdrucken"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5550
msgid "Close a_ll Windows"
msgstr "_Alle Fenster schließen"
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5553
msgid "_Edit"
msgstr "_Bearbeiten"
-#: ../midori/midori-browser.c:5282
-msgid "_Find..."
-msgstr "_Suchen…"
+#: ../midori/midori-browser.c:5576
+msgid "_Find…"
+msgstr "_Suchen …"
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5577
msgid "Find a word or phrase in the page"
-msgstr "Finde ein Wort oder einen Satz auf der Seite"
+msgstr "Ein Wort oder einen Satz auf der Seite suchen"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5579
msgid "Find _Next"
msgstr "_Nächstes suchen"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5582
msgid "Find _Previous"
msgstr "_Vorheriges suchen"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5586
msgid "Configure the application preferences"
-msgstr "Anwedungseinstellungen anpassen"
+msgstr "Anwendungseinstellungen anpassen"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5588
msgid "_View"
msgstr "_Ansicht"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5589
msgid "_Toolbars"
msgstr "_Werkzeugleisten"
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5594
msgid "Reload page without caching"
msgstr "Seite ohne Zwischenspeicher neu laden"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5604
msgid "Increase the zoom level"
-msgstr "Erhöhe die Vergrößerungsstufe"
+msgstr "Die Vergrößerungsstufe erhöhen"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5607
msgid "Decrease the zoom level"
-msgstr "Verringere die Vergrößerungsstufe"
+msgstr "Die Vergrößerungsstufe verringern"
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5611
msgid "_Encoding"
msgstr "_Zeichensatz"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5613
msgid "View So_urce"
msgstr "_Quelltext anzeigen"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5616
msgid "Ca_ret Browsing"
-msgstr "Navigation mit Textmarke"
+msgstr "Navigation mit Textma_rke"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5620
msgid "Toggle fullscreen view"
msgstr "Vollbildmodus ein-/ ausschalten"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5622
msgid "Scroll _Left"
msgstr "Nach _links rollen"
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5625
msgid "Scroll _Down"
msgstr "_Herunter rollen"
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5628
msgid "Scroll _Up"
msgstr "H_och rollen"
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5631
msgid "Scroll _Right"
msgstr "Nach _rechts rollen"
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5634
+msgid "_Readable"
+msgstr "Lesba_r"
+
+#: ../midori/midori-browser.c:5637
msgid "_Go"
msgstr "_Gehe zu"
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5640
msgid "Go back to the previous page"
-msgstr "Gehe zur voherigen Seite zurück"
-
-#: ../midori/midori-browser.c:5346
-msgid "Go forward to the next page"
-msgstr "Gehe weiter zur nächsten Seite"
+msgstr "Zur vorherigen Seite zurück gehen"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5647
msgid "Go to the previous sub-page"
-msgstr "Gehe zur voherigen Unterseite zurück"
+msgstr "Zur vorherigen Unterseite zurück gehen"
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5354
-msgid "Go to the next sub-page"
-msgstr "Gehe weiter zur nächsten Unterseite"
+#: ../midori/midori-browser.c:5656
+msgid "_Homepage"
+msgstr "_Startseite"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5657
msgid "Go to your homepage"
-msgstr "Gehe zu Deiner Startseite"
+msgstr "Zu Ihrer Startseite gehen"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5659
msgid "Empty Trash"
msgstr "Papierkorb leeren"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5662
msgid "Undo _Close Tab"
msgstr "Reiter _zurückholen"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5669
msgid "Add a new _folder"
msgstr "Einen neuen _Ordner hinzufügen"
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5675
msgid "_Export bookmarks"
msgstr "Lesezeichen _exportieren"
-#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5678 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "_Suchmaschinen verwalten"
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5681
msgid "_Clear Private Data"
msgstr "_Private Daten löschen"
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5684
msgid "_Inspect Page"
msgstr "Seite _untersuchen"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5688
msgid "_Previous Tab"
msgstr "_Vorheriger Reiter"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5691
msgid "_Next Tab"
msgstr "_Nächster Reiter"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5693
msgid "Move Tab _Backward"
msgstr "Reiter _zurück schieben"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5695
msgid "_Move Tab Forward"
msgstr "Reiter v_orwärts schieben"
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5698
msgid "Focus _Current Tab"
-msgstr "_Aktuellen Reiter fokusieren"
+msgstr "_Aktuellen Reiter fokussieren"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5701
msgid "Focus _Next view"
-msgstr "_Nächste Ansicht foussieren"
+msgstr "_Nächste Ansicht fokussieren"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5704
msgid "Only show the Icon of the _Current Tab"
msgstr "Nur das Symbol des _aktuellen Reiters anziegen"
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5707
msgid "_Duplicate Current Tab"
msgstr "Aktuellen Reiter _verdoppeln"
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5710
msgid "Close Ot_her Tabs"
msgstr "Ande_re Reiter schließen"
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5713
msgid "Open last _session"
msgstr "Die letzte _Sitzung öffnen"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5716
msgid "_Help"
msgstr "_Hilfe"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5718
msgid "_Frequent Questions"
msgstr "_Häufige Fragen"
-#: ../midori/midori-browser.c:5421
-msgid "_Report a Problem..."
-msgstr "Einen Fehler _melden..."
+#: ../midori/midori-browser.c:5721
+msgid "_Report a Problem…"
+msgstr "Einen Fehler _melden …"
-#: ../midori/midori-browser.c:5433
-msgid "_Menubar"
-msgstr "_Menüleiste"
-
-#: ../midori/midori-browser.c:5437
-msgid "_Navigationbar"
-msgstr "_Navigationsleiste"
-
-#: ../midori/midori-browser.c:5441
-msgid "Side_panel"
-msgstr "Seiten_leiste"
-
-#: ../midori/midori-browser.c:5442
-msgid "Sidepanel"
-msgstr "Seitenleiste"
-
-#: ../midori/midori-browser.c:5445
-msgid "_Bookmarkbar"
-msgstr "_Lesezeichenleiste"
-
-#: ../midori/midori-browser.c:5449
-msgid "_Statusbar"
-msgstr "_Statusleiste"
-
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311
-msgid "_Automatic"
-msgstr "_Automatisch"
-
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "Chinesisch (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5465
-msgid "Japanese (SHIFT__JIS)"
-msgstr "Japanisch (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238
-msgid "Korean (EUC-KR)"
-msgstr "Koreanisch (EUC-KR)"
-
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239
-msgid "Russian (KOI8-R)"
-msgstr "Russisch (KOI8-R)"
-
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241
-msgid "Western (ISO-8859-1)"
-msgstr "Westlich (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242
-#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Benutzerdefiniert…"
-
-#: ../midori/midori-browser.c:5985
-msgid "_Separator"
-msgstr "_Trennlinie"
-
-#: ../midori/midori-browser.c:5992
-msgid "_Location..."
-msgstr "_Ort…"
-
-#: ../midori/midori-browser.c:5994
-msgid "Open a particular location"
-msgstr "Öffne einen bestimmten Ort"
-
-#: ../midori/midori-browser.c:6016
-msgid "_Web Search..."
-msgstr "Im _Netz suchen…"
-
-#: ../midori/midori-browser.c:6018
-msgid "Run a web search"
-msgstr "Starte eine Suche im Netz"
-
-#: ../midori/midori-browser.c:6045
-msgid "Reopen a previously closed tab or window"
-msgstr "Reiter oder Fenster zurückholen"
-
-#: ../midori/midori-browser.c:6062
-msgid "Show the saved bookmarks"
-msgstr "Die gespeicherten Lesezeichen anzeigen"
-
-#: ../midori/midori-browser.c:6079
+#: ../midori/midori-browser.c:5726 ../midori/midori-browser.c:6387
msgid "_Tools"
msgstr "_Extras"
-#: ../midori/midori-browser.c:6095
+#: ../midori/midori-browser.c:5733
+msgid "_Menubar"
+msgstr "_Menüleiste"
+
+#: ../midori/midori-browser.c:5737
+msgid "_Navigationbar"
+msgstr "_Navigationsleiste"
+
+#: ../midori/midori-browser.c:5741
+msgid "Side_panel"
+msgstr "Seiten_leiste"
+
+#: ../midori/midori-browser.c:5742
+msgid "Sidepanel"
+msgstr "Seitenleiste"
+
+#: ../midori/midori-browser.c:5745
+msgid "_Bookmarkbar"
+msgstr "_Lesezeichenleiste"
+
+#: ../midori/midori-browser.c:5749
+msgid "_Statusbar"
+msgstr "_Statusleiste"
+
+#: ../midori/midori-browser.c:5758 ../midori/midori-websettings.c:198
+msgid "_Automatic"
+msgstr "_Automatisch"
+
+#: ../midori/midori-browser.c:5761 ../midori/midori-websettings.c:122
+msgid "Chinese Traditional (BIG5)"
+msgstr "Traditionelles Chinesisch (BIG5)"
+
+#: ../midori/midori-browser.c:5764 ../midori/midori-websettings.c:123
+msgid "Chinese Simplified (GB18030)"
+msgstr "Vereinfachtes Chinesisch (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5768
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japanisch (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5771 ../midori/midori-websettings.c:125
+msgid "Korean (EUC-KR)"
+msgstr "Koreanisch (EUC-KR)"
+
+#: ../midori/midori-browser.c:5774 ../midori/midori-websettings.c:126
+msgid "Russian (KOI8-R)"
+msgstr "Russisch (KOI8-R)"
+
+#: ../midori/midori-browser.c:5777 ../midori/midori-websettings.c:127
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5780 ../midori/midori-websettings.c:128
+msgid "Western (ISO-8859-1)"
+msgstr "Westlich (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5783
+msgid "Custom…"
+msgstr "Benutzerdefiniert …"
+
+#: ../midori/midori-browser.c:6293
+msgid "_Separator"
+msgstr "_Trennlinie"
+
+#: ../midori/midori-browser.c:6300
+msgid "_Location…"
+msgstr "_Ort …"
+
+#: ../midori/midori-browser.c:6302
+msgid "Open a particular location"
+msgstr "Einen bestimmten Ort öffnen"
+
+#: ../midori/midori-browser.c:6324
+msgid "_Web Search…"
+msgstr "Im _Netz suchen …"
+
+#: ../midori/midori-browser.c:6326
+msgid "Run a web search"
+msgstr "Eine Suche im Netz starten"
+
+#: ../midori/midori-browser.c:6353
+msgid "Reopen a previously closed tab or window"
+msgstr "Reiter oder Fenster zurückholen"
+
+#: ../midori/midori-browser.c:6370
+msgid "Show the saved bookmarks"
+msgstr "Die gespeicherten Lesezeichen anzeigen"
+
+#: ../midori/midori-browser.c:6403
msgid "_Window"
msgstr "_Fenster"
-#: ../midori/midori-browser.c:6097
+#: ../midori/midori-browser.c:6405
msgid "Show a list of all open tabs"
-msgstr "Zeige eine Übersicht aller offenen Reiter"
+msgstr "Eine Übersicht aller offenen Reiter zeigen"
-#: ../midori/midori-browser.c:6111
+#: ../midori/midori-browser.c:6419
msgid "_Menu"
msgstr "_Menü"
-#: ../midori/midori-browser.c:6113
+#: ../midori/midori-browser.c:6421
msgid "Menu"
msgstr "Menü"
-#: ../midori/midori-browser.c:6927
+#: ../midori/midori-browser.c:7246
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Unerwartete Einstellung »%s«"
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:330
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr ""
"Die Konfiguration der Erweiterung »%s« konnte nicht geladen werden: %s\n"
-#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
-#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:749 ../midori/midori-extension.c:846
+#: ../midori/midori-extension.c:943 ../midori/midori-extension.c:1055
+#: ../extensions/addons.c:1685
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr ""
"Die Konfiguration der Erweiterung »%s« konnte nicht gespeichert werden: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "Suchen mit %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
msgstr "Suchen mit …"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "Auswahl aus Verlauf schlug fehl\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "Nach %s suchen"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "Zertifikat exportieren"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "Die signierende Zertifizierungsstelle ist unbekannt."
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"Das Zertifikat entspricht nicht der erwarteten Identität der Seite, von der "
+"es empfangen wurde."
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "Die Aktivierungszeit des Zertifikats liegt in der Zukunft."
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "Das Zertifikat ist abgelaufen"
+
+#: ../midori/midori-locationaction.c:1267
+#, fuzzy
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"Das Zertifikat wurde widerrufen, entsprechend der Widerrufliste von "
+"GTIsConnections."
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Der Algorithmus des Zertifikats wurde als unsicher erkannt."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "Ein anderer Fehler trat bei der Überprüfung des Zertifikats auf."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "Zertifikat _exportieren"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "Selbstsigniert"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "Sicherheitsdetails"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "Einfügen und _fortfahren"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "Nicht überprüft"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "Überprüfte und verschlüsselte Verbindung"
-#: ../midori/midori-locationaction.c:1771
-#, fuzzy
+#: ../midori/midori-locationaction.c:1989
msgid "Open, unencrypted connection"
msgstr "Offene, unverschlüsselte Verbindung"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Seitenleiste rechts anordnen"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Leiste schließen"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Seitenleiste links anordnen"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:104
msgid "Show Speed Dial"
msgstr "Schnellwahl anzeigen"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:105
msgid "Show Homepage"
msgstr "Startseite anzeigen"
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:124
msgid "Japanese (SHIFT_JIS)"
msgstr "Japanisch (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:129 ../midori/midori-websettings.c:205
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Benutzerdefiniert …"
+
+#: ../midori/midori-websettings.c:144
msgid "New tab"
msgstr "Neuer Reiter"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:145
msgid "New window"
msgstr "Neues Fenster"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:146
msgid "Current tab"
msgstr "Aktueller Reiter"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:161
msgid "Default"
msgstr "Standard"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:162
msgid "Icons"
msgstr "Symbole"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:163
msgid "Small icons"
msgstr "Kleine Symbole"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:164
msgid "Text"
msgstr "Text"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:165
msgid "Icons and text"
msgstr "Symbole und Text"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:166
msgid "Text beside icons"
msgstr "Text neben Symbolen"
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:181
msgid "Automatic (GNOME or environment)"
msgstr "Automatisch (GNOME oder Umgebung)"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:182
msgid "HTTP proxy server"
msgstr "HTTP-Zwischenrechner"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:183
msgid "No proxy server"
msgstr "Kein Zwischenrechner"
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:200
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:201
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:202
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:203
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:204
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:400
-msgid "Remember last window size"
-msgstr "Letzte Fenstergröße merken"
-
-#: ../midori/midori-websettings.c:401
-msgid "Whether to save the last window size"
-msgstr "Die letzte Fenstergröße speichern oder nicht"
-
-#: ../midori/midori-websettings.c:409
-msgid "Last window width"
-msgstr "Letzte Fensterbreite"
-
-#: ../midori/midori-websettings.c:410
-msgid "The last saved window width"
-msgstr "Die zuletzt gespeicherte Fensterbreite"
-
-#: ../midori/midori-websettings.c:418
-msgid "Last window height"
-msgstr "Letzte Fensterhöhe"
-
-#: ../midori/midori-websettings.c:419
-msgid "The last saved window height"
-msgstr "Die zuletzt gespeicherte Fensterhöhe"
-
-#: ../midori/midori-websettings.c:444
-msgid "Last panel position"
-msgstr "Letzte Leistenposition"
-
-#: ../midori/midori-websettings.c:445
-msgid "The last saved panel position"
-msgstr "Die zuletzt gespeicherte Leistenposition"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
-msgid "Last panel page"
-msgstr "Letzte Leistenseite"
-
-#: ../midori/midori-websettings.c:455
-msgid "The last saved panel page"
-msgstr "Die zuletzt gespeicherte Leistenseite"
-
-#: ../midori/midori-websettings.c:463
-msgid "Last Web search"
-msgstr "Letzte Suche im Netz"
-
-#: ../midori/midori-websettings.c:464
-msgid "The last saved Web search"
-msgstr "Die zuletzt gespeicherte Suche im Netz"
-
-#: ../midori/midori-websettings.c:473
-msgid "Show Menubar"
-msgstr "Menüleiste anzeigen"
-
-#: ../midori/midori-websettings.c:474
-msgid "Whether to show the menubar"
-msgstr "Die Menüleiste anzeigen oder verbergen"
-
-#: ../midori/midori-websettings.c:482
-msgid "Show Navigationbar"
-msgstr "Navigationsleiste anzeigen"
-
-#: ../midori/midori-websettings.c:483
-msgid "Whether to show the navigationbar"
-msgstr "Die Navigationsleiste anzeigen oder verbergen"
-
-#: ../midori/midori-websettings.c:491
-msgid "Show Bookmarkbar"
-msgstr "Lesezeichenleiste anzeigen"
-
-#: ../midori/midori-websettings.c:492
-msgid "Whether to show the bookmarkbar"
-msgstr "Die Lesezeichenleiste anzeigen oder verbergen"
-
-#: ../midori/midori-websettings.c:500
-msgid "Show Panel"
-msgstr "Leiste anzeigen"
-
-#: ../midori/midori-websettings.c:501
-msgid "Whether to show the panel"
-msgstr "Die Leiste anzeigen oder verbergen"
-
-#: ../midori/midori-websettings.c:509
-msgid "Show Statusbar"
-msgstr "Statusleiste anzeigen"
-
-#: ../midori/midori-websettings.c:510
-msgid "Whether to show the statusbar"
-msgstr "Die Statusleiste anzeigen oder verbergen"
-
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:277
msgid "Toolbar Style:"
msgstr "Werkzeugleistenstil:"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:278
msgid "The style of the toolbar"
msgstr "Der Stil der Werkzeugleiste"
-#: ../midori/midori-websettings.c:529
-msgid "Toolbar Items"
-msgstr "Werkzeugleistenelemente"
-
-#: ../midori/midori-websettings.c:530
-msgid "The items to show on the toolbar"
-msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente"
-
-#: ../midori/midori-websettings.c:538
-msgid "Compact Sidepanel"
-msgstr "Kompakte Seitenleiste"
-
-#: ../midori/midori-websettings.c:539
-msgid "Whether to make the sidepanel compact"
-msgstr "Die Seitenleiste anzeigen oder verbergen"
-
-#: ../midori/midori-websettings.c:554
-msgid "Align sidepanel on the right"
-msgstr "Seitenleiste rechts anordnen"
-
-#: ../midori/midori-websettings.c:555
-msgid "Whether to align the sidepanel on the right"
-msgstr "Die Seitenleiste auf der rechten Seite anordnen"
-
-#: ../midori/midori-websettings.c:570
-msgid "Open panels in separate windows"
-msgstr "Leisten in eigenen Fenstern öffnen"
-
-#: ../midori/midori-websettings.c:571
-msgid "Whether to always open panels in separate windows"
-msgstr "Ob Seitenleisten immer in eigenen Fenstern geöffnet werden sollen"
-
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:287
msgid "When Midori starts:"
msgstr "Beim Starten von Midori:"
-#: ../midori/midori-websettings.c:581
-msgid "What to do when Midori starts"
-msgstr "Was beim Starten von Midori passieren soll"
-
-#: ../midori/midori-websettings.c:590
-msgid "Homepage:"
-msgstr "Startseite:"
-
-#: ../midori/midori-websettings.c:591
-msgid "The homepage"
-msgstr "Die Startseite"
-
-#: ../midori/midori-websettings.c:606
-msgid "Show crash dialog"
-msgstr "Absturzdialog anzeigen"
-
-#: ../midori/midori-websettings.c:607
-msgid "Show a dialog after Midori crashed"
-msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist"
-
-#: ../midori/midori-websettings.c:615
-msgid "Save downloaded files to:"
-msgstr "Heruntergeladene Dateien speichern:"
-
-#: ../midori/midori-websettings.c:616
-msgid "The folder downloaded files are saved to"
-msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden"
-
-#: ../midori/midori-websettings.c:624
-msgid "Text Editor"
-msgstr "Texteditor"
-
-#: ../midori/midori-websettings.c:625
-msgid "An external text editor"
-msgstr "Ein externer Texteditor"
-
-#: ../midori/midori-websettings.c:640
-msgid "News Aggregator"
-msgstr "Nachrichtenaggregator"
-
-#: ../midori/midori-websettings.c:641
-msgid "An external news aggregator"
-msgstr "Ein externer Nachrichtenaggregator"
-
-#: ../midori/midori-websettings.c:649
-msgid "Location entry Search"
-msgstr "Adressfeldsuche"
-
-#: ../midori/midori-websettings.c:650
-msgid "The search to perform inside the location entry"
-msgstr "Die Suche, die über das Adressfeld ausgeführt wird"
-
-#: ../midori/midori-websettings.c:658
+#: ../midori/midori-websettings.c:297
msgid "Preferred Encoding"
msgstr "Bevorzugter Zeichensatz"
-#: ../midori/midori-websettings.c:659
-msgid "The preferred character encoding"
-msgstr "Der bevorzugte Zeichensatz"
-
-#: ../midori/midori-websettings.c:669
-msgid "Always Show Tabbar"
-msgstr "Reiterleiste immer anzeigen"
-
-#: ../midori/midori-websettings.c:670
-msgid "Always show the tabbar"
-msgstr "Die Reiterleiste immer anzeigen"
-
-#: ../midori/midori-websettings.c:683
-msgid "Close Buttons on Tabs"
-msgstr "Schließenschaltflächen auf Reitern"
-
-#: ../midori/midori-websettings.c:684
-msgid "Whether tabs have close buttons"
-msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen"
-
-#: ../midori/midori-websettings.c:709
+#: ../midori/midori-websettings.c:324
msgid "Open new pages in:"
-msgstr "Öffne neue Seiten in:"
-
-#: ../midori/midori-websettings.c:710
-msgid "Where to open new pages"
-msgstr "Wo neue Seiten geöffnet werden sollen"
-
-#: ../midori/midori-websettings.c:719
-msgid "Middle click opens Selection"
-msgstr "Mittelklick öffnet Markierung"
-
-#: ../midori/midori-websettings.c:720
-msgid "Load an address from the selection via middle click"
-msgstr "Lade eine markierte Adresse mit der mittleren Maustaste"
-
-#: ../midori/midori-websettings.c:728
-msgid "Open tabs in the background"
-msgstr "Reiter im Hintergrund öffnen"
-
-#: ../midori/midori-websettings.c:729
-msgid "Whether to open new tabs in the background"
-msgstr "Neue Reiter im Hintergrund öffnen"
-
-#: ../midori/midori-websettings.c:737
-msgid "Open Tabs next to Current"
-msgstr "Reiter neben aktuellem öffnen"
-
-#: ../midori/midori-websettings.c:738
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen"
-
-#: ../midori/midori-websettings.c:746
-msgid "Open popups in tabs"
-msgstr "Aufklappfenster in Reitern öffnen"
-
-#: ../midori/midori-websettings.c:747
-msgid "Whether to open popup windows in tabs"
-msgstr "Aufklappfenster in neuen Reitern öffnen"
-
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Bilder automatisch laden"
-
-#: ../midori/midori-websettings.c:758
-msgid "Load and display images automatically"
-msgstr "Bilder automatisch laden und anzeigen"
-
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Skripte einschalten"
-
-#: ../midori/midori-websettings.c:766
-msgid "Enable embedded scripting languages"
-msgstr "Eingebettete Skriptsprachen einschalten"
-
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Netscape-Module einschalten"
-
-#: ../midori/midori-websettings.c:774
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Eingebettete Netscape-Module einschalten"
-
-#: ../midori/midori-websettings.c:789
-msgid "Enable Spell Checking"
-msgstr "Rechtschreibprüfung einschalten"
-
-#: ../midori/midori-websettings.c:790
-msgid "Enable spell checking while typing"
-msgstr "Rechtschreibprüfung beim Eintippen einschalten"
-
-#: ../midori/midori-websettings.c:796
-msgid "Enable HTML5 database support"
-msgstr "HTML5-Datenbanken einschalten"
-
-#: ../midori/midori-websettings.c:797
-msgid "Whether to enable HTML5 database support"
-msgstr "Unterstützung für HTML5-Datenbank einschalten"
-
-#: ../midori/midori-websettings.c:803
-msgid "Enable HTML5 local storage support"
-msgstr "HTML5-Lokalspeicher einschalten"
-
-#: ../midori/midori-websettings.c:804
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Unterstützung für HTML5-Lokalspeicher einschalten"
-
-#: ../midori/midori-websettings.c:810
-msgid "Enable offline web application cache"
-msgstr "HTML5-Anwendungsspeicher einschalten"
-
-#: ../midori/midori-websettings.c:811
-msgid "Whether to enable offline web application cache"
-msgstr "HTML5-Zwischenspeicher für Internetanwendungen einschalten"
-
-#: ../midori/midori-websettings.c:827
-msgid "Flash window on background tabs"
-msgstr "Fenster bei Hintergrund-Reitern blinken lassen"
-
-#: ../midori/midori-websettings.c:828
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr ""
-"Browserfenster blinken lassen, wenn ein neuer Reiter im Hintergrund geöffnet "
-"wurde"
-
-#: ../midori/midori-websettings.c:836
-msgid "Enable WebGL support"
-msgstr "WebGL-Unterstützung einschalten"
-
-#: ../midori/midori-websettings.c:837
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Internetseiten erlauben, OpenGL zur Darstellung zu benutzen"
-
-#: ../midori/midori-websettings.c:863
-msgid "Zoom Text and Images"
-msgstr "Text und Bilder vergrößern"
-
-#: ../midori/midori-websettings.c:864
-msgid "Whether to zoom text and images"
-msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen"
-
-#: ../midori/midori-websettings.c:879
-msgid "Find inline while typing"
-msgstr "Inkrementelle Suche beim Eintippen"
-
-#: ../midori/midori-websettings.c:880
-msgid "Whether to automatically find inline while typing"
-msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll"
-
-#: ../midori/midori-websettings.c:895
-msgid "Kinetic scrolling"
-msgstr "Sanfter Bildlauf"
-
-#: ../midori/midori-websettings.c:896
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Ob der Bildlauf sanft schneller und langsamer wird"
-
-#: ../midori/midori-websettings.c:904
-msgid "Delete old Cookies after:"
-msgstr "Alte Cookies löschen nach:"
-
-#: ../midori/midori-websettings.c:905
-msgid "The maximum number of days to save cookies for"
-msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden"
-
-#: ../midori/midori-websettings.c:921
-msgid "Only accept Cookies from sites you visit"
-msgstr "Nur Cookies von Seiten annehmen, die ich besuche"
-
-#: ../midori/midori-websettings.c:922
-msgid "Block cookies sent by third-party websites"
-msgstr "Cookies von Drittanbietern blockieren"
-
-#: ../midori/midori-websettings.c:936
-msgid "Delete pages from history after:"
-msgstr "Seiten aus dem Verlauf löschen nach:"
-
-#: ../midori/midori-websettings.c:937
-msgid "The maximum number of days to save the history for"
-msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gespeichert wird"
-
-#: ../midori/midori-websettings.c:952
-msgid "Proxy server"
-msgstr "Proxy-Server"
-
-#: ../midori/midori-websettings.c:953
-msgid "The type of proxy server to use"
-msgstr "Die Art des zu verwendenden Zwischenrechners"
-
-#: ../midori/midori-websettings.c:962
-msgid "HTTP Proxy Server"
-msgstr "HTTP-Zwischenrechner"
-
-#: ../midori/midori-websettings.c:963
-msgid "The proxy server used for HTTP connections"
-msgstr "Der Zwischenrechner für HTTP-Verbindungen"
-
-#: ../midori/midori-websettings.c:978
-msgid "Port"
-msgstr "Port"
-
-#: ../midori/midori-websettings.c:979
-msgid "The proxy server port used for HTTP connections"
-msgstr "Der Port des Zwischenrechners für HTTP-Verbindungen"
-
-#: ../midori/midori-websettings.c:997
-msgid "The maximum size of cached pages on disk"
-msgstr "Die maximale Größe zwischengespeicherter Seiten auf der Festplatte"
+msgstr "Neue Seiten öffnen in:"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
+#: ../midori/midori-websettings.c:387
msgid "Identify as"
msgstr "Ausgeben als"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:388
msgid "What to identify as to web pages"
-msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll"
+msgstr "Legt fest, wie gegenüber Seiten im Internet identifiziert werden soll"
-#: ../midori/midori-websettings.c:1031
-msgid "Identification string"
-msgstr "Identifikationskennung"
-
-#: ../midori/midori-websettings.c:1032
-msgid "The application identification string"
-msgstr "Die Identifikationskennung der Anwedung"
-
-#: ../midori/midori-websettings.c:1048
+#: ../midori/midori-websettings.c:421
msgid "Preferred languages"
msgstr "Bevorzugte Sprachen"
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:422
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1613,442 +1358,531 @@ msgstr ""
"Darstellung mehrsprachiger Internetseiten benutzt wird, zum Beispiel »de«, "
"»ru,nl« oder »en-us;q=1.0, fr-fr;q=0.667«"
-#: ../midori/midori-websettings.c:1064
-msgid "Clear private data"
-msgstr "Private Daten löschen"
-
-#: ../midori/midori-websettings.c:1065
-msgid "The private data selected for deletion"
-msgstr "Zum Löschen ausgewählte private Daten"
-
-#: ../midori/midori-websettings.c:1080
-msgid "Clear data"
-msgstr "Daten löschen"
-
-#: ../midori/midori-websettings.c:1081
-msgid "The data selected for deletion"
-msgstr "Zum Löschen ausgewählte Daten"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
-msgid "Strip referrer details sent to websites"
-msgstr "Herkunftsdetails beim Seitenwechsel kürzen"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Ob die »Referer«-Kopfzeile auf den Rechnernamen verkürzt werden soll"
-
-#: ../midori/midori-websettings.c:1146
+#: ../midori/midori-websettings.c:471
msgid "Always use my font choices"
msgstr "Immer meine Schriften benutzen"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:472
msgid "Override fonts picked by websites with user preferences"
msgstr ""
"Schriftarten auf Internetseiten mit Benutzereinstellungen überschreiben"
-#: ../midori/midori-view.c:1360
+#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151
+msgid "Trust this website"
+msgstr "Dieser Webseite vertrauen"
+
+#: ../midori/midori-view.c:1149
+msgid "Security unknown"
+msgstr "Sicherheitsstufe unbekannt"
+
+#: ../midori/midori-view.c:1447
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s möchte eine HTML5-Datenbank speichern."
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Deny"
msgstr "_Verweigern"
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Allow"
msgstr "_Zulassen"
-#: ../midori/midori-view.c:1392
+#: ../midori/midori-view.c:1480
#, c-format
msgid "%s wants to know your location."
msgstr "%s möchte Ihren Standort wissen."
-#: ../midori/midori-view.c:1485
+#: ../midori/midori-view.c:1576
#, c-format
msgid "Error - %s"
msgstr "Fehler - %s"
-#: ../midori/midori-view.c:1486
+#: ../midori/midori-view.c:1577
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Die Seite »%s« konnte nicht geladen werden."
-#: ../midori/midori-view.c:1488
+#: ../midori/midori-view.c:1579
msgid "Try again"
msgstr "Erneut versuchen"
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
+#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2888
#, c-format
msgid "Send a message to %s"
msgstr "Nachricht an %s schicken"
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
+#: ../midori/midori-view.c:2674
+msgid "Add _search engine..."
+msgstr "_Suchmaschine hinzufügen …"
+
+#: ../midori/midori-view.c:2718 ../midori/midori-view.c:3044
msgid "Inspect _Element"
msgstr "Element _untersuchen"
-#: ../midori/midori-view.c:2480
+#: ../midori/midori-view.c:2770
msgid "Open Link in New _Tab"
msgstr "Verweis in neuem _Reiter öffnen"
-#: ../midori/midori-view.c:2484
+#: ../midori/midori-view.c:2774
msgid "Open Link in _Foreground Tab"
msgstr "Verweis in _Vordergrund-Reiter öffnen"
-#: ../midori/midori-view.c:2485
+#: ../midori/midori-view.c:2775
msgid "Open Link in _Background Tab"
msgstr "Verweis in _Hintergrund-Reiter öffnen"
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2778
msgid "Open Link in New _Window"
msgstr "Verweis in neuem _Fenster öffnen"
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2781
msgid "Open Link as Web A_pplication"
msgstr "Verweis als _Internetanwendung öffnen"
-#: ../midori/midori-view.c:2496
+#: ../midori/midori-view.c:2786
msgid "Copy Link de_stination"
msgstr "Verweisziel k_opieren"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2802
msgid "Open _Image in New Tab"
msgstr "_Bild in neuem Reiter öffnen"
-#: ../midori/midori-view.c:2515
+#: ../midori/midori-view.c:2805
msgid "Copy Image _Address"
msgstr "Bild_adresse kopieren"
-#: ../midori/midori-view.c:2518
+#: ../midori/midori-view.c:2808
msgid "Save I_mage"
msgstr "Bi_ld speichern"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2811
msgid "Open in Image _Viewer"
msgstr "In _Bildbetrachter öffnen"
-#: ../midori/midori-view.c:2528
+#: ../midori/midori-view.c:2818
msgid "Copy Video _Address"
msgstr "Video_adresse kopieren"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2821
msgid "Save _Video"
msgstr "_Video speichern"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2821
msgid "Download _Video"
msgstr "_Video herunterladen"
-#: ../midori/midori-view.c:2557
+#: ../midori/midori-view.c:2847
msgid "Search _with"
msgstr "Suchen _mit"
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:2879
msgid "_Search the Web"
msgstr "Im Netz _suchen"
-#: ../midori/midori-view.c:2606
+#: ../midori/midori-view.c:2896
msgid "Open Address in New _Tab"
msgstr "Adresse in neuem _Reiter öffnen"
-#: ../midori/midori-view.c:2909
-msgid "Open or download file"
-msgstr "Datei öffnen oder herunterladen"
+#: ../midori/midori-view.c:2949
+msgid "Open _Frame in New Tab"
+msgstr "_Rahmen in neuem Reiter öffnen"
-#: ../midori/midori-view.c:2929
+#: ../midori/midori-view.c:3206
#, c-format
-msgid "File Type: '%s'"
-msgstr "Dateityp: »%s«"
+msgid "Open or download file from %s"
+msgstr "Datei öffnen oder von %s herunterladen"
-#: ../midori/midori-view.c:2931
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Dateityp: %s (»%s«)"
-
-#: ../midori/midori-view.c:2935
+#: ../midori/midori-view.c:3230
#, c-format
msgid "File Name: %s"
msgstr "Dateiname: %s"
-#: ../midori/midori-view.c:2955
+#: ../midori/midori-view.c:3235
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Dateityp: »%s«"
+
+#: ../midori/midori-view.c:3237
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Dateityp: %s (»%s«)"
+
+#: ../midori/midori-view.c:3272
+#, c-format
+msgid "Size: %s"
+msgstr "Größe: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3283
#, c-format
msgid "Open %s"
msgstr "%s öffnen"
-#: ../midori/midori-view.c:3576
+#: ../midori/midori-view.c:3889
#, c-format
msgid "Inspect page - %s"
msgstr "Seite untersuchen - %s"
-#: ../midori/midori-view.c:3923
-msgid "Speed Dial"
-msgstr "Schnellwahl"
-
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
-msgid "Click to add a shortcut"
-msgstr "Klicken um eine Verknüpfung hinzuzufügen"
-
-#: ../midori/midori-view.c:3925
-msgid "Enter shortcut address"
-msgstr "Ziel der Verknüpfung eingeben"
-
-#: ../midori/midori-view.c:3926
-msgid "Enter shortcut title"
-msgstr "Titel der Verknüpfung eingeben"
-
-#: ../midori/midori-view.c:3927
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "Sind Sie sicher, dass Sie diese Verknüpfung löschen wollen?"
-
-#: ../midori/midori-view.c:4089
+#: ../midori/midori-view.c:4288
#, c-format
msgid "No documentation installed"
msgstr "Keine Dokumentation installiert"
-#: ../midori/midori-view.c:4165
+#: ../midori/midori-view.c:4365
msgid "Midori doesn't store any personal data:"
msgstr "Midori speichert keine persönlichen Daten:"
-#: ../midori/midori-view.c:4166
+#: ../midori/midori-view.c:4366
msgid "No history or web cookies are being saved."
-msgstr "Es werden weder Chronik noch Web-Cookies gespeichert."
+msgstr "Es werden weder Verlauf noch Web-Cookies gespeichert."
-#: ../midori/midori-view.c:4167
+#: ../midori/midori-view.c:4367
msgid "Extensions are disabled."
msgstr "Erweiterungen sind deaktiviert."
-#: ../midori/midori-view.c:4168
+#: ../midori/midori-view.c:4368
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
"HTML5-Speicher, lokale Datenbank und Anwendungszwischenspeicher sind "
"deaktiviert."
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4369
msgid "Midori prevents websites from tracking the user:"
-msgstr "Midori verhindert, dass Webseiten ihre Nutzer verfolgen."
+msgstr "Midori verhindert, dass Webseiten ihre Nutzer verfolgen:"
-#: ../midori/midori-view.c:4170
-#, fuzzy
+#: ../midori/midori-view.c:4370
msgid "Referrer URLs are stripped down to the hostname."
msgstr ""
"Weiterleitende URLs werden bis hintunter auf den Rechnernamen aufgelöst."
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:4371
msgid "DNS prefetching is disabled."
msgstr "DNS-Auflösung im Voraus ist deaktiviert."
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:4372
msgid "The language and timezone are not revealed to websites."
msgstr ""
"Die Sprach- und Zeitzoneneinstellungen werden Webseiten nicht verraten."
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:4373
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr ""
"Flash und andere Netscape-Erweiterungen können nicht durch Websites "
"aufgelistet werden."
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:4459
msgid "Version numbers in brackets show the version used at runtime."
msgstr "Versionsnummern in Klammern geben Versionen zur Laufzeit an."
-#: ../midori/midori-view.c:4278
+#: ../midori/midori-view.c:4508
msgid "Page loading delayed"
msgstr "Laden der Seite verzögert"
-#: ../midori/midori-view.c:4279
+#: ../midori/midori-view.c:4509
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr "Laden der Seite wegen eines Absturzes oder Einstellung verzögert"
-#: ../midori/midori-view.c:4280
+#: ../midori/midori-view.c:4510
msgid "Load Page"
msgstr "Seite laden"
-#: ../midori/midori-view.c:4446
+#: ../midori/midori-view.c:4677
msgid "Blank page"
msgstr "Leere Seite"
-#: ../midori/midori-view.c:4708
+#: ../midori/midori-view.c:4941
msgid "_Duplicate Tab"
msgstr "Reiter _verdoppeln"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4946
msgid "Show Tab _Label"
msgstr "Reiterleiste anzeigen"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4946
msgid "Show Tab _Icon Only"
msgstr "Nur Reiter_symbol anzeigen"
-#: ../midori/midori-view.c:4719
-msgid "Close ot_her Tabs"
-msgstr "Ande_re Reiter schließen"
+#: ../midori/midori-view.c:4953
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Ande_ren Reiter schließen"
+msgstr[1] "Ande_re Reiter schließen"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5532
+#: ../midori/midori-view.c:5760
msgid "previous"
msgstr "vorige"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5551
+#: ../midori/midori-view.c:5779
msgid "next"
msgstr "nächste"
-#: ../midori/midori-view.c:5564
+#: ../midori/midori-view.c:5792
msgid "Print background images"
msgstr "Hintergrundbilder drucken"
-#: ../midori/midori-view.c:5565
+#: ../midori/midori-view.c:5793
msgid "Whether background images should be printed"
-msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht"
+msgstr "Leget fest, ob Hintergrundbilder gedruckt werden sollen oder nicht"
-#: ../midori/midori-view.c:5597
+#: ../midori/midori-view.c:5825
msgid "Features"
msgstr "Inhalte"
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-speeddial.vala:160
+msgid "Speed Dial"
+msgstr "Schnellwahl"
+
+#: ../midori/midori-speeddial.vala:161 ../midori/midori-speeddial.vala:246
+msgid "Click to add a shortcut"
+msgstr "Klicken um eine Verknüpfung hinzuzufügen"
+
+#: ../midori/midori-speeddial.vala:162
+msgid "Enter shortcut address"
+msgstr "Ziel der Verknüpfung eingeben"
+
+#: ../midori/midori-speeddial.vala:163
+msgid "Enter shortcut title"
+msgstr "Titel der Verknüpfung eingeben"
+
+#: ../midori/midori-speeddial.vala:164
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Sind Sie sicher, dass Sie diese Verknüpfung löschen wollen?"
+
+#: ../midori/midori-preferences.c:299
msgid "Startup"
msgstr "Programmstart"
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:305
+msgid "Homepage:"
+msgstr "Startseite:"
+
+#: ../midori/midori-preferences.c:313
msgid "Use _current page"
msgstr "_Aktuelle Seite benutzen"
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:317
msgid "Use current page as homepage"
msgstr "Aktuelle Seite als Startseite benutzen"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:326
msgid "Fonts"
msgstr "Schriften"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:329
msgid "Proportional Font Family"
msgstr "Proportionale Schriftart"
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:333
msgid "The default font family used to display text"
msgstr "Die Standardschriftgröße, in der Text angezeigt wird"
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:336
msgid "The default font size used to display text"
msgstr "Die Standardschriftgröße, in der Text angezeigt wird"
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:338
msgid "Fixed-width Font Family"
msgstr "Dicktengleiche Schriftart"
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:342
msgid "The font family used to display fixed-width text"
msgstr "Die Schriftart, in der dicktengleicher Text angezeigt wird"
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:345
msgid "The font size used to display fixed-width text"
msgstr "Die Schriftgröße, in der dicktengleicher Text angezeigt wird"
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:347
msgid "Minimum Font Size"
msgstr "Mindestschriftgröße"
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:351
msgid "The minimum font size used to display text"
msgstr "Die Mindestschriftgröße, in der Text angezeigt wird"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:362
msgid "Behavior"
msgstr "Verhalten"
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Bilder automatisch laden"
+
+#: ../midori/midori-preferences.c:369
+msgid "Enable Spell Checking"
+msgstr "Rechtschreibprüfung einschalten"
+
+#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Skripte einschalten"
+
+#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Netscape-Module einschalten"
+
+#: ../midori/midori-preferences.c:391
+msgid "Zoom Text and Images"
+msgstr "Text und Bilder vergrößern"
+
+#: ../midori/midori-preferences.c:394
msgid "Allow scripts to open popups"
msgstr "Skripte können Aufklappfenster öffnen"
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:395
msgid "Whether scripts are allowed to open popup windows automatically"
msgstr "Skripte können selbstständig neue Fenster öffnen"
+#: ../midori/midori-preferences.c:401
+msgid "Kinetic scrolling"
+msgstr "Sanfter Bildlauf"
+
+#: ../midori/midori-preferences.c:402
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr "Legt fest ob der Bildlauf sanft schneller und langsamer wird"
+
+#: ../midori/midori-preferences.c:407
+msgid "Middle click opens Selection"
+msgstr "Mittelklick öffnet Auswahl"
+
+#: ../midori/midori-preferences.c:408
+msgid "Load an address from the selection via middle click"
+msgstr "Eine markierte Adresse mit der mittleren Maustaste laden"
+
+#: ../midori/midori-preferences.c:414
+msgid "Enable WebGL support"
+msgstr "WebGL-Unterstützung einschalten"
+
+#: ../midori/midori-preferences.c:419
+msgid "Flash window on background tabs"
+msgstr "Fenster bei Hintergrund-Reitern blinken lassen"
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Heruntergeladene Dateien speichern in:"
+
#. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:435
msgid "Browsing"
msgstr "Navigation"
+#: ../midori/midori-preferences.c:451
+msgid "Close Buttons on Tabs"
+msgstr "Knöpfe zum Schließen auf Reitern"
+
+#: ../midori/midori-preferences.c:455
+msgid "Always Show Tabbar"
+msgstr "Reiterleiste immer anzeigen"
+
+#: ../midori/midori-preferences.c:459
+msgid "Open Tabs next to Current"
+msgstr "Reiter neben aktuellem öffnen"
+
+#: ../midori/midori-preferences.c:460
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen"
+
+#: ../midori/midori-preferences.c:463
+msgid "Open tabs in the background"
+msgstr "Reiter im Hintergrund öffnen"
+
+#: ../midori/midori-preferences.c:467
+msgid "Text Editor"
+msgstr "Texteditor"
+
+#: ../midori/midori-preferences.c:472
+msgid "News Aggregator"
+msgstr "Nachrichtenaggregator"
+
#. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:479
msgid "Network"
msgstr "Netzwerk"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:481
+msgid "Proxy server"
+msgstr "Proxy-Server"
+
+#: ../midori/midori-preferences.c:486
msgid "Hostname"
msgstr "Rechnername"
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:494
+msgid "Port"
+msgstr "Port"
+
+#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509
+msgid "The maximum size of cached pages on disk"
+msgstr "Die maximale Größe zwischengespeicherter Seiten auf der Festplatte"
+
+#: ../midori/midori-preferences.c:511
msgid "MB"
msgstr "MB"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Add search engine"
msgstr "Suchmaschine hinzufügen"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Edit search engine"
msgstr "Suchmaschine bearbeiten"
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:985
msgid "_Name:"
msgstr "_Name:"
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1000
msgid "_Description:"
msgstr "_Beschreibung:"
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Symbol:"
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Adresse:"
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1032
msgid "_Token:"
msgstr "_Kürzel:"
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1330
msgid "Manage Search Engines"
msgstr "Suchmaschinen verwalten"
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1432
msgid "Use as _default"
msgstr "Als _Standard"
-#: ../midori/sokoke.c:354
+#: ../midori/sokoke.c:353
msgid "Open with"
msgstr "Öffnen mit"
-#: ../midori/sokoke.c:362
+#: ../midori/sokoke.c:361
#, c-format
msgid "Choose an application or command to open \"%s\":"
msgstr "Anwendung oder Befehl zum Öffnen von »%s« wählen:"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
+#: ../midori/sokoke.c:475 ../midori/sokoke.c:489
msgid "Could not run external program."
-msgstr "Konnte externes Programm nicht ausführen."
+msgstr "Externes Programm konnte nicht ausgeführt werden."
-#: ../midori/sokoke.c:1595
+#: ../midori/sokoke.c:1327
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d Stunde"
msgstr[1] "%d Stunden"
-#: ../midori/sokoke.c:1596
+#: ../midori/sokoke.c:1328
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d Minute"
msgstr[1] "%d Minuten"
-#: ../midori/sokoke.c:1597
+#: ../midori/sokoke.c:1329
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2056,67 +1890,67 @@ msgstr[0] "%d Sekunde"
msgstr[1] "%d Sekunden"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
+#: ../midori/sokoke.c:1337 ../panels/midori-transfers.c:268
#, c-format
msgid "%s of %s"
msgstr "%s von %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
+#: ../midori/sokoke.c:1346
msgid "?B"
msgstr "?B"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
+#: ../midori/sokoke.c:1349
#, c-format
msgid " (%s/s)"
msgstr " (%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/sokoke.c:1366
#, c-format
msgid " - %s remaining"
msgstr " - %s verbleibend"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:265
msgid "_Inline Find:"
msgstr "_Inkrementelle Suche:"
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:287
msgid "Previous"
msgstr "Zurück"
-#: ../toolbars/midori-findbar.c:323
+#: ../toolbars/midori-findbar.c:293
msgid "Next"
msgstr "Weiter"
-#: ../toolbars/midori-findbar.c:327
+#: ../toolbars/midori-findbar.c:297
msgid "Match Case"
msgstr "Groß-/ Kleinschreibung"
-#: ../toolbars/midori-findbar.c:336
+#: ../toolbars/midori-findbar.c:306
msgid "Highlight Matches"
msgstr "Treffer hervorheben"
-#: ../toolbars/midori-findbar.c:347
+#: ../toolbars/midori-findbar.c:317
msgid "Close Findbar"
msgstr "Suchleiste schließen"
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:124
#, c-format
msgid "The file '%s ' has been downloaded."
msgstr "Die Datei »%s « wurde heruntergeladen."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:129
msgid "Transfer completed"
msgstr "Übertragung abgeschlossen"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:198
msgid "The downloaded file is erroneous."
msgstr "Die heruntergeladene Datei ist fehlerhaft."
-#: ../toolbars/midori-transferbar.c:194
+#: ../toolbars/midori-transferbar.c:199
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2125,47 +1959,53 @@ msgstr ""
"normalerweise, dass die Datei unvollständig ist oder im Nachhinein verändert "
"wurde."
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:342 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Alle entfernen"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:379 ../toolbars/midori-transferbar.c:381
msgid "Some files are being downloaded"
msgstr "Einige Dateien werden gerade heruntergeladen."
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:385
msgid "_Quit Midori"
msgstr "Midori _beenden"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:387
msgid "The transfers will be cancelled if Midori quits."
-msgstr "Die Übertragungen werden abgebrochen wenn Midori beendet wird."
+msgstr "Die Übertragungen werden abgebrochen, wenn Midori beendet wird."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Lesezeichen"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Lesezeichen konnte nicht hinzugefügt werden: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Lesezeichen konnte nicht aktualisiert werden: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Markiertes Lesezeichen bearbeiten"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Markiertes Lesezeichen löschen"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Einen neuen Ordner hinzufügen"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Trennlinie "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Lesezeichen durchsuchen"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Verlauf"
@@ -2189,6 +2029,11 @@ msgstr[1] "Vor %d Tagen"
msgid "A week ago"
msgstr "Vor einer Woche"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?"
@@ -2205,15 +2050,20 @@ msgstr "Ausgewählten Verlaufseintrag löschen"
msgid "Clear the entire history"
msgstr "Den gesamten Verlauf löschen"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Verlauf durchsuchen"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Übertragungen"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
msgstr "Zielordner ö_ffnen"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
msgstr "Verweisziel ko_pieren"
@@ -2235,11 +2085,11 @@ msgstr "Benutzername"
#: ../katze/katze-http-auth.c:253
msgid "Password"
-msgstr "Kennwort"
+msgstr "Passwort"
#: ../katze/katze-http-auth.c:267
msgid "_Remember password"
-msgstr "Kennwort _merken"
+msgstr "Passwort _merken"
#: ../katze/katze-throbber.c:949
#, c-format
@@ -2255,54 +2105,62 @@ msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden"
msgid "Animation frames are broken"
msgstr "Animationsbilder sind fehlerhaft"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Eigenschaft »%s« ist ungültig für %s"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
-#: ../extensions/addons.c:308
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:309
msgid "Choose file"
msgstr "Datei wählen"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Dateispeicherordner auswählen"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Keine"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 Stunde"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 Tag"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 Woche"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 Monat"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 Jahr"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Einstellungen für %s"
-#: ../extensions/adblock.c:473
+#: ../katze/midori-uri.vala:158
+msgid "MD5-Checksum:"
+msgstr "MD5-Prüfsumme:"
+
+#: ../katze/midori-uri.vala:165
+msgid "SHA1-Checksum:"
+msgstr "SHA1-Prüfsumme:"
+
+#: ../extensions/adblock.c:475
msgid "Configure Advertisement filters"
msgstr "Werbefilter einstellen"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:508
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2312,111 +2170,111 @@ msgstr ""
"ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere "
"Listen finden Sie auf %s."
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:922
msgid "Edit rule"
msgstr "Regel bearbeiten"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:936
msgid "_Rule:"
msgstr "_Regel:"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:990
msgid "Bl_ock image"
msgstr "Bild bloc_kieren"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:995
msgid "Bl_ock link"
msgstr "Verweis blo_ckieren"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1799
msgid "Advertisement blocker"
msgstr "Werbeblocker"
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1800
msgid "Block advertisements according to a filter list"
msgstr "Werbung an Hand einer Filterliste blockieren"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
+#: ../extensions/addons.c:222
msgid "This page appears to contain a user script. Do you wish to install it?"
msgstr ""
"Diese Seite enthält ein Benutzerskript. Möchten Sie dieses installieren?"
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
msgid "_Install user script"
msgstr "Benutzerskript _installieren"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
msgid "This page appears to contain a user style. Do you wish to install it?"
msgstr ""
"Diese Seite enthält einen Benutzerstil. Möchten Sie diesen installieren?"
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
msgid "_Install user style"
msgstr "Benutzerstil _installieren"
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
msgid "Don't install"
msgstr "Nicht installieren"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:320 ../extensions/addons.c:675
msgid "Userscripts"
msgstr "Benutzerskripte"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:325 ../extensions/addons.c:677
msgid "Userstyles"
msgstr "Benutzerstile"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:371 ../extensions/addons.c:450
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Fehler"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:412
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Soll »%s« gelöscht werden?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:418
msgid "Delete user script"
msgstr "Benutzerskript löschen"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:419
msgid "Delete user style"
msgstr "Benutzerstil löschen"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:422
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Die Datei »%s « wird endgültig gelöscht."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:564 ../extensions/addons.c:641
msgid "Open in Text Editor"
msgstr "In Texteditor öffnen"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:566 ../extensions/addons.c:650
msgid "Open Target Folder"
msgstr "Zielordner öffnen"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:632
msgid "Add new addon"
msgstr "Eine neue Erweiterung hinzufügen"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:658
msgid "Remove selected addon"
msgstr "Ausgewählte Erweiterung löschen"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1686 ../extensions/addons.c:1904
msgid "User addons"
msgstr "Benutzererweiterungen"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1816
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Der Ordner »%s« kann nicht überwacht werden: %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1905
msgid "Support for userscripts and userstyles"
msgstr "Unterstützung für Benutzerskripte und -stile"
@@ -2455,7 +2313,7 @@ msgstr "Alle einklappen"
#: ../extensions/cookie-manager/cookie-manager-page.c:572
msgid "Do you really want to delete all cookies?"
-msgstr "Sind Sie sicher, dass alle Profildateien entfernt werden sollen?"
+msgstr "Sind Sie sicher, dass alle Cookies entfernt werden sollen?"
#: ../extensions/cookie-manager/cookie-manager-page.c:574
msgid "Question"
@@ -2504,33 +2362,25 @@ msgstr ""
"Domäne : %s\n"
"Profildateien : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Name"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "Alle _ausklappen"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "Alle _einklappen"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filter:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder "
-"Domöne auf den eingegebenen Filter passt."
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Cookies nach Name oder Rechner suchen"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
-msgstr "Profildateien auflisten, anzeigen und löschen"
+msgstr "Cookies auflisten, anzeigen und löschen"
#: ../extensions/copy-tabs.c:38
msgid "Copy Tab _Addresses"
@@ -2603,7 +2453,7 @@ msgstr "Nicht unterstützte RSS-Version gefunden."
#: ../extensions/feed-panel/feed-rss.c:148
msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr "Die für RSS benötigten \"item\"-Elemente wurden im XML nicht gefunden."
+msgstr "Die für RSS benötigten »item«-Elemente wurden im XML nicht gefunden."
#: ../extensions/feed-panel/feed-rss.c:248
msgid "Failed to find required RSS \"channel\" elements in XML data."
@@ -2663,7 +2513,7 @@ msgstr "Niemals für diese Seite"
#: ../extensions/formhistory/formhistory.c:437
msgid "Toggle form history state"
-msgstr "Seiten aus dem Verlauf löschen nach:"
+msgstr "Formulardatenstatus umschalten"
#: ../extensions/formhistory/formhistory.c:438
msgid "Activate or deactivate form history for the current tab."
@@ -2699,7 +2549,7 @@ msgstr "Vervollständigung schlug fehl\n"
#: ../extensions/history-list.vala:197
msgid "There are no unvisited tabs"
-msgstr "Keine unbesuchten Reiter vorhanden."
+msgstr "Keine unbesuchten Reiter vorhanden"
#: ../extensions/history-list.vala:235
#, c-format
@@ -2762,11 +2612,11 @@ msgstr "Mausgesten"
#: ../extensions/mouse-gestures.c:302
msgid "Control Midori by moving the mouse"
-msgstr "Steuere Midori durch Bewegen der Maus"
+msgstr "Midori durch Bewegen der Maus steuern"
#: ../extensions/shortcuts.c:109
msgid "Reload page or stop loading"
-msgstr "Seite neu laden oder laden abbrechen"
+msgstr "Seite neu laden oder Laden abbrechen"
#: ../extensions/shortcuts.c:176
msgid "Customize Keyboard shortcuts"
@@ -2774,7 +2624,7 @@ msgstr "Tastaturkürzel anpassen"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "Tastaturkürzel anpassen..."
+msgstr "_Tastaturkürzel anpassen …"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2792,35 +2642,35 @@ msgstr "Uhr in der Statusleiste"
msgid "Display date and time in the statusbar"
msgstr "Datum und Zeit in der Statusleiste anzeigen"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Bilder"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Skripte"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Netscape-Module"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Funktionen in der Statusleiste"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "Funktionen auf Internetseiten leicht an- und abstellen"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Reiterleiste"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "_Reiterleiste"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Reiter in einer senkrechten Leiste anzeigen"
@@ -2832,11 +2682,11 @@ msgstr "Nur Symbole in Reitern anzeigen"
msgid "New tabs have no label by default"
msgstr "Neue Reiter haben keine Beschriftung"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Werkzeugleiste anpassen"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2844,34 +2694,278 @@ msgstr ""
"Wähle Elemente, die in der Werkzeugleiste erscheinen sollen. Elemente lassen "
"sich durch Ziehen und Ablegen ordnen."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Verfügbare Elemente"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Angezeigte Elemente"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "_Werkzeugleiste anpassen..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "_Werkzeugleiste anpassen …"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Anpassen…"
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Werkzeugleisteneditor"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Werkzeugleisten leicht anpassen"
-#: ../extensions/web-cache.c:463
+#: ../extensions/web-cache.c:462
msgid "Cache HTTP communication on disk"
msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern"
+#~ msgid "Remember last window size"
+#~ msgstr "Letzte Fenstergröße merken"
+
+#~ msgid "Whether to save the last window size"
+#~ msgstr "Die letzte Fenstergröße speichern oder nicht"
+
+#~ msgid "Last window width"
+#~ msgstr "Letzte Fensterbreite"
+
+#~ msgid "The last saved window width"
+#~ msgstr "Die zuletzt gespeicherte Fensterbreite"
+
+#~ msgid "Last window height"
+#~ msgstr "Letzte Fensterhöhe"
+
+#~ msgid "The last saved window height"
+#~ msgstr "Die zuletzt gespeicherte Fensterhöhe"
+
+#~ msgid "Last panel position"
+#~ msgstr "Letzte Leistenposition"
+
+#~ msgid "The last saved panel position"
+#~ msgstr "Die zuletzt gespeicherte Leistenposition"
+
+#~ msgid "Last panel page"
+#~ msgstr "Letzte Leistenseite"
+
+#~ msgid "The last saved panel page"
+#~ msgstr "Die zuletzt gespeicherte Leistenseite"
+
+#~ msgid "Last Web search"
+#~ msgstr "Letzte Suche im Netz"
+
+#~ msgid "The last saved Web search"
+#~ msgstr "Die zuletzt gespeicherte Suche im Netz"
+
+#~ msgid "Show Menubar"
+#~ msgstr "Menüleiste anzeigen"
+
+#~ msgid "Whether to show the menubar"
+#~ msgstr "Die Menüleiste anzeigen oder verbergen"
+
+#~ msgid "Show Navigationbar"
+#~ msgstr "Navigationsleiste anzeigen"
+
+#~ msgid "Whether to show the navigationbar"
+#~ msgstr "Die Navigationsleiste anzeigen oder verbergen"
+
+#~ msgid "Show Bookmarkbar"
+#~ msgstr "Lesezeichenleiste anzeigen"
+
+#~ msgid "Whether to show the bookmarkbar"
+#~ msgstr "Die Lesezeichenleiste anzeigen oder verbergen"
+
+#~ msgid "Show Panel"
+#~ msgstr "Leiste anzeigen"
+
+#~ msgid "Whether to show the panel"
+#~ msgstr "Die Leiste anzeigen oder verbergen"
+
+#~ msgid "Show Statusbar"
+#~ msgstr "Statusleiste anzeigen"
+
+#~ msgid "Whether to show the statusbar"
+#~ msgstr "Die Statusleiste anzeigen oder verbergen"
+
+#~ msgid "Toolbar Items"
+#~ msgstr "Werkzeugleistenelemente"
+
+#~ msgid "The items to show on the toolbar"
+#~ msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente"
+
+#~ msgid "Compact Sidepanel"
+#~ msgstr "Kompakte Seitenleiste"
+
+#~ msgid "Whether to make the sidepanel compact"
+#~ msgstr "Die Seitenleiste anzeigen oder verbergen"
+
+#~ msgid "Align sidepanel on the right"
+#~ msgstr "Seitenleiste rechts anordnen"
+
+#~ msgid "Whether to align the sidepanel on the right"
+#~ msgstr "Die Seitenleiste auf der rechten Seite anordnen"
+
+#~ msgid "Open panels in separate windows"
+#~ msgstr "Leisten in eigenen Fenstern öffnen"
+
+#~ msgid "Whether to always open panels in separate windows"
+#~ msgstr ""
+#~ "Legt fest, ob Seitenleisten immer in eigenen Fenstern geöffnet werden "
+#~ "sollen"
+
+#~ msgid "What to do when Midori starts"
+#~ msgstr "Was beim Starten von Midori passieren soll"
+
+#~ msgid "The homepage"
+#~ msgstr "Die Startseite"
+
+#~ msgid "Show crash dialog"
+#~ msgstr "Absturzdialog anzeigen"
+
+#~ msgid "The folder downloaded files are saved to"
+#~ msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden"
+
+#~ msgid "An external text editor"
+#~ msgstr "Ein externer Texteditor"
+
+#~ msgid "An external news aggregator"
+#~ msgstr "Ein externer Nachrichtenaggregator"
+
+#~ msgid "Location entry Search"
+#~ msgstr "Adressfeldsuche"
+
+#~ msgid "The search to perform inside the location entry"
+#~ msgstr "Die Suche, die über das Adressfeld ausgeführt wird"
+
+#~ msgid "The preferred character encoding"
+#~ msgstr "Der bevorzugte Zeichensatz"
+
+#~ msgid "Always show the tabbar"
+#~ msgstr "Die Reiterleiste immer anzeigen"
+
+#~ msgid "Whether tabs have close buttons"
+#~ msgstr "Knöpfe zum Schließen auf Reitern anzeigen oder verbergen"
+
+#~ msgid "Where to open new pages"
+#~ msgstr "Wo neue Seiten geöffnet werden sollen"
+
+#~ msgid "Whether to open new tabs in the background"
+#~ msgstr "Neue Reiter im Hintergrund öffnen"
+
+#~ msgid "Open popups in tabs"
+#~ msgstr "Aufklappfenster in Reitern öffnen"
+
+#~ msgid "Whether to open popup windows in tabs"
+#~ msgstr "Aufklappfenster in neuen Reitern öffnen"
+
+#~ msgid "Load and display images automatically"
+#~ msgstr "Bilder automatisch laden und anzeigen"
+
+#~ msgid "Enable embedded scripting languages"
+#~ msgstr "Eingebettete Skriptsprachen einschalten"
+
+#~ msgid "Enable embedded Netscape plugin objects"
+#~ msgstr "Eingebettete Netscape-Module einschalten"
+
+#~ msgid "Enable spell checking while typing"
+#~ msgstr "Rechtschreibprüfung beim Eintippen einschalten"
+
+#~ msgid "Enable HTML5 database support"
+#~ msgstr "HTML5-Datenbanken einschalten"
+
+#~ msgid "Whether to enable HTML5 database support"
+#~ msgstr "Unterstützung für HTML5-Datenbank einschalten"
+
+#~ msgid "Whether to enable HTML5 local storage support"
+#~ msgstr "Unterstützung für HTML5-Lokalspeicher einschalten"
+
+#~ msgid "Whether to enable offline web application cache"
+#~ msgstr "HTML5-Zwischenspeicher für Internetanwendungen einschalten"
+
+#~ msgid "Flash the browser window if a new tab was opened in the background"
+#~ msgstr ""
+#~ "Browserfenster blinken lassen, wenn ein neuer Reiter im Hintergrund "
+#~ "geöffnet wurde"
+
+#~ msgid "Allow websites to use OpenGL rendering"
+#~ msgstr "Internetseiten erlauben, OpenGL zur Darstellung zu benutzen"
+
+#~ msgid "Whether to zoom text and images"
+#~ msgstr ""
+#~ "Legt fest, ob Text und Bilder gleichermaßen vergrößert werden sollen"
+
+#~ msgid "Find inline while typing"
+#~ msgstr "Inkrementelle Suche beim Eintippen"
+
+#~ msgid "Whether to automatically find inline while typing"
+#~ msgstr ""
+#~ "Legt fest, ob die inkrementelle Suche automatisch beim Eintippen starten "
+#~ "soll"
+
+#~ msgid "The type of proxy server to use"
+#~ msgstr "Die Art des zu verwendenden Zwischenrechners"
+
+#~ msgid "HTTP Proxy Server"
+#~ msgstr "HTTP-Zwischenrechner"
+
+#~ msgid "The proxy server used for HTTP connections"
+#~ msgstr "Der Zwischenrechner für HTTP-Verbindungen"
+
+#~ msgid "The proxy server port used for HTTP connections"
+#~ msgstr "Der Port des Zwischenrechners für HTTP-Verbindungen"
+
+#~ msgid "Identification string"
+#~ msgstr "Identifikationskennung"
+
+#~ msgid "The application identification string"
+#~ msgstr "Die Identifikationskennung der Anwendung"
+
+#~ msgid "Clear private data"
+#~ msgstr "Private Daten löschen"
+
+#~ msgid "The private data selected for deletion"
+#~ msgstr "Zum Löschen ausgewählte private Daten"
+
+#~ msgid "Clear data"
+#~ msgstr "Daten löschen"
+
+#~ msgid "The data selected for deletion"
+#~ msgstr "Zum Löschen ausgewählte Daten"
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Lesezeichen"
+
+#~ msgid "_Console"
+#~ msgstr "_Konsole"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Ande_re Reiter schließen"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Symbol:"
+
+#~ msgid "Filter:"
+#~ msgstr "Filter:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder "
+#~ "Domöne auf den eingegebenen Filter passt."
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Die Lesezeichen konnten nicht gespeichert werden. %s"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Oberster Ordner"
+
+#~ msgid "_Title:"
+#~ msgstr "_Titel:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Ordner:"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Anpassen…"
+
#~ msgid "The specified configuration folder is invalid."
#~ msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden."
@@ -2971,15 +3065,15 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Einen neuen Lesezeichenordner hinzufügen"
-#~ msgid "Add, edit and remove search engines..."
+#~ msgid "Add, edit and remove search engines…"
#~ msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…"
-#~ msgid "Clear private data..."
-#~ msgstr "Private Daten löschen..."
+#~ msgid "Clear private data…"
+#~ msgstr "Private Daten löschen…"
-#~ msgid "Inspect page details and access developer tools..."
+#~ msgid "Inspect page details and access developer tools…"
#~ msgstr ""
-#~ "Einzelheiten der Seite untersuchen und Entwicklerwerkzeuge benutzen..."
+#~ "Einzelheiten der Seite untersuchen und Entwicklerwerkzeuge benutzen…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Zum voherigen Reiter wechseln"
@@ -3035,12 +3129,6 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern"
#~ msgid "Show statusbar"
#~ msgstr "Statusleiste anzeigen"
-#~ msgid "MD5-Checksum:"
-#~ msgstr "MD5-Prüfsumme:"
-
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "SHA1-Prüfsumme:"
-
#~ msgid "No filename specified"
#~ msgstr "Kein Dateiname angegeben"
@@ -3068,8 +3156,8 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern"
#~ msgid "Reset the last _session"
#~ msgstr "Die letzte _Sitzung zurücksetzen"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Werbefilter einstellen..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Werbefilter einstellen…"
#~ msgid "Not found - %s"
#~ msgstr "Nicht gefunden - %s"
@@ -3431,9 +3519,6 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern"
#~ msgid "The character encoding to use by default"
#~ msgstr "Der voreingestellte Zeichensatz"
-#~ msgid "User_styles"
-#~ msgstr "Benutzer_stile"
-
#~ msgid "Resizable text areas"
#~ msgstr "Vergrößerbare Textfelder"
@@ -3449,11 +3534,8 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern"
#~ msgid "Load on Startup"
#~ msgstr "Beim Programmstart öffnen"
-#~ msgid "Configure _Toolbar..."
-#~ msgstr "Werkzeugleiste anpassen..."
-
-#~ msgid "_Enable"
-#~ msgstr "_Einschalten"
+#~ msgid "Configure _Toolbar…"
+#~ msgstr "Werkzeugleiste anpassen…"
#~ msgid "Enable"
#~ msgstr "_Einschalten"
diff --git a/po/el.po b/po/el.po
index be1490b8..724ed775 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: midori git version\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-18 18:18+0000\n"
-"PO-Revision-Date: 2012-04-18 21:44+0300\n"
+"POT-Creation-Date: 2012-08-19 12:06+0000\n"
+"PO-Revision-Date: 2012-08-24 00:38+0300\n"
"Last-Translator: Efstathios Iosifidis \n"
"Language-Team: Ελληνικά, Σύγχρονα \n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -27,16 +27,31 @@ msgid "Browse the Web"
msgstr "Αναζήτηση στον Ιστό"
#: ../data/midori.desktop.in.h:2
-#, fuzzy
msgid "Internet;WWW;Explorer"
-msgstr "Internet Explorer"
+msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:2025 ../midori/main.c:2049
+#: ../midori/main.c:2063 ../midori/midori-websettings.c:315
msgid "Midori"
-msgstr "Μιντόρι"
+msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Περιηγητής Ιστού Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Νέο Παράθυρο Ιδιωτικής Περιήγησης"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1479
+msgid "New Tab"
+msgstr "Νέα καρτέλα"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1476
+msgid "New Window"
+msgstr "Νέο παράθυρο"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Περιηγητής Ιστού"
@@ -48,82 +63,71 @@ msgstr "Ιδιωτική περιήγηση Midori"
msgid "Open a new private browsing window"
msgstr "Άνοιγμα ενός νέου παραθύρου ιδιωτικής περιήγησης"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4505
msgid "Private Browsing"
msgstr "Ιδιωτική περιήγηση"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Οι ρυθμίσεις δεν μπορούν να φορτωθούν: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Η τιμή '%s' δεν είναι έγκυρη για το %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Μη έγκυρη τιμή ρύθμισης '%s'"
-#: ../midori/main.c:380
+#: ../midori/main.c:375
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να φορτωθούν. %s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:429
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Αποτυχία κατά τον καθαρισμό του ιστορικού: %s\n"
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Αποτυχία κατά το άνοιγμα της βάσης: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:523
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Αποτυχία στην διαγραφή των παλιών αντικειμένων από το ιστορικό: %s\n"
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Οι σελιδοδείκτες δεν μπόρεσαν να αποθηκευτούν. %s"
-
-#: ../midori/main.c:633
+#: ../midori/main.c:545
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Οι ρυθμίσεις δεν μπορούν να αποθηκευτούν. %s"
-#: ../midori/main.c:668
+#: ../midori/main.c:571
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να αποθηκευτούν. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:608
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Τα απορρίμματα δεν μπόρεσαν να αποθηκευτούν. %s"
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
+#: ../midori/main.c:681 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Επεκτάσεις"
-#: ../midori/main.c:760
+#: ../midori/main.c:695
msgid "Privacy"
msgstr "Προσωπικό απόρρητο"
-#: ../midori/main.c:772
+#: ../midori/main.c:707
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -131,19 +135,19 @@ msgstr ""
"Τα cookies αποθηκεύουν δεδομένα σύνδεσης, αποθηκεύουν παιχνίδια ή προφίλ "
"χρηστών για διαφημιστικούς λόγους."
-#: ../midori/main.c:828
+#: ../midori/main.c:763
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Η συνεδρία δεν μπόρεσε να αποθηκευτεί. %s"
-#: ../midori/main.c:1046
+#: ../midori/main.c:1001
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Δεν είναι διαθέσιμο κανένα πιστοποιητικό ρίζας. Πιστοποιητικά SSL δεν "
"μπορούν να επιβεβαιωθούν."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1093
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -152,228 +156,225 @@ msgstr ""
"συνεχίζει επανειλημμένα δοκιμάστε μία από τις παρακάτω επιλογές για να "
"επιλύσετε το πρόβλημα."
-#: ../midori/main.c:1134
+#: ../midori/main.c:1112
msgid "Modify _preferences"
msgstr "Τροποποίηση _προτιμήσεων"
-#: ../midori/main.c:1138
+#: ../midori/main.c:1116
msgid "Disable all _extensions"
msgstr "Απενεργοποίηση όλων των επ_εκτάσεων"
-#: ../midori/main.c:1151
+#: ../midori/main.c:1129
msgid "Discard old tabs"
msgstr "Απόρριψη παλιών καρτελών"
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1130 ../midori/midori-websettings.c:223
msgid "Show last tabs without loading"
msgstr "Εμφάνιση των τελευταίων καρτέλων χωρίς φόρτωση"
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1131 ../midori/midori-websettings.c:222
msgid "Show last open tabs"
msgstr "Εμφάνιση των τελευταίων ανοιχτών καρτελών"
-#: ../midori/main.c:1400 ../midori/main.c:2464
+#: ../midori/main.c:1379 ../midori/main.c:2433
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1517
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Το στιγμιότυπο αποθηκεύτηκε στο: %s\n"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1933
msgid "Run ADDRESS as a web application"
msgstr "Άνοιγμα της διεύθυνσης ως διαδικτυακή εφαρμογή"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1933
msgid "ADDRESS"
msgstr "Διεύθυνση"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1936
msgid "Use FOLDER as configuration folder"
msgstr "Χρήση φακέλου ως φάκελος ρύθμισης"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1936
msgid "FOLDER"
msgstr "ΦΑΚΕΛΟΣ"
-#: ../midori/main.c:1957
+#: ../midori/main.c:1939
msgid "Private browsing, no changes are saved"
msgstr "Ιδιωτική περιήγηση, οι τροποποιήσεις δεν αποθηκεύονται"
-#: ../midori/main.c:1959
+#: ../midori/main.c:1941
msgid "Show a diagnostic dialog"
msgstr "Εμφάνιση του διαλόγου διάγνωσης"
-#: ../midori/main.c:1961
+#: ../midori/main.c:1943
msgid "Run the specified filename as javascript"
msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript"
-#: ../midori/main.c:1963
+#: ../midori/main.c:1945
msgid "Take a snapshot of the specified URI"
msgstr "Αποθήκευση του συγκεκριμένου URI"
-#: ../midori/main.c:1965
+#: ../midori/main.c:1947
msgid "Execute the specified command"
msgstr "Εκτέλεση της συγκεκριμένης εντολής"
-#: ../midori/main.c:1967
+#: ../midori/main.c:1949
msgid "List available commands to execute with -e/ --execute"
msgstr "Εμφάνιση των διαθέσιμων εντολών προς εκτέλεση με e-/ --execute"
-#: ../midori/main.c:1969
+#: ../midori/main.c:1951
msgid "Display program version"
msgstr "Προβολή έκδοσης προγράμματος"
-#: ../midori/main.c:1971
+#: ../midori/main.c:1953
msgid "Addresses"
msgstr "Διευθύνσεις"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1955
msgid "Block URIs according to regular expression PATTERN"
msgstr "Εμπόδισε URIs σύμφωνα με την κανονική έκφραση ΜΟΤΙΒΟ"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1955
msgid "PATTERN"
msgstr "ΜΟΤΙΒΟ"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:1959
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Επαναφορά midori μετά από SECONDS δευτερόλεπτα απραγίας"
-#: ../midori/main.c:1977
+#: ../midori/main.c:1959
msgid "SECONDS"
msgstr "ΔΕΥΤΕΡΟΛΕΠΤΑ"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1962
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Ανακατεύθυνση μηνυμάτων κονσόλας στο συγκεκριμένο ΑΡΧΕΙΟ"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1962
msgid "FILENAME"
msgstr "ΟΝΟΜΑ ΑΡΧΕΙΟΥ"
-#: ../midori/main.c:2045
-msgid "[Addresses]"
-msgstr "[Διευθύνσεις"
-
-#: ../midori/main.c:2087
+#: ../midori/main.c:2064
msgid "Please report comments, suggestions and bugs to:"
msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:"
-#: ../midori/main.c:2089
+#: ../midori/main.c:2066
msgid "Check for new versions at:"
msgstr "Έλεγχος για νέα έκδοση στο:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
+#: ../midori/main.c:2161
msgid "Saved logins and _passwords"
msgstr "Αποθηκευμένες συνδέσεις και _συνθηματικά"
-#: ../midori/main.c:2175
+#: ../midori/main.c:2163
msgid "Cookies and Website data"
-msgstr ""
+msgstr "Δεδομένα ιστοσελίδας και Cookies"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
+#: ../midori/main.c:2167 ../midori/midori-websettings.c:1020
#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
msgstr "Προσωρινής μνήμης ιστού"
-#: ../midori/main.c:2182
+#: ../midori/main.c:2170
msgid "Website icons"
msgstr "Εικονίδια ιστότοπων"
-#: ../midori/main.c:2288
+#: ../midori/main.c:2274
msgid "An unknown error occured"
msgstr "Ένα άγνωστο σφάλμα προέκυψε"
-#: ../midori/main.c:2395
+#: ../midori/main.c:2381
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Ένα στιγμιότυπο του Μιντόρι τρέχει ήδη αλλά δεν ανταποκρίνεται.\n"
-#: ../midori/main.c:2431
+#: ../midori/main.c:2415
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n"
-#: ../midori/main.c:2479
+#: ../midori/main.c:2448
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Τα απορρίμματα δεν μπόρεσαν να φορτωθούν: %s\n"
-#: ../midori/main.c:2492
+#: ../midori/main.c:2461
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Το ιστορικό δεν μπόρεσε να φορτωθεί: %s\n"
-#: ../midori/main.c:2508
+#: ../midori/main.c:2476
msgid "The following errors occured:"
msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:"
-#: ../midori/main.c:2524
+#: ../midori/main.c:2492
msgid "_Ignore"
msgstr "Α_γνόησε"
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "_Σελιδοδείκτης"
+#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:545
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Αναπάντεχη ενέργεια '%s'."
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6073
+#: ../midori/midori-app.c:1459 ../midori/midori-browser.c:6435
msgid "_Bookmarks"
msgstr "_Σελιδοδείκτες"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1460
msgid "Add Boo_kmark"
msgstr "Προσθήκη σ_ελιδοδείκτη"
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_Τερματικό"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1461
msgid "_Extensions"
msgstr "_Επεκτάσεις"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4600
+#: ../midori/midori-app.c:1462 ../midori/midori-browser.c:4891
msgid "_History"
msgstr "_Ιστορικό"
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "_Αρχική σελίδα"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1463
msgid "_Userscripts"
msgstr "_Δέσμες εντολών χρήστη"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1464
+msgid "User_styles"
+msgstr "_Στυλ χρήστη"
+
+#: ../midori/midori-app.c:1465
msgid "New _Tab"
msgstr "Νέα _καρτέλα"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1466
msgid "_Transfers"
msgstr "_Μεταφορές"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1467
msgid "Netscape p_lugins"
msgstr "Α_ρθρωμάτων netscape"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1468
msgid "_Closed Tabs"
msgstr "_Κλειστές καρτέλες"
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5229
+#: ../midori/midori-app.c:1469 ../midori/midori-browser.c:5574
msgid "New _Window"
msgstr "Νέο _παράθυρο"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1470
msgid "New _Folder"
msgstr "Νέος _φάκελος"
+#: ../midori/midori-app.c:1499
+msgid "[Addresses]"
+msgstr "[Διευθύνσεις"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Το αρχείο δεν βρέθηκε."
@@ -391,141 +392,127 @@ msgstr "Άγνωστος τύπος συνδέσμου."
msgid "Writing failed."
msgstr "Αποτυχία εγγραφής."
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5311
-#: ../midori/midori-browser.c:5320
+#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5662
+#: ../midori/midori-browser.c:5671
msgid "Reload the current page"
msgstr "Ανανέωση της τρέχουσας σελίδας"
-#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:373 ../midori/midori-browser.c:5668
msgid "Stop loading the current page"
msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:530
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Αποτυχία κατά την ανανέωση του τίτλου: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Αναπάντεχη ενέργεια '%s'."
-
-#: ../midori/midori-browser.c:579
+#: ../midori/midori-browser.c:625
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Ιδιωτική περιήγηση)"
-#: ../midori/midori-browser.c:693 ../midori/midori-browser.c:726
-msgid "Toplevel folder"
-msgstr "Αρχικός φάκελος"
+#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Σελιδοδείκτες"
-#: ../midori/midori-browser.c:784
+#: ../midori/midori-browser.c:837
msgid "New folder"
msgstr "Νέος φάκελος"
-#: ../midori/midori-browser.c:784
+#: ../midori/midori-browser.c:837
msgid "Edit folder"
msgstr "Επεξεργασία φακέλου"
-#: ../midori/midori-browser.c:786
+#: ../midori/midori-browser.c:839
msgid "New bookmark"
msgstr "Νέος σελιδοδείκτης"
-#: ../midori/midori-browser.c:786
+#: ../midori/midori-browser.c:839
msgid "Edit bookmark"
msgstr "Επεξεργασία σελιδοδείκτη"
-#: ../midori/midori-browser.c:828
-msgid "_Title:"
-msgstr "_Τίτλος:"
+#: ../midori/midori-browser.c:873
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr ""
+"Πληκτρολογήστε ένα όνομα γι'αυτόν τον σελιδοδείκτη και επιλέξτε που θα τον "
+"αποθηκεύσετε."
-#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Διεύθυνση:"
-
-#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4337
-msgid "_Folder:"
-msgstr "_Φάκελος:"
-
-#: ../midori/midori-browser.c:887
+#: ../midori/midori-browser.c:934
msgid "Add to _Speed Dial"
msgstr "Προσθήκη στην _γρήγορη σύνδεση"
-#: ../midori/midori-browser.c:900
+#: ../midori/midori-browser.c:940
msgid "Show in the tool_bar"
msgstr "Εμφάνιση στην εργαλειο_θήκη"
-#: ../midori/midori-browser.c:915
+#: ../midori/midori-browser.c:948
msgid "Run as _web application"
msgstr "Εκτέλεση ως _διαδικτυακή εφαρμογή"
-#: ../midori/midori-browser.c:986
+#: ../midori/midori-browser.c:1019
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "Το αρχείο \"%s\" δεν μπορεί να αποθηκευτεί σε αυτόν τον φάκελο."
-#: ../midori/midori-browser.c:988
+#: ../midori/midori-browser.c:1021
#, c-format
msgid "You don't have permission to write in this location."
msgstr "Δεν έχετε δικαιώματα εγγραφής σε αυτή την τοποθεσία"
-#: ../midori/midori-browser.c:995
+#: ../midori/midori-browser.c:1028
#, c-format
msgid "There is not enough free space to download \"%s\"."
msgstr "Δεν υπάρχει αρκετός ελεύθερος χώρος για να κατεβάσετε \"%s\"."
-#: ../midori/midori-browser.c:998
+#: ../midori/midori-browser.c:1031
#, c-format
msgid "The file needs %s but only %s are left."
msgstr "Το αρχείο χρειάζεται %s αλλά έχουν απομείνει μόνο %s."
-#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4406
+#: ../midori/midori-browser.c:1167 ../midori/midori-browser.c:4695
msgid "Save file as"
msgstr "Αποθήκευση αρχείου ως"
-#: ../midori/midori-browser.c:1330
-msgid "New Window"
-msgstr "Νέο παράθυρο"
+#: ../midori/midori-browser.c:1173
+msgid "Save associated _resources"
+msgstr ""
-#: ../midori/midori-browser.c:1330
+#: ../midori/midori-browser.c:1476
msgid "A new window has been opened"
msgstr "Ένα νέο παράθυρο έχει ανοιχθεί"
-#: ../midori/midori-browser.c:1333
-msgid "New Tab"
-msgstr "Νέα καρτέλα"
-
-#: ../midori/midori-browser.c:1333
+#: ../midori/midori-browser.c:1479
msgid "A new tab has been opened"
msgstr "Μια νέα καρτέλα έχει ανοιχθεί"
-#: ../midori/midori-browser.c:1368
+#: ../midori/midori-browser.c:1496
msgid "Error opening the image!"
msgstr "Σφάλμα ανοίγματος εικόνας!"
-#: ../midori/midori-browser.c:1369
+#: ../midori/midori-browser.c:1497
msgid "Can not open selected image in a default viewer."
msgstr ""
+"Αδυναμία ανοίγματος επιλεγμένης εικόνας στον προεπιλεγμένο πρόγραμμα "
+"προβολής εικόνων."
-#: ../midori/midori-browser.c:1375
-#, fuzzy
+#: ../midori/midori-browser.c:1503
msgid "Error downloading the image!"
-msgstr "Σφάλμα κατά την φόρτωση ροής '%s'"
+msgstr "Σφάλμα κατά την λήψη της εικόνας!"
-#: ../midori/midori-browser.c:1376
+#: ../midori/midori-browser.c:1504
msgid "Can not download selected image."
msgstr "Αδυναμία λήψης επιλεγμένης εικόνας."
-#: ../midori/midori-browser.c:1502
+#: ../midori/midori-browser.c:1625
msgid "Save file"
msgstr "Αποθήκευση αρχείου"
-#: ../midori/midori-browser.c:2377
+#: ../midori/midori-browser.c:2528
msgid "Open file"
msgstr "Άνοιγμα αρχείου"
-#: ../midori/midori-browser.c:2509
+#: ../midori/midori-browser.c:2660
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -539,140 +526,154 @@ msgstr ""
"συλλέκτη νέων. Την επόμενη φορά που θα κάνετε click σε εικονίδιο ροής νέων, "
"θα προστεθεί αυτόματα."
-#: ../midori/midori-browser.c:2515 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2666 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Νέα ροή"
-#: ../midori/midori-browser.c:2558 ../midori/midori-browser.c:5380
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2709 ../midori/midori-browser.c:5734
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Προσθήκη ενός νέου σελιδοδείκτη"
-#: ../midori/midori-browser.c:3057 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3253 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Άδειο"
-#: ../midori/midori-browser.c:3477
+#: ../midori/midori-browser.c:3699 ../midori/midori-browser.c:3700
msgid "Toggle text cursor navigation"
msgstr "Εναλλαγή κειμένου κέρσορα πλοήγησης"
-#: ../midori/midori-browser.c:3793 ../midori/midori-browser.c:5766
+#: ../midori/midori-browser.c:3702
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3705
+msgid "_Enable Caret Browsing"
+msgstr "_Ενεργοποίηση Περιήγησης Δρομέα"
+
+#: ../midori/midori-browser.c:4095 ../midori/midori-browser.c:6128
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s\n"
-#: ../midori/midori-browser.c:4125 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4421 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Άνοιγμα όλων σε _καρτέλες"
-#: ../midori/midori-browser.c:4132 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4428 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Άνοιγμα σε νέα_καρτέλα"
-#: ../midori/midori-browser.c:4135 ../midori/midori-view.c:2657
-#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4431 ../midori/midori-view.c:2944
+#: ../midori/midori-view.c:5082 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Άνοιγμα σε νέο _παράθυρο"
-#: ../midori/midori-browser.c:4224
+#: ../midori/midori-browser.c:4520
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4225
+#: ../midori/midori-browser.c:4521
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4226
+#: ../midori/midori-browser.c:4522
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4227
+#: ../midori/midori-browser.c:4523
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4228
+#: ../midori/midori-browser.c:4524
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4229
+#: ../midori/midori-browser.c:4525
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4250
-msgid "Import bookmarks..."
-msgstr "Εισαγωγή συνδέσμων..."
+#: ../midori/midori-browser.c:4526
+msgid "Midori 0.2.6"
+msgstr "Μιντόρι 0.2.6"
-#: ../midori/midori-browser.c:4253 ../midori/midori-browser.c:5385
+#: ../midori/midori-browser.c:4547
+msgid "Import bookmarks…"
+msgstr "_Εισαγωγή σελιδοδεικτών..."
+
+#: ../midori/midori-browser.c:4550 ../midori/midori-browser.c:5739
msgid "_Import bookmarks"
-msgstr "_Εισαγωγή συνδέσμων..."
+msgstr "_Εισαγωγή σελιδοδεικτών..."
-#: ../midori/midori-browser.c:4264
+#: ../midori/midori-browser.c:4561
msgid "_Application:"
msgstr "_Εφαρμογή:"
-#: ../midori/midori-browser.c:4329
+#: ../midori/midori-browser.c:4626
msgid "Import from XBEL or HTML file"
msgstr "Εισαγωγή από αρχείο XBEL ή HTML"
-#: ../midori/midori-browser.c:4364
+#: ../midori/midori-browser.c:4654
msgid "Import from a file"
msgstr "Εισαγωγή από αρχείο"
-#: ../midori/midori-browser.c:4376
+#: ../midori/midori-browser.c:4666
msgid "Failed to import bookmarks"
-msgstr "Αποτυχία εισαγωγής συνδέσμων"
+msgstr "Αποτυχία εισαγωγής σελιδοδεικτών"
-#: ../midori/midori-browser.c:4411
+#: ../midori/midori-browser.c:4700
msgid "XBEL Bookmarks"
msgstr "Σελιδοδείκτες XBEL"
-#: ../midori/midori-browser.c:4416
+#: ../midori/midori-browser.c:4705
msgid "Netscape Bookmarks"
msgstr "Σελιδοδείκτες Netscape"
-#: ../midori/midori-browser.c:4430
+#: ../midori/midori-browser.c:4719
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr ""
"Το Midori μπορεί κάνει εξαγωγή μόνο σε XBEL (*.xbel) και Netscape (*.html)"
-#: ../midori/midori-browser.c:4445
+#: ../midori/midori-browser.c:4734
msgid "Failed to export bookmarks"
-msgstr "Αποτυχία εξαγωγής συνδέσμων"
+msgstr "Αποτυχία εξαγωγής σελιδοδεικτών"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4567
+#: ../midori/midori-browser.c:4856
msgid "Clear Private Data"
msgstr "Καθαρισμός προσωπικών δεδομένων"
-#: ../midori/midori-browser.c:4571
+#: ../midori/midori-browser.c:4860
msgid "_Clear private data"
msgstr "_Καθαρισμός προσωπικών δεδομένων"
-#: ../midori/midori-browser.c:4584
+#: ../midori/midori-browser.c:4875
msgid "Clear the following data:"
msgstr "Καθαρισμός των παρακάτω δεδομένων:"
-#: ../midori/midori-browser.c:4594
+#: ../midori/midori-browser.c:4885
msgid "Last open _tabs"
msgstr "Τελευταίες ανοιχτές _καρτελές"
-#: ../midori/midori-browser.c:4620
+#: ../midori/midori-browser.c:4911
msgid "Clear private data when _quitting Midori"
msgstr "Καθαρισμός προσωπικών δεδομένων κατά τον _τερματισμό του Midori"
-#: ../midori/midori-browser.c:4815
+#: ../midori/midori-browser.c:5126
msgid "A lightweight web browser."
msgstr "Ένας ελαφρύς περιηγητής ιστού"
-#: ../midori/midori-browser.c:4816
+#: ../midori/midori-browser.c:5127
msgid "See about:version for version info."
msgstr "Δείτε στο about:version για πληροφορίες έκδοσης."
-#: ../midori/midori-browser.c:4818
+#: ../midori/midori-browser.c:5129
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -684,363 +685,378 @@ msgstr ""
"License όπως δημοσιεύεται από το Free Software Foundation - είτε έκδοση 2.1 "
"της άδειας, ή (κατά την γνώμη σας) οποιαδήποτε νεώτερη."
-#: ../midori/midori-browser.c:4839
+#: ../midori/midori-browser.c:5159
msgid "translator-credits"
msgstr "Ευάγγελος Μπαλάσκας 2008,2009"
-#: ../midori/midori-browser.c:5227
+#: ../midori/midori-browser.c:5572
msgid "_File"
msgstr "_Αρχείο"
-#: ../midori/midori-browser.c:5230
+#: ../midori/midori-browser.c:5575
msgid "Open a new window"
msgstr "Άνοιγμα ενός νέου παραθύρου"
-#: ../midori/midori-browser.c:5233
+#: ../midori/midori-browser.c:5578
msgid "Open a new tab"
msgstr "Άνοιγμα μίας νέας καρτέλας"
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5580
msgid "New P_rivate Browsing Window"
msgstr "Νέο παράθυρο ιδιωτικής περιήγησης"
-#: ../midori/midori-browser.c:5239
+#: ../midori/midori-browser.c:5584
msgid "Open a file"
msgstr "Άνοιγμα αρχείου"
-#: ../midori/midori-browser.c:5241
-msgid "_Save Page As..."
-msgstr "_Αποθήκευση ως..."
+#: ../midori/midori-browser.c:5586
+msgid "_Save Page As…"
+msgstr "_Αποθήκευση Σελίδας ως..."
-#: ../midori/midori-browser.c:5242
+#: ../midori/midori-browser.c:5587
msgid "Save to a file"
msgstr "Αποθήκευση σε αρχείου"
-#: ../midori/midori-browser.c:5244
+#: ../midori/midori-browser.c:5589
msgid "Add to Speed _dial"
msgstr "Προσθήκη σε γρήγορη σ_ύνδεση"
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5593
msgid "Add Shortcut to the _desktop"
msgstr "Προσθήκη συντόμευσης στην _επιφάνεια εργασίας"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5595
msgid "Create _Launcher"
msgstr "Δημιουργία _εκκινητή"
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5599
msgid "Subscribe to News _feed"
msgstr "Εγγραφή σε _ροή νέων"
-#: ../midori/midori-browser.c:5260
+#: ../midori/midori-browser.c:5605
msgid "_Close Tab"
msgstr "_Κλείσιμο καρτέλας"
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5606
msgid "Close the current tab"
msgstr "Κλείσιμο της τρέχουσας καρτέλας"
-#: ../midori/midori-browser.c:5263
+#: ../midori/midori-browser.c:5608
msgid "C_lose Window"
msgstr "Κ_λείσιμο παραθύρου"
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5612
+msgid "_Share"
+msgstr "_Κοινόχρηστο"
+
+#: ../midori/midori-browser.c:5617
msgid "Print the current page"
msgstr "Εκτύπωση της τρέχουσας σελίδας"
-#: ../midori/midori-browser.c:5269
+#: ../midori/midori-browser.c:5620
msgid "Close a_ll Windows"
msgstr "Κλείσιμο _όλων των παραθύρων"
-#: ../midori/midori-browser.c:5272
+#: ../midori/midori-browser.c:5623
msgid "_Edit"
msgstr "_Επεξεργασία"
-#: ../midori/midori-browser.c:5295
-msgid "_Find..."
+#: ../midori/midori-browser.c:5646
+msgid "_Find…"
msgstr "_Εύρεση..."
-#: ../midori/midori-browser.c:5296
+#: ../midori/midori-browser.c:5647
msgid "Find a word or phrase in the page"
msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα"
-#: ../midori/midori-browser.c:5298
+#: ../midori/midori-browser.c:5649
msgid "Find _Next"
msgstr "Εύρεση επ_όμενο"
-#: ../midori/midori-browser.c:5301
+#: ../midori/midori-browser.c:5652
msgid "Find _Previous"
msgstr "Εύρεση _προηγούμενο"
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5656
msgid "Configure the application preferences"
msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής"
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:5658
msgid "_View"
msgstr "_Εμφάνιση"
-#: ../midori/midori-browser.c:5308
+#: ../midori/midori-browser.c:5659
msgid "_Toolbars"
msgstr "_Εργαλειοθήκες"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5664
msgid "Reload page without caching"
msgstr "Ανανέωση σελίδας χωρίς προσωρινή μνήμη"
-#: ../midori/midori-browser.c:5323
+#: ../midori/midori-browser.c:5674
msgid "Increase the zoom level"
msgstr "Αύξηση του επίπεδου εστίασης"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5677
msgid "Decrease the zoom level"
msgstr "Μείωση του επιπέδου εστίασης"
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5681
msgid "_Encoding"
msgstr "_Κωδικοποίηση"
-#: ../midori/midori-browser.c:5332
+#: ../midori/midori-browser.c:5683
msgid "View So_urce"
msgstr "Προβολή κ_ώδικα"
-#: ../midori/midori-browser.c:5335
+#: ../midori/midori-browser.c:5686
msgid "Ca_ret Browsing"
msgstr "Περιήγηση κέρσορα κειμένου"
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5690
msgid "Toggle fullscreen view"
msgstr "Εναλλαγή σε πλήρη οθόνη"
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5692
msgid "Scroll _Left"
msgstr "Μετακίνηση _αριστερά"
-#: ../midori/midori-browser.c:5344
+#: ../midori/midori-browser.c:5695
msgid "Scroll _Down"
msgstr "Μετακίνηση _κάτω"
-#: ../midori/midori-browser.c:5347
+#: ../midori/midori-browser.c:5698
msgid "Scroll _Up"
msgstr "Μετακίνηση _επάνω"
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5701
msgid "Scroll _Right"
msgstr "Μετακίνηση _δεξιά"
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:5704
+msgid "_Readable"
+msgstr "_Αναγνώσιμο"
+
+#: ../midori/midori-browser.c:5707
msgid "_Go"
msgstr "_Μετάβαση"
-#: ../midori/midori-browser.c:5356
+#: ../midori/midori-browser.c:5710
msgid "Go back to the previous page"
msgstr "Μετάβαση στην προηγούμενη σελίδα"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5713
msgid "Go forward to the next page"
msgstr "Μετάβαση στην επόμενη σελίδα"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5717
msgid "Go to the previous sub-page"
msgstr "Μετάβαση στην προηγούμενη υπό-σελίδα"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5367
+#: ../midori/midori-browser.c:5721
msgid "Go to the next sub-page"
msgstr "Μετάβαση στην επόμενη υπό-σελίδα"
-#: ../midori/midori-browser.c:5370
+#: ../midori/midori-browser.c:5723
+msgid "_Homepage"
+msgstr "_Αρχική σελίδα"
+
+#: ../midori/midori-browser.c:5724
msgid "Go to your homepage"
msgstr "Μετάβαση στην αρχική σελίδα"
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5726
msgid "Empty Trash"
msgstr "Άδειασμα απορριμμάτων"
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5729
msgid "Undo _Close Tab"
msgstr "Αναίρεση κλ_είσιμο καρτέλας"
-#: ../midori/midori-browser.c:5382
+#: ../midori/midori-browser.c:5736
msgid "Add a new _folder"
msgstr "Προσθήκη ενός νέου φ_ακέλου"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5742
msgid "_Export bookmarks"
-msgstr "_Εξαγωγή συνδέσμων"
+msgstr "_Εξαγωγή σελιδοδεικτών"
-#: ../midori/midori-browser.c:5391 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5745 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "_Διαχείριση των μηχανών αναζήτησης"
-#: ../midori/midori-browser.c:5394
+#: ../midori/midori-browser.c:5748
msgid "_Clear Private Data"
msgstr "_Καθαρισμός προσωπικών δεδομένων"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5751
msgid "_Inspect Page"
msgstr "_Εξέταση σελίδας"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5755
msgid "_Previous Tab"
msgstr "_Προηγούμενη καρτέλα"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5758
msgid "_Next Tab"
msgstr "Επόμε_νη καρτέλα"
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5760
msgid "Move Tab _Backward"
msgstr "Μετακίνηση καρτέλας _πίσω"
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5762
msgid "_Move Tab Forward"
msgstr "_Μετακίνηση καρτέλας εμπρός"
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5765
msgid "Focus _Current Tab"
msgstr "Εστίαση στην _ισχύουσα καρτέλα"
-#: ../midori/midori-browser.c:5414
+#: ../midori/midori-browser.c:5768
msgid "Focus _Next view"
msgstr "Εστίαση στην _επόμενη προβολή"
-#: ../midori/midori-browser.c:5417
+#: ../midori/midori-browser.c:5771
msgid "Only show the Icon of the _Current Tab"
msgstr "Εμφάνιση μόνο του εικονιδίου της _τρέχουσας καρτέλας"
-#: ../midori/midori-browser.c:5420
+#: ../midori/midori-browser.c:5774
msgid "_Duplicate Current Tab"
msgstr "_Διπλασίασε την τρέχουσα καρτέλα"
-#: ../midori/midori-browser.c:5423
+#: ../midori/midori-browser.c:5777
msgid "Close Ot_her Tabs"
msgstr "Κλείσιμο των άλλ_ων καρτελών"
-#: ../midori/midori-browser.c:5426
+#: ../midori/midori-browser.c:5780
msgid "Open last _session"
msgstr "Επαναφορά της τελευταίας _συνεδρίας"
-#: ../midori/midori-browser.c:5429
+#: ../midori/midori-browser.c:5783
msgid "_Help"
msgstr "_Βοήθεια"
-#: ../midori/midori-browser.c:5431
+#: ../midori/midori-browser.c:5785
msgid "_Frequent Questions"
msgstr "Σ_υχνές ερωτήσεις"
-#: ../midori/midori-browser.c:5434
-msgid "_Report a Problem..."
+#: ../midori/midori-browser.c:5788
+msgid "_Report a Problem…"
msgstr "_Αναφορά προβλήματος..."
-#: ../midori/midori-browser.c:5446
-msgid "_Menubar"
-msgstr "_Μπάρα μενού"
-
-#: ../midori/midori-browser.c:5450
-msgid "_Navigationbar"
-msgstr "_Μπάρα περιήγησης"
-
-#: ../midori/midori-browser.c:5454
-msgid "Side_panel"
-msgstr "Πλαϊνό _πλαίσιο"
-
-#: ../midori/midori-browser.c:5455
-msgid "Sidepanel"
-msgstr "Πλαϊνό πλαίσιο"
-
-#: ../midori/midori-browser.c:5458
-msgid "_Bookmarkbar"
-msgstr "_Μπάρα σελιδοδείκτη"
-
-#: ../midori/midori-browser.c:5462
-msgid "_Statusbar"
-msgstr "_Γραμμή κατάστασης"
-
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:311
-msgid "_Automatic"
-msgstr "_Αυτόματα"
-
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "Κινέζικα (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5478
-msgid "Japanese (SHIFT__JIS)"
-msgstr "Ιαπωνικά (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:5481 ../midori/midori-websettings.c:238
-msgid "Korean (EUC-KR)"
-msgstr "Κορεάτικα (EUC-KR)"
-
-#: ../midori/midori-browser.c:5484 ../midori/midori-websettings.c:239
-msgid "Russian (KOI8-R)"
-msgstr "Ρωσικά (KOI8-R)"
-
-#: ../midori/midori-browser.c:5487 ../midori/midori-websettings.c:240
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-browser.c:5490 ../midori/midori-websettings.c:241
-msgid "Western (ISO-8859-1)"
-msgstr "Δυτικά (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5493 ../midori/midori-websettings.c:242
-#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Προσαρμογή..."
-
-#: ../midori/midori-browser.c:5998
-msgid "_Separator"
-msgstr "_Διαχωριστής"
-
-#: ../midori/midori-browser.c:6005
-msgid "_Location..."
-msgstr "_Τοποθεσία:"
-
-#: ../midori/midori-browser.c:6007
-msgid "Open a particular location"
-msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας"
-
-#: ../midori/midori-browser.c:6029
-msgid "_Web Search..."
-msgstr "_Αναζήτηση ιστού..."
-
-#: ../midori/midori-browser.c:6031
-msgid "Run a web search"
-msgstr "Εκκίνηση μίας αναζήτησης ιστού"
-
-#: ../midori/midori-browser.c:6058
-msgid "Reopen a previously closed tab or window"
-msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει"
-
-#: ../midori/midori-browser.c:6075
-msgid "Show the saved bookmarks"
-msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών"
-
-#: ../midori/midori-browser.c:6092
+#: ../midori/midori-browser.c:5793 ../midori/midori-browser.c:6454
msgid "_Tools"
msgstr "_Εργαλεία"
-#: ../midori/midori-browser.c:6108
+#: ../midori/midori-browser.c:5800
+msgid "_Menubar"
+msgstr "_Μπάρα μενού"
+
+#: ../midori/midori-browser.c:5804
+msgid "_Navigationbar"
+msgstr "_Μπάρα περιήγησης"
+
+#: ../midori/midori-browser.c:5808
+msgid "Side_panel"
+msgstr "Πλαϊνό _πλαίσιο"
+
+#: ../midori/midori-browser.c:5809
+msgid "Sidepanel"
+msgstr "Πλαϊνό πλαίσιο"
+
+#: ../midori/midori-browser.c:5812
+msgid "_Bookmarkbar"
+msgstr "_Μπάρα σελιδοδείκτη"
+
+#: ../midori/midori-browser.c:5816
+msgid "_Statusbar"
+msgstr "_Γραμμή κατάστασης"
+
+#: ../midori/midori-browser.c:5825 ../midori/midori-websettings.c:314
+msgid "_Automatic"
+msgstr "_Αυτόματα"
+
+#: ../midori/midori-browser.c:5828 ../midori/midori-websettings.c:238
+msgid "Chinese Traditional (BIG5)"
+msgstr "Παραδοσιακά Κινέζικα (BIG5)"
+
+#: ../midori/midori-browser.c:5831 ../midori/midori-websettings.c:239
+msgid "Chinese Simplified (GB18030)"
+msgstr "Απλοποιημένα Κινέζικα (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5835
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Ιαπωνικά (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5838 ../midori/midori-websettings.c:241
+msgid "Korean (EUC-KR)"
+msgstr "Κορεάτικα (EUC-KR)"
+
+#: ../midori/midori-browser.c:5841 ../midori/midori-websettings.c:242
+msgid "Russian (KOI8-R)"
+msgstr "Ρωσικά (KOI8-R)"
+
+#: ../midori/midori-browser.c:5844 ../midori/midori-websettings.c:243
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5847 ../midori/midori-websettings.c:244
+msgid "Western (ISO-8859-1)"
+msgstr "Δυτικά (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5850
+msgid "Custom…"
+msgstr "Προσαρμοσμένο..."
+
+#: ../midori/midori-browser.c:6360
+msgid "_Separator"
+msgstr "_Διαχωριστής"
+
+#: ../midori/midori-browser.c:6367
+msgid "_Location…"
+msgstr "_Τοποθεσία..."
+
+#: ../midori/midori-browser.c:6369
+msgid "Open a particular location"
+msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας"
+
+#: ../midori/midori-browser.c:6391
+msgid "_Web Search…"
+msgstr "_Αναζήτηση ιστού..."
+
+#: ../midori/midori-browser.c:6393
+msgid "Run a web search"
+msgstr "Εκκίνηση μίας αναζήτησης ιστού"
+
+#: ../midori/midori-browser.c:6420
+msgid "Reopen a previously closed tab or window"
+msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει"
+
+#: ../midori/midori-browser.c:6437
+msgid "Show the saved bookmarks"
+msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών"
+
+#: ../midori/midori-browser.c:6470
msgid "_Window"
msgstr "_Παράθυρο"
-#: ../midori/midori-browser.c:6110
+#: ../midori/midori-browser.c:6472
msgid "Show a list of all open tabs"
msgstr "Εμφάνιση μίας λίστας με όλες τις ανοιχτές καρτέλες"
-#: ../midori/midori-browser.c:6124
+#: ../midori/midori-browser.c:6486
msgid "_Menu"
msgstr "_Μενού"
-#: ../midori/midori-browser.c:6126
+#: ../midori/midori-browser.c:6488
msgid "Menu"
msgstr "Μενού"
-#: ../midori/midori-browser.c:6940
+#: ../midori/midori-browser.c:7313
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Αναπάντεχη ρύθμιση '%s'"
@@ -1052,555 +1068,617 @@ msgstr "Η ρύθμιση της επέκτασης '%s' δεν μπορεί ν
#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../extensions/addons.c:1688
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "Οι ρυθμίσεις της επέκτασης '%s' δεν μπορεί να αποθηκευτεί: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "Αναζήτηση με %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
msgstr "Αναζήτηση με..."
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "Αποτυχία επιλογής ιστορικό: \n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "Αναζήτηση για %s"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "Εξαγωγή πιστοποιητικού"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "Άγνωστος δημιουργός υπογεγραμμένου πιστοποιητικού."
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"Το πιστοποιητικό δεν ταιριάζει με την αναμενόμενη ταυτότητα της ιστοσελίδας "
+"από την οποία έχει ληφθεί."
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "Ο χρόνος ενεργοποίησης πιστοποιητικού εξακολουθεί να είναι στο μέλλον."
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "Το πιστοποιητικό έχει λήξει"
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Ο αλγόριθμος του πιστοποιητικού θεωρείται μη ασφαλής."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "Παρουσιάστηκαν άλλα σφάλματα κατά τον έλεγχο του πιστοποιητικού."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "_Εξαγωγή πιστοποιητικού"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "Λεπτομέρειες ασφαλείας"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1400
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "Επικόλληση και σ_υνέχεια"
-#: ../midori/midori-locationaction.c:1768
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "Μη επαληθευμένο"
-#: ../midori/midori-locationaction.c:1788
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "Επαληθευμένη και κρυπτογραφημένη σύνδεση"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-locationaction.c:1989
+msgid "Open, unencrypted connection"
+msgstr "Άνοιγμα, μη κρυπτογραφημένης σύνδεσης"
+
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα δεξιά"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Κλείσιμο πλαισίου"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα αριστερά"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:220
msgid "Show Speed Dial"
msgstr "Εμφάνιση γρήγορης κλήσης"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:221
msgid "Show Homepage"
msgstr "Εμφάνιση αρχικής σελίδας"
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:240
msgid "Japanese (SHIFT_JIS)"
msgstr "Ιαπωνικά (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Προσαρμογή..."
+
+#: ../midori/midori-websettings.c:260
msgid "New tab"
msgstr "Νέα καρτέλα"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:261
msgid "New window"
msgstr "Νέο παράθυρο"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:262
msgid "Current tab"
msgstr "Τρέχον καρτέλα"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:277
msgid "Default"
msgstr "Προκαθορισμένο"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:278
msgid "Icons"
msgstr "Εικονίδια"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:279
msgid "Small icons"
msgstr "Μικρά εικονίδια"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:280
msgid "Text"
msgstr "Κείμενο"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:281
msgid "Icons and text"
msgstr "Εικονίδια με κείμενο"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:282
msgid "Text beside icons"
msgstr "Κείμενο δίπλα στα εικονίδια"
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:297
msgid "Automatic (GNOME or environment)"
msgstr "Αυτόματα (Gnome ή περιβάλλον)"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:298
msgid "HTTP proxy server"
msgstr "HTTP διακομιστής μεσολάβησης"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:299
msgid "No proxy server"
msgstr "Κανένας διακομιστής μεσολάβησης"
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:316
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:317
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:318
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:319
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:320
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:400
+#: ../midori/midori-websettings.c:404
msgid "Remember last window size"
msgstr "Απομνημόνευση μεγέθους τελευταίου παραθύρου"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:405
msgid "Whether to save the last window size"
msgstr "Εάν θα αποθηκεύεται το μέγεθος του τελευταίου παραθύρου"
-#: ../midori/midori-websettings.c:409
+#: ../midori/midori-websettings.c:413
msgid "Last window width"
msgstr "Πλάτος τελευταίου παραθύρου"
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:414
msgid "The last saved window width"
msgstr "Το τελευταίο αποθηκευμένο πλάτος παραθύρου"
-#: ../midori/midori-websettings.c:418
+#: ../midori/midori-websettings.c:422
msgid "Last window height"
msgstr "Ύψος τελευταίου παραθύρου"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:423
msgid "The last saved window height"
msgstr "Το τελευταίο ύψος αποθηκευμένου παραθύρου"
-#: ../midori/midori-websettings.c:444
+#: ../midori/midori-websettings.c:448
msgid "Last panel position"
msgstr "Η τελευταία θέση πλαισίου"
-#: ../midori/midori-websettings.c:445
+#: ../midori/midori-websettings.c:449
msgid "The last saved panel position"
msgstr "Η τελευταία αποθηκευμένη θέση πλαισίου"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
+#: ../midori/midori-websettings.c:458
msgid "Last panel page"
msgstr "Η τελευταία σελίδα πλαισίου"
-#: ../midori/midori-websettings.c:455
+#: ../midori/midori-websettings.c:459
msgid "The last saved panel page"
msgstr "Η τελευταία αποθηκευμένη σελίδα πλαισίου"
-#: ../midori/midori-websettings.c:463
+#: ../midori/midori-websettings.c:467
msgid "Last Web search"
msgstr "Τελευταία αναζήτηση ιστού"
-#: ../midori/midori-websettings.c:464
+#: ../midori/midori-websettings.c:468
msgid "The last saved Web search"
msgstr "Η τελευταία αποθηκευμένη αναζήτηση ιστού"
-#: ../midori/midori-websettings.c:473
+#: ../midori/midori-websettings.c:492
msgid "Show Menubar"
msgstr "Εμφάνιση γραμμής μενού"
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:493
msgid "Whether to show the menubar"
msgstr "Εάν θα φαίνεται η μπάρα του μενού"
-#: ../midori/midori-websettings.c:482
+#: ../midori/midori-websettings.c:501
msgid "Show Navigationbar"
msgstr "Εμφάνιση της γραμμής πλοήγησης"
-#: ../midori/midori-websettings.c:483
+#: ../midori/midori-websettings.c:502
msgid "Whether to show the navigationbar"
msgstr "Εάν θα φαίνεται η γραμμή πλοήγησης"
-#: ../midori/midori-websettings.c:491
+#: ../midori/midori-websettings.c:510
msgid "Show Bookmarkbar"
msgstr "Εμφάνιση μπάρας σελιδοδεικτών"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:511
msgid "Whether to show the bookmarkbar"
msgstr "Εάν θα φαίνεται η μπάρα των σελιδοδεικτών"
-#: ../midori/midori-websettings.c:500
+#: ../midori/midori-websettings.c:519
msgid "Show Panel"
msgstr "Εμφάνιση πλαισίου"
-#: ../midori/midori-websettings.c:501
+#: ../midori/midori-websettings.c:520
msgid "Whether to show the panel"
msgstr "Εάν θα φαίνεται το πλαίσιο"
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:528
msgid "Show Statusbar"
msgstr "Εμφάνιση γραμμής κατάστασης"
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:529
msgid "Whether to show the statusbar"
msgstr "Εάν θα φαίνεται η γραμμή κατάστασης"
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:538
msgid "Toolbar Style:"
msgstr "Στυλ εργαλειοθήκης:"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:539
msgid "The style of the toolbar"
msgstr "Το στυλ της εργαλειοθήκης"
-#: ../midori/midori-websettings.c:529
+#: ../midori/midori-websettings.c:548
msgid "Toolbar Items"
msgstr "Αντικείμενα εργαλειοθήκης"
-#: ../midori/midori-websettings.c:530
+#: ../midori/midori-websettings.c:549
msgid "The items to show on the toolbar"
msgstr "Τι αντικείμενα να εμφανίζονται στην εργαλειοθήκη"
-#: ../midori/midori-websettings.c:538
+#: ../midori/midori-websettings.c:557
msgid "Compact Sidepanel"
msgstr "Σύμπτυξη πλαϊνού πλαισίου"
-#: ../midori/midori-websettings.c:539
+#: ../midori/midori-websettings.c:558
msgid "Whether to make the sidepanel compact"
msgstr "Εάν θα γίνει σύμπτυξη του πλαϊνού πλαισίου"
-#: ../midori/midori-websettings.c:554
+#: ../midori/midori-websettings.c:573
msgid "Align sidepanel on the right"
msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα δεξιά"
-#: ../midori/midori-websettings.c:555
+#: ../midori/midori-websettings.c:574
msgid "Whether to align the sidepanel on the right"
msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό πλαίσιο στα δεξιά"
-#: ../midori/midori-websettings.c:570
+#: ../midori/midori-websettings.c:589
msgid "Open panels in separate windows"
msgstr "Άνοιγμα ταμπλών σε ξεχωριστά παράθυρα"
-#: ../midori/midori-websettings.c:571
+#: ../midori/midori-websettings.c:590
msgid "Whether to always open panels in separate windows"
msgstr "Εάν θα ανοίγουν πάντα τα ταμπλό σε ξεχωριστά παράθυρα"
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:599
msgid "When Midori starts:"
msgstr "Κατά την εκκίνηση του midori:"
-#: ../midori/midori-websettings.c:581
+#: ../midori/midori-websettings.c:600
msgid "What to do when Midori starts"
msgstr "Κατά την εκκίνηση του midori να φορτώνει:"
-#: ../midori/midori-websettings.c:590
+#: ../midori/midori-websettings.c:609
msgid "Homepage:"
msgstr "Αρχική σελίδα:"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:610
msgid "The homepage"
msgstr "Η αρχική σελίδα"
-#: ../midori/midori-websettings.c:606
+#: ../midori/midori-websettings.c:625
msgid "Show crash dialog"
msgstr "Εμφάνιση παραθύρου αποτυχίας"
-#: ../midori/midori-websettings.c:607
+#: ../midori/midori-websettings.c:626
msgid "Show a dialog after Midori crashed"
msgstr "Εμφάνιση διαλόγου μετά από αποτυχία"
-#: ../midori/midori-websettings.c:615
+#: ../midori/midori-websettings.c:634
msgid "Save downloaded files to:"
msgstr "Αποθήκευση των αρχείων που κατέβηκαν στο:"
-#: ../midori/midori-websettings.c:616
+#: ../midori/midori-websettings.c:635
msgid "The folder downloaded files are saved to"
msgstr "Ο κατάλογος στον οποίο αποθηκεύονται τα αρχεία που κατεβαίνουν"
-#: ../midori/midori-websettings.c:624
+#: ../midori/midori-websettings.c:643
msgid "Text Editor"
msgstr "Κειμενογράφος"
-#: ../midori/midori-websettings.c:625
+#: ../midori/midori-websettings.c:644
msgid "An external text editor"
msgstr "Εξωτερικός κειμενογράφος"
-#: ../midori/midori-websettings.c:640
+#: ../midori/midori-websettings.c:659
msgid "News Aggregator"
msgstr "Διαχειριστής νέων"
-#: ../midori/midori-websettings.c:641
+#: ../midori/midori-websettings.c:660
msgid "An external news aggregator"
msgstr "Εξωτερικός διαχειριστής νέων"
-#: ../midori/midori-websettings.c:649
+#: ../midori/midori-websettings.c:668
msgid "Location entry Search"
msgstr "Διεύθυνση για αναζήτηση"
-#: ../midori/midori-websettings.c:650
+#: ../midori/midori-websettings.c:669
msgid "The search to perform inside the location entry"
msgstr "Η αναζήτηση να πραγματοποιηθεί εσωτερικά της τοποθεσίας εισαγωγής"
-#: ../midori/midori-websettings.c:658
+#: ../midori/midori-websettings.c:677
msgid "Preferred Encoding"
msgstr "Προτιμώμενη κωδικοποίηση"
-#: ../midori/midori-websettings.c:659
+#: ../midori/midori-websettings.c:678
msgid "The preferred character encoding"
msgstr "Η προτιμώμενη κωδικοποίηση χαρακτήρων"
-#: ../midori/midori-websettings.c:669
+#: ../midori/midori-websettings.c:688
msgid "Always Show Tabbar"
msgstr "Εμφάνιση πάντα της γραμμής καρτελών"
-#: ../midori/midori-websettings.c:670
+#: ../midori/midori-websettings.c:689
msgid "Always show the tabbar"
msgstr "Εμφάνιση πάντα της μπάρας με τις καρτέλες"
-#: ../midori/midori-websettings.c:683
+#: ../midori/midori-websettings.c:702
msgid "Close Buttons on Tabs"
msgstr "Κουμπιά κλεισίματος στις καρτέλες"
-#: ../midori/midori-websettings.c:684
+#: ../midori/midori-websettings.c:703
msgid "Whether tabs have close buttons"
msgstr "Εάν οι καρτέλες θα έχουν κουμπί κλεισίματος"
-#: ../midori/midori-websettings.c:709
+#: ../midori/midori-websettings.c:728
msgid "Open new pages in:"
msgstr "Άνοιγμα νέων σελίδων σε:"
-#: ../midori/midori-websettings.c:710
+#: ../midori/midori-websettings.c:729
msgid "Where to open new pages"
msgstr "Που να ανοίγουν οι νέες σελίδες"
-#: ../midori/midori-websettings.c:719
+#: ../midori/midori-websettings.c:738
msgid "Middle click opens Selection"
msgstr "Το μεσαίο κλικ ανοίγει την Επιλογή"
-#: ../midori/midori-websettings.c:720
+#: ../midori/midori-websettings.c:739
msgid "Load an address from the selection via middle click"
msgstr "Φόρτωση μίας διεύθυνσης από την επιλογή μέσω του μεσαίου κλικ"
-#: ../midori/midori-websettings.c:728
+#: ../midori/midori-websettings.c:747
msgid "Open tabs in the background"
msgstr "Άνοιγμα των καρτελών στο παρασκήνιο"
-#: ../midori/midori-websettings.c:729
+#: ../midori/midori-websettings.c:748
msgid "Whether to open new tabs in the background"
msgstr "Εάν θα ανοίγονται νέες καρτέλες στο παρασκήνιο"
-#: ../midori/midori-websettings.c:737
+#: ../midori/midori-websettings.c:756
msgid "Open Tabs next to Current"
msgstr "Άνοιγμα των καρτελών δίπλα στο τρέχων"
-#: ../midori/midori-websettings.c:738
+#: ../midori/midori-websettings.c:757
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr ""
"Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την "
"τελευταία"
-#: ../midori/midori-websettings.c:746
+#: ../midori/midori-websettings.c:765
msgid "Open popups in tabs"
msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες"
-#: ../midori/midori-websettings.c:747
+#: ../midori/midori-websettings.c:766
msgid "Whether to open popup windows in tabs"
msgstr "Εάν θα ανοίγονται τα αναδυόμενα παράθυρα σε καρτέλες"
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
+#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155
msgid "Load images automatically"
msgstr "Αυτόματη φόρτωση εικόνων"
-#: ../midori/midori-websettings.c:758
+#: ../midori/midori-websettings.c:777
msgid "Load and display images automatically"
msgstr "Αυτόματη φόρτωση και εμφάνιση εικόνων"
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
+#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165
msgid "Enable scripts"
msgstr "Ενεργοποίηση δεσμών εντολών"
-#: ../midori/midori-websettings.c:766
+#: ../midori/midori-websettings.c:785
msgid "Enable embedded scripting languages"
msgstr "Ενεργοποίηση ενσωματωμένων γλωσσών κειμένου"
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
+#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177
msgid "Enable Netscape plugins"
msgstr "Ενεργοποίηση αρθρωμάτων netscape"
-#: ../midori/midori-websettings.c:774
+#: ../midori/midori-websettings.c:793
msgid "Enable embedded Netscape plugin objects"
msgstr "Ενεργοποίηση ενσωματωμένων αρθρωμάτων netscape"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:808
msgid "Enable Spell Checking"
msgstr "Ενεργοποίηση ορθογραφίας"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:809
msgid "Enable spell checking while typing"
msgstr "Ενεργοποίηση ορθογραφίας κατά την πληκτρολόγηση"
-#: ../midori/midori-websettings.c:796
+#: ../midori/midori-websettings.c:815
msgid "Enable HTML5 database support"
msgstr "Ενεργοποίηση υποστήριξης βάσης δεδομένων HTML5"
-#: ../midori/midori-websettings.c:797
+#: ../midori/midori-websettings.c:816
msgid "Whether to enable HTML5 database support"
msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5"
-#: ../midori/midori-websettings.c:803
+#: ../midori/midori-websettings.c:822
msgid "Enable HTML5 local storage support"
msgstr "Ενεργοποίηση τοπικής υποστήριξης αποθήκευσης HTML5"
-#: ../midori/midori-websettings.c:804
+#: ../midori/midori-websettings.c:823
msgid "Whether to enable HTML5 local storage support"
msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5"
-#: ../midori/midori-websettings.c:810
+#: ../midori/midori-websettings.c:829
msgid "Enable offline web application cache"
msgstr "Ενεργοποίηση προσωρινής μνήμης δικτυακή εφαρμογής εκτός σύνδεσης"
-#: ../midori/midori-websettings.c:811
+#: ../midori/midori-websettings.c:830
msgid "Whether to enable offline web application cache"
msgstr "Εάν θα ενεργοποιηθεί η προσωρινή μνήμη της εφαρμογής εκτός σύνδεσης"
-#: ../midori/midori-websettings.c:827
+#: ../midori/midori-websettings.c:851
msgid "Flash window on background tabs"
msgstr "Αναβόσβησε το παράθυρο στις παρασκήνιες καρτέλες"
-#: ../midori/midori-websettings.c:828
+#: ../midori/midori-websettings.c:852
msgid "Flash the browser window if a new tab was opened in the background"
msgstr ""
"Αναβόσβησε το παράθυρο του περιηγητή όταν μία καρτέλα ανοιχθεί στο παρασκήνιο"
-#: ../midori/midori-websettings.c:836
-#, fuzzy
+#: ../midori/midori-websettings.c:860
msgid "Enable WebGL support"
-msgstr "Ενεργοποίηση υποστήριξης βάσης δεδομένων HTML5"
+msgstr "Ενεργοποίηση υποστήριξης WebGL"
-#: ../midori/midori-websettings.c:837
+#: ../midori/midori-websettings.c:861
msgid "Allow websites to use OpenGL rendering"
-msgstr ""
+msgstr "Να επιτρέπεται στις ιστοσελίδες να χρησιμοποιούν αποτύπωση OpenGL"
-#: ../midori/midori-websettings.c:863
+#: ../midori/midori-websettings.c:887
msgid "Zoom Text and Images"
msgstr "Εστίαση κειμένου και εικόνων"
-#: ../midori/midori-websettings.c:864
+#: ../midori/midori-websettings.c:888
msgid "Whether to zoom text and images"
msgstr "Εάν θα εστιάζεται το κείμενο και οι εικόνες"
-#: ../midori/midori-websettings.c:879
+#: ../midori/midori-websettings.c:903
msgid "Find inline while typing"
msgstr "Ενσωματωμένη εύρεση κατά την πληκτρολόγηση"
-#: ../midori/midori-websettings.c:880
+#: ../midori/midori-websettings.c:904
msgid "Whether to automatically find inline while typing"
msgstr "Εάν θα γίνεται αυτόματη ενσωματωμένη αναζήτηση κατά την πληκτρολόγηση"
-#: ../midori/midori-websettings.c:895
+#: ../midori/midori-websettings.c:919
msgid "Kinetic scrolling"
msgstr "Κινητική κύλιση"
-#: ../midori/midori-websettings.c:896
+#: ../midori/midori-websettings.c:920
msgid "Whether scrolling should kinetically move according to speed"
msgstr "Εάν η κύλιση θα κινείται ανάλογα με την ταχύτητα "
-#: ../midori/midori-websettings.c:904
+#: ../midori/midori-websettings.c:928
msgid "Delete old Cookies after:"
msgstr "Διαγραφή παλιών cookies μετά από:"
-#: ../midori/midori-websettings.c:905
+#: ../midori/midori-websettings.c:929
msgid "The maximum number of days to save cookies for"
msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση των cookies"
-#: ../midori/midori-websettings.c:921
+#: ../midori/midori-websettings.c:945
msgid "Only accept Cookies from sites you visit"
msgstr "Αποδοχή Cookies μόνο από τα επισκεπτόμενους ιστότοπους"
-#: ../midori/midori-websettings.c:922
+#: ../midori/midori-websettings.c:946
msgid "Block cookies sent by third-party websites"
msgstr "Εμπόδισε cookies που στέλνονται από τρίτους ιστότοπους "
-#: ../midori/midori-websettings.c:936
+#: ../midori/midori-websettings.c:960
msgid "Delete pages from history after:"
msgstr "Διαγραφή σελίδων από το ιστορικό μετά από:"
-#: ../midori/midori-websettings.c:937
+#: ../midori/midori-websettings.c:961
msgid "The maximum number of days to save the history for"
msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση του ιστορικού"
-#: ../midori/midori-websettings.c:952
+#: ../midori/midori-websettings.c:976
msgid "Proxy server"
msgstr "Διακομιστής μεσολάβησης"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:977
msgid "The type of proxy server to use"
msgstr "Ο τύπος του διακομιστής προς χρήση"
-#: ../midori/midori-websettings.c:962
+#: ../midori/midori-websettings.c:986
msgid "HTTP Proxy Server"
msgstr "HTTP διακομιστής μεσολάβησης"
-#: ../midori/midori-websettings.c:963
+#: ../midori/midori-websettings.c:987
msgid "The proxy server used for HTTP connections"
msgstr "Ο μεσολαβητής χρησιμοποιείται για http συνδέσεις"
-#: ../midori/midori-websettings.c:978
+#: ../midori/midori-websettings.c:1002
msgid "Port"
msgstr "Πόρτα"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:1003
msgid "The proxy server port used for HTTP connections"
msgstr "Η πόρτα του μεσολαβητή χρησιμοποιείται για HTTP συνδέσεις"
-#: ../midori/midori-websettings.c:997
+#: ../midori/midori-websettings.c:1021
msgid "The maximum size of cached pages on disk"
msgstr "Το μέγιστο μέγεθος των προσωρινά αποθηκευμένων σελίδων στο δίσκο"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
+#: ../midori/midori-websettings.c:1038
msgid "Identify as"
msgstr "Αναγνώριση ως"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1039
msgid "What to identify as to web pages"
msgstr "Με τι να αναγνωρίζεται στις σελίδες ιστού"
-#: ../midori/midori-websettings.c:1031
+#: ../midori/midori-websettings.c:1055
msgid "Identification string"
msgstr "Αλφαριθμητικό αναγνώρισης"
-#: ../midori/midori-websettings.c:1032
+#: ../midori/midori-websettings.c:1056
msgid "The application identification string"
msgstr "Το αλφαριθμητικό αναγνώρισης της εφαρμογής"
-#: ../midori/midori-websettings.c:1048
+#: ../midori/midori-websettings.c:1072
msgid "Preferred languages"
msgstr "Προτιμώμενες γλώσσες"
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:1073
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1609,449 +1687,476 @@ msgstr ""
"πολυγλωσσικών ιστοσελίδων, για παράδειγμα \"de\", \"ru,nl\" or \"en-us;"
"q=1.0, fr-fr;q=0.667\""
-#: ../midori/midori-websettings.c:1064
+#: ../midori/midori-websettings.c:1088
msgid "Clear private data"
msgstr "Καθαρισμός προσωπικών δεδομένων"
-#: ../midori/midori-websettings.c:1065
+#: ../midori/midori-websettings.c:1089
msgid "The private data selected for deletion"
msgstr "Τα προσωπικά δεδομένα που επιλέχθηκαν για διαγραφή"
-#: ../midori/midori-websettings.c:1080
+#: ../midori/midori-websettings.c:1104
msgid "Clear data"
msgstr "Καθαρισμός δεδομένων"
-#: ../midori/midori-websettings.c:1081
+#: ../midori/midori-websettings.c:1105
msgid "The data selected for deletion"
msgstr "Τα δεδομένα που επιλέχθηκαν για διαγραφή"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
+#: ../midori/midori-websettings.c:1154
msgid "Strip referrer details sent to websites"
msgstr "Αφαίρεση λεπτομερειών referrer που αποστέλλονται σε ιστοσελίδες"
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
+#: ../midori/midori-websettings.c:1156
msgid "Whether the \"Referer\" header should be shortened to the hostname"
msgstr "Εάν η κεφαλίδα \"Referer\" θα πρέπει να συντομεύσει στο hostname"
-#: ../midori/midori-websettings.c:1146
+#: ../midori/midori-websettings.c:1170
msgid "Always use my font choices"
msgstr "Πάντα χρήση των δικών μου επιλογών γραμματοσειράς"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:1171
msgid "Override fonts picked by websites with user preferences"
msgstr ""
"Παράκαμψη της επιλογής των γραμματοσειρών των ιστότοπων με τις επιλογές του "
"χρήστη"
-#: ../midori/midori-view.c:1360
+#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140
+msgid "Trust this website"
+msgstr "Έμπιστη ιστοσελίδα"
+
+#: ../midori/midori-view.c:1138
+msgid "Security unknown"
+msgstr "Άγνωστη ασφάλεια"
+
+#: ../midori/midori-view.c:1436
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s θέλει να σώσει μια βάση δεδομένων HTML5."
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Deny"
msgstr "_Άρνηση"
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Allow"
msgstr "_Αποδοχή"
-#: ../midori/midori-view.c:1392
+#: ../midori/midori-view.c:1469
#, c-format
msgid "%s wants to know your location."
msgstr "%s θέλει να ξέρει τη θέση σας."
-#: ../midori/midori-view.c:1485
+#: ../midori/midori-view.c:1565
#, c-format
msgid "Error - %s"
msgstr "Σφάλμα- %s"
-#: ../midori/midori-view.c:1486
+#: ../midori/midori-view.c:1566
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Η σελίδα '%s' δεν μπορεί να φορτωθεί."
-#: ../midori/midori-view.c:1488
+#: ../midori/midori-view.c:1568
msgid "Try again"
msgstr "Δοκιμάστε ξανά"
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
+#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2879
#, c-format
msgid "Send a message to %s"
msgstr "Αποστολή μηνύματος στο: %s"
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
+#: ../midori/midori-view.c:2665
+msgid "Add _search engine..."
+msgstr "Προσθήκη _μηχανής αναζήτησης..."
+
+#: ../midori/midori-view.c:2709 ../midori/midori-view.c:3035
msgid "Inspect _Element"
msgstr "Εξέταση _στοιχείου"
-#: ../midori/midori-view.c:2480
+#: ../midori/midori-view.c:2761
msgid "Open Link in New _Tab"
msgstr "Άνοιγμα συνδέσμου σε νέα κ_αρτέλα"
-#: ../midori/midori-view.c:2484
+#: ../midori/midori-view.c:2765
msgid "Open Link in _Foreground Tab"
msgstr "Άνοιγμα συνδέσμου σε νέα καρτέλα στο π_ροσκήνιο"
-#: ../midori/midori-view.c:2485
+#: ../midori/midori-view.c:2766
msgid "Open Link in _Background Tab"
msgstr "Άνοιγμα συνδέσμου σε καρτέλα στο _παρασκήνιο"
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2769
msgid "Open Link in New _Window"
msgstr "Άνοιγμα συνδέσμου σε νέο _παράθυρο"
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2772
msgid "Open Link as Web A_pplication"
msgstr "Άνοιγμα ως δικτυακή εφ_αρμογή"
-#: ../midori/midori-view.c:2496
+#: ../midori/midori-view.c:2777
msgid "Copy Link de_stination"
msgstr "Αντιγραφή συνδέσμου πρ_οορισμού"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2793
msgid "Open _Image in New Tab"
msgstr "Άνοιγμα ει_κόνας σε νέα καρτέλα"
-#: ../midori/midori-view.c:2515
+#: ../midori/midori-view.c:2796
msgid "Copy Image _Address"
msgstr "Αντιγραφή _διεύθυνσης εικόνας"
-#: ../midori/midori-view.c:2518
+#: ../midori/midori-view.c:2799
msgid "Save I_mage"
msgstr "Αποθήκευση ει_κόνας"
-#: ../midori/midori-view.c:2521
-#, fuzzy
+#: ../midori/midori-view.c:2802
msgid "Open in Image _Viewer"
-msgstr "Άνοιγμα ει_κόνας σε νέα καρτέλα"
+msgstr "Άνοιγμα σε Πρόγραμμα _Προβολής Εικόνας"
-#: ../midori/midori-view.c:2528
+#: ../midori/midori-view.c:2809
msgid "Copy Video _Address"
msgstr "Αντιγραφή _διεύθυνσης βίντεο"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2812
msgid "Save _Video"
msgstr "Αποθήκευση _βίντεο"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2812
msgid "Download _Video"
msgstr "Αποθήκευση _βίντεο"
-#: ../midori/midori-view.c:2557
+#: ../midori/midori-view.c:2838
msgid "Search _with"
msgstr "Αναζήτηση _με"
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:2870
msgid "_Search the Web"
msgstr "_Αναζήτηση στον ιστό"
-#: ../midori/midori-view.c:2606
+#: ../midori/midori-view.c:2887
msgid "Open Address in New _Tab"
msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα"
-#: ../midori/midori-view.c:2909
-msgid "Open or download file"
-msgstr "Άνοιγμα ή κατέβασμα αρχείου"
+#: ../midori/midori-view.c:2940
+msgid "Open _Frame in New Tab"
+msgstr "Άνοιγμα _Πλαισίου σε Νέα Καρτέλα"
-#: ../midori/midori-view.c:2929
+#: ../midori/midori-view.c:3201
#, c-format
-msgid "File Type: '%s'"
-msgstr "Τύπος αρχείου: '%s'"
+msgid "Open or download file from %s"
+msgstr "Άνοιγμα ή λήψη αρχείου από %s"
-#: ../midori/midori-view.c:2931
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Τύπος αρχείου: %s ('%s')"
-
-#: ../midori/midori-view.c:2935
+#: ../midori/midori-view.c:3225
#, c-format
msgid "File Name: %s"
msgstr "Όνομα Αρχείου: %s"
-#: ../midori/midori-view.c:2955
+#: ../midori/midori-view.c:3230
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Τύπος αρχείου: '%s'"
+
+#: ../midori/midori-view.c:3232
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Τύπος αρχείου: %s ('%s')"
+
+#: ../midori/midori-view.c:3267
+#, c-format
+msgid "Size: %s"
+msgstr "Μέγεθος: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3278
#, c-format
msgid "Open %s"
msgstr "Άνοιγμα %s"
-#: ../midori/midori-view.c:3576
+#: ../midori/midori-view.c:3897
#, c-format
msgid "Inspect page - %s"
msgstr "Εξέταση σελίδα -%s"
-#: ../midori/midori-view.c:3923
+#: ../midori/midori-view.c:4252
msgid "Speed Dial"
msgstr "Γρήγορη σύνδεση"
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
+#: ../midori/midori-view.c:4253 ../midori/midori-view.c:4359
msgid "Click to add a shortcut"
msgstr "Κάντε click για προσθήκη συντόμευσης"
-#: ../midori/midori-view.c:3925
+#: ../midori/midori-view.c:4254
msgid "Enter shortcut address"
msgstr "Εισάγεται διεύθυνση συντόμευσης"
-#: ../midori/midori-view.c:3926
+#: ../midori/midori-view.c:4255
msgid "Enter shortcut title"
msgstr "Εισάγετε τίτλο συντόμευσης"
-#: ../midori/midori-view.c:3927
+#: ../midori/midori-view.c:4256
msgid "Are you sure you want to delete this shortcut?"
msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την συντόμευση;"
-#: ../midori/midori-view.c:4089
+#: ../midori/midori-view.c:4429
#, c-format
msgid "No documentation installed"
msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση"
-#: ../midori/midori-view.c:4165
+#: ../midori/midori-view.c:4506
msgid "Midori doesn't store any personal data:"
msgstr "Ο Midori δεν αποθηκεύει προσωπικά δεδομένα:"
-#: ../midori/midori-view.c:4166
+#: ../midori/midori-view.c:4507
msgid "No history or web cookies are being saved."
-msgstr ""
+msgstr "Δεν αποθηκεύτηκαν ιστορικό ή cookies."
-#: ../midori/midori-view.c:4167
+#: ../midori/midori-view.c:4508
msgid "Extensions are disabled."
-msgstr ""
+msgstr "Τα πρόσθετα είναι απενεργοποιημένα."
-#: ../midori/midori-view.c:4168
+#: ../midori/midori-view.c:4509
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
+"Απενεργοποιήθηκαν η αποθήκευση HTML5, η λανθάνουσα μνήμη της τοπική βάση "
+"δεδομένων και εφαρμογών."
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4510
msgid "Midori prevents websites from tracking the user:"
-msgstr ""
+msgstr "Ο Midori αποτρέπει τις ιστοσελίδες να απομνημονεύσουν τον χρήστη:"
-#: ../midori/midori-view.c:4170
+#: ../midori/midori-view.c:4511
msgid "Referrer URLs are stripped down to the hostname."
msgstr ""
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:4512
msgid "DNS prefetching is disabled."
-msgstr ""
+msgstr "Απενεργοποίηση προανάκτησης DNS."
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:4513
msgid "The language and timezone are not revealed to websites."
msgstr "Η γλώσσα και η ζώνη ώρας δεν εμφανίζονται στις ιστοσελίδες."
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:4514
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr ""
+"Το Flash και άλλα πρόσθετα του Netscape δεν μπορούν να βρεθούν σε λίστα από "
+"ιστοσελίδες."
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:4603
msgid "Version numbers in brackets show the version used at runtime."
msgstr ""
"Οι αριθμοί έκδοσης στις παρενθέσεις δείχνουν την έκδοση που χρησιμοποιήθηκε "
"κατά την εκτέλεση."
-#: ../midori/midori-view.c:4278
+#: ../midori/midori-view.c:4653
msgid "Page loading delayed"
msgstr "Καθυστέρηση φόρτωση σελίδας"
-#: ../midori/midori-view.c:4279
+#: ../midori/midori-view.c:4654
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"Καθυστέρηση φόρτωσης είτε λόγω πρόσφατης κατάρρευσης ή εφαρμογής ρυθμίσεων "
"εκκίνησης."
-#: ../midori/midori-view.c:4280
+#: ../midori/midori-view.c:4655
msgid "Load Page"
msgstr "Φόρτωση σελίδας"
-#: ../midori/midori-view.c:4446
+#: ../midori/midori-view.c:4822
msgid "Blank page"
msgstr "Κενή σελίδα"
-#: ../midori/midori-view.c:4708
+#: ../midori/midori-view.c:5086
msgid "_Duplicate Tab"
msgstr "_Διπλότυπη καρτέλα"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:5091
msgid "Show Tab _Label"
msgstr "Εμφάνιση _ετικέτας καρτέλας"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:5091
msgid "Show Tab _Icon Only"
msgstr "Εμφάνιση μόνο των πλακ_ιδίων καρτέλας"
-#: ../midori/midori-view.c:4719
-msgid "Close ot_her Tabs"
-msgstr "Κλείσιμο άλλ_ων καρτελών"
+#: ../midori/midori-view.c:5098
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Κλείσιμο της άλλ_ης καρτέλας"
+msgstr[1] "Κλείσιμο των άλλ_ων καρτελών"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5532
+#: ../midori/midori-view.c:5934
msgid "previous"
msgstr "προηγούμενο"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5551
+#: ../midori/midori-view.c:5953
msgid "next"
msgstr "επόμενο"
-#: ../midori/midori-view.c:5564
+#: ../midori/midori-view.c:5966
msgid "Print background images"
msgstr "Εκτύπωση εικόνων παρασκηνίου"
-#: ../midori/midori-view.c:5565
+#: ../midori/midori-view.c:5967
msgid "Whether background images should be printed"
msgstr "Εάν θα τυπώνονται οι εικόνες παρασκηνίου"
-#: ../midori/midori-view.c:5597
+#: ../midori/midori-view.c:5999
msgid "Features"
msgstr "Χαρακτηριστικά"
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:298
msgid "Startup"
msgstr "Εκκίνηση"
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:311
msgid "Use _current page"
msgstr "Χρήση _τρέχουσας σελίδας"
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:315
msgid "Use current page as homepage"
msgstr "Τρέχουσα σελίδα ως αρχική"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:324
msgid "Fonts"
msgstr "Γραμματοσειρές"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:327
msgid "Proportional Font Family"
msgstr "Αναλογική οικογένεια γραμματοσειράς"
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:331
msgid "The default font family used to display text"
msgstr ""
"Η προκαθορισμένη οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση "
"του κειμένου"
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:334
msgid "The default font size used to display text"
msgstr "Το προκαθορισμένο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου"
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:336
msgid "Fixed-width Font Family"
msgstr "Σταθερού-μεγέθους οικογένεια γραμματοσειράς"
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:340
msgid "The font family used to display fixed-width text"
msgstr ""
"Η οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση σταθερού "
"μεγέθους κειμένου"
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:343
msgid "The font size used to display fixed-width text"
msgstr ""
"Το μέγεθος της γραμματοσειράς που χρησιμοποιείται για την εμφάνιση κειμένου "
"σταθερού μεγέθους"
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:345
msgid "Minimum Font Size"
msgstr "Ελάχιστο μέγεθος γραμματοσειράς"
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:349
msgid "The minimum font size used to display text"
msgstr "Το ελάχιστο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:360
msgid "Behavior"
msgstr "Συμπεριφορά"
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:386
msgid "Allow scripts to open popups"
msgstr "Να επιτρέπονται στις δέσμες εντολών να ανοίγουν αναδυόμενα παράθυρα."
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:387
msgid "Whether scripts are allowed to open popup windows automatically"
msgstr ""
"Εάν θα επιτρέπονται στις δέσμες εντολών να ανοίγουν αυτόματα αναδυόμενα "
"παράθυρα"
#. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:418
msgid "Browsing"
msgstr "Περιήγηση"
#. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:458
msgid "Network"
msgstr "Δίκτυο"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:465
msgid "Hostname"
msgstr "Όνομα διακομιστή"
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:489
msgid "MB"
msgstr "ΜΒ"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Add search engine"
msgstr "Προσθήκη μηχανής αναζήτησης"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Edit search engine"
msgstr "Επεξεργασία μηχανής αναζήτησης"
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:985
msgid "_Name:"
msgstr "_Όνομα:"
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1000
msgid "_Description:"
msgstr "_Περιγραφή:"
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Εικονίδιο:"
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Διεύθυνση:"
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1032
msgid "_Token:"
msgstr "_Μορφότυπο:"
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1330
msgid "Manage Search Engines"
msgstr "Διαχείριση των μηχανών αναζήτησης"
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1432
msgid "Use as _default"
msgstr "Χρήση ως _προκαθορισμένο"
-#: ../midori/sokoke.c:354
+#: ../midori/sokoke.c:346
msgid "Open with"
msgstr "Άνοιγμα με"
-#: ../midori/sokoke.c:362
+#: ../midori/sokoke.c:354
#, c-format
msgid "Choose an application or command to open \"%s\":"
msgstr "Επιλέξτε μια εφαρμογή ή εντολή για να ανοίξει το \"%s\":"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
+#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
msgid "Could not run external program."
msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα."
-#: ../midori/sokoke.c:1595
+#: ../midori/sokoke.c:1529
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d ώρα"
msgstr[1] "%d ώρες"
-#: ../midori/sokoke.c:1596
+#: ../midori/sokoke.c:1530
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d λεπτό"
msgstr[1] "%d λεπτά"
-#: ../midori/sokoke.c:1597
+#: ../midori/sokoke.c:1531
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2059,67 +2164,67 @@ msgstr[0] "%d δευτερόλεπτο"
msgstr[1] "%d δευτερόλεπτα"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
+#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:268
#, c-format
msgid "%s of %s"
msgstr "%s από %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
+#: ../midori/sokoke.c:1548
msgid "?B"
msgstr "?B"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
+#: ../midori/sokoke.c:1551
#, c-format
msgid " (%s/s)"
msgstr " (%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/sokoke.c:1568
#, c-format
msgid " - %s remaining"
msgstr " - %s απομένει"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:265
msgid "_Inline Find:"
msgstr "Ε_νσωματωμένη αναζήτηση:"
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:287
msgid "Previous"
msgstr "Προηγούμενο"
-#: ../toolbars/midori-findbar.c:323
+#: ../toolbars/midori-findbar.c:293
msgid "Next"
msgstr "Επόμενο"
-#: ../toolbars/midori-findbar.c:327
+#: ../toolbars/midori-findbar.c:297
msgid "Match Case"
msgstr "Ταίριασμα πεζών"
-#: ../toolbars/midori-findbar.c:336
+#: ../toolbars/midori-findbar.c:306
msgid "Highlight Matches"
msgstr "Τονισμός των ταιριασμάτων"
-#: ../toolbars/midori-findbar.c:347
+#: ../toolbars/midori-findbar.c:317
msgid "Close Findbar"
msgstr "Κλείσιμο μπάρας εύρεσης"
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:124
#, c-format
msgid "The file '%s ' has been downloaded."
msgstr "Το αρχείο '%s ' έχει κατέβει."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:129
msgid "Transfer completed"
msgstr "Η μεταφορά ολοκληρώθηκε"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:201
msgid "The downloaded file is erroneous."
msgstr "Το αρχείο που κατέβηκε είναι εσφαλμένο."
-#: ../toolbars/midori-transferbar.c:194
+#: ../toolbars/midori-transferbar.c:202
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2127,47 +2232,53 @@ msgstr ""
"Το άθροισμα ελέγχου που παρέχεται με το σύνδεσμο δεν ταιριάζει. Αυτό "
"σημαίνει ότι το αρχείο είναι μάλλον ελλιπές ή τροποποιήθηκε στη συνέχεια."
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:345 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Καθαρισμός όλων"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384
msgid "Some files are being downloaded"
msgstr "Μερικά αρχεία κατεβαίνουν"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:388
msgid "_Quit Midori"
msgstr "_Τερματισμός του Μιντόρι"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:390
msgid "The transfers will be cancelled if Midori quits."
msgstr "Οι μεταφορές θα ακυρωθούν εάν τερματιστεί ο midori."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Σελιδοδείκτες"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Απέτυχε η προσθήκη σελιδοδείκτη: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Αποτυχία ενημέρωσης σελιδοδείκτη: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Επεξεργασία του επιλεγμένου σελιδοδείκτη"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Διαγραφή του επιλεγμένου σελιδοδείκτη"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Προσθήκη ενός νέου φακέλου"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Διαχωριστικό "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Αναζήτηση Σελιδοδεικτών"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Ιστορικό"
@@ -2191,6 +2302,11 @@ msgstr[1] "%d μέρες πριν"
msgid "A week ago"
msgstr "Μια βδομάδα πριν"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr ""
@@ -2208,15 +2324,20 @@ msgstr "Διαγραφή του επιλεγμένου αντικειμένου
msgid "Clear the entire history"
msgstr "Καθαρισμός ολόκληρου του ιστορικού"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Αναζήτηση Ιστορικού"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Μεταφορές"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
msgstr "Άνοιγμα _φακέλου προορισμού"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
msgstr "Αντιγραφή τοποθεσίας σ_υνδέσμου"
@@ -2258,54 +2379,54 @@ msgstr "Το εικονίδιο Stock '%s' δεν μπορεί να φορτωθ
msgid "Animation frames are broken"
msgstr "Τα κινούμενα γραφικά πλαίσια δεν λειτουργούν"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Η ιδιότητα '%s' δεν είναι έγκυρη για το %s"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
#: ../extensions/addons.c:308
msgid "Choose file"
msgstr "Επιλογή αρχείου"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Επιλογή φακέλου"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Κανένα"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 ώρα"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 ημέρα"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 Εβδομάδα"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 μήνας"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 έτος"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Προτιμήσεις για %s"
-#: ../extensions/adblock.c:473
+#: ../extensions/adblock.c:470
msgid "Configure Advertisement filters"
msgstr "Ρύθμιση φίλτρων διαφημίσεων"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:503
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2315,27 +2436,27 @@ msgstr ""
"εισαγωγή κειμένου και πατήστε \"Προσθήκη\" για να την προσθέσετε στην λίστα. "
"Μπορείτε να βρείτε περισσότερες λίστες στο %s."
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:917
msgid "Edit rule"
msgstr "Επεξεργασία κανόνα"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:931
msgid "_Rule:"
msgstr "_Κανόνας:"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:985
msgid "Bl_ock image"
msgstr "Φρ_αγή εικόνας"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:990
msgid "Bl_ock link"
msgstr "Φρ_αγή συνδέσμου"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1689
msgid "Advertisement blocker"
msgstr "Εμποδιστής διαφημίσεων"
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1690
msgid "Block advertisements according to a filter list"
msgstr "Μπλόκαρε διαφημίσεις σύμφωνα με μία λίστα με φίλτρα"
@@ -2365,63 +2486,63 @@ msgstr "_Εγκατάσταση στυλ χρήστη"
msgid "Don't install"
msgstr "Να μην εγκατασταθεί"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:677
msgid "Userscripts"
msgstr "Δέσμες εντολών χρηστών"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:679
msgid "Userstyles"
msgstr "Θέματα χρήστη"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Σφάλμα"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Θέλετε να διαγράψετε το '%s';"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
msgid "Delete user script"
msgstr "Διαγραφή δέσμης εντολών χρήστη"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
msgid "Delete user style"
msgstr "Διαγραφή θεμάτων χρήστη"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Το αρχείο %s θα διαγραφεί μόνιμα."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:566 ../extensions/addons.c:643
msgid "Open in Text Editor"
msgstr "Άνοιγμα στον κειμενογράφο"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:568 ../extensions/addons.c:652
msgid "Open Target Folder"
msgstr "Άνοιγμα φακέλου προορισμού"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:634
msgid "Add new addon"
msgstr "Προσθήκη νέας επέκτασης"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:660
msgid "Remove selected addon"
msgstr "Απομάκρυνση της επιλεγμένης επέκτασης"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
msgid "User addons"
msgstr "Προσθήκες χρήστη"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1819
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Αδυναμία παρακολούθησης του καταλόγου '%s': %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1908
msgid "Support for userscripts and userstyles"
msgstr "Υποστήριξη για δέσμες εντολών χρήστη και στυλ χρήστη"
@@ -2508,29 +2629,21 @@ msgstr ""
"Τομέας : %s\n"
"Cookies : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Όνομα"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "_Ανάπτυξη όλων"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "_Μάζεμα όλων"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Φίλτρο:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Εισαγωγή ενός αλφαριθμητικού φίλτρου για να φαίνονται μόνο τα cookies που το "
-"όνομα ή το πεδίο τομέα ταιριάζει με το φίλτρο που εισάγεται"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Αναζήτηση Cookies ανά Όνομα ή Τομέα"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2637,18 +2750,16 @@ msgid "Failed to add form value: %s\n"
msgstr "Απέτυχε η προσθήκη τιμής φόρμας: %s\n"
#: ../extensions/formhistory/formhistory.c:95
-#, fuzzy
msgid "Form history"
-msgstr "Ιστορικό δεδομένων φόρμας"
+msgstr "Ιστορικό φόρμας"
#: ../extensions/formhistory/formhistory.c:112
-#, fuzzy
msgid ""
"Master password required\n"
"to open password database"
msgstr ""
-"Απαιτείται ένα όνομα χρήσης και ένα συνθηματικό\n"
-"για το άνοιγμα της τοποθεσίας:"
+"Απαιτείται το κυρίως συνθηματικό\n"
+"για το άνοιγμα της βάσης δεδομένων"
#: ../extensions/formhistory/formhistory.c:294
msgid "Remember password on this page?"
@@ -2660,7 +2771,7 @@ msgstr "Απομνημόνευση"
#: ../extensions/formhistory/formhistory.c:300
msgid "Not now"
-msgstr ""
+msgstr "Όχι τώρα"
#: ../extensions/formhistory/formhistory.c:301
msgid "Never for this page"
@@ -2683,11 +2794,9 @@ msgid "Failed to execute database statement: %s\n"
msgstr "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s\n"
#: ../extensions/formhistory/formhistory.c:629
-#, fuzzy
msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
msgstr ""
-"ενεργοποίηση ιστορικότητας φόρμας μόνο μέσω συντόμευσης(Ctrl+Shift+F) ανά "
-"καρτέλα"
+"Ενεργοποίηση ιστορικού φόρμας μέσω συντόμευσης(Ctrl+Shift+F) ανά καρτέλα"
#: ../extensions/formhistory/formhistory.c:668
msgid "Form history filler"
@@ -2699,9 +2808,9 @@ msgstr "Αποθηκεύει το ιστορικό των δεδομένων π
#: ../extensions/formhistory/formhistory-gdom-frontend.c:225
#: ../extensions/formhistory/formhistory-js-frontend.c:106
-#, fuzzy, c-format
+#, c-format
msgid "Failed to select suggestions\n"
-msgstr "Αποτυχία επιλογής ιστορικό: \n"
+msgstr "Αποτυχία επιλογής υποδείξεων\n"
#: ../extensions/history-list.vala:197
msgid "There are no unvisited tabs"
@@ -2798,37 +2907,37 @@ msgstr "Ρολόι στην γραμμή κατάστασης"
msgid "Display date and time in the statusbar"
msgstr "Εμφάνιση ημερομηνίας και ώρας στην γραμμή κατάστασης"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Εικόνες"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Δέσμες εντολών"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Αρθρωμάτων netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Γραμμή κατάστασης χαρακτηριστικών"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr ""
"Εύκολη εναλλαγή χαρακτηριστικών στις ιστοσελίδες ενεργοποίηση και "
"απενεργοποίηση"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Πλαίσιο καρτέλας"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "Πλαίσιο κ_αρτέλας"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Εμφάνιση καρτελών στο κάθετο πλαίσιο"
@@ -2840,11 +2949,11 @@ msgstr "Μόνο εικονίδια στις καρτέλες εξ'ορισμο
msgid "New tabs have no label by default"
msgstr "Οι νέες καρτέλες δεν έχουν ετικέτα εξ'ορισμού"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Προσαρμογή εργαλειοθήκης"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2852,27 +2961,23 @@ msgstr ""
"Επιλέξτε τα αντικείμενα που θα εμφανίζονται στην εργαλειοθήκη. Τα "
"αντικείμενα μπορούνε να ταξινομηθούν κατά την μεταφορά."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Διαθέσιμα αντικείμενα"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Εμφανίσιμα αντικείμενα"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Προσαρμογή _εργαλειοθήκης..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "_Προσαρμογή Εργαλειοθήκης..."
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Προσαρμογή..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Επεξεργασία εργαλειοθήκης"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Εύκολη επεξεργασία της εμφάνισης της εργαλειοθήκης"
@@ -2880,6 +2985,52 @@ msgstr "Εύκολη επεξεργασία της εμφάνισης της ε
msgid "Cache HTTP communication on disk"
msgstr "Προσωρινή μνήμη επικοινωνίας HTTP στο δίσκο"
+#~ msgid "_Bookmark"
+#~ msgstr "_Σελιδοδείκτης"
+
+#~ msgid "_Console"
+#~ msgstr "_Τερματικό"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Αρχικός φάκελος"
+
+#~ msgid "_Title:"
+#~ msgstr "_Τίτλος:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Φάκελος:"
+
+#~ msgid "Import bookmarks..."
+#~ msgstr "Εισαγωγή συνδέσμων..."
+
+#~ msgid "Search with..."
+#~ msgstr "Αναζήτηση με..."
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Κλείσιμο άλλ_ων καρτελών"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Εικονίδιο:"
+
+#~ msgid "Filter:"
+#~ msgstr "Φίλτρο:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Εισαγωγή ενός αλφαριθμητικού φίλτρου για να φαίνονται μόνο τα cookies που "
+#~ "το όνομα ή το πεδίο τομέα ταιριάζει με το φίλτρο που εισάγεται"
+
+#~ msgid "Customize _Toolbar..."
+#~ msgstr "Προσαρμογή _εργαλειοθήκης..."
+
+#~ msgid "_Customize..."
+#~ msgstr "_Προσαρμογή..."
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Οι σελιδοδείκτες δεν μπόρεσαν να αποθηκευτούν. %s"
+
#~ msgid "Lightweight web browser"
#~ msgstr "Ελαφρύς περιηγητής ιστού"
diff --git a/po/en_GB.po b/po/en_GB.po
index 48c7d4cd..f7151ce4 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -595,8 +595,8 @@ msgid "Firefox (%s)"
msgstr "Firefox (%s)"
#: ../midori/midori-browser.c:4239
-msgid "Import bookmarks..."
-msgstr "Import bookmarks..."
+msgid "Import bookmarks…"
+msgstr "Import bookmarks…"
#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
msgid "_Import bookmarks"
@@ -702,8 +702,8 @@ msgid "Open a file"
msgstr "Open a file"
#: ../midori/midori-browser.c:5228
-msgid "_Save Page As..."
-msgstr "_Save Page As..."
+msgid "_Save Page As…"
+msgstr "_Save Page As…"
#: ../midori/midori-browser.c:5229
msgid "Save to a file"
@@ -750,8 +750,8 @@ msgid "_Edit"
msgstr "_Edit"
#: ../midori/midori-browser.c:5282
-msgid "_Find..."
-msgstr "_Find..."
+msgid "_Find…"
+msgstr "_Find…"
#: ../midori/midori-browser.c:5283
msgid "Find a word or phrase in the page"
@@ -924,8 +924,8 @@ msgid "_Frequent Questions"
msgstr "_Frequent Questions"
#: ../midori/midori-browser.c:5421
-msgid "_Report a Problem..."
-msgstr "_Report a Problem..."
+msgid "_Report a Problem…"
+msgstr "_Report a Problem…"
#: ../midori/midori-browser.c:5433
msgid "_Menubar"
@@ -982,24 +982,24 @@ msgstr "Western (ISO-8859-1)"
#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242
#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Custom..."
+msgid "Custom…"
+msgstr "Custom…"
#: ../midori/midori-browser.c:5985
msgid "_Separator"
msgstr "_Separator"
#: ../midori/midori-browser.c:5992
-msgid "_Location..."
-msgstr "_Location..."
+msgid "_Location…"
+msgstr "_Location…"
#: ../midori/midori-browser.c:5994
msgid "Open a particular location"
msgstr "Open a particular location"
#: ../midori/midori-browser.c:6016
-msgid "_Web Search..."
-msgstr "_Web Search..."
+msgid "_Web Search…"
+msgstr "_Web Search…"
#: ../midori/midori-browser.c:6018
msgid "Run a web search"
@@ -1056,8 +1056,8 @@ msgid "Search with %s"
msgstr "Search with %s"
#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Search with..."
+msgid "Search with…"
+msgstr "Search with…"
#: ../midori/midori-locationaction.c:537
#, c-format
@@ -2738,8 +2738,8 @@ msgid "Customize Keyboard shortcuts"
msgstr "Customise Keyboard shortcuts"
#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
-msgstr "Customise Sh_ortcuts..."
+msgid "Customize Sh_ortcuts…"
+msgstr "Customise Sh_ortcuts…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2818,12 +2818,12 @@ msgid "Displayed Items"
msgstr "Displayed Items"
#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Customise _Toolbar..."
+msgid "Customize _Toolbar…"
+msgstr "Customise _Toolbar…"
#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Customise..."
+msgid "_Customize…"
+msgstr "_Customise…"
#: ../extensions/toolbar-editor.c:627
msgid "Toolbar Editor"
@@ -2933,14 +2933,14 @@ msgstr "Cache HTTP communication on disk"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Add a new bookmark folder"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Add, edit and remove search engines..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Add, edit and remove search engines…"
-#~ msgid "Clear private data..."
-#~ msgstr "Clear private data..."
+#~ msgid "Clear private data…"
+#~ msgstr "Clear private data…"
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr "Inspect page details and access developer tools..."
+#~ msgid "Inspect page details and access developer tools…"
+#~ msgstr "Inspect page details and access developer tools…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Switch to the previous tab"
@@ -3164,8 +3164,8 @@ msgstr "Cache HTTP communication on disk"
#~ msgid "days"
#~ msgstr "days"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Configure _Advertisement filters..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Configure _Advertisement filters…"
#~ msgid "Open target folder for selected addon"
#~ msgstr "Open target folder for selected addon"
diff --git a/po/eo.po b/po/eo.po
index 1e36bf43..3df22e17 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -587,8 +587,8 @@ msgid "Firefox (%s)"
msgstr "Fajrfokso (%s)"
#: ../midori/midori-browser.c:4152
-msgid "Import bookmarks..."
-msgstr "Importi legosignojn..."
+msgid "Import bookmarks…"
+msgstr "Importi legosignojn…"
#: ../midori/midori-browser.c:4155 ../midori/midori-browser.c:5244
msgid "_Import bookmarks"
@@ -688,8 +688,8 @@ msgid "Open a file"
msgstr "Malfermi dosieron"
#: ../midori/midori-browser.c:5100
-msgid "_Save Page As..."
-msgstr "Kon_servi paĝon kiel..."
+msgid "_Save Page As…"
+msgstr "Kon_servi paĝon kiel…"
#: ../midori/midori-browser.c:5101
msgid "Save to a file"
@@ -736,8 +736,8 @@ msgid "_Edit"
msgstr "R_edakti"
#: ../midori/midori-browser.c:5154
-msgid "_Find..."
-msgstr "_Trovi..."
+msgid "_Find…"
+msgstr "_Trovi…"
#: ../midori/midori-browser.c:5155
msgid "Find a word or phrase in the page"
@@ -910,7 +910,7 @@ msgid "_Frequent Questions"
msgstr ""
#: ../midori/midori-browser.c:5293
-msgid "_Report a Problem..."
+msgid "_Report a Problem…"
msgstr ""
#: ../midori/midori-browser.c:5305
@@ -968,7 +968,7 @@ msgstr ""
#: ../midori/midori-browser.c:5352 ../midori/midori-websettings.c:238
#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635
-msgid "Custom..."
+msgid "Custom…"
msgstr ""
#: ../midori/midori-browser.c:5858
@@ -976,7 +976,7 @@ msgid "_Separator"
msgstr ""
#: ../midori/midori-browser.c:5865
-msgid "_Location..."
+msgid "_Location…"
msgstr ""
#: ../midori/midori-browser.c:5867
@@ -984,7 +984,7 @@ msgid "Open a particular location"
msgstr ""
#: ../midori/midori-browser.c:5889
-msgid "_Web Search..."
+msgid "_Web Search…"
msgstr ""
#: ../midori/midori-browser.c:5891
@@ -2695,7 +2695,7 @@ msgid "Customize Keyboard shortcuts"
msgstr ""
#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
+msgid "Customize Sh_ortcuts…"
msgstr ""
#: ../extensions/shortcuts.c:320
@@ -2773,11 +2773,11 @@ msgid "Displayed Items"
msgstr ""
#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
+msgid "Customize _Toolbar…"
msgstr ""
#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
+msgid "_Customize…"
msgstr ""
#: ../extensions/toolbar-editor.c:627
diff --git a/po/es.po b/po/es.po
index 8cbe4a92..2d1dcac7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,22 +7,22 @@
# 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: 2012-05-13 15:27+0000\n"
+"POT-Creation-Date: 2012-09-09 16:21+0000\n"
"PO-Revision-Date: 2012-05-13 11:54-0600\n"
"Last-Translator: Sergio García \n"
"Language-Team: Spanish/es \n"
-"Language: es\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.2\n"
"X-Poedit-Language: Spanish\n"
+"X-Generator: Lokalize 1.2\n"
#: ../data/midori.desktop.in.h:1
msgid "Browse the Web"
@@ -32,15 +32,28 @@ msgstr "Navegue por la web"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3
-#: ../midori/main.c:1972
-#: ../midori/main.c:1996
-#: ../midori/main.c:2010
-#: ../midori/midori-websettings.c:313
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1926 ../midori/main.c:1950
+#: ../midori/main.c:1964 ../midori/midori-websettings.c:199
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Navegador web Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Nueva ventana de navegación privada"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1314
+msgid "New Tab"
+msgstr "Nueva pestaña"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1311
+msgid "New Window"
+msgstr "Nueva ventana"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Navegador web"
@@ -52,330 +65,381 @@ msgstr "Midori Navegación Privada"
msgid "Open a new private browsing window"
msgstr "Abrir una nueva ventana de navegación privada"
-#: ../data/midori-private.desktop.in.h:3
-#: ../midori/midori-view.c:4288
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4351
msgid "Private Browsing"
msgstr "Navegación Privada"
-#: ../midori/main.c:97
-#: ../midori/main.c:103
+#: ../midori/main.c:91 ../midori/main.c:97
#, 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:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "El valor «%s» no es válido para %s"
-#: ../midori/main.c:156
-#: ../midori/main.c:260
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Valor de configuración no válido «%s»"
-#: ../midori/main.c:381
+#: ../midori/main.c:365
#, 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:435
+#: ../midori/main.c:419
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "No se pudo vaciar el historial: %s\n"
-#: ../midori/main.c:455
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "No se pudo abrir la base de datos: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:525
+#: ../midori/main.c:513
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "No se pudieron quitar elementos antiguos del historial: %s\n"
-#: ../midori/main.c:547
+#: ../midori/main.c:535
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "No se pudo guardar la configuración. %s"
-#: ../midori/main.c:582
+#: ../midori/main.c:561
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "No se pudieron guardar los motores de búsqueda. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:619
+#: ../midori/main.c:598
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "No se pudo guardar la papelera. %s"
-#: ../midori/main.c:660
-#: ../panels/midori-extensions.c:91
+#: ../midori/main.c:671 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Extensiones"
-#: ../midori/main.c:674
+#: ../midori/main.c:685
msgid "Privacy"
msgstr "Privacidad"
-#: ../midori/main.c:686
-msgid "Cookies store login data, saved games, or user profiles for advertisement purposes."
-msgstr "Las cookies almacenan datos de inicio de sesión, juegos guardados o perfiles de usuario para fines publicitarios."
+#: ../midori/main.c:687
+msgid "Delete old Cookies after:"
+msgstr "Eliminar cookies antiguas después de:"
-#: ../midori/main.c:742
+#: ../midori/main.c:689 ../midori/main.c:692
+msgid "The maximum number of days to save cookies for"
+msgstr "Número máximo de días para conservar las cookies"
+
+#: ../midori/main.c:696
+msgid "Only accept Cookies from sites you visit"
+msgstr "Solo aceptar cookies de los sitios que visite"
+
+#: ../midori/main.c:697
+msgid "Block cookies sent by third-party websites"
+msgstr "Bloquear cookies enviadas por sitios de terceros"
+
+#: ../midori/main.c:702
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Las cookies almacenan datos de inicio de sesión, juegos guardados o perfiles "
+"de usuario para fines publicitarios."
+
+#: ../midori/main.c:709
+msgid "Enable offline web application cache"
+msgstr "Activar caché local de aplicación web"
+
+#: ../midori/main.c:712
+msgid "Enable HTML5 local storage support"
+msgstr "Activar soporte de almacenamiento local HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/main.c:716
+msgid "Strip referrer details sent to websites"
+msgstr "Franja de detalles referentes enviados a los sitios web"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/main.c:718
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Si se debe acortar la cabecera del \\ \"Referer\\ \""
+
+#: ../midori/main.c:721
+msgid "Delete pages from history after:"
+msgstr "Eliminar páginas del historial después de:"
+
+#: ../midori/main.c:723 ../midori/main.c:726
+msgid "The maximum number of days to save the history for"
+msgstr "Número máximo de días para conservar el historial"
+
+#: ../midori/main.c:767
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "No se pudo guardar la sesión. %s"
-#: ../midori/main.c:960
-msgid "No root certificate file is available. SSL certificates cannot be verified."
-msgstr "No hay ningún archivo de cerficado raíz disponible. Los certificados SSL no se pueden verificar."
+#: ../midori/main.c:993
+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:1036
-msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem."
-msgstr "Parece que Midori se cerró insperadamente la última vez. Si esto sucede repetidamente, pruebe una de las siguientes opciones para resolver el problema."
+#: ../midori/main.c:1088
+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:1055
+#: ../midori/main.c:1107
msgid "Modify _preferences"
msgstr "Modificar _preferencias"
-#: ../midori/main.c:1059
+#: ../midori/main.c:1111
msgid "Disable all _extensions"
msgstr "Desactivar todas las _extensiones"
-#: ../midori/main.c:1072
+#: ../midori/main.c:1120
+msgid "Show a dialog after Midori crashed"
+msgstr "Mostrar un dialogo después de que Midori se cuelgue"
+
+#: ../midori/main.c:1125
msgid "Discard old tabs"
msgstr "Descartar las pestañas viejas"
-#: ../midori/main.c:1073
-#: ../midori/midori-websettings.c:221
+#: ../midori/main.c:1126 ../midori/midori-websettings.c:107
msgid "Show last tabs without loading"
msgstr "Mostrar las últimas etiquetas sin cargar"
-#: ../midori/main.c:1074
-#: ../midori/midori-websettings.c:220
+#: ../midori/main.c:1127 ../midori/midori-websettings.c:106
msgid "Show last open tabs"
msgstr "Mostrar las últimas pestañas abiertas"
-#: ../midori/main.c:1321
-#: ../midori/main.c:2399
+#: ../midori/main.c:1374 ../midori/main.c:2378
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "No se pudo cargar la sesión: %s\n"
-#: ../midori/main.c:1459
+#: ../midori/main.c:1512
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Captura guardada en: %s\n"
-#: ../midori/main.c:1875
+#: ../midori/main.c:1841
msgid "Run ADDRESS as a web application"
msgstr "Ejecutar DIRECCIÓN como una aplicación web"
-#: ../midori/main.c:1875
+#: ../midori/main.c:1841
msgid "ADDRESS"
msgstr "DIRECCIÓN"
-#: ../midori/main.c:1878
+#: ../midori/main.c:1844
msgid "Use FOLDER as configuration folder"
msgstr "Utilizar CARPETA como carpeta de configuración"
-#: ../midori/main.c:1878
+#: ../midori/main.c:1844
msgid "FOLDER"
msgstr "CARPETA"
-#: ../midori/main.c:1881
+#: ../midori/main.c:1847
msgid "Private browsing, no changes are saved"
msgstr "Navegación privada, no se guardan los cambios"
-#: ../midori/main.c:1883
+#: ../midori/main.c:1850
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+"Modo portable, Todas los archivos de tiempo de ejecución son guardados en un "
+"mismo lugar"
+
+#: ../midori/main.c:1853
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Ventana plana GTK+ con WebKit, similar a GtkLauncher"
+
+#: ../midori/main.c:1855
msgid "Show a diagnostic dialog"
msgstr "Mostrar diálogo de diagnóstico"
-#: ../midori/main.c:1885
+#: ../midori/main.c:1857
msgid "Run the specified filename as javascript"
msgstr "Ejecutar el nombre de archivo especificado como JavaScript"
-#: ../midori/main.c:1887
+#: ../midori/main.c:1859
msgid "Take a snapshot of the specified URI"
msgstr "Tomar una captura de la URI especificada"
-#: ../midori/main.c:1889
+#: ../midori/main.c:1861
msgid "Execute the specified command"
msgstr "Ejecutar el comando especificado"
-#: ../midori/main.c:1891
+#: ../midori/main.c:1863
msgid "List available commands to execute with -e/ --execute"
msgstr "Mostrar los comandos disponibles para ejecutar con -e/ --execute"
-#: ../midori/main.c:1893
+#: ../midori/main.c:1865
msgid "Display program version"
msgstr "Mostrar la versión del programa"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1867
msgid "Addresses"
msgstr "Direcciones"
-#: ../midori/main.c:1897
+#: ../midori/main.c:1869
msgid "Block URIs according to regular expression PATTERN"
msgstr "Bloquear URI según PATRÓN de expresión regular"
-#: ../midori/main.c:1897
+#: ../midori/main.c:1869
msgid "PATTERN"
msgstr "PATRÓN"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1901
+#: ../midori/main.c:1873
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Restablecer Midori después de SEGUNDOS segundos de inactividad"
-#: ../midori/main.c:1901
+#: ../midori/main.c:1873
msgid "SECONDS"
msgstr "SEGUNDOS"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1876
msgid "Redirects console warnings to the specified FILENAME"
-msgstr "Redirecciona las advertencias de la consola en el FILENAME especificado"
+msgstr ""
+"Redirecciona las advertencias de la consola en el FILENAME especificado"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1876
msgid "FILENAME"
msgstr "NOMBRE DE ARCHIVO"
-#: ../midori/main.c:1969
-msgid "[Addresses]"
-msgstr "[Direcciones]"
-
-#: ../midori/main.c:2011
+#: ../midori/main.c:1965
msgid "Please report comments, suggestions and bugs to:"
msgstr "Por favor envíe comentarios, sugerencias y errores a:"
-#: ../midori/main.c:2013
+#: ../midori/main.c:1967
msgid "Check for new versions at:"
msgstr "Buscar nuevas versiones en:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2108
+#: ../midori/main.c:2098
msgid "Saved logins and _passwords"
msgstr "Inicios de sesión y _contraseñas guardadas"
-#: ../midori/main.c:2110
+#: ../midori/main.c:2100
msgid "Cookies and Website data"
msgstr "Cookies y datos de sitios web"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2114
-#: ../midori/midori-websettings.c:997
-#: ../extensions/web-cache.c:462
-#: ../extensions/web-cache.c:471
+#: ../midori/main.c:2104 ../midori/midori-preferences.c:505
+#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470
msgid "Web Cache"
msgstr "Caché web"
-#: ../midori/main.c:2117
+#: ../midori/main.c:2107
msgid "Website icons"
msgstr "Iconos de sitios web"
-#: ../midori/main.c:2223
+#: ../midori/main.c:2211
msgid "An unknown error occured"
msgstr "Se produjo un error desconocido"
-#: ../midori/main.c:2330
+#: ../midori/main.c:2326
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:2366
+#: ../midori/main.c:2360
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "No se pudieron cargar los marcadores: %s\n"
-#: ../midori/main.c:2414
+#: ../midori/main.c:2393
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "No se pudo cargar la papelera: %s\n"
-#: ../midori/main.c:2427
+#: ../midori/main.c:2406
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "No se pudo cargar el historial: %s\n"
-#: ../midori/main.c:2443
+#: ../midori/main.c:2421
msgid "The following errors occured:"
msgstr "Se produjeron los siguientes errores:"
-#: ../midori/main.c:2459
+#: ../midori/main.c:2437
msgid "_Ignore"
msgstr "_Ignorar"
-#: ../midori/midori-app.c:1339
-msgid "_Bookmark"
-msgstr "_Marcador"
+#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:533
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Acción inesperada «%s»."
-#: ../midori/midori-app.c:1340
-#: ../midori/midori-browser.c:6066
+#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6212
msgid "_Bookmarks"
msgstr "_Marcadores"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1373
msgid "Add Boo_kmark"
msgstr "Añadir _marcador"
-#: ../midori/midori-app.c:1342
-msgid "_Console"
-msgstr "_Consola"
-
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1374
msgid "_Extensions"
msgstr "_Extensiones"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1344
-#: ../midori/midori-browser.c:4591
+#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4665
msgid "_History"
msgstr "_Historial"
-#: ../midori/midori-app.c:1345
-msgid "_Homepage"
-msgstr "_Página de inicio"
-
-#: ../midori/midori-app.c:1346
+#: ../midori/midori-app.c:1376
msgid "_Userscripts"
msgstr "_Scripts de usuario"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1377
+msgid "User_styles"
+msgstr "_Estilos de usuario"
+
+#: ../midori/midori-app.c:1378
msgid "New _Tab"
msgstr "Nueva _pestaña"
-#: ../midori/midori-app.c:1348
+#: ../midori/midori-app.c:1379
msgid "_Transfers"
msgstr "_Transferencias"
-#: ../midori/midori-app.c:1349
+#: ../midori/midori-app.c:1380
msgid "Netscape p_lugins"
msgstr "C_omplementos de Netscape"
-#: ../midori/midori-app.c:1350
+#: ../midori/midori-app.c:1381
msgid "_Closed Tabs"
msgstr "_Pestañas cerradas"
-#: ../midori/midori-app.c:1351
-#: ../midori/midori-browser.c:5218
+#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5348
msgid "New _Window"
msgstr "Nueva _ventana"
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1383
msgid "New _Folder"
msgstr "Nueva _carpeta"
+#: ../midori/midori-app.c:1437
+msgid "[Addresses]"
+msgstr "[Direcciones]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Archivo no encontrado."
-#: ../midori/midori-array.c:547
-#: ../midori/midori-array.c:586
-#: ../midori/midori-array.c:609
-#: ../midori/midori-array.c:619
+#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
+#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
msgid "Malformed document."
msgstr "Documento defectuoso."
@@ -387,301 +451,288 @@ msgstr "Formato de marcador no reconocido."
msgid "Writing failed."
msgstr "Falló la escritura."
-#: ../midori/midori-browser.c:350
-#: ../midori/midori-browser.c:5300
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5487
+msgid "Go forward to the next page"
+msgstr "Avanza una página"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:353 ../midori/midori-browser.c:5495
+#: ../midori/midori-browser.c:5498
+msgid "Go to the next sub-page"
+msgstr "Ir a la subpágina siguiente"
+
+#: ../midori/midori-browser.c:440 ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5445
msgid "Reload the current page"
msgstr "Recargar la página actual"
-#: ../midori/midori-browser.c:359
-#: ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:448 ../midori/midori-browser.c:5442
msgid "Stop loading the current page"
msgstr "Detener la carga de la página actual"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:518
#, c-format
msgid "Failed to update title: %s\n"
msgstr "No se pudo actualizar el título: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Acción inesperada «%s»."
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:613
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (navegación privada)"
-#: ../midori/midori-browser.c:683
-#: ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "Carpeta de nivel superior"
+#: ../midori/midori-browser.c:723 ../midori/midori-browser.c:765
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Marcadores"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:825
msgid "New folder"
msgstr "Nueva carpeta"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:825
msgid "Edit folder"
msgstr "Editar carpeta"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:827
msgid "New bookmark"
msgstr "Nuevo marcador"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:827
msgid "Edit bookmark"
msgstr "Editar marcador"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Título:"
-
-#: ../midori/midori-browser.c:838
-#: ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Dirección:"
-
#: ../midori/midori-browser.c:861
-#: ../midori/midori-browser.c:4328
-msgid "_Folder:"
-msgstr "_Carpeta:"
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Elija un nombre para el marcador y elija donde guardarlo."
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:922
msgid "Add to _Speed Dial"
msgstr "Añadir a marcado _rápido"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:928
msgid "Show in the tool_bar"
msgstr "Mostrar en la _barra de herramientas"
-#: ../midori/midori-browser.c:905
+#: ../midori/midori-browser.c:936
msgid "Run as _web application"
msgstr "Ejecutar como aplicación _web"
-#: ../midori/midori-browser.c:976
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "El archivo «%s» no puede guardarse en esta carpeta."
-
-#: ../midori/midori-browser.c:978
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "No tiene los permisos suficientes para escribir en esta ubicación."
-
-#: ../midori/midori-browser.c:985
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "No hay suficiente espacio para descargar «%s»."
-
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "El archivo necesita %s pero solo quedan %s libres."
-
-#: ../midori/midori-browser.c:1026
-#: ../midori/midori-browser.c:4397
+#: ../midori/midori-browser.c:1054 ../midori/midori-browser.c:4469
msgid "Save file as"
msgstr "Guardar archivo como"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Nueva ventana"
+#: ../midori/midori-browser.c:1064
+msgid "Save associated _resources"
+msgstr "Salvar _asociacion de recursos"
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1311
msgid "A new window has been opened"
msgstr "Se ha abierto una ventana nueva"
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Nueva pestaña"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1314
msgid "A new tab has been opened"
msgstr "Se ha abierto una pestaña nueva"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1331
msgid "Error opening the image!"
msgstr "Error abriendo la imagen:"
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1332
msgid "Can not open selected image in a default viewer."
msgstr "No se puede abrir la imagen seleccionada en el visor predeteminado."
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1338
msgid "Error downloading the image!"
msgstr "Error al cargar el canal '%s'"
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1339
msgid "Can not download selected image."
msgstr "No se puede descargar la imágen seleccionada."
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1396
msgid "Save file"
msgstr "Guardar archivo"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2300
msgid "Open file"
msgstr "Abrir archivo"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2432
msgid ""
-"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n"
-"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically."
+"To use the above URI open a news aggregator. There is usually a menu or "
+"button \"New Subscription\", \"New News Feed\" or similar.\n"
+"Alternatively go to Preferences, Applications in Midori, and select a News "
+"Aggregator. Next time you click the news feed icon, it will be added "
+"automatically."
msgstr ""
-"La URI de arriba abre un nuevo canal de noticias. Normalmente hay un botón \"Nueva subscripción\", \"Nuevo canal de noticias\" o similar.\n"
-"Alternativamente vaya a Preferencias, Aplicaciones en Midori y elija Canal de noticias. La próxima vez que haga clic en un icono de canal de noticias se añadirá automáticamente."
+"La URI de arriba abre un nuevo canal de noticias. Normalmente hay un botón "
+"\"Nueva subscripción\", \"Nuevo canal de noticias\" o similar.\n"
+"Alternativamente vaya a Preferencias, Aplicaciones en Midori y elija Canal "
+"de noticias. La próxima vez que haga clic en un icono de canal de noticias "
+"se añadirá automáticamente."
-#: ../midori/midori-browser.c:2505
-#: ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2438 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Nuevo canal"
-#: ../midori/midori-browser.c:2548
-#: ../midori/midori-browser.c:5369
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2481 ../midori/midori-browser.c:5511
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Añadir un nuevo marcador"
-#: ../midori/midori-browser.c:3047
-#: ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3025 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Vacío"
-#: ../midori/midori-browser.c:3469
+#: ../midori/midori-browser.c:3471 ../midori/midori-browser.c:3472
msgid "Toggle text cursor navigation"
msgstr "Activar o desactivar la navegación con el cursor del texto"
-#: ../midori/midori-browser.c:3784
-#: ../midori/midori-browser.c:5759
+#: ../midori/midori-browser.c:3474
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Presione y mantenga F7 para alternar a la navegación intercalada. Cuando se "
+"active, El cursor de texto aparecerá en todas las páginas."
+
+#: ../midori/midori-browser.c:3477
+msgid "_Enable Caret Browsing"
+msgstr "_Activar navegación intercalada"
+
+#: ../midori/midori-browser.c:3869 ../midori/midori-browser.c:5905
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "No se pudo insertar un nuevo elemento en el historial: %s\n"
-#: ../midori/midori-browser.c:4116
-#: ../panels/midori-bookmarks.c:745
-#: ../panels/midori-history.c:803
+#: ../midori/midori-browser.c:4195 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Abrir todo en _pestañas"
-#: ../midori/midori-browser.c:4123
-#: ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809
-#: ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4202 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Abrir en una nueva _pestaña "
-#: ../midori/midori-browser.c:4126
-#: ../midori/midori-view.c:2688
-#: ../midori/midori-view.c:4828
-#: ../panels/midori-bookmarks.c:753
-#: ../panels/midori-history.c:811
-#: ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4205 ../midori/midori-view.c:2952
+#: ../midori/midori-view.c:4924 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Abrir en una nueva _ventana"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4294
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4295
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4296
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4297
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4219
+#: ../midori/midori-browser.c:4298
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4220
+#: ../midori/midori-browser.c:4299
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4241
-msgid "Import bookmarks..."
-msgstr "Importar marcadores..."
+#: ../midori/midori-browser.c:4300
+msgid "Midori 0.2.6"
+msgstr "Midori"
-#: ../midori/midori-browser.c:4244
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:4321
+msgid "Import bookmarks…"
+msgstr "Importar marcadores…"
+
+#: ../midori/midori-browser.c:4324 ../midori/midori-browser.c:5516
msgid "_Import bookmarks"
msgstr "_Importar marcadores"
-#: ../midori/midori-browser.c:4255
+#: ../midori/midori-browser.c:4335
msgid "_Application:"
msgstr "_Aplicación:"
-#: ../midori/midori-browser.c:4320
+#: ../midori/midori-browser.c:4400
msgid "Import from XBEL or HTML file"
msgstr "Importar desde archivo XBEL o HTML"
-#: ../midori/midori-browser.c:4355
+#: ../midori/midori-browser.c:4428
msgid "Import from a file"
msgstr "Importar desde un archivo"
-#: ../midori/midori-browser.c:4367
+#: ../midori/midori-browser.c:4440
msgid "Failed to import bookmarks"
msgstr "No se pudieron importar los marcadores"
-#: ../midori/midori-browser.c:4402
+#: ../midori/midori-browser.c:4474
msgid "XBEL Bookmarks"
msgstr "Marcadores XBEL"
-#: ../midori/midori-browser.c:4407
+#: ../midori/midori-browser.c:4479
msgid "Netscape Bookmarks"
msgstr "Marcadores Netscape "
-#: ../midori/midori-browser.c:4421
+#: ../midori/midori-browser.c:4493
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
-msgstr "Midori sólo puede exportar a formatos XBEL (*.xbel) y Netscape (*.html)"
+msgstr ""
+"Midori sólo puede exportar a formatos XBEL (*.xbel) y Netscape (*.html)"
-#: ../midori/midori-browser.c:4436
+#: ../midori/midori-browser.c:4508
msgid "Failed to export bookmarks"
msgstr "No se pudieron exportar los marcadores"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4558
+#: ../midori/midori-browser.c:4630
msgid "Clear Private Data"
msgstr "Borrar datos privados"
-#: ../midori/midori-browser.c:4562
+#: ../midori/midori-browser.c:4634
msgid "_Clear private data"
msgstr "_Borrar datos privados"
-#: ../midori/midori-browser.c:4575
+#: ../midori/midori-browser.c:4649
msgid "Clear the following data:"
msgstr "Borrar los siguientes datos:"
-#: ../midori/midori-browser.c:4585
+#: ../midori/midori-browser.c:4659
msgid "Last open _tabs"
msgstr "Últimas _pestañas abiertas"
-#: ../midori/midori-browser.c:4611
+#: ../midori/midori-browser.c:4685
msgid "Clear private data when _quitting Midori"
msgstr "Borrar datos privados al _salir de Midori"
-#: ../midori/midori-browser.c:4806
+#: ../midori/midori-browser.c:4900
msgid "A lightweight web browser."
msgstr "Un navegador web ligero."
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:4901
msgid "See about:version for version info."
msgstr "Escriba about:version para conocer más detalles de la versión."
-#: ../midori/midori-browser.c:4809
-msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version."
-msgstr "Esta librería es software libre; puede redistribuirla y/o modificarla bajo los términos de la Licencia Pública General Reducida GNU tal y como es publicada por la Free Software Foundation; bien versión 2.1 de la licencia o (según su criterio) cualquier versión posterior."
+#: ../midori/midori-browser.c:4903
+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:4830
+#: ../midori/midori-browser.c:4933
msgid "translator-credits"
msgstr ""
"Miguel Anxo Bouzada \n"
@@ -691,1525 +742,1303 @@ msgstr ""
"Guillermo Iguarán \n"
"Abel Martín "
-#: ../midori/midori-browser.c:5216
+#: ../midori/midori-browser.c:5346
msgid "_File"
msgstr "_Archivo"
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5349
msgid "Open a new window"
msgstr "Abrir una ventana nueva"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5352
msgid "Open a new tab"
msgstr "Abrir una pestaña nueva"
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5354
msgid "New P_rivate Browsing Window"
msgstr "Nueva ventana de navegación p_rivada"
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5358
msgid "Open a file"
msgstr "Abrir un archivo"
-#: ../midori/midori-browser.c:5230
-msgid "_Save Page As..."
-msgstr "_Guardar página como..."
+#: ../midori/midori-browser.c:5360
+msgid "_Save Page As…"
+msgstr "_Guardar página como…"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5361
msgid "Save to a file"
msgstr "Guardar en un archivo"
-#: ../midori/midori-browser.c:5233
+#: ../midori/midori-browser.c:5363
msgid "Add to Speed _dial"
msgstr "Añadir a _marcado rápido"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5367
msgid "Add Shortcut to the _desktop"
msgstr "Añadir acceso directo en el _escritorio"
-#: ../midori/midori-browser.c:5239
+#: ../midori/midori-browser.c:5369
msgid "Create _Launcher"
msgstr "Crear _lanzador"
-#: ../midori/midori-browser.c:5243
+#: ../midori/midori-browser.c:5373
msgid "Subscribe to News _feed"
msgstr "Suscribirse al _canal de noticias"
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5379
msgid "_Close Tab"
msgstr "_Cerrar pestaña"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5380
msgid "Close the current tab"
msgstr "Cerrar la pestaña actual"
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5382
msgid "C_lose Window"
msgstr "_Cerrar ventana"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5386
+msgid "_Share"
+msgstr "_Compartir"
+
+#: ../midori/midori-browser.c:5391
msgid "Print the current page"
msgstr "Imprimir la página actual"
-#: ../midori/midori-browser.c:5258
+#: ../midori/midori-browser.c:5394
msgid "Close a_ll Windows"
msgstr "Cerrar _todas las ventanas"
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5397
msgid "_Edit"
msgstr "_Editar"
-#: ../midori/midori-browser.c:5284
-msgid "_Find..."
-msgstr "_Buscar..."
+#: ../midori/midori-browser.c:5420
+msgid "_Find…"
+msgstr "_Buscar…"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5421
msgid "Find a word or phrase in the page"
msgstr "Buscar una palabra o frase en la página"
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5423
msgid "Find _Next"
msgstr "Buscar _siguiente"
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5426
msgid "Find _Previous"
msgstr "Buscar _anterior"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5430
msgid "Configure the application preferences"
msgstr "Configurar las preferencias de la aplicación"
-#: ../midori/midori-browser.c:5296
+#: ../midori/midori-browser.c:5432
msgid "_View"
msgstr "_Ver"
-#: ../midori/midori-browser.c:5297
+#: ../midori/midori-browser.c:5433
msgid "_Toolbars"
msgstr "_Barra de herramientas"
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5438
msgid "Reload page without caching"
msgstr "Recargar página sin caché"
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5448
msgid "Increase the zoom level"
msgstr "Aumentar el nivel de zoom"
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5451
msgid "Decrease the zoom level"
msgstr "Disminuir el nivel de zoom"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5455
msgid "_Encoding"
msgstr "_Codificación"
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5457
msgid "View So_urce"
msgstr "Ver _código fuente"
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5460
msgid "Ca_ret Browsing"
msgstr "Navegación inter_calada"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5464
msgid "Toggle fullscreen view"
msgstr "Activar o desactivar pantalla completa"
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5466
msgid "Scroll _Left"
msgstr "Desplazar hacia la _izquierda"
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5469
msgid "Scroll _Down"
msgstr "Desplazar hacia a_bajo"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5472
msgid "Scroll _Up"
msgstr "Desplazar hacia a_rriba"
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5475
msgid "Scroll _Right"
msgstr "Desplazar hacia la _derecha"
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5478
+msgid "_Readable"
+msgstr "_Leible"
+
+#: ../midori/midori-browser.c:5481
msgid "_Go"
msgstr "_Ir"
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5484
msgid "Go back to the previous page"
-msgstr "Retroceder una página"
-
-#: ../midori/midori-browser.c:5348
-msgid "Go forward to the next page"
-msgstr "Avanzar una página"
+msgstr "Retrocede una página"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5352
+#: ../midori/midori-browser.c:5491
msgid "Go to the previous sub-page"
msgstr "Ir a la subpágina anterior"
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5356
-msgid "Go to the next sub-page"
-msgstr "Ir a la subpágina siguiente"
+#: ../midori/midori-browser.c:5500
+msgid "_Homepage"
+msgstr "_Página de inicio"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5501
msgid "Go to your homepage"
msgstr "Abrir la página de inicio"
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5503
msgid "Empty Trash"
msgstr "Vaciar la papelera"
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5506
msgid "Undo _Close Tab"
msgstr "Deshacer el _cierre de pestaña"
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5513
msgid "Add a new _folder"
msgstr "Añadir una _carpeta nueva"
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5519
msgid "_Export bookmarks"
msgstr "_Exportar marcadores"
-#: ../midori/midori-browser.c:5380
-#: ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5522 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "_Gestionar motores de búsqueda"
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5525
msgid "_Clear Private Data"
msgstr "_Borrar datos privados"
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5528
msgid "_Inspect Page"
msgstr "_Inspeccionar página"
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5532
msgid "_Previous Tab"
msgstr "Pestaña _anterior"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5535
msgid "_Next Tab"
msgstr "Pestaña _siguiente"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5537
msgid "Move Tab _Backward"
msgstr "Mover pestaña hacia _atrás"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5539
msgid "_Move Tab Forward"
msgstr "_Mover pestaña hacia adelante"
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5542
msgid "Focus _Current Tab"
msgstr "Foco en la pestaña a_ctual"
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5545
msgid "Focus _Next view"
msgstr "Enfocar _siguiente vista"
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5548
msgid "Only show the Icon of the _Current Tab"
msgstr "Solo mostrar el icono de la pestaña actual"
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5551
msgid "_Duplicate Current Tab"
msgstr "_Duplicar pestaña actual"
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5554
msgid "Close Ot_her Tabs"
msgstr "Cerrar las o_tras pestañas"
-#: ../midori/midori-browser.c:5415
+#: ../midori/midori-browser.c:5557
msgid "Open last _session"
msgstr "Abrir la última _sesión"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5560
msgid "_Help"
msgstr "Ay_uda"
-#: ../midori/midori-browser.c:5420
+#: ../midori/midori-browser.c:5562
msgid "_Frequent Questions"
msgstr "_Preguntas frecuentes"
-#: ../midori/midori-browser.c:5423
-msgid "_Report a Problem..."
-msgstr "_Informar de un problema..."
+#: ../midori/midori-browser.c:5565
+msgid "_Report a Problem…"
+msgstr "_Informar de un problema…"
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5570 ../midori/midori-browser.c:6231
+msgid "_Tools"
+msgstr "_Herramientas"
+
+#: ../midori/midori-browser.c:5577
msgid "_Menubar"
msgstr "Barra de _menús"
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5581
msgid "_Navigationbar"
msgstr "Barra de _navegación"
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5585
msgid "Side_panel"
msgstr "_Panel lateral"
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:5586
msgid "Sidepanel"
msgstr "Panel Lateral"
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5589
msgid "_Bookmarkbar"
msgstr "Barra de _marcadores"
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5593
msgid "_Statusbar"
msgstr "_Barra de estado"
-#: ../midori/midori-browser.c:5460
-#: ../midori/midori-websettings.c:312
+#: ../midori/midori-browser.c:5602 ../midori/midori-websettings.c:198
msgid "_Automatic"
msgstr "_Automático"
-#: ../midori/midori-browser.c:5463
-#: ../midori/midori-websettings.c:236
+#: ../midori/midori-browser.c:5605 ../midori/midori-websettings.c:122
msgid "Chinese Traditional (BIG5)"
msgstr "Chino tradicional (BIG5)"
-#: ../midori/midori-browser.c:5466
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-browser.c:5608 ../midori/midori-websettings.c:123
msgid "Chinese Simplified (GB18030)"
msgstr "Chino simplificado (GB18030)"
#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5470
+#: ../midori/midori-browser.c:5612
msgid "Japanese (SHIFT__JIS)"
msgstr "Japonés (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5473
-#: ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5615 ../midori/midori-websettings.c:125
msgid "Korean (EUC-KR)"
msgstr "Koreano (EUC-KR)"
-#: ../midori/midori-browser.c:5476
-#: ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5618 ../midori/midori-websettings.c:126
msgid "Russian (KOI8-R)"
msgstr "Ruso (KOI8-R)"
-#: ../midori/midori-browser.c:5479
-#: ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5621 ../midori/midori-websettings.c:127
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5482
-#: ../midori/midori-websettings.c:242
+#: ../midori/midori-browser.c:5624 ../midori/midori-websettings.c:128
msgid "Western (ISO-8859-1)"
msgstr "Occidental (ISO-8859-1)"
-#: ../midori/midori-browser.c:5485
-#: ../midori/midori-websettings.c:243
-#: ../midori/midori-websettings.c:318
-#: ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Personalizado..."
+#: ../midori/midori-browser.c:5627
+msgid "Custom…"
+msgstr "Personalizado…"
-#: ../midori/midori-browser.c:5991
+#: ../midori/midori-browser.c:6137
msgid "_Separator"
msgstr "_Separador"
-#: ../midori/midori-browser.c:5998
-msgid "_Location..."
-msgstr "_Ubicación..."
+#: ../midori/midori-browser.c:6144
+msgid "_Location…"
+msgstr "_Ubicación…"
-#: ../midori/midori-browser.c:6000
+#: ../midori/midori-browser.c:6146
msgid "Open a particular location"
msgstr "Abrir una dirección en particular"
-#: ../midori/midori-browser.c:6022
-msgid "_Web Search..."
-msgstr "_Buscar en la web..."
+#: ../midori/midori-browser.c:6168
+msgid "_Web Search…"
+msgstr "_Buscar en la web…"
-#: ../midori/midori-browser.c:6024
+#: ../midori/midori-browser.c:6170
msgid "Run a web search"
msgstr "Realizar una búsqueda en la web"
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:6197
msgid "Reopen a previously closed tab or window"
msgstr "Abrir ventanas o pestañas cerradas"
-#: ../midori/midori-browser.c:6068
+#: ../midori/midori-browser.c:6214
msgid "Show the saved bookmarks"
msgstr "Mostrar los marcadores guardados."
-#: ../midori/midori-browser.c:6085
-msgid "_Tools"
-msgstr "_Herramientas"
-
-#: ../midori/midori-browser.c:6101
+#: ../midori/midori-browser.c:6247
msgid "_Window"
msgstr "_Ventanas"
-#: ../midori/midori-browser.c:6103
+#: ../midori/midori-browser.c:6249
msgid "Show a list of all open tabs"
msgstr "Mostrar una lista de todas las pestañas abiertas"
-#: ../midori/midori-browser.c:6117
+#: ../midori/midori-browser.c:6263
msgid "_Menu"
msgstr "_Menú"
-#: ../midori/midori-browser.c:6119
+#: ../midori/midori-browser.c:6265
msgid "Menu"
msgstr "Menú"
-#: ../midori/midori-browser.c:6933
+#: ../midori/midori-browser.c:7090
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Configuración no esperada «%s»"
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:330
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "No se pudo cargar la configuración de la extensión \"%s\": %s\n"
-#: ../midori/midori-extension.c:747
-#: ../midori/midori-extension.c:844
-#: ../midori/midori-extension.c:941
-#: ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:749 ../midori/midori-extension.c:846
+#: ../midori/midori-extension.c:943 ../midori/midori-extension.c:1055
+#: ../extensions/addons.c:1685
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "No se pudo guardar la configuración de la extensión '%s': %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "Buscar con %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Buscar con..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "Buscar con…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "No se pudo seleccionar del historial\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "Buscar %s"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "Exportar certificado"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "El sertificado de autoridad no es conocido"
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "El certificado no calza con la identidad esperada del sitio"
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "El tiempo de activación del certificado está en el futuro"
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "El certificado expiró"
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"El certificado ha sido revocade deacuerdo a la lista de revocación de "
+"GTlsConnection"
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "El algoritmo del certificado es conciderado inseguro"
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "Ocurrieron errores durante la validación del certificado"
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "_Exportar certificado"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "Autofirmado"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "Detalles de seguridad"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "Pegar y c_ontinuar"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "No verificada"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "Conexión verificada y cifrada"
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1989
msgid "Open, unencrypted connection"
msgstr "Conexión abierta y desencriptada"
-#: ../midori/midori-panel.c:397
-#: ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562
-#: ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Alinear el panel a la derecha"
-#: ../midori/midori-panel.c:409
-#: ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Cerrar panel"
-#: ../midori/midori-panel.c:563
-#: ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Alinear el panel a la izquierda"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:104
msgid "Show Speed Dial"
msgstr "Mostrar marcado rápido"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:105
msgid "Show Homepage"
msgstr "Mostrar página de inicio"
-#: ../midori/midori-websettings.c:238
+#: ../midori/midori-websettings.c:124
msgid "Japanese (SHIFT_JIS)"
msgstr "Japonés (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:129 ../midori/midori-websettings.c:205
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Personalizar…"
+
+#: ../midori/midori-websettings.c:144
msgid "New tab"
msgstr "Nueva pestaña"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:145
msgid "New window"
msgstr "Nueva ventana"
-#: ../midori/midori-websettings.c:260
+#: ../midori/midori-websettings.c:146
msgid "Current tab"
msgstr "Pestaña actual"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:161
msgid "Default"
msgstr "Predeterminado"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:162
msgid "Icons"
msgstr "Iconos"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:163
msgid "Small icons"
msgstr "Iconos pequeños"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:164
msgid "Text"
msgstr "Texto"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:165
msgid "Icons and text"
msgstr "Iconos y texto"
-#: ../midori/midori-websettings.c:280
+#: ../midori/midori-websettings.c:166
msgid "Text beside icons"
msgstr "Texto al lado de los iconos"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:181
msgid "Automatic (GNOME or environment)"
msgstr "Automático (GNOME o entorno)"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:182
msgid "HTTP proxy server"
msgstr "Servidor proxy HTTP"
-#: ../midori/midori-websettings.c:297
+#: ../midori/midori-websettings.c:183
msgid "No proxy server"
msgstr "Sin servidor proxy"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:200
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:201
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:202
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:203
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:317
+#: ../midori/midori-websettings.c:204
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:401
-msgid "Remember last window size"
-msgstr "Recordar el tamaño de la última ventana"
-
-#: ../midori/midori-websettings.c:402
-msgid "Whether to save the last window size"
-msgstr "Si se desea recordar el tamaño de la última ventana"
-
-#: ../midori/midori-websettings.c:410
-msgid "Last window width"
-msgstr "Última anchura de la ventana"
-
-#: ../midori/midori-websettings.c:411
-msgid "The last saved window width"
-msgstr "Última anchura de la ventana guardada"
-
-#: ../midori/midori-websettings.c:419
-msgid "Last window height"
-msgstr "Última altura de la ventana"
-
-#: ../midori/midori-websettings.c:420
-msgid "The last saved window height"
-msgstr "Última altura guardada de la ventana "
-
-#: ../midori/midori-websettings.c:445
-msgid "Last panel position"
-msgstr "Última posición del panel"
-
-#: ../midori/midori-websettings.c:446
-msgid "The last saved panel position"
-msgstr "Ultima posición guardada del panel"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:455
-msgid "Last panel page"
-msgstr "Última página del panel"
-
-#: ../midori/midori-websettings.c:456
-msgid "The last saved panel page"
-msgstr "Última página guardada del panel"
-
-#: ../midori/midori-websettings.c:464
-msgid "Last Web search"
-msgstr "Última búsqueda web"
-
-#: ../midori/midori-websettings.c:465
-msgid "The last saved Web search"
-msgstr "Última búsqueda web guardada"
-
-#: ../midori/midori-websettings.c:474
-msgid "Show Menubar"
-msgstr "Mostrar barra de menú"
-
-#: ../midori/midori-websettings.c:475
-msgid "Whether to show the menubar"
-msgstr "Mostrar u ocultar la barra de menú"
-
-#: ../midori/midori-websettings.c:483
-msgid "Show Navigationbar"
-msgstr "Mostrar la barra de navegación"
-
-#: ../midori/midori-websettings.c:484
-msgid "Whether to show the navigationbar"
-msgstr "Mostrar u ocultar la barra de navegación"
-
-#: ../midori/midori-websettings.c:492
-msgid "Show Bookmarkbar"
-msgstr "Mostrar la barra de marcadores"
-
-#: ../midori/midori-websettings.c:493
-msgid "Whether to show the bookmarkbar"
-msgstr "Mostrar u ocultar la barra de marcadores"
-
-#: ../midori/midori-websettings.c:501
-msgid "Show Panel"
-msgstr "Mostrar el panel"
-
-#: ../midori/midori-websettings.c:502
-msgid "Whether to show the panel"
-msgstr "Mostrar u ocultar el panel"
-
-#: ../midori/midori-websettings.c:510
-msgid "Show Statusbar"
-msgstr "Mostrar la barra de estado"
-
-#: ../midori/midori-websettings.c:511
-msgid "Whether to show the statusbar"
-msgstr "Mostrar u ocultar la barra de estado"
-
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:277
msgid "Toolbar Style:"
msgstr "Estilo de la barra de herramientas:"
-#: ../midori/midori-websettings.c:521
+#: ../midori/midori-websettings.c:278
msgid "The style of the toolbar"
msgstr "El estilo de la barra de herramientas"
-#: ../midori/midori-websettings.c:530
-msgid "Toolbar Items"
-msgstr "Elementos de la barra de herramientas"
-
-#: ../midori/midori-websettings.c:531
-msgid "The items to show on the toolbar"
-msgstr "Los elementos a mostrar en la barra de herramientas"
-
-#: ../midori/midori-websettings.c:539
-msgid "Compact Sidepanel"
-msgstr "Panel lateral compacto"
-
-#: ../midori/midori-websettings.c:540
-msgid "Whether to make the sidepanel compact"
-msgstr "Si se desea hacer compacto el panel lateral"
-
-#: ../midori/midori-websettings.c:555
-msgid "Align sidepanel on the right"
-msgstr "Alinear el panel a la derecha"
-
-#: ../midori/midori-websettings.c:556
-msgid "Whether to align the sidepanel on the right"
-msgstr "Alinear el panel lateral a la derecha"
-
-#: ../midori/midori-websettings.c:571
-msgid "Open panels in separate windows"
-msgstr "Abrir paneles en ventanas separadas"
-
-#: ../midori/midori-websettings.c:572
-msgid "Whether to always open panels in separate windows"
-msgstr "Configura si los paneles se abren en ventanas separadas"
-
-#: ../midori/midori-websettings.c:581
+#: ../midori/midori-websettings.c:287
msgid "When Midori starts:"
-msgstr "Cuando se inicie Midori:"
+msgstr "Cuando Midori inicie:"
-#: ../midori/midori-websettings.c:582
-msgid "What to do when Midori starts"
-msgstr "Qué hacer al inicio de Midori"
-
-#: ../midori/midori-websettings.c:591
-msgid "Homepage:"
-msgstr "Página de inicio:"
-
-#: ../midori/midori-websettings.c:592
-msgid "The homepage"
-msgstr "La página de inicio"
-
-#: ../midori/midori-websettings.c:607
-msgid "Show crash dialog"
-msgstr "Mostrar diálogo de cuelgue"
-
-#: ../midori/midori-websettings.c:608
-msgid "Show a dialog after Midori crashed"
-msgstr "Mostrar un dialogo después de que Midori se cuelgue"
-
-#: ../midori/midori-websettings.c:616
-msgid "Save downloaded files to:"
-msgstr "Guardar los archivos descargados en:"
-
-#: ../midori/midori-websettings.c:617
-msgid "The folder downloaded files are saved to"
-msgstr "Carpeta donde se guardan los archivos descargados"
-
-#: ../midori/midori-websettings.c:625
-msgid "Text Editor"
-msgstr "Editor de texto"
-
-#: ../midori/midori-websettings.c:626
-msgid "An external text editor"
-msgstr "Editor de textos externo"
-
-#: ../midori/midori-websettings.c:641
-msgid "News Aggregator"
-msgstr "Agregador de noticias"
-
-#: ../midori/midori-websettings.c:642
-msgid "An external news aggregator"
-msgstr "Un agregador de noticias externo"
-
-#: ../midori/midori-websettings.c:650
-msgid "Location entry Search"
-msgstr "Búsqueda en la barra"
-
-#: ../midori/midori-websettings.c:651
-msgid "The search to perform inside the location entry"
-msgstr "Hacer una búsqueda a partir del contenido de la barra de direcciones"
-
-#: ../midori/midori-websettings.c:659
+#: ../midori/midori-websettings.c:297
msgid "Preferred Encoding"
msgstr "Codificación preferida"
-#: ../midori/midori-websettings.c:660
-msgid "The preferred character encoding"
-msgstr "Codificación de caracteres preferida"
-
-#: ../midori/midori-websettings.c:670
-msgid "Always Show Tabbar"
-msgstr "Siempre mostrar la barra de pestañas"
-
-#: ../midori/midori-websettings.c:671
-msgid "Always show the tabbar"
-msgstr "Siempre mostrar la barra de pestañas"
-
-#: ../midori/midori-websettings.c:684
-msgid "Close Buttons on Tabs"
-msgstr "Botón de cerrar en las pestañas"
-
-#: ../midori/midori-websettings.c:685
-msgid "Whether tabs have close buttons"
-msgstr "Si se desea que las pestañas tengan el botón de cerrar"
-
-#: ../midori/midori-websettings.c:710
+#: ../midori/midori-websettings.c:324
msgid "Open new pages in:"
msgstr "Abrir las páginas nuevas en:"
-#: ../midori/midori-websettings.c:711
-msgid "Where to open new pages"
-msgstr "Dónde abrir las páginas nuevas"
-
-#: ../midori/midori-websettings.c:720
-msgid "Middle click opens Selection"
-msgstr "Abrir la selección con pulsación central"
-
-#: ../midori/midori-websettings.c:721
-msgid "Load an address from the selection via middle click"
-msgstr "Cargar una dirección desde la selección a través del botón del medio del ratón"
-
-#: ../midori/midori-websettings.c:729
-msgid "Open tabs in the background"
-msgstr "Abrir pestañas en segundo plano"
-
-#: ../midori/midori-websettings.c:730
-msgid "Whether to open new tabs in the background"
-msgstr "Si se desea que las nuevas pestañas se abran en segundo plano"
-
-#: ../midori/midori-websettings.c:738
-msgid "Open Tabs next to Current"
-msgstr "Abrir pestañas junto a la actual"
-
-#: ../midori/midori-websettings.c:739
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o después de la última"
-
-#: ../midori/midori-websettings.c:747
-msgid "Open popups in tabs"
-msgstr "Abrir ventanas emergentes en pestañas"
-
-#: ../midori/midori-websettings.c:748
-msgid "Whether to open popup windows in tabs"
-msgstr "Si se desea abrir las ventanas emergentes en pestañas"
-
-#: ../midori/midori-websettings.c:758
-#: ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Cargar imágenes automáticamente"
-
-#: ../midori/midori-websettings.c:759
-msgid "Load and display images automatically"
-msgstr "Cargar y mostrar imágenes automáticamente"
-
-#: ../midori/midori-websettings.c:766
-#: ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Activar scripts"
-
-#: ../midori/midori-websettings.c:767
-msgid "Enable embedded scripting languages"
-msgstr "Activar idiomas de escrituras incrustadas"
-
-#: ../midori/midori-websettings.c:774
-#: ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Activar complementos de Netscape"
-
-#: ../midori/midori-websettings.c:775
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Activar el complemento de objetos incrustados Netscape"
-
-#: ../midori/midori-websettings.c:790
-msgid "Enable Spell Checking"
-msgstr "Activar corrección ortográfica"
-
-#: ../midori/midori-websettings.c:791
-msgid "Enable spell checking while typing"
-msgstr "Activar corrección ortográfica mientras se escribe"
-
-#: ../midori/midori-websettings.c:797
-msgid "Enable HTML5 database support"
-msgstr "Activar soporte de base de datos HTML5"
-
-#: ../midori/midori-websettings.c:798
-msgid "Whether to enable HTML5 database support"
-msgstr "Configura si se activa el soporte de base de datos de HTML5"
-
-#: ../midori/midori-websettings.c:804
-msgid "Enable HTML5 local storage support"
-msgstr "Activar soporte de almacenamiento local HTML5"
-
-#: ../midori/midori-websettings.c:805
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Configura si se activa el soporte de almacenamiento local de HTML5"
-
-#: ../midori/midori-websettings.c:811
-msgid "Enable offline web application cache"
-msgstr "Activar caché local de aplicación web"
-
-#: ../midori/midori-websettings.c:812
-msgid "Whether to enable offline web application cache"
-msgstr "Configura si se activa el caché local de aplicación web"
-
-#: ../midori/midori-websettings.c:828
-msgid "Flash window on background tabs"
-msgstr "Destellar ventana en pestañas en segundo plano"
-
-#: ../midori/midori-websettings.c:829
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr "El flash de la ventana del navegador si una nueva pestaña se abre en el fondo"
-
-#: ../midori/midori-websettings.c:837
-msgid "Enable WebGL support"
-msgstr "Habilitar soporte WebGL"
-
-#: ../midori/midori-websettings.c:838
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Permitir a los sitios web utilizar renderizado OpenGL"
-
-#: ../midori/midori-websettings.c:864
-msgid "Zoom Text and Images"
-msgstr "Ampliar textos e imágenes"
-
-#: ../midori/midori-websettings.c:865
-msgid "Whether to zoom text and images"
-msgstr "Si se desea ampliar texto e imágenes"
-
-#: ../midori/midori-websettings.c:880
-msgid "Find inline while typing"
-msgstr "Buscar en el texto al escribir"
-
-#: ../midori/midori-websettings.c:881
-msgid "Whether to automatically find inline while typing"
-msgstr "Si se desea buscar automáticamente en el texto al comenzar a escribir"
-
-#: ../midori/midori-websettings.c:896
-msgid "Kinetic scrolling"
-msgstr "Desplazamiento dinámico"
-
-#: ../midori/midori-websettings.c:897
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Configura si el desplazamiento debe realizarse de forma acorde a la velocidad"
-
-#: ../midori/midori-websettings.c:905
-msgid "Delete old Cookies after:"
-msgstr "Eliminar cookies antiguas después de:"
-
-#: ../midori/midori-websettings.c:906
-msgid "The maximum number of days to save cookies for"
-msgstr "Número máximo de días para conservar las cookies"
-
-#: ../midori/midori-websettings.c:922
-msgid "Only accept Cookies from sites you visit"
-msgstr "Solo aceptar cookies de los sitios que visite"
-
-#: ../midori/midori-websettings.c:923
-msgid "Block cookies sent by third-party websites"
-msgstr "Bloquear cookies enviadas por sitios de terceros"
-
-#: ../midori/midori-websettings.c:937
-msgid "Delete pages from history after:"
-msgstr "Eliminar páginas del historial después de:"
-
-#: ../midori/midori-websettings.c:938
-msgid "The maximum number of days to save the history for"
-msgstr "Número máximo de días para conservar el historial"
-
-#: ../midori/midori-websettings.c:953
-msgid "Proxy server"
-msgstr "Servidor proxy"
-
-#: ../midori/midori-websettings.c:954
-msgid "The type of proxy server to use"
-msgstr "El tipo de servidor a usar"
-
-#: ../midori/midori-websettings.c:963
-msgid "HTTP Proxy Server"
-msgstr "Servidor proxy HTTP"
-
-#: ../midori/midori-websettings.c:964
-msgid "The proxy server used for HTTP connections"
-msgstr "Servidor proxy utilizado para conexiones HTTP"
-
-#: ../midori/midori-websettings.c:979
-msgid "Port"
-msgstr "Puerto"
-
-#: ../midori/midori-websettings.c:980
-msgid "The proxy server port used for HTTP connections"
-msgstr "El puerto del servidor proxy usado para conexiones HTTP"
-
-#: ../midori/midori-websettings.c:998
-msgid "The maximum size of cached pages on disk"
-msgstr "El tamaño máximo de páginas de caché en el disco"
-
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:387
msgid "Identify as"
msgstr "Identificar como:"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:388
msgid "What to identify as to web pages"
msgstr "Identificar como páginas web"
-#: ../midori/midori-websettings.c:1032
-msgid "Identification string"
-msgstr "Cadena de identificación"
-
-#: ../midori/midori-websettings.c:1033
-msgid "The application identification string"
-msgstr "Aplicación de identificación de cadenas"
-
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:421
msgid "Preferred languages"
msgstr "Idiomas preferidos"
-#: ../midori/midori-websettings.c:1050
-msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-msgstr "Una lista separada por comas de idioma preferidos para procesar páginas multi-idiomas, como por ejemplo \"de\", \"ru,nl\" o \"en-us;q=1.0, fr-fr;q=0.667\""
+#: ../midori/midori-websettings.c:422
+msgid ""
+"A comma separated list of languages preferred for rendering multilingual "
+"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+msgstr ""
+"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:1065
-msgid "Clear private data"
-msgstr "Borrar datos privados"
-
-#: ../midori/midori-websettings.c:1066
-msgid "The private data selected for deletion"
-msgstr "Los datos privados seleccionados para su eliminación"
-
-#: ../midori/midori-websettings.c:1081
-msgid "Clear data"
-msgstr "Borrar datos privados"
-
-#: ../midori/midori-websettings.c:1082
-msgid "The data selected for deletion"
-msgstr "Los datos seleccionados para eliminarse"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1131
-msgid "Strip referrer details sent to websites"
-msgstr "Franja de detalles referentes enviados a los sitios web"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1133
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Si se debe acortar la cabecera del \\ \"Referer\\ \""
-
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:471
msgid "Always use my font choices"
msgstr "Siempre usar las tipografías que elija"
-#: ../midori/midori-websettings.c:1148
+#: ../midori/midori-websettings.c:472
msgid "Override fonts picked by websites with user preferences"
-msgstr "Usar las tipografías elegidas por el usuario en vez de las elegidas por los sitios web"
+msgstr ""
+"Usar las tipografías elegidas por el usuario en vez de las elegidas por los "
+"sitios web"
-#: ../midori/midori-view.c:1375
+#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151
+msgid "Trust this website"
+msgstr "Confiar en el sitio"
+
+#: ../midori/midori-view.c:1149
+msgid "Security unknown"
+msgstr "Seguridad desconocida"
+
+#: ../midori/midori-view.c:1447
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s desea grabar una base de datos HTML5"
-#: ../midori/midori-view.c:1379
-#: ../midori/midori-view.c:1411
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Deny"
msgstr "_Denegar "
-#: ../midori/midori-view.c:1379
-#: ../midori/midori-view.c:1411
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Allow"
msgstr "_Permitir"
-#: ../midori/midori-view.c:1407
+#: ../midori/midori-view.c:1480
#, c-format
msgid "%s wants to know your location."
msgstr "%s desea conocer su ubicación actual."
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1576
#, c-format
msgid "Error - %s"
msgstr "Error - %s"
-#: ../midori/midori-view.c:1501
+#: ../midori/midori-view.c:1577
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "No se pudo cargar la página '%s'."
-#: ../midori/midori-view.c:1503
+#: ../midori/midori-view.c:1579
msgid "Try again"
msgstr "Inténtelo de nuevo"
-#: ../midori/midori-view.c:1701
-#: ../midori/midori-view.c:2623
+#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887
#, c-format
msgid "Send a message to %s"
msgstr "Enviar un mensaje a %s"
-#: ../midori/midori-view.c:2453
-#: ../midori/midori-view.c:2779
+#: ../midori/midori-view.c:2673
+msgid "Add _search engine..."
+msgstr "Añadir motor de _búsqueda"
+
+#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043
msgid "Inspect _Element"
msgstr "Inspeccionar _elemento"
-#: ../midori/midori-view.c:2505
+#: ../midori/midori-view.c:2769
msgid "Open Link in New _Tab"
msgstr "Abrir enlace en nueva _pestaña"
-#: ../midori/midori-view.c:2509
+#: ../midori/midori-view.c:2773
msgid "Open Link in _Foreground Tab"
msgstr "Abrir enlace en pestaña en _primer plano"
-#: ../midori/midori-view.c:2510
+#: ../midori/midori-view.c:2774
msgid "Open Link in _Background Tab"
msgstr "Abrir enlace en pestaña en _segundo plano"
-#: ../midori/midori-view.c:2513
+#: ../midori/midori-view.c:2777
msgid "Open Link in New _Window"
msgstr "Abrir enlace en nueva _ventana"
-#: ../midori/midori-view.c:2516
+#: ../midori/midori-view.c:2780
msgid "Open Link as Web A_pplication"
msgstr "Abrir enlace como a_plicación web"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2785
msgid "Copy Link de_stination"
msgstr "Copiar de_stino del enlace"
-#: ../midori/midori-view.c:2537
+#: ../midori/midori-view.c:2801
msgid "Open _Image in New Tab"
msgstr "Abrir _imagen en nueva pestaña"
-#: ../midori/midori-view.c:2540
+#: ../midori/midori-view.c:2804
msgid "Copy Image _Address"
msgstr "Copiar _dirección de imagen"
-#: ../midori/midori-view.c:2543
+#: ../midori/midori-view.c:2807
msgid "Save I_mage"
msgstr "Guardar i_magen"
-#: ../midori/midori-view.c:2546
+#: ../midori/midori-view.c:2810
msgid "Open in Image _Viewer"
msgstr "Abrir en _Visor de Imagenes"
-#: ../midori/midori-view.c:2553
+#: ../midori/midori-view.c:2817
msgid "Copy Video _Address"
msgstr "Copiar _dirección de vídeo"
-#: ../midori/midori-view.c:2556
+#: ../midori/midori-view.c:2820
msgid "Save _Video"
msgstr "Guardar _vídeo"
-#: ../midori/midori-view.c:2556
+#: ../midori/midori-view.c:2820
msgid "Download _Video"
msgstr "Descargar _vídeo"
-#: ../midori/midori-view.c:2582
+#: ../midori/midori-view.c:2846
msgid "Search _with"
msgstr "Buscar _con"
-#: ../midori/midori-view.c:2614
+#: ../midori/midori-view.c:2878
msgid "_Search the Web"
msgstr "_Buscar en la web"
-#: ../midori/midori-view.c:2631
+#: ../midori/midori-view.c:2895
msgid "Open Address in New _Tab"
msgstr "Abrir dirección en una nueva _pestaña "
-#: ../midori/midori-view.c:2684
+#: ../midori/midori-view.c:2948
msgid "Open _Frame in New Tab"
msgstr "Abrir _marco en nueva pestaña"
-#: ../midori/midori-view.c:2988
-msgid "Open or download file"
-msgstr "Abrir o descargar archivo"
-
-#: ../midori/midori-view.c:3008
+#: ../midori/midori-view.c:3203
#, c-format
-msgid "File Type: '%s'"
-msgstr "Tipo de archivo: '%s'"
+msgid "Open or download file from %s"
+msgstr "Abre o descarga el archivo desde %s"
-#: ../midori/midori-view.c:3010
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Tipo de archivo: %s ('%s')"
-
-#: ../midori/midori-view.c:3014
+#: ../midori/midori-view.c:3216
#, c-format
msgid "File Name: %s"
msgstr "Nombre de archivo: %s"
-#: ../midori/midori-view.c:3041
+#: ../midori/midori-view.c:3221
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Tipo de archivo: '%s'"
+
+#: ../midori/midori-view.c:3223
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Tipo de archivo: %s ('%s')"
+
+#: ../midori/midori-view.c:3260
+#, c-format
+msgid "Size: %s"
+msgstr "Tamaño: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3271
#, c-format
msgid "Open %s"
msgstr "Abrir %s"
-#: ../midori/midori-view.c:3700
+#: ../midori/midori-view.c:3876
#, c-format
msgid "Inspect page - %s"
msgstr "Inspeccionar la página - %s"
-#: ../midori/midori-view.c:4047
-msgid "Speed Dial"
-msgstr "Marcación rápida"
-
-#: ../midori/midori-view.c:4048
-#: ../midori/midori-view.c:4144
-msgid "Click to add a shortcut"
-msgstr "Haga clic aquí para añadir un acceso directo"
-
-#: ../midori/midori-view.c:4049
-msgid "Enter shortcut address"
-msgstr "Introduzca la dirección del acceso directo"
-
-#: ../midori/midori-view.c:4050
-msgid "Enter shortcut title"
-msgstr "Introduzca el título del acceso directo"
-
-#: ../midori/midori-view.c:4051
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "¿Está seguro que desea eliminar este acceso directo?"
-
-#: ../midori/midori-view.c:4213
+#: ../midori/midori-view.c:4275
#, c-format
msgid "No documentation installed"
msgstr "No hay documentación instalada"
-#: ../midori/midori-view.c:4289
+#: ../midori/midori-view.c:4352
msgid "Midori doesn't store any personal data:"
msgstr "Midori no almacena información personal:"
-#: ../midori/midori-view.c:4290
+#: ../midori/midori-view.c:4353
msgid "No history or web cookies are being saved."
msgstr "Ningún historial o cookies de web están siendo almacenadas."
-#: ../midori/midori-view.c:4291
+#: ../midori/midori-view.c:4354
msgid "Extensions are disabled."
msgstr "Las extensiones están deshabilitadas."
-#: ../midori/midori-view.c:4292
+#: ../midori/midori-view.c:4355
msgid "HTML5 storage, local database and application caches are disabled."
-msgstr "El almacenamento de HTML5, las bases de datos locales y las cachés de aplicación están desactivadas."
+msgstr ""
+"El almacenamento de HTML5, las bases de datos locales y las cachés de "
+"aplicación están desactivadas."
-#: ../midori/midori-view.c:4293
+#: ../midori/midori-view.c:4356
msgid "Midori prevents websites from tracking the user:"
msgstr "Midori evita que los sitios web rastreen al usuario:"
-#: ../midori/midori-view.c:4294
+#: ../midori/midori-view.c:4357
msgid "Referrer URLs are stripped down to the hostname."
msgstr "Las URLs de referencia estan reducidas al hostname."
-#: ../midori/midori-view.c:4295
+#: ../midori/midori-view.c:4358
msgid "DNS prefetching is disabled."
msgstr "La prelectura de DNS esta desactivada."
-#: ../midori/midori-view.c:4296
+#: ../midori/midori-view.c:4359
msgid "The language and timezone are not revealed to websites."
msgstr "El lenguaje y la zona horaria no son revelados a los sitios web."
-#: ../midori/midori-view.c:4297
+#: ../midori/midori-view.c:4360
msgid "Flash and other Netscape plugins cannot be listed by websites."
-msgstr "Flash y otros complementos Netscape no pueden ser mostrados por los sitios web."
+msgstr ""
+"Flash y otros complementos Netscape no pueden ser mostrados por los sitios "
+"web."
-#: ../midori/midori-view.c:4346
+#: ../midori/midori-view.c:4446
msgid "Version numbers in brackets show the version used at runtime."
-msgstr "Los números en paréntesis corresponden a la versión que está usando en este momento."
+msgstr ""
+"Los números en paréntesis corresponden a la versión que está usando en este "
+"momento."
-#: ../midori/midori-view.c:4402
+#: ../midori/midori-view.c:4495
msgid "Page loading delayed"
msgstr "Carga de página retrasada"
-#: ../midori/midori-view.c:4403
+#: ../midori/midori-view.c:4496
msgid "Loading delayed either due to a recent crash or startup preferences."
-msgstr "La carga se ha retrasado debido a un cuelgue reciente o a las preferencias de inicio"
+msgstr ""
+"La carga se ha retrasado debido a un cuelgue reciente o a las preferencias "
+"de inicio"
-#: ../midori/midori-view.c:4404
+#: ../midori/midori-view.c:4497
msgid "Load Page"
msgstr "Cargar página"
-#: ../midori/midori-view.c:4570
+#: ../midori/midori-view.c:4664
msgid "Blank page"
msgstr "Página en blanco"
-#: ../midori/midori-view.c:4832
+#: ../midori/midori-view.c:4928
msgid "_Duplicate Tab"
msgstr "_Duplicar pestaña"
-#: ../midori/midori-view.c:4837
+#: ../midori/midori-view.c:4933
msgid "Show Tab _Label"
msgstr "Mostrar título de la pestaña"
-#: ../midori/midori-view.c:4837
+#: ../midori/midori-view.c:4933
msgid "Show Tab _Icon Only"
msgstr "Mostrar sólo el _icono del panel"
-#: ../midori/midori-view.c:4843
-msgid "Close ot_her Tabs"
-msgstr "Cerrar las o_tras pestañas"
+#: ../midori/midori-view.c:4940
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Cerrar la o_tra pestaña"
+msgstr[1] "Cerrar las o_tras pestañas"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5656
+#: ../midori/midori-view.c:5697
msgid "previous"
msgstr "anterior"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5675
+#: ../midori/midori-view.c:5716
msgid "next"
msgstr "siguiente"
-#: ../midori/midori-view.c:5688
+#: ../midori/midori-view.c:5729
msgid "Print background images"
msgstr "Imprimir imágenes de fondo"
-#: ../midori/midori-view.c:5689
+#: ../midori/midori-view.c:5730
msgid "Whether background images should be printed"
msgstr "Si se deberían imprimir las imágenes de fondo"
-#: ../midori/midori-view.c:5721
+#: ../midori/midori-view.c:5762
msgid "Features"
msgstr "Características"
-#: ../midori/midori-preferences.c:297
-msgid "Startup"
-msgstr "Inicio"
-
-#: ../midori/midori-preferences.c:310
-msgid "Use _current page"
-msgstr "Usar _página actual"
-
-#: ../midori/midori-preferences.c:314
-msgid "Use current page as homepage"
-msgstr "Usar la página actual como página de inicio"
-
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
-msgid "Fonts"
-msgstr "Fuentes"
-
-#: ../midori/midori-preferences.c:326
-msgid "Proportional Font Family"
-msgstr "Familia de Fuente Proporcional"
-
-#: ../midori/midori-preferences.c:330
-msgid "The default font family used to display text"
-msgstr "Tamaño de letra predeterminado utilizado para mostrar texto"
-
-#: ../midori/midori-preferences.c:333
-msgid "The default font size used to display text"
-msgstr "Tamaño de letra predeterminado utilizado para mostrar texto"
-
-#: ../midori/midori-preferences.c:335
-msgid "Fixed-width Font Family"
-msgstr "Tipo de letra de ancho fijo"
-
-#: ../midori/midori-preferences.c:339
-msgid "The font family used to display fixed-width text"
-msgstr "Tipo de letra utilizado para mostrar el texto de ancho fijo"
-
-#: ../midori/midori-preferences.c:342
-msgid "The font size used to display fixed-width text"
-msgstr "Tamaño de letra utilizado para mostrar el texto de ancho fijo"
-
-#: ../midori/midori-preferences.c:344
-msgid "Minimum Font Size"
-msgstr "Tamaño mínimo de fuente"
-
-#: ../midori/midori-preferences.c:348
-msgid "The minimum font size used to display text"
-msgstr "Mínimo tamaño de fuente utilizado para mostrar texto"
-
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
-msgid "Behavior"
-msgstr "Comportamiento"
-
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
-msgstr "Permitir ventanas emergentes de scripts"
-
-#: ../midori/midori-preferences.c:386
-msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr "Configura si se permite que los scripts puedan abrir ventanas emergentes automáticamente"
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:416
-msgid "Browsing"
-msgstr "Navegación"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:456
-msgid "Network"
-msgstr "Red"
-
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "Nombre de host"
-
-#: ../midori/midori-preferences.c:487
-msgid "MB"
-msgstr "MB"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Add search engine"
-msgstr "Añadir motor de búsqueda"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Edit search engine"
-msgstr "Editar motor de búsqueda"
-
-#: ../midori/midori-searchaction.c:931
-msgid "_Name:"
-msgstr "_Nombre:"
-
-#: ../midori/midori-searchaction.c:947
-msgid "_Description:"
-msgstr "_Descripción:"
-
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Icono"
-
-#: ../midori/midori-searchaction.c:995
-msgid "_Token:"
-msgstr "_Abreviatura:"
-
-#: ../midori/midori-searchaction.c:1295
-msgid "Manage Search Engines"
-msgstr "Administrar los motores de búsqueda"
-
-#: ../midori/midori-searchaction.c:1395
-msgid "Use as _default"
-msgstr "_Predeterminado"
-
-#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr "Abrir con"
-
-#: ../midori/sokoke.c:362
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:48
#, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Eliga una aplicación o comando para abir \"%s\":"
+msgid "%s of %s"
+msgstr "%s de %s"
-#: ../midori/sokoke.c:403
-#: ../midori/sokoke.c:413
-#: ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470
-#: ../midori/sokoke.c:484
-msgid "Could not run external program."
-msgstr "No se pudo ejecutar la aplicación externa."
-
-#: ../midori/sokoke.c:1595
+#: ../midori/midori-download.vala:60
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: ../midori/sokoke.c:1596
+#: ../midori/midori-download.vala:61
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: ../midori/sokoke.c:1597
+#: ../midori/midori-download.vala:62
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundo"
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605
-#: ../panels/midori-transfers.c:268
-#, c-format
-msgid "%s of %s"
-msgstr "%s de %s"
-
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
-msgid "?B"
-msgstr "?B"
-
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
-#, c-format
-msgid " (%s/s)"
-msgstr " (%s/s)"
-
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/midori-download.vala:78
#, c-format
msgid " - %s remaining"
msgstr " - %s restantes"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:86
+msgid "?B"
+msgstr "?B"
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:88
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
+
+#: ../midori/midori-download.vala:182
+msgid "The downloaded file is erroneous."
+msgstr "El archivo descargado es inválido."
+
+#: ../midori/midori-download.vala:183
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
+msgstr ""
+"El checksum provisto con el link no coincide. Esto significa que el archivo "
+"probablemente esté incompleto o fue modificado después de su descarga."
+
+#: ../midori/midori-download.vala:292
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "El archivo «%s» no puede guardarse en esta carpeta."
+
+#: ../midori/midori-download.vala:294
+msgid "You don't have permission to write in this location."
+msgstr "No tiene los permisos suficientes para escribir en esta ubicación."
+
+#: ../midori/midori-download.vala:297
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "No hay suficiente espacio para descargar «%s»."
+
+#: ../midori/midori-download.vala:299
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "El archivo necesita %s pero solo quedan %s libres."
+
+#: ../midori/midori-speeddial.vala:160
+msgid "Speed Dial"
+msgstr "Marcación rápida"
+
+#: ../midori/midori-speeddial.vala:161 ../midori/midori-speeddial.vala:246
+msgid "Click to add a shortcut"
+msgstr "Haga clic aquí para añadir un acceso directo"
+
+#: ../midori/midori-speeddial.vala:162
+msgid "Enter shortcut address"
+msgstr "Introduzca la dirección del acceso directo"
+
+#: ../midori/midori-speeddial.vala:163
+msgid "Enter shortcut title"
+msgstr "Introduzca el título del acceso directo"
+
+#: ../midori/midori-speeddial.vala:164
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "¿Está seguro que desea eliminar este acceso directo?"
+
+#: ../midori/midori-preferences.c:299
+msgid "Startup"
+msgstr "Inicio"
+
+#: ../midori/midori-preferences.c:305
+msgid "Homepage:"
+msgstr "Página de inicio:"
+
+#: ../midori/midori-preferences.c:313
+msgid "Use _current page"
+msgstr "Usar _página actual"
+
+#: ../midori/midori-preferences.c:317
+msgid "Use current page as homepage"
+msgstr "Usar la página actual como página de inicio"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:326
+msgid "Fonts"
+msgstr "Fuentes"
+
+#: ../midori/midori-preferences.c:329
+msgid "Proportional Font Family"
+msgstr "Familia de Fuente Proporcional"
+
+#: ../midori/midori-preferences.c:333
+msgid "The default font family used to display text"
+msgstr "Tamaño de letra predeterminado utilizado para mostrar texto"
+
+#: ../midori/midori-preferences.c:336
+msgid "The default font size used to display text"
+msgstr "Tamaño de letra predeterminado utilizado para mostrar texto"
+
+#: ../midori/midori-preferences.c:338
+msgid "Fixed-width Font Family"
+msgstr "Tipo de letra de ancho fijo"
+
+#: ../midori/midori-preferences.c:342
+msgid "The font family used to display fixed-width text"
+msgstr "Tipo de letra utilizado para mostrar el texto de ancho fijo"
+
+#: ../midori/midori-preferences.c:345
+msgid "The font size used to display fixed-width text"
+msgstr "Tamaño de letra utilizado para mostrar el texto de ancho fijo"
+
+#: ../midori/midori-preferences.c:347
+msgid "Minimum Font Size"
+msgstr "Tamaño mínimo de fuente"
+
+#: ../midori/midori-preferences.c:351
+msgid "The minimum font size used to display text"
+msgstr "Mínimo tamaño de fuente utilizado para mostrar texto"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:362
+msgid "Behavior"
+msgstr "Comportamiento"
+
+#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Cargar imágenes automáticamente"
+
+#: ../midori/midori-preferences.c:369
+msgid "Enable Spell Checking"
+msgstr "Activar corrección ortográfica"
+
+#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Activar scripts"
+
+#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Activar complementos de Netscape"
+
+#: ../midori/midori-preferences.c:391
+msgid "Zoom Text and Images"
+msgstr "Ampliar textos e imágenes"
+
+#: ../midori/midori-preferences.c:394
+msgid "Allow scripts to open popups"
+msgstr "Permitir ventanas emergentes de scripts"
+
+#: ../midori/midori-preferences.c:395
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+"Configura si se permite que los scripts puedan abrir ventanas emergentes "
+"automáticamente"
+
+#: ../midori/midori-preferences.c:401
+msgid "Kinetic scrolling"
+msgstr "Desplazamiento dinámico"
+
+#: ../midori/midori-preferences.c:402
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr ""
+"Configura si el desplazamiento debe realizarse de forma acorde a la velocidad"
+
+#: ../midori/midori-preferences.c:407
+msgid "Middle click opens Selection"
+msgstr "Abrir la selección con pulsación central"
+
+#: ../midori/midori-preferences.c:408
+msgid "Load an address from the selection via middle click"
+msgstr ""
+"Cargar una dirección desde la selección a través del botón del medio del "
+"ratón"
+
+#: ../midori/midori-preferences.c:414
+msgid "Enable WebGL support"
+msgstr "Habilitar soporte WebGL"
+
+#: ../midori/midori-preferences.c:419
+msgid "Flash window on background tabs"
+msgstr "Destellar ventana en pestañas en segundo plano"
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Guardar los archivos descargados en:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Navegación"
+
+#: ../midori/midori-preferences.c:451
+msgid "Close Buttons on Tabs"
+msgstr "Botón de cerrar en las pestañas"
+
+#: ../midori/midori-preferences.c:455
+msgid "Always Show Tabbar"
+msgstr "Siempre mostrar la barra de pestañas"
+
+#: ../midori/midori-preferences.c:459
+msgid "Open Tabs next to Current"
+msgstr "Abrir pestañas junto a la actual"
+
+#: ../midori/midori-preferences.c:460
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o "
+"después de la última"
+
+#: ../midori/midori-preferences.c:463
+msgid "Open tabs in the background"
+msgstr "Abrir pestañas en segundo plano"
+
+#: ../midori/midori-preferences.c:467
+msgid "Text Editor"
+msgstr "Editor de texto"
+
+#: ../midori/midori-preferences.c:472
+msgid "News Aggregator"
+msgstr "Agregador de noticias"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:479
+msgid "Network"
+msgstr "Red"
+
+#: ../midori/midori-preferences.c:481
+msgid "Proxy server"
+msgstr "Servidor proxy"
+
+#: ../midori/midori-preferences.c:486
+msgid "Hostname"
+msgstr "Nombre de host"
+
+#: ../midori/midori-preferences.c:494
+msgid "Port"
+msgstr "Puerto"
+
+#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509
+msgid "The maximum size of cached pages on disk"
+msgstr "El tamaño máximo de páginas de caché en el disco"
+
+#: ../midori/midori-preferences.c:511
+msgid "MB"
+msgstr "MB"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Add search engine"
+msgstr "Añadir motor de búsqueda"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Edit search engine"
+msgstr "Editar motor de búsqueda"
+
+#: ../midori/midori-searchaction.c:985
+msgid "_Name:"
+msgstr "_Nombre:"
+
+#: ../midori/midori-searchaction.c:1000
+msgid "_Description:"
+msgstr "_Descripción:"
+
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Dirección:"
+
+#: ../midori/midori-searchaction.c:1032
+msgid "_Token:"
+msgstr "_Abreviatura:"
+
+#: ../midori/midori-searchaction.c:1330
+msgid "Manage Search Engines"
+msgstr "Administrar los motores de búsqueda"
+
+#: ../midori/midori-searchaction.c:1432
+msgid "Use as _default"
+msgstr "_Predeterminado"
+
+#: ../midori/sokoke.c:353
+msgid "Open with"
+msgstr "Abrir con"
+
+#: ../midori/sokoke.c:361
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Eliga una aplicación o comando para abir \"%s\":"
+
+#: ../midori/sokoke.c:475 ../midori/sokoke.c:489
+msgid "Could not run external program."
+msgstr "No se pudo ejecutar la aplicación externa."
+
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:265
msgid "_Inline Find:"
msgstr "_Buscar:"
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:287
msgid "Previous"
msgstr "Anterior"
-#: ../toolbars/midori-findbar.c:323
+#: ../toolbars/midori-findbar.c:293
msgid "Next"
msgstr "Siguiente"
-#: ../toolbars/midori-findbar.c:327
+#: ../toolbars/midori-findbar.c:297
msgid "Match Case"
msgstr "Coincidir mayúsculas "
-#: ../toolbars/midori-findbar.c:336
+#: ../toolbars/midori-findbar.c:306
msgid "Highlight Matches"
msgstr "Destacar coincidencias"
-#: ../toolbars/midori-findbar.c:347
+#: ../toolbars/midori-findbar.c:317
msgid "Close Findbar"
msgstr "Cerrar la barra de búsqueda"
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:109
#, c-format
msgid "The file '%s ' has been downloaded."
msgstr "El archivo '%s ' ha sido descargado."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:114
msgid "Transfer completed"
msgstr "Transferencia completa"
-#: ../toolbars/midori-transferbar.c:193
-msgid "The downloaded file is erroneous."
-msgstr "El archivo descargado es inválido."
-
-#: ../toolbars/midori-transferbar.c:194
-msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards."
-msgstr "El checksum provisto con el link no coincide. Esto significa que el archivo probablemente esté incompleto o fue modificado después de su descarga."
-
-#: ../toolbars/midori-transferbar.c:334
-#: ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:241 ../panels/midori-transfers.c:139
msgid "Clear All"
msgstr "Limpiar todo"
-#: ../toolbars/midori-transferbar.c:371
-#: ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:274 ../toolbars/midori-transferbar.c:276
msgid "Some files are being downloaded"
msgstr "Se está descargando algunos archivos"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:280
msgid "_Quit Midori"
msgstr "_Cerrar Midori"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:282
msgid "The transfers will be cancelled if Midori quits."
msgstr "Se cancelarán las descargas si Midori se cierra."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Marcadores"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Error al añadir marcador: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Error al actualizar marcador: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Editar el marcador seleccionado"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Borrar el marcador seleccionado"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Añadir una nueva carpeta"
-#: ../panels/midori-bookmarks.c:594
-#: ../panels/midori-history.c:635
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Separador "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Buscar marcadores"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Historial"
-#: ../panels/midori-history.c:158
-#: ../panels/midori-history.c:189
+#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
msgid "Today"
msgstr "Hoy"
-#: ../panels/midori-history.c:160
-#: ../panels/midori-history.c:191
+#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
msgid "Yesterday"
msgstr "Ayer"
-#: ../panels/midori-history.c:162
-#: ../panels/midori-history.c:186
+#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "Hace %d día"
msgstr[1] "Hace %d días"
-#: ../panels/midori-history.c:165
-#: ../panels/midori-history.c:184
+#: ../panels/midori-history.c:165 ../panels/midori-history.c:184
msgid "A week ago"
msgstr "Hace una semana"
@@ -2234,15 +2063,20 @@ msgstr "Borrar el elemento seleccionado del historial"
msgid "Clear the entire history"
msgstr "Vaciar todo el historial"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Buscar historial"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Transferencias"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:435
msgid "Open Destination _Folder"
msgstr "Abrir la _carpeta de destino"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:438
msgid "Copy Link Loc_ation"
msgstr "Copiar destino del _enlace"
@@ -2284,170 +2118,176 @@ msgstr "No se pudo cargar el ícono stock «%s»"
msgid "Animation frames are broken"
msgstr "Los cuadros de animación están rotos"
-#: ../katze/katze-utils.c:445
-#: ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "La propiedad «%s» no es válida para %s"
-#: ../katze/katze-utils.c:491
-#: ../katze/katze-utils.c:520
-#: ../extensions/addons.c:308
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:309
msgid "Choose file"
msgstr "Elegir archivo"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Elegir carpeta"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Ninguna"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 hora"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 día"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 semana"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 mes"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 año"
-#: ../katze/katze-preferences.c:91
-#: ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Preferencias de %s"
-#: ../extensions/adblock.c:473
+#: ../katze/midori-uri.vala:173
+msgid "MD5-Checksum:"
+msgstr "MD5-Checksum:"
+
+#: ../katze/midori-uri.vala:180
+msgid "SHA1-Checksum:"
+msgstr "SHA1-Checksum:"
+
+#: ../extensions/adblock.c:475
msgid "Configure Advertisement filters"
msgstr "Configurar los filtros de publicidad"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:508
#, 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."
+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:882
+#: ../extensions/adblock.c:922
msgid "Edit rule"
msgstr "Editar regla"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:936
msgid "_Rule:"
msgstr "_Regla:"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:990
msgid "Bl_ock image"
msgstr "Bl_oquear imagen"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:995
msgid "Bl_ock link"
msgstr "Bl_oquear enlace"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1799
msgid "Advertisement blocker"
msgstr "Bloqueador de publicidad"
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1800
msgid "Block advertisements according to a filter list"
msgstr "Bloquear publicidad de acuerdo a una lista de filtros"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
-msgid "This page appears to contain a user script. Do you wish to install it?"
-msgstr "Esta página pareciera contener un script de usuario. ¿Desea instalarlo?"
-
#: ../extensions/addons.c:222
+msgid "This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+"Esta página pareciera contener un script de usuario. ¿Desea instalarlo?"
+
+#: ../extensions/addons.c:223
msgid "_Install user script"
msgstr "_Instalar script de usuario"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
-msgid "This page appears to contain a user style. Do you wish to install it?"
-msgstr "Esta página pareciera contener un estilo de usuario. ¿Desea instalarlo?"
-
#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+"Esta página pareciera contener un estilo de usuario. ¿Desea instalarlo?"
+
+#: ../extensions/addons.c:229
msgid "_Install user style"
msgstr "_Instalar estilo de usuario"
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
msgid "Don't install"
msgstr "No instalar"
-#: ../extensions/addons.c:319
-#: ../extensions/addons.c:681
+#: ../extensions/addons.c:320 ../extensions/addons.c:675
msgid "Userscripts"
msgstr "Scripts de usuario"
-#: ../extensions/addons.c:324
-#: ../extensions/addons.c:683
+#: ../extensions/addons.c:325 ../extensions/addons.c:677
msgid "Userstyles"
msgstr "Estilos de usuario"
-#: ../extensions/addons.c:380
-#: ../extensions/addons.c:459
+#: ../extensions/addons.c:371 ../extensions/addons.c:450
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Error"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:412
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "¿Está seguro que desea borrar \"%s\"?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:418
msgid "Delete user script"
msgstr "Eliminar script de usuario"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:419
msgid "Delete user style"
msgstr "Eliminar estilo de usuario"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:422
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "El archivo %s será eliminado definitivamente."
-#: ../extensions/addons.c:570
-#: ../extensions/addons.c:647
+#: ../extensions/addons.c:564 ../extensions/addons.c:641
msgid "Open in Text Editor"
msgstr "Abrir en editor de texto"
-#: ../extensions/addons.c:572
-#: ../extensions/addons.c:656
+#: ../extensions/addons.c:566 ../extensions/addons.c:650
msgid "Open Target Folder"
msgstr "Abrir carpeta de destino"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:632
msgid "Add new addon"
msgstr "Añadir nuevo complemento"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:658
msgid "Remove selected addon"
msgstr "Eliminar complemento seleccionado"
-#: ../extensions/addons.c:1696
-#: ../extensions/addons.c:1914
+#: ../extensions/addons.c:1686 ../extensions/addons.c:1904
msgid "User addons"
msgstr "Complementos de usuario"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1816
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "No se puede monitorizar el directorio '%s': %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1905
msgid "Support for userscripts and userstyles"
msgstr "Soporte para scripts y estilos de usuario"
@@ -2469,8 +2309,12 @@ msgid "Delete All"
msgstr "Eliminar todo"
#: ../extensions/cookie-manager/cookie-manager-page.c:105
-msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter."
-msgstr "Elimina todas las cookies. Si se establece un filtro, sólo se eliminarán las \"cookies\" que coincidan con el filtro."
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"Elimina todas las cookies. Si se establece un filtro, sólo se eliminarán las "
+"\"cookies\" que coincidan con el filtro."
#: ../extensions/cookie-manager/cookie-manager-page.c:120
msgid "Expand All"
@@ -2530,25 +2374,21 @@ msgstr ""
"Dominio : %s\n"
"Cookies : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Nombre"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "_Expandir todo"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "_Contraer todo"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filtro:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter"
-msgstr "Introduzca una cadena de filtro para mostrar sólo las cookies cuyo nombre o dominio coincide con el filtro ingresado"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Buscar cookies por nombre de dominio"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2568,11 +2408,15 @@ msgstr "Copiar las direcciones de todas las pestañas al portapapeles"
#: ../extensions/feed-panel/feed-atom.c:209
msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr "No se han podido encontrar elementos necesarios de tipo \"entry\" Atom en los datos XML."
+msgstr ""
+"No se han podido encontrar elementos necesarios de tipo \"entry\" Atom en "
+"los datos XML."
#: ../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 de tipo \"feed\" Atom 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:387
@@ -2600,7 +2444,8 @@ msgstr "_Canales"
#: ../extensions/feed-panel/feed-parse.c:195
#, 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."
+msgstr ""
+"No se ha podido encontrar el elemento raíz en el canal de información XML."
#: ../extensions/feed-panel/feed-parse.c:235
#, c-format
@@ -2614,7 +2459,9 @@ 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 de tipo \"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."
@@ -2622,11 +2469,15 @@ msgstr "Versión de RSS no soportada."
#: ../extensions/feed-panel/feed-rss.c:148
msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr "No se ha podido encontrar los elementos necesarios RSS \"item\" en los datos XML."
+msgstr ""
+"No se ha podido encontrar los elementos necesarios RSS \"item\" en los datos "
+"XML."
#: ../extensions/feed-panel/feed-rss.c:248
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."
+msgstr ""
+"No se ha podido encontrar los elementos necesarios RSS \"channel\" en los "
+"datos XML."
#: ../extensions/feed-panel/main.c:131
#, c-format
@@ -2685,7 +2536,8 @@ msgstr "Alternar estado del formulario de historial"
#: ../extensions/formhistory/formhistory.c:438
msgid "Activate or deactivate form history for the current tab."
-msgstr "Activar o desactivar el formulario de historial para la pestaña actual."
+msgstr ""
+"Activar o desactivar el formulario de historial para la pestaña actual."
#: ../extensions/formhistory/formhistory.c:549
#: ../extensions/formhistory/formhistory.c:553
@@ -2695,7 +2547,9 @@ msgstr "No se ha podido ejecutar sentencia en base de datos: %s\n"
#: ../extensions/formhistory/formhistory.c:629
msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
-msgstr "Solamente activar el historial a través del atajo de teclado (Ctrl + Shift + F) por pestaña"
+msgstr ""
+"Solamente activar el historial a través del atajo de teclado (Ctrl + Shift + "
+"F) por pestaña"
#: ../extensions/formhistory/formhistory.c:668
msgid "Form history filler"
@@ -2766,7 +2620,8 @@ msgstr "Lista de historial de pestañas"
#: ../extensions/history-list.vala:570
msgid "Move to the last used tab when switching or closing tabs"
-msgstr "Mover a la última pestaña se utiliza cuando se cambian o se cierran pestañas"
+msgstr ""
+"Mover a la última pestaña se utiliza cuando se cambian o se cierran pestañas"
#: ../extensions/mouse-gestures.c:301
msgid "Mouse Gestures"
@@ -2786,7 +2641,7 @@ msgstr "Personalizar los atajos del teclado"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "Personalizar los ac_cesos directos..."
+msgstr "Personalizar los a_ccesos directos…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2804,36 +2659,35 @@ msgstr "Reloj de barra de estado"
msgid "Display date and time in the statusbar"
msgstr "Mostrar fecha y hora en la barra de estado"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Imágenes"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Scripts"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Complementos de Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Barra de funcionalidades"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "Activar y desactivar fácilmente las características de páginas web"
-#: ../extensions/tab-panel.c:593
-#: ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Panel de pestañas"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "Panel de p_estañas"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Mostrar las pestañas en un panel vertical"
@@ -2845,42 +2699,284 @@ msgstr "Sólo iconos en las pestañas por defecto"
msgid "New tabs have no label by default"
msgstr "Nuevas pestañas sin etiqueta por defecto"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Personalizar la barra de tareas"
-#: ../extensions/toolbar-editor.c:409
-msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop."
-msgstr "Seleccione los elementos que se mostrarán en la barra de herramientas. Los elementos pueden ser reordenados arrastrando y soltando."
+#: ../extensions/toolbar-editor.c:411
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"Seleccione los elementos que se mostrarán en la barra de herramientas. Los "
+"elementos pueden ser reordenados arrastrando y soltando."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Elementos disponibles"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Elementos utilizados"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Personalizar la barra de _tareas..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "_Personalizar la barra de tareas…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Personalizar..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Editor de la barra de herramientas"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Editar fácilmente el diseño de la barra de herramienta"
-#: ../extensions/web-cache.c:463
+#: ../extensions/web-cache.c:462
msgid "Cache HTTP communication on disk"
msgstr "Cachear tráfico HTTP en disco"
+#~ msgid "Remember last window size"
+#~ msgstr "Recordar el tamaño de la última ventana"
+
+#~ msgid "Whether to save the last window size"
+#~ msgstr "Si se desea recordar el tamaño de la última ventana"
+
+#~ msgid "Last window width"
+#~ msgstr "Última anchura de la ventana"
+
+#~ msgid "The last saved window width"
+#~ msgstr "Última anchura de la ventana guardada"
+
+#~ msgid "Last window height"
+#~ msgstr "Última altura de la ventana"
+
+#~ msgid "The last saved window height"
+#~ msgstr "Última altura guardada de la ventana "
+
+#~ msgid "Last panel position"
+#~ msgstr "Última posición del panel"
+
+#~ msgid "The last saved panel position"
+#~ msgstr "Ultima posición guardada del panel"
+
+#~ msgid "Last panel page"
+#~ msgstr "Última página del panel"
+
+#~ msgid "The last saved panel page"
+#~ msgstr "Última página guardada del panel"
+
+#~ msgid "Last Web search"
+#~ msgstr "Última búsqueda web"
+
+#~ msgid "The last saved Web search"
+#~ msgstr "Última búsqueda web guardada"
+
+#~ msgid "Show Menubar"
+#~ msgstr "Mostrar barra de menú"
+
+#~ msgid "Whether to show the menubar"
+#~ msgstr "Mostrar u ocultar la barra de menú"
+
+#~ msgid "Show Navigationbar"
+#~ msgstr "Mostrar la barra de navegación"
+
+#~ msgid "Whether to show the navigationbar"
+#~ msgstr "Mostrar u ocultar la barra de navegación"
+
+#~ msgid "Show Bookmarkbar"
+#~ msgstr "Mostrar la barra de marcadores"
+
+#~ msgid "Whether to show the bookmarkbar"
+#~ msgstr "Mostrar u ocultar la barra de marcadores"
+
+#~ msgid "Show Panel"
+#~ msgstr "Mostrar el panel"
+
+#~ msgid "Whether to show the panel"
+#~ msgstr "Mostrar u ocultar el panel"
+
+#~ msgid "Show Statusbar"
+#~ msgstr "Mostrar la barra de estado"
+
+#~ msgid "Whether to show the statusbar"
+#~ msgstr "Mostrar u ocultar la barra de estado"
+
+#~ msgid "Toolbar Items"
+#~ msgstr "Elementos de la barra de herramientas"
+
+#~ msgid "The items to show on the toolbar"
+#~ msgstr "Los elementos a mostrar en la barra de herramientas"
+
+#~ msgid "Compact Sidepanel"
+#~ msgstr "Panel lateral compacto"
+
+#~ msgid "Whether to make the sidepanel compact"
+#~ msgstr "Si se desea hacer compacto el panel lateral"
+
+#~ msgid "Align sidepanel on the right"
+#~ msgstr "Alinear el panel a la derecha"
+
+#~ msgid "Whether to align the sidepanel on the right"
+#~ msgstr "Alinear el panel lateral a la derecha"
+
+#~ msgid "Open panels in separate windows"
+#~ msgstr "Abrir paneles en ventanas separadas"
+
+#~ msgid "Whether to always open panels in separate windows"
+#~ msgstr "Configura si los paneles se abren en ventanas separadas"
+
+#~ msgid "What to do when Midori starts"
+#~ msgstr "Qué hacer al inicio de Midori"
+
+#~ msgid "The homepage"
+#~ msgstr "La página de inicio"
+
+#~ msgid "Show crash dialog"
+#~ msgstr "Mostrar diálogo de cuelgue"
+
+#~ msgid "The folder downloaded files are saved to"
+#~ msgstr "Carpeta donde se guardan los archivos descargados"
+
+#~ msgid "An external text editor"
+#~ msgstr "Editor de textos externo"
+
+#~ msgid "An external news aggregator"
+#~ msgstr "Un agregador de noticias externo"
+
+#~ msgid "Location entry Search"
+#~ msgstr "Búsqueda en la barra"
+
+#~ msgid "The search to perform inside the location entry"
+#~ msgstr ""
+#~ "Hacer una búsqueda a partir del contenido de la barra de direcciones"
+
+#~ msgid "The preferred character encoding"
+#~ msgstr "Codificación de caracteres preferida"
+
+#~ msgid "Always show the tabbar"
+#~ msgstr "Siempre mostrar la barra de pestañas"
+
+#~ msgid "Whether tabs have close buttons"
+#~ msgstr "Si se desea que las pestañas tengan el botón de cerrar"
+
+#~ msgid "Where to open new pages"
+#~ msgstr "Dónde abrir las páginas nuevas"
+
+#~ msgid "Whether to open new tabs in the background"
+#~ msgstr "Si se desea que las nuevas pestañas se abran en segundo plano"
+
+#~ msgid "Open popups in tabs"
+#~ msgstr "Abrir ventanas emergentes en pestañas"
+
+#~ msgid "Whether to open popup windows in tabs"
+#~ msgstr "Si se desea abrir las ventanas emergentes en pestañas"
+
+#~ msgid "Load and display images automatically"
+#~ msgstr "Cargar y mostrar imágenes automáticamente"
+
+#~ msgid "Enable embedded scripting languages"
+#~ msgstr "Activar idiomas de escrituras incrustadas"
+
+#~ msgid "Enable embedded Netscape plugin objects"
+#~ msgstr "Activar el complemento de objetos incrustados Netscape"
+
+#~ msgid "Enable spell checking while typing"
+#~ msgstr "Activar corrección ortográfica mientras se escribe"
+
+#~ msgid "Enable HTML5 database support"
+#~ msgstr "Activar soporte de base de datos HTML5"
+
+#~ msgid "Whether to enable HTML5 database support"
+#~ msgstr "Configura si se activa el soporte de base de datos de HTML5"
+
+#~ msgid "Whether to enable HTML5 local storage support"
+#~ msgstr "Configura si se activa el soporte de almacenamiento local de HTML5"
+
+#~ msgid "Whether to enable offline web application cache"
+#~ msgstr "Configura si se activa el caché local de aplicación web"
+
+#~ msgid "Flash the browser window if a new tab was opened in the background"
+#~ msgstr ""
+#~ "El flash de la ventana del navegador si una nueva pestaña se abre en el "
+#~ "fondo"
+
+#~ msgid "Allow websites to use OpenGL rendering"
+#~ msgstr "Permitir a los sitios web utilizar renderizado OpenGL"
+
+#~ msgid "Whether to zoom text and images"
+#~ msgstr "Si se desea ampliar texto e imágenes"
+
+#~ msgid "Find inline while typing"
+#~ msgstr "Buscar en el texto al escribir"
+
+#~ msgid "Whether to automatically find inline while typing"
+#~ msgstr ""
+#~ "Si se desea buscar automáticamente en el texto al comenzar a escribir"
+
+#~ msgid "The type of proxy server to use"
+#~ msgstr "El tipo de servidor a usar"
+
+#~ msgid "HTTP Proxy Server"
+#~ msgstr "Servidor proxy HTTP"
+
+#~ msgid "The proxy server used for HTTP connections"
+#~ msgstr "Servidor proxy utilizado para conexiones HTTP"
+
+#~ msgid "The proxy server port used for HTTP connections"
+#~ msgstr "El puerto del servidor proxy usado para conexiones HTTP"
+
+#~ msgid "Identification string"
+#~ msgstr "Cadena de identificación"
+
+#~ msgid "The application identification string"
+#~ msgstr "Aplicación de identificación de cadenas"
+
+#~ msgid "Clear private data"
+#~ msgstr "Borrar datos privados"
+
+#~ msgid "The private data selected for deletion"
+#~ msgstr "Los datos privados seleccionados para su eliminación"
+
+#~ msgid "Clear data"
+#~ msgstr "Borrar datos privados"
+
+#~ msgid "The data selected for deletion"
+#~ msgstr "Los datos seleccionados para eliminarse"
+
+#~ msgid "Filter:"
+#~ msgstr "Filtro:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Introduzca una cadena de filtro para mostrar sólo las cookies cuyo nombre "
+#~ "o dominio coincide con el filtro ingresado"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Cerrar las o_tras pestañas"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Icono"
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Marcador"
+
+#~ msgid "_Console"
+#~ msgstr "_Consola"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Carpeta de nivel superior"
+
+#~ msgid "_Title:"
+#~ msgstr "_Título:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Carpeta:"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Personalizar…"
+
#~ msgid "The bookmarks couldn't be saved. %s"
#~ msgstr "No se pudieron guardar los marcadores. %s"
@@ -2983,15 +3079,15 @@ msgstr "Cachear tráfico HTTP en disco"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Añadir un marcador nuevo"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Añadir, editar y quitar motores de búsqueda..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Añadir, editar y quitar motores de búsqueda…"
-#~ msgid "Clear private data..."
+#~ msgid "Clear private data…"
#~ msgstr "Borrar datos privados"
-#~ msgid "Inspect page details and access developer tools..."
+#~ msgid "Inspect page details and access developer tools…"
#~ msgstr ""
-#~ "Inspeccionar detalles de página y acceder a herramientas de desarrollo..."
+#~ "Inspeccionar detalles de página y acceder a herramientas de desarrollo…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Cambiar a la pestaña anterior"
@@ -3047,12 +3143,6 @@ msgstr "Cachear tráfico HTTP en disco"
#~ msgid "Show statusbar"
#~ msgstr "Mostrar la barra de estado"
-#~ msgid "MD5-Checksum:"
-#~ msgstr "MD5-Checksum:"
-
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "SHA1-Checksum:"
-
#~ msgid "No filename specified"
#~ msgstr "No se especificó el nombre del archivo"
@@ -3207,8 +3297,8 @@ msgstr "Cachear tráfico HTTP en disco"
#~ msgid "%s of %s, %s/s"
#~ msgstr "%s de %s, a %s/s"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Configurar filtros de p_ublicidad..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Configurar filtros de p_ublicidad…"
#~ msgid "Open target folder for selected addon"
#~ msgstr "Abrir carpeta de destino para el complemento seleccionado"
@@ -3423,9 +3513,6 @@ msgstr "Cachear tráfico HTTP en disco"
#~ msgid "Enable special extensions for developers"
#~ msgstr "Habilitar extensiones especiales para desarrolladores"
-#~ msgid "User_styles"
-#~ msgstr "_Estilos de usuario"
-
#~ msgid "Tint tabs distinctly"
#~ msgstr "Pestañas de distintos colores"
@@ -3438,7 +3525,7 @@ msgstr "Cachear tráfico HTTP en disco"
#~ msgid "Load on Startup"
#~ msgstr "Al iniciar Midori cargar:"
-#~ msgid "Configure _Toolbar..."
+#~ msgid "Configure _Toolbar…"
#~ msgstr "Configurar la _Barra de tareas"
#~ msgid "_Quick Find"
@@ -3453,9 +3540,6 @@ msgstr "Cachear tráfico HTTP en disco"
#~ msgid "Warning: You are using a superuser account!"
#~ msgstr "Advertencia: Usted está utilizando una cuenta de superusuario!"
-#~ msgid "_Enable"
-#~ msgstr "_Activar"
-
#~ msgid "Enable"
#~ msgstr "Activar"
diff --git a/po/et.po b/po/et.po
index 577cde2d..acb3da87 100644
--- a/po/et.po
+++ b/po/et.po
@@ -532,7 +532,7 @@ msgid "_Manage Search Engines"
msgstr "_Halda otsingumootoreid"
#: ../midori/midori-browser.c:3196
-msgid "Add, edit and remove search engines..."
+msgid "Add, edit and remove search engines…"
msgstr "Lisa, muuda ja eemalda otsingumootoreid"
#: ../midori/midori-browser.c:3200
@@ -642,16 +642,16 @@ msgid "Show statusbar"
msgstr "Näita olekuriba"
#: ../midori/midori-browser.c:3669
-msgid "_Location..."
-msgstr "_Asukoht..."
+msgid "_Location…"
+msgstr "_Asukoht…"
#: ../midori/midori-browser.c:3671
msgid "Open a particular location"
msgstr "Ava kindel asukoht"
#: ../midori/midori-browser.c:3695
-msgid "_Web Search..."
-msgstr "_Veebiotsing..."
+msgid "_Web Search…"
+msgstr "_Veebiotsing…"
#: ../midori/midori-browser.c:3697
msgid "Run a web search"
@@ -751,8 +751,8 @@ msgid "Western (ISO-8859-1)"
msgstr "Lääne (ISO-8859-1)"
#: ../midori/midori-websettings.c:153
-msgid "Custom..."
-msgstr "Kohandatud..."
+msgid "Custom…"
+msgstr "Kohandatud…"
#: ../midori/midori-websettings.c:168
msgid "New tab"
@@ -1478,8 +1478,8 @@ msgstr ""
#~ msgid "Redo the last modification"
#~ msgstr "Tee viimane muudatus uuesti"
-#~ msgid "Open in Page_holder..."
-#~ msgstr "Ava lehe_hoidjas..."
+#~ msgid "Open in Page_holder…"
+#~ msgstr "Ava lehe_hoidjas…"
#~ msgid "Open the current page in the pageholder"
#~ msgstr "Ava käesolev lehekülg lehehoidjas"
@@ -1487,8 +1487,8 @@ msgstr ""
#~ msgid "_Manage Bookmarks"
#~ msgstr "_Halda järjehoidjaid"
-#~ msgid "Add, edit and remove bookmarks..."
-#~ msgstr "Lisa, muuda ja eemalda järjehoidjaid..."
+#~ msgid "Add, edit and remove bookmarks…"
+#~ msgstr "Lisa, muuda ja eemalda järjehoidjaid…"
#~ msgid "Open the selected bookmark in a new tab"
#~ msgstr "Ava valitud järjehoidja uuel kaardil"
diff --git a/po/eu.po b/po/eu.po
index 1c922bf4..98201579 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2,19 +2,19 @@
# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER
# This file is distributed under the same license as the midori package.
# Asier Iturralde Sarasola , 2012.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: midori\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-07 14:06+0000\n"
+"POT-Creation-Date: 2012-08-05 21:45+0000\n"
"PO-Revision-Date: 2012-05-03 13:11+0000\n"
"Last-Translator: Asier Iturralde Sarasola \n"
"Language-Team: Librezale \n"
-"Language: Basque\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: Basque\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: ../data/midori.desktop.in.h:1
@@ -25,12 +25,30 @@ msgstr "Arakatu sarea"
msgid "Internet;WWW;Explorer"
msgstr ""
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:2028 ../midori/main.c:2052
+#: ../midori/main.c:2066 ../midori/midori-websettings.c:315
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+#, fuzzy
+msgid "Midori Web Browser"
+msgstr "Web-arakatzailea"
+
+#: ../data/midori.desktop.in.h:5
+#, fuzzy
+msgid "New Private Browsing Window"
+msgstr "Nabigatze _pribatuko leiho berria"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1434
+msgid "New Tab"
+msgstr "Fitxa berria"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1431
+msgid "New Window"
+msgstr "Leiho berria"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Web-arakatzailea"
@@ -42,325 +60,313 @@ msgstr "Midori nabigatze pribatua"
msgid "Open a new private browsing window"
msgstr "Ireki nabigatze pribatuko leiho berri bat"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4492
msgid "Private Browsing"
msgstr "Nabigatze pribatua"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Ezin izan da konfigurazioa kargatu: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "'%s' balioa baliogabea da %s-(r)entzat"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Baliogabeko '%s' konfigurazio balioa"
-#: ../midori/main.c:380
+#: ../midori/main.c:375
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Ezin izan dira bilaketa-tresnak kargatu. %s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:429
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Huts egin du historia garbitzean: %s\n"
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Huts egin du datu-basea irekitzean: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:523
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Huts egin du historiako elementu zaharrak kentzean: %s\n"
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Huts egin du historiako elementua kentzean: %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Ezin izan dira laster-markak gorde. %s"
-
-#: ../midori/main.c:633
+#: ../midori/main.c:545
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Ezin izan da konfigurazioa gorde. %s"
-#: ../midori/main.c:668
+#: ../midori/main.c:571
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Ezin izan dira bilaketa-tresnak gorde. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:608
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Ezin izan da zakarrontzia gorde. %s"
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
+#: ../midori/main.c:681 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Hedapenak"
-#: ../midori/main.c:760
+#: ../midori/main.c:695
msgid "Privacy"
msgstr "Pribatutasuna"
-#: ../midori/main.c:772
+#: ../midori/main.c:707
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
msgstr ""
-#: ../midori/main.c:828
+#: ../midori/main.c:763
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Ezin izan da saioa gorde. %s"
-#: ../midori/main.c:1046
+#: ../midori/main.c:1001
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
+"Ez dago erro ziurtagiri fitxategi eskuragarririk. SSL ziurtagiriak ezin dira "
+"egiaztatu."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1093
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
msgstr ""
+"Dirudienez Midori kraskatu egin zen ireki zen azkenengo aldian. Behin baino "
+"gehiago pasa bada saiatu hauetako irteera bat arazoa konpontzeko."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1112
msgid "Modify _preferences"
msgstr "Aldatu _hobespenak"
-#: ../midori/main.c:1119
+#: ../midori/main.c:1116
msgid "Disable all _extensions"
msgstr "Desgaitu _hedapen guztiak"
-#: ../midori/main.c:1132
+#: ../midori/main.c:1129
msgid "Discard old tabs"
msgstr "Baztertu fitxa zaharrak"
-#: ../midori/main.c:1133 ../midori/midori-websettings.c:217
+#: ../midori/main.c:1130 ../midori/midori-websettings.c:223
msgid "Show last tabs without loading"
msgstr "Erakutsi azken fitxak kargatu gabe"
-#: ../midori/main.c:1134 ../midori/midori-websettings.c:216
+#: ../midori/main.c:1131 ../midori/midori-websettings.c:222
msgid "Show last open tabs"
-msgstr ""
+msgstr "Ikusi azken irekitako fitxak"
-#: ../midori/main.c:1342 ../midori/main.c:2399
+#: ../midori/main.c:1379 ../midori/main.c:2436
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Ezin izan da saioa kargatu: %s\n"
-#: ../midori/main.c:1480
+#: ../midori/main.c:1517
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Argazkia hona gorde da: %s\n"
-#: ../midori/main.c:1891
+#: ../midori/main.c:1933
msgid "Run ADDRESS as a web application"
msgstr "Exekutatu HELBIDEA web aplikazio bezala"
-#: ../midori/main.c:1891
+#: ../midori/main.c:1933
msgid "ADDRESS"
msgstr "HELBIDEA"
-#: ../midori/main.c:1894
+#: ../midori/main.c:1936
msgid "Use FOLDER as configuration folder"
msgstr "Erabili KARPETA konfigurazio karpeta bezala"
-#: ../midori/main.c:1894
+#: ../midori/main.c:1936
msgid "FOLDER"
msgstr "KARPETA"
-#: ../midori/main.c:1897
+#: ../midori/main.c:1939
msgid "Private browsing, no changes are saved"
msgstr "Nabigatze pribatua, aldaketak ez dira gordeko"
-#: ../midori/main.c:1899
+#: ../midori/main.c:1941
msgid "Show a diagnostic dialog"
msgstr "Erakutsi diagnostiko elkarrizketa-koadroa"
-#: ../midori/main.c:1901
+#: ../midori/main.c:1943
msgid "Run the specified filename as javascript"
msgstr "Exekutatu zehazturiko fitxategi-izena javascript bezala"
-#: ../midori/main.c:1903
+#: ../midori/main.c:1945
msgid "Take a snapshot of the specified URI"
msgstr "Hartu zehazturiko URI-aren argazki bat"
-#: ../midori/main.c:1905
+#: ../midori/main.c:1947
msgid "Execute the specified command"
msgstr "Exekutatu zehazturiko komandoa"
-#: ../midori/main.c:1907
+#: ../midori/main.c:1949
msgid "List available commands to execute with -e/ --execute"
msgstr "Zerrendatu exekuta daitezkeen komandoak honela: -e/ --execute"
-#: ../midori/main.c:1909
+#: ../midori/main.c:1951
msgid "Display program version"
msgstr "Bistaratu programaren bertsioa"
-#: ../midori/main.c:1911
+#: ../midori/main.c:1953
msgid "Addresses"
msgstr "Helbideak"
-#: ../midori/main.c:1913
+#: ../midori/main.c:1955
msgid "Block URIs according to regular expression PATTERN"
-msgstr ""
+msgstr "Iragazi URIak espresio erregular PATROIArekin "
-#: ../midori/main.c:1913
+#: ../midori/main.c:1955
msgid "PATTERN"
-msgstr ""
+msgstr "PATROIA"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1917
+#: ../midori/main.c:1959
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr ""
-#: ../midori/main.c:1917
+#: ../midori/main.c:1959
msgid "SECONDS"
-msgstr ""
+msgstr "SEGUNDU"
-#: ../midori/main.c:1920
+#: ../midori/main.c:1962
msgid "Redirects console warnings to the specified FILENAME"
msgstr ""
-#: ../midori/main.c:1920
+#: ../midori/main.c:1962
msgid "FILENAME"
-msgstr ""
+msgstr "FITXATEGI-IZENA"
-#: ../midori/main.c:1985
+#: ../midori/main.c:2025
msgid "[Addresses]"
msgstr "[Helbideak]"
-#: ../midori/main.c:1995
-msgid "The specified configuration folder is invalid."
-msgstr ""
-
-#: ../midori/main.c:2023
+#: ../midori/main.c:2067
msgid "Please report comments, suggestions and bugs to:"
msgstr ""
-#: ../midori/main.c:2025
+#: ../midori/main.c:2069
msgid "Check for new versions at:"
msgstr ""
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2109
+#: ../midori/main.c:2164
msgid "Saved logins and _passwords"
msgstr ""
-#: ../midori/main.c:2111
+#: ../midori/main.c:2166
msgid "Cookies and Website data"
-msgstr ""
+msgstr "Cookie eta Webgune datuak"
-#: ../midori/main.c:2114 ../midori/midori-websettings.c:956
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/main.c:2170 ../midori/midori-websettings.c:1020
#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
msgstr "Web cache-a"
-#: ../midori/main.c:2117
+#: ../midori/main.c:2173
msgid "Website icons"
msgstr "Webguneen ikonoak"
-#: ../midori/main.c:2224
+#: ../midori/main.c:2277
msgid "An unknown error occured"
msgstr "Errore ezezagun bat gertatu da"
-#: ../midori/main.c:2330
+#: ../midori/main.c:2384
msgid "An instance of Midori is already running but not responding.\n"
msgstr ""
-#: ../midori/main.c:2366
+#: ../midori/main.c:2418
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Ezin izan dira laster-markak kargatu: %s\n"
-#: ../midori/main.c:2414
+#: ../midori/main.c:2451
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Ezin izan da zakarrontzia kargatu: %s\n"
-#: ../midori/main.c:2427
+#: ../midori/main.c:2464
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Ezin izan da historia kargatu: %s\n"
-#: ../midori/main.c:2443
+#: ../midori/main.c:2479
msgid "The following errors occured:"
msgstr "Ondorengo erroreak gertatu dira:"
-#: ../midori/main.c:2459
+#: ../midori/main.c:2495
msgid "_Ignore"
msgstr "Ez _ikusia egin"
-#: ../midori/midori-app.c:1331
-msgid "_Bookmark"
-msgstr "_Laster-marka"
+#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:499
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Ezusteko ekintza '%s'."
-#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:5933
+#: ../midori/midori-app.c:1453 ../midori/midori-browser.c:6380
msgid "_Bookmarks"
msgstr "_Laster-markak"
-#: ../midori/midori-app.c:1333
+#: ../midori/midori-app.c:1454
msgid "Add Boo_kmark"
msgstr "Gehitu _laster-marka"
-#: ../midori/midori-app.c:1334
-msgid "_Console"
-msgstr "Kontsola"
-
-#: ../midori/midori-app.c:1335
+#: ../midori/midori-app.c:1455
msgid "_Extensions"
msgstr "_Hedapenak"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4502
+#: ../midori/midori-app.c:1456 ../midori/midori-browser.c:4836
msgid "_History"
msgstr "_Historia"
-#: ../midori/midori-app.c:1337
-msgid "_Homepage"
-msgstr "_Hasiera-orria"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1457
msgid "_Userscripts"
msgstr "_Erabiltzailearen script-ak"
-#: ../midori/midori-app.c:1339
+#: ../midori/midori-app.c:1458
+#, fuzzy
+msgid "User_styles"
+msgstr "Erabiltzaile-estiloak"
+
+#: ../midori/midori-app.c:1459
msgid "New _Tab"
msgstr "_Fitxa berria"
-#: ../midori/midori-app.c:1340
+#: ../midori/midori-app.c:1460
msgid "_Transfers"
msgstr "_Transferentziak"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1461
msgid "Netscape p_lugins"
msgstr "Netscape-en pluginak"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1462
msgid "_Closed Tabs"
msgstr "_Itxitako fitxak"
-#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5088
+#: ../midori/midori-app.c:1463 ../midori/midori-browser.c:5519
msgid "New _Window"
msgstr "_Leiho berria"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1464
msgid "New _Folder"
msgstr "_Karpeta berria"
@@ -381,140 +387,123 @@ msgstr "Laster-marka formatu ezezaguna."
msgid "Writing failed."
msgstr "Huts egin du idaztean."
-#: ../midori/midori-browser.c:321 ../midori/midori-browser.c:5170
-#: ../midori/midori-browser.c:5179
+#: ../midori/midori-browser.c:360 ../midori/midori-browser.c:5607
+#: ../midori/midori-browser.c:5616
msgid "Reload the current page"
msgstr "Birkargatu uneko orria"
-#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:5176
+#: ../midori/midori-browser.c:369 ../midori/midori-browser.c:5613
msgid "Stop loading the current page"
-msgstr ""
+msgstr "Gelditu uneko orrialdea kargatzeaz"
-#: ../midori/midori-browser.c:455
+#: ../midori/midori-browser.c:486
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Huts egin du izenburua eguneratzean: %s\n"
-#: ../midori/midori-browser.c:468
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Ezusteko ekintza '%s'."
-
-#: ../midori/midori-browser.c:558
+#: ../midori/midori-browser.c:579
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Nabigatze pribatua)"
-#: ../midori/midori-browser.c:668 ../midori/midori-browser.c:701
-msgid "Toplevel folder"
-msgstr ""
+#: ../midori/midori-browser.c:692 ../midori/midori-browser.c:734
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Laster-markak"
-#: ../midori/midori-browser.c:758
+#: ../midori/midori-browser.c:794
msgid "New folder"
msgstr "Karpeta berria"
-#: ../midori/midori-browser.c:758
+#: ../midori/midori-browser.c:794
msgid "Edit folder"
msgstr "Editatu karpeta"
-#: ../midori/midori-browser.c:760
+#: ../midori/midori-browser.c:796
msgid "New bookmark"
msgstr "Laster-marka berria"
-#: ../midori/midori-browser.c:760
+#: ../midori/midori-browser.c:796
msgid "Edit bookmark"
msgstr "Editatu laster-marka"
-#: ../midori/midori-browser.c:791
-msgid "_Title:"
-msgstr "_Izenburua:"
+#: ../midori/midori-browser.c:830
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Idatzi laster-marka honentzat izen bat eta hautatu non gorde nahi duzun."
-#: ../midori/midori-browser.c:811 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Helbidea:"
-
-#: ../midori/midori-browser.c:834 ../midori/midori-browser.c:4239
-msgid "_Folder:"
-msgstr "_Karpeta:"
-
-#: ../midori/midori-browser.c:850
+#: ../midori/midori-browser.c:891
msgid "Add to _Speed Dial"
msgstr ""
-#: ../midori/midori-browser.c:863
+#: ../midori/midori-browser.c:897
msgid "Show in the tool_bar"
msgstr "Erakutsi _tresna-barran"
-#: ../midori/midori-browser.c:878
+#: ../midori/midori-browser.c:905
msgid "Run as _web application"
msgstr "Exekutatu _web aplikazio bezala"
-#: ../midori/midori-browser.c:949
+#: ../midori/midori-browser.c:975
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "Ezin da \"%s\" fitxategia karpetan honetan gorde"
-#: ../midori/midori-browser.c:951
+#: ../midori/midori-browser.c:977
#, c-format
msgid "You don't have permission to write in this location."
msgstr "Ez daukazu kokaleku honetan idazteko baimenik."
-#: ../midori/midori-browser.c:958
+#: ../midori/midori-browser.c:984
#, c-format
msgid "There is not enough free space to download \"%s\"."
msgstr "Ez dago \"%s\" deskargatzeko adina leku libre."
-#: ../midori/midori-browser.c:961
+#: ../midori/midori-browser.c:987
#, c-format
msgid "The file needs %s but only %s are left."
msgstr "Fitxategiak %s behar ditu baina %s daude libre."
-#: ../midori/midori-browser.c:999 ../midori/midori-browser.c:4308
+#: ../midori/midori-browser.c:1123 ../midori/midori-browser.c:4640
msgid "Save file as"
msgstr "Gorde fitxategia honela"
-#: ../midori/midori-browser.c:1293
-msgid "New Window"
-msgstr "Leiho berria"
+#: ../midori/midori-browser.c:1129
+msgid "Save associated _resources"
+msgstr ""
-#: ../midori/midori-browser.c:1293
+#: ../midori/midori-browser.c:1431
msgid "A new window has been opened"
msgstr "Leiho berri bat ireki da"
-#: ../midori/midori-browser.c:1296
-msgid "New Tab"
-msgstr "Fitxa berria"
-
-#: ../midori/midori-browser.c:1296
+#: ../midori/midori-browser.c:1434
msgid "A new tab has been opened"
msgstr "Fitxa berri bat ireki da"
-#: ../midori/midori-browser.c:1331
+#: ../midori/midori-browser.c:1451
msgid "Error opening the image!"
msgstr "Errorea irudia irekitzean!"
-#: ../midori/midori-browser.c:1332
+#: ../midori/midori-browser.c:1452
msgid "Can not open selected image in a default viewer."
msgstr "Ezin da hautatutako irudia ireki ikustaile lehenetsian."
-#: ../midori/midori-browser.c:1338
+#: ../midori/midori-browser.c:1458
msgid "Error downloading the image!"
msgstr "Errorea irudia deskargatzean!"
-#: ../midori/midori-browser.c:1339
-msgid "Can not downlaod selected image."
+#: ../midori/midori-browser.c:1459
+msgid "Can not download selected image."
msgstr "Ezin da hautatutako irudia deskargatu."
-#: ../midori/midori-browser.c:1442
+#: ../midori/midori-browser.c:1580
msgid "Save file"
msgstr "Gorde fitxategia"
-#: ../midori/midori-browser.c:2293
+#: ../midori/midori-browser.c:2476
msgid "Open file"
msgstr "Ireki fitxategia"
-#: ../midori/midori-browser.c:2425
+#: ../midori/midori-browser.c:2608
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -523,139 +512,153 @@ msgid ""
"automatically."
msgstr ""
-#: ../midori/midori-browser.c:2431 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2614 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Jario berria"
-#: ../midori/midori-browser.c:2474 ../midori/midori-browser.c:5239
-#: ../panels/midori-bookmarks.c:426
+#: ../midori/midori-browser.c:2657 ../midori/midori-browser.c:5679
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Gehitu laster-marka berri bat"
-#: ../midori/midori-browser.c:2973 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3201 ../midori/midori-searchaction.c:488
msgid "Empty"
msgstr "Hutsik"
-#: ../midori/midori-browser.c:3393
+#: ../midori/midori-browser.c:3644 ../midori/midori-browser.c:3645
msgid "Toggle text cursor navigation"
msgstr ""
-#: ../midori/midori-browser.c:3705 ../midori/midori-browser.c:5625
+#: ../midori/midori-browser.c:3647
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3650
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4040 ../midori/midori-browser.c:6073
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Huts egin du historiako elementu berri bat txertatzean: %s\n"
-#: ../midori/midori-browser.c:4036 ../panels/midori-bookmarks.c:742
-#: ../panels/midori-history.c:799
+#: ../midori/midori-browser.c:4366 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Ireki guztia _fitxetan"
-#: ../midori/midori-browser.c:4043 ../panels/midori-bookmarks.c:748
-#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4373 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Ireki _fitxa berrian"
-#: ../midori/midori-browser.c:4046 ../midori/midori-view.c:2573
-#: ../midori/midori-view.c:4525 ../panels/midori-bookmarks.c:750
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4376 ../midori/midori-view.c:2940
+#: ../midori/midori-view.c:5069 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Ireki leiho _berrian"
-#: ../midori/midori-browser.c:4126
+#: ../midori/midori-browser.c:4465
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4127
+#: ../midori/midori-browser.c:4466
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4128
+#: ../midori/midori-browser.c:4467
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4129
+#: ../midori/midori-browser.c:4468
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4130
+#: ../midori/midori-browser.c:4469
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4131
+#: ../midori/midori-browser.c:4470
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4152
-msgid "Import bookmarks..."
-msgstr "Inportatu laster-markak..."
+#: ../midori/midori-browser.c:4471
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4155 ../midori/midori-browser.c:5244
+#: ../midori/midori-browser.c:4492
+msgid "Import bookmarks…"
+msgstr "Inportatu laster-markak…"
+
+#: ../midori/midori-browser.c:4495 ../midori/midori-browser.c:5684
msgid "_Import bookmarks"
msgstr "_Inportatu laster-markak"
-#: ../midori/midori-browser.c:4166
+#: ../midori/midori-browser.c:4506
msgid "_Application:"
msgstr "_Aplikazioa:"
-#: ../midori/midori-browser.c:4231
+#: ../midori/midori-browser.c:4571
msgid "Import from XBEL or HTML file"
msgstr "Inportatu XBEL edo HTML fitxategitik"
-#: ../midori/midori-browser.c:4266
+#: ../midori/midori-browser.c:4599
msgid "Import from a file"
msgstr "Inportatu fitxategi batetik"
-#: ../midori/midori-browser.c:4278
+#: ../midori/midori-browser.c:4611
msgid "Failed to import bookmarks"
msgstr "Huts egin du laster-markak inportatzean"
-#: ../midori/midori-browser.c:4313
+#: ../midori/midori-browser.c:4645
msgid "XBEL Bookmarks"
msgstr "XBEL laster-markak"
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4650
msgid "Netscape Bookmarks"
msgstr "Netscape-ren laster-markak"
-#: ../midori/midori-browser.c:4332
+#: ../midori/midori-browser.c:4664
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr ""
-#: ../midori/midori-browser.c:4347
+#: ../midori/midori-browser.c:4679
msgid "Failed to export bookmarks"
msgstr "Huts egin du laster-markak esportatzean"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4469
+#: ../midori/midori-browser.c:4801
msgid "Clear Private Data"
msgstr "Garbitu datu pribatuak"
-#: ../midori/midori-browser.c:4473
+#: ../midori/midori-browser.c:4805
msgid "_Clear private data"
msgstr "_Garbitu datu pribatuak"
-#: ../midori/midori-browser.c:4486
+#: ../midori/midori-browser.c:4820
msgid "Clear the following data:"
msgstr "Garbitu ondorengo datuak:"
-#: ../midori/midori-browser.c:4496
+#: ../midori/midori-browser.c:4830
msgid "Last open _tabs"
msgstr ""
-#: ../midori/midori-browser.c:4522
+#: ../midori/midori-browser.c:4856
msgid "Clear private data when _quitting Midori"
msgstr ""
-#: ../midori/midori-browser.c:4698
+#: ../midori/midori-browser.c:5071
msgid "A lightweight web browser."
msgstr "Web-arakatzaile arin bat"
-#: ../midori/midori-browser.c:4699
+#: ../midori/midori-browser.c:5072
msgid "See about:version for version info."
msgstr ""
-#: ../midori/midori-browser.c:4701
+#: ../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 "
@@ -663,1356 +666,1462 @@ msgid ""
"option) any later version."
msgstr ""
-#: ../midori/midori-browser.c:4722
+#: ../midori/midori-browser.c:5104
msgid "translator-credits"
msgstr ""
"Launchpad Contributions:\n"
" Asier Iturralde Sarasola https://launchpad.net/~asier-iturralde"
-#: ../midori/midori-browser.c:5086
+#: ../midori/midori-browser.c:5517
msgid "_File"
msgstr "_Fitxategia"
-#: ../midori/midori-browser.c:5089
+#: ../midori/midori-browser.c:5520
msgid "Open a new window"
msgstr "Ireki leiho berri bat"
-#: ../midori/midori-browser.c:5092
+#: ../midori/midori-browser.c:5523
msgid "Open a new tab"
msgstr "Ireki fitxa berri bat"
-#: ../midori/midori-browser.c:5094
+#: ../midori/midori-browser.c:5525
msgid "New P_rivate Browsing Window"
msgstr "Nabigatze _pribatuko leiho berria"
-#: ../midori/midori-browser.c:5098
+#: ../midori/midori-browser.c:5529
msgid "Open a file"
msgstr "Ireki fitxategi bat"
-#: ../midori/midori-browser.c:5100
-msgid "_Save Page As..."
-msgstr "_Gorde orria honela..."
+#: ../midori/midori-browser.c:5531
+msgid "_Save Page As…"
+msgstr "_Gorde orria honela…"
-#: ../midori/midori-browser.c:5101
+#: ../midori/midori-browser.c:5532
msgid "Save to a file"
msgstr "Gorde fitxategi batera"
-#: ../midori/midori-browser.c:5103
+#: ../midori/midori-browser.c:5534
msgid "Add to Speed _dial"
msgstr ""
-#: ../midori/midori-browser.c:5107
+#: ../midori/midori-browser.c:5538
msgid "Add Shortcut to the _desktop"
msgstr ""
-#: ../midori/midori-browser.c:5109
+#: ../midori/midori-browser.c:5540
msgid "Create _Launcher"
msgstr "Sortu _abiarazlea"
-#: ../midori/midori-browser.c:5113
+#: ../midori/midori-browser.c:5544
msgid "Subscribe to News _feed"
msgstr "Harpidetu berrien _jariora"
-#: ../midori/midori-browser.c:5119
+#: ../midori/midori-browser.c:5550
msgid "_Close Tab"
msgstr "_Itxi fitxa"
-#: ../midori/midori-browser.c:5120
+#: ../midori/midori-browser.c:5551
msgid "Close the current tab"
msgstr "Itxi uneko fitxa"
-#: ../midori/midori-browser.c:5122
+#: ../midori/midori-browser.c:5553
msgid "C_lose Window"
msgstr "Itxi _leihoa"
-#: ../midori/midori-browser.c:5126
+#: ../midori/midori-browser.c:5557
+msgid "_Share"
+msgstr ""
+
+#: ../midori/midori-browser.c:5562
msgid "Print the current page"
msgstr "Inprimatu uneko orria"
-#: ../midori/midori-browser.c:5128
+#: ../midori/midori-browser.c:5565
msgid "Close a_ll Windows"
msgstr "Itxi leiho _guztiak"
-#: ../midori/midori-browser.c:5131
+#: ../midori/midori-browser.c:5568
msgid "_Edit"
msgstr "_Editatu"
-#: ../midori/midori-browser.c:5154
-msgid "_Find..."
-msgstr "_Bilatu..."
+#: ../midori/midori-browser.c:5591
+msgid "_Find…"
+msgstr "_Bilatu…"
-#: ../midori/midori-browser.c:5155
+#: ../midori/midori-browser.c:5592
msgid "Find a word or phrase in the page"
msgstr "Bilatu hitz edo esaldi bat orrian"
-#: ../midori/midori-browser.c:5157
+#: ../midori/midori-browser.c:5594
msgid "Find _Next"
msgstr "Bilatu _hurrengoa"
-#: ../midori/midori-browser.c:5160
+#: ../midori/midori-browser.c:5597
msgid "Find _Previous"
msgstr "Bilatu _aurrekoa"
-#: ../midori/midori-browser.c:5164
+#: ../midori/midori-browser.c:5601
msgid "Configure the application preferences"
msgstr "Konfiguratu aplikazioaren hobespenak"
-#: ../midori/midori-browser.c:5166
+#: ../midori/midori-browser.c:5603
msgid "_View"
msgstr "_Ikusi"
-#: ../midori/midori-browser.c:5167
+#: ../midori/midori-browser.c:5604
msgid "_Toolbars"
msgstr "_Tresna-barrak"
-#: ../midori/midori-browser.c:5172
+#: ../midori/midori-browser.c:5609
msgid "Reload page without caching"
msgstr ""
-#: ../midori/midori-browser.c:5182
+#: ../midori/midori-browser.c:5619
msgid "Increase the zoom level"
msgstr ""
-#: ../midori/midori-browser.c:5185
+#: ../midori/midori-browser.c:5622
msgid "Decrease the zoom level"
msgstr ""
-#: ../midori/midori-browser.c:5189
+#: ../midori/midori-browser.c:5626
msgid "_Encoding"
msgstr "_Kodeketa"
-#: ../midori/midori-browser.c:5191
+#: ../midori/midori-browser.c:5628
msgid "View So_urce"
msgstr "Ikusi _iturburua"
-#: ../midori/midori-browser.c:5194
+#: ../midori/midori-browser.c:5631
msgid "Ca_ret Browsing"
msgstr ""
-#: ../midori/midori-browser.c:5198
+#: ../midori/midori-browser.c:5635
msgid "Toggle fullscreen view"
msgstr "Txandakatu pantaila osoko ikuspegia"
-#: ../midori/midori-browser.c:5200
+#: ../midori/midori-browser.c:5637
msgid "Scroll _Left"
msgstr ""
-#: ../midori/midori-browser.c:5203
+#: ../midori/midori-browser.c:5640
msgid "Scroll _Down"
msgstr ""
-#: ../midori/midori-browser.c:5206
+#: ../midori/midori-browser.c:5643
msgid "Scroll _Up"
msgstr ""
-#: ../midori/midori-browser.c:5209
+#: ../midori/midori-browser.c:5646
msgid "Scroll _Right"
msgstr ""
-#: ../midori/midori-browser.c:5212
+#: ../midori/midori-browser.c:5649
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5652
msgid "_Go"
msgstr "_Joan"
-#: ../midori/midori-browser.c:5215
+#: ../midori/midori-browser.c:5655
msgid "Go back to the previous page"
msgstr "Joan aurreko orrira"
-#: ../midori/midori-browser.c:5218
+#: ../midori/midori-browser.c:5658
msgid "Go forward to the next page"
msgstr "Joan hurrengo orrira"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5662
msgid "Go to the previous sub-page"
msgstr "Joan aurreko azpi-orrira"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5666
msgid "Go to the next sub-page"
msgstr "Joan hurrengo azpi-orrira"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5668
+msgid "_Homepage"
+msgstr "_Hasiera-orria"
+
+#: ../midori/midori-browser.c:5669
msgid "Go to your homepage"
msgstr "Joan zure hasiera-orrira"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5671
msgid "Empty Trash"
msgstr "Hustu zakarrontzia"
-#: ../midori/midori-browser.c:5234
+#: ../midori/midori-browser.c:5674
msgid "Undo _Close Tab"
msgstr "Desegin fitxa _ixtea"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5681
msgid "Add a new _folder"
msgstr "Gehitu _karpeta berri bat"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5687
msgid "_Export bookmarks"
msgstr "_Esportatu laster-markak"
-#: ../midori/midori-browser.c:5250 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5690 ../midori/midori-searchaction.c:497
msgid "_Manage Search Engines"
msgstr "_Kudeatu bilaketa-tresnak"
-#: ../midori/midori-browser.c:5253
+#: ../midori/midori-browser.c:5693
msgid "_Clear Private Data"
msgstr "_Garbitu datu pribatuak"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5696
msgid "_Inspect Page"
msgstr ""
-#: ../midori/midori-browser.c:5260
+#: ../midori/midori-browser.c:5700
msgid "_Previous Tab"
msgstr "_Aurreko fitxa"
-#: ../midori/midori-browser.c:5263
+#: ../midori/midori-browser.c:5703
msgid "_Next Tab"
msgstr "_Hurrengo fitxa"
-#: ../midori/midori-browser.c:5265
+#: ../midori/midori-browser.c:5705
msgid "Move Tab _Backward"
msgstr "Mugitu fitxa _atzera"
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5707
msgid "_Move Tab Forward"
msgstr "_Mugitu fitxa aurrera"
-#: ../midori/midori-browser.c:5270
+#: ../midori/midori-browser.c:5710
msgid "Focus _Current Tab"
msgstr ""
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5713
msgid "Focus _Next view"
msgstr ""
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5716
msgid "Only show the Icon of the _Current Tab"
msgstr ""
-#: ../midori/midori-browser.c:5279
+#: ../midori/midori-browser.c:5719
msgid "_Duplicate Current Tab"
msgstr "_Bikoiztu uneko fitxa"
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5722
msgid "Close Ot_her Tabs"
msgstr "Itxi _beste fitxak"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5725
msgid "Open last _session"
msgstr "Ireki azken _saioa"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5728
msgid "_Help"
msgstr "_Laguntza"
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5730
msgid "_Frequent Questions"
msgstr "_Ohiko galderak"
-#: ../midori/midori-browser.c:5293
-msgid "_Report a Problem..."
-msgstr "_Eman arazo baten berri..."
+#: ../midori/midori-browser.c:5733
+msgid "_Report a Problem…"
+msgstr "_Eman arazo baten berri…"
-#: ../midori/midori-browser.c:5305
-msgid "_Menubar"
-msgstr "_Menu-barra"
-
-#: ../midori/midori-browser.c:5309
-msgid "_Navigationbar"
-msgstr "_Nabigazio-barra"
-
-#: ../midori/midori-browser.c:5313
-msgid "Side_panel"
-msgstr "Alboko _panela"
-
-#: ../midori/midori-browser.c:5314
-msgid "Sidepanel"
-msgstr "Alboko panela"
-
-#: ../midori/midori-browser.c:5317
-msgid "_Bookmarkbar"
-msgstr "_Laster-marka-barra"
-
-#: ../midori/midori-browser.c:5321
-msgid "_Statusbar"
-msgstr "_Egoera-barra"
-
-#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:307
-msgid "_Automatic"
-msgstr "_Automatikoa"
-
-#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:232
-msgid "Chinese (BIG5)"
-msgstr "Txinera (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5337
-msgid "Japanese (SHIFT__JIS)"
-msgstr "Japoniera (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:5340 ../midori/midori-websettings.c:234
-msgid "Korean (EUC-KR)"
-msgstr "Koreera (EUC-KR)"
-
-#: ../midori/midori-browser.c:5343 ../midori/midori-websettings.c:235
-msgid "Russian (KOI8-R)"
-msgstr "Errusiera (KOI8-R)"
-
-#: ../midori/midori-browser.c:5346 ../midori/midori-websettings.c:236
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-browser.c:5349 ../midori/midori-websettings.c:237
-msgid "Western (ISO-8859-1)"
-msgstr "Mendebaldekoa (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5352 ../midori/midori-websettings.c:238
-#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635
-msgid "Custom..."
-msgstr "Pertsonalizatua..."
-
-#: ../midori/midori-browser.c:5858
-msgid "_Separator"
-msgstr "_Banatzailea"
-
-#: ../midori/midori-browser.c:5865
-msgid "_Location..."
-msgstr "_Kokalekua"
-
-#: ../midori/midori-browser.c:5867
-msgid "Open a particular location"
-msgstr "Ireki kokaleku jakin bat"
-
-#: ../midori/midori-browser.c:5889
-msgid "_Web Search..."
-msgstr "_Web bilaketa"
-
-#: ../midori/midori-browser.c:5891
-msgid "Run a web search"
-msgstr "Exekutatu web bilaketa bat"
-
-#: ../midori/midori-browser.c:5918
-msgid "Reopen a previously closed tab or window"
-msgstr ""
-
-#: ../midori/midori-browser.c:5935
-msgid "Show the saved bookmarks"
-msgstr "Erakutsi gordetako laster-markak"
-
-#: ../midori/midori-browser.c:5952
+#: ../midori/midori-browser.c:5738 ../midori/midori-browser.c:6399
msgid "_Tools"
msgstr "_Tresnak"
-#: ../midori/midori-browser.c:5968
+#: ../midori/midori-browser.c:5745
+msgid "_Menubar"
+msgstr "_Menu-barra"
+
+#: ../midori/midori-browser.c:5749
+msgid "_Navigationbar"
+msgstr "_Nabigazio-barra"
+
+#: ../midori/midori-browser.c:5753
+msgid "Side_panel"
+msgstr "Alboko _panela"
+
+#: ../midori/midori-browser.c:5754
+msgid "Sidepanel"
+msgstr "Alboko panela"
+
+#: ../midori/midori-browser.c:5757
+msgid "_Bookmarkbar"
+msgstr "_Laster-marka-barra"
+
+#: ../midori/midori-browser.c:5761
+msgid "_Statusbar"
+msgstr "_Egoera-barra"
+
+#: ../midori/midori-browser.c:5770 ../midori/midori-websettings.c:314
+msgid "_Automatic"
+msgstr "_Automatikoa"
+
+#: ../midori/midori-browser.c:5773 ../midori/midori-websettings.c:238
+#, fuzzy
+msgid "Chinese Traditional (BIG5)"
+msgstr "Txinera (BIG5)"
+
+#: ../midori/midori-browser.c:5776 ../midori/midori-websettings.c:239
+msgid "Chinese Simplified (GB18030)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5780
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japoniera (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5783 ../midori/midori-websettings.c:241
+msgid "Korean (EUC-KR)"
+msgstr "Koreera (EUC-KR)"
+
+#: ../midori/midori-browser.c:5786 ../midori/midori-websettings.c:242
+msgid "Russian (KOI8-R)"
+msgstr "Errusiera (KOI8-R)"
+
+#: ../midori/midori-browser.c:5789 ../midori/midori-websettings.c:243
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5792 ../midori/midori-websettings.c:244
+msgid "Western (ISO-8859-1)"
+msgstr "Mendebaldekoa (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5795
+msgid "Custom…"
+msgstr "Pertsonalizatua…"
+
+#: ../midori/midori-browser.c:6305
+msgid "_Separator"
+msgstr "_Banatzailea"
+
+#: ../midori/midori-browser.c:6312
+msgid "_Location…"
+msgstr "_Kokalekua"
+
+#: ../midori/midori-browser.c:6314
+msgid "Open a particular location"
+msgstr "Ireki kokaleku jakin bat"
+
+#: ../midori/midori-browser.c:6336
+msgid "_Web Search…"
+msgstr "_Web bilaketa"
+
+#: ../midori/midori-browser.c:6338
+msgid "Run a web search"
+msgstr "Exekutatu web bilaketa bat"
+
+#: ../midori/midori-browser.c:6365
+msgid "Reopen a previously closed tab or window"
+msgstr ""
+
+#: ../midori/midori-browser.c:6382
+msgid "Show the saved bookmarks"
+msgstr "Erakutsi gordetako laster-markak"
+
+#: ../midori/midori-browser.c:6415
msgid "_Window"
msgstr "_Leihoa"
-#: ../midori/midori-browser.c:5970
+#: ../midori/midori-browser.c:6417
msgid "Show a list of all open tabs"
msgstr "Erakutsi irekitako fitxa guztien zerrenda"
-#: ../midori/midori-browser.c:5984
+#: ../midori/midori-browser.c:6431
msgid "_Menu"
msgstr "_Menua"
-#: ../midori/midori-browser.c:5986
+#: ../midori/midori-browser.c:6433
msgid "Menu"
msgstr "Menua"
-#: ../midori/midori-browser.c:6659
+#: ../midori/midori-browser.c:7258
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Ustekabeko ezarpena '%s'"
-#: ../midori/midori-extension.c:310
+#: ../midori/midori-extension.c:329
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "Ezin izan da '%s' hedapenaren konfigurazioa kargatu: %s\n"
-#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818
-#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
+#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
+#: ../extensions/addons.c:1688
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "Ezin izan da '%s' hedapenaren konfigurazioa gorde: %s\n"
-#: ../midori/midori-locationaction.c:472
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "Huts egin du historiatik hautatzean\n"
-
-#: ../midori/midori-locationaction.c:558
-#, c-format
-msgid "Search for %s"
-msgstr ""
-
-#: ../midori/midori-locationaction.c:592
+#: ../midori/midori-locationaction.c:394
#, c-format
msgid "Search with %s"
msgstr ""
+#: ../midori/midori-locationaction.c:414
+#, fuzzy
+msgid "Search with…"
+msgstr "Bilatu _honekin"
+
+#: ../midori/midori-locationaction.c:541
+#, c-format
+msgid "Failed to select from history\n"
+msgstr "Huts egin du historiatik hautatzean\n"
+
+#: ../midori/midori-locationaction.c:628
+#, c-format
+msgid "Search for %s"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1195
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1227
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1229
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1231
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1233
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1235
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1237
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Ziurtagiri algoritmoa ez-ziurtzat ematen da."
+
+#: ../midori/midori-locationaction.c:1239
+msgid "Some other error occurred validating the certificate."
+msgstr "Beste errore bat gertatu da ziurtagiria egiaztatzean."
+
+#: ../midori/midori-locationaction.c:1286
+msgid "_Export certificate"
+msgstr "_Esportatu ziurtagiria"
+
+#: ../midori/midori-locationaction.c:1301
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1335
+msgid "Security details"
+msgstr "Segurtasun xehetasunak"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1359
+#: ../midori/midori-locationaction.c:1618
msgid "Paste and p_roceed"
msgstr "Itsatsi eta _jarraitu"
-#: ../midori/midori-locationaction.c:1727
+#: ../midori/midori-locationaction.c:1942
msgid "Not verified"
msgstr "Egiaztatu gabea"
-#: ../midori/midori-locationaction.c:1747
+#: ../midori/midori-locationaction.c:1950
msgid "Verified and encrypted connection"
msgstr "Egiaztatu eta zifratutako konexioa"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-locationaction.c:1957
+msgid "Open, unencrypted connection"
+msgstr "Irekia, zifratu gabeko konexioa"
+
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Lerrokatu alboko panela eskuinean"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Itxi panela"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Lerrokatu alboko panela ezkerrean"
-#: ../midori/midori-websettings.c:214
+#: ../midori/midori-websettings.c:220
msgid "Show Speed Dial"
msgstr ""
-#: ../midori/midori-websettings.c:215
+#: ../midori/midori-websettings.c:221
msgid "Show Homepage"
msgstr "Erakutsi hasiera-orria"
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:240
msgid "Japanese (SHIFT_JIS)"
msgstr "Japoniera (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:253
+#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Pertsonalizatua…"
+
+#: ../midori/midori-websettings.c:260
msgid "New tab"
msgstr "Fitxa berria"
-#: ../midori/midori-websettings.c:254
+#: ../midori/midori-websettings.c:261
msgid "New window"
msgstr "Leiho berria"
-#: ../midori/midori-websettings.c:255
+#: ../midori/midori-websettings.c:262
msgid "Current tab"
msgstr "Uneko fitxa"
-#: ../midori/midori-websettings.c:270
+#: ../midori/midori-websettings.c:277
msgid "Default"
msgstr "Lehenetsia"
-#: ../midori/midori-websettings.c:271
+#: ../midori/midori-websettings.c:278
msgid "Icons"
msgstr "Ikonoak"
-#: ../midori/midori-websettings.c:272
+#: ../midori/midori-websettings.c:279
msgid "Small icons"
msgstr "Ikono txikiak"
-#: ../midori/midori-websettings.c:273
+#: ../midori/midori-websettings.c:280
msgid "Text"
msgstr "Testua"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:281
msgid "Icons and text"
msgstr "Ikonoak eta testua"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:282
msgid "Text beside icons"
msgstr "Testua ikonoen ondoan"
-#: ../midori/midori-websettings.c:290
+#: ../midori/midori-websettings.c:297
msgid "Automatic (GNOME or environment)"
msgstr "Automatikoa (GNOME edo ingurunea)"
-#: ../midori/midori-websettings.c:291
+#: ../midori/midori-websettings.c:298
msgid "HTTP proxy server"
msgstr "HTTP proxy zerbitzaria"
-#: ../midori/midori-websettings.c:292
+#: ../midori/midori-websettings.c:299
msgid "No proxy server"
msgstr "Proxy zerbitzaririk ez"
-#: ../midori/midori-websettings.c:309
+#: ../midori/midori-websettings.c:316
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:317
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:310
+#: ../midori/midori-websettings.c:318
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:311
+#: ../midori/midori-websettings.c:319
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:312
+#: ../midori/midori-websettings.c:320
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:365
+#: ../midori/midori-websettings.c:404
msgid "Remember last window size"
msgstr "Gogoratu azken leiho-tamaina"
-#: ../midori/midori-websettings.c:366
+#: ../midori/midori-websettings.c:405
msgid "Whether to save the last window size"
msgstr "Azken leiho-tamaina gordeko den ala ez"
-#: ../midori/midori-websettings.c:374
+#: ../midori/midori-websettings.c:413
msgid "Last window width"
msgstr "Azken leiho-zabalera"
-#: ../midori/midori-websettings.c:375
+#: ../midori/midori-websettings.c:414
msgid "The last saved window width"
msgstr "Gordetako azken leiho-zabalera"
-#: ../midori/midori-websettings.c:383
+#: ../midori/midori-websettings.c:422
msgid "Last window height"
msgstr "Azken leiho-altuera"
-#: ../midori/midori-websettings.c:384
+#: ../midori/midori-websettings.c:423
msgid "The last saved window height"
msgstr "Gordetako azken leiho-altuera"
-#: ../midori/midori-websettings.c:409
+#: ../midori/midori-websettings.c:448
msgid "Last panel position"
msgstr "Azken panel-posizioa"
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:449
msgid "The last saved panel position"
msgstr "Gordetako azken panel-posizioa"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:458
msgid "Last panel page"
msgstr "Azken panel-orria"
-#: ../midori/midori-websettings.c:420
+#: ../midori/midori-websettings.c:459
msgid "The last saved panel page"
msgstr "Gordetako azken panel-orria"
-#: ../midori/midori-websettings.c:428
+#: ../midori/midori-websettings.c:467
msgid "Last Web search"
msgstr "Azken web bilaketa"
-#: ../midori/midori-websettings.c:429
+#: ../midori/midori-websettings.c:468
msgid "The last saved Web search"
msgstr "Gordetako azken web bilaketa"
-#: ../midori/midori-websettings.c:438
+#: ../midori/midori-websettings.c:492
msgid "Show Menubar"
msgstr "Erakutsi menu-barra"
-#: ../midori/midori-websettings.c:439
+#: ../midori/midori-websettings.c:493
msgid "Whether to show the menubar"
msgstr "Menu-barra erakutsiko den ala ez"
-#: ../midori/midori-websettings.c:447
+#: ../midori/midori-websettings.c:501
msgid "Show Navigationbar"
msgstr "Erakutsi nabigazio-barra"
-#: ../midori/midori-websettings.c:448
+#: ../midori/midori-websettings.c:502
msgid "Whether to show the navigationbar"
msgstr "Nabigazio-barra erakutsiko den ala ez"
-#: ../midori/midori-websettings.c:456
+#: ../midori/midori-websettings.c:510
msgid "Show Bookmarkbar"
msgstr "Erakutsi laster-marka-barra"
-#: ../midori/midori-websettings.c:457
+#: ../midori/midori-websettings.c:511
msgid "Whether to show the bookmarkbar"
msgstr "Laster-marka-barra erakutsiko den ala ez"
-#: ../midori/midori-websettings.c:465
+#: ../midori/midori-websettings.c:519
msgid "Show Panel"
msgstr "Erakutsi panela"
-#: ../midori/midori-websettings.c:466
+#: ../midori/midori-websettings.c:520
msgid "Whether to show the panel"
msgstr "Panela erakutsiko den ala ez"
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:528
msgid "Show Statusbar"
msgstr "Erakutsi egoera-barra"
-#: ../midori/midori-websettings.c:475
+#: ../midori/midori-websettings.c:529
msgid "Whether to show the statusbar"
msgstr "Egoera-barra erakutsiko den ala ez"
-#: ../midori/midori-websettings.c:484
+#: ../midori/midori-websettings.c:538
msgid "Toolbar Style:"
msgstr "Tresna-barraren estiloa:"
-#: ../midori/midori-websettings.c:485
+#: ../midori/midori-websettings.c:539
msgid "The style of the toolbar"
msgstr "Tresna-barraren estiloa"
-#: ../midori/midori-websettings.c:494
+#: ../midori/midori-websettings.c:548
msgid "Toolbar Items"
msgstr "Tresna-barraren elementuak"
-#: ../midori/midori-websettings.c:495
+#: ../midori/midori-websettings.c:549
msgid "The items to show on the toolbar"
msgstr "Tresna-barran erakutsiko diren elementuak"
-#: ../midori/midori-websettings.c:503
+#: ../midori/midori-websettings.c:557
msgid "Compact Sidepanel"
msgstr "Alboko panel trinkoa"
-#: ../midori/midori-websettings.c:504
+#: ../midori/midori-websettings.c:558
msgid "Whether to make the sidepanel compact"
msgstr "Alboko panela trinkotuko den ala ez"
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:573
msgid "Align sidepanel on the right"
msgstr "Lerrokatu alboko panela eskuinean"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:574
msgid "Whether to align the sidepanel on the right"
msgstr "Alboko panela eskuinean lerrokatuko den ala ez"
-#: ../midori/midori-websettings.c:535
+#: ../midori/midori-websettings.c:589
msgid "Open panels in separate windows"
msgstr "Ireki panela leiho bereizietan"
-#: ../midori/midori-websettings.c:536
+#: ../midori/midori-websettings.c:590
msgid "Whether to always open panels in separate windows"
msgstr "Panelak beti leiho bereizietan irekiko diren ala ez"
-#: ../midori/midori-websettings.c:545
+#: ../midori/midori-websettings.c:599
msgid "When Midori starts:"
msgstr "Midori abiatzean:"
-#: ../midori/midori-websettings.c:546
+#: ../midori/midori-websettings.c:600
msgid "What to do when Midori starts"
msgstr "Zer egin Midori abiatzean"
-#: ../midori/midori-websettings.c:555
+#: ../midori/midori-websettings.c:609
msgid "Homepage:"
msgstr "Hasiera-orria"
-#: ../midori/midori-websettings.c:556
+#: ../midori/midori-websettings.c:610
msgid "The homepage"
msgstr "Hasiera-orria"
-#: ../midori/midori-websettings.c:571
+#: ../midori/midori-websettings.c:625
msgid "Show crash dialog"
msgstr "Erakutsi kraskatze elkarrizketa-koadroa"
-#: ../midori/midori-websettings.c:572
+#: ../midori/midori-websettings.c:626
msgid "Show a dialog after Midori crashed"
msgstr "Erakutsi elkarrizketa-koadro bat Midorik kraskatzean"
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:634
msgid "Save downloaded files to:"
msgstr "Gorde deskargatutako fitxategiak hona:"
-#: ../midori/midori-websettings.c:581
+#: ../midori/midori-websettings.c:635
msgid "The folder downloaded files are saved to"
msgstr "Deskargatutako fitxategiak gordeko diren karpeta"
-#: ../midori/midori-websettings.c:589
+#: ../midori/midori-websettings.c:643
msgid "Text Editor"
msgstr "Testu-editorea"
-#: ../midori/midori-websettings.c:590
+#: ../midori/midori-websettings.c:644
msgid "An external text editor"
msgstr "Kanpoko testu-editore bat"
-#: ../midori/midori-websettings.c:605
+#: ../midori/midori-websettings.c:659
msgid "News Aggregator"
msgstr ""
-#: ../midori/midori-websettings.c:606
+#: ../midori/midori-websettings.c:660
msgid "An external news aggregator"
msgstr ""
-#: ../midori/midori-websettings.c:614
+#: ../midori/midori-websettings.c:668
msgid "Location entry Search"
msgstr ""
-#: ../midori/midori-websettings.c:615
+#: ../midori/midori-websettings.c:669
msgid "The search to perform inside the location entry"
msgstr ""
-#: ../midori/midori-websettings.c:623
+#: ../midori/midori-websettings.c:677
msgid "Preferred Encoding"
msgstr "Hobetsitako kodeketa"
-#: ../midori/midori-websettings.c:624
+#: ../midori/midori-websettings.c:678
msgid "The preferred character encoding"
msgstr "Hobetsitako karaktere-kodeketa"
-#: ../midori/midori-websettings.c:634
+#: ../midori/midori-websettings.c:688
msgid "Always Show Tabbar"
msgstr "Beti erakutsi fitxa-barra"
-#: ../midori/midori-websettings.c:635
+#: ../midori/midori-websettings.c:689
msgid "Always show the tabbar"
msgstr "Beti erakutsi fitxa-barra"
-#: ../midori/midori-websettings.c:643
+#: ../midori/midori-websettings.c:702
msgid "Close Buttons on Tabs"
msgstr "Ixteko botoiak fitxetan"
-#: ../midori/midori-websettings.c:644
+#: ../midori/midori-websettings.c:703
msgid "Whether tabs have close buttons"
msgstr "Fitxek ixteko botoiak dituzten ala ez"
-#: ../midori/midori-websettings.c:669
+#: ../midori/midori-websettings.c:728
msgid "Open new pages in:"
msgstr "Ireki orri berriak hemen:"
-#: ../midori/midori-websettings.c:670
+#: ../midori/midori-websettings.c:729
msgid "Where to open new pages"
msgstr "Non ireki behar diren orri berriak"
-#: ../midori/midori-websettings.c:679
+#: ../midori/midori-websettings.c:738
msgid "Middle click opens Selection"
msgstr ""
-#: ../midori/midori-websettings.c:680
+#: ../midori/midori-websettings.c:739
msgid "Load an address from the selection via middle click"
msgstr ""
-#: ../midori/midori-websettings.c:688
+#: ../midori/midori-websettings.c:747
msgid "Open tabs in the background"
msgstr "Ireki fitxak atzeko planoan"
-#: ../midori/midori-websettings.c:689
+#: ../midori/midori-websettings.c:748
msgid "Whether to open new tabs in the background"
msgstr "Atzeko planoan fitxak irekiko diren ala ez"
-#: ../midori/midori-websettings.c:697
+#: ../midori/midori-websettings.c:756
msgid "Open Tabs next to Current"
msgstr "Ireki fitxak unekoaren ondoren"
-#: ../midori/midori-websettings.c:698
-msgid ""
-"Whether to open new tabs next to the current tab or after the last one"
+#: ../midori/midori-websettings.c:757
+msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr "Fitxa berriak uneko fitxaren ala azkenaren ondoren irekiko diren"
-#: ../midori/midori-websettings.c:706
+#: ../midori/midori-websettings.c:765
msgid "Open popups in tabs"
msgstr ""
-#: ../midori/midori-websettings.c:707
+#: ../midori/midori-websettings.c:766
msgid "Whether to open popup windows in tabs"
msgstr ""
-#: ../midori/midori-websettings.c:717 ../extensions/statusbar-features.c:134
+#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155
msgid "Load images automatically"
msgstr "Kargatu irudiak automatikoki"
-#: ../midori/midori-websettings.c:718
+#: ../midori/midori-websettings.c:777
msgid "Load and display images automatically"
msgstr "Kargatu eta bistaratu irudiak automatikoki"
-#: ../midori/midori-websettings.c:725 ../extensions/statusbar-features.c:143
+#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165
msgid "Enable scripts"
msgstr "Gaitu script-ak"
-#: ../midori/midori-websettings.c:726
+#: ../midori/midori-websettings.c:785
msgid "Enable embedded scripting languages"
msgstr ""
-#: ../midori/midori-websettings.c:733 ../extensions/statusbar-features.c:154
+#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177
msgid "Enable Netscape plugins"
msgstr "Gaitu Netscape pluginak"
-#: ../midori/midori-websettings.c:734
+#: ../midori/midori-websettings.c:793
msgid "Enable embedded Netscape plugin objects"
msgstr ""
-#: ../midori/midori-websettings.c:749
+#: ../midori/midori-websettings.c:808
msgid "Enable Spell Checking"
-msgstr ""
+msgstr "Gaitu ortografia egiaztaketa"
-#: ../midori/midori-websettings.c:750
+#: ../midori/midori-websettings.c:809
msgid "Enable spell checking while typing"
-msgstr ""
+msgstr "Gaitu idatzi ahalako ortografia egiaztaketa"
-#: ../midori/midori-websettings.c:756
+#: ../midori/midori-websettings.c:815
msgid "Enable HTML5 database support"
msgstr "Gaitu HTML5 datu-baseen euskarria"
-#: ../midori/midori-websettings.c:757
+#: ../midori/midori-websettings.c:816
msgid "Whether to enable HTML5 database support"
msgstr "HTML5 datu-baseen euskarria gaituko den ala ez"
-#: ../midori/midori-websettings.c:763
+#: ../midori/midori-websettings.c:822
msgid "Enable HTML5 local storage support"
msgstr "Gaitu HTML5 biltegiratze lokalaren euskarria"
-#: ../midori/midori-websettings.c:764
+#: ../midori/midori-websettings.c:823
msgid "Whether to enable HTML5 local storage support"
msgstr "HTML5 biltegiratze lokalaren euskarria gaituko den ala ez"
-#: ../midori/midori-websettings.c:770
+#: ../midori/midori-websettings.c:829
msgid "Enable offline web application cache"
msgstr "Gaitu lineaz kanpoko web aplikazioen cachea"
-#: ../midori/midori-websettings.c:771
+#: ../midori/midori-websettings.c:830
msgid "Whether to enable offline web application cache"
msgstr "Lineaz kanpoko web aplikazioen cachea gaituko den ala ez"
-#: ../midori/midori-websettings.c:787
+#: ../midori/midori-websettings.c:851
msgid "Flash window on background tabs"
msgstr ""
-#: ../midori/midori-websettings.c:788
+#: ../midori/midori-websettings.c:852
msgid "Flash the browser window if a new tab was opened in the background"
msgstr ""
-#: ../midori/midori-websettings.c:796
+#: ../midori/midori-websettings.c:860
msgid "Enable WebGL support"
msgstr "Gaitu WebGL euskarria"
-#: ../midori/midori-websettings.c:797
+#: ../midori/midori-websettings.c:861
msgid "Allow websites to use OpenGL rendering"
msgstr "Baimendu webguneek OpenGL errendatzea erabiltzea"
-#: ../midori/midori-websettings.c:823
+#: ../midori/midori-websettings.c:887
msgid "Zoom Text and Images"
msgstr ""
-#: ../midori/midori-websettings.c:824
+#: ../midori/midori-websettings.c:888
msgid "Whether to zoom text and images"
msgstr ""
-#: ../midori/midori-websettings.c:839
+#: ../midori/midori-websettings.c:903
msgid "Find inline while typing"
msgstr ""
-#: ../midori/midori-websettings.c:840
+#: ../midori/midori-websettings.c:904
msgid "Whether to automatically find inline while typing"
msgstr ""
-#: ../midori/midori-websettings.c:855
+#: ../midori/midori-websettings.c:919
msgid "Kinetic scrolling"
msgstr ""
-#: ../midori/midori-websettings.c:856
+#: ../midori/midori-websettings.c:920
msgid "Whether scrolling should kinetically move according to speed"
msgstr ""
-#: ../midori/midori-websettings.c:864
+#: ../midori/midori-websettings.c:928
msgid "Delete old Cookies after:"
msgstr ""
-#: ../midori/midori-websettings.c:865
+#: ../midori/midori-websettings.c:929
msgid "The maximum number of days to save cookies for"
msgstr ""
-#: ../midori/midori-websettings.c:881
+#: ../midori/midori-websettings.c:945
msgid "Only accept Cookies from sites you visit"
msgstr "Bisitatutako guneetako cookie-ak soilik onartu"
-#: ../midori/midori-websettings.c:882
+#: ../midori/midori-websettings.c:946
msgid "Block cookies sent by third-party websites"
msgstr "Blokeatu hirugarrengo webguneek bidalitako cookie-ak"
-#: ../midori/midori-websettings.c:896
+#: ../midori/midori-websettings.c:960
msgid "Delete pages from history after:"
msgstr ""
-#: ../midori/midori-websettings.c:897
+#: ../midori/midori-websettings.c:961
msgid "The maximum number of days to save the history for"
msgstr ""
-#: ../midori/midori-websettings.c:912
+#: ../midori/midori-websettings.c:976
msgid "Proxy server"
msgstr "Proxy zerbitzaria"
-#: ../midori/midori-websettings.c:913
+#: ../midori/midori-websettings.c:977
msgid "The type of proxy server to use"
msgstr "Erabiliko den proxy zerbitzari mota"
-#: ../midori/midori-websettings.c:922
+#: ../midori/midori-websettings.c:986
msgid "HTTP Proxy Server"
msgstr "HTTP proxy zerbitzaria"
-#: ../midori/midori-websettings.c:923
+#: ../midori/midori-websettings.c:987
msgid "The proxy server used for HTTP connections"
msgstr "HTTP konexioetarako erabilitako proxy zerbitzaria"
-#: ../midori/midori-websettings.c:938
+#: ../midori/midori-websettings.c:1002
msgid "Port"
msgstr "Ataka"
-#: ../midori/midori-websettings.c:939
+#: ../midori/midori-websettings.c:1003
msgid "The proxy server port used for HTTP connections"
msgstr "HTTP konexioetarako erabilitako proxy zerbitzariaren ataka"
-#: ../midori/midori-websettings.c:957
+#: ../midori/midori-websettings.c:1021
msgid "The maximum size of cached pages on disk"
msgstr ""
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:974
+#: ../midori/midori-websettings.c:1038
msgid "Identify as"
msgstr ""
-#: ../midori/midori-websettings.c:975
+#: ../midori/midori-websettings.c:1039
msgid "What to identify as to web pages"
msgstr ""
-#: ../midori/midori-websettings.c:991
+#: ../midori/midori-websettings.c:1055
msgid "Identification string"
msgstr ""
-#: ../midori/midori-websettings.c:992
+#: ../midori/midori-websettings.c:1056
msgid "The application identification string"
msgstr ""
-#: ../midori/midori-websettings.c:1008
+#: ../midori/midori-websettings.c:1072
msgid "Preferred languages"
msgstr "Hobetsitako hizkuntzak"
-#: ../midori/midori-websettings.c:1009
+#: ../midori/midori-websettings.c:1073
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
msgstr ""
-#: ../midori/midori-websettings.c:1024
+#: ../midori/midori-websettings.c:1088
msgid "Clear private data"
msgstr "Garbitu datu pribatuak"
-#: ../midori/midori-websettings.c:1025
+#: ../midori/midori-websettings.c:1089
msgid "The private data selected for deletion"
msgstr "Ezabatzeko hautatutako datu pribatuak"
-#: ../midori/midori-websettings.c:1040
+#: ../midori/midori-websettings.c:1104
msgid "Clear data"
msgstr "Garbitu datuak"
-#: ../midori/midori-websettings.c:1041
+#: ../midori/midori-websettings.c:1105
msgid "The data selected for deletion"
msgstr "Ezabatzeko hautatutako datuak"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1090
+#: ../midori/midori-websettings.c:1154
msgid "Strip referrer details sent to websites"
msgstr ""
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1092
+#: ../midori/midori-websettings.c:1156
msgid "Whether the \"Referer\" header should be shortened to the hostname"
msgstr ""
-#: ../midori/midori-websettings.c:1106
+#: ../midori/midori-websettings.c:1170
msgid "Always use my font choices"
msgstr "Beti erabili nire letra-tipo aukerak"
-#: ../midori/midori-websettings.c:1107
+#: ../midori/midori-websettings.c:1171
msgid "Override fonts picked by websites with user preferences"
msgstr ""
-#: ../midori/midori-view.c:1307
+#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:1138
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1436
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s-(e)k HTML5 datu-base bat gorde nahi du."
-#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Deny"
msgstr "_Ukatu"
-#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Allow"
msgstr "_Baimendu"
-#: ../midori/midori-view.c:1339
+#: ../midori/midori-view.c:1469
#, c-format
msgid "%s wants to know your location."
msgstr "%s-(e)k zure kokapena ezagutu nahi du."
-#: ../midori/midori-view.c:1430
+#: ../midori/midori-view.c:1565
#, c-format
msgid "Error - %s"
msgstr "Errorea - %s"
-#: ../midori/midori-view.c:1431
+#: ../midori/midori-view.c:1566
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Ezin izan da '%s' orria kargatu."
-#: ../midori/midori-view.c:1433
+#: ../midori/midori-view.c:1568
msgid "Try again"
msgstr "Saiatu berriro"
-#: ../midori/midori-view.c:1610 ../midori/midori-view.c:2514
+#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875
#, c-format
msgid "Send a message to %s"
msgstr "Mezu bat bidali %s-(r)i"
-#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2663
+#: ../midori/midori-view.c:2661
+#, fuzzy
+msgid "Add _search engine..."
+msgstr "Gehitu bilaketa-tresna"
+
+#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031
msgid "Inspect _Element"
msgstr ""
-#: ../midori/midori-view.c:2397
+#: ../midori/midori-view.c:2757
msgid "Open Link in New _Tab"
msgstr "Ireki esteka _fitxa berrian"
-#: ../midori/midori-view.c:2401
+#: ../midori/midori-view.c:2761
msgid "Open Link in _Foreground Tab"
msgstr "Ireki esteka _aurreko planoko fitxan"
-#: ../midori/midori-view.c:2402
+#: ../midori/midori-view.c:2762
msgid "Open Link in _Background Tab"
msgstr "Ireki esteka a_tzeko planoko fitxan"
-#: ../midori/midori-view.c:2405
+#: ../midori/midori-view.c:2765
msgid "Open Link in New _Window"
msgstr "Ireki esteka _leiho berrian"
-#: ../midori/midori-view.c:2408
+#: ../midori/midori-view.c:2768
msgid "Open Link as Web A_pplication"
msgstr "Ireki esteka web _aplikazio bezala"
-#: ../midori/midori-view.c:2413
+#: ../midori/midori-view.c:2773
msgid "Copy Link de_stination"
msgstr "Kopiatu estekaren helburua"
-#: ../midori/midori-view.c:2429
+#: ../midori/midori-view.c:2789
msgid "Open _Image in New Tab"
msgstr "Ireki _irudia fitxa berrian"
-#: ../midori/midori-view.c:2432
+#: ../midori/midori-view.c:2792
msgid "Copy Image _Address"
msgstr "Kopiatu irudiaren _helbidea"
-#: ../midori/midori-view.c:2435
+#: ../midori/midori-view.c:2795
msgid "Save I_mage"
msgstr "Gorde i_rudia"
-#: ../midori/midori-view.c:2438
+#: ../midori/midori-view.c:2798
msgid "Open in Image _Viewer"
msgstr "Ireki irudi-i_kustailean"
-#: ../midori/midori-view.c:2445
+#: ../midori/midori-view.c:2805
msgid "Copy Video _Address"
msgstr "Kopiatu bideoaren _helbidea"
-#: ../midori/midori-view.c:2448
+#: ../midori/midori-view.c:2808
msgid "Save _Video"
msgstr "Gorde _bideoa"
-#: ../midori/midori-view.c:2448
+#: ../midori/midori-view.c:2808
msgid "Download _Video"
msgstr "Deskargatu _bideoa"
-#: ../midori/midori-view.c:2474
+#: ../midori/midori-view.c:2834
msgid "Search _with"
msgstr "Bilatu _honekin"
-#: ../midori/midori-view.c:2506
+#: ../midori/midori-view.c:2866
msgid "_Search the Web"
msgstr "_Bilatu sarean"
-#: ../midori/midori-view.c:2522
+#: ../midori/midori-view.c:2883
msgid "Open Address in New _Tab"
msgstr "Ireki helbidea _fitxa berrian"
-#: ../midori/midori-view.c:2814
+#: ../midori/midori-view.c:2936
+#, fuzzy
+msgid "Open _Frame in New Tab"
+msgstr "Ireki _irudia fitxa berrian"
+
+#: ../midori/midori-view.c:3189
msgid "Open or download file"
msgstr "Ireki edo deskargatu fitxategia"
-#: ../midori/midori-view.c:2833
-#, c-format
-msgid "File Type: '%s'"
-msgstr "Fitxategi-mota: '%s'"
-
-#: ../midori/midori-view.c:2835
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Fitxategi-mota: %s ('%s')"
-
-#: ../midori/midori-view.c:2839
+#: ../midori/midori-view.c:3213
#, c-format
msgid "File Name: %s"
msgstr "Fitxategi-izena: %s"
+#: ../midori/midori-view.c:3218
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Fitxategi-mota: '%s'"
+
+#: ../midori/midori-view.c:3220
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Fitxategi-mota: %s ('%s')"
+
+#: ../midori/midori-view.c:3255
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2858
+#: ../midori/midori-view.c:3266
#, c-format
msgid "Open %s"
msgstr "Ireki %s"
-#: ../midori/midori-view.c:3483
+#: ../midori/midori-view.c:3885
#, c-format
msgid "Inspect page - %s"
msgstr ""
-#: ../midori/midori-view.c:3784
+#: ../midori/midori-view.c:4240
msgid "Speed Dial"
msgstr ""
-#: ../midori/midori-view.c:3785 ../midori/midori-view.c:3881
+#: ../midori/midori-view.c:4241 ../midori/midori-view.c:4347
msgid "Click to add a shortcut"
msgstr "Klikatu lasterbide bat gehitzeko"
-#: ../midori/midori-view.c:3786
+#: ../midori/midori-view.c:4242
msgid "Enter shortcut address"
msgstr "Sartu lasterbidearen helbidea"
-#: ../midori/midori-view.c:3787
+#: ../midori/midori-view.c:4243
msgid "Enter shortcut title"
msgstr "Sartu lasterbidearen izenburua"
-#: ../midori/midori-view.c:3788
+#: ../midori/midori-view.c:4244
msgid "Are you sure you want to delete this shortcut?"
msgstr "Ziur zaude lasterbide hau ezabatu nahi duzula?"
-#: ../midori/midori-view.c:3950
+#: ../midori/midori-view.c:4416
#, c-format
msgid "No documentation installed"
msgstr ""
-#: ../midori/midori-view.c:4026
+#: ../midori/midori-view.c:4493
msgid "Midori doesn't store any personal data:"
msgstr "Midori-k ez du datu pertsonalik gordetzen:"
-#: ../midori/midori-view.c:4027
+#: ../midori/midori-view.c:4494
msgid "No history or web cookies are being saved."
msgstr "Ez da gordetzen ez historiarik ez web cookie-rik."
-#: ../midori/midori-view.c:4028
+#: ../midori/midori-view.c:4495
msgid "Extensions are disabled."
msgstr "Hedapenak desgaituta daude."
-#: ../midori/midori-view.c:4029
+#: ../midori/midori-view.c:4496
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
"HTML5 biltegiratzea, datu-base lokalak eta aplikazioen cache-a desgaituta "
"daude."
-#: ../midori/midori-view.c:4030
+#: ../midori/midori-view.c:4497
msgid "Midori prevents websites from tracking the user:"
msgstr ""
-#: ../midori/midori-view.c:4031
+#: ../midori/midori-view.c:4498
msgid "Referrer URLs are stripped down to the hostname."
msgstr ""
-#: ../midori/midori-view.c:4032
+#: ../midori/midori-view.c:4499
msgid "DNS prefetching is disabled."
msgstr ""
-#: ../midori/midori-view.c:4033
+#: ../midori/midori-view.c:4500
msgid "The language and timezone are not revealed to websites."
msgstr ""
-#: ../midori/midori-view.c:4034
+#: ../midori/midori-view.c:4501
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr ""
-#: ../midori/midori-view.c:4071
+#: ../midori/midori-view.c:4590
msgid "Version numbers in brackets show the version used at runtime."
msgstr ""
-#: ../midori/midori-view.c:4126
+#: ../midori/midori-view.c:4640
msgid "Page loading delayed"
msgstr "Orria kargatzea atzeratuta"
-#: ../midori/midori-view.c:4127
+#: ../midori/midori-view.c:4641
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"Kargatzea atzeratuta duela gutxiko kraskatze bat edo abioko hobespenak "
"direla eta."
-#: ../midori/midori-view.c:4128
+#: ../midori/midori-view.c:4642
msgid "Load Page"
msgstr "Kargatu orria"
-#: ../midori/midori-view.c:4267
+#: ../midori/midori-view.c:4809
msgid "Blank page"
msgstr "Orri hutsa"
-#: ../midori/midori-view.c:4529
+#: ../midori/midori-view.c:5073
msgid "_Duplicate Tab"
msgstr "_Bikoiztu fitxa"
-#: ../midori/midori-view.c:4534
+#: ../midori/midori-view.c:5078
msgid "Show Tab _Label"
msgstr "Erakutsi fitxaren _etiketa"
-#: ../midori/midori-view.c:4534
+#: ../midori/midori-view.c:5078
msgid "Show Tab _Icon Only"
msgstr "Erakutsi fitxaren _ikonoa soilik"
-#: ../midori/midori-view.c:4540
-msgid "Close ot_her Tabs"
-msgstr "Itxi _beste fitxak"
+#: ../midori/midori-view.c:5085
+#, fuzzy
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Itxi _beste fitxak"
+msgstr[1] "Itxi _beste fitxak"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5311
+#: ../midori/midori-view.c:5921
msgid "previous"
msgstr "aurrekoa"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5330
+#: ../midori/midori-view.c:5940
msgid "next"
msgstr "hurrengoa"
-#: ../midori/midori-view.c:5343
+#: ../midori/midori-view.c:5953
msgid "Print background images"
msgstr "Inprimatu atzeko planoko irudiak"
-#: ../midori/midori-view.c:5344
+#: ../midori/midori-view.c:5954
msgid "Whether background images should be printed"
msgstr "Atzeko planoko irudiak inprimatu behar diren ala ez"
-#: ../midori/midori-view.c:5376
+#: ../midori/midori-view.c:5986
msgid "Features"
msgstr "Ezaugarriak"
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:298
msgid "Startup"
msgstr "Abioa"
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:311
msgid "Use _current page"
msgstr "Erabili _uneko orria"
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:315
msgid "Use current page as homepage"
msgstr "Erabili uneko orria hasiera-orria bezala"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:324
msgid "Fonts"
msgstr "Letra-tipoak"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:327
msgid "Proportional Font Family"
msgstr ""
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:331
msgid "The default font family used to display text"
msgstr ""
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:334
msgid "The default font size used to display text"
msgstr ""
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:336
msgid "Fixed-width Font Family"
msgstr ""
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:340
msgid "The font family used to display fixed-width text"
msgstr ""
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:343
msgid "The font size used to display fixed-width text"
msgstr ""
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:345
msgid "Minimum Font Size"
msgstr "Gutxieneko letra-tipoaren tamaina"
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:349
msgid "The minimum font size used to display text"
msgstr "Testua bistaratzeko erabilitako gutxieneko letra-tipoaren tamaina"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:360
msgid "Behavior"
msgstr "Portaera"
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:386
msgid "Allow scripts to open popups"
msgstr ""
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:387
msgid "Whether scripts are allowed to open popup windows automatically"
msgstr ""
#. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:418
msgid "Browsing"
msgstr "Arakatzen"
#. Page "Network"
-#: ../midori/midori-preferences.c:454
+#: ../midori/midori-preferences.c:458
msgid "Network"
msgstr "Sarea"
-#: ../midori/midori-preferences.c:461
+#: ../midori/midori-preferences.c:465
msgid "Hostname"
msgstr "Ostalari-izena"
-#: ../midori/midori-preferences.c:485
+#: ../midori/midori-preferences.c:489
msgid "MB"
msgstr "MB"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:958
msgid "Add search engine"
msgstr "Gehitu bilaketa-tresna"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:958
msgid "Edit search engine"
msgstr "Editatu bilaketa-tresna"
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:986
msgid "_Name:"
msgstr "_Izena:"
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1001
msgid "_Description:"
msgstr "Deskribapena:"
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Ikonoa:"
+#: ../midori/midori-searchaction.c:1014 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Helbidea:"
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1033
msgid "_Token:"
msgstr ""
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1331
msgid "Manage Search Engines"
msgstr "Kudeatu bilaketa-tresnak"
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1433
msgid "Use as _default"
msgstr "Erabili _lehenetsi bezala"
-#: ../midori/sokoke.c:412
+#: ../midori/sokoke.c:346
msgid "Open with"
msgstr "Ireki honekin"
-#: ../midori/sokoke.c:420
+#: ../midori/sokoke.c:354
#, c-format
msgid "Choose an application or command to open \"%s\":"
msgstr "Aukeratu aplikazio edo komando bat \"%s\" irekitzeko:"
-#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499
-#: ../midori/sokoke.c:528 ../midori/sokoke.c:542
+#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
msgid "Could not run external program."
msgstr "Ezin izan da kanpoko programa exekutatu."
-#: ../midori/sokoke.c:1653
+#: ../midori/sokoke.c:1529
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "ordu %d"
msgstr[1] "%d ordu"
-#: ../midori/sokoke.c:1654
+#: ../midori/sokoke.c:1530
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "minutu %d"
msgstr[1] "%d minutu"
-#: ../midori/sokoke.c:1655
+#: ../midori/sokoke.c:1531
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2020,161 +2129,177 @@ msgstr[0] "segundo %d"
msgstr[1] "%d segundo"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267
+#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269
#, c-format
msgid "%s of %s"
msgstr "%s / %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1672
+#: ../midori/sokoke.c:1548
msgid "?B"
msgstr "?B"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1675
+#: ../midori/sokoke.c:1551
#, c-format
msgid " (%s/s)"
msgstr " (%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1692
+#: ../midori/sokoke.c:1568
#, c-format
msgid " - %s remaining"
msgstr " - %s falta dira"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:263
+#: ../toolbars/midori-findbar.c:277
msgid "_Inline Find:"
msgstr ""
-#: ../toolbars/midori-findbar.c:289
+#: ../toolbars/midori-findbar.c:303
msgid "Previous"
msgstr "Aurrekoa"
-#: ../toolbars/midori-findbar.c:295
+#: ../toolbars/midori-findbar.c:309
msgid "Next"
msgstr "Hurrengoa"
-#: ../toolbars/midori-findbar.c:299
+#: ../toolbars/midori-findbar.c:313
msgid "Match Case"
msgstr ""
-#: ../toolbars/midori-findbar.c:308
+#: ../toolbars/midori-findbar.c:322
msgid "Highlight Matches"
msgstr ""
-#: ../toolbars/midori-findbar.c:319
+#: ../toolbars/midori-findbar.c:333
msgid "Close Findbar"
msgstr "Itxi bilaketa-barra"
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:124
#, c-format
msgid "The file '%s ' has been downloaded."
msgstr "'%s ' fitxategia deskargatu da."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:127
msgid "Transfer completed"
msgstr "Transferentzia burututa"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:195
msgid "The downloaded file is erroneous."
msgstr ""
-#: ../toolbars/midori-transferbar.c:194
+#: ../toolbars/midori-transferbar.c:196
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
msgstr ""
-#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:339 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Garbitu guztia"
-#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370
+#: ../toolbars/midori-transferbar.c:376 ../toolbars/midori-transferbar.c:378
msgid "Some files are being downloaded"
msgstr "Zenbait fitxategi deskargatzen ari dira"
-#: ../toolbars/midori-transferbar.c:374
+#: ../toolbars/midori-transferbar.c:382
msgid "_Quit Midori"
msgstr "_Irten Midori-tik"
-#: ../toolbars/midori-transferbar.c:376
+#: ../toolbars/midori-transferbar.c:384
msgid "The transfers will be cancelled if Midori quits."
msgstr ""
-#: ../panels/midori-bookmarks.c:113
-msgid "Bookmarks"
-msgstr "Laster-markak"
-
-#: ../panels/midori-bookmarks.c:256
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Huts egin du laster-marka elementua gehitzean: %s\n"
-#: ../panels/midori-bookmarks.c:434
+#: ../panels/midori-bookmarks.c:475
+#, fuzzy, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Huts egin du laster-marka elementua gehitzean: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Editatu hautatutako laster-marka"
-#: ../panels/midori-bookmarks.c:442
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Ezabatu hautatutako laster-marka"
-#: ../panels/midori-bookmarks.c:457
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Gehitu karpeta berri bat"
-#: ../panels/midori-bookmarks.c:591 ../panels/midori-history.c:631
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Banatzailea "
-#: ../panels/midori-history.c:110
+#: ../panels/midori-bookmarks.c:1038
+#, fuzzy
+msgid "Search Bookmarks"
+msgstr "Laster-markak"
+
+#: ../panels/midori-history.c:111
msgid "History"
msgstr "Historia"
-#: ../panels/midori-history.c:157 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
msgid "Today"
msgstr "Gaur"
-#: ../panels/midori-history.c:159 ../panels/midori-history.c:190
+#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
msgid "Yesterday"
msgstr "Atzo"
-#: ../panels/midori-history.c:161 ../panels/midori-history.c:185
+#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "Duela egun %d"
msgstr[1] "Duela %d egun"
-#: ../panels/midori-history.c:164 ../panels/midori-history.c:183
+#: ../panels/midori-history.c:165 ../panels/midori-history.c:184
msgid "A week ago"
msgstr "Duela aste bat"
-#: ../panels/midori-history.c:359
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Huts egin du historiako elementua kentzean: %s\n"
+
+#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Ziur zaude historiako elementu guztiak kendu nahi dituzula?"
-#: ../panels/midori-history.c:405
+#: ../panels/midori-history.c:407
msgid "Bookmark the selected history item"
msgstr "Egin hautatutako historiako elementuaren laster-marka"
-#: ../panels/midori-history.c:414
+#: ../panels/midori-history.c:416
msgid "Delete the selected history item"
msgstr "Ezabatu hautatutako historiako elementua"
-#: ../panels/midori-history.c:422
+#: ../panels/midori-history.c:424
msgid "Clear the entire history"
msgstr "Garbitu historia osoa"
-#: ../panels/midori-transfers.c:86
+#: ../panels/midori-history.c:1008
+#, fuzzy
+msgid "Search History"
+msgstr "Bilatu _honekin"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Transferentziak"
-#: ../panels/midori-transfers.c:467
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
msgstr "Ireki helburuko _karpeta"
-#: ../panels/midori-transfers.c:470
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
msgstr "Kopiatu estekaren _helbidea"
@@ -2216,90 +2341,88 @@ msgstr ""
msgid "Animation frames are broken"
msgstr ""
-#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr ""
-#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
#: ../extensions/addons.c:308
msgid "Choose file"
msgstr "Aukeratu fitxategia"
-#: ../katze/katze-utils.c:500
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Aukeratu karpeta"
-#: ../katze/katze-utils.c:604
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Bat ere ez"
-#: ../katze/katze-utils.c:719
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "Ordu 1"
-#: ../katze/katze-utils.c:720
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "Egun 1"
-#: ../katze/katze-utils.c:721
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "Aste 1"
-#: ../katze/katze-utils.c:722
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "Hilabete 1"
-#: ../katze/katze-utils.c:723
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "Urte 1"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "%s-(r)en hobespenak"
-#: ../extensions/adblock.c:467
+#: ../extensions/adblock.c:470
msgid "Configure Advertisement filters"
msgstr "Konfiguratu iragarkien iragazkiak"
-#: ../extensions/adblock.c:498
+#: ../extensions/adblock.c:503
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
"\"Add\" to add it to the list. You can find more lists at %s."
msgstr ""
-#: ../extensions/adblock.c:846
+#: ../extensions/adblock.c:917
msgid "Edit rule"
msgstr "Editatu araua"
-#: ../extensions/adblock.c:860
+#: ../extensions/adblock.c:931
msgid "_Rule:"
msgstr "_Araua:"
-#: ../extensions/adblock.c:914
+#: ../extensions/adblock.c:985
msgid "Bl_ock image"
msgstr "Bl_okeatu irudia"
-#: ../extensions/adblock.c:919
+#: ../extensions/adblock.c:990
msgid "Bl_ock link"
msgstr "Bl_okeatu esteka"
-#: ../extensions/adblock.c:1538
+#: ../extensions/adblock.c:1689
msgid "Advertisement blocker"
msgstr "Iragarkien blokeatzailea"
-#: ../extensions/adblock.c:1539
+#: ../extensions/adblock.c:1690
msgid "Block advertisements according to a filter list"
msgstr "Blokeatu iragarkiak iragazki zerrenda bat jarraituz"
#. i18n: An infobar shows up when viewing a script on userscripts.org
#: ../extensions/addons.c:221
-msgid ""
-"This page appears to contain a user script. Do you wish to install it?"
-msgstr ""
-"Orri honek erabiltzaile-script bat duela dirudi. Exekutatu nahi duzu?"
+msgid "This page appears to contain a user script. Do you wish to install it?"
+msgstr "Orri honek erabiltzaile-script bat duela dirudi. Exekutatu nahi duzu?"
#: ../extensions/addons.c:222
msgid "_Install user script"
@@ -2308,8 +2431,7 @@ msgstr "_Instalatu erabiltzaile-script-a"
#. i18n: An infobar shows up when viewing a style on userstyles.org
#: ../extensions/addons.c:227
msgid "This page appears to contain a user style. Do you wish to install it?"
-msgstr ""
-"Orri honek erabiltzaile-estilo bat duela dirudi. Instalatu nahi duzu?"
+msgstr "Orri honek erabiltzaile-estilo bat duela dirudi. Instalatu nahi duzu?"
#: ../extensions/addons.c:228
msgid "_Install user style"
@@ -2319,63 +2441,63 @@ msgstr "_Instalatu erabiltzaile-estiloa"
msgid "Don't install"
msgstr "Ez instalatu"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:677
msgid "Userscripts"
msgstr "Erabiltzaile-script-ak"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:679
msgid "Userstyles"
msgstr "Erabiltzaile-estiloak"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Errorea"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "'%s' ezabatu nahi duzu?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
msgid "Delete user script"
msgstr "Ezabatu erabiltzaile-script-a"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
msgid "Delete user style"
msgstr "Ezabatu erabiltzaile-estiloa"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "%s fitxategia betirako ezabatuko da."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:566 ../extensions/addons.c:643
msgid "Open in Text Editor"
msgstr "Ireki testu-editorean"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:568 ../extensions/addons.c:652
msgid "Open Target Folder"
msgstr "Ireki helburuko karpeta"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:634
msgid "Add new addon"
msgstr "Gehitu gehigarri berria"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:660
msgid "Remove selected addon"
msgstr "Kendu hautatutako gehigarria"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
msgid "User addons"
msgstr "Erabiltzailearen gehigarriak"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1819
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr ""
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1908
msgid "Support for userscripts and userstyles"
msgstr "Erabiltzaile-script eta erabiltzaile-estiloen euskarria"
@@ -2462,7 +2584,7 @@ msgstr ""
"Domeinua : %s\n"
"Cookie-ak : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1025
msgid "Name"
msgstr "Izena"
@@ -2474,14 +2596,8 @@ msgstr "_Zabaldu guztiak"
msgid "_Collapse All"
msgstr "_Tolestu guztiak"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Iragazi:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1138
+msgid "Search Cookies by Name or Domain"
msgstr ""
#: ../extensions/cookie-manager/main.c:36
@@ -2595,45 +2711,45 @@ msgid ""
"to open password database"
msgstr ""
-#: ../extensions/formhistory/formhistory.c:292
+#: ../extensions/formhistory/formhistory.c:294
msgid "Remember password on this page?"
msgstr "Pasahitza gogoratu orri honetan?"
-#: ../extensions/formhistory/formhistory.c:297
+#: ../extensions/formhistory/formhistory.c:299
msgid "Remember"
msgstr "Gogoratu"
-#: ../extensions/formhistory/formhistory.c:298
+#: ../extensions/formhistory/formhistory.c:300
msgid "Not now"
msgstr "Orain ez"
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:301
msgid "Never for this page"
msgstr "Inoiz ez orri honentzat"
-#: ../extensions/formhistory/formhistory.c:435
+#: ../extensions/formhistory/formhistory.c:437
msgid "Toggle form history state"
msgstr ""
-#: ../extensions/formhistory/formhistory.c:436
+#: ../extensions/formhistory/formhistory.c:438
msgid "Activate or deactivate form history for the current tab."
msgstr ""
-#: ../extensions/formhistory/formhistory.c:547
-#: ../extensions/formhistory/formhistory.c:551
+#: ../extensions/formhistory/formhistory.c:549
+#: ../extensions/formhistory/formhistory.c:553
#, c-format
msgid "Failed to execute database statement: %s\n"
msgstr ""
-#: ../extensions/formhistory/formhistory.c:627
+#: ../extensions/formhistory/formhistory.c:629
msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
msgstr ""
-#: ../extensions/formhistory/formhistory.c:666
+#: ../extensions/formhistory/formhistory.c:668
msgid "Form history filler"
msgstr ""
-#: ../extensions/formhistory/formhistory.c:667
+#: ../extensions/formhistory/formhistory.c:669
msgid "Stores history of entered form data"
msgstr ""
@@ -2717,8 +2833,9 @@ msgid "Customize Keyboard shortcuts"
msgstr "Pertsonalizatu teklatuaren lasterbideak"
#: ../extensions/shortcuts.c:283
+#, fuzzy
msgid "Customize Sh_ortcuts..."
-msgstr "Pertsonalizatu _lasterbideak..."
+msgstr "Pertsonalizatu _lasterbideak…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2736,35 +2853,35 @@ msgstr "Egoera-barrako erlojua"
msgid "Display date and time in the statusbar"
msgstr "Bistaratu data eta ordua egoera-barran"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Irudiak"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Script-ak"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Netscape pluginak"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Egoera-barraren ezaugarriak"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr ""
-#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Fitxen panela"
-#: ../extensions/tab-panel.c:666
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "_Fitxen panela"
-#: ../extensions/tab-panel.c:684
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Erakutsi fitxak panel bertikal batean"
@@ -2776,11 +2893,11 @@ msgstr "Ikonoak soilik fitxetan modu lehenetsian"
msgid "New tabs have no label by default"
msgstr "Fitxa berriek etiketarik ez edukitzea lehenesten da"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Pertsonalizatu tresna-barra"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2788,30 +2905,54 @@ msgstr ""
"Hautatu tresna-barran bistaratuko diren elementuak. Elementuak berrordenatu "
"daitezke arrastatu eta jareginez."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Elementu erabilgarriak"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Bistaratutako elementuak"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Pertsonalizatu _tresna-barra..."
+#: ../extensions/toolbar-editor.c:588
+#, fuzzy
+msgid "_Customize Toolbar…"
+msgstr "Pertsonalizatu _tresna-barra…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Pertsonalizatu..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Tresna-barra editorea"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Editatu tresna-barraren diseinua modu errazean"
#: ../extensions/web-cache.c:463
msgid "Cache HTTP communication on disk"
msgstr ""
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Laster-marka"
+
+#~ msgid "_Console"
+#~ msgstr "Kontsola"
+
+#~ msgid "_Title:"
+#~ msgstr "_Izenburua:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Karpeta:"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Itxi _beste fitxak"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Ikonoa:"
+
+#~ msgid "Filter:"
+#~ msgstr "Iragazi:"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Pertsonalizatu…"
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Ezin izan dira laster-markak gorde. %s"
diff --git a/po/fi.po b/po/fi.po
index 31d5ec3c..11699670 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -459,8 +459,8 @@ msgid "Epiphany"
msgstr "Epiphany"
#: ../midori/midori-browser.c:4016
-msgid "Import bookmarks..."
-msgstr "Tuo kirjanmerkit..."
+msgid "Import bookmarks…"
+msgstr "Tuo kirjanmerkit…"
#: ../midori/midori-browser.c:4019 ../midori/midori-browser.c:4957
msgid "_Import bookmarks"
@@ -792,24 +792,24 @@ msgid "_Manage Search Engines"
msgstr "_Hallitse hakukoneita"
#: ../midori/midori-browser.c:4964
-msgid "Add, edit and remove search engines..."
-msgstr "Lisää, muokkaa ja poista hakukoneita..."
+msgid "Add, edit and remove search engines…"
+msgstr "Lisää, muokkaa ja poista hakukoneita…"
#: ../midori/midori-browser.c:4967
msgid "_Clear Private Data"
msgstr "_Poista yksityisyystietoja"
#: ../midori/midori-browser.c:4968
-msgid "Clear private data..."
-msgstr "Poista yksityisyystietoja..."
+msgid "Clear private data…"
+msgstr "Poista yksityisyystietoja…"
#: ../midori/midori-browser.c:4972
msgid "_Inspect Page"
msgstr "_Tutki sivua"
#: ../midori/midori-browser.c:4973
-msgid "Inspect page details and access developer tools..."
-msgstr "Tutki sivun ominaisuuksia ja käytä kehitystyökaluja..."
+msgid "Inspect page details and access developer tools…"
+msgstr "Tutki sivun ominaisuuksia ja käytä kehitystyökaluja…"
#: ../midori/midori-browser.c:4978
msgid "_Previous Tab"
@@ -978,23 +978,23 @@ msgstr "Länsimainen (ISO-8859-1)"
#: ../midori/midori-browser.c:5070 ../midori/midori-websettings.c:229
#: ../midori/midori-websettings.c:320 ../katze/katze-utils.c:706
-msgid "Custom..."
-msgstr "Mukautettu..."
+msgid "Custom…"
+msgstr "Mukautettu…"
#: ../midori/midori-browser.c:5591
msgid "_Separator"
msgstr "_Erotin"
#: ../midori/midori-browser.c:5598
-msgid "_Location..."
-msgstr "_Sijainti..."
+msgid "_Location…"
+msgstr "_Sijainti…"
#: ../midori/midori-browser.c:5600
msgid "Open a particular location"
msgstr "Avaa tarkka sijainti"
#: ../midori/midori-browser.c:5624
-msgid "_Web Search..."
+msgid "_Web Search…"
msgstr "_Verkkohaku"
#: ../midori/midori-browser.c:5626
@@ -2370,8 +2370,8 @@ msgstr ""
"napsauttamalla \"Lisää\". Löydät lisää listoja osoitteesta %s."
#: ../extensions/adblock.c:587
-msgid "Configure _Advertisement filters..."
-msgstr "Säädä _mainossuodattimia..."
+msgid "Configure _Advertisement filters…"
+msgstr "Säädä _mainossuodattimia…"
#: ../extensions/adblock.c:841
msgid "Edit rule"
@@ -2788,7 +2788,7 @@ msgid "Customize Keyboard shortcuts"
msgstr "Muokkaa pikanäppäimiä"
#: ../extensions/shortcuts.c:276
-msgid "Customize Sh_ortcuts..."
+msgid "Customize Sh_ortcuts…"
msgstr "Muokkaa pika_näppäimiä,,,"
#: ../extensions/shortcuts.c:313
@@ -2868,8 +2868,8 @@ msgid "Displayed Items"
msgstr "Käytössä"
#: ../extensions/toolbar-editor.c:575
-msgid "Customize _Toolbar..."
-msgstr "Mukauta työ_kalupalkkia..."
+msgid "Customize _Toolbar…"
+msgstr "Mukauta työ_kalupalkkia…"
#: ../extensions/toolbar-editor.c:604
msgid "Toolbar Editor"
diff --git a/po/fr.po b/po/fr.po
index 3e3e0bb8..8f6125de 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,19 +8,19 @@
# Jérôme Geulfucci 2009
# Stéphane Marguet 2009-2010
# Patrick Douart 2010
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: midori 0.2.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-13 17:33+0000\n"
-"PO-Revision-Date: 2012-04-14 01:20+0100\n"
-"Last-Translator: Iliyas Jorio \n"
+"POT-Creation-Date: 2012-09-01 10:24+0000\n"
+"PO-Revision-Date: 2012-08-29 14:29+0100\n"
+"Last-Translator: \n"
"Language-Team: French \n"
-"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: ../data/midori.desktop.in.h:1
@@ -28,19 +28,31 @@ msgid "Browse the Web"
msgstr "Rechercher sur Internet"
#: ../data/midori.desktop.in.h:2
-#, fuzzy
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3
-#: ../midori/main.c:2048
-#: ../midori/main.c:2072
-#: ../midori/main.c:2086
-#: ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1944 ../midori/main.c:1968
+#: ../midori/main.c:1982 ../midori/midori-websettings.c:199
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Navigateur Web Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Nouvelle fenêtre de navigation privée"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1435
+msgid "New Tab"
+msgstr "Nouvel onglet"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1432
+msgid "New Window"
+msgstr "Nouvelle fenêtre"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Navigateur Internet"
@@ -52,344 +64,380 @@ msgstr "Midori (Navigation privée)"
msgid "Open a new private browsing window"
msgstr "Ouvrir une nouvelle fenêtre (Navigation privée)"
-#: ../data/midori-private.desktop.in.h:3
-#: ../midori/midori-view.c:4166
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4370
msgid "Private Browsing"
msgstr "Navigation privée"
-#: ../midori/main.c:96
-#: ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, 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:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "La valeur « %s » n'est pas valide pour %s"
-#: ../midori/main.c:155
-#: ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Valeur de paramètre non valide « %s »"
-#: ../midori/main.c:380
+#: ../midori/main.c:375
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Les moteurs de recherche n'ont pas pu être chargés. %s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:429
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Impossible de supprimer l'historique : %s\n"
-#: ../midori/main.c:454
-#: ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Impossible d'ouvrir la base de données : %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:523
#, 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:564
-#: ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Impossible de supprimer l'élément de l'historique : %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Les signets n'ont pas pu être enregistrés. %s"
-
-#: ../midori/main.c:633
+#: ../midori/main.c:545
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "La configuration n'a pas pu être enregistrée. %s"
-#: ../midori/main.c:668
+#: ../midori/main.c:571
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Les moteurs de recherche n'ont pas pu être enregistrés. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:608
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "La corbeille n'a pas pu être enregistrée. %s"
-#: ../midori/main.c:746
-#: ../panels/midori-extensions.c:91
+#: ../midori/main.c:681 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Extensions"
-#: ../midori/main.c:760
+#: ../midori/main.c:695
msgid "Privacy"
msgstr "Vie privée"
-#: ../midori/main.c:772
-msgid "Cookies store login data, saved games, or user profiles for advertisement purposes."
+#: ../midori/main.c:697
+msgid "Delete old Cookies after:"
+msgstr "Effacer les anciens cookies après :"
+
+#: ../midori/main.c:699 ../midori/main.c:702
+msgid "The maximum number of days to save cookies for"
msgstr ""
-"Les cookies peuvent contenir des informations de login, des sauvegardes de jeu ou des profils informations\n"
+"Le nombre maximal de jours durant lesquels conserver les fichiers témoins"
+
+#: ../midori/main.c:706
+msgid "Only accept Cookies from sites you visit"
+msgstr "N'accepter les cookies que de sites que vous visitez"
+
+#: ../midori/main.c:707
+msgid "Block cookies sent by third-party websites"
+msgstr "Bloquer les cookies envoyés par des sites tiers"
+
+#: ../midori/main.c:712
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+"Les cookies peuvent contenir des informations de login, des sauvegardes de "
+"jeu ou des profils informations\n"
" sur vous utilisées à des fins publicitaires."
-#: ../midori/main.c:828
+#: ../midori/main.c:719
+msgid "Enable offline web application cache"
+msgstr "Activer le cache d'applications web hors ligne"
+
+#: ../midori/main.c:722
+msgid "Enable HTML5 local storage support"
+msgstr "Activer le support de stockage local de HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/main.c:726
+msgid "Strip referrer details sent to websites"
+msgstr "Raccourcir l'en-tête « Referer » envoyée aux sites"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/main.c:728
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr ""
+"Si l'en-tête « Referer » (qui fournit des informations à propos de la page "
+"précédente où vous vous trouviez) doit être raccourcie au nom d'hôte"
+
+#: ../midori/main.c:731
+msgid "Delete pages from history after:"
+msgstr "Effacer les pages de l'historique après :"
+
+#: ../midori/main.c:733 ../midori/main.c:736
+msgid "The maximum number of days to save the history for"
+msgstr "Le nombre maximal de jours durant lesquels conserver l'historique"
+
+#: ../midori/main.c:777
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "La session n'a pas pu être enregistrée. %s"
-#: ../midori/main.c:1046
-msgid "No root certificate file is available. SSL certificates cannot be verified."
-msgstr "Aucun fichier de certificat racine disponible. Les certificats SSL ne peuvent être vérifiés."
+#: ../midori/main.c:1003
+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:1115
-msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem."
-msgstr "Midori semble s'être interrompu de façon inattendue lors de la dernière utilisation. Si cela se produit de façon répétée, essayez l'une des options suivantes pour résoudre le problème."
+#: ../midori/main.c:1095
+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:1134
+#: ../midori/main.c:1114
msgid "Modify _preferences"
msgstr "Modifier les _préférences"
-#: ../midori/main.c:1138
+#: ../midori/main.c:1118
msgid "Disable all _extensions"
msgstr "Désactiver toutes les _extensions"
-#: ../midori/main.c:1151
+#: ../midori/main.c:1127
+msgid "Show a dialog after Midori crashed"
+msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori"
+
+#: ../midori/main.c:1132
msgid "Discard old tabs"
msgstr "Ignorer les derniers onglets"
-#: ../midori/main.c:1152
-#: ../midori/midori-websettings.c:221
+#: ../midori/main.c:1133 ../midori/midori-websettings.c:107
msgid "Show last tabs without loading"
msgstr "Afficher les derniers onglets sans les charger"
-#: ../midori/main.c:1153
-#: ../midori/midori-websettings.c:220
+#: ../midori/main.c:1134 ../midori/midori-websettings.c:106
msgid "Show last open tabs"
msgstr "Afficher les derniers onglets ouverts"
-#: ../midori/main.c:1400
-#: ../midori/main.c:2464
+#: ../midori/main.c:1381 ../midori/main.c:2360
#, 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:1538
+#: ../midori/main.c:1519
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Capture enregistrée sous : %s\n"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1847
msgid "Run ADDRESS as a web application"
msgstr "Lancer l'ADRESSE comme une application internet"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1847
msgid "ADDRESS"
msgstr "ADRESSE"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1850
msgid "Use FOLDER as configuration folder"
msgstr "Utiliser DOSSIER comme dossier de configuration"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1850
msgid "FOLDER"
msgstr "DOSSIER"
-#: ../midori/main.c:1957
+#: ../midori/main.c:1853
msgid "Private browsing, no changes are saved"
msgstr "Navigation privée, les modifications ne sont pas enregistrées"
-#: ../midori/main.c:1959
+#: ../midori/main.c:1856
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+"Mode portable, tous les fichiers exécutables sont stockés dans un endroit"
+
+#: ../midori/main.c:1859
msgid "Show a diagnostic dialog"
msgstr "Afficher une fenêtre de diagnostic"
-#: ../midori/main.c:1961
+#: ../midori/main.c:1861
msgid "Run the specified filename as javascript"
msgstr "Lancer le fichier spécifié en tant que javascript"
-#: ../midori/main.c:1963
+#: ../midori/main.c:1863
msgid "Take a snapshot of the specified URI"
msgstr "Prendre une capture de l'URI spécifiée"
-#: ../midori/main.c:1965
+#: ../midori/main.c:1865
msgid "Execute the specified command"
msgstr "Exécuter la commande spécifiée"
-#: ../midori/main.c:1967
+#: ../midori/main.c:1867
msgid "List available commands to execute with -e/ --execute"
msgstr "Lister les commandes disponibles avec l'option -e/ --execute"
-#: ../midori/main.c:1969
+#: ../midori/main.c:1869
msgid "Display program version"
msgstr "Afficher la version du programme"
-#: ../midori/main.c:1971
+#: ../midori/main.c:1871
msgid "Addresses"
msgstr "Adresses"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1873
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:1973
+#: ../midori/main.c:1873
msgid "PATTERN"
msgstr "MODÈLE"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:1877
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Réinitialiser Midori après SECONDES secondes d'inactivité"
-#: ../midori/main.c:1977
+#: ../midori/main.c:1877
msgid "SECONDS"
msgstr "SECONDES"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1880
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Redirige les avertissements console dans le FICHIER spécifié"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1880
msgid "FILENAME"
msgstr "FICHIER"
-#: ../midori/main.c:2045
-msgid "[Addresses]"
-msgstr "[Adresses]"
-
-#: ../midori/main.c:2087
+#: ../midori/main.c:1983
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:2089
+#: ../midori/main.c:1985
msgid "Check for new versions at:"
msgstr "Vérifier l'existence de nouvelles versions à :"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
+#: ../midori/main.c:2080
msgid "Saved logins and _passwords"
msgstr "Mots de _passe et identifiants enregistrés"
-#: ../midori/main.c:2175
+#: ../midori/main.c:2082
msgid "Cookies and Website data"
msgstr "Cookies et données des sites web"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179
-#: ../midori/midori-websettings.c:996
-#: ../extensions/web-cache.c:462
-#: ../extensions/web-cache.c:471
+#: ../midori/main.c:2086 ../midori/midori-preferences.c:505
+#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470
msgid "Web Cache"
msgstr "Cache internet"
-#: ../midori/main.c:2182
+#: ../midori/main.c:2089
msgid "Website icons"
msgstr "Icônes des pages Internet"
-#: ../midori/main.c:2288
+#: ../midori/main.c:2193
msgid "An unknown error occured"
msgstr "Une erreur inconnue est survenue."
-#: ../midori/main.c:2395
+#: ../midori/main.c:2308
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:2431
+#: ../midori/main.c:2342
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Les signets n'ont pas pu être chargés : %s\n"
-#: ../midori/main.c:2479
+#: ../midori/main.c:2375
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "La corbeille n'a pas pu être chargée : %s\n"
-#: ../midori/main.c:2492
+#: ../midori/main.c:2388
#, 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:2508
+#: ../midori/main.c:2403
msgid "The following errors occured:"
msgstr "Les erreurs suivantes sont survenues :"
-#: ../midori/main.c:2524
+#: ../midori/main.c:2419
msgid "_Ignore"
msgstr "_Ignorer"
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "_Signet"
+#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:557
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Action inattendue « %s »."
-#: ../midori/midori-app.c:1335
-#: ../midori/midori-browser.c:6042
+#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6394
msgid "_Bookmarks"
msgstr "_Signets"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1373
msgid "Add Boo_kmark"
msgstr "Ajouter un s_ignet"
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_Console"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1374
msgid "_Extensions"
msgstr "_Extensions"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339
-#: ../midori/midori-browser.c:4569
+#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4847
msgid "_History"
msgstr "_Historique"
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "Page d'a_ccueil"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1376
msgid "_Userscripts"
msgstr "Scripts _utilisateur"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1377
+msgid "User_styles"
+msgstr "Styles utilisateur"
+
+#: ../midori/midori-app.c:1378
msgid "New _Tab"
msgstr "Nouvel o_nglet"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1379
msgid "_Transfers"
msgstr "_Transferts"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1380
msgid "Netscape p_lugins"
msgstr "Greffons _Netscape"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1381
msgid "_Closed Tabs"
msgstr "Onglets _fermés"
-#: ../midori/midori-app.c:1346
-#: ../midori/midori-browser.c:5198
+#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5530
msgid "New _Window"
msgstr "Nouvelle _fenêtre"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1383
msgid "New _Folder"
msgstr "Nouveau dossier"
+#: ../midori/midori-app.c:1437
+msgid "[Addresses]"
+msgstr "[Adresses]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Fichier non trouvé."
-#: ../midori/midori-array.c:547
-#: ../midori/midori-array.c:586
-#: ../midori/midori-array.c:609
-#: ../midori/midori-array.c:619
+#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
+#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
msgid "Malformed document."
msgstr "Document mal formé."
@@ -401,300 +449,314 @@ msgstr "Format de signets inconnus."
msgid "Writing failed."
msgstr "L'écriture a échoué."
-#: ../midori/midori-browser.c:331
-#: ../midori/midori-browser.c:5280
-#: ../midori/midori-browser.c:5289
+#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5618
+#: ../midori/midori-browser.c:5627
msgid "Reload the current page"
msgstr "Actualiser la page courante"
-#: ../midori/midori-browser.c:340
-#: ../midori/midori-browser.c:5286
+#: ../midori/midori-browser.c:368 ../midori/midori-browser.c:5624
msgid "Stop loading the current page"
msgstr "Arrêter le chargement de la page courante"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:376 ../midori/midori-browser.c:5669
+msgid "Go forward to the next page"
+msgstr "Aller à la page suivante"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:383 ../midori/midori-browser.c:5677
+#: ../midori/midori-browser.c:5680
+msgid "Go to the next sub-page"
+msgstr "Aller à la sous-page suivante"
+
+#: ../midori/midori-browser.c:542
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Impossible de mettre à jour le titre : %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Action inattendue « %s »."
-
-#: ../midori/midori-browser.c:579
+#: ../midori/midori-browser.c:637
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Navigation privée)"
-#: ../midori/midori-browser.c:693
-#: ../midori/midori-browser.c:726
-msgid "Toplevel folder"
-msgstr "Dossier supérieur"
+#: ../midori/midori-browser.c:747 ../midori/midori-browser.c:789
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Signets"
-#: ../midori/midori-browser.c:784
+#: ../midori/midori-browser.c:849
msgid "New folder"
msgstr "Nouveau dossier"
-#: ../midori/midori-browser.c:784
+#: ../midori/midori-browser.c:849
msgid "Edit folder"
msgstr "Modifier le dossier"
-#: ../midori/midori-browser.c:786
+#: ../midori/midori-browser.c:851
msgid "New bookmark"
msgstr "Nouveau signet"
-#: ../midori/midori-browser.c:786
+#: ../midori/midori-browser.c:851
msgid "Edit bookmark"
msgstr "Modifier le signet"
-#: ../midori/midori-browser.c:828
-msgid "_Title:"
-msgstr "_Titre :"
+#: ../midori/midori-browser.c:885
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Taper un nom pour ce signet et choisisser où le conserver."
-#: ../midori/midori-browser.c:848
-#: ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Adresse :"
-
-# manque un raccourcis Alt+X
-#: ../midori/midori-browser.c:871
-#: ../midori/midori-browser.c:4306
-msgid "_Folder:"
-msgstr "_Dossier :"
-
-#: ../midori/midori-browser.c:887
+#: ../midori/midori-browser.c:946
msgid "Add to _Speed Dial"
msgstr "Ajouter à la page d'appel rapide"
-#: ../midori/midori-browser.c:900
+#: ../midori/midori-browser.c:952
msgid "Show in the tool_bar"
msgstr "Afficher dans la _barre d'outils"
-#: ../midori/midori-browser.c:915
+#: ../midori/midori-browser.c:960
msgid "Run as _web application"
msgstr "Lancer comme une application _internet"
-#: ../midori/midori-browser.c:986
+#: ../midori/midori-browser.c:1031
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "Le fichier \"%s\" ne peut être sauvé dans ce répertoire."
-#: ../midori/midori-browser.c:988
+#: ../midori/midori-browser.c:1033
#, c-format
msgid "You don't have permission to write in this location."
msgstr "Vous n'avez pas la permission pour écrire à cet endroit."
-#: ../midori/midori-browser.c:995
+#: ../midori/midori-browser.c:1040
#, 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:998
+#: ../midori/midori-browser.c:1043
#, 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:1036
-#: ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:1179 ../midori/midori-browser.c:4651
msgid "Save file as"
msgstr "Enregistrer le fichier sous"
-#: ../midori/midori-browser.c:1330
-msgid "New Window"
-msgstr "Nouvelle fenêtre"
+#: ../midori/midori-browser.c:1185
+msgid "Save associated _resources"
+msgstr "sauver les _ressources associées"
-#: ../midori/midori-browser.c:1330
+#: ../midori/midori-browser.c:1432
msgid "A new window has been opened"
msgstr "Une nouvelle fenêtre a été ouverte"
-#: ../midori/midori-browser.c:1333
-msgid "New Tab"
-msgstr "Nouvel onglet"
-
-#: ../midori/midori-browser.c:1333
+#: ../midori/midori-browser.c:1435
msgid "A new tab has been opened"
msgstr "Un nouvel onglet a été ouvert"
-#: ../midori/midori-browser.c:1368
+#: ../midori/midori-browser.c:1452
msgid "Error opening the image!"
msgstr "Erreur pendant l'ouverture de l'image !"
-#: ../midori/midori-browser.c:1369
+#: ../midori/midori-browser.c:1453
msgid "Can not open selected image in a default viewer."
-msgstr "Impossible d'ouvrir l'image sélectionnée dans la visionneuse par défaut."
+msgstr ""
+"Impossible d'ouvrir l'image sélectionnée dans la visionneuse par défaut."
-#: ../midori/midori-browser.c:1375
+#: ../midori/midori-browser.c:1459
msgid "Error downloading the image!"
msgstr "Erreur lors du téléchargement de l'image !"
-#: ../midori/midori-browser.c:1376
+#: ../midori/midori-browser.c:1460
msgid "Can not download selected image."
msgstr "Ne peut pas télécharger l'image sélectionnez."
-#: ../midori/midori-browser.c:1481
+#: ../midori/midori-browser.c:1579
msgid "Save file"
msgstr "Enregistrer le fichier"
-#: ../midori/midori-browser.c:2349
+#: ../midori/midori-browser.c:2482
msgid "Open file"
msgstr "Ouvrir le fichier"
-#: ../midori/midori-browser.c:2481
+#: ../midori/midori-browser.c:2614
msgid ""
-"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n"
-"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically."
-msgstr "Pour utiliser l'URI ci-dessus ouvrez un agrégateur de flux. Il y a habituellement un menu ou un bouton \"Nouvel abonnement\", \"Nouvelles RSS \" ou similaires. \\ nAlternativement allez dans Préférences, Applications de Midori, et sélectionnez un agrégateur de flux. La prochaine fois que vous cliquerez sur l'icône de fil de nouvelles, il sera ajouté automatiquement."
+"To use the above URI open a news aggregator. There is usually a menu or "
+"button \"New Subscription\", \"New News Feed\" or similar.\n"
+"Alternatively go to Preferences, Applications in Midori, and select a News "
+"Aggregator. Next time you click the news feed icon, it will be added "
+"automatically."
+msgstr ""
+"Pour utiliser l'URI ci-dessus ouvrez un agrégateur de flux. Il y a "
+"habituellement un menu ou un bouton \"Nouvel abonnement\", \"Nouvelles RSS "
+"\" ou similaires. \\ nAlternativement allez dans Préférences, Applications "
+"de Midori, et sélectionnez un agrégateur de flux. La prochaine fois que vous "
+"cliquerez sur l'icône de fil de nouvelles, il sera ajouté automatiquement."
-#: ../midori/midori-browser.c:2487
-#: ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2620 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Nouveau flux"
-#: ../midori/midori-browser.c:2530
-#: ../midori/midori-browser.c:5349
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2663 ../midori/midori-browser.c:5693
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Ajouter un nouveau signet"
-#: ../midori/midori-browser.c:3029
-#: ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3207 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Vide"
-#: ../midori/midori-browser.c:3449
+#: ../midori/midori-browser.c:3653 ../midori/midori-browser.c:3654
msgid "Toggle text cursor navigation"
msgstr "Activer ou désactiver la navigation au curseur"
-#: ../midori/midori-browser.c:3765
-#: ../midori/midori-browser.c:5735
+#: ../midori/midori-browser.c:3656
+#, fuzzy
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Appuyer sur F7 permet de basculer à la navigation au curseur. Lorsqu'elle "
+"est activée, un curseur texte apparaît sur tous les sites."
+
+#: ../midori/midori-browser.c:3659
+#, fuzzy
+msgid "_Enable Caret Browsing"
+msgstr "Navigation au _curseur"
+
+#: ../midori/midori-browser.c:4051 ../midori/midori-browser.c:6087
#, 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:4094
-#: ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4377 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Tout ouvrir dans des _onglets"
-#: ../midori/midori-browser.c:4101
-#: ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807
-#: ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4384 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Ouvrir dans un nouvel _onglet"
-#: ../midori/midori-browser.c:4104
-#: ../midori/midori-view.c:2648
-#: ../midori/midori-view.c:4706
-#: ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809
-#: ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4387 ../midori/midori-view.c:2940
+#: ../midori/midori-view.c:4943 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Ouvrir dans une nouvelle _fenêtre"
-#: ../midori/midori-browser.c:4193
+#: ../midori/midori-browser.c:4476
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4194
+#: ../midori/midori-browser.c:4477
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4195
+#: ../midori/midori-browser.c:4478
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4196
+#: ../midori/midori-browser.c:4479
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4197
+#: ../midori/midori-browser.c:4480
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4198
+#: ../midori/midori-browser.c:4481
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4219
-msgid "Import bookmarks..."
-msgstr "Importer des signets..."
+#: ../midori/midori-browser.c:4482
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4222
-#: ../midori/midori-browser.c:5354
+#: ../midori/midori-browser.c:4503
+msgid "Import bookmarks…"
+msgstr "Importer des signets…"
+
+#: ../midori/midori-browser.c:4506 ../midori/midori-browser.c:5698
msgid "_Import bookmarks"
msgstr "_Importer des signets"
-#: ../midori/midori-browser.c:4233
+#: ../midori/midori-browser.c:4517
msgid "_Application:"
msgstr "_Application :"
-#: ../midori/midori-browser.c:4298
+#: ../midori/midori-browser.c:4582
msgid "Import from XBEL or HTML file"
msgstr "Importer depuis un fichier XBEL ou HTML"
-#: ../midori/midori-browser.c:4333
+#: ../midori/midori-browser.c:4610
msgid "Import from a file"
msgstr "Importer depuis un fichier"
-#: ../midori/midori-browser.c:4345
+#: ../midori/midori-browser.c:4622
msgid "Failed to import bookmarks"
msgstr "Impossible d'importer les signets"
-#: ../midori/midori-browser.c:4380
+#: ../midori/midori-browser.c:4656
msgid "XBEL Bookmarks"
msgstr "Signets XBEL"
-#: ../midori/midori-browser.c:4385
+#: ../midori/midori-browser.c:4661
msgid "Netscape Bookmarks"
msgstr "Signets Netscape"
-#: ../midori/midori-browser.c:4399
+#: ../midori/midori-browser.c:4675
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
-msgstr "Midori peut exporter uniquement vers les formats XBEL (*.xbel) et Netscape (*.html)."
+msgstr ""
+"Midori peut exporter uniquement vers les formats XBEL (*.xbel) et Netscape "
+"(*.html)."
-#: ../midori/midori-browser.c:4414
+#: ../midori/midori-browser.c:4690
msgid "Failed to export bookmarks"
msgstr "Impossible d'exporter les signets"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4536
+#: ../midori/midori-browser.c:4812
msgid "Clear Private Data"
msgstr "Effacer les informations privées"
-#: ../midori/midori-browser.c:4540
+#: ../midori/midori-browser.c:4816
msgid "_Clear private data"
msgstr "_Effacer les informations privées"
-#: ../midori/midori-browser.c:4553
+#: ../midori/midori-browser.c:4831
msgid "Clear the following data:"
msgstr "Effacer les informations suivantes :"
-#: ../midori/midori-browser.c:4563
+#: ../midori/midori-browser.c:4841
msgid "Last open _tabs"
msgstr "Derniers ongle_ts ouverts"
-#: ../midori/midori-browser.c:4589
+#: ../midori/midori-browser.c:4867
msgid "Clear private data when _quitting Midori"
msgstr "Effacer les informations privées en _quittant Midori"
-#: ../midori/midori-browser.c:4784
+#: ../midori/midori-browser.c:5082
msgid "A lightweight web browser."
msgstr "Un navigateur Internet léger."
-#: ../midori/midori-browser.c:4785
+#: ../midori/midori-browser.c:5083
msgid "See about:version for version info."
-msgstr "Consultez about:version pour obtenir des informations à propos de la version de Midori."
+msgstr ""
+"Consultez about:version pour obtenir des informations à propos de la version "
+"de Midori."
-#: ../midori/midori-browser.c:4787
-msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version."
-msgstr "Cette bibliothèque est un logiciel libre, vous pouvez le redistribuer et/ou le modifier selon les termes de la GNU Lesser General Public License telle que publiée par la Free Software Foundation; soit la version 2.1 de la licence ou, à votre choix, toutes versions ultérieures."
+#: ../midori/midori-browser.c:5085
+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:4808
+#: ../midori/midori-browser.c:5115
msgid "translator-credits"
msgstr ""
"Christian Dywan \n"
@@ -704,1374 +766,1146 @@ msgstr ""
"Jérôme Geulfucci \n"
"Iliyas Jorio "
-#: ../midori/midori-browser.c:5196
+#: ../midori/midori-browser.c:5528
msgid "_File"
msgstr "_Fichier"
-#: ../midori/midori-browser.c:5199
+#: ../midori/midori-browser.c:5531
msgid "Open a new window"
msgstr "Ouvrir une nouvelle fenêtre"
-#: ../midori/midori-browser.c:5202
+#: ../midori/midori-browser.c:5534
msgid "Open a new tab"
msgstr "Ouvrir un nouvel onglet"
-#: ../midori/midori-browser.c:5204
+#: ../midori/midori-browser.c:5536
msgid "New P_rivate Browsing Window"
msgstr "Nouvelle fenêtre (Navigation _privée)"
-#: ../midori/midori-browser.c:5208
+#: ../midori/midori-browser.c:5540
msgid "Open a file"
msgstr "Ouvrir un fichier"
-#: ../midori/midori-browser.c:5210
-msgid "_Save Page As..."
-msgstr "_Sauvegarder la page sous..."
+#: ../midori/midori-browser.c:5542
+msgid "_Save Page As…"
+msgstr "_Sauvegarder la page sous…"
-#: ../midori/midori-browser.c:5211
+#: ../midori/midori-browser.c:5543
msgid "Save to a file"
msgstr "Enregistrer dans un fichier"
-#: ../midori/midori-browser.c:5213
+#: ../midori/midori-browser.c:5545
msgid "Add to Speed _dial"
msgstr "Ajouter à la page d'appel rapi_de"
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5549
msgid "Add Shortcut to the _desktop"
msgstr "Ajouter un raccourci sur le _bureau"
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5551
msgid "Create _Launcher"
msgstr "Créer un _lanceur"
-#: ../midori/midori-browser.c:5223
+#: ../midori/midori-browser.c:5555
msgid "Subscribe to News _feed"
msgstr "Souscrire au flux de _nouvelles"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5561
msgid "_Close Tab"
msgstr "Fe_rmer l'onglet"
-#: ../midori/midori-browser.c:5230
+#: ../midori/midori-browser.c:5562
msgid "Close the current tab"
msgstr "Fermer l'onglet actuel"
-#: ../midori/midori-browser.c:5232
+#: ../midori/midori-browser.c:5564
msgid "C_lose Window"
msgstr "Fer_mer la fenêtre"
-#: ../midori/midori-browser.c:5236
+#: ../midori/midori-browser.c:5568
+msgid "_Share"
+msgstr "Partager"
+
+#: ../midori/midori-browser.c:5573
msgid "Print the current page"
msgstr "Imprimer la page actuelle"
-#: ../midori/midori-browser.c:5238
+#: ../midori/midori-browser.c:5576
msgid "Close a_ll Windows"
msgstr "Fermer _toutes les fenêtres"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5579
msgid "_Edit"
msgstr "É_dition"
-#: ../midori/midori-browser.c:5264
-msgid "_Find..."
+#: ../midori/midori-browser.c:5602
+msgid "_Find…"
msgstr "_Trouver"
-#: ../midori/midori-browser.c:5265
+#: ../midori/midori-browser.c:5603
msgid "Find a word or phrase in the page"
msgstr "Rechercher un mot ou une phrase dans la page"
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5605
msgid "Find _Next"
msgstr "Rechercher le sui_vant"
-#: ../midori/midori-browser.c:5270
+#: ../midori/midori-browser.c:5608
msgid "Find _Previous"
msgstr "Rechercher le _précédent"
-#: ../midori/midori-browser.c:5274
+#: ../midori/midori-browser.c:5612
msgid "Configure the application preferences"
msgstr "Configurer les préférences de l'application"
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5614
msgid "_View"
msgstr "_Affichage"
-#: ../midori/midori-browser.c:5277
+#: ../midori/midori-browser.c:5615
msgid "_Toolbars"
msgstr "_Barre d'outils"
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5620
msgid "Reload page without caching"
msgstr "Actualiser la page sans mettre en cache"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5630
msgid "Increase the zoom level"
msgstr "Augmenter le niveau d'agrandissement"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5633
msgid "Decrease the zoom level"
msgstr "Diminuer le niveau d'agrandissement"
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5637
msgid "_Encoding"
msgstr "_Encodage"
-#: ../midori/midori-browser.c:5301
+#: ../midori/midori-browser.c:5639
msgid "View So_urce"
msgstr "Afficher le code so_urce"
-#: ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:5642
msgid "Ca_ret Browsing"
msgstr "Navigation au _curseur"
-#: ../midori/midori-browser.c:5308
+#: ../midori/midori-browser.c:5646
msgid "Toggle fullscreen view"
msgstr "Activer/désactiver le plein écran"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5648
msgid "Scroll _Left"
msgstr "Défilement à _gauche"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5651
msgid "Scroll _Down"
msgstr "Défilement en _bas"
-#: ../midori/midori-browser.c:5316
+#: ../midori/midori-browser.c:5654
msgid "Scroll _Up"
msgstr "Défilement en _haut"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5657
msgid "Scroll _Right"
msgstr "Défilement à _droite"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5660
+msgid "_Readable"
+msgstr "Lisible"
+
+#: ../midori/midori-browser.c:5663
msgid "_Go"
msgstr "A_ller"
-#: ../midori/midori-browser.c:5325
+#: ../midori/midori-browser.c:5666
msgid "Go back to the previous page"
msgstr "Aller à la page précédente"
-#: ../midori/midori-browser.c:5328
-msgid "Go forward to the next page"
-msgstr "Aller à la page suivante"
-
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5332
+#: ../midori/midori-browser.c:5673
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:5336
-msgid "Go to the next sub-page"
-msgstr "Aller à la sous-page suivante"
+#: ../midori/midori-browser.c:5682
+msgid "_Homepage"
+msgstr "Page d'a_ccueil"
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5683
msgid "Go to your homepage"
msgstr "Aller à la page d'accueil"
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5685
msgid "Empty Trash"
msgstr "Vider la corbeille"
-#: ../midori/midori-browser.c:5344
+#: ../midori/midori-browser.c:5688
msgid "Undo _Close Tab"
msgstr "A_nnuler la fermeture de l'onglet"
-#: ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:5695
msgid "Add a new _folder"
msgstr "Ajouter un nouveau _dossier"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5701
msgid "_Export bookmarks"
msgstr "_Exporter des signets"
-#: ../midori/midori-browser.c:5360
-#: ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5704 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "_Gestion des moteurs de recherche"
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5707
msgid "_Clear Private Data"
msgstr "_Effacer les informations privées"
-#: ../midori/midori-browser.c:5366
+#: ../midori/midori-browser.c:5710
msgid "_Inspect Page"
msgstr "_Inspecter la page"
-#: ../midori/midori-browser.c:5370
+#: ../midori/midori-browser.c:5714
msgid "_Previous Tab"
msgstr "Onglet _précédent"
-#: ../midori/midori-browser.c:5373
+#: ../midori/midori-browser.c:5717
msgid "_Next Tab"
msgstr "Onglet _suivant"
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5719
msgid "Move Tab _Backward"
msgstr "Déplacer l'onglet en _arrière"
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5721
msgid "_Move Tab Forward"
msgstr "_Déplacer l'onglet en avant"
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5724
msgid "Focus _Current Tab"
msgstr "Mettre le focus sur l'onglet _actuel"
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5727
msgid "Focus _Next view"
msgstr "Mettre le focus sur la vue _suivante"
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5730
msgid "Only show the Icon of the _Current Tab"
msgstr "Afficher uniquement l'icône de l'onglet _courant"
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5733
msgid "_Duplicate Current Tab"
msgstr "_Dupliquer l'onglet actif"
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5736
msgid "Close Ot_her Tabs"
msgstr "Fermer les _autres onglets"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5739
msgid "Open last _session"
msgstr "Ouvrir la _dernière session"
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5742
msgid "_Help"
msgstr "Aid_e"
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5744
msgid "_Frequent Questions"
msgstr "_Questions fréquentes"
-#: ../midori/midori-browser.c:5403
-msgid "_Report a Problem..."
+#: ../midori/midori-browser.c:5747
+msgid "_Report a Problem…"
msgstr "_Signaler un _problème"
-#: ../midori/midori-browser.c:5415
-msgid "_Menubar"
-msgstr "Barre de _menu"
-
-#: ../midori/midori-browser.c:5419
-msgid "_Navigationbar"
-msgstr "Barre de _navigation"
-
-#: ../midori/midori-browser.c:5423
-msgid "Side_panel"
-msgstr "Panneau la_téral"
-
-#: ../midori/midori-browser.c:5424
-msgid "Sidepanel"
-msgstr "Panneau latéral"
-
-#: ../midori/midori-browser.c:5427
-msgid "_Bookmarkbar"
-msgstr "Barre des _signets"
-
-#: ../midori/midori-browser.c:5431
-msgid "_Statusbar"
-msgstr "Barre d'ét_at"
-
-#: ../midori/midori-browser.c:5440
-#: ../midori/midori-websettings.c:311
-msgid "_Automatic"
-msgstr "_Automatique"
-
-#: ../midori/midori-browser.c:5443
-#: ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "Chinois (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5447
-msgid "Japanese (SHIFT__JIS)"
-msgstr "Japonais (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:5450
-#: ../midori/midori-websettings.c:238
-msgid "Korean (EUC-KR)"
-msgstr "Coréen (EUC-KR)"
-
-#: ../midori/midori-browser.c:5453
-#: ../midori/midori-websettings.c:239
-msgid "Russian (KOI8-R)"
-msgstr "Russe (KOI8-R)"
-
-#: ../midori/midori-browser.c:5456
-#: ../midori/midori-websettings.c:240
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-browser.c:5459
-#: ../midori/midori-websettings.c:241
-msgid "Western (ISO-8859-1)"
-msgstr "Occidental (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5462
-#: ../midori/midori-websettings.c:242
-#: ../midori/midori-websettings.c:317
-#: ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Personnalisé..."
-
-#: ../midori/midori-browser.c:5967
-msgid "_Separator"
-msgstr "_Séparateur"
-
-#: ../midori/midori-browser.c:5974
-msgid "_Location..."
-msgstr "_Emplacement..."
-
-#: ../midori/midori-browser.c:5976
-msgid "Open a particular location"
-msgstr "Ouvrir un emplacement particulier"
-
-#: ../midori/midori-browser.c:5998
-msgid "_Web Search..."
-msgstr "Recherche _Internet..."
-
-#: ../midori/midori-browser.c:6000
-msgid "Run a web search"
-msgstr "Lancer une recherche sur Internet"
-
-#: ../midori/midori-browser.c:6027
-msgid "Reopen a previously closed tab or window"
-msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé"
-
-#: ../midori/midori-browser.c:6044
-msgid "Show the saved bookmarks"
-msgstr "Afficher les signets sauvegardés"
-
-#: ../midori/midori-browser.c:6061
+#: ../midori/midori-browser.c:5752 ../midori/midori-browser.c:6413
msgid "_Tools"
msgstr "_Outils"
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5759
+msgid "_Menubar"
+msgstr "Barre de _menu"
+
+#: ../midori/midori-browser.c:5763
+msgid "_Navigationbar"
+msgstr "Barre de _navigation"
+
+#: ../midori/midori-browser.c:5767
+msgid "Side_panel"
+msgstr "Panneau la_téral"
+
+#: ../midori/midori-browser.c:5768
+msgid "Sidepanel"
+msgstr "Panneau latéral"
+
+#: ../midori/midori-browser.c:5771
+msgid "_Bookmarkbar"
+msgstr "Barre des _signets"
+
+#: ../midori/midori-browser.c:5775
+msgid "_Statusbar"
+msgstr "Barre d'ét_at"
+
+#: ../midori/midori-browser.c:5784 ../midori/midori-websettings.c:198
+msgid "_Automatic"
+msgstr "_Automatique"
+
+#: ../midori/midori-browser.c:5787 ../midori/midori-websettings.c:122
+msgid "Chinese Traditional (BIG5)"
+msgstr "Chinois traditionnel (BIG5)"
+
+#: ../midori/midori-browser.c:5790 ../midori/midori-websettings.c:123
+msgid "Chinese Simplified (GB18030)"
+msgstr "Chinois simplifié (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5794
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japonais (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5797 ../midori/midori-websettings.c:125
+msgid "Korean (EUC-KR)"
+msgstr "Coréen (EUC-KR)"
+
+#: ../midori/midori-browser.c:5800 ../midori/midori-websettings.c:126
+msgid "Russian (KOI8-R)"
+msgstr "Russe (KOI8-R)"
+
+#: ../midori/midori-browser.c:5803 ../midori/midori-websettings.c:127
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5806 ../midori/midori-websettings.c:128
+msgid "Western (ISO-8859-1)"
+msgstr "Occidental (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5809
+msgid "Custom…"
+msgstr "Personnalisé…"
+
+#: ../midori/midori-browser.c:6319
+msgid "_Separator"
+msgstr "_Séparateur"
+
+#: ../midori/midori-browser.c:6326
+msgid "_Location…"
+msgstr "_Emplacement…"
+
+#: ../midori/midori-browser.c:6328
+msgid "Open a particular location"
+msgstr "Ouvrir un emplacement particulier"
+
+#: ../midori/midori-browser.c:6350
+msgid "_Web Search…"
+msgstr "Recherche _Internet…"
+
+#: ../midori/midori-browser.c:6352
+msgid "Run a web search"
+msgstr "Lancer une recherche sur Internet"
+
+#: ../midori/midori-browser.c:6379
+msgid "Reopen a previously closed tab or window"
+msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé"
+
+#: ../midori/midori-browser.c:6396
+msgid "Show the saved bookmarks"
+msgstr "Afficher les signets sauvegardés"
+
+#: ../midori/midori-browser.c:6429
msgid "_Window"
msgstr "Fe_nêtre"
-#: ../midori/midori-browser.c:6079
+#: ../midori/midori-browser.c:6431
msgid "Show a list of all open tabs"
msgstr "Afficher une liste de tous les onglets ouverts"
-#: ../midori/midori-browser.c:6093
+#: ../midori/midori-browser.c:6445
msgid "_Menu"
msgstr "_Menu"
-#: ../midori/midori-browser.c:6095
+#: ../midori/midori-browser.c:6447
msgid "Menu"
msgstr "Menu"
-#: ../midori/midori-browser.c:6909
+#: ../midori/midori-browser.c:7272
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Paramètre inattendu « %s »"
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:330
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "La configuration de l'extension « %s » n'a pas pu être lue : %s\n"
-#: ../midori/midori-extension.c:747
-#: ../midori/midori-extension.c:844
-#: ../midori/midori-extension.c:941
-#: ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:749 ../midori/midori-extension.c:846
+#: ../midori/midori-extension.c:943 ../midori/midori-extension.c:1055
+#: ../extensions/addons.c:1685
#, 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"
+msgstr ""
+"La configuration de l'extension « %s » n'a pas pu être enregistrée: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "Rechercher avec %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Rechercher avec..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "Rechercher avec…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "Impossible de sélectionner dans l'historique\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "Rechercher %s"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "Exporter le certificat"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "L'autorité de signature de certificat est inconnue."
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"Le certificat ne correspond pas à l'identité attendue du site qui a été reçu."
+
+#: ../midori/midori-locationaction.c:1263
+#, fuzzy
+msgid "The certificate's activation time is still in the future."
+msgstr "le temps d'activation du certificat est encore dans le futur."
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "Le certificat a expiré"
+
+#: ../midori/midori-locationaction.c:1267
+#, fuzzy
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"Le certificat a été révoqué conformément à la liste de révocation de "
+"certificats GTL Connexions."
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "L'algorithme du certificat est considéré comme peu sûr."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "Une autre erreur s'est produite lors de la validation du certificat."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "_Exporter le certificat"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "Auto-signé"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "Détails de sécurité"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1400
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "Coller et continue_r"
-#: ../midori/midori-locationaction.c:1768
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "Non vérifié"
-#: ../midori/midori-locationaction.c:1788
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "Connection sécurisée"
-#: ../midori/midori-panel.c:397
-#: ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562
-#: ../midori/midori-panel.c:565
+#: ../midori/midori-locationaction.c:1989
+msgid "Open, unencrypted connection"
+msgstr "Ouvrir une connection sécurisée"
+
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Aligner le panneau latéral sur la droite"
-#: ../midori/midori-panel.c:409
-#: ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Fermer le panneau"
-#: ../midori/midori-panel.c:563
-#: ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Aligner le panneau latéral sur la gauche"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:104
msgid "Show Speed Dial"
msgstr "Montrer l'Appel rapide"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:105
msgid "Show Homepage"
msgstr "Afficher la page d'accueil"
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:124
msgid "Japanese (SHIFT_JIS)"
msgstr "Japonais (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:129 ../midori/midori-websettings.c:205
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Personnalisé…"
+
+#: ../midori/midori-websettings.c:144
msgid "New tab"
msgstr "Nouvel onglet"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:145
msgid "New window"
msgstr "Nouvelle fenêtre"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:146
msgid "Current tab"
msgstr "Onglet actuel"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:161
msgid "Default"
msgstr "Par défaut"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:162
msgid "Icons"
msgstr "Icônes"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:163
msgid "Small icons"
msgstr "Petites icônes"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:164
msgid "Text"
msgstr "Texte"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:165
msgid "Icons and text"
msgstr "Icônes et texte"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:166
msgid "Text beside icons"
msgstr "Texte à côté des icônes"
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:181
msgid "Automatic (GNOME or environment)"
msgstr "Automatique (GNOME ou de l'environnement)"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:182
msgid "HTTP proxy server"
msgstr "Serveur mandataire HTTP"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:183
msgid "No proxy server"
msgstr "Pas de serveur mandataire"
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:200
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:201
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:202
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:203
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:204
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:400
-msgid "Remember last window size"
-msgstr "Se souvenir de la taille de la fenêtre"
-
-#: ../midori/midori-websettings.c:401
-msgid "Whether to save the last window size"
-msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre"
-
-#: ../midori/midori-websettings.c:409
-msgid "Last window width"
-msgstr "Dernière largeur de la fenêtre"
-
-#: ../midori/midori-websettings.c:410
-msgid "The last saved window width"
-msgstr "La dernière largeur enregistrée de la fenêtre"
-
-#: ../midori/midori-websettings.c:418
-msgid "Last window height"
-msgstr "Dernière hauteur de la fenêtre"
-
-#: ../midori/midori-websettings.c:419
-msgid "The last saved window height"
-msgstr "La dernière hauteur enregistrée de la fenêtre"
-
-#: ../midori/midori-websettings.c:444
-msgid "Last panel position"
-msgstr "Dernière position du panneau"
-
-#: ../midori/midori-websettings.c:445
-msgid "The last saved panel position"
-msgstr "La dernière position enregistrée du panneau"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
-msgid "Last panel page"
-msgstr "Dernière page du panneau"
-
-#: ../midori/midori-websettings.c:455
-msgid "The last saved panel page"
-msgstr "La dernière page enregistrée du panneau"
-
-#: ../midori/midori-websettings.c:463
-msgid "Last Web search"
-msgstr "Dernière recherche sur Internet"
-
-#: ../midori/midori-websettings.c:464
-msgid "The last saved Web search"
-msgstr "La dernière recherche sur Internet enregistrée"
-
-#: ../midori/midori-websettings.c:473
-msgid "Show Menubar"
-msgstr "Afficher la barre de menu"
-
-#: ../midori/midori-websettings.c:474
-msgid "Whether to show the menubar"
-msgstr "Indique s'il faut afficher la barre de menu"
-
-#: ../midori/midori-websettings.c:482
-msgid "Show Navigationbar"
-msgstr "Afficher la barre de navigation"
-
-#: ../midori/midori-websettings.c:483
-msgid "Whether to show the navigationbar"
-msgstr "Indique s'il faut afficher la barre de navigation"
-
-#: ../midori/midori-websettings.c:491
-msgid "Show Bookmarkbar"
-msgstr "Afficher la barre des _signets"
-
-#: ../midori/midori-websettings.c:492
-msgid "Whether to show the bookmarkbar"
-msgstr "Indique s'il faut afficher la barre des signets"
-
-#: ../midori/midori-websettings.c:500
-msgid "Show Panel"
-msgstr "Afficher le panneau"
-
-#: ../midori/midori-websettings.c:501
-msgid "Whether to show the panel"
-msgstr "Indique s'il faut afficher le panneau"
-
-#: ../midori/midori-websettings.c:509
-msgid "Show Statusbar"
-msgstr "Afficher la barre d'état"
-
-#: ../midori/midori-websettings.c:510
-msgid "Whether to show the statusbar"
-msgstr "Indique s'il faut afficher la barre d'état"
-
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:277
msgid "Toolbar Style:"
msgstr "Style de la barre d'outils"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:278
msgid "The style of the toolbar"
msgstr "Le style de la barre d'outils"
-#: ../midori/midori-websettings.c:529
-msgid "Toolbar Items"
-msgstr "Éléments de la barre d'outils"
-
-#: ../midori/midori-websettings.c:530
-msgid "The items to show on the toolbar"
-msgstr "Les éléments à afficher dans la barre d'outils"
-
-#: ../midori/midori-websettings.c:538
-msgid "Compact Sidepanel"
-msgstr "Panneau latéral compact"
-
-#: ../midori/midori-websettings.c:539
-msgid "Whether to make the sidepanel compact"
-msgstr "Indique s'il faut mettre le panneau latéral compact"
-
-#: ../midori/midori-websettings.c:554
-msgid "Align sidepanel on the right"
-msgstr "Aligner le panneau latéral sur la droite"
-
-#: ../midori/midori-websettings.c:555
-msgid "Whether to align the sidepanel on the right"
-msgstr "Indique s'il faut aligner le panneau latéral sur la droite"
-
-#: ../midori/midori-websettings.c:570
-msgid "Open panels in separate windows"
-msgstr "Ouvrir les panneaux dans une fenêtre séparée"
-
-#: ../midori/midori-websettings.c:571
-msgid "Whether to always open panels in separate windows"
-msgstr "Indique s'il faut toujours ouvrir les panneaux dans des fenêtres séparées"
-
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:287
msgid "When Midori starts:"
msgstr "Au lancement de Midori :"
-#: ../midori/midori-websettings.c:581
-msgid "What to do when Midori starts"
-msgstr "Que faire au lancement de Midori"
-
-#: ../midori/midori-websettings.c:590
-msgid "Homepage:"
-msgstr "Page d'accueil :"
-
-#: ../midori/midori-websettings.c:591
-msgid "The homepage"
-msgstr "La page d'accueil"
-
-#: ../midori/midori-websettings.c:606
-msgid "Show crash dialog"
-msgstr "Fenêtre de fermeture inattendue"
-
-#: ../midori/midori-websettings.c:607
-msgid "Show a dialog after Midori crashed"
-msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori"
-
-#: ../midori/midori-websettings.c:615
-msgid "Save downloaded files to:"
-msgstr "Enregistrer les téléchargements dans :"
-
-#: ../midori/midori-websettings.c:616
-msgid "The folder downloaded files are saved to"
-msgstr "Le dossier où enregistrer les fichiers téléchargés"
-
-#: ../midori/midori-websettings.c:624
-msgid "Text Editor"
-msgstr "Éditeur de texte"
-
-#: ../midori/midori-websettings.c:625
-msgid "An external text editor"
-msgstr "Un éditeur de texte externe"
-
-#: ../midori/midori-websettings.c:640
-msgid "News Aggregator"
-msgstr "Agrégateur de flux"
-
-#: ../midori/midori-websettings.c:641
-msgid "An external news aggregator"
-msgstr "Un agrégateur de flux externe"
-
-#: ../midori/midori-websettings.c:649
-msgid "Location entry Search"
-msgstr "Recherche depuis la barre d'adresse"
-
-#: ../midori/midori-websettings.c:650
-msgid "The search to perform inside the location entry"
-msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse"
-
-#: ../midori/midori-websettings.c:658
+#: ../midori/midori-websettings.c:297
msgid "Preferred Encoding"
msgstr "Encodage favori"
-#: ../midori/midori-websettings.c:659
-msgid "The preferred character encoding"
-msgstr "Encodage favori des caractères"
-
-#: ../midori/midori-websettings.c:669
-msgid "Always Show Tabbar"
-msgstr "Toujours afficher la barre d'onglets"
-
-#: ../midori/midori-websettings.c:670
-msgid "Always show the tabbar"
-msgstr "Toujours afficher la barre d'onglets"
-
-#: ../midori/midori-websettings.c:683
-msgid "Close Buttons on Tabs"
-msgstr "Boutons de fermeture sur les onglets"
-
-#: ../midori/midori-websettings.c:684
-msgid "Whether tabs have close buttons"
-msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets"
-
-#: ../midori/midori-websettings.c:709
+#: ../midori/midori-websettings.c:324
msgid "Open new pages in:"
msgstr "Ouvrir les nouvelles pages dans :"
-#: ../midori/midori-websettings.c:710
-msgid "Where to open new pages"
-msgstr "Lieu où les nouvelles pages doivent être ouvertes"
-
-#: ../midori/midori-websettings.c:719
-msgid "Middle click opens Selection"
-msgstr "Un clic milieu ouvre la sélection"
-
-#: ../midori/midori-websettings.c:720
-msgid "Load an address from the selection via middle click"
-msgstr "Charger l'addresse de la sélection avec un clic du bouton central de la souris"
-
-#: ../midori/midori-websettings.c:728
-msgid "Open tabs in the background"
-msgstr "Ouvrir les onglets en arrière-plan"
-
-#: ../midori/midori-websettings.c:729
-msgid "Whether to open new tabs in the background"
-msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan"
-
-#: ../midori/midori-websettings.c:737
-msgid "Open Tabs next to Current"
-msgstr "Ouvrir les onglets à côté de l'onglet actif"
-
-#: ../midori/midori-websettings.c:738
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actif ou après le dernier"
-
-#: ../midori/midori-websettings.c:746
-msgid "Open popups in tabs"
-msgstr "Ouvrir les fenêtre intempestives dans des onglets"
-
-#: ../midori/midori-websettings.c:747
-msgid "Whether to open popup windows in tabs"
-msgstr "Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des onglets"
-
-#: ../midori/midori-websettings.c:757
-#: ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Charger les images automatiquement"
-
-#: ../midori/midori-websettings.c:758
-msgid "Load and display images automatically"
-msgstr "Charger et afficher les images automatiquement"
-
-#: ../midori/midori-websettings.c:765
-#: ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Activer les scripts"
-
-#: ../midori/midori-websettings.c:766
-msgid "Enable embedded scripting languages"
-msgstr "Active la prise en charge interne des scripts"
-
-#: ../midori/midori-websettings.c:773
-#: ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Activer les greffons Netscape"
-
-#: ../midori/midori-websettings.c:774
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Active la prise en charge interne des greffons Netscape"
-
-#: ../midori/midori-websettings.c:789
-msgid "Enable Spell Checking"
-msgstr "Activer la vérification de l'orthographe"
-
-#: ../midori/midori-websettings.c:790
-msgid "Enable spell checking while typing"
-msgstr "Activer la vérification de l'orthographe lors de la saisie"
-
-#: ../midori/midori-websettings.c:796
-msgid "Enable HTML5 database support"
-msgstr "Activer le support de base de données HTML5"
-
-#: ../midori/midori-websettings.c:797
-msgid "Whether to enable HTML5 database support"
-msgstr "Indique s'il faut activer le support de base de données de HTML5"
-
-#: ../midori/midori-websettings.c:803
-msgid "Enable HTML5 local storage support"
-msgstr "Activer le support de stockage local de HTML5"
-
-#: ../midori/midori-websettings.c:804
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Indique s'il faut activer le support de stockage local de HTML5"
-
-#: ../midori/midori-websettings.c:810
-msgid "Enable offline web application cache"
-msgstr "Activer le cache d'applications web hors ligne"
-
-#: ../midori/midori-websettings.c:811
-msgid "Whether to enable offline web application cache"
-msgstr "Indique s'il faut activer le cache des applications web hors ligne"
-
-#: ../midori/midori-websettings.c:827
-msgid "Flash window on background tabs"
-msgstr "Clignoter en cas d'onglet en arrière-plan"
-
-#: ../midori/midori-websettings.c:828
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr "Faire clignoter la fenêtre du navigateur si un onglet a été ouvert en arrière-plan"
-
-#: ../midori/midori-websettings.c:836
-msgid "Enable WebGL support"
-msgstr "Activer le support WebGL"
-
-#: ../midori/midori-websettings.c:837
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Permettre aux sites d'utiliser le rendu OpenGL"
-
-#: ../midori/midori-websettings.c:863
-msgid "Zoom Text and Images"
-msgstr "Agrandir le texte et les images"
-
-#: ../midori/midori-websettings.c:864
-msgid "Whether to zoom text and images"
-msgstr "Indique s'il faut agrandir le texte et les images"
-
-#: ../midori/midori-websettings.c:879
-msgid "Find inline while typing"
-msgstr "Chercher pendant la saisie"
-
-#: ../midori/midori-websettings.c:880
-msgid "Whether to automatically find inline while typing"
-msgstr "Indique s'il faut chercher automatiquement dans la page pendant la saisie"
-
-#: ../midori/midori-websettings.c:895
-msgid "Kinetic scrolling"
-msgstr "Défilement cinétique"
-
-#: ../midori/midori-websettings.c:896
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Indique si le défilement doit se déplacer cinétiquement en fonction de la vitesse"
-
-#: ../midori/midori-websettings.c:904
-msgid "Delete old Cookies after:"
-msgstr "Effacer les anciens cookies après :"
-
-#: ../midori/midori-websettings.c:905
-msgid "The maximum number of days to save cookies for"
-msgstr "Le nombre maximal de jours durant lesquels conserver les fichiers témoins"
-
-#: ../midori/midori-websettings.c:921
-msgid "Only accept Cookies from sites you visit"
-msgstr "N'accepter les cookies que de sites que vous visitez"
-
-#: ../midori/midori-websettings.c:922
-msgid "Block cookies sent by third-party websites"
-msgstr "Bloquer les cookies envoyés par des sites tiers"
-
-#: ../midori/midori-websettings.c:936
-msgid "Delete pages from history after:"
-msgstr "Effacer les pages de l'historique après :"
-
-#: ../midori/midori-websettings.c:937
-msgid "The maximum number of days to save the history for"
-msgstr "Le nombre maximal de jours durant lesquels conserver l'historique"
-
-#: ../midori/midori-websettings.c:952
-msgid "Proxy server"
-msgstr "Serveur mandataire"
-
-#: ../midori/midori-websettings.c:953
-msgid "The type of proxy server to use"
-msgstr "Le type de serveur mandataire à utiliser"
-
-#: ../midori/midori-websettings.c:962
-msgid "HTTP Proxy Server"
-msgstr "Serveur mandataire HTTP"
-
-#: ../midori/midori-websettings.c:963
-msgid "The proxy server used for HTTP connections"
-msgstr "Le serveur mandataire (proxy) pour les connexions HTTP"
-
-#: ../midori/midori-websettings.c:978
-msgid "Port"
-msgstr "Port"
-
-#: ../midori/midori-websettings.c:979
-msgid "The proxy server port used for HTTP connections"
-msgstr "Le port utilisé pour contacter le serveur mandataire (proxy) pour les connexions HTTP"
-
-#: ../midori/midori-websettings.c:997
-msgid "The maximum size of cached pages on disk"
-msgstr "La taille maximale des pages mises en cache sur le disque"
-
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
+#: ../midori/midori-websettings.c:387
msgid "Identify as"
msgstr "S'identifier comme"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:388
msgid "What to identify as to web pages"
msgstr "Comment s'identifier sur les pages Internet"
-#: ../midori/midori-websettings.c:1031
-msgid "Identification string"
-msgstr "Chaîne d'identification"
-
-#: ../midori/midori-websettings.c:1032
-msgid "The application identification string"
-msgstr "La chaîne d'identification de l'application"
-
-#: ../midori/midori-websettings.c:1048
+#: ../midori/midori-websettings.c:421
msgid "Preferred languages"
msgstr "Langues préférés"
-#: ../midori/midori-websettings.c:1049
-msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-msgstr "Une liste des langues préférées séparées par une virgule pour le rendu des pages multilingues, par exemple \"de\", \"fr,en\" ou \"en-us;q=1.0, fr-fr;q=0.667\""
+#: ../midori/midori-websettings.c:422
+msgid ""
+"A comma separated list of languages preferred for rendering multilingual "
+"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+msgstr ""
+"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:1064
-msgid "Clear private data"
-msgstr "Effacer les informations privées"
-
-#: ../midori/midori-websettings.c:1065
-msgid "The private data selected for deletion"
-msgstr "Les informations privées sélectionnées pour la suppression"
-
-#: ../midori/midori-websettings.c:1080
-msgid "Clear data"
-msgstr "Effacer les informations"
-
-#: ../midori/midori-websettings.c:1081
-msgid "The data selected for deletion"
-msgstr "Les informations sélectionnées pour la suppression"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
-msgid "Strip referrer details sent to websites"
-msgstr "Raccourcir l'en-tête « Referer » envoyée aux sites"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Si l'en-tête « Referer » (qui fournit des informations à propos de la page précédente où vous vous trouviez) doit être raccourcie au nom d'hôte"
-
-#: ../midori/midori-websettings.c:1146
+#: ../midori/midori-websettings.c:471
msgid "Always use my font choices"
msgstr "Toujours utiliser les polices choisies"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:472
msgid "Override fonts picked by websites with user preferences"
msgstr "Forcer toute page web à utiliser les polices ci-dessus"
-#: ../midori/midori-view.c:1353
+#: ../midori/midori-view.c:997 ../midori/midori-view.c:1136
+msgid "Trust this website"
+msgstr "Faire confiance à ce site"
+
+#: ../midori/midori-view.c:1134
+msgid "Security unknown"
+msgstr "Sécurité inconnue"
+
+#: ../midori/midori-view.c:1432
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s veut enregistrer une base de donnée HTML5."
-#: ../midori/midori-view.c:1357
-#: ../midori/midori-view.c:1389
+#: ../midori/midori-view.c:1436 ../midori/midori-view.c:1470
msgid "_Deny"
msgstr "_Refuser"
-#: ../midori/midori-view.c:1357
-#: ../midori/midori-view.c:1389
+#: ../midori/midori-view.c:1436 ../midori/midori-view.c:1470
msgid "_Allow"
msgstr "_Autoriser"
-#: ../midori/midori-view.c:1385
+#: ../midori/midori-view.c:1465
#, c-format
msgid "%s wants to know your location."
msgstr "%s veut connaître votre position"
-#: ../midori/midori-view.c:1476
+#: ../midori/midori-view.c:1561
#, c-format
msgid "Error - %s"
msgstr "Erreur - %s"
-#: ../midori/midori-view.c:1477
+#: ../midori/midori-view.c:1562
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "La page « %s » n'a pu être chargée."
-#: ../midori/midori-view.c:1479
+#: ../midori/midori-view.c:1564
msgid "Try again"
msgstr "Réessayer"
-#: ../midori/midori-view.c:1676
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:1762 ../midori/midori-view.c:2875
#, c-format
msgid "Send a message to %s"
msgstr "Envoyer un message à %s"
-#: ../midori/midori-view.c:2419
-#: ../midori/midori-view.c:2738
+#: ../midori/midori-view.c:2661
+msgid "Add _search engine..."
+msgstr "Ajouter un moteur de recherche"
+
+#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031
msgid "Inspect _Element"
msgstr "Inspecter l'élé_ment"
-#: ../midori/midori-view.c:2471
+#: ../midori/midori-view.c:2757
msgid "Open Link in New _Tab"
msgstr "Ouvrir le lien dans un nouvel _onglet"
-#: ../midori/midori-view.c:2475
+#: ../midori/midori-view.c:2761
msgid "Open Link in _Foreground Tab"
msgstr "Ouvrir le lien en a_vant plan"
-#: ../midori/midori-view.c:2476
+#: ../midori/midori-view.c:2762
msgid "Open Link in _Background Tab"
msgstr "Ouvrir le lien en a_rrière plan"
-#: ../midori/midori-view.c:2479
+#: ../midori/midori-view.c:2765
msgid "Open Link in New _Window"
msgstr "Ouvrir le lien dans une nouvelle _fenêtre"
-#: ../midori/midori-view.c:2482
+#: ../midori/midori-view.c:2768
msgid "Open Link as Web A_pplication"
msgstr "Ouvrir le lien comme une appli_cation internet"
-#: ../midori/midori-view.c:2487
+#: ../midori/midori-view.c:2773
msgid "Copy Link de_stination"
msgstr "Copier l'adre_sse du lien"
-#: ../midori/midori-view.c:2503
+#: ../midori/midori-view.c:2789
msgid "Open _Image in New Tab"
msgstr "Ouvrir l'image dans un _nouvel onglet"
-#: ../midori/midori-view.c:2506
+#: ../midori/midori-view.c:2792
msgid "Copy Image _Address"
msgstr "Copier l'_adresse de l'image"
-#: ../midori/midori-view.c:2509
+#: ../midori/midori-view.c:2795
msgid "Save I_mage"
msgstr "Enregistrer l'i_mage"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2798
msgid "Open in Image _Viewer"
msgstr "Ouvrir dans la _Visionneuse d'images"
-#: ../midori/midori-view.c:2519
+#: ../midori/midori-view.c:2805
msgid "Copy Video _Address"
msgstr "Copier l'_adresse de la vidéo"
-#: ../midori/midori-view.c:2522
+#: ../midori/midori-view.c:2808
msgid "Save _Video"
msgstr "Enregistrer la _vidéo"
-#: ../midori/midori-view.c:2522
+#: ../midori/midori-view.c:2808
msgid "Download _Video"
msgstr "Télécharger la _vidéo"
-#: ../midori/midori-view.c:2548
+#: ../midori/midori-view.c:2834
msgid "Search _with"
msgstr "Rechercher _avec"
-#: ../midori/midori-view.c:2580
+#: ../midori/midori-view.c:2866
msgid "_Search the Web"
msgstr "_Rechercher sur Internet"
-#: ../midori/midori-view.c:2597
+#: ../midori/midori-view.c:2883
msgid "Open Address in New _Tab"
msgstr "Ouvrir l'adresse dans un nouvel _onglet"
-#: ../midori/midori-view.c:2887
-msgid "Open or download file"
-msgstr "Ouvrir ou télécharger le fichier"
+#: ../midori/midori-view.c:2936
+msgid "Open _Frame in New Tab"
+msgstr "Ouvrir le cadre dans un _nouvel onglet"
-#: ../midori/midori-view.c:2906
+#: ../midori/midori-view.c:3193
#, c-format
-msgid "File Type: '%s'"
-msgstr "Type de fichier : « %s »"
+msgid "Open or download file from %s"
+msgstr "Ouvrir ou télécharger le fichier depuis %s"
-#: ../midori/midori-view.c:2908
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Type de fichier : %s (« %s »)"
-
-#: ../midori/midori-view.c:2913
+#: ../midori/midori-view.c:3217
#, c-format
msgid "File Name: %s"
msgstr "Nom du fichier : %s"
+#: ../midori/midori-view.c:3222
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Type de fichier : « %s »"
+
+#: ../midori/midori-view.c:3224
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Type de fichier : %s (« %s »)"
+
+#: ../midori/midori-view.c:3259
+#, c-format
+msgid "Size: %s"
+msgstr "Taille : %s"
+
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2932
+#: ../midori/midori-view.c:3270
#, c-format
msgid "Open %s"
msgstr "Ouvrir %s"
-#: ../midori/midori-view.c:3578
+#: ../midori/midori-view.c:3895
#, c-format
msgid "Inspect page - %s"
msgstr "Analyser la page - %s"
-#: ../midori/midori-view.c:3925
-msgid "Speed Dial"
-msgstr "Appel rapide"
-
-#: ../midori/midori-view.c:3926
-#: ../midori/midori-view.c:4022
-msgid "Click to add a shortcut"
-msgstr "Cliquez pour ajouter un raccourci"
-
-#: ../midori/midori-view.c:3927
-msgid "Enter shortcut address"
-msgstr "Entrez l'adresse du raccourci"
-
-#: ../midori/midori-view.c:3928
-msgid "Enter shortcut title"
-msgstr "Entrez le titre du raccourci"
-
-#: ../midori/midori-view.c:3929
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "Ètes-vous certain de vouloir supprimer ce raccourci ?"
-
-#: ../midori/midori-view.c:4091
+#: ../midori/midori-view.c:4294
#, c-format
msgid "No documentation installed"
msgstr "Pas de documentation installée"
-#: ../midori/midori-view.c:4167
+#: ../midori/midori-view.c:4371
msgid "Midori doesn't store any personal data:"
msgstr "Midori ne stocke aucune donnée personnelle :"
-#: ../midori/midori-view.c:4168
+#: ../midori/midori-view.c:4372
msgid "No history or web cookies are being saved."
msgstr "Aucun historique ou cookie n'est enregistré."
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4373
msgid "Extensions are disabled."
msgstr "Les extensions sont désactivées."
-#: ../midori/midori-view.c:4170
+#: ../midori/midori-view.c:4374
msgid "HTML5 storage, local database and application caches are disabled."
-msgstr "Le stockage HTML5, la base de donnée locale et le cache de l'application sont désactivés."
+msgstr ""
+"Le stockage HTML5, la base de donnée locale et le cache de l'application "
+"sont désactivés."
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:4375
msgid "Midori prevents websites from tracking the user:"
msgstr "Midori empêche les sites web de traquer l'utilisateur :"
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:4376
msgid "Referrer URLs are stripped down to the hostname."
msgstr "Les URL référantes sont réduites au nom d'hôte."
-#: ../midori/midori-view.c:4173
-#, fuzzy
+#: ../midori/midori-view.c:4377
msgid "DNS prefetching is disabled."
-msgstr "Le DNS prefetching est désactivé."
+msgstr "Le DNS préchargé est désactivé."
-#: ../midori/midori-view.c:4174
+#: ../midori/midori-view.c:4378
msgid "The language and timezone are not revealed to websites."
msgstr "La langue et le fuseau horaire ne sont pas révélés aux sites web."
-#: ../midori/midori-view.c:4175
+#: ../midori/midori-view.c:4379
msgid "Flash and other Netscape plugins cannot be listed by websites."
-msgstr "Les sites web ne peuvent pas connaître les greffons Netscape (tels que Flash) installés."
+msgstr ""
+"Les sites web ne peuvent pas connaître les greffons Netscape (tels que "
+"Flash) installés."
-#: ../midori/midori-view.c:4224
+#: ../midori/midori-view.c:4465
msgid "Version numbers in brackets show the version used at runtime."
-msgstr "Les numéros de version entre parenthèses montrent la version que vous utilisez."
+msgstr ""
+"Les numéros de version entre parenthèses montrent la version que vous "
+"utilisez."
-#: ../midori/midori-view.c:4280
+#: ../midori/midori-view.c:4514
msgid "Page loading delayed"
msgstr "Chargement de la page différé"
-#: ../midori/midori-view.c:4281
+#: ../midori/midori-view.c:4515
msgid "Loading delayed either due to a recent crash or startup preferences."
-msgstr "Chargement différé, soit en raison d'un incident récent soit des préférences de démarrage."
+msgstr ""
+"Chargement différé, soit en raison d'un incident récent soit des préférences "
+"de démarrage."
-#: ../midori/midori-view.c:4282
+#: ../midori/midori-view.c:4516
msgid "Load Page"
msgstr "Charger la page"
-#: ../midori/midori-view.c:4448
+#: ../midori/midori-view.c:4683
msgid "Blank page"
msgstr "Page vierge"
-#: ../midori/midori-view.c:4710
+#: ../midori/midori-view.c:4947
msgid "_Duplicate Tab"
msgstr "_Dupliquer l'onglet"
-#: ../midori/midori-view.c:4715
+#: ../midori/midori-view.c:4952
msgid "Show Tab _Label"
msgstr "Afficher l'intitulé de l'onglet"
-#: ../midori/midori-view.c:4715
+#: ../midori/midori-view.c:4952
msgid "Show Tab _Icon Only"
msgstr "Afficher l'icône de l'onglet uniquement"
-#: ../midori/midori-view.c:4721
-msgid "Close ot_her Tabs"
-msgstr "Fermer les _autres onglets"
+#: ../midori/midori-view.c:4959
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Fermer l'_autre onglet"
+msgstr[1] "Fermer les _autres onglets"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5534
+#: ../midori/midori-view.c:5779
msgid "previous"
msgstr "précedent"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5553
+#: ../midori/midori-view.c:5798
msgid "next"
msgstr "suivant"
-#: ../midori/midori-view.c:5566
+#: ../midori/midori-view.c:5811
msgid "Print background images"
msgstr "Imprimer les images d'arrière-plan"
-#: ../midori/midori-view.c:5567
+#: ../midori/midori-view.c:5812
msgid "Whether background images should be printed"
msgstr "Indique s'il faut imprimer les images d'arrière-plan"
-#: ../midori/midori-view.c:5599
+#: ../midori/midori-view.c:5844
msgid "Features"
msgstr "Fonctionnalités"
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-speeddial.vala:142
+msgid "Speed Dial"
+msgstr "Appel rapide"
+
+#: ../midori/midori-speeddial.vala:143 ../midori/midori-speeddial.vala:229
+msgid "Click to add a shortcut"
+msgstr "Cliquez pour ajouter un raccourci"
+
+#: ../midori/midori-speeddial.vala:144
+msgid "Enter shortcut address"
+msgstr "Entrez l'adresse du raccourci"
+
+#: ../midori/midori-speeddial.vala:145
+msgid "Enter shortcut title"
+msgstr "Entrez le titre du raccourci"
+
+#: ../midori/midori-speeddial.vala:146
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Ètes-vous certain de vouloir supprimer ce raccourci ?"
+
+#: ../midori/midori-preferences.c:299
msgid "Startup"
msgstr "Démarrage"
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:305
+msgid "Homepage:"
+msgstr "Page d'accueil :"
+
+#: ../midori/midori-preferences.c:313
msgid "Use _current page"
msgstr "Utiliser la page _actuelle"
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:317
msgid "Use current page as homepage"
msgstr "Utiliser la page courante comme page d'accueil"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:326
msgid "Fonts"
msgstr "Polices"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:329
msgid "Proportional Font Family"
msgstr "Police proportionnelle"
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:333
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:333
+#: ../midori/midori-preferences.c:336
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:335
+#: ../midori/midori-preferences.c:338
msgid "Fixed-width Font Family"
msgstr "Police à largeur fixe"
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:342
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:342
+#: ../midori/midori-preferences.c:345
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:344
+#: ../midori/midori-preferences.c:347
msgid "Minimum Font Size"
msgstr "Taille minimale de la police"
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:351
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:359
+#: ../midori/midori-preferences.c:362
msgid "Behavior"
msgstr "Comportement"
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Charger les images automatiquement"
+
+#: ../midori/midori-preferences.c:369
+msgid "Enable Spell Checking"
+msgstr "Activer la vérification de l'orthographe"
+
+#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Activer les scripts"
+
+#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Activer les greffons Netscape"
+
+#: ../midori/midori-preferences.c:391
+msgid "Zoom Text and Images"
+msgstr "Agrandir le texte et les images"
+
+#: ../midori/midori-preferences.c:394
msgid "Allow scripts to open popups"
msgstr "Autoriser les scripts à ouvrir des popups"
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:395
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"
+msgstr ""
+"Indique si les scripts sont autorisés à ouvrir des fenêtres intempestives "
+"(popups) automatiquement"
+
+#: ../midori/midori-preferences.c:401
+msgid "Kinetic scrolling"
+msgstr "Défilement cinétique"
+
+#: ../midori/midori-preferences.c:402
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr ""
+"Indique si le défilement doit se déplacer cinétiquement en fonction de la "
+"vitesse"
+
+#: ../midori/midori-preferences.c:407
+msgid "Middle click opens Selection"
+msgstr "Un clic milieu ouvre la sélection"
+
+#: ../midori/midori-preferences.c:408
+msgid "Load an address from the selection via middle click"
+msgstr ""
+"Charger l'addresse de la sélection avec un clic du bouton central de la "
+"souris"
+
+#: ../midori/midori-preferences.c:414
+msgid "Enable WebGL support"
+msgstr "Activer le support WebGL"
+
+#: ../midori/midori-preferences.c:419
+msgid "Flash window on background tabs"
+msgstr "Clignoter en cas d'onglet en arrière-plan"
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Enregistrer les téléchargements dans :"
#. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:435
msgid "Browsing"
msgstr "Navigation"
+#: ../midori/midori-preferences.c:451
+msgid "Close Buttons on Tabs"
+msgstr "Boutons de fermeture sur les onglets"
+
+#: ../midori/midori-preferences.c:455
+msgid "Always Show Tabbar"
+msgstr "Toujours afficher la barre d'onglets"
+
+#: ../midori/midori-preferences.c:459
+msgid "Open Tabs next to Current"
+msgstr "Ouvrir les onglets à côté de l'onglet actif"
+
+#: ../midori/midori-preferences.c:460
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actif ou "
+"après le dernier"
+
+#: ../midori/midori-preferences.c:463
+msgid "Open tabs in the background"
+msgstr "Ouvrir les onglets en arrière-plan"
+
+#: ../midori/midori-preferences.c:467
+msgid "Text Editor"
+msgstr "Éditeur de texte"
+
+#: ../midori/midori-preferences.c:472
+msgid "News Aggregator"
+msgstr "Agrégateur de flux"
+
#. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:479
msgid "Network"
msgstr "Réseau"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:481
+msgid "Proxy server"
+msgstr "Serveur mandataire"
+
+#: ../midori/midori-preferences.c:486
msgid "Hostname"
msgstr "Nom de l'hôte"
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:494
+msgid "Port"
+msgstr "Port"
+
+#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509
+msgid "The maximum size of cached pages on disk"
+msgstr "La taille maximale des pages mises en cache sur le disque"
+
+#: ../midori/midori-preferences.c:511
msgid "MB"
msgstr "Mo"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Add search engine"
msgstr "Ajouter un moteur de recherche"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Edit search engine"
msgstr "Modifier le moteur de recherche"
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:985
msgid "_Name:"
msgstr "_Nom :"
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1000
msgid "_Description:"
msgstr "_Description :"
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Icône :"
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Adresse :"
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1032
msgid "_Token:"
msgstr "_Identifiant :"
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1330
msgid "Manage Search Engines"
msgstr "Gestion des moteurs de recherche"
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1432
msgid "Use as _default"
msgstr "Par dé_faut"
-#: ../midori/sokoke.c:354
+#: ../midori/sokoke.c:353
msgid "Open with"
msgstr "Ouvrir avec"
-#: ../midori/sokoke.c:362
+#: ../midori/sokoke.c:361
#, c-format
msgid "Choose an application or command to open \"%s\":"
msgstr "Choisir une application ou une commande pour ouvrir \"%s\":"
-#: ../midori/sokoke.c:403
-#: ../midori/sokoke.c:413
-#: ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470
-#: ../midori/sokoke.c:484
+#: ../midori/sokoke.c:475 ../midori/sokoke.c:489
msgid "Could not run external program."
msgstr "Impossible de lancer le programme externe."
-#: ../midori/sokoke.c:1595
+#: ../midori/sokoke.c:1327
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d heure"
msgstr[1] "%d heures"
-#: ../midori/sokoke.c:1596
+#: ../midori/sokoke.c:1328
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minute"
msgstr[1] "%d minutes"
-#: ../midori/sokoke.c:1597
+#: ../midori/sokoke.c:1329
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2079,142 +1913,149 @@ msgstr[0] "%d seconed"
msgstr[1] "%d secondes"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605
-#: ../panels/midori-transfers.c:268
+#: ../midori/sokoke.c:1337 ../panels/midori-transfers.c:268
#, c-format
msgid "%s of %s"
msgstr "%s sur %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
+#: ../midori/sokoke.c:1346
msgid "?B"
msgstr "?o"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
+#: ../midori/sokoke.c:1349
#, c-format
msgid " (%s/s)"
msgstr "(%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/sokoke.c:1366
#, c-format
msgid " - %s remaining"
msgstr " - %s restantes"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:265
msgid "_Inline Find:"
msgstr "_Recherche rapide :"
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:287
msgid "Previous"
msgstr "Précedent"
-#: ../toolbars/midori-findbar.c:323
+#: ../toolbars/midori-findbar.c:293
msgid "Next"
msgstr "Suivant"
-#: ../toolbars/midori-findbar.c:327
+#: ../toolbars/midori-findbar.c:297
msgid "Match Case"
msgstr "Sensible à la casse"
-#: ../toolbars/midori-findbar.c:336
+#: ../toolbars/midori-findbar.c:306
msgid "Highlight Matches"
msgstr "Surligner les résultats"
-#: ../toolbars/midori-findbar.c:347
+#: ../toolbars/midori-findbar.c:317
msgid "Close Findbar"
msgstr "Fermer la barre de recherche"
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:124
#, c-format
msgid "The file '%s ' has been downloaded."
msgstr "Le fichier « %s » a été téléchargé."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:129
msgid "Transfer completed"
msgstr "Transfert terminé"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:198
msgid "The downloaded file is erroneous."
msgstr "Le fichier téléchargé est erroné."
-#: ../toolbars/midori-transferbar.c:194
-msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards."
-msgstr "L'emprunte fournie avec le lien ne correspond pas. Cela signifie que le fichier est probablement incomplet ou a été modifié par la suite."
+#: ../toolbars/midori-transferbar.c:199
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
+msgstr ""
+"L'emprunte fournie avec le lien ne correspond pas. Cela signifie que le "
+"fichier est probablement incomplet ou a été modifié par la suite."
-#: ../toolbars/midori-transferbar.c:334
-#: ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:342 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Effacer tout"
-#: ../toolbars/midori-transferbar.c:371
-#: ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:379 ../toolbars/midori-transferbar.c:381
msgid "Some files are being downloaded"
msgstr "Des fichiers sont en cours de téléchargement"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:385
msgid "_Quit Midori"
msgstr "_Quitter Midori"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:387
msgid "The transfers will be cancelled if Midori quits."
msgstr "Les transferts seront annulés si Midori se ferme."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Signets"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Échec de l'ajout du signet : %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Échec à l'ajout du signet : %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Modifier le signet sélectionné"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Supprimer le signet sélectionné"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Ajouter un nouveau dossier"
-#: ../panels/midori-bookmarks.c:592
-#: ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Séparateur "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Recherche dans signets"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Historique"
-#: ../panels/midori-history.c:158
-#: ../panels/midori-history.c:189
+#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
msgid "Today"
msgstr "Aujourd'hui"
-#: ../panels/midori-history.c:160
-#: ../panels/midori-history.c:191
+#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
msgid "Yesterday"
msgstr "Hier"
-#: ../panels/midori-history.c:162
-#: ../panels/midori-history.c:186
+#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "Il y a %d jour"
msgstr[1] "Il y a %d jours"
-#: ../panels/midori-history.c:165
-#: ../panels/midori-history.c:184
+#: ../panels/midori-history.c:165 ../panels/midori-history.c:184
msgid "A week ago"
msgstr "Il y a une semaine"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Impossible de supprimer l'élément de l'historique : %s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Ètes-vous certain de vouloir effacer tout l'historique ?"
@@ -2231,15 +2072,20 @@ msgstr "Supprimer l'élément sélectionné dans l'historique"
msgid "Clear the entire history"
msgstr "Effacer tout l'historique"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Historique de recherche"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Transferts"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
msgstr "Ouvrir le _dossier de destination"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
msgstr "Copier l'_adresse du lien"
@@ -2281,170 +2127,176 @@ msgstr "L'icône prédéfinie « %s » n'a pu être chargée."
msgid "Animation frames are broken"
msgstr "Les trames d'animation sont corrompues"
-#: ../katze/katze-utils.c:445
-#: ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "La propriété « %s » n'est pas valide pour %s"
-#: ../katze/katze-utils.c:491
-#: ../katze/katze-utils.c:520
-#: ../extensions/addons.c:308
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:309
msgid "Choose file"
msgstr "Choisissez un fichier"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Choisissez un dossier"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Aucun"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 heure"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 jour"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 semaine"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 mois"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 an"
-#: ../katze/katze-preferences.c:91
-#: ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Préférences pour %s"
-#: ../extensions/adblock.c:473
+#: ../katze/midori-uri.vala:158
+msgid "MD5-Checksum:"
+msgstr "Somme de contrôle MD5 :"
+
+#: ../katze/midori-uri.vala:165
+msgid "SHA1-Checksum:"
+msgstr "Somme de contrôle SHA1 :"
+
+#: ../extensions/adblock.c:474
msgid "Configure Advertisement filters"
msgstr "Configurer les filtres de publicité"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:507
#, 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:873
+#: ../extensions/adblock.c:921
msgid "Edit rule"
msgstr "Modifier les règles"
-#: ../extensions/adblock.c:887
+#: ../extensions/adblock.c:935
msgid "_Rule:"
msgstr "_Règles :"
-#: ../extensions/adblock.c:941
+#: ../extensions/adblock.c:989
msgid "Bl_ock image"
msgstr "_Bloquer l'image"
-#: ../extensions/adblock.c:946
+#: ../extensions/adblock.c:994
msgid "Bl_ock link"
msgstr "B_loquer le lien"
-#: ../extensions/adblock.c:1662
+#: ../extensions/adblock.c:1772
msgid "Advertisement blocker"
msgstr "Bloqueur de publicités"
-#: ../extensions/adblock.c:1663
+#: ../extensions/adblock.c:1773
msgid "Block advertisements according to a filter list"
msgstr "Bloquer les publicités en fonction d'une liste de filtres"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
-msgid "This page appears to contain a user script. Do you wish to install it?"
-msgstr "Cette page semble contenir un script utilisateur. Voulez-vous l'installer?"
-
#: ../extensions/addons.c:222
+msgid "This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+"Cette page semble contenir un script utilisateur. Voulez-vous l'installer?"
+
+#: ../extensions/addons.c:223
msgid "_Install user script"
msgstr "_Installer le script utilisateur"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
-msgid "This page appears to contain a user style. Do you wish to install it?"
-msgstr "Cette page semble contenir un style utilisateur. Voulez-vous l'installer?"
-
#: ../extensions/addons.c:228
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr ""
+"Cette page semble contenir un style utilisateur. Voulez-vous l'installer?"
+
+#: ../extensions/addons.c:229
msgid "_Install user style"
msgstr "_Installer un style utilisateur"
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
msgid "Don't install"
msgstr "Ne pas installer"
-#: ../extensions/addons.c:319
-#: ../extensions/addons.c:681
+#: ../extensions/addons.c:320 ../extensions/addons.c:675
msgid "Userscripts"
msgstr "Scripts utilisateur"
-#: ../extensions/addons.c:324
-#: ../extensions/addons.c:683
+#: ../extensions/addons.c:325 ../extensions/addons.c:677
msgid "Userstyles"
msgstr "Styles utilisateur"
-#: ../extensions/addons.c:380
-#: ../extensions/addons.c:459
+#: ../extensions/addons.c:371 ../extensions/addons.c:450
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Erreur"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:412
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Ètes-vous certain de vouloir supprimer '%s' ?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:418
msgid "Delete user script"
msgstr "Supprime le script utilisateur"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:419
msgid "Delete user style"
msgstr "Supprimer un style utilisateur"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:422
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Le fichier « %s » sera définitivement supprimé."
-#: ../extensions/addons.c:570
-#: ../extensions/addons.c:647
+#: ../extensions/addons.c:564 ../extensions/addons.c:641
msgid "Open in Text Editor"
msgstr "Ouvrir dans l'éditeur de texte"
-#: ../extensions/addons.c:572
-#: ../extensions/addons.c:656
+#: ../extensions/addons.c:566 ../extensions/addons.c:650
msgid "Open Target Folder"
msgstr "Ouvrir le _dossier de destination"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:632
msgid "Add new addon"
msgstr "Ajouter une extension"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:658
msgid "Remove selected addon"
msgstr "Supprimer l'extension sélectionnée"
-#: ../extensions/addons.c:1696
-#: ../extensions/addons.c:1914
+#: ../extensions/addons.c:1686 ../extensions/addons.c:1904
msgid "User addons"
msgstr "Extensions utilisateur"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1816
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Impossible de surveiller le dossier « %s » : %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1905
msgid "Support for userscripts and userstyles"
msgstr "Support des scripts et styles utilisateur"
@@ -2466,8 +2318,12 @@ msgid "Delete All"
msgstr "Supprimer tous"
#: ../extensions/cookie-manager/cookie-manager-page.c:105
-msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter."
-msgstr "Supprimer tous les fichiers témoins visibles. Si un filtre est appliqué, seuls les fichiers témoins correspondant au filtre seront effacés."
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"Supprimer tous les fichiers témoins visibles. Si un filtre est appliqué, "
+"seuls les fichiers témoins correspondant au filtre seront effacés."
#: ../extensions/cookie-manager/cookie-manager-page.c:120
msgid "Expand All"
@@ -2527,26 +2383,21 @@ msgstr ""
"Domaine : %s\n"
"Fichiers témoins : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Nom"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "_Afficher tous"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "_Masquer tous"
-# manque un raccourcis Alt+X
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filtre :"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter"
-msgstr "Entrer un filtre pour n'afficher que les cookies dont le nom ou le domaine correspondent au filtre entré."
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Recherche les cookies par nom ou domaine"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2566,11 +2417,14 @@ msgstr "Copier les adresses de tous les onglets vers le presse-papiers"
#: ../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: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:387
@@ -2612,7 +2466,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."
@@ -2620,11 +2475,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:131
#, c-format
@@ -2678,12 +2536,13 @@ msgid "Never for this page"
msgstr "Jamais sur cette page"
#: ../extensions/formhistory/formhistory.c:437
+#, fuzzy
msgid "Toggle form history state"
-msgstr ""
+msgstr "Basculer vers le formulaire état historique "
#: ../extensions/formhistory/formhistory.c:438
msgid "Activate or deactivate form history for the current tab."
-msgstr ""
+msgstr "Activer ou désactiver l'historique de l'onglet courant."
#: ../extensions/formhistory/formhistory.c:549
#: ../extensions/formhistory/formhistory.c:553
@@ -2692,8 +2551,11 @@ msgid "Failed to execute database statement: %s\n"
msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n"
#: ../extensions/formhistory/formhistory.c:629
+#, fuzzy
msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
msgstr ""
+"Active suelement l'historique via le raccourci clavier (Ctrl+Maj+F) par "
+"onglet"
#: ../extensions/formhistory/formhistory.c:668
msgid "Form history filler"
@@ -2714,9 +2576,9 @@ msgid "There are no unvisited tabs"
msgstr "Ils n'y a pas d'onglets qui n'ont pas été visités"
#: ../extensions/history-list.vala:235
-#, c-format
+#, fuzzy, c-format
msgid "History-List"
-msgstr ""
+msgstr "Liste historique"
#: ../extensions/history-list.vala:275
msgid "Tab closing behavior"
@@ -2752,11 +2614,11 @@ msgstr "Onglet précédent dans l'historique"
#: ../extensions/history-list.vala:443
msgid "Display tab in background (History List)"
-msgstr ""
+msgstr "Afficher l'onglet en arrière-plan (liste de l'historique)"
#: ../extensions/history-list.vala:444
msgid "Display the current selected tab in background"
-msgstr ""
+msgstr "Afficher les onglets sélectionnés en arrière-plan"
#: ../extensions/history-list.vala:569
msgid "History List"
@@ -2764,7 +2626,7 @@ msgstr "Liste de l'historique des onglets"
#: ../extensions/history-list.vala:570
msgid "Move to the last used tab when switching or closing tabs"
-msgstr ""
+msgstr "Aller au onglets utilisé quand on change ou ferme des onglets"
#: ../extensions/mouse-gestures.c:301
msgid "Mouse Gestures"
@@ -2784,7 +2646,7 @@ msgstr "Personnaliser les raccourcis clavier"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "_Personnaliser les raccourcis..."
+msgstr "_Personnaliser les raccourcis…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2802,36 +2664,36 @@ msgstr "Horloge de barre d'état"
msgid "Display date and time in the statusbar"
msgstr "Afficher la date et l'heure dans la barre d'état"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Images"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Scripts"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Greffons Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Fonctionnalités dans la barre d'état"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
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:593
-#: ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Panneau d'onglets"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "P_anneau d'onglets"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Afficher les onglets dans un panneau vertical"
@@ -2843,357 +2705,262 @@ msgstr "Onglets sans intitulé"
msgid "New tabs have no label by default"
msgstr "Les nouveaux onglets n'ont qu'une icône par défaut"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Personnaliser la barre d'outils"
-#: ../extensions/toolbar-editor.c:409
-msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop."
+#: ../extensions/toolbar-editor.c:411
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
msgstr ""
"Sélectionnez les éléments à afficher sur la barre d'outils.\n"
"Ils peuvent être réorganisés par glisser-déposer."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Éléments disponibles"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Éléments affichés"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Personnaliser la barre d'outi_ls..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "Personnaliser la barre d'outi_ls…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Personnaliser..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Éditeur de barre d'outils"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Éditer facilement la disposition de la barre d'outils"
-#: ../extensions/web-cache.c:463
+#: ../extensions/web-cache.c:462
msgid "Cache HTTP communication on disk"
msgstr "Mettre en cache les communication HTTP sur le disque"
-#~ msgid "The specified configuration folder is invalid."
-#~ msgstr "Le dossier de configuration specifié n'est pas valide."
+#~ msgid "Remember last window size"
+#~ msgstr "Se souvenir de la taille de la fenêtre"
-#~ msgid "Lightweight web browser"
-#~ msgstr "Navigateur Internet léger"
+#~ msgid "Whether to save the last window size"
+#~ msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre"
-#~ msgid "Cookies"
-#~ msgstr "Fichiers témoins / Cookies"
+#~ msgid "Last window width"
+#~ msgstr "Dernière largeur de la fenêtre"
-#~ msgid "'Flash' Cookies"
-#~ msgstr "Cookies « Flash »"
+#~ msgid "The last saved window width"
+#~ msgstr "La dernière largeur enregistrée de la fenêtre"
-#~ msgid "HTML5 _Databases"
-#~ msgstr "_Base de données HTML5"
+#~ msgid "Last window height"
+#~ msgstr "Dernière hauteur de la fenêtre"
-#~ msgid "Offline Application Cache"
-#~ msgstr "Cache des applications hors-ligne"
+#~ msgid "The last saved window height"
+#~ msgstr "La dernière hauteur enregistrée de la fenêtre"
-#~ msgid "Not available: %s"
-#~ msgstr "Non disponible : %s"
+#~ msgid "Last panel position"
+#~ msgstr "Dernière position du panneau"
-#~ msgid "Resource files not installed"
-#~ msgstr "Fichiers ressources non installés"
+#~ msgid "The last saved panel position"
+#~ msgstr "La dernière position enregistrée du panneau"
-#~ msgid "Don't save any private data while browsing"
-#~ msgstr "Ne pas enregistrer de données privées durant la navigation"
+#~ msgid "Last panel page"
+#~ msgstr "Dernière page du panneau"
-#~ msgid "Add shortcut to speed dial"
-#~ msgstr "Ajouter un raccourci à la page d'appel rapide"
+#~ msgid "The last saved panel page"
+#~ msgstr "La dernière page enregistrée du panneau"
-#~ msgid "Add shortcut to the desktop"
-#~ msgstr "Ajouter un raccourci sur le bureau"
+#~ msgid "Last Web search"
+#~ msgstr "Dernière recherche sur Internet"
-#~ msgid "Create a launcher"
-#~ msgstr "Créer un lanceur"
+#~ msgid "The last saved Web search"
+#~ msgstr "La dernière recherche sur Internet enregistrée"
-#~ msgid "Subscribe to this news feed"
-#~ msgstr "Souscrire à ce flux de _nouvelles"
-
-#~ msgid "Close this window"
-#~ msgstr "Fermer cette fenêtre"
-
-#~ msgid "Close all open windows"
-#~ msgstr "Fermer toutes les fenêtres ouvertes"
-
-#~ msgid "Undo the last modification"
-#~ msgstr "Annuler la dernière modification"
-
-#~ msgid "Redo the last modification"
-#~ msgstr "Refaire la dernière modification"
-
-#~ msgid "Cut the selected text"
-#~ msgstr "Couper le texte sélectionné"
-
-#~ msgid "Copy the selected text"
-#~ msgstr "Copier le texte sélectionné"
-
-#~ msgid "Paste text from the clipboard"
-#~ msgstr "Coller le texte à partir du presse-papiers"
-
-#~ msgid "Delete the selected text"
-#~ msgstr "Supprimer le texte sélectionné"
-
-#~ msgid "Select all text"
-#~ msgstr "Sélectionner tout le texte"
-
-#~ msgid "Find the next occurrence of a word or phrase"
-#~ msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase"
-
-#~ msgid "Find the previous occurrence of a word or phrase"
-#~ msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase"
-
-#~ msgid "Reset the zoom level"
-#~ msgstr "Réinitialiser le niveau d'agrandissement"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "Affiche le code source de la page"
-
-#~ msgid "Scroll to the left"
-#~ msgstr "Défilement vers la gauche"
-
-#~ msgid "Scroll down"
-#~ msgstr "Défilement vers le bas"
-
-#~ msgid "Scroll up"
-#~ msgstr "Défilement vers le haut"
-
-#~ msgid "Scroll to the right"
-#~ msgstr "Défilement vers la droite"
-
-#~ msgid "Delete the contents of the trash"
-#~ msgstr "Supprimer le contenu de la corbeille"
-
-#~ msgid "Open the last closed tab"
-#~ msgstr "Ouvrir le dernier onglet fermé"
-
-#~ msgid "Add a new bookmark folder"
-#~ msgstr "Ajouter un nouveau dossier de signets"
-
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Ajouter, modifier et supprimer des moteurs de recherche..."
-
-#~ msgid "Clear private data..."
-#~ msgstr "Effacer les informations privées..."
-
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr ""
-#~ "Inspecter les détails de la page et accéder aux outils développeur..."
-
-#~ msgid "Switch to the previous tab"
-#~ msgstr "Bascule vers l'onglet précédent"
-
-#~ msgid "Switch to the next tab"
-#~ msgstr "Bascule vers l'onglet suivant"
-
-#~ msgid "Move tab behind the previous tab"
-#~ msgstr "Basculer vers l'onglet précédent"
-
-#~ msgid "Move tab in front of the next tab"
-#~ msgstr "Basculer vers l'onglet suivant"
-
-#~ msgid "Focus the current tab"
-#~ msgstr "Mettre le focus sur l'onglet actuel"
-
-#~ msgid "Cycle focus between views"
-#~ msgstr "Changer le focus d'une vue à l'autre, en boucle"
-
-#~ msgid "Only show the icon of the current tab"
-#~ msgstr "Afficher uniquement l'icône de l'onglet courant"
-
-#~ msgid "Duplicate the current tab"
-#~ msgstr "Duplique l'onglet actif"
-
-#~ msgid "Close all tabs except the current tab"
-#~ msgstr "Fermer tous les onglets sauf l'onglet actuel"
-
-#~ msgid "Open the tabs saved in the last session"
-#~ msgstr "Ouvrir les onglets enregistrés dans la dernière session"
-
-#~ msgid "Show the Frequently Asked Questions"
-#~ msgstr "Afficher la foire aux questions"
-
-#~ msgid "Open Midori's bug tracker"
-#~ msgstr "Ouvrir l'outil de suivi d'anomalies de Midori"
-
-#~ msgid "Show information about the program"
-#~ msgstr "Afficher les informations sur le programme"
-
-#~ msgid "Show menubar"
+#~ msgid "Show Menubar"
#~ msgstr "Afficher la barre de menu"
-#~ msgid "Show navigationbar"
+#~ msgid "Whether to show the menubar"
+#~ msgstr "Indique s'il faut afficher la barre de menu"
+
+#~ msgid "Show Navigationbar"
#~ msgstr "Afficher la barre de navigation"
-#~ msgid "Show sidepanel"
-#~ msgstr "Afficher le panneau latéral"
+#~ msgid "Whether to show the navigationbar"
+#~ msgstr "Indique s'il faut afficher la barre de navigation"
-#~ msgid "Show bookmarkbar"
-#~ msgstr "Afficher la barre des signets"
+#~ msgid "Show Bookmarkbar"
+#~ msgstr "Afficher la barre des _signets"
-#~ msgid "Show statusbar"
+#~ msgid "Whether to show the bookmarkbar"
+#~ msgstr "Indique s'il faut afficher la barre des signets"
+
+#~ msgid "Show Panel"
+#~ msgstr "Afficher le panneau"
+
+#~ msgid "Whether to show the panel"
+#~ msgstr "Indique s'il faut afficher le panneau"
+
+#~ msgid "Show Statusbar"
#~ msgstr "Afficher la barre d'état"
-#~ msgid "MD5-Checksum:"
-#~ msgstr "Emprunte MD5 :"
+#~ msgid "Whether to show the statusbar"
+#~ msgstr "Indique s'il faut afficher la barre d'état"
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "Emprunte SHA1 :"
+#~ msgid "Toolbar Items"
+#~ msgstr "Éléments de la barre d'outils"
-#~ msgid "Web Cookies"
-#~ msgstr "Fichiers témoins"
+#~ msgid "The items to show on the toolbar"
+#~ msgstr "Les éléments à afficher dans la barre d'outils"
-#~ msgid "Delete old cookies after 1 hour"
-#~ msgstr "Effacer les anciens cookies après 1 heure"
+#~ msgid "Compact Sidepanel"
+#~ msgstr "Panneau latéral compact"
-#~ msgid "Delete old cookies after 1 week"
-#~ msgstr "Effacer les anciens cookies après 1 semaine"
+#~ msgid "Whether to make the sidepanel compact"
+#~ msgstr "Indique s'il faut mettre le panneau latéral compact"
-#~ msgid "Delete old cookies after 1 month"
-#~ msgstr "Effacer les anciens cookies après 1 mois"
+#~ msgid "Align sidepanel on the right"
+#~ msgstr "Aligner le panneau latéral sur la droite"
-#~ msgid "Delete old cookies after 1 year"
-#~ msgstr "Effacer les anciens cookies après 1 an"
+#~ msgid "Whether to align the sidepanel on the right"
+#~ msgstr "Indique s'il faut aligner le panneau latéral sur la droite"
-#~ msgid "days"
-#~ msgstr "jours"
+#~ msgid "Open panels in separate windows"
+#~ msgstr "Ouvrir les panneaux dans une fenêtre séparée"
-#~ msgid "Reset the last _session"
-#~ msgstr "Réinitialiser la dernière _session"
-
-#~ msgid "No filename specified"
-#~ msgstr "Aucun nom de fichier spécifié"
-
-#~ msgid "All cookies"
-#~ msgstr "Tous les fichiers témoins"
-
-#~ msgid "Session cookies"
-#~ msgstr "Témoins de session"
-
-#~ msgid "Show Transferbar"
-#~ msgstr "Afficher la barre des transferts"
-
-#~ msgid "Whether to show the transferbar"
-#~ msgstr "Indique s'il faut afficher la barre des transferts"
-
-#~ msgid "Search engines in location completion"
-#~ msgstr "Moteurs de recherche dans la complétion"
-
-#~ msgid "Whether to show search engines in the location completion"
+#~ msgid "Whether to always open panels in separate windows"
#~ msgstr ""
-#~ "Indique s'il faut afficher les moteurs de recherche dans les résultats de "
-#~ "complétion de la barre d'adresse"
+#~ "Indique s'il faut toujours ouvrir les panneaux dans des fenêtres séparées"
-#~ msgid "Show operating controls of the panel"
-#~ msgstr "Afficher les élements de contrôle du panneau"
+#~ msgid "What to do when Midori starts"
+#~ msgstr "Que faire au lancement de Midori"
-#~ msgid "Whether to show the operating controls of the panel"
-#~ msgstr "Indique s'il faut afficher les élements de contrôle du panneau"
+#~ msgid "The homepage"
+#~ msgstr "La page d'accueil"
-#~ msgid "Show speed dial in new tabs"
-#~ msgstr "Appel rapide dans les nouveaux onglets"
+#~ msgid "Show crash dialog"
+#~ msgstr "Fenêtre de fermeture inattendue"
-#~ msgid "Show speed dial in newly opened tabs"
-#~ msgstr "Afficher la page d'appel rapide dans les nouveaux onglets"
+#~ msgid "The folder downloaded files are saved to"
+#~ msgstr "Le dossier où enregistrer les fichiers téléchargés"
-#~ msgid "Download Manager"
-#~ msgstr "Gestionnaire de téléchargements"
+#~ msgid "An external text editor"
+#~ msgstr "Un éditeur de texte externe"
-#~ msgid "An external download manager"
-#~ msgstr "Un gestionnaire de téléchargements externe"
+#~ msgid "An external news aggregator"
+#~ msgstr "Un agrégateur de flux externe"
-#~ msgid "Open external pages in:"
-#~ msgstr "Ouvrir les pages externes dans :"
+#~ msgid "Location entry Search"
+#~ msgstr "Recherche depuis la barre d'adresse"
-#~ msgid "Where to open externally opened pages"
-#~ msgstr "Lieu où les pages externes doivent être ouvertes"
+#~ msgid "The search to perform inside the location entry"
+#~ msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse"
-#~ msgid "Accept cookies"
-#~ msgstr "Accepter les cookies"
+#~ msgid "The preferred character encoding"
+#~ msgstr "Encodage favori des caractères"
-#~ msgid "What type of cookies to accept"
-#~ msgstr "Type de fichiers témoins (cookies) à accepter"
+#~ msgid "Always show the tabbar"
+#~ msgstr "Toujours afficher la barre d'onglets"
-#~ msgid "Maximum cookie age"
-#~ msgstr "Âge maximal des cookies"
+#~ msgid "Whether tabs have close buttons"
+#~ msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets"
-#~ msgid "Maximum history age"
-#~ msgstr "Âge maximal de l'historique"
+#~ msgid "Where to open new pages"
+#~ msgstr "Lieu où les nouvelles pages doivent être ouvertes"
-#~ msgid "Remember last downloaded files"
-#~ msgstr "Se souvenir des derniers fichiers téléchargés"
+#~ msgid "Whether to open new tabs in the background"
+#~ msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan"
-#~ msgid "Whether the last downloaded files are saved"
+#~ msgid "Open popups in tabs"
+#~ msgstr "Ouvrir les fenêtre intempestives dans des onglets"
+
+#~ msgid "Whether to open popup windows in tabs"
#~ msgstr ""
-#~ "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés"
+#~ "Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des "
+#~ "onglets"
-#~ msgid "Not found - %s"
-#~ msgstr "Page introuvable - %s"
+#~ msgid "Load and display images automatically"
+#~ msgstr "Charger et afficher les images automatiquement"
-#~ msgid "Set number of columns and rows"
-#~ msgstr "Choisir le nombre de colonnes et de lignes"
+#~ msgid "Enable embedded scripting languages"
+#~ msgstr "Active la prise en charge interne des scripts"
-#~ msgid "Enter number of columns and rows:"
-#~ msgstr "Entrer le nombre de colonnes et de lignes"
+#~ msgid "Enable embedded Netscape plugin objects"
+#~ msgstr "Active la prise en charge interne des greffons Netscape"
-#~ msgid "Invalid input for the size of the speed dial"
-#~ msgstr "Entrée invalide pour la taille de la page d'appel rapide"
+#~ msgid "Enable spell checking while typing"
+#~ msgstr "Activer la vérification de l'orthographe lors de la saisie"
-#~ msgid "Thumb size:"
-#~ msgstr "Taille des vignettes :"
+#~ msgid "Enable HTML5 database support"
+#~ msgstr "Activer le support de base de données HTML5"
-#~ msgid "Small"
-#~ msgstr "Petites"
+#~ msgid "Whether to enable HTML5 database support"
+#~ msgstr "Indique s'il faut activer le support de base de données de HTML5"
-#~ msgid "Medium"
-#~ msgstr "Moyennes"
+#~ msgid "Whether to enable HTML5 local storage support"
+#~ msgstr "Indique s'il faut activer le support de stockage local de HTML5"
-#~ msgid "Big"
-#~ msgstr "Grandes"
+#~ msgid "Whether to enable offline web application cache"
+#~ msgstr "Indique s'il faut activer le cache des applications web hors ligne"
-#~ msgid "Document cannot be displayed"
-#~ msgstr "Le document ne peut être affiché"
-
-#~ msgid "General"
-#~ msgstr "Général"
-
-#~ msgid "Appearance"
-#~ msgstr "Apparence"
-
-#~ msgid "Font settings"
-#~ msgstr "Paramètres des polices"
-
-#~ msgid "Enforce 96 dots per inch"
-#~ msgstr "Forcer 96 points par pouce"
-
-#~ msgid "Enforce a video dot density of 96 DPI"
-#~ msgstr "Force une densité visuelle de 96 DPI"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid "Navigationbar"
-#~ msgstr "Barre de navigation"
-
-#~ msgid "Applications"
-#~ msgstr "Applications"
-
-#~ msgid "External applications"
-#~ msgstr "Applications externes"
-
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Configurer les filtres de _publicité"
-
-#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
+#~ msgid "Flash the browser window if a new tab was opened in the background"
#~ msgstr ""
-#~ "Changer d'onglet par ordre de dernière utilisation en utilisant Ctrl+Tab"
+#~ "Faire clignoter la fenêtre du navigateur si un onglet a été ouvert en "
+#~ "arrière-plan"
+
+#~ msgid "Allow websites to use OpenGL rendering"
+#~ msgstr "Permettre aux sites d'utiliser le rendu OpenGL"
+
+#~ msgid "Whether to zoom text and images"
+#~ msgstr "Indique s'il faut agrandir le texte et les images"
+
+#~ msgid "Find inline while typing"
+#~ msgstr "Chercher pendant la saisie"
+
+#~ msgid "Whether to automatically find inline while typing"
+#~ msgstr ""
+#~ "Indique s'il faut chercher automatiquement dans la page pendant la saisie"
+
+#~ msgid "The type of proxy server to use"
+#~ msgstr "Le type de serveur mandataire à utiliser"
+
+#~ msgid "HTTP Proxy Server"
+#~ msgstr "Serveur mandataire HTTP"
+
+#~ msgid "The proxy server used for HTTP connections"
+#~ msgstr "Le serveur mandataire (proxy) pour les connexions HTTP"
+
+#~ msgid "The proxy server port used for HTTP connections"
+#~ msgstr ""
+#~ "Le port utilisé pour contacter le serveur mandataire (proxy) pour les "
+#~ "connexions HTTP"
+
+#~ msgid "Identification string"
+#~ msgstr "Chaîne d'identification"
+
+#~ msgid "The application identification string"
+#~ msgstr "La chaîne d'identification de l'application"
+
+#~ msgid "Clear private data"
+#~ msgstr "Effacer les informations privées"
+
+#~ msgid "The private data selected for deletion"
+#~ msgstr "Les informations privées sélectionnées pour la suppression"
+
+#~ msgid "Clear data"
+#~ msgstr "Effacer les informations"
+
+#~ msgid "The data selected for deletion"
+#~ msgstr "Les informations sélectionnées pour la suppression"
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Signet"
+
+#~ msgid "_Console"
+#~ msgstr "_Console"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Dossier supérieur"
+
+#~ msgid "_Title:"
+#~ msgstr "_Titre :"
diff --git a/po/gl.po b/po/gl.po
index ba3dfc39..1d9acfe3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: midori-0.1.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-04 06:24+0000\n"
+"POT-Creation-Date: 2012-08-03 16:15+0000\n"
"PO-Revision-Date: 2011-11-30 19:29+0100\n"
"Last-Translator: Miguel Anxo Bouzada \n"
"Language-Team: Galician \n"
@@ -32,12 +32,28 @@ msgstr "Buscar na rede"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:2028 ../midori/main.c:2052
+#: ../midori/main.c:2066 ../midori/midori-websettings.c:315
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Navegador web Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Nova xanela de navegación privada"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1434
+msgid "New Tab"
+msgstr "Nova lapela"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1431
+msgid "New Window"
+msgstr "Nova xanela"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Navegador web"
@@ -49,82 +65,71 @@ msgstr "Midori, navegación privada"
msgid "Open a new private browsing window"
msgstr "Abrir unha nova xanela de navegación privada"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4481
msgid "Private Browsing"
msgstr "Navegación privada"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Non foi posíbel cargar a configuración: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "O valor «%s» non é válido para %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "O valor de configuración «%s» non é válido"
-#: ../midori/main.c:380
+#: ../midori/main.c:375
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Non foi posíbel cargar os motores de busca. %s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:429
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Produciuse un erro ao limpar o historial: %s\n"
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Produciuse un fallo ao abrir a base de datos: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:523
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Produciuse un fallo ao eliminar elementos antigos do historial: %s\n"
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Produciuse un fallo ao eliminar o elemento do historial: %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Non foi posíbel gardar os marcadores. %s"
-
-#: ../midori/main.c:633
+#: ../midori/main.c:545
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Non foi posíbel gardar a configuración. %s"
-#: ../midori/main.c:668
+#: ../midori/main.c:571
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Non foi posíbel gardar os motores de busca. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:608
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Non foi posíbel gardar o lixo. %s"
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
+#: ../midori/main.c:681 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Extensións"
-#: ../midori/main.c:760
+#: ../midori/main.c:695
msgid "Privacy"
msgstr "Intimidade"
-#: ../midori/main.c:772
+#: ../midori/main.c:707
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -132,19 +137,19 @@ msgstr ""
"As «cookies» almacenan datos de sesión e gardan xogos ou perfís de usuario "
"para publicidade."
-#: ../midori/main.c:828
+#: ../midori/main.c:763
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Non foi posíbel gardar a sesión. %s"
-#: ../midori/main.c:1046
+#: ../midori/main.c:1001
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Non hai ningún ficheiro de certificado raíz dispoñíbel. Non é posíbel "
"verificar os certificados SSL."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1093
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -152,225 +157,222 @@ 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:1134
+#: ../midori/main.c:1112
msgid "Modify _preferences"
msgstr "Modificar as _preferencias"
-#: ../midori/main.c:1138
+#: ../midori/main.c:1116
msgid "Disable all _extensions"
msgstr "Desactivar todas as _extensións"
-#: ../midori/main.c:1151
+#: ../midori/main.c:1129
msgid "Discard old tabs"
msgstr "Desbotar as lapelas antigas"
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1130 ../midori/midori-websettings.c:223
msgid "Show last tabs without loading"
msgstr "Mostrar as últimas lapelas sen cargalas"
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1131 ../midori/midori-websettings.c:222
msgid "Show last open tabs"
msgstr "Mostrar as últimas lapelas abertas"
-#: ../midori/main.c:1400 ../midori/main.c:2464
+#: ../midori/main.c:1379 ../midori/main.c:2436
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Non foi posíbel cargar a sesión: %s\n"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1517
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Captura gardada en: %s\n"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1933
msgid "Run ADDRESS as a web application"
msgstr "Executar ENDEREZO como un aplicativo web"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1933
msgid "ADDRESS"
msgstr "ENDEREZO"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1936
msgid "Use FOLDER as configuration folder"
msgstr "Usar CARTAFOL como cartafol de configuración"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1936
msgid "FOLDER"
msgstr "CARTAFOL"
-#: ../midori/main.c:1957
+#: ../midori/main.c:1939
msgid "Private browsing, no changes are saved"
msgstr "Navegación privada, non se garda ningún cambio"
-#: ../midori/main.c:1959
+#: ../midori/main.c:1941
msgid "Show a diagnostic dialog"
msgstr "Mostrar un diálogo de diagnóstico"
-#: ../midori/main.c:1961
+#: ../midori/main.c:1943
msgid "Run the specified filename as javascript"
msgstr "Execute o nome de ficheiro especificado como JavaScript"
-#: ../midori/main.c:1963
+#: ../midori/main.c:1945
msgid "Take a snapshot of the specified URI"
msgstr "Facer unha captura do URI especificado"
-#: ../midori/main.c:1965
+#: ../midori/main.c:1947
msgid "Execute the specified command"
msgstr "Executar a orde especificada"
-#: ../midori/main.c:1967
+#: ../midori/main.c:1949
msgid "List available commands to execute with -e/ --execute"
msgstr "Liste as ordes dispoñíbeis para executar con -e/ --execute"
-#: ../midori/main.c:1969
+#: ../midori/main.c:1951
msgid "Display program version"
msgstr "Mostrar a versión do programa"
-#: ../midori/main.c:1971
+#: ../midori/main.c:1953
msgid "Addresses"
msgstr "Enderezos"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1955
msgid "Block URIs according to regular expression PATTERN"
msgstr "Bloquear os URI de acordo ca expresión regular PATRÓN"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1955
msgid "PATTERN"
msgstr "PATRÓN"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:1959
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Restabelecer Midori despois de SEGUNDOS segundos de inactividade"
-#: ../midori/main.c:1977
+#: ../midori/main.c:1959
msgid "SECONDS"
msgstr "SEGUNDOS"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1962
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Redirixir os avisos ao NOMEFICHEIRO indicado"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1962
msgid "FILENAME"
msgstr "NOMEFICHEIRO"
-#: ../midori/main.c:2045
+#: ../midori/main.c:2025
msgid "[Addresses]"
msgstr "[Enderezos]"
-#: ../midori/main.c:2087
+#: ../midori/main.c:2067
msgid "Please report comments, suggestions and bugs to:"
msgstr "Envíe comentarios, suxestións e fallos a:"
-#: ../midori/main.c:2089
+#: ../midori/main.c:2069
msgid "Check for new versions at:"
msgstr "Comprobar se existen novas versións en:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
+#: ../midori/main.c:2164
msgid "Saved logins and _passwords"
msgstr "Gardar os nomes de usuario e os _contrasinais"
-#: ../midori/main.c:2175
+#: ../midori/main.c:2166
msgid "Cookies and Website data"
msgstr "Cookies e datos do sitio web"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
+#: ../midori/main.c:2170 ../midori/midori-websettings.c:1020
#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
msgstr "Caché web"
-#: ../midori/main.c:2182
+#: ../midori/main.c:2173
msgid "Website icons"
msgstr "Iconas de sitios web"
-#: ../midori/main.c:2288
+#: ../midori/main.c:2277
msgid "An unknown error occured"
msgstr "Produciuse un erro descoñecido"
-#: ../midori/main.c:2395
+#: ../midori/main.c:2384
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Xa se está a executar outra instancia de Midori mais non responde.\n"
-#: ../midori/main.c:2431
+#: ../midori/main.c:2418
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Non foi posíbel cargar os marcadores: %s\n"
-#: ../midori/main.c:2479
+#: ../midori/main.c:2451
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Non foi posíbel cargar o lixo: %s\n"
-#: ../midori/main.c:2492
+#: ../midori/main.c:2464
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Non foi posíbel cargar o historial: %s\n"
-#: ../midori/main.c:2508
+#: ../midori/main.c:2479
msgid "The following errors occured:"
msgstr "Producíronse os seguintes erros:"
-#: ../midori/main.c:2524
+#: ../midori/main.c:2495
msgid "_Ignore"
msgstr "_Ignorar"
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "_Marcador"
+#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:499
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Acción inesperada «%s»"
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060
+#: ../midori/midori-app.c:1453 ../midori/midori-browser.c:6380
msgid "_Bookmarks"
msgstr "_Marcadores"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1454
msgid "Add Boo_kmark"
msgstr "Engadir mar_cador…"
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_Consola"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1455
msgid "_Extensions"
msgstr "_Extensións"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589
+#: ../midori/midori-app.c:1456 ../midori/midori-browser.c:4836
msgid "_History"
msgstr "_Historial"
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "P_áxina de inicio"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1457
msgid "_Userscripts"
msgstr "_Scripts de usuario"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1458
+msgid "User_styles"
+msgstr "_Estilos de usuario"
+
+#: ../midori/midori-app.c:1459
msgid "New _Tab"
msgstr "Nova _lapela"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1460
msgid "_Transfers"
msgstr "_Transferencias"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1461
msgid "Netscape p_lugins"
msgstr "En_gadidos de Netscape"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1462
msgid "_Closed Tabs"
msgstr "_Lapelas pechadas"
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216
+#: ../midori/midori-app.c:1463 ../midori/midori-browser.c:5519
msgid "New _Window"
msgstr "Nova _xanela"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1464
msgid "New _Folder"
msgstr "Cartafol _novo"
@@ -391,68 +393,55 @@ msgstr "Formato de marcador non recoñecido."
msgid "Writing failed."
msgstr "Produciuse un fallo de escritura."
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:360 ../midori/midori-browser.c:5607
+#: ../midori/midori-browser.c:5616
msgid "Reload the current page"
msgstr "Recargar a páxina actual"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:369 ../midori/midori-browser.c:5613
msgid "Stop loading the current page"
msgstr "Deter a carga da páxina"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:486
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Produciuse un erro ao actualizar o título: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Acción inesperada «%s»"
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:579
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Navegación privada)"
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "Cartafol principal"
+#: ../midori/midori-browser.c:692 ../midori/midori-browser.c:734
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Marcadores"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:794
msgid "New folder"
msgstr "Novo cartafol"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:794
msgid "Edit folder"
msgstr "Editar o cartafol"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:796
msgid "New bookmark"
msgstr "Novo marcador"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:796
msgid "Edit bookmark"
msgstr "Editar o marcador"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Título:"
+#: ../midori/midori-browser.c:830
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Escriba un nome para este marcador e escolla onde gardalo."
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Enderezo:"
-
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326
-msgid "_Folder:"
-msgstr "_Cartafol:"
-
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:891
msgid "Add to _Speed Dial"
msgstr "Enga_dir a marcación rápida"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:897
msgid "Show in the tool_bar"
msgstr "Mostrar na _barra de ferramentas"
@@ -460,71 +449,67 @@ msgstr "Mostrar na _barra de ferramentas"
msgid "Run as _web application"
msgstr "Executar como aplicativo _web"
-#: ../midori/midori-browser.c:976
+#: ../midori/midori-browser.c:975
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "Non é posíbel gardar o ficheiro «%s» neste cartafol."
-#: ../midori/midori-browser.c:978
+#: ../midori/midori-browser.c:977
#, c-format
msgid "You don't have permission to write in this location."
msgstr "Non ten permiso para escribir nesta localización."
-#: ../midori/midori-browser.c:985
+#: ../midori/midori-browser.c:984
#, c-format
msgid "There is not enough free space to download \"%s\"."
msgstr "Non hai espazo libre abondo para descargar «%s»."
-#: ../midori/midori-browser.c:988
+#: ../midori/midori-browser.c:987
#, 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:1026 ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:1123 ../midori/midori-browser.c:4640
msgid "Save file as"
msgstr "Gardar o ficheiro como"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Nova xanela"
+#: ../midori/midori-browser.c:1129
+msgid "Save associated _resources"
+msgstr "Gardar os _recursos asociados"
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1431
msgid "A new window has been opened"
msgstr "Abriuse unha nova xanela"
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Nova lapela"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1434
msgid "A new tab has been opened"
msgstr "Abriuse unha nova lapela"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1451
msgid "Error opening the image!"
msgstr "Produciuse un erro ao abrir a imaxe!"
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1452
msgid "Can not open selected image in a default viewer."
msgstr "Non é posíbel abrir a imaxe no visor predeterminado"
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1458
msgid "Error downloading the image!"
msgstr "Produciuse un erro ao descargar a imaxe!"
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1459
msgid "Can not download selected image."
msgstr "Non foi posíbel descargar a imaxe seleccionada."
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1580
msgid "Save file"
msgstr "Gardar ficheiro"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2476
msgid "Open file"
msgstr "Abrir ficheiro"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2608
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -539,139 +524,153 @@ msgstr ""
"Agregador de novas. A seguinte vez que prema na icona da fonte de novas "
"engadirase automaticamente."
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2614 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Nova fonte"
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2657 ../midori/midori-browser.c:5679
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Engadir novo marcador"
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3201 ../midori/midori-searchaction.c:488
msgid "Empty"
msgstr "Baleiro"
-#: ../midori/midori-browser.c:3467
+#: ../midori/midori-browser.c:3644 ../midori/midori-browser.c:3645
msgid "Toggle text cursor navigation"
msgstr "Activar/desactivar a navegación con cursor"
-#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753
+#: ../midori/midori-browser.c:3647
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3650
+msgid "_Enable Caret Browsing"
+msgstr "Activar a _navegación con cursor"
+
+#: ../midori/midori-browser.c:4040 ../midori/midori-browser.c:6073
#, 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:4114 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4366 ../panels/midori-bookmarks.c:847
+#: ../panels/midori-history.c:803
msgid "Open all in _Tabs"
msgstr "Abrir todo en _lapelas"
-#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4373 ../panels/midori-bookmarks.c:853
+#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Abrir nunha nova _lapela"
-#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657
-#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4376 ../midori/midori-view.c:2940
+#: ../midori/midori-view.c:5058 ../panels/midori-bookmarks.c:855
+#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Abrir nunha nova _xanela"
-#: ../midori/midori-browser.c:4213
+#: ../midori/midori-browser.c:4465
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4214
+#: ../midori/midori-browser.c:4466
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4467
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4468
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4469
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4470
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4239
-msgid "Import bookmarks..."
-msgstr "Importar marcadores..."
+#: ../midori/midori-browser.c:4471
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:4492
+msgid "Import bookmarks…"
+msgstr "Importar marcadores…"
+
+#: ../midori/midori-browser.c:4495 ../midori/midori-browser.c:5684
msgid "_Import bookmarks"
msgstr "_Importar marcadores"
-#: ../midori/midori-browser.c:4253
+#: ../midori/midori-browser.c:4506
msgid "_Application:"
msgstr "_Aplicativo:"
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4571
msgid "Import from XBEL or HTML file"
msgstr "Importar desde un ficheiro XBEL ou HTML"
-#: ../midori/midori-browser.c:4353
+#: ../midori/midori-browser.c:4599
msgid "Import from a file"
msgstr "Importar desde un ficheiro"
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4611
msgid "Failed to import bookmarks"
msgstr "Produciuse un erro ao importar os marcadores"
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4645
msgid "XBEL Bookmarks"
msgstr "Marcadores XBEL"
-#: ../midori/midori-browser.c:4405
+#: ../midori/midori-browser.c:4650
msgid "Netscape Bookmarks"
msgstr "Marcadores de Netscape"
-#: ../midori/midori-browser.c:4419
+#: ../midori/midori-browser.c:4664
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "Midori só pode exportar a XBEL (*.xbel) e Netscape (*.html)"
-#: ../midori/midori-browser.c:4434
+#: ../midori/midori-browser.c:4679
msgid "Failed to export bookmarks"
msgstr "Produciuse un erro ao exportar os marcadores"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4556
+#: ../midori/midori-browser.c:4801
msgid "Clear Private Data"
msgstr "Limpar os datos privados"
-#: ../midori/midori-browser.c:4560
+#: ../midori/midori-browser.c:4805
msgid "_Clear private data"
msgstr "_Limpar os datos privados"
-#: ../midori/midori-browser.c:4573
+#: ../midori/midori-browser.c:4820
msgid "Clear the following data:"
msgstr "Limpar os seguintes datos:"
-#: ../midori/midori-browser.c:4583
+#: ../midori/midori-browser.c:4830
msgid "Last open _tabs"
msgstr "Últimas lapelas abertas"
-#: ../midori/midori-browser.c:4609
+#: ../midori/midori-browser.c:4856
msgid "Clear private data when _quitting Midori"
msgstr "_Limpar os datos privados ao saír de Midori"
-#: ../midori/midori-browser.c:4804
+#: ../midori/midori-browser.c:5071
msgid "A lightweight web browser."
msgstr "Un navegador moi lixeiro"
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:5072
msgid "See about:version for version info."
msgstr "Ver a información de versión en about:version"
-#: ../midori/midori-browser.c:4807
+#: ../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 "
@@ -683,7 +682,7 @@ msgstr ""
"Free Software Foundation; tanto na versión 2.1 ou, opcionalmente, calquera "
"versión posterior."
-#: ../midori/midori-browser.c:4828
+#: ../midori/midori-browser.c:5104
msgid "translator-credits"
msgstr ""
"Miguel Anxo Bouzada, 2008, 2009, 2010, 2011\n"
@@ -691,359 +690,374 @@ msgstr ""
"\n"
"Proxecto Trasno http://trasno.net"
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5517
msgid "_File"
msgstr "_Ficheiro"
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5520
msgid "Open a new window"
msgstr "Abrir unha nova xanela"
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5523
msgid "Open a new tab"
msgstr "Abrir unha nova lapela"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5525
msgid "New P_rivate Browsing Window"
msgstr "Nova xanela de navegación p_rivada"
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5529
msgid "Open a file"
msgstr "Abrir un ficheiro"
-#: ../midori/midori-browser.c:5228
-msgid "_Save Page As..."
-msgstr "_Gardar a páxina como..."
+#: ../midori/midori-browser.c:5531
+msgid "_Save Page As…"
+msgstr "_Gardar a páxina como…"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5532
msgid "Save to a file"
msgstr "Gardar nun ficheiro"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5534
msgid "Add to Speed _dial"
msgstr "Enga_dir a marcación rápida"
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5538
msgid "Add Shortcut to the _desktop"
msgstr "Engadir un atallo no _escritorio"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5540
msgid "Create _Launcher"
msgstr "Crear _iniciador"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5544
msgid "Subscribe to News _feed"
msgstr "Subscribirse á _fonte de novas"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5550
msgid "_Close Tab"
msgstr "Pechar a _lapela"
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5551
msgid "Close the current tab"
msgstr "Pechar a lapela actual"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5553
msgid "C_lose Window"
msgstr "_Pechar a xanela"
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5557
+msgid "_Share"
+msgstr "_Compartir"
+
+#: ../midori/midori-browser.c:5562
msgid "Print the current page"
msgstr "Imprimir a páxina actual"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5565
msgid "Close a_ll Windows"
msgstr "Pechar todas as xane_las"
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5568
msgid "_Edit"
msgstr "_Editar"
-#: ../midori/midori-browser.c:5282
-msgid "_Find..."
-msgstr "_Buscar..."
+#: ../midori/midori-browser.c:5591
+msgid "_Find…"
+msgstr "_Buscar…"
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5592
msgid "Find a word or phrase in the page"
msgstr "Buscar unha palabra ou frase nesta páxina"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5594
msgid "Find _Next"
msgstr "Buscar _seguinte"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5597
msgid "Find _Previous"
msgstr "Buscar _anterior"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5601
msgid "Configure the application preferences"
msgstr "Configurar as preferencias do aplicativo"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5603
msgid "_View"
msgstr "_Ver"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5604
msgid "_Toolbars"
msgstr "_Barra de ferramentas"
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5609
msgid "Reload page without caching"
msgstr "Recargar a páxina sen usar a caché"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5619
msgid "Increase the zoom level"
msgstr "Aumentar o nivel de zoom"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5622
msgid "Decrease the zoom level"
msgstr "Diminuír o nivel de zoom"
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5626
msgid "_Encoding"
msgstr "_Codificación"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5628
msgid "View So_urce"
msgstr "Ver o códi_go da páxina"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5631
msgid "Ca_ret Browsing"
msgstr "Navegación con cu_rsor"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5635
msgid "Toggle fullscreen view"
msgstr "Activar/desactivar a pantalla completa"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5637
msgid "Scroll _Left"
msgstr "Desprazar cara á _esquerda"
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5640
msgid "Scroll _Down"
msgstr "Desprazar cara a_baixo"
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5643
msgid "Scroll _Up"
msgstr "Desprazar cara _arriba"
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5646
msgid "Scroll _Right"
msgstr "Desprazar cara á _dereita"
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5649
+msgid "_Readable"
+msgstr "_Lexíbel"
+
+#: ../midori/midori-browser.c:5652
msgid "_Go"
msgstr "_Ir"
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5655
msgid "Go back to the previous page"
msgstr "Ir á páxina anterior"
-#: ../midori/midori-browser.c:5346
+#: ../midori/midori-browser.c:5658
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:5350
+#: ../midori/midori-browser.c:5662
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:5354
+#: ../midori/midori-browser.c:5666
msgid "Go to the next sub-page"
msgstr "Ir á seguinte subpáxina"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5668
+msgid "_Homepage"
+msgstr "P_áxina de inicio"
+
+#: ../midori/midori-browser.c:5669
msgid "Go to your homepage"
msgstr "Ir á súa páxina de inicio"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5671
msgid "Empty Trash"
msgstr "Baleirar o lixo"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5674
msgid "Undo _Close Tab"
msgstr "Desfa_cer o pechar lapela"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5681
msgid "Add a new _folder"
msgstr "Engadir un carta_fol novo"
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5687
msgid "_Export bookmarks"
msgstr "_Exportar os marcadores"
-#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5690 ../midori/midori-searchaction.c:497
msgid "_Manage Search Engines"
msgstr "_Xestor de motores de busca"
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5693
msgid "_Clear Private Data"
msgstr "_Limpar datos privados"
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5696
msgid "_Inspect Page"
msgstr "_Inspeccionar a páxina"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5700
msgid "_Previous Tab"
msgstr "Lapela _anterior"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5703
msgid "_Next Tab"
msgstr "Lapela _seguinte"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5705
msgid "Move Tab _Backward"
msgstr "Mover a lapela cara _atrás"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5707
msgid "_Move Tab Forward"
msgstr "_Mover a lapela cara adiante"
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5710
msgid "Focus _Current Tab"
msgstr "Enfocar a lapela a_ctual"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5713
msgid "Focus _Next view"
msgstr "Enfocar a _seguinte vista"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5716
msgid "Only show the Icon of the _Current Tab"
msgstr "Mostrar só a icona da lapela a_ctual"
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5719
msgid "_Duplicate Current Tab"
msgstr "_Duplicar a lapela actual"
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5722
msgid "Close Ot_her Tabs"
msgstr "Pechar ou_tras lapelas"
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5725
msgid "Open last _session"
msgstr "Abrir a última _sesión"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5728
msgid "_Help"
msgstr "_Axuda"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5730
msgid "_Frequent Questions"
msgstr "Preguntas _frecuentes"
-#: ../midori/midori-browser.c:5421
-msgid "_Report a Problem..."
-msgstr "_Informar dun problema..."
+#: ../midori/midori-browser.c:5733
+msgid "_Report a Problem…"
+msgstr "_Informar dun problema…"
-#: ../midori/midori-browser.c:5433
-msgid "_Menubar"
-msgstr "Barra de _menú"
-
-#: ../midori/midori-browser.c:5437
-msgid "_Navigationbar"
-msgstr "Barra de _navegación"
-
-#: ../midori/midori-browser.c:5441
-msgid "Side_panel"
-msgstr "_Panel lateral"
-
-#: ../midori/midori-browser.c:5442
-msgid "Sidepanel"
-msgstr "Panel lateral"
-
-#: ../midori/midori-browser.c:5445
-msgid "_Bookmarkbar"
-msgstr "Barra de marcadores"
-
-#: ../midori/midori-browser.c:5449
-msgid "_Statusbar"
-msgstr "Barra de es_tado"
-
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311
-msgid "_Automatic"
-msgstr "_Automático"
-
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "Chinés (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5465
-msgid "Japanese (SHIFT__JIS)"
-msgstr "Xaponés (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238
-msgid "Korean (EUC-KR)"
-msgstr "Coreano (EUC-KR)"
-
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239
-msgid "Russian (KOI8-R)"
-msgstr "Ruso (KOI8-R)"
-
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241
-msgid "Western (ISO-8859-1)"
-msgstr "Occidental (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242
-#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Personalizado..."
-
-#: ../midori/midori-browser.c:5985
-msgid "_Separator"
-msgstr "_Separador"
-
-#: ../midori/midori-browser.c:5992
-msgid "_Location..."
-msgstr "Lugar"
-
-#: ../midori/midori-browser.c:5994
-msgid "Open a particular location"
-msgstr "Abrir un enderezo determinado"
-
-#: ../midori/midori-browser.c:6016
-msgid "_Web Search..."
-msgstr "Buscar no _web..."
-
-#: ../midori/midori-browser.c:6018
-msgid "Run a web search"
-msgstr "Executar unha busca no web"
-
-#: ../midori/midori-browser.c:6045
-msgid "Reopen a previously closed tab or window"
-msgstr "Volver abrir xanelas ou lapelas pechadas"
-
-#: ../midori/midori-browser.c:6062
-msgid "Show the saved bookmarks"
-msgstr "Mostrar os marcadores gardados"
-
-#: ../midori/midori-browser.c:6079
+#: ../midori/midori-browser.c:5738 ../midori/midori-browser.c:6399
msgid "_Tools"
msgstr "_Ferramentas"
-#: ../midori/midori-browser.c:6095
+#: ../midori/midori-browser.c:5745
+msgid "_Menubar"
+msgstr "Barra de _menú"
+
+#: ../midori/midori-browser.c:5749
+msgid "_Navigationbar"
+msgstr "Barra de _navegación"
+
+#: ../midori/midori-browser.c:5753
+msgid "Side_panel"
+msgstr "_Panel lateral"
+
+#: ../midori/midori-browser.c:5754
+msgid "Sidepanel"
+msgstr "Panel lateral"
+
+#: ../midori/midori-browser.c:5757
+msgid "_Bookmarkbar"
+msgstr "Barra de marcadores"
+
+#: ../midori/midori-browser.c:5761
+msgid "_Statusbar"
+msgstr "Barra de es_tado"
+
+#: ../midori/midori-browser.c:5770 ../midori/midori-websettings.c:314
+msgid "_Automatic"
+msgstr "_Automático"
+
+#: ../midori/midori-browser.c:5773 ../midori/midori-websettings.c:238
+msgid "Chinese Traditional (BIG5)"
+msgstr "Chinés tradicional(BIG5)"
+
+#: ../midori/midori-browser.c:5776 ../midori/midori-websettings.c:239
+msgid "Chinese Simplified (GB18030)"
+msgstr "Chinéss simplificado (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5780
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Xaponés (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5783 ../midori/midori-websettings.c:241
+msgid "Korean (EUC-KR)"
+msgstr "Coreano (EUC-KR)"
+
+#: ../midori/midori-browser.c:5786 ../midori/midori-websettings.c:242
+msgid "Russian (KOI8-R)"
+msgstr "Ruso (KOI8-R)"
+
+#: ../midori/midori-browser.c:5789 ../midori/midori-websettings.c:243
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5792 ../midori/midori-websettings.c:244
+msgid "Western (ISO-8859-1)"
+msgstr "Occidental (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5795
+msgid "Custom…"
+msgstr "Personalizado…"
+
+#: ../midori/midori-browser.c:6305
+msgid "_Separator"
+msgstr "_Separador"
+
+#: ../midori/midori-browser.c:6312
+msgid "_Location…"
+msgstr "Lugar"
+
+#: ../midori/midori-browser.c:6314
+msgid "Open a particular location"
+msgstr "Abrir un enderezo determinado"
+
+#: ../midori/midori-browser.c:6336
+msgid "_Web Search…"
+msgstr "Buscar no _web…"
+
+#: ../midori/midori-browser.c:6338
+msgid "Run a web search"
+msgstr "Executar unha busca no web"
+
+#: ../midori/midori-browser.c:6365
+msgid "Reopen a previously closed tab or window"
+msgstr "Volver abrir xanelas ou lapelas pechadas"
+
+#: ../midori/midori-browser.c:6382
+msgid "Show the saved bookmarks"
+msgstr "Mostrar os marcadores gardados"
+
+#: ../midori/midori-browser.c:6415
msgid "_Window"
msgstr "_Xanela"
-#: ../midori/midori-browser.c:6097
+#: ../midori/midori-browser.c:6417
msgid "Show a list of all open tabs"
msgstr "Mostrar unha lista de todas as lapelas abertas"
-#: ../midori/midori-browser.c:6111
+#: ../midori/midori-browser.c:6431
msgid "_Menu"
msgstr "_Menú"
-#: ../midori/midori-browser.c:6113
+#: ../midori/midori-browser.c:6433
msgid "Menu"
msgstr "Menú"
-#: ../midori/midori-browser.c:6927
+#: ../midori/midori-browser.c:7258
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Opción inesperada «%s»"
@@ -1055,7 +1069,7 @@ msgstr "Non foi posíbel cargar a configuración da extensión «%s»: %s\n"
#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../extensions/addons.c:1688
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "Non foi posíbel gardar a configuración da extensión «%s»: %s\n"
@@ -1065,548 +1079,605 @@ msgstr "Non foi posíbel gardar a configuración da extensión «%s»: %s\n"
msgid "Search with %s"
msgstr "Buscar con %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Buscar con..."
+#: ../midori/midori-locationaction.c:414
+msgid "Search with…"
+msgstr "Buscar con…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:541
#, c-format
msgid "Failed to select from history\n"
msgstr "Produciuse un erro ao seleccionar do historial\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:628
#, c-format
msgid "Search for %s"
msgstr "Buscar %s"
+#: ../midori/midori-locationaction.c:1195
+msgid "Export certificate"
+msgstr "Exportar o certificado"
+
+#: ../midori/midori-locationaction.c:1227
+msgid "The signing certificate authority is not known."
+msgstr "Non se coñece a firma da Entidade de acreditación"
+
+#: ../midori/midori-locationaction.c:1229
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1231
+msgid "The certificate's activation time is still in the future."
+msgstr "A data de activación do certificado está aínda no futuro."
+
+#: ../midori/midori-locationaction.c:1233
+msgid "The certificate has expired"
+msgstr "Este certificado xa caducou"
+
+#: ../midori/midori-locationaction.c:1235
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1237
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1239
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1286
+msgid "_Export certificate"
+msgstr "_Exportar o certificado"
+
+#: ../midori/midori-locationaction.c:1301
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1335
+msgid "Security details"
+msgstr "Detalles de segiuranza"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1618
msgid "Paste and p_roceed"
msgstr "Pegar e _continuar"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1942
msgid "Not verified"
msgstr "Non verificada"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1950
msgid "Verified and encrypted connection"
msgstr "Conexión verificada e cifrada"
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1957
msgid "Open, unencrypted connection"
msgstr "Conexión aberta e non cifrada"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Aliñar o panel lateral á dereita"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Pechar o panel"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Aliñar o panel lateral á esquerda"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:220
msgid "Show Speed Dial"
msgstr "Mostrar a marcación rápida"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:221
msgid "Show Homepage"
msgstr "Mostrar a páxina inicial"
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:240
msgid "Japanese (SHIFT_JIS)"
msgstr "Xaponés (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Personalizado…"
+
+#: ../midori/midori-websettings.c:260
msgid "New tab"
msgstr "Nova lapela"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:261
msgid "New window"
msgstr "Nova xanela"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:262
msgid "Current tab"
msgstr "Lapela actual"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:277
msgid "Default"
msgstr "Predeterminada"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:278
msgid "Icons"
msgstr "Iconas"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:279
msgid "Small icons"
msgstr "Iconas pequenas"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:280
msgid "Text"
msgstr "Texto"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:281
msgid "Icons and text"
msgstr "Iconas e texto"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:282
msgid "Text beside icons"
msgstr "Texto a carón das iconas"
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:297
msgid "Automatic (GNOME or environment)"
msgstr "Automático (GNOME ou entorno)"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:298
msgid "HTTP proxy server"
msgstr "Servidor proxy HTTP"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:299
msgid "No proxy server"
msgstr "Sen servidor proxy"
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:316
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:317
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:318
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:319
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:320
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:400
+#: ../midori/midori-websettings.c:404
msgid "Remember last window size"
msgstr "Lembrar o último tamaño de xanela"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:405
msgid "Whether to save the last window size"
msgstr "Gardar (ou non) o último tamaño de xanela"
-#: ../midori/midori-websettings.c:409
+#: ../midori/midori-websettings.c:413
msgid "Last window width"
msgstr "Última largura da xanela"
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:414
msgid "The last saved window width"
msgstr "Última largura da xanela gardada"
-#: ../midori/midori-websettings.c:418
+#: ../midori/midori-websettings.c:422
msgid "Last window height"
msgstr "Última altura da xanela"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:423
msgid "The last saved window height"
msgstr "Última altura da xanela gardada"
-#: ../midori/midori-websettings.c:444
+#: ../midori/midori-websettings.c:448
msgid "Last panel position"
msgstr "Última posición do panel"
-#: ../midori/midori-websettings.c:445
+#: ../midori/midori-websettings.c:449
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:454
+#: ../midori/midori-websettings.c:458
msgid "Last panel page"
msgstr "Última páxina do panel"
-#: ../midori/midori-websettings.c:455
+#: ../midori/midori-websettings.c:459
msgid "The last saved panel page"
msgstr "Última páxina gardada do panel"
-#: ../midori/midori-websettings.c:463
+#: ../midori/midori-websettings.c:467
msgid "Last Web search"
msgstr "Última busca no web"
-#: ../midori/midori-websettings.c:464
+#: ../midori/midori-websettings.c:468
msgid "The last saved Web search"
msgstr "Última busca no web gardada"
-#: ../midori/midori-websettings.c:473
+#: ../midori/midori-websettings.c:492
msgid "Show Menubar"
msgstr "Mostrar a barra de menú"
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:493
msgid "Whether to show the menubar"
msgstr "Mostrar (ou non) a barra de menú"
-#: ../midori/midori-websettings.c:482
+#: ../midori/midori-websettings.c:501
msgid "Show Navigationbar"
msgstr "Mostrar a barra de navegación"
-#: ../midori/midori-websettings.c:483
+#: ../midori/midori-websettings.c:502
msgid "Whether to show the navigationbar"
msgstr "Mostrar (ou non) a barra de navegación"
-#: ../midori/midori-websettings.c:491
+#: ../midori/midori-websettings.c:510
msgid "Show Bookmarkbar"
msgstr "Mostrar a barra de marcadores"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:511
msgid "Whether to show the bookmarkbar"
msgstr "Mostrar (ou non) a barra de marcadores"
-#: ../midori/midori-websettings.c:500
+#: ../midori/midori-websettings.c:519
msgid "Show Panel"
msgstr "Mostrar o panel"
-#: ../midori/midori-websettings.c:501
+#: ../midori/midori-websettings.c:520
msgid "Whether to show the panel"
msgstr "Mostrar (ou non) o panel"
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:528
msgid "Show Statusbar"
msgstr "Mostrar a barra de estado"
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:529
msgid "Whether to show the statusbar"
msgstr "Mostrar (ou non) a barra de estado"
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:538
msgid "Toolbar Style:"
msgstr "Estilo da barra de ferramentas:"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:539
msgid "The style of the toolbar"
msgstr "O estilo da barra de ferramentas"
-#: ../midori/midori-websettings.c:529
+#: ../midori/midori-websettings.c:548
msgid "Toolbar Items"
msgstr "Elementos da barra de ferramentas"
-#: ../midori/midori-websettings.c:530
+#: ../midori/midori-websettings.c:549
msgid "The items to show on the toolbar"
msgstr "Elementos que se van mostrar na barra de ferramentas"
-#: ../midori/midori-websettings.c:538
+#: ../midori/midori-websettings.c:557
msgid "Compact Sidepanel"
msgstr "Panel lateral compacto"
-#: ../midori/midori-websettings.c:539
+#: ../midori/midori-websettings.c:558
msgid "Whether to make the sidepanel compact"
msgstr "Facer (ou non) o panel lateral compacto"
-#: ../midori/midori-websettings.c:554
+#: ../midori/midori-websettings.c:573
msgid "Align sidepanel on the right"
msgstr "Aliñar á dereita o panel lateral"
-#: ../midori/midori-websettings.c:555
+#: ../midori/midori-websettings.c:574
msgid "Whether to align the sidepanel on the right"
msgstr "Aliñar (ou non) á dereita o panel lateral"
-#: ../midori/midori-websettings.c:570
+#: ../midori/midori-websettings.c:589
msgid "Open panels in separate windows"
msgstr "Abrir os paneis en xanelas separadas"
-#: ../midori/midori-websettings.c:571
+#: ../midori/midori-websettings.c:590
msgid "Whether to always open panels in separate windows"
msgstr "Indica se os paneis se abren sempre en xanelas separadas"
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:599
msgid "When Midori starts:"
msgstr "Cando se inicia Midori:"
-#: ../midori/midori-websettings.c:581
+#: ../midori/midori-websettings.c:600
msgid "What to do when Midori starts"
msgstr "Que facer ao iniciar Midori"
-#: ../midori/midori-websettings.c:590
+#: ../midori/midori-websettings.c:609
msgid "Homepage:"
msgstr "Páxina de inicio:"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:610
msgid "The homepage"
msgstr "A páxina de inicio"
-#: ../midori/midori-websettings.c:606
+#: ../midori/midori-websettings.c:625
msgid "Show crash dialog"
msgstr "Mostrar o diálogo de fallo"
-#: ../midori/midori-websettings.c:607
+#: ../midori/midori-websettings.c:626
msgid "Show a dialog after Midori crashed"
msgstr "Mostrar un cadro de dialogo despois de que Midori falle"
-#: ../midori/midori-websettings.c:615
+#: ../midori/midori-websettings.c:634
msgid "Save downloaded files to:"
msgstr "Gardar os ficheiros descargados en:"
-#: ../midori/midori-websettings.c:616
+#: ../midori/midori-websettings.c:635
msgid "The folder downloaded files are saved to"
msgstr "O cartafol de descargas foi gardado en"
-#: ../midori/midori-websettings.c:624
+#: ../midori/midori-websettings.c:643
msgid "Text Editor"
msgstr "Editor de texto"
-#: ../midori/midori-websettings.c:625
+#: ../midori/midori-websettings.c:644
msgid "An external text editor"
msgstr "Un editor de texto externo"
-#: ../midori/midori-websettings.c:640
+#: ../midori/midori-websettings.c:659
msgid "News Aggregator"
msgstr "Agregador de novas"
-#: ../midori/midori-websettings.c:641
+#: ../midori/midori-websettings.c:660
msgid "An external news aggregator"
msgstr "Un agregador de novas externo"
-#: ../midori/midori-websettings.c:649
+#: ../midori/midori-websettings.c:668
msgid "Location entry Search"
msgstr "Busca de barra de enderezos"
-#: ../midori/midori-websettings.c:650
+#: ../midori/midori-websettings.c:669
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:658
+#: ../midori/midori-websettings.c:677
msgid "Preferred Encoding"
msgstr "Codificación preferida"
-#: ../midori/midori-websettings.c:659
+#: ../midori/midori-websettings.c:678
msgid "The preferred character encoding"
msgstr "Codificación de caracteres preferida"
-#: ../midori/midori-websettings.c:669
+#: ../midori/midori-websettings.c:688
msgid "Always Show Tabbar"
msgstr "Mostrar sempre a barra de lapelas"
-#: ../midori/midori-websettings.c:670
+#: ../midori/midori-websettings.c:689
msgid "Always show the tabbar"
msgstr "Mostrar sempre a barra de lapelas"
-#: ../midori/midori-websettings.c:683
+#: ../midori/midori-websettings.c:702
msgid "Close Buttons on Tabs"
msgstr "Botón de pechar nas lapelas"
-#: ../midori/midori-websettings.c:684
+#: ../midori/midori-websettings.c:703
msgid "Whether tabs have close buttons"
msgstr "Cada unha das lapelas terá o seu botón para pechala"
-#: ../midori/midori-websettings.c:709
+#: ../midori/midori-websettings.c:728
msgid "Open new pages in:"
msgstr "Abrir as páxinas novas en:"
-#: ../midori/midori-websettings.c:710
+#: ../midori/midori-websettings.c:729
msgid "Where to open new pages"
msgstr "Onde se van abrir as páxinas novas"
-#: ../midori/midori-websettings.c:719
+#: ../midori/midori-websettings.c:738
msgid "Middle click opens Selection"
msgstr "Prema no botón central para abrir a selección"
-#: ../midori/midori-websettings.c:720
+#: ../midori/midori-websettings.c:739
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:728
+#: ../midori/midori-websettings.c:747
msgid "Open tabs in the background"
msgstr "Abrir as lapelas en segundo plano"
-#: ../midori/midori-websettings.c:729
+#: ../midori/midori-websettings.c:748
msgid "Whether to open new tabs in the background"
msgstr "Abrir (ou non) as novas lapelas en segundo plano"
-#: ../midori/midori-websettings.c:737
+#: ../midori/midori-websettings.c:756
msgid "Open Tabs next to Current"
msgstr "Abrir lapelas xunto á actual"
-#: ../midori/midori-websettings.c:738
+#: ../midori/midori-websettings.c:757
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:746
+#: ../midori/midori-websettings.c:765
msgid "Open popups in tabs"
msgstr "Abrir as xanelas emerxentes en lapelas"
-#: ../midori/midori-websettings.c:747
+#: ../midori/midori-websettings.c:766
msgid "Whether to open popup windows in tabs"
msgstr "Abrir (ou non) as xanelas emerxentes en lapelas"
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
+#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155
msgid "Load images automatically"
msgstr "Cargar as imaxes automaticamente"
-#: ../midori/midori-websettings.c:758
+#: ../midori/midori-websettings.c:777
msgid "Load and display images automatically"
msgstr "Cargar e mostrar as imaxes automaticamente"
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
+#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165
msgid "Enable scripts"
msgstr "Activar scripts"
-#: ../midori/midori-websettings.c:766
+#: ../midori/midori-websettings.c:785
msgid "Enable embedded scripting languages"
msgstr "Activar linguaxes de script incrustadas"
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
+#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177
msgid "Enable Netscape plugins"
msgstr "Activar os engadidos de Netscape"
-#: ../midori/midori-websettings.c:774
+#: ../midori/midori-websettings.c:793
msgid "Enable embedded Netscape plugin objects"
msgstr "Activar o engadido de obxectos incrustados de Netscape"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:808
msgid "Enable Spell Checking"
msgstr "Activar a corrección ortográfica"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:809
msgid "Enable spell checking while typing"
msgstr "Activar o corrector ortográfico ao escribir"
-#: ../midori/midori-websettings.c:796
+#: ../midori/midori-websettings.c:815
msgid "Enable HTML5 database support"
msgstr "Activar a compatibilidade de base de datos HTML5"
-#: ../midori/midori-websettings.c:797
+#: ../midori/midori-websettings.c:816
msgid "Whether to enable HTML5 database support"
msgstr "Activar ou desactivar a compatibilidade de base de datos HTML5"
-#: ../midori/midori-websettings.c:803
+#: ../midori/midori-websettings.c:822
msgid "Enable HTML5 local storage support"
msgstr "Activar a opción de almacenamento local de HTML5"
-#: ../midori/midori-websettings.c:804
+#: ../midori/midori-websettings.c:823
msgid "Whether to enable HTML5 local storage support"
msgstr ""
"Activar ou desactivar a compatibilidade de almacenamento local de HTML5"
-#: ../midori/midori-websettings.c:810
+#: ../midori/midori-websettings.c:829
msgid "Enable offline web application cache"
msgstr "Activar a caché de aplicativos web sen conexión"
-#: ../midori/midori-websettings.c:811
+#: ../midori/midori-websettings.c:830
msgid "Whether to enable offline web application cache"
msgstr "Activar ou desactivar a caché de aplicativos web sen conexión"
-#: ../midori/midori-websettings.c:827
+#: ../midori/midori-websettings.c:851
msgid "Flash window on background tabs"
msgstr "Xanela intermitente nas lapelas en segundo plano"
-#: ../midori/midori-websettings.c:828
+#: ../midori/midori-websettings.c:852
msgid "Flash the browser window if a new tab was opened in the background"
msgstr ""
"Xanela do navegador intermitente se foi aberta unha nova lapela en segundo "
"plano"
-#: ../midori/midori-websettings.c:836
+#: ../midori/midori-websettings.c:860
msgid "Enable WebGL support"
msgstr "Activar a compatibilidade para WebGL"
-#: ../midori/midori-websettings.c:837
+#: ../midori/midori-websettings.c:861
msgid "Allow websites to use OpenGL rendering"
-msgstr ""
+msgstr "Permitir que os sitios web empreguen OpenGL"
-#: ../midori/midori-websettings.c:863
+#: ../midori/midori-websettings.c:887
msgid "Zoom Text and Images"
msgstr "Zoom sobre o texto e as imaxes"
-#: ../midori/midori-websettings.c:864
+#: ../midori/midori-websettings.c:888
msgid "Whether to zoom text and images"
msgstr "Aplicar zoom (ou non) ao texto e ás imaxes"
-#: ../midori/midori-websettings.c:879
+#: ../midori/midori-websettings.c:903
msgid "Find inline while typing"
msgstr "Buscar en liña ao escribir"
-#: ../midori/midori-websettings.c:880
+#: ../midori/midori-websettings.c:904
msgid "Whether to automatically find inline while typing"
msgstr "Buscar en liña automaticamente (ou non) mentres se escribe"
-#: ../midori/midori-websettings.c:895
+#: ../midori/midori-websettings.c:919
msgid "Kinetic scrolling"
msgstr "Desprazamento cinético"
-#: ../midori/midori-websettings.c:896
+#: ../midori/midori-websettings.c:920
msgid "Whether scrolling should kinetically move according to speed"
msgstr "O desprazamento móvese de acordo ca velocidade"
-#: ../midori/midori-websettings.c:904
+#: ../midori/midori-websettings.c:928
msgid "Delete old Cookies after:"
msgstr "Eliminar as «cookies» antigas despois de:"
-#: ../midori/midori-websettings.c:905
+#: ../midori/midori-websettings.c:929
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:921
+#: ../midori/midori-websettings.c:945
msgid "Only accept Cookies from sites you visit"
msgstr "Só se aceptan as «cookies» dos sitios que visite"
-#: ../midori/midori-websettings.c:922
+#: ../midori/midori-websettings.c:946
msgid "Block cookies sent by third-party websites"
msgstr "Bloquear as «cookies» dos sitios de terceiros"
-#: ../midori/midori-websettings.c:936
+#: ../midori/midori-websettings.c:960
msgid "Delete pages from history after:"
msgstr "Eliminar as páxinas do historial despois de:"
-#: ../midori/midori-websettings.c:937
+#: ../midori/midori-websettings.c:961
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:952
+#: ../midori/midori-websettings.c:976
msgid "Proxy server"
msgstr "Servidor proxy"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:977
msgid "The type of proxy server to use"
msgstr "O tipo de servidor proxy a usar"
-#: ../midori/midori-websettings.c:962
+#: ../midori/midori-websettings.c:986
msgid "HTTP Proxy Server"
msgstr "Servidor proxy HTTP"
-#: ../midori/midori-websettings.c:963
+#: ../midori/midori-websettings.c:987
msgid "The proxy server used for HTTP connections"
msgstr "Servidor proxy que se usa para as conexións HTTP"
-#: ../midori/midori-websettings.c:978
+#: ../midori/midori-websettings.c:1002
msgid "Port"
msgstr "Porto"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:1003
msgid "The proxy server port used for HTTP connections"
msgstr "Servidor proxy que se usa para as conexións HTTP"
-#: ../midori/midori-websettings.c:997
+#: ../midori/midori-websettings.c:1021
msgid "The maximum size of cached pages on disk"
msgstr "O tamaño máximo da caché de páxinas no disco"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
+#: ../midori/midori-websettings.c:1038
msgid "Identify as"
msgstr "Identificarse como"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1039
msgid "What to identify as to web pages"
msgstr "Como se identifica nas páxinas web"
-#: ../midori/midori-websettings.c:1031
+#: ../midori/midori-websettings.c:1055
msgid "Identification string"
msgstr "Cadea de identificación"
-#: ../midori/midori-websettings.c:1032
+#: ../midori/midori-websettings.c:1056
msgid "The application identification string"
msgstr "Cadea de identificación do aplicativo"
-#: ../midori/midori-websettings.c:1048
+#: ../midori/midori-websettings.c:1072
msgid "Preferred languages"
msgstr "Idiomas preferidos"
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:1073
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1614,440 +1685,463 @@ 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:1064
+#: ../midori/midori-websettings.c:1088
msgid "Clear private data"
msgstr "Limpar a información persoal"
-#: ../midori/midori-websettings.c:1065
+#: ../midori/midori-websettings.c:1089
msgid "The private data selected for deletion"
msgstr "Os datos privados seleccionados para eliminar"
-#: ../midori/midori-websettings.c:1080
+#: ../midori/midori-websettings.c:1104
msgid "Clear data"
msgstr "Limpar os datos"
-#: ../midori/midori-websettings.c:1081
+#: ../midori/midori-websettings.c:1105
msgid "The data selected for deletion"
msgstr "Os datos seleccionados para eliminar"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
+#: ../midori/midori-websettings.c:1154
msgid "Strip referrer details sent to websites"
msgstr "Recortar os detalles de referencia enviados para sitios externos"
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
+#: ../midori/midori-websettings.c:1156
msgid "Whether the \"Referer\" header should be shortened to the hostname"
msgstr "Se a cabeceira «Referencia» debe limitarse ao nome da máquina"
-#: ../midori/midori-websettings.c:1146
+#: ../midori/midori-websettings.c:1170
msgid "Always use my font choices"
msgstr "Utilizar sempre as miñas escollas de tipo de letras"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:1171
msgid "Override fonts picked by websites with user preferences"
msgstr ""
"Substituír os tipos de letras dos sitios web polos preferidos do usuario"
-#: ../midori/midori-view.c:1360
+#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140
+msgid "Trust this website"
+msgstr "Confiar neste sitio web"
+
+#: ../midori/midori-view.c:1138
+msgid "Security unknown"
+msgstr "Seguranza descoñecida"
+
+#: ../midori/midori-view.c:1436
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s desexa gardar unha base de datos HTML5."
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Deny"
msgstr "_Denegar"
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Allow"
msgstr "_Permitir"
-#: ../midori/midori-view.c:1392
+#: ../midori/midori-view.c:1469
#, c-format
msgid "%s wants to know your location."
msgstr "%s desexa coñecer a súa localización."
-#: ../midori/midori-view.c:1485
+#: ../midori/midori-view.c:1565
#, c-format
msgid "Error - %s"
msgstr "Erro - %s"
-#: ../midori/midori-view.c:1486
+#: ../midori/midori-view.c:1566
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Non foi posíbel cargar a páxina «%s»."
-#: ../midori/midori-view.c:1488
+#: ../midori/midori-view.c:1568
msgid "Try again"
msgstr "Ténteo de novo"
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
+#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875
#, c-format
msgid "Send a message to %s"
msgstr "Enviarlle unha mensaxe a %s"
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
+#: ../midori/midori-view.c:2661
+msgid "Add _search engine..."
+msgstr "Engadir un _motor de busca"
+
+#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031
msgid "Inspect _Element"
msgstr "Inspeccionar _elemento"
-#: ../midori/midori-view.c:2480
+#: ../midori/midori-view.c:2757
msgid "Open Link in New _Tab"
msgstr "Abrir a ligazón nunha nova _lapela"
-#: ../midori/midori-view.c:2484
+#: ../midori/midori-view.c:2761
msgid "Open Link in _Foreground Tab"
msgstr "Abrir a ligazón na lapela de _primeiro plano"
-#: ../midori/midori-view.c:2485
+#: ../midori/midori-view.c:2762
msgid "Open Link in _Background Tab"
msgstr "Abrir a ligazón na lapela de _segundo plano"
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2765
msgid "Open Link in New _Window"
msgstr "Abrir a ligazón nunha _xanela nova"
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2768
msgid "Open Link as Web A_pplication"
msgstr "Abrir a ligazón como aplicativo _web"
-#: ../midori/midori-view.c:2496
+#: ../midori/midori-view.c:2773
msgid "Copy Link de_stination"
msgstr "Copiar o de_stino da ligazón"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2789
msgid "Open _Image in New Tab"
msgstr "Abrir a _imaxe nunha nova lapela"
-#: ../midori/midori-view.c:2515
+#: ../midori/midori-view.c:2792
msgid "Copy Image _Address"
msgstr "Copiar o _enderezo da imaxe"
-#: ../midori/midori-view.c:2518
+#: ../midori/midori-view.c:2795
msgid "Save I_mage"
msgstr "Gardar a i_maxe"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2798
msgid "Open in Image _Viewer"
msgstr "Abrir no _visor de imaxes"
-#: ../midori/midori-view.c:2528
+#: ../midori/midori-view.c:2805
msgid "Copy Video _Address"
msgstr "Copiar o _enderezo do vídeo"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2808
msgid "Save _Video"
msgstr "Gardar o _vídeo"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2808
msgid "Download _Video"
msgstr "Descargar o _vídeo"
-#: ../midori/midori-view.c:2557
+#: ../midori/midori-view.c:2834
msgid "Search _with"
msgstr "Buscar _con: "
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:2866
msgid "_Search the Web"
msgstr "_Buscar na rede"
-#: ../midori/midori-view.c:2606
+#: ../midori/midori-view.c:2883
msgid "Open Address in New _Tab"
msgstr "Abrir o enderezo nunha nova _lapela"
-#: ../midori/midori-view.c:2909
+#: ../midori/midori-view.c:2936
+msgid "Open _Frame in New Tab"
+msgstr "Abrir o _marco nunha nova lapela"
+
+#: ../midori/midori-view.c:3189
msgid "Open or download file"
msgstr "Abrir ou descargar o ficheiro"
-#: ../midori/midori-view.c:2929
-#, c-format
-msgid "File Type: '%s'"
-msgstr "Tipo de ficheiro: «%s»"
-
-#: ../midori/midori-view.c:2931
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Tipo de ficheiro: %s («%s»)"
-
-#: ../midori/midori-view.c:2935
+#: ../midori/midori-view.c:3213
#, c-format
msgid "File Name: %s"
msgstr "Nome de ficheiro: «%s»"
-#: ../midori/midori-view.c:2955
+#: ../midori/midori-view.c:3218
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Tipo de ficheiro: «%s»"
+
+#: ../midori/midori-view.c:3220
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Tipo de ficheiro: %s («%s»)"
+
+#: ../midori/midori-view.c:3255
+#, c-format
+msgid "Size: %s"
+msgstr "Tamaño: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3266
#, c-format
msgid "Open %s"
msgstr "Abrir %s"
-#: ../midori/midori-view.c:3576
+#: ../midori/midori-view.c:3885
#, c-format
msgid "Inspect page - %s"
msgstr "Inspeccionar a páxina - %s"
-#: ../midori/midori-view.c:3923
+#: ../midori/midori-view.c:4239
msgid "Speed Dial"
msgstr "Marcación rápida"
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
+#: ../midori/midori-view.c:4240 ../midori/midori-view.c:4336
msgid "Click to add a shortcut"
msgstr "Prema para engadir un atallo"
-#: ../midori/midori-view.c:3925
+#: ../midori/midori-view.c:4241
msgid "Enter shortcut address"
msgstr "Introduza o enderezo do atallo"
-#: ../midori/midori-view.c:3926
+#: ../midori/midori-view.c:4242
msgid "Enter shortcut title"
msgstr "Introduza o título do atallo"
-#: ../midori/midori-view.c:3927
+#: ../midori/midori-view.c:4243
msgid "Are you sure you want to delete this shortcut?"
msgstr "Está seguro de que desexa eliminar este atallo?"
-#: ../midori/midori-view.c:4089
+#: ../midori/midori-view.c:4405
#, c-format
msgid "No documentation installed"
msgstr "A documentación non está instalada"
-#: ../midori/midori-view.c:4165
+#: ../midori/midori-view.c:4482
msgid "Midori doesn't store any personal data:"
msgstr "Midori non almacena ningún dato persoal:"
-#: ../midori/midori-view.c:4166
+#: ../midori/midori-view.c:4483
msgid "No history or web cookies are being saved."
msgstr "Non se gardan cookies nin historiais."
-#: ../midori/midori-view.c:4167
+#: ../midori/midori-view.c:4484
msgid "Extensions are disabled."
msgstr "Os complementos están desactivados."
-#: ../midori/midori-view.c:4168
+#: ../midori/midori-view.c:4485
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4486
msgid "Midori prevents websites from tracking the user:"
msgstr ""
-#: ../midori/midori-view.c:4170
+#: ../midori/midori-view.c:4487
msgid "Referrer URLs are stripped down to the hostname."
msgstr ""
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:4488
msgid "DNS prefetching is disabled."
-msgstr ""
+msgstr "A oObtención previa de DNS está desactivada."
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:4489
msgid "The language and timezone are not revealed to websites."
msgstr "O idioma e o fuso horario non se revelan aos sitios web."
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:4490
msgid "Flash and other Netscape plugins cannot be listed by websites."
-msgstr ""
+msgstr "Non é posíbel listar Flash e outros complementos de Netscape nos sitios web."
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:4579
msgid "Version numbers in brackets show the version used at runtime."
msgstr ""
"Os números de versión entre os corchetes mostran a versión en tempo de "
"execución."
-#: ../midori/midori-view.c:4278
+#: ../midori/midori-view.c:4629
msgid "Page loading delayed"
msgstr "Pospúxose a carga da páxina"
-#: ../midori/midori-view.c:4279
+#: ../midori/midori-view.c:4630
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"Pospúxose a carga debido a un fallo recente ou ao inicio das preferencias."
-#: ../midori/midori-view.c:4280
+#: ../midori/midori-view.c:4631
msgid "Load Page"
msgstr "Cargar a páxina"
-#: ../midori/midori-view.c:4446
+#: ../midori/midori-view.c:4798
msgid "Blank page"
msgstr "Páxina en branco"
-#: ../midori/midori-view.c:4708
+#: ../midori/midori-view.c:5062
msgid "_Duplicate Tab"
msgstr "_Duplicar a lapela"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:5067
msgid "Show Tab _Label"
msgstr "Mostrar a _etiqueta da lapela"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:5067
msgid "Show Tab _Icon Only"
msgstr "Só mostrar a _icona da lapela"
-#: ../midori/midori-view.c:4719
-msgid "Close ot_her Tabs"
-msgstr "Pechar ou_tras lapelas"
+#: ../midori/midori-view.c:5074
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Pechar ou_tra lapela"
+msgstr[1] "Pechar ou_tras lapelas"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5532
+#: ../midori/midori-view.c:5910
msgid "previous"
msgstr "anterior"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5551
+#: ../midori/midori-view.c:5929
msgid "next"
msgstr "seguinte"
-#: ../midori/midori-view.c:5564
+#: ../midori/midori-view.c:5942
msgid "Print background images"
msgstr "Imprimir imaxes de fondo"
-#: ../midori/midori-view.c:5565
+#: ../midori/midori-view.c:5943
msgid "Whether background images should be printed"
msgstr "Se se imprimen (ou non) as imaxes de fondo"
-#: ../midori/midori-view.c:5597
+#: ../midori/midori-view.c:5975
msgid "Features"
msgstr "Funcionalidades"
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:298
msgid "Startup"
msgstr "Inicio"
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:311
msgid "Use _current page"
msgstr "Usar a páxina a_ctual"
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:315
msgid "Use current page as homepage"
msgstr "Usar a páxina actual como páxina de inicio"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:324
msgid "Fonts"
msgstr "Tipos de letra"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:327
msgid "Proportional Font Family"
msgstr "Familia de letras proporcionais"
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:331
msgid "The default font family used to display text"
msgstr "Tipo de letra predeterminado utilizada para mostrar o texto"
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:334
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:335
+#: ../midori/midori-preferences.c:336
msgid "Fixed-width Font Family"
msgstr "Tipo de letra de ancho fixo"
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:340
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:342
+#: ../midori/midori-preferences.c:343
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:344
+#: ../midori/midori-preferences.c:345
msgid "Minimum Font Size"
msgstr "Tamaño mínimo do tipo de letra"
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:349
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:359
+#: ../midori/midori-preferences.c:360
msgid "Behavior"
msgstr "Comportamento"
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:386
msgid "Allow scripts to open popups"
msgstr "Permitir que os «scripts» abran xanelas emerxentes"
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:387
msgid "Whether scripts are allowed to open popup windows automatically"
msgstr ""
"Definir se os scripts teñen permiso ou non para abrir xanelas emerxentes "
"automaticamente"
#. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:418
msgid "Browsing"
msgstr "Navegación"
#. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:458
msgid "Network"
msgstr "Rede"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:465
msgid "Hostname"
msgstr "Nome de máquina"
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:489
msgid "MB"
msgstr "MB"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:958
msgid "Add search engine"
msgstr "Engadir un motor de busca"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:958
msgid "Edit search engine"
msgstr "Editar o motor de busca"
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:986
msgid "_Name:"
msgstr "_Nome:"
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1001
msgid "_Description:"
msgstr "_Descrición"
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Icona"
+#: ../midori/midori-searchaction.c:1014 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Enderezo:"
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1033
msgid "_Token:"
msgstr "_Marca"
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1331
msgid "Manage Search Engines"
msgstr "Xestionar os motores de busca"
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1433
msgid "Use as _default"
msgstr "Usar como pre_determinado"
-#: ../midori/sokoke.c:354
+#: ../midori/sokoke.c:346
msgid "Open with"
msgstr "Abrir con"
-#: ../midori/sokoke.c:362
+#: ../midori/sokoke.c:354
#, c-format
msgid "Choose an application or command to open \"%s\":"
msgstr "Escoller un aplicativo ou orde para abrir «%s»:"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
+#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
msgid "Could not run external program."
msgstr "Non foi posíbel executar o programa externo."
-#: ../midori/sokoke.c:1595
+#: ../midori/sokoke.c:1529
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: ../midori/sokoke.c:1596
+#: ../midori/sokoke.c:1530
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: ../midori/sokoke.c:1597
+#: ../midori/sokoke.c:1531
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2055,67 +2149,67 @@ msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
+#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269
#, c-format
msgid "%s of %s"
msgstr "%s de %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
+#: ../midori/sokoke.c:1548
msgid "?B"
msgstr "?B"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
+#: ../midori/sokoke.c:1551
#, c-format
msgid " (%s/s)"
msgstr "(%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/sokoke.c:1568
#, c-format
msgid " - %s remaining"
msgstr "- restan %s"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:277
msgid "_Inline Find:"
msgstr "_Busca en liña:"
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:303
msgid "Previous"
msgstr "Anterior"
-#: ../toolbars/midori-findbar.c:323
+#: ../toolbars/midori-findbar.c:309
msgid "Next"
msgstr "Seguinte"
-#: ../toolbars/midori-findbar.c:327
+#: ../toolbars/midori-findbar.c:313
msgid "Match Case"
msgstr "Diferenciar maiúsculas de minúsculas"
-#: ../toolbars/midori-findbar.c:336
+#: ../toolbars/midori-findbar.c:322
msgid "Highlight Matches"
msgstr "Resaltar coincidencias"
-#: ../toolbars/midori-findbar.c:347
+#: ../toolbars/midori-findbar.c:333
msgid "Close Findbar"
msgstr "Pechar a barra de buscas"
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:124
#, c-format
msgid "The file '%s ' has been downloaded."
msgstr "Descargouse o ficheiro «%s »."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:127
msgid "Transfer completed"
msgstr "Transferencia completada"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:195
msgid "The downloaded file is erroneous."
msgstr "O ficheiro descargado é erróneo."
-#: ../toolbars/midori-transferbar.c:194
+#: ../toolbars/midori-transferbar.c:196
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2124,47 +2218,52 @@ msgstr ""
"Probabelmente isto signfica que o ficheiro está incompleto ou que foi "
"modificado despois do cálculo."
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:339 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Limpar todo"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:376 ../toolbars/midori-transferbar.c:378
msgid "Some files are being downloaded"
msgstr "Estanse a descargar algúns ficheiros"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:382
msgid "_Quit Midori"
msgstr "Saír de Midori"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:384
msgid "The transfers will be cancelled if Midori quits."
msgstr "Se sae de Midori hanse cancelar as transferencias."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Marcadores"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Produciuse un erro engadir o elemento ao marcadores: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Non foi posíbel actualizar o marcador: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Editar o marcador seleccionado"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Eliminar o marcador seleccionado"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Engadir un cartafol novo"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:694 ../panels/midori-history.c:635
msgid "Separator "
msgstr "Separador "
+#: ../panels/midori-bookmarks.c:1030
+msgid "Search Bookmarks"
+msgstr "Buscar marcadores"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Historial"
@@ -2188,6 +2287,11 @@ msgstr[1] "Fai %d días"
msgid "A week ago"
msgstr "Fai unha semana"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Produciuse un fallo ao eliminar o elemento do historial: %s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Esta seguro de que desexa eliminar todos os elementos do historial?"
@@ -2204,15 +2308,19 @@ msgstr "Eliminar o elemento seleccionado no historial"
msgid "Clear the entire history"
msgstr "Limpar completamente o historial"
-#: ../panels/midori-transfers.c:86
+#: ../panels/midori-history.c:1001
+msgid "Search History"
+msgstr "Buscar no historial "
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Transferencias"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
msgstr "Abrir o carta_fol de destino"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
msgstr "Copiar o enderezo da lig_azón"
@@ -2254,54 +2362,54 @@ msgstr "Non é posíbel cargar a icona de inventario «%s»"
msgid "Animation frames are broken"
msgstr "Os marcos de animación están rotos"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "A propiedade «%s» non é válida para %s"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
#: ../extensions/addons.c:308
msgid "Choose file"
msgstr "Escoller un ficheiro"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Escoller un cartafol"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Ningunha"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 hora"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 día"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 semana"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 mes"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 ano"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Preferencias de %s"
-#: ../extensions/adblock.c:473
+#: ../extensions/adblock.c:470
msgid "Configure Advertisement filters"
msgstr "Configurar os filtros de publicidade"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:503
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2311,27 +2419,27 @@ msgstr ""
"texto e prema en «Engadir» para engadila á lista. Pode atopar máis listas en "
"%s."
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:917
msgid "Edit rule"
msgstr "Editar regra"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:931
msgid "_Rule:"
msgstr "_Regra:"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:985
msgid "Bl_ock image"
msgstr "Bl_oquear a imaxe"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:990
msgid "Bl_ock link"
msgstr "Bl_oquear a ligazón"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1689
msgid "Advertisement blocker"
msgstr "Bloqueo de publicidade"
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1690
msgid "Block advertisements according to a filter list"
msgstr "Bloquear a publicidade de acordo cunha lista de filtros"
@@ -2359,63 +2467,63 @@ msgstr "_instalar un estilo de usuario"
msgid "Don't install"
msgstr "Non instalar"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:677
msgid "Userscripts"
msgstr "«Scripts» de usuario"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:679
msgid "Userstyles"
msgstr "Estilos de usuario"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Erro"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Está seguro de que desexa eliminar «%s»?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
msgid "Delete user script"
msgstr "Eliminar o «script» de usuario"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
msgid "Delete user style"
msgstr "Eliminar o estilo de usuario"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Eliminouse de forma permanente o ficheiro %s ."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:566 ../extensions/addons.c:643
msgid "Open in Text Editor"
msgstr "Abrir nun editor de texto"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:568 ../extensions/addons.c:652
msgid "Open Target Folder"
msgstr "Abrir o cartafol de destino"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:634
msgid "Add new addon"
msgstr "Engadir un novo complemento"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:660
msgid "Remove selected addon"
msgstr "Eliminar o complemento seleccionado"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
msgid "User addons"
msgstr "Complementos de usuario"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1819
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Non é posíbel monitorizar o cartafol «%s»: %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1908
msgid "Support for userscripts and userstyles"
msgstr "Compatibilidade para «scripts» e estilos de usuario"
@@ -2502,29 +2610,21 @@ msgstr ""
"Dominio : %s\n"
"Cookies : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1021
msgid "Name"
msgstr "Nome"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1072
msgid "_Expand All"
msgstr "_Expandir todo"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1080
msgid "_Collapse All"
msgstr "_Contraer todo"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr " Filtro:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Introduza unha cadea como filtro para mostrar só as cookies cuxo nome ou "
-"campo de dominio coincida co filtro de entrada"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1133
+msgid "Search Cookies by Name or Domain"
+msgstr "Buscar cookies por nome ou dominio"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2636,7 +2736,6 @@ msgid "Form history"
msgstr "Historial de formularios"
#: ../extensions/formhistory/formhistory.c:112
-#, fuzzy
msgid ""
"Master password required\n"
"to open password database"
@@ -2676,9 +2775,8 @@ msgid "Failed to execute database statement: %s\n"
msgstr "Produciuse un fallo ao executar a declaración na base de datos: %s\n"
#: ../extensions/formhistory/formhistory.c:629
-#, fuzzy
msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
-msgstr "Activar só a través das teclas de atallo (Ctrl+Shift+F) por lapela"
+msgstr "Activar o historial de formularios só a través das teclas de atallo (Ctrl+Shift+F) por lapela"
#: ../extensions/formhistory/formhistory.c:668
msgid "Form history filler"
@@ -2769,7 +2867,7 @@ msgstr "Personalizar os atallos de teclado"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "Personalizar _os atallos..."
+msgstr "Personali_zar os atallos…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2787,35 +2885,35 @@ msgstr "Reloxo na barra de estado"
msgid "Display date and time in the statusbar"
msgstr "Mostrar data e hora na barra de estado"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Imaxes"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Scripts"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Engadidos de Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Características da barra de estado"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "Alternar facilmente as características dentro e fóra de páxinas web"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Panel de lapelas"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "Panel de _lapelas"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Mostrar as lapelas nun panel vertical"
@@ -2827,11 +2925,11 @@ msgstr "De xeito predeterminado só se mostran as iconas nas lapelas"
msgid "New tabs have no label by default"
msgstr "De xeito predeterminado as novas lapelas non teñen etiqueta"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Personalizar a barra de ferramentas"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2839,27 +2937,23 @@ msgstr ""
"Seleccionar os elementos que se van mostrar na barra de ferramentas. Os "
"elementos poden reordenarse arrastrando e soltando."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Elementos dispoñíbeis"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Elementos mostrados"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Personalizar a barra de ferramen_tas..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "_Personalizar a barra de ferramentas…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Personalizar..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Editor da barra de ferramentas"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Modificar de xeito sinxelo a disposición da barra de ferramentas"
@@ -2867,6 +2961,43 @@ msgstr "Modificar de xeito sinxelo a disposición da barra de ferramentas"
msgid "Cache HTTP communication on disk"
msgstr "Gardar unha caché da comunicación HTTP no disco"
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Non foi posíbel gardar os marcadores. %s"
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Marcador"
+
+#~ msgid "_Console"
+#~ msgstr "_Consola"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Cartafol principal"
+
+#~ msgid "_Title:"
+#~ msgstr "_Título:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Cartafol:"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Pechar ou_tras lapelas"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Icona"
+
+#~ msgid "Filter:"
+#~ msgstr " Filtro:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Introduza unha cadea como filtro para mostrar só as cookies cuxo nome ou "
+#~ "campo de dominio coincida co filtro de entrada"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Personalizar…"
+
#~ msgid "Lightweight web browser"
#~ msgstr "Navegador web lixeiro"
@@ -2966,16 +3097,16 @@ msgstr "Gardar unha caché da comunicación HTTP no disco"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Engadir un novo cartafol de marcadores"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Engadir, editar ou eliminar motores de busca..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Engadir, editar ou eliminar motores de busca…"
-#~ msgid "Clear private data..."
-#~ msgstr "Limpar os datos privados..."
+#~ msgid "Clear private data…"
+#~ msgstr "Limpar os datos privados…"
-#~ msgid "Inspect page details and access developer tools..."
+#~ msgid "Inspect page details and access developer tools…"
#~ msgstr ""
#~ "Inspeccionar os detalles de páxina e acceder ás ferramentas de "
-#~ "desenvolvemento..."
+#~ "desenvolvemento…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Cambiar á lapela anterior"
@@ -3067,8 +3198,8 @@ msgstr "Gardar unha caché da comunicación HTTP no disco"
#~ msgid "Enforce a video dot density of 96 DPI"
#~ msgstr "Aplica unha densidade de puntos de vídeo de 96 DIP"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Configurar os filtros de _publicidade..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Configurar os filtros de _publicidade…"
#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
#~ msgstr ""
@@ -3400,8 +3531,5 @@ msgstr "Gardar unha caché da comunicación HTTP no disco"
#~ msgid "Enable special extensions for developers"
#~ msgstr "Activar as extensións especiais para desenvolvedores"
-#~ msgid "User_styles"
-#~ msgstr "_Estilos de usuario"
-
#~ msgid "Tint tabs distinctly"
#~ msgstr "Pintar as lapelas con cores diferentes"
diff --git a/po/he.po b/po/he.po
index 99b4989d..992b9603 100644
--- a/po/he.po
+++ b/po/he.po
@@ -589,8 +589,8 @@ msgid "Firefox (%s)"
msgstr "Firefox (%s)"
#: ../midori/midori-browser.c:4216
-msgid "Import bookmarks..."
-msgstr "ייבוא סימניות..."
+msgid "Import bookmarks…"
+msgstr "ייבוא סימניות…"
#: ../midori/midori-browser.c:4219 ../midori/midori-browser.c:5351
msgid "_Import bookmarks"
@@ -693,8 +693,8 @@ msgid "Open a file"
msgstr "פתח קובץ"
#: ../midori/midori-browser.c:5207
-msgid "_Save Page As..."
-msgstr "שמירת ה_עמוד בשם..."
+msgid "_Save Page As…"
+msgstr "שמירת ה_עמוד בשם…"
#: ../midori/midori-browser.c:5208
msgid "Save to a file"
@@ -741,8 +741,8 @@ msgid "_Edit"
msgstr "_עריכה"
#: ../midori/midori-browser.c:5261
-msgid "_Find..."
-msgstr "_חיפוש..."
+msgid "_Find…"
+msgstr "_חיפוש…"
#: ../midori/midori-browser.c:5262
msgid "Find a word or phrase in the page"
@@ -915,8 +915,8 @@ msgid "_Frequent Questions"
msgstr "שאלות _נפוצות"
#: ../midori/midori-browser.c:5400
-msgid "_Report a Problem..."
-msgstr "_דיווח על תקלה..."
+msgid "_Report a Problem…"
+msgstr "_דיווח על תקלה…"
#: ../midori/midori-browser.c:5412
msgid "_Menubar"
@@ -973,24 +973,24 @@ msgstr "מערבי (ISO-8859-1)"
#: ../midori/midori-browser.c:5459 ../midori/midori-websettings.c:242
#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:635
-msgid "Custom..."
-msgstr "מותאם..."
+msgid "Custom…"
+msgstr "מותאם…"
#: ../midori/midori-browser.c:5964
msgid "_Separator"
msgstr "קו _מפריד"
#: ../midori/midori-browser.c:5971
-msgid "_Location..."
-msgstr "_מיקום..."
+msgid "_Location…"
+msgstr "_מיקום…"
#: ../midori/midori-browser.c:5973
msgid "Open a particular location"
msgstr "פתיחת מיקום מסוים"
#: ../midori/midori-browser.c:5995
-msgid "_Web Search..."
-msgstr "חיפוש ב_רשת..."
+msgid "_Web Search…"
+msgstr "חיפוש ב_רשת…"
#: ../midori/midori-browser.c:5997
msgid "Run a web search"
@@ -1047,8 +1047,8 @@ msgid "Search with %s"
msgstr "חיפוש בעזרת %s"
#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "חיפוש באמצעות..."
+msgid "Search with…"
+msgstr "חיפוש באמצעות…"
#: ../midori/midori-locationaction.c:537
#, c-format
@@ -2725,8 +2725,8 @@ msgid "Customize Keyboard shortcuts"
msgstr "התאמת קיצורי מקלדת"
#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
-msgstr "התאמת קי_צורים..."
+msgid "Customize Sh_ortcuts…"
+msgstr "התאמת קי_צורים…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2803,12 +2803,12 @@ msgid "Displayed Items"
msgstr "פריטים מוצגים"
#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "התאמת _סרגל הכלים..."
+msgid "Customize _Toolbar…"
+msgstr "התאמת _סרגל הכלים…"
#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "התאמה _אישית..."
+msgid "_Customize…"
+msgstr "התאמה _אישית…"
#: ../extensions/toolbar-editor.c:627
msgid "Toolbar Editor"
@@ -2921,11 +2921,11 @@ msgstr "אגירת נתוני תקשורת HTTP על הכונן"
#~ msgid "Add a new bookmark folder"
#~ msgstr "הוסף תיקיית סימניות חדשה"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "הוסף, ערוך והסר מנועי חיפוש..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "הוסף, ערוך והסר מנועי חיפוש…"
-#~ msgid "Clear private data..."
-#~ msgstr "נקה נתונים אישיים..."
+#~ msgid "Clear private data…"
+#~ msgstr "נקה נתונים אישיים…"
#~ msgid "Switch to the previous tab"
#~ msgstr "עבור אל הלשונית הקודמת"
@@ -3107,8 +3107,8 @@ msgstr "אגירת נתוני תקשורת HTTP על הכונן"
#~ msgid "days"
#~ msgstr "ימים"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "הגדרת מסנני _פרסומות..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "הגדרת מסנני _פרסומות…"
#~ msgid "Next Tab (History List)"
#~ msgstr "רשימת היסטוריית לשוניות"
diff --git a/po/hr.po b/po/hr.po
index a2242d22..5a3bf9d8 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Midori\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 15:27+0000\n"
+"POT-Creation-Date: 2012-08-23 23:06+0000\n"
"PO-Revision-Date: 2010-12-22 21:45+0100\n"
"Last-Translator: Ivica Kolić \n"
"Language-Team: Croatian <>\n"
@@ -26,12 +26,28 @@ msgstr "Pretraži web"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996
-#: ../midori/main.c:2010 ../midori/midori-websettings.c:313
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:2009 ../midori/main.c:2033
+#: ../midori/main.c:2047 ../midori/midori-websettings.c:316
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Midori web preglednik"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Novi prozor privatnog pretraživanja"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1491
+msgid "New Tab"
+msgstr "Nova kartica"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1488
+msgid "New Window"
+msgstr "Novi prozor"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Web preglednik"
@@ -43,87 +59,87 @@ msgstr "Midori privatno pretraživanje"
msgid "Open a new private browsing window"
msgstr "Novi prozor privatnog pretraživanja"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4288
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4505
msgid "Private Browsing"
msgstr " (Privatno pretraživanje)"
-#: ../midori/main.c:97 ../midori/main.c:103
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Konfiguracija ne može biti učitana: %s\n"
-#: ../midori/main.c:151
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Vrijednost '%s' nije valjana za %s"
-#: ../midori/main.c:156 ../midori/main.c:260
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Neispravna konfiguracijska vrijednost '%s'"
-#: ../midori/main.c:381
+#: ../midori/main.c:375
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Tražilice ne nogu biti učitane: %s\n"
-#: ../midori/main.c:435
+#: ../midori/main.c:429
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Neuspjelo uklanjanje povijesti: %s\n"
-#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Neuspjelo otvaranje baze podataka: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:525
+#: ../midori/main.c:523
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Neuspjelo uklanjanje starih stavki povijesti: %s\n"
-#: ../midori/main.c:547
+#: ../midori/main.c:545
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Konfiguracija ne može biti spremljena. %s"
-#: ../midori/main.c:582
+#: ../midori/main.c:571
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Tražilice ne mogu biti spremljene. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:619
+#: ../midori/main.c:608
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Smeće ne može biti spremljeno. %s"
-#: ../midori/main.c:660 ../panels/midori-extensions.c:91
+#: ../midori/main.c:681 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Proširenja"
-#: ../midori/main.c:674
+#: ../midori/main.c:695
msgid "Privacy"
msgstr "Privatnost"
-#: ../midori/main.c:686
+#: ../midori/main.c:707
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
msgstr ""
-#: ../midori/main.c:742
+#: ../midori/main.c:763
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Sesija ne može biti spremljena. %s"
-#: ../midori/main.c:960
+#: ../midori/main.c:985
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
-#: ../midori/main.c:1036
+#: ../midori/main.c:1077
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -131,228 +147,225 @@ msgstr ""
"Izgleda da se Midori srušio zadnji put kad je bio otvoren.Ako se ovo događa "
"učestalo,pokušajte jednu os slijedećih opcija da biste riješili problem."
-#: ../midori/main.c:1055
+#: ../midori/main.c:1096
msgid "Modify _preferences"
msgstr "Izmjeni _osobitosti"
-#: ../midori/main.c:1059
+#: ../midori/main.c:1100
msgid "Disable all _extensions"
msgstr "Onemogući sva _proširenja"
-#: ../midori/main.c:1072
+#: ../midori/main.c:1113
msgid "Discard old tabs"
msgstr ""
-#: ../midori/main.c:1073 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1114 ../midori/midori-websettings.c:224
msgid "Show last tabs without loading"
msgstr "Pokaži zadnje kartice bez učitavanja"
-#: ../midori/main.c:1074 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1115 ../midori/midori-websettings.c:223
msgid "Show last open tabs"
msgstr "Pokaži zadnje otvorene kartice"
-#: ../midori/main.c:1321 ../midori/main.c:2399
+#: ../midori/main.c:1363 ../midori/main.c:2417
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Sesija ne može biti učitana: %s\n"
-#: ../midori/main.c:1459
+#: ../midori/main.c:1501
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Snimak spremljen u:%s\n"
-#: ../midori/main.c:1875
+#: ../midori/main.c:1917
msgid "Run ADDRESS as a web application"
msgstr "Pokreni Adresu kao web aplikaciju"
-#: ../midori/main.c:1875
+#: ../midori/main.c:1917
msgid "ADDRESS"
msgstr "ADRESA"
-#: ../midori/main.c:1878
+#: ../midori/main.c:1920
msgid "Use FOLDER as configuration folder"
msgstr "Koristi MAPU kao konfiguracijsku mapu"
-#: ../midori/main.c:1878
+#: ../midori/main.c:1920
msgid "FOLDER"
msgstr "MAPA"
-#: ../midori/main.c:1881
+#: ../midori/main.c:1923
msgid "Private browsing, no changes are saved"
msgstr "Privatno pregledavanje, promjene nisu spremljene"
-#: ../midori/main.c:1883
+#: ../midori/main.c:1925
msgid "Show a diagnostic dialog"
msgstr "Pokaži dijagnostički dijalog"
-#: ../midori/main.c:1885
+#: ../midori/main.c:1927
msgid "Run the specified filename as javascript"
msgstr "Pokreni naznačeno ime datoteke kao javascript"
-#: ../midori/main.c:1887
+#: ../midori/main.c:1929
msgid "Take a snapshot of the specified URI"
msgstr ""
-#: ../midori/main.c:1889
+#: ../midori/main.c:1931
msgid "Execute the specified command"
msgstr "Izvrši naznačenu naredbu"
-#: ../midori/main.c:1891
+#: ../midori/main.c:1933
msgid "List available commands to execute with -e/ --execute"
msgstr "Listaj dostupne naredbe za izvršavanje pomoću -e/ --execute"
-#: ../midori/main.c:1893
+#: ../midori/main.c:1935
msgid "Display program version"
msgstr "Prikaži verziju programa"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1937
msgid "Addresses"
msgstr "Adrese"
-#: ../midori/main.c:1897
+#: ../midori/main.c:1939
msgid "Block URIs according to regular expression PATTERN"
msgstr ""
-#: ../midori/main.c:1897
+#: ../midori/main.c:1939
msgid "PATTERN"
msgstr "UZORAK"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1901
+#: ../midori/main.c:1943
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr ""
-#: ../midori/main.c:1901
+#: ../midori/main.c:1943
msgid "SECONDS"
msgstr "SEKUNDE"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1946
msgid "Redirects console warnings to the specified FILENAME"
msgstr ""
-#: ../midori/main.c:1904
+#: ../midori/main.c:1946
msgid "FILENAME"
msgstr "DATOTEKA"
-#: ../midori/main.c:1969
-msgid "[Addresses]"
-msgstr "[Adrese]"
-
-#: ../midori/main.c:2011
+#: ../midori/main.c:2048
msgid "Please report comments, suggestions and bugs to:"
msgstr "Prijavite komentare,sugestije i probleme u:"
-#: ../midori/main.c:2013
+#: ../midori/main.c:2050
msgid "Check for new versions at:"
msgstr "Provjeri za nove verzije na:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2108
+#: ../midori/main.c:2145
msgid "Saved logins and _passwords"
msgstr "Spremljene prijave i _lozinke"
-#: ../midori/main.c:2110
+#: ../midori/main.c:2147
msgid "Cookies and Website data"
msgstr ""
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2114 ../midori/midori-websettings.c:997
+#: ../midori/main.c:2151 ../midori/midori-websettings.c:1021
#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
msgstr ""
-#: ../midori/main.c:2117
+#: ../midori/main.c:2154
msgid "Website icons"
msgstr "Website ikone"
-#: ../midori/main.c:2223
+#: ../midori/main.c:2258
msgid "An unknown error occured"
msgstr "Nepoznata greška"
-#: ../midori/main.c:2330
+#: ../midori/main.c:2365
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Midori instanca je već pokrenuta ali ne odgovara.\n"
-#: ../midori/main.c:2366
+#: ../midori/main.c:2399
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Zabilješke ne mogu biti učitane: %s\n"
-#: ../midori/main.c:2414
+#: ../midori/main.c:2432
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Smeće ne može biti učitano: %s\n"
-#: ../midori/main.c:2427
+#: ../midori/main.c:2445
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Povijest ne može biti učitana: %s\n"
-#: ../midori/main.c:2443
+#: ../midori/main.c:2460
msgid "The following errors occured:"
msgstr "Došlo je do slijedeće greške:"
-#: ../midori/main.c:2459
+#: ../midori/main.c:2476
msgid "_Ignore"
msgstr "_Ignoriraj"
-#: ../midori/midori-app.c:1339
-msgid "_Bookmark"
-msgstr "_Zabilješka"
+#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:557
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Neočekivana radnja '%s'."
-#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066
+#: ../midori/midori-app.c:1459 ../midori/midori-browser.c:6452
msgid "_Bookmarks"
msgstr "_Zabilješke"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1460
msgid "Add Boo_kmark"
msgstr "Dodaj za_bilješku"
-#: ../midori/midori-app.c:1342
-msgid "_Console"
-msgstr "_Konzola"
-
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1461
msgid "_Extensions"
msgstr "_Proširenja"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591
+#: ../midori/midori-app.c:1462 ../midori/midori-browser.c:4905
msgid "_History"
msgstr "_Povijest"
-#: ../midori/midori-app.c:1345
-msgid "_Homepage"
-msgstr "_Početna stranica"
-
-#: ../midori/midori-app.c:1346
+#: ../midori/midori-app.c:1463
msgid "_Userscripts"
msgstr "_Korisničke skripte"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1464
+msgid "User_styles"
+msgstr "Korisnički_stilovi"
+
+#: ../midori/midori-app.c:1465
msgid "New _Tab"
msgstr "Nova _kartica"
-#: ../midori/midori-app.c:1348
+#: ../midori/midori-app.c:1466
msgid "_Transfers"
msgstr "_Prijenosi"
-#: ../midori/midori-app.c:1349
+#: ../midori/midori-app.c:1467
msgid "Netscape p_lugins"
msgstr "Netscape p_riključci"
-#: ../midori/midori-app.c:1350
+#: ../midori/midori-app.c:1468
msgid "_Closed Tabs"
msgstr "_Zatvorene kartice"
-#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218
+#: ../midori/midori-app.c:1469 ../midori/midori-browser.c:5588
msgid "New _Window"
msgstr "Novi _prozor"
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1470
msgid "New _Folder"
msgstr "Nova _mapa"
+#: ../midori/midori-app.c:1499
+msgid "[Addresses]"
+msgstr "[Adrese]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Datoteka nije pronađena."
@@ -370,140 +383,133 @@ msgstr "Neprepoznati format zabilješke."
msgid "Writing failed."
msgstr "Neuspjelo pisanje."
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5676
+#: ../midori/midori-browser.c:5685
msgid "Reload the current page"
msgstr "Učitaj ponovo trenutnu stranicu"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:368 ../midori/midori-browser.c:5682
msgid "Stop loading the current page"
msgstr "Prestani učitavati trenutnu stranicu"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:376 ../midori/midori-browser.c:5727
+msgid "Go forward to the next page"
+msgstr "Naprijed na idući stranicu"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:383 ../midori/midori-browser.c:5735
+#: ../midori/midori-browser.c:5738
+msgid "Go to the next sub-page"
+msgstr "Idi na iduću podstranicu"
+
+#: ../midori/midori-browser.c:542
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Neuspjeh u ažuriranju naslova: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Neočekivana radnja '%s'."
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:637
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Privatno pretraživanje)"
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr ""
+#: ../midori/midori-browser.c:747 ../midori/midori-browser.c:789
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Zabilješke"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:849
msgid "New folder"
msgstr "Nova mapa"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:849
msgid "Edit folder"
msgstr "Uredi mapu"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:851
msgid "New bookmark"
msgstr "Nova zabilješka"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:851
msgid "Edit bookmark"
msgstr "Uredi zabilješku"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Naslov:"
+#: ../midori/midori-browser.c:885
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr ""
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Adresa:"
-
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328
-msgid "_Folder:"
-msgstr "_Mapa:"
-
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:946
msgid "Add to _Speed Dial"
msgstr "Dodaj u _brzo biranje"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:952
msgid "Show in the tool_bar"
msgstr "Prikaži u alatnoj_traci"
-#: ../midori/midori-browser.c:905
+#: ../midori/midori-browser.c:960
msgid "Run as _web application"
msgstr "Pokreni kao _web aplikaciju"
-#: ../midori/midori-browser.c:976
+#: ../midori/midori-browser.c:1031
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "Datoteka \"%s\" ne može biti spremljena u ovoj mapi."
-#: ../midori/midori-browser.c:978
+#: ../midori/midori-browser.c:1033
#, c-format
msgid "You don't have permission to write in this location."
msgstr "Nemate dozvole za pisanje na ovoj lokaciji."
-#: ../midori/midori-browser.c:985
+#: ../midori/midori-browser.c:1040
#, c-format
msgid "There is not enough free space to download \"%s\"."
msgstr "Nema dovoljno slobodnog prostora za preuzimanje \"%s\"."
-#: ../midori/midori-browser.c:988
+#: ../midori/midori-browser.c:1043
#, c-format
msgid "The file needs %s but only %s are left."
msgstr "Datoteci je potrebno %s ali samo %s je preostalo."
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397
+#: ../midori/midori-browser.c:1179 ../midori/midori-browser.c:4709
msgid "Save file as"
msgstr "Spremi datoteku kao"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Novi prozor"
+#: ../midori/midori-browser.c:1185
+msgid "Save associated _resources"
+msgstr ""
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1488
msgid "A new window has been opened"
msgstr "Otvoren je novi prozor"
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Nova kartica"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1491
msgid "A new tab has been opened"
msgstr "Otvorena je nova kartica"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1508
msgid "Error opening the image!"
msgstr "Greška pri otvaranju slike!"
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1509
msgid "Can not open selected image in a default viewer."
msgstr "Ne mogu otvoriti odabranu sliku u zadanom pregledniku."
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1515
msgid "Error downloading the image!"
msgstr "Greška pri preuzimanju slike!"
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1516
msgid "Can not download selected image."
msgstr "Ne mogu preuzeti odabranu sliku."
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1637
msgid "Save file"
msgstr "Spremi datoteku"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2540
msgid "Open file"
msgstr "Otvori datoteku"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2672
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -512,139 +518,153 @@ msgid ""
"automatically."
msgstr ""
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2678 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr ""
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2721 ../midori/midori-browser.c:5751
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Dodaj novu zabilješku"
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3265 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Prazno"
-#: ../midori/midori-browser.c:3469
+#: ../midori/midori-browser.c:3711 ../midori/midori-browser.c:3712
msgid "Toggle text cursor navigation"
msgstr ""
-#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759
+#: ../midori/midori-browser.c:3714
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+
+#: ../midori/midori-browser.c:3717
+msgid "_Enable Caret Browsing"
+msgstr ""
+
+#: ../midori/midori-browser.c:4109 ../midori/midori-browser.c:6145
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n"
-#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745
-#: ../panels/midori-history.c:803
+#: ../midori/midori-browser.c:4435 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Otvori sve u _karticama"
-#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Otvori u novoj _kartici"
-#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2688
-#: ../midori/midori-view.c:4828 ../panels/midori-bookmarks.c:753
-#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4445 ../midori/midori-view.c:2944
+#: ../midori/midori-view.c:5082 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Otvori u novom _prozoru"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4534
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4535
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4536
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4537
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4219
+#: ../midori/midori-browser.c:4538
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4220
+#: ../midori/midori-browser.c:4539
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4241
-msgid "Import bookmarks..."
+#: ../midori/midori-browser.c:4540
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4561
+msgid "Import bookmarks…"
msgstr "Uvezi zabilješke..."
-#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:4564 ../midori/midori-browser.c:5756
msgid "_Import bookmarks"
msgstr "_Uvezi zabilješke"
-#: ../midori/midori-browser.c:4255
+#: ../midori/midori-browser.c:4575
msgid "_Application:"
msgstr "_Program:"
-#: ../midori/midori-browser.c:4320
+#: ../midori/midori-browser.c:4640
msgid "Import from XBEL or HTML file"
msgstr "Uvezi iz XBEL ili HTML datoteke"
-#: ../midori/midori-browser.c:4355
+#: ../midori/midori-browser.c:4668
msgid "Import from a file"
msgstr "Uvezi iz datoteke"
-#: ../midori/midori-browser.c:4367
+#: ../midori/midori-browser.c:4680
msgid "Failed to import bookmarks"
msgstr "Neuspjeli uvoz zabilješki"
-#: ../midori/midori-browser.c:4402
+#: ../midori/midori-browser.c:4714
msgid "XBEL Bookmarks"
msgstr "XBEL zabilješke"
-#: ../midori/midori-browser.c:4407
+#: ../midori/midori-browser.c:4719
msgid "Netscape Bookmarks"
msgstr "Netscape zabilješke"
-#: ../midori/midori-browser.c:4421
+#: ../midori/midori-browser.c:4733
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "MIdori može izvesti samo u XBEL (*.xbel) i Netscape (*.html)"
-#: ../midori/midori-browser.c:4436
+#: ../midori/midori-browser.c:4748
msgid "Failed to export bookmarks"
msgstr "Neuspjeli izvoz zabilješki"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4558
+#: ../midori/midori-browser.c:4870
msgid "Clear Private Data"
msgstr "Očisti privatne podatke"
-#: ../midori/midori-browser.c:4562
+#: ../midori/midori-browser.c:4874
msgid "_Clear private data"
msgstr "_Očisti privatne podatke"
-#: ../midori/midori-browser.c:4575
+#: ../midori/midori-browser.c:4889
msgid "Clear the following data:"
msgstr "Očisti slijedeće podatke:"
-#: ../midori/midori-browser.c:4585
+#: ../midori/midori-browser.c:4899
msgid "Last open _tabs"
msgstr "Zadnje otvorene _kartice"
-#: ../midori/midori-browser.c:4611
+#: ../midori/midori-browser.c:4925
msgid "Clear private data when _quitting Midori"
msgstr "Očisti privatne podatke kad _isključuješ Midori"
-#: ../midori/midori-browser.c:4806
+#: ../midori/midori-browser.c:5140
msgid "A lightweight web browser."
msgstr "Lagani web preglednik"
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:5141
msgid "See about:version for version info."
msgstr "Vidi about:version za informacije o verziji"
-#: ../midori/midori-browser.c:4809
+#: ../midori/midori-browser.c:5143
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -652,367 +672,369 @@ msgid ""
"option) any later version."
msgstr ""
-#: ../midori/midori-browser.c:4830
+#: ../midori/midori-browser.c:5173
msgid "translator-credits"
msgstr "Ivica Kolić "
-#: ../midori/midori-browser.c:5216
+#: ../midori/midori-browser.c:5586
msgid "_File"
msgstr "_Datoteka"
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5589
msgid "Open a new window"
msgstr "Otvori u novom prozoru"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5592
msgid "Open a new tab"
msgstr "Otvori novu karticu"
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5594
msgid "New P_rivate Browsing Window"
msgstr "Novi p_rozor privatnog pretraživanja"
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5598
msgid "Open a file"
msgstr "Otvori datoteku"
-#: ../midori/midori-browser.c:5230
-msgid "_Save Page As..."
+#: ../midori/midori-browser.c:5600
+msgid "_Save Page As…"
msgstr "_Spremi stranicu kao..."
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5601
msgid "Save to a file"
msgstr "Spremi u datoteku"
-#: ../midori/midori-browser.c:5233
+#: ../midori/midori-browser.c:5603
msgid "Add to Speed _dial"
msgstr "Dodaj u Brzo _biranje"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5607
msgid "Add Shortcut to the _desktop"
msgstr "Dodaj prečac na _radnu površinu"
-#: ../midori/midori-browser.c:5239
+#: ../midori/midori-browser.c:5609
msgid "Create _Launcher"
msgstr "Napravi _pokretač"
-#: ../midori/midori-browser.c:5243
+#: ../midori/midori-browser.c:5613
msgid "Subscribe to News _feed"
msgstr ""
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5619
msgid "_Close Tab"
msgstr "_Zatvori karticu"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5620
msgid "Close the current tab"
msgstr "Zatvori trenutnu karticu"
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5622
msgid "C_lose Window"
msgstr "Z_atvori prozor"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5626
+msgid "_Share"
+msgstr ""
+
+#: ../midori/midori-browser.c:5631
msgid "Print the current page"
msgstr "Ispiši trenutnu stranicu"
-#: ../midori/midori-browser.c:5258
+#: ../midori/midori-browser.c:5634
msgid "Close a_ll Windows"
msgstr "Zatvori s_ve prozore"
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5637
msgid "_Edit"
msgstr "_Uredi"
-#: ../midori/midori-browser.c:5284
-msgid "_Find..."
+#: ../midori/midori-browser.c:5660
+msgid "_Find…"
msgstr "_Nađi..."
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5661
msgid "Find a word or phrase in the page"
msgstr "Nađi riječ ili frazu na stranici"
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5663
msgid "Find _Next"
msgstr "Nađi _slijedeće"
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5666
msgid "Find _Previous"
msgstr "Nađi _prethodno"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5670
msgid "Configure the application preferences"
msgstr "Konfiguriraj postavke programa"
-#: ../midori/midori-browser.c:5296
+#: ../midori/midori-browser.c:5672
msgid "_View"
msgstr "_Pogled"
-#: ../midori/midori-browser.c:5297
+#: ../midori/midori-browser.c:5673
msgid "_Toolbars"
msgstr "_Alatne trake"
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5678
msgid "Reload page without caching"
msgstr ""
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5688
msgid "Increase the zoom level"
msgstr "Povećaj zoom razinu"
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5691
msgid "Decrease the zoom level"
msgstr "Smanji zoom razinu"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5695
msgid "_Encoding"
msgstr "_Kodiranje"
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5697
msgid "View So_urce"
msgstr ""
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5700
msgid "Ca_ret Browsing"
msgstr ""
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5704
msgid "Toggle fullscreen view"
msgstr ""
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5706
msgid "Scroll _Left"
msgstr "Kliži _Lijevo"
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5709
msgid "Scroll _Down"
msgstr "Kliži _Dolje"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5712
msgid "Scroll _Up"
msgstr "Kliži _Gore"
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5715
msgid "Scroll _Right"
msgstr "Kližu _Desno"
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5718
+msgid "_Readable"
+msgstr ""
+
+#: ../midori/midori-browser.c:5721
msgid "_Go"
msgstr "_Idi"
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5724
msgid "Go back to the previous page"
msgstr "Natrag na prethodnu stranicu"
-#: ../midori/midori-browser.c:5348
-msgid "Go forward to the next page"
-msgstr "Naprijed na idući stranicu"
-
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5352
+#: ../midori/midori-browser.c:5731
msgid "Go to the previous sub-page"
msgstr "Idi na prethodnu podstranicu"
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5356
-msgid "Go to the next sub-page"
-msgstr "Idi na iduću podstranicu"
+#: ../midori/midori-browser.c:5740
+msgid "_Homepage"
+msgstr "_Početna stranica"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5741
msgid "Go to your homepage"
msgstr "Idi na svoju početnu stranicu"
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5743
msgid "Empty Trash"
msgstr "Isprazni smeće"
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5746
msgid "Undo _Close Tab"
msgstr "Poništi _zatvori karticu"
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5753
msgid "Add a new _folder"
msgstr "Dodaj novu _mapu"
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5759
msgid "_Export bookmarks"
msgstr "_Izvezi zabilješke"
-#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5762 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "_Upravljaj tražilicama"
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5765
msgid "_Clear Private Data"
msgstr "_Očisti privatne podatke"
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5768
msgid "_Inspect Page"
msgstr ""
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5772
msgid "_Previous Tab"
msgstr "_Prethodna kartica"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5775
msgid "_Next Tab"
msgstr "_Slijedeća kartica"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5777
msgid "Move Tab _Backward"
msgstr "_Premjesti karticu unazad"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5779
msgid "_Move Tab Forward"
msgstr "_Premjesti karticu naprijed"
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5782
msgid "Focus _Current Tab"
msgstr ""
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5785
msgid "Focus _Next view"
msgstr ""
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5788
msgid "Only show the Icon of the _Current Tab"
msgstr "Pokaži samo ikonu _trenutne kartice"
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5791
msgid "_Duplicate Current Tab"
msgstr "_Udvostruči trenutnu karticu"
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5794
msgid "Close Ot_her Tabs"
msgstr "Zatvori dr_uge kartice"
-#: ../midori/midori-browser.c:5415
+#: ../midori/midori-browser.c:5797
msgid "Open last _session"
msgstr "Otvori posljednju _sesiju"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5800
msgid "_Help"
msgstr "_Pomoć"
-#: ../midori/midori-browser.c:5420
+#: ../midori/midori-browser.c:5802
msgid "_Frequent Questions"
msgstr "_Česta pitanja"
-#: ../midori/midori-browser.c:5423
-msgid "_Report a Problem..."
+#: ../midori/midori-browser.c:5805
+msgid "_Report a Problem…"
msgstr "_Prijavite problem..."
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5810 ../midori/midori-browser.c:6471
+msgid "_Tools"
+msgstr "_Alati"
+
+#: ../midori/midori-browser.c:5817
msgid "_Menubar"
msgstr "_Traka izbornika"
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5821
msgid "_Navigationbar"
msgstr "_Navigacijska traka"
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5825
msgid "Side_panel"
msgstr "Bočni_stupac"
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:5826
msgid "Sidepanel"
msgstr "Bočni stupac"
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5829
msgid "_Bookmarkbar"
msgstr "_Traka zabilješki"
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5833
msgid "_Statusbar"
msgstr "_Statusna traka"
-#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312
+#: ../midori/midori-browser.c:5842 ../midori/midori-websettings.c:315
msgid "_Automatic"
msgstr "_Automatski"
-#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236
+#: ../midori/midori-browser.c:5845 ../midori/midori-websettings.c:239
msgid "Chinese Traditional (BIG5)"
msgstr "Tradicionalni kineski (BIG5)"
-#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237
+#: ../midori/midori-browser.c:5848 ../midori/midori-websettings.c:240
msgid "Chinese Simplified (GB18030)"
msgstr "Pojednostavljeni kineski (GB18030)"
#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5470
+#: ../midori/midori-browser.c:5852
msgid "Japanese (SHIFT__JIS)"
msgstr "Japanski (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5855 ../midori/midori-websettings.c:242
msgid "Korean (EUC-KR)"
msgstr "Korejski (EUC-KR)"
-#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5858 ../midori/midori-websettings.c:243
msgid "Russian (KOI8-R)"
msgstr "Ruski (KOI8-R)"
-#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5861 ../midori/midori-websettings.c:244
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242
+#: ../midori/midori-browser.c:5864 ../midori/midori-websettings.c:245
msgid "Western (ISO-8859-1)"
msgstr "Zapadni (ISO-8859-1)"
-#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243
-#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641
-msgid "Custom..."
+#: ../midori/midori-browser.c:5867
+msgid "Custom…"
msgstr "Prilagođeno..."
-#: ../midori/midori-browser.c:5991
+#: ../midori/midori-browser.c:6377
msgid "_Separator"
msgstr "_Razdjelnik"
-#: ../midori/midori-browser.c:5998
-msgid "_Location..."
+#: ../midori/midori-browser.c:6384
+msgid "_Location…"
msgstr "_Lokacija..."
-#: ../midori/midori-browser.c:6000
+#: ../midori/midori-browser.c:6386
msgid "Open a particular location"
msgstr "Otvori određenu lokaciju"
-#: ../midori/midori-browser.c:6022
-msgid "_Web Search..."
+#: ../midori/midori-browser.c:6408
+msgid "_Web Search…"
msgstr "_Web pretraživanje..."
-#: ../midori/midori-browser.c:6024
+#: ../midori/midori-browser.c:6410
msgid "Run a web search"
msgstr "Pokreni web pretraživanje"
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:6437
msgid "Reopen a previously closed tab or window"
msgstr "Ponovno otvori prethodno zatvorenu karticu ili prozor"
-#: ../midori/midori-browser.c:6068
+#: ../midori/midori-browser.c:6454
msgid "Show the saved bookmarks"
msgstr "Pokaži spremljene zabilješke"
-#: ../midori/midori-browser.c:6085
-msgid "_Tools"
-msgstr "_Alati"
-
-#: ../midori/midori-browser.c:6101
+#: ../midori/midori-browser.c:6487
msgid "_Window"
msgstr "_Prozor"
-#: ../midori/midori-browser.c:6103
+#: ../midori/midori-browser.c:6489
msgid "Show a list of all open tabs"
msgstr "Pokaži listu svih otvorenih kartica"
-#: ../midori/midori-browser.c:6117
+#: ../midori/midori-browser.c:6503
msgid "_Menu"
msgstr "_Izbornik"
-#: ../midori/midori-browser.c:6119
+#: ../midori/midori-browser.c:6505
msgid "Menu"
msgstr "Izbornik"
-#: ../midori/midori-browser.c:6933
+#: ../midori/midori-browser.c:7330
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Neočekivana postavka '%s'"
@@ -1024,979 +1046,1057 @@ msgstr "Konfiguracija proširenja '%s' ne može biti učitana: %s\n"
#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../extensions/addons.c:1688
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "Konfiguracija proširenja '%s' ne može biti spremljena: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "Traži pomoću %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
msgstr "Traži pomoću..."
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "Neuspjeli odabir iz povijesti\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "Traži %s"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr ""
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "Zalijepi i n_astavi"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "Nije provjereno"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "Provjerena i šifrirana veza"
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1989
msgid "Open, unencrypted connection"
msgstr ""
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Poravnaj bočni stupac desno"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Zatvori panel"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Poravnaj bočni stupac lijevo"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:221
msgid "Show Speed Dial"
msgstr "Pokaži brzo biranje"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:222
msgid "Show Homepage"
msgstr "Pokaži početnu stranicu"
-#: ../midori/midori-websettings.c:238
+#: ../midori/midori-websettings.c:241
msgid "Japanese (SHIFT_JIS)"
msgstr "Japanski (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:246 ../midori/midori-websettings.c:322
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Prilagođeno..."
+
+#: ../midori/midori-websettings.c:261
msgid "New tab"
msgstr "Nova kartica"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:262
msgid "New window"
msgstr "Novi prozor"
-#: ../midori/midori-websettings.c:260
+#: ../midori/midori-websettings.c:263
msgid "Current tab"
msgstr "Trenutna kartica"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:278
msgid "Default"
msgstr "Zadano"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:279
msgid "Icons"
msgstr "Ikone"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:280
msgid "Small icons"
msgstr "Male ikone"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:281
msgid "Text"
msgstr "Tekst"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:282
msgid "Icons and text"
msgstr "Ikone i tekst"
-#: ../midori/midori-websettings.c:280
+#: ../midori/midori-websettings.c:283
msgid "Text beside icons"
msgstr "Tekst pored ikona"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:298
msgid "Automatic (GNOME or environment)"
msgstr "Automatski (GNOME ili okruženje)"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:299
msgid "HTTP proxy server"
msgstr "HTTP proxy poslužitelj"
-#: ../midori/midori-websettings.c:297
+#: ../midori/midori-websettings.c:300
msgid "No proxy server"
msgstr "Nema proxy poslužitelja"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:317
+msgid "Chrome"
+msgstr ""
+
+#: ../midori/midori-websettings.c:318
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:319
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:320
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:317
+#: ../midori/midori-websettings.c:321
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:405
msgid "Remember last window size"
msgstr "Zapamti zadnu veličinu prozora"
-#: ../midori/midori-websettings.c:402
+#: ../midori/midori-websettings.c:406
msgid "Whether to save the last window size"
msgstr "Da li spremiti zadnju veličinu prozora"
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:414
msgid "Last window width"
msgstr "Zadnja širina prozora"
-#: ../midori/midori-websettings.c:411
+#: ../midori/midori-websettings.c:415
msgid "The last saved window width"
msgstr "Zadnja sačuvana širina prozora"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:423
msgid "Last window height"
msgstr "zadnja visina prozora"
-#: ../midori/midori-websettings.c:420
+#: ../midori/midori-websettings.c:424
msgid "The last saved window height"
msgstr "Zadnja sačuvana visina prozora"
-#: ../midori/midori-websettings.c:445
+#: ../midori/midori-websettings.c:449
msgid "Last panel position"
msgstr "Zadnja pozicija ploče"
-#: ../midori/midori-websettings.c:446
+#: ../midori/midori-websettings.c:450
msgid "The last saved panel position"
msgstr "Zadnja spremljena pozicija ploče"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:455
+#: ../midori/midori-websettings.c:459
msgid "Last panel page"
msgstr "Zadnja stranica ploče"
-#: ../midori/midori-websettings.c:456
+#: ../midori/midori-websettings.c:460
msgid "The last saved panel page"
msgstr "Zadnja spremljena stranica ploče"
-#: ../midori/midori-websettings.c:464
+#: ../midori/midori-websettings.c:468
msgid "Last Web search"
msgstr "Zadnje Web pretraživanje"
-#: ../midori/midori-websettings.c:465
+#: ../midori/midori-websettings.c:469
msgid "The last saved Web search"
msgstr "Zadnje sačuvano Web pretraživanje"
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:493
msgid "Show Menubar"
msgstr "Pokaži traku izbornika"
-#: ../midori/midori-websettings.c:475
+#: ../midori/midori-websettings.c:494
msgid "Whether to show the menubar"
msgstr "Da li pokazati izbornik"
-#: ../midori/midori-websettings.c:483
+#: ../midori/midori-websettings.c:502
msgid "Show Navigationbar"
msgstr "Pokaži navigacijsku traku"
-#: ../midori/midori-websettings.c:484
+#: ../midori/midori-websettings.c:503
msgid "Whether to show the navigationbar"
msgstr "Da li pokazati navigacijsku traku"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:511
msgid "Show Bookmarkbar"
msgstr "Pokaži traku zabilješki"
-#: ../midori/midori-websettings.c:493
+#: ../midori/midori-websettings.c:512
msgid "Whether to show the bookmarkbar"
msgstr "Da li pokazati traku zabilješki"
-#: ../midori/midori-websettings.c:501
+#: ../midori/midori-websettings.c:520
msgid "Show Panel"
msgstr "Pokaži ploču"
-#: ../midori/midori-websettings.c:502
+#: ../midori/midori-websettings.c:521
msgid "Whether to show the panel"
msgstr "Da li pokazati ploču"
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:529
msgid "Show Statusbar"
msgstr "Pokaži statusnu traku"
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:530
msgid "Whether to show the statusbar"
msgstr "Da li pokazati statusnu traku"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:539
msgid "Toolbar Style:"
msgstr "Stil alatne trake"
-#: ../midori/midori-websettings.c:521
+#: ../midori/midori-websettings.c:540
msgid "The style of the toolbar"
msgstr "Stil alatne trake"
-#: ../midori/midori-websettings.c:530
+#: ../midori/midori-websettings.c:549
msgid "Toolbar Items"
msgstr "Stavke alatne trake"
-#: ../midori/midori-websettings.c:531
+#: ../midori/midori-websettings.c:550
msgid "The items to show on the toolbar"
msgstr "Stavke za prikazivanje u alatnoj traci"
-#: ../midori/midori-websettings.c:539
+#: ../midori/midori-websettings.c:558
msgid "Compact Sidepanel"
msgstr "Zbijeni bočni stupac"
-#: ../midori/midori-websettings.c:540
+#: ../midori/midori-websettings.c:559
msgid "Whether to make the sidepanel compact"
msgstr "Da li bočni stupac učiniti zbijenim"
-#: ../midori/midori-websettings.c:555
+#: ../midori/midori-websettings.c:574
msgid "Align sidepanel on the right"
msgstr "Poravnaj bočni stupac desno"
-#: ../midori/midori-websettings.c:556
+#: ../midori/midori-websettings.c:575
msgid "Whether to align the sidepanel on the right"
msgstr "Da li poravnati bočni stupac lijevo"
-#: ../midori/midori-websettings.c:571
+#: ../midori/midori-websettings.c:590
msgid "Open panels in separate windows"
msgstr "Otvori ploče u zasebnim prozorima"
-#: ../midori/midori-websettings.c:572
+#: ../midori/midori-websettings.c:591
msgid "Whether to always open panels in separate windows"
msgstr "Da li uvijek otvarati ploče u odvojenim prozorima"
-#: ../midori/midori-websettings.c:581
+#: ../midori/midori-websettings.c:600
msgid "When Midori starts:"
msgstr "Kad se Midori pokrene:"
-#: ../midori/midori-websettings.c:582
+#: ../midori/midori-websettings.c:601
msgid "What to do when Midori starts"
msgstr "Što učiniti kad se Midori pokrene"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:610
msgid "Homepage:"
msgstr "Početna stranica:"
-#: ../midori/midori-websettings.c:592
+#: ../midori/midori-websettings.c:611
msgid "The homepage"
msgstr "početna stranica"
-#: ../midori/midori-websettings.c:607
+#: ../midori/midori-websettings.c:626
msgid "Show crash dialog"
msgstr "Pokaži dijalog rušenja"
-#: ../midori/midori-websettings.c:608
+#: ../midori/midori-websettings.c:627
msgid "Show a dialog after Midori crashed"
msgstr "Pokaži dijalog nakon što se Midori sruši"
-#: ../midori/midori-websettings.c:616
+#: ../midori/midori-websettings.c:635
msgid "Save downloaded files to:"
msgstr "Spremi preuzimanja u"
-#: ../midori/midori-websettings.c:617
+#: ../midori/midori-websettings.c:636
msgid "The folder downloaded files are saved to"
msgstr "Mapa preuzetih datoteka je spremljena u"
-#: ../midori/midori-websettings.c:625
+#: ../midori/midori-websettings.c:644
msgid "Text Editor"
msgstr "Uređivač teksta"
-#: ../midori/midori-websettings.c:626
+#: ../midori/midori-websettings.c:645
msgid "An external text editor"
msgstr "Vanjski uređivač teksta"
-#: ../midori/midori-websettings.c:641
+#: ../midori/midori-websettings.c:660
msgid "News Aggregator"
msgstr ""
-#: ../midori/midori-websettings.c:642
+#: ../midori/midori-websettings.c:661
msgid "An external news aggregator"
msgstr ""
-#: ../midori/midori-websettings.c:650
+#: ../midori/midori-websettings.c:669
msgid "Location entry Search"
msgstr ""
-#: ../midori/midori-websettings.c:651
+#: ../midori/midori-websettings.c:670
msgid "The search to perform inside the location entry"
msgstr ""
-#: ../midori/midori-websettings.c:659
+#: ../midori/midori-websettings.c:678
msgid "Preferred Encoding"
msgstr "Željeno kodiranje"
-#: ../midori/midori-websettings.c:660
+#: ../midori/midori-websettings.c:679
msgid "The preferred character encoding"
msgstr "Željeno kodiranje znakova"
-#: ../midori/midori-websettings.c:670
+#: ../midori/midori-websettings.c:689
msgid "Always Show Tabbar"
msgstr "Uvijek pokaži Traku kartica"
-#: ../midori/midori-websettings.c:671
+#: ../midori/midori-websettings.c:690
msgid "Always show the tabbar"
msgstr "Uvijek pokaži traku kartica"
-#: ../midori/midori-websettings.c:684
+#: ../midori/midori-websettings.c:703
msgid "Close Buttons on Tabs"
msgstr "Zatvori dugmad na karticama"
-#: ../midori/midori-websettings.c:685
+#: ../midori/midori-websettings.c:704
msgid "Whether tabs have close buttons"
msgstr ""
-#: ../midori/midori-websettings.c:710
+#: ../midori/midori-websettings.c:729
msgid "Open new pages in:"
msgstr "Otvori nove stranice u:"
-#: ../midori/midori-websettings.c:711
+#: ../midori/midori-websettings.c:730
msgid "Where to open new pages"
msgstr "Gdje otvoriti nove stranice"
-#: ../midori/midori-websettings.c:720
+#: ../midori/midori-websettings.c:739
msgid "Middle click opens Selection"
msgstr "Srednji klik otvara odabir"
-#: ../midori/midori-websettings.c:721
+#: ../midori/midori-websettings.c:740
msgid "Load an address from the selection via middle click"
msgstr "Učitaj adresu iz odabira pomoću srednjeg klika"
-#: ../midori/midori-websettings.c:729
+#: ../midori/midori-websettings.c:748
msgid "Open tabs in the background"
msgstr "Otvori kartice u pozadini"
-#: ../midori/midori-websettings.c:730
+#: ../midori/midori-websettings.c:749
msgid "Whether to open new tabs in the background"
msgstr "Da li otvoriti nove kartice u pozadini"
-#: ../midori/midori-websettings.c:738
+#: ../midori/midori-websettings.c:757
msgid "Open Tabs next to Current"
msgstr "Otvori kartice do trenutne"
-#: ../midori/midori-websettings.c:739
+#: ../midori/midori-websettings.c:758
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr ""
-#: ../midori/midori-websettings.c:747
+#: ../midori/midori-websettings.c:766
msgid "Open popups in tabs"
msgstr ""
-#: ../midori/midori-websettings.c:748
+#: ../midori/midori-websettings.c:767
msgid "Whether to open popup windows in tabs"
msgstr ""
-#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134
+#: ../midori/midori-websettings.c:777 ../extensions/statusbar-features.c:155
msgid "Load images automatically"
msgstr "Učitaj slike automatski"
-#: ../midori/midori-websettings.c:759
+#: ../midori/midori-websettings.c:778
msgid "Load and display images automatically"
msgstr "Učitaj i prikaži slike automatski"
-#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143
+#: ../midori/midori-websettings.c:785 ../extensions/statusbar-features.c:165
msgid "Enable scripts"
msgstr "Omogući skripte"
-#: ../midori/midori-websettings.c:767
+#: ../midori/midori-websettings.c:786
msgid "Enable embedded scripting languages"
msgstr ""
-#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154
+#: ../midori/midori-websettings.c:793 ../extensions/statusbar-features.c:177
msgid "Enable Netscape plugins"
msgstr "Omogući Netscape priključke"
-#: ../midori/midori-websettings.c:775
+#: ../midori/midori-websettings.c:794
msgid "Enable embedded Netscape plugin objects"
msgstr ""
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:809
msgid "Enable Spell Checking"
msgstr "Omogući provjeru pravopisa"
-#: ../midori/midori-websettings.c:791
+#: ../midori/midori-websettings.c:810
msgid "Enable spell checking while typing"
msgstr "Omogući provjeru pravopisa dok pišem"
-#: ../midori/midori-websettings.c:797
+#: ../midori/midori-websettings.c:816
msgid "Enable HTML5 database support"
msgstr "Omogući podršku za HTML5 bazu podataka"
-#: ../midori/midori-websettings.c:798
+#: ../midori/midori-websettings.c:817
msgid "Whether to enable HTML5 database support"
msgstr "Da li omogućiti podršku za HTML bazu podataka"
-#: ../midori/midori-websettings.c:804
+#: ../midori/midori-websettings.c:823
msgid "Enable HTML5 local storage support"
msgstr "Omogući podršku za HTML5 lokalnu pohranu"
-#: ../midori/midori-websettings.c:805
+#: ../midori/midori-websettings.c:824
msgid "Whether to enable HTML5 local storage support"
msgstr "Da li omogućiti podršku za HTML5 lokalnu pohranu"
-#: ../midori/midori-websettings.c:811
+#: ../midori/midori-websettings.c:830
msgid "Enable offline web application cache"
msgstr ""
-#: ../midori/midori-websettings.c:812
+#: ../midori/midori-websettings.c:831
msgid "Whether to enable offline web application cache"
msgstr ""
-#: ../midori/midori-websettings.c:828
+#: ../midori/midori-websettings.c:852
msgid "Flash window on background tabs"
msgstr ""
-#: ../midori/midori-websettings.c:829
+#: ../midori/midori-websettings.c:853
msgid "Flash the browser window if a new tab was opened in the background"
msgstr ""
-#: ../midori/midori-websettings.c:837
+#: ../midori/midori-websettings.c:861
msgid "Enable WebGL support"
msgstr "Omogući WebGL podršku "
-#: ../midori/midori-websettings.c:838
+#: ../midori/midori-websettings.c:862
msgid "Allow websites to use OpenGL rendering"
msgstr ""
-#: ../midori/midori-websettings.c:864
+#: ../midori/midori-websettings.c:888
msgid "Zoom Text and Images"
msgstr "Zumiraj tekst i slike"
-#: ../midori/midori-websettings.c:865
+#: ../midori/midori-websettings.c:889
msgid "Whether to zoom text and images"
msgstr "Da li zumirati tekst i slike"
-#: ../midori/midori-websettings.c:880
+#: ../midori/midori-websettings.c:904
msgid "Find inline while typing"
msgstr ""
-#: ../midori/midori-websettings.c:881
+#: ../midori/midori-websettings.c:905
msgid "Whether to automatically find inline while typing"
msgstr ""
-#: ../midori/midori-websettings.c:896
+#: ../midori/midori-websettings.c:920
msgid "Kinetic scrolling"
msgstr ""
-#: ../midori/midori-websettings.c:897
+#: ../midori/midori-websettings.c:921
msgid "Whether scrolling should kinetically move according to speed"
msgstr ""
-#: ../midori/midori-websettings.c:905
+#: ../midori/midori-websettings.c:929
msgid "Delete old Cookies after:"
msgstr "Obriši stare kolačiće nakon:"
-#: ../midori/midori-websettings.c:906
+#: ../midori/midori-websettings.c:930
msgid "The maximum number of days to save cookies for"
msgstr "Maksimalni broj dana za spremanje kolačića"
-#: ../midori/midori-websettings.c:922
+#: ../midori/midori-websettings.c:946
msgid "Only accept Cookies from sites you visit"
msgstr "Prihvati kolačiće samo sa stranica koje ste posjetili"
-#: ../midori/midori-websettings.c:923
+#: ../midori/midori-websettings.c:947
msgid "Block cookies sent by third-party websites"
msgstr ""
-#: ../midori/midori-websettings.c:937
+#: ../midori/midori-websettings.c:961
msgid "Delete pages from history after:"
msgstr "Obriši stranice iz povijesti nakon:"
-#: ../midori/midori-websettings.c:938
+#: ../midori/midori-websettings.c:962
msgid "The maximum number of days to save the history for"
msgstr "Maksimalni broj dana za spremanje povijesti"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:977
msgid "Proxy server"
msgstr "Proxy poslužitelj"
-#: ../midori/midori-websettings.c:954
+#: ../midori/midori-websettings.c:978
msgid "The type of proxy server to use"
msgstr "Tip proxy poslužitelja za uporabu"
-#: ../midori/midori-websettings.c:963
+#: ../midori/midori-websettings.c:987
msgid "HTTP Proxy Server"
msgstr "HTTP Proxy poslužitelj"
-#: ../midori/midori-websettings.c:964
+#: ../midori/midori-websettings.c:988
msgid "The proxy server used for HTTP connections"
msgstr "Proxy poslužitelj korišten za HTTP spajanja"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:1003
msgid "Port"
msgstr "Port"
-#: ../midori/midori-websettings.c:980
+#: ../midori/midori-websettings.c:1004
msgid "The proxy server port used for HTTP connections"
msgstr "Proxy poslužitelj korišten za HTTP spajanja"
-#: ../midori/midori-websettings.c:998
+#: ../midori/midori-websettings.c:1022
msgid "The maximum size of cached pages on disk"
msgstr ""
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1039
msgid "Identify as"
msgstr "Predstavi se kao"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:1040
msgid "What to identify as to web pages"
msgstr "Kako se predstaviti na web stranicama"
-#: ../midori/midori-websettings.c:1032
+#: ../midori/midori-websettings.c:1056
msgid "Identification string"
msgstr ""
-#: ../midori/midori-websettings.c:1033
+#: ../midori/midori-websettings.c:1057
msgid "The application identification string"
msgstr ""
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:1073
msgid "Preferred languages"
msgstr "Željeni jezici"
-#: ../midori/midori-websettings.c:1050
+#: ../midori/midori-websettings.c:1074
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
msgstr ""
-#: ../midori/midori-websettings.c:1065
+#: ../midori/midori-websettings.c:1089
msgid "Clear private data"
msgstr "Očisti privatne podatke"
-#: ../midori/midori-websettings.c:1066
+#: ../midori/midori-websettings.c:1090
msgid "The private data selected for deletion"
msgstr "Privatni podaci odabrani za brisanje"
-#: ../midori/midori-websettings.c:1081
+#: ../midori/midori-websettings.c:1105
msgid "Clear data"
msgstr "Očisti podatke"
-#: ../midori/midori-websettings.c:1082
+#: ../midori/midori-websettings.c:1106
msgid "The data selected for deletion"
msgstr "Podaci odabrani za brisanje"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1131
+#: ../midori/midori-websettings.c:1155
msgid "Strip referrer details sent to websites"
msgstr ""
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1133
+#: ../midori/midori-websettings.c:1157
msgid "Whether the \"Referer\" header should be shortened to the hostname"
msgstr ""
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:1171
msgid "Always use my font choices"
msgstr "Uvijek koristi moj izbor fonta"
-#: ../midori/midori-websettings.c:1148
+#: ../midori/midori-websettings.c:1172
msgid "Override fonts picked by websites with user preferences"
msgstr ""
-#: ../midori/midori-view.c:1375
+#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:1138
+msgid "Security unknown"
+msgstr ""
+
+#: ../midori/midori-view.c:1436
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s želi spremiti HTML5 bazu podataka."
-#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Deny"
msgstr "_Uskrati"
-#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Allow"
msgstr "_Dopusti"
-#: ../midori/midori-view.c:1407
+#: ../midori/midori-view.c:1469
#, c-format
msgid "%s wants to know your location."
msgstr "%s želi znati vašu lokaciju."
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1565
#, c-format
msgid "Error - %s"
msgstr "Greška - %s"
-#: ../midori/midori-view.c:1501
+#: ../midori/midori-view.c:1566
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Stranica '%s' ne može biti učitana"
-#: ../midori/midori-view.c:1503
+#: ../midori/midori-view.c:1568
msgid "Try again"
msgstr "Pokušaj ponovo"
-#: ../midori/midori-view.c:1701 ../midori/midori-view.c:2623
+#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2879
#, c-format
msgid "Send a message to %s"
msgstr "Pošalji poruku %s"
-#: ../midori/midori-view.c:2453 ../midori/midori-view.c:2779
+#: ../midori/midori-view.c:2665
+msgid "Add _search engine..."
+msgstr "Dodaj _tražilicu..."
+
+#: ../midori/midori-view.c:2709 ../midori/midori-view.c:3035
msgid "Inspect _Element"
msgstr ""
-#: ../midori/midori-view.c:2505
+#: ../midori/midori-view.c:2761
msgid "Open Link in New _Tab"
msgstr "Otvori poveznicu u novoj _kartici"
-#: ../midori/midori-view.c:2509
+#: ../midori/midori-view.c:2765
msgid "Open Link in _Foreground Tab"
msgstr "Otvori poveznicu u _prednjoj kartici"
-#: ../midori/midori-view.c:2510
+#: ../midori/midori-view.c:2766
msgid "Open Link in _Background Tab"
msgstr "Otvori poveznicu u _pozadinskoj kartici"
-#: ../midori/midori-view.c:2513
+#: ../midori/midori-view.c:2769
msgid "Open Link in New _Window"
msgstr "Otvori poveznicu u novom _prozoru"
-#: ../midori/midori-view.c:2516
+#: ../midori/midori-view.c:2772
msgid "Open Link as Web A_pplication"
msgstr "Otvori poveznicu kao web p_rogram"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2777
msgid "Copy Link de_stination"
msgstr "Kopiraj odredište po_veznice"
-#: ../midori/midori-view.c:2537
+#: ../midori/midori-view.c:2793
msgid "Open _Image in New Tab"
msgstr "Otvori _sliku u novoj kartici"
-#: ../midori/midori-view.c:2540
+#: ../midori/midori-view.c:2796
msgid "Copy Image _Address"
msgstr "Kopiraj adresu _slike"
-#: ../midori/midori-view.c:2543
+#: ../midori/midori-view.c:2799
msgid "Save I_mage"
msgstr "Sačuvaj s_liku"
-#: ../midori/midori-view.c:2546
+#: ../midori/midori-view.c:2802
msgid "Open in Image _Viewer"
msgstr "Otvori u pregledniku _slika"
-#: ../midori/midori-view.c:2553
+#: ../midori/midori-view.c:2809
msgid "Copy Video _Address"
msgstr "Kopiraj video _adresu"
-#: ../midori/midori-view.c:2556
+#: ../midori/midori-view.c:2812
msgid "Save _Video"
msgstr "Spremi _video"
-#: ../midori/midori-view.c:2556
+#: ../midori/midori-view.c:2812
msgid "Download _Video"
msgstr "Preuzmi _video"
-#: ../midori/midori-view.c:2582
+#: ../midori/midori-view.c:2838
msgid "Search _with"
msgstr "Traži _pomoću"
-#: ../midori/midori-view.c:2614
+#: ../midori/midori-view.c:2870
msgid "_Search the Web"
msgstr "_Pretraži web"
-#: ../midori/midori-view.c:2631
+#: ../midori/midori-view.c:2887
msgid "Open Address in New _Tab"
msgstr "Otvori adresu u novoj _kartici"
-#: ../midori/midori-view.c:2684
+#: ../midori/midori-view.c:2940
msgid "Open _Frame in New Tab"
msgstr "Otvori _okvir u novoj kartici"
-#: ../midori/midori-view.c:2988
-msgid "Open or download file"
-msgstr "Otvori ili preuzmi datoteku"
-
-#: ../midori/midori-view.c:3008
+#: ../midori/midori-view.c:3201
#, c-format
-msgid "File Type: '%s'"
-msgstr "Tip datoteke: '%s'"
+msgid "Open or download file from %s"
+msgstr "Otvori ili preuzmi datoteku sa %s"
-#: ../midori/midori-view.c:3010
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Tip datoteke: %s ('%s')"
-
-#: ../midori/midori-view.c:3014
+#: ../midori/midori-view.c:3225
#, c-format
msgid "File Name: %s"
msgstr "Ime datoteke: %s"
-#: ../midori/midori-view.c:3041
+#: ../midori/midori-view.c:3230
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Tip datoteke: '%s'"
+
+#: ../midori/midori-view.c:3232
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Tip datoteke: %s ('%s')"
+
+#: ../midori/midori-view.c:3267
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3278
#, c-format
msgid "Open %s"
msgstr "Otvori %s"
-#: ../midori/midori-view.c:3700
+#: ../midori/midori-view.c:3897
#, c-format
msgid "Inspect page - %s"
msgstr ""
-#: ../midori/midori-view.c:4047
+#: ../midori/midori-view.c:4252
msgid "Speed Dial"
msgstr "Brzo biranje"
-#: ../midori/midori-view.c:4048 ../midori/midori-view.c:4144
+#: ../midori/midori-view.c:4253 ../midori/midori-view.c:4359
msgid "Click to add a shortcut"
msgstr "Klik za dodavanje prečaca"
-#: ../midori/midori-view.c:4049
+#: ../midori/midori-view.c:4254
msgid "Enter shortcut address"
msgstr "Unesi adresu prečaca"
-#: ../midori/midori-view.c:4050
+#: ../midori/midori-view.c:4255
msgid "Enter shortcut title"
msgstr "Unesi naslov prečaca"
-#: ../midori/midori-view.c:4051
+#: ../midori/midori-view.c:4256
msgid "Are you sure you want to delete this shortcut?"
msgstr "jeste li sigurni da želite izbrisati ovaj prečac?"
-#: ../midori/midori-view.c:4213
+#: ../midori/midori-view.c:4429
#, c-format
msgid "No documentation installed"
msgstr "Dokumentacija nije instalirana"
-#: ../midori/midori-view.c:4289
+#: ../midori/midori-view.c:4506
msgid "Midori doesn't store any personal data:"
msgstr "Midori ne pohranjuje osobne podatke"
-#: ../midori/midori-view.c:4290
+#: ../midori/midori-view.c:4507
msgid "No history or web cookies are being saved."
msgstr "Ni povijest ni kolačići nisu spremljeni."
-#: ../midori/midori-view.c:4291
+#: ../midori/midori-view.c:4508
msgid "Extensions are disabled."
msgstr "Proširenja su onemogućena."
-#: ../midori/midori-view.c:4292
+#: ../midori/midori-view.c:4509
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
-#: ../midori/midori-view.c:4293
+#: ../midori/midori-view.c:4510
msgid "Midori prevents websites from tracking the user:"
msgstr "Midovi sprečava web stranice da prate korisnika:"
-#: ../midori/midori-view.c:4294
+#: ../midori/midori-view.c:4511
msgid "Referrer URLs are stripped down to the hostname."
msgstr ""
-#: ../midori/midori-view.c:4295
+#: ../midori/midori-view.c:4512
msgid "DNS prefetching is disabled."
msgstr ""
-#: ../midori/midori-view.c:4296
+#: ../midori/midori-view.c:4513
msgid "The language and timezone are not revealed to websites."
msgstr "Jezik i vremenska zona se ne otkrivaju web stranicama."
-#: ../midori/midori-view.c:4297
+#: ../midori/midori-view.c:4514
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr "Web stranice ne mogu izlistati Flash ili druge Netscape priključke."
-#: ../midori/midori-view.c:4346
+#: ../midori/midori-view.c:4603
msgid "Version numbers in brackets show the version used at runtime."
msgstr ""
"Brojevi verzije u zagradama prikazuju verziju korištenu pri pokretanju."
-#: ../midori/midori-view.c:4402
+#: ../midori/midori-view.c:4653
msgid "Page loading delayed"
msgstr "Odgođeno učitavanje stranice"
-#: ../midori/midori-view.c:4403
+#: ../midori/midori-view.c:4654
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
-#: ../midori/midori-view.c:4404
+#: ../midori/midori-view.c:4655
msgid "Load Page"
msgstr "Učitaj stranicu"
-#: ../midori/midori-view.c:4570
+#: ../midori/midori-view.c:4822
msgid "Blank page"
msgstr "Prazna stranica"
-#: ../midori/midori-view.c:4832
+#: ../midori/midori-view.c:5086
msgid "_Duplicate Tab"
msgstr "_Udvostruči karticu"
-#: ../midori/midori-view.c:4837
+#: ../midori/midori-view.c:5091
msgid "Show Tab _Label"
msgstr "Pokaži oznaku _kartice"
-#: ../midori/midori-view.c:4837
+#: ../midori/midori-view.c:5091
msgid "Show Tab _Icon Only"
msgstr "Prikaži samo _ikone kartice"
-#: ../midori/midori-view.c:4843
-msgid "Close ot_her Tabs"
-msgstr "Zatvori dr_uge kartice"
+#: ../midori/midori-view.c:5098
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Zatvori dr_ugu karticu"
+msgstr[1] "Zatvori dr_uge kartice"
+msgstr[2] "Zatvori dr_uge kartice"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5656
+#: ../midori/midori-view.c:5934
msgid "previous"
msgstr "prethodno"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5675
+#: ../midori/midori-view.c:5953
msgid "next"
msgstr "slijedeće"
-#: ../midori/midori-view.c:5688
+#: ../midori/midori-view.c:5966
msgid "Print background images"
msgstr "Ispis pozadinskih slika"
-#: ../midori/midori-view.c:5689
+#: ../midori/midori-view.c:5967
msgid "Whether background images should be printed"
msgstr ""
-#: ../midori/midori-view.c:5721
+#: ../midori/midori-view.c:5999
msgid "Features"
msgstr "Obilježja"
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:298
msgid "Startup"
msgstr "Pokretanje"
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:311
msgid "Use _current page"
msgstr "Koristi _trenutnu stranicu"
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:315
msgid "Use current page as homepage"
msgstr "Koristi trenutnu stranicu kao početnu stranicu"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:324
msgid "Fonts"
msgstr "Fontovi"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:327
msgid "Proportional Font Family"
msgstr "Zadana obitelj fonta"
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:331
msgid "The default font family used to display text"
msgstr "Zadana obitelj fonta koje se koristi za prikaz teksta"
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:334
msgid "The default font size used to display text"
msgstr "Zadana veličina fonta za prikaz teksta"
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:336
msgid "Fixed-width Font Family"
msgstr ""
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:340
msgid "The font family used to display fixed-width text"
msgstr ""
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:343
msgid "The font size used to display fixed-width text"
msgstr ""
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:345
msgid "Minimum Font Size"
msgstr "Najmanja veličina fonta"
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:349
msgid "The minimum font size used to display text"
msgstr "Najmanja veličina fonta korištena za prikaz teksta"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:360
msgid "Behavior"
msgstr "Ponašanje"
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:386
msgid "Allow scripts to open popups"
msgstr ""
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:387
msgid "Whether scripts are allowed to open popup windows automatically"
msgstr ""
#. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:418
msgid "Browsing"
msgstr "Pretraživanje"
#. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:458
msgid "Network"
msgstr "Mreža"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:465
msgid "Hostname"
msgstr "Ime računala"
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:489
msgid "MB"
msgstr "MB"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Add search engine"
msgstr "Dodaj tražilicu"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Edit search engine"
msgstr "Uredi tražilicu"
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:985
msgid "_Name:"
msgstr "_Ime:"
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1000
msgid "_Description:"
msgstr "_Opis:"
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Ikona:"
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Adresa:"
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1032
msgid "_Token:"
msgstr ""
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1330
msgid "Manage Search Engines"
msgstr "Upravljaj tražilicama"
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1432
msgid "Use as _default"
msgstr "Koristi kao _zadano"
-#: ../midori/sokoke.c:354
+#: ../midori/sokoke.c:346
msgid "Open with"
msgstr "Otvori pomoću"
-#: ../midori/sokoke.c:362
+#: ../midori/sokoke.c:354
#, c-format
msgid "Choose an application or command to open \"%s\":"
msgstr "Izaberite program ili naredbu za otvaranje \"%s\":"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
+#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
msgid "Could not run external program."
msgstr "Ne mogu pokrenuti vanjski program"
-#: ../midori/sokoke.c:1595
+#: ../midori/sokoke.c:1443
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -2004,7 +2104,7 @@ msgstr[0] "%d sat"
msgstr[1] "%d sati"
msgstr[2] "%d sata"
-#: ../midori/sokoke.c:1596
+#: ../midori/sokoke.c:1444
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -2012,7 +2112,7 @@ msgstr[0] "%d minuta"
msgstr[1] "%d minute"
msgstr[2] "%d minuta"
-#: ../midori/sokoke.c:1597
+#: ../midori/sokoke.c:1445
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2021,113 +2121,119 @@ msgstr[1] "%d sekunde"
msgstr[2] "%d sekundi"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
+#: ../midori/sokoke.c:1453 ../panels/midori-transfers.c:268
#, c-format
msgid "%s of %s"
msgstr "%s od %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
+#: ../midori/sokoke.c:1462
msgid "?B"
msgstr "?B"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
+#: ../midori/sokoke.c:1465
#, c-format
msgid " (%s/s)"
msgstr "(%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/sokoke.c:1482
#, c-format
msgid " - %s remaining"
msgstr "- %s preostalo"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:265
msgid "_Inline Find:"
msgstr ""
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:287
msgid "Previous"
msgstr "Prethodno"
-#: ../toolbars/midori-findbar.c:323
+#: ../toolbars/midori-findbar.c:293
msgid "Next"
msgstr "Slijedeće"
-#: ../toolbars/midori-findbar.c:327
+#: ../toolbars/midori-findbar.c:297
msgid "Match Case"
msgstr ""
-#: ../toolbars/midori-findbar.c:336
+#: ../toolbars/midori-findbar.c:306
msgid "Highlight Matches"
msgstr ""
-#: ../toolbars/midori-findbar.c:347
+#: ../toolbars/midori-findbar.c:317
msgid "Close Findbar"
msgstr ""
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:124
#, c-format
msgid "The file '%s ' has been downloaded."
msgstr "Datoteka '%s ' je preuzeta."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:129
msgid "Transfer completed"
msgstr "Prijenos završen"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:201
msgid "The downloaded file is erroneous."
msgstr "Preuzeta datoteka je pogrešna."
-#: ../toolbars/midori-transferbar.c:194
+#: ../toolbars/midori-transferbar.c:202
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
msgstr ""
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:345 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Očisti sve"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384
msgid "Some files are being downloaded"
msgstr "Neke datoteke su preuzete"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:388
msgid "_Quit Midori"
msgstr "_Isključi Midori"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:390
msgid "The transfers will be cancelled if Midori quits."
msgstr "Prijenosi će biti odgođeni ako se Midori isključi"
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Zabilješke"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Neuspjeh u dodavanju stavki zabilješki: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Neuspjeh u dopuni zabilješki : %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Uredi odabrane zabilješke"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Izbriši odabrane zabilješke"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Dodaj novu mapu"
-#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Razdjelnik "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Pretraži zabilješke"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Povijest"
@@ -2173,15 +2279,20 @@ msgstr "Izbriši odabranu stavku povijesti"
msgid "Clear the entire history"
msgstr "Obriši cijelu povijest"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Pretraži povijest"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Prijenosi"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
msgstr "Otvori odredišni _direktorij"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
msgstr "Kopiraj lokaciju po_veznice"
@@ -2223,81 +2334,81 @@ msgstr ""
msgid "Animation frames are broken"
msgstr ""
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Svojstvo '%s' nije valjano za %s"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
#: ../extensions/addons.c:308
msgid "Choose file"
msgstr "Izaberi datoteku"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Izaberi mapu"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Nijedan"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 sat"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 dan"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 tjedan"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 mjesec"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 godina"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Osobitosti za %s"
-#: ../extensions/adblock.c:473
+#: ../extensions/adblock.c:470
msgid "Configure Advertisement filters"
msgstr "Konfiguriraj filtere oglašavanja"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:503
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
"\"Add\" to add it to the list. You can find more lists at %s."
msgstr ""
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:917
msgid "Edit rule"
msgstr "Uredi pravilo"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:931
msgid "_Rule:"
msgstr "_Pravilo:"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:985
msgid "Bl_ock image"
msgstr "Bl_okiraj sliku"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:990
msgid "Bl_ock link"
msgstr "Bl_okiraj poveznicu"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1689
msgid "Advertisement blocker"
msgstr ""
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1690
msgid "Block advertisements according to a filter list"
msgstr "Blokiraj oglašavanj sukladno sa listom filtera"
@@ -2325,63 +2436,63 @@ msgstr "_Instaliraj korisnički stil"
msgid "Don't install"
msgstr "Nemoj instalirati"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:677
msgid "Userscripts"
msgstr "Korisničke skripte"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:679
msgid "Userstyles"
msgstr "Korisnički stilovi"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Greška"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Želite li izbrisati '%s'?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
msgid "Delete user script"
msgstr "Izbriši korisničke skripte"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
msgid "Delete user style"
msgstr "Izbriši korisnički stil"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Datoteka %s će biti trajno uklonjena"
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:566 ../extensions/addons.c:643
msgid "Open in Text Editor"
msgstr "Otvori u uređivaču teksta"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:568 ../extensions/addons.c:652
msgid "Open Target Folder"
msgstr "Otvori odredišni direktorij"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:634
msgid "Add new addon"
msgstr "Dodaj novu dodatak"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:660
msgid "Remove selected addon"
msgstr "Ukloni odabrani dodatak"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
msgid "User addons"
msgstr "Korisnički dodaci"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1819
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr ""
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1908
msgid "Support for userscripts and userstyles"
msgstr "Podrška za korisničke skripte i stilove"
@@ -2468,26 +2579,20 @@ msgstr ""
"Domena : %s\n"
"Kolačići : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Ime"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "_Proširi sve"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "_Skupi sve"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filter:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
msgstr ""
#: ../extensions/cookie-manager/main.c:36
@@ -2744,35 +2849,35 @@ msgstr "Sat statusne trake"
msgid "Display date and time in the statusbar"
msgstr "Prikaži datum i vrijeme u statusnoj traci"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Slike"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Skripte"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Netscape priključci"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Obilježja statusne trake"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr ""
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Kartica ploče"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "K_artica ploče"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Pokaži kartice u okomitoj ploči"
@@ -2784,37 +2889,33 @@ msgstr "Kao zadano samo ikone na karticama"
msgid "New tabs have no label by default"
msgstr ""
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Prilagodi alatnu traku"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
msgstr ""
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Dostupne stavke"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Prikazane stavke"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Prilagodi_Alatnu traku..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "_Prilagodi alatnu traku"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "Prilagodi..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Uređivač alatne trake"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Jednostavno uređivanje izgleda alatnih traka"
@@ -2822,6 +2923,39 @@ msgstr "Jednostavno uređivanje izgleda alatnih traka"
msgid "Cache HTTP communication on disk"
msgstr ""
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Zatvori dr_uge kartice"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Ikona:"
+
+#~ msgid "Filter:"
+#~ msgstr "Filter:"
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Zabilješka"
+
+#~ msgid "_Console"
+#~ msgstr "_Konzola"
+
+#~ msgid "Import bookmarks..."
+#~ msgstr "Uvezi zabilješke..."
+
+#~ msgid "Search with..."
+#~ msgstr "Traži pomoću..."
+
+#~ msgid "Customize _Toolbar..."
+#~ msgstr "Prilagodi_Alatnu traku..."
+
+#~ msgid "_Customize..."
+#~ msgstr "Prilagodi..."
+
+#~ msgid "_Title:"
+#~ msgstr "_Naslov:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Mapa:"
+
#~ msgid "The bookmarks couldn't be saved. %s"
#~ msgstr "Zabilješke ne mogu biti spremljene. %s"
diff --git a/po/hu.po b/po/hu.po
index 969ec10d..d6dd4f08 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -598,7 +598,7 @@ msgid "Firefox (%s)"
msgstr "Firefox (%s)"
#: ../midori/midori-browser.c:4250
-msgid "Import bookmarks..."
+msgid "Import bookmarks…"
msgstr "Könyvjelzők importálása…"
#: ../midori/midori-browser.c:4253 ../midori/midori-browser.c:5385
@@ -703,7 +703,7 @@ msgid "Open a file"
msgstr "Fájl megnyitása"
#: ../midori/midori-browser.c:5241
-msgid "_Save Page As..."
+msgid "_Save Page As…"
msgstr "Oldal _mentése másként…"
#: ../midori/midori-browser.c:5242
@@ -751,7 +751,7 @@ msgid "_Edit"
msgstr "S_zerkesztés"
#: ../midori/midori-browser.c:5295
-msgid "_Find..."
+msgid "_Find…"
msgstr "_Keresés…"
#: ../midori/midori-browser.c:5296
@@ -925,7 +925,7 @@ msgid "_Frequent Questions"
msgstr "_Gyakori kérdések"
#: ../midori/midori-browser.c:5434
-msgid "_Report a Problem..."
+msgid "_Report a Problem…"
msgstr "_Hiba jelentése…"
#: ../midori/midori-browser.c:5446
@@ -983,7 +983,7 @@ msgstr "Nyugati (ISO-8859-1)"
#: ../midori/midori-browser.c:5493 ../midori/midori-websettings.c:242
#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
+msgid "Custom…"
msgstr "Egyéni…"
#: ../midori/midori-browser.c:5998
@@ -991,7 +991,7 @@ msgid "_Separator"
msgstr "_Elválasztó"
#: ../midori/midori-browser.c:6005
-msgid "_Location..."
+msgid "_Location…"
msgstr "He_ly…"
#: ../midori/midori-browser.c:6007
@@ -999,7 +999,7 @@ msgid "Open a particular location"
msgstr "Adott hely megnyitása"
#: ../midori/midori-browser.c:6029
-msgid "_Web Search..."
+msgid "_Web Search…"
msgstr "_Webkeresés…"
#: ../midori/midori-browser.c:6031
@@ -1057,7 +1057,7 @@ msgid "Search with %s"
msgstr "Keresés ezzel: %s"
#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
+msgid "Search with…"
msgstr "Keresés ezzel…"
#: ../midori/midori-locationaction.c:537
@@ -2750,7 +2750,7 @@ msgid "Customize Keyboard shortcuts"
msgstr "Gyorsbillentyűk személyre szabása"
#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
+msgid "Customize Sh_ortcuts…"
msgstr "_Gyorsbillentyűk személyre szabása…"
#: ../extensions/shortcuts.c:320
@@ -2830,11 +2830,11 @@ msgid "Displayed Items"
msgstr "Megjelenített elemek"
#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
+msgid "Customize _Toolbar…"
msgstr "_Eszköztár személyre szabása…"
#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
+msgid "_Customize…"
msgstr "_Testreszabás…"
#: ../extensions/toolbar-editor.c:627
@@ -2948,13 +2948,13 @@ msgstr "HTTP kommunikáció gyorsítótárazása a lemezen"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Új könyvjelzőmappa hozzáadása"
-#~ msgid "Add, edit and remove search engines..."
+#~ msgid "Add, edit and remove search engines…"
#~ msgstr "Keresőszolgáltatások hozzáadása, szerkesztése és eltávolítása…"
-#~ msgid "Clear private data..."
+#~ msgid "Clear private data…"
#~ msgstr "Privát adatok törlése…"
-#~ msgid "Inspect page details and access developer tools..."
+#~ msgid "Inspect page details and access developer tools…"
#~ msgstr "Oldal részleteinek vizsgálata és fejlesztői eszközök elérése…"
#~ msgid "Switch to the previous tab"
@@ -3179,7 +3179,7 @@ msgstr "HTTP kommunikáció gyorsítótárazása a lemezen"
#~ msgid "days"
#~ msgstr "nap"
-#~ msgid "Configure _Advertisement filters..."
+#~ msgid "Configure _Advertisement filters…"
#~ msgstr "_Reklámszűrők beállítása…"
#~ msgid "Open target folder for selected addon"
diff --git a/po/id.po b/po/id.po
index d1a1c376..7dc703a4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: midori\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-17 23:30+0000\n"
+"POT-Creation-Date: 2012-09-15 00:45+0000\n"
"PO-Revision-Date: 2011-03-12 16:27+0700\n"
"Last-Translator: Andhika Padmawan \n"
"Language-Team: Indonesian \n"
@@ -25,12 +25,28 @@ msgstr "Ramban Web"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:1989 ../midori/main.c:2009
-#: ../midori/main.c:2023 ../midori/midori-websettings.c:308
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1922 ../midori/main.c:1946
+#: ../midori/main.c:1960 ../midori/midori-websettings.c:200
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Peramban Web Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Jendela Peramban Privat Baru"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326
+msgid "New Tab"
+msgstr "Tab Baru"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323
+msgid "New Window"
+msgstr "Jendela Baru"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Peramban Web"
@@ -42,82 +58,87 @@ msgstr "Midori Meramban Privat"
msgid "Open a new private browsing window"
msgstr "Buka jendela meramban privat baru"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4081
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4355
msgid "Private Browsing"
msgstr "Meramban Privat"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Konfigurasi tak dapat dimuat: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Nilai '%s' hanya sah untuk %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Nilai konfigurasi '%s' tidak sah"
-#: ../midori/main.c:364
+#: ../midori/main.c:365
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Mesin pencari tak dapat dimuat. %s\n"
-#: ../midori/main.c:418
+#: ../midori/main.c:419
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Gagal membersihkan riwayat: %s\n"
-#: ../midori/main.c:438 ../midori/main.c:562
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Gagal membuka basis data: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:505
+#: ../midori/main.c:513
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Gagal menghapus item riwayat lama: %s\n"
-#: ../midori/main.c:545 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Gagal menghapus item riwayat: %s\n"
-
-#: ../midori/main.c:592
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Bookmark tak dapat disimpan. %s"
-
-#: ../midori/main.c:614
+#: ../midori/main.c:535
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Konfigurasi tak dapat disimpan. %s"
-#: ../midori/main.c:649
+#: ../midori/main.c:561
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Mesin pencari tak dapat disimpan. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:686
+#: ../midori/main.c:598
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Kotak sampah tak dapat disimpan. %s"
-#: ../midori/main.c:727 ../panels/midori-extensions.c:91
+#: ../midori/main.c:671 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Ekstensi"
-#: ../midori/main.c:741
+#: ../midori/main.c:685
msgid "Privacy"
msgstr "Privasi"
-#: ../midori/main.c:753
+#: ../midori/main.c:687
+msgid "Delete old Cookies after:"
+msgstr "Hapus kuki lama setelah:"
+
+#: ../midori/main.c:689 ../midori/main.c:692
+msgid "The maximum number of days to save cookies for"
+msgstr "Jumlah maksimum hari untuk menyimpan kuki"
+
+#: ../midori/main.c:696
+msgid "Only accept Cookies from sites you visit"
+msgstr "Hanya terima kuki dari situs yang anda kunjungi"
+
+#: ../midori/main.c:697
+msgid "Block cookies sent by third-party websites"
+msgstr "Blok kuki yang dikirim dari situs web pihak ketiga"
+
+#: ../midori/main.c:702
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -125,18 +146,44 @@ msgstr ""
"Kuki menyimpan data log masuk, permainan yang disimpan, atau profil pengguna "
"untuk kepentingan iklan."
-#: ../midori/main.c:809
+#: ../midori/main.c:709
+msgid "Enable offline web application cache"
+msgstr "Aktifkan tembolok aplikasi web luring"
+
+#: ../midori/main.c:712
+msgid "Enable HTML5 local storage support"
+msgstr "Aktifkan dukungan penyimpanan lokal HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/main.c:716
+msgid "Strip referrer details sent to websites"
+msgstr "Hapus detail rujukan yang dikirim ke situs web"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/main.c:718
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Apakah tajuk \"Rujukan\" harus dipendekkan ke nama host"
+
+#: ../midori/main.c:721
+msgid "Delete pages from history after:"
+msgstr "Hapus halaman dari riwayat setelah:"
+
+#: ../midori/main.c:723 ../midori/main.c:726
+msgid "The maximum number of days to save the history for"
+msgstr "Jumlah maksimum hari untuk tetap menyimpan riwayat"
+
+#: ../midori/main.c:767
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Sesi tak dapat disimpan. %s"
-#: ../midori/main.c:1027
+#: ../midori/main.c:989
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Tak ada sertifikat root yang tersedia. Sertifikat SSL tak dapat diverifikasi."
-#: ../midori/main.c:1096
+#: ../midori/main.c:1084
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -145,232 +192,238 @@ msgstr ""
"terjadi berulang kali, coba salah satu opsi berikut untuk memecahkan masalah "
"tersebut."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1103
msgid "Modify _preferences"
msgstr "Ubah _pengaturan"
-#: ../midori/main.c:1119
+#: ../midori/main.c:1107
msgid "Disable all _extensions"
msgstr "Nonaktifkan semua _ekstensi"
-#: ../midori/main.c:1132
+#: ../midori/main.c:1116
+msgid "Show a dialog after Midori crashed"
+msgstr "Tampilkan sebuah dialog setelah Midori macet"
+
+#: ../midori/main.c:1121
msgid "Discard old tabs"
msgstr "Abaikan tab lama"
-#: ../midori/main.c:1133 ../midori/midori-websettings.c:217
+#: ../midori/main.c:1122 ../midori/midori-websettings.c:108
msgid "Show last tabs without loading"
msgstr "Tampilkan tab terakhir tanpa memuat"
-#: ../midori/main.c:1134 ../midori/midori-websettings.c:216
+#: ../midori/main.c:1123 ../midori/midori-websettings.c:107
msgid "Show last open tabs"
msgstr "Tampilkan tab yang terakhir terbuka"
-#: ../midori/main.c:1342 ../midori/main.c:2400
+#: ../midori/main.c:1370 ../midori/main.c:2382
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Sesi tak dapat dimuat: %s\n"
-#: ../midori/main.c:1480
+#: ../midori/main.c:1508
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Cuplikan layar disimpan ke: %s\n"
-#: ../midori/main.c:1892
+#: ../midori/main.c:1837
msgid "Run ADDRESS as a web application"
msgstr "Jalankan ALAMAT sebagai sebuah aplikasi web"
-#: ../midori/main.c:1892
+#: ../midori/main.c:1837
msgid "ADDRESS"
msgstr "ALAMAT"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1840
msgid "Use FOLDER as configuration folder"
msgstr "Gunakan FOLDER sebagai folder konfigurasi"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1840
msgid "FOLDER"
msgstr "FOLDER"
-#: ../midori/main.c:1898
+#: ../midori/main.c:1843
msgid "Private browsing, no changes are saved"
msgstr "Meramban privat, tak ada perubahan yang disimpan"
-#: ../midori/main.c:1900
+#: ../midori/main.c:1846
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+"Dalam mode portabel, semua berkas proses akan disimpan dalam satu tempat"
+
+#: ../midori/main.c:1849
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Jendela GTK+ biasa dengan WebKit, mirip dengan GtkLauncher"
+
+#: ../midori/main.c:1851
msgid "Show a diagnostic dialog"
msgstr "Tampilkan dialog diagnosis"
-#: ../midori/main.c:1902
+#: ../midori/main.c:1853
msgid "Run the specified filename as javascript"
msgstr "Jalankan nama berkas yang ditentukan sebagai javascript"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1855
msgid "Take a snapshot of the specified URI"
msgstr "Ambil cuplikan layar dari URI yang ditentukan"
-#: ../midori/main.c:1906
+#: ../midori/main.c:1857
msgid "Execute the specified command"
msgstr "Eksekusi perintah yang ditentukan"
-#: ../midori/main.c:1908
+#: ../midori/main.c:1859
msgid "List available commands to execute with -e/ --execute"
msgstr "Senarai perintah tersedia yang dijalankan dengan -e/ --execute"
-#: ../midori/main.c:1910
+#: ../midori/main.c:1861
msgid "Display program version"
msgstr "Tampilkan versi program"
-#: ../midori/main.c:1912
+#: ../midori/main.c:1863
msgid "Addresses"
msgstr "Alamat"
-#: ../midori/main.c:1914
+#: ../midori/main.c:1865
msgid "Block URIs according to regular expression PATTERN"
msgstr "Blok URI berdasarkan POLA ekspresi reguler"
-#: ../midori/main.c:1914
+#: ../midori/main.c:1865
msgid "PATTERN"
msgstr "POLA"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1918
+#: ../midori/main.c:1869
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Atur ulang Midori setelah DETIK detik tidak aktif"
-#: ../midori/main.c:1918
+#: ../midori/main.c:1869
msgid "SECONDS"
msgstr "DETIK"
-#: ../midori/main.c:1921
+#: ../midori/main.c:1872
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Mengalihkan peringatan konsol ke NAMABERKAS yang ditentukan"
-#: ../midori/main.c:1921
+#: ../midori/main.c:1872
msgid "FILENAME"
msgstr "NAMABERKAS"
-#: ../midori/main.c:1986
-msgid "[Addresses]"
-msgstr "[Alamat]"
-
-#: ../midori/main.c:1996
-msgid "The specified configuration folder is invalid."
-msgstr "Folder konfigurasi yang ditentukan tidak valid."
-
-#: ../midori/main.c:2024
+#: ../midori/main.c:1961
msgid "Please report comments, suggestions and bugs to:"
msgstr "Silakan laporkan komentar, saran dan kutu ke:"
-#: ../midori/main.c:2026
+#: ../midori/main.c:1963
msgid "Check for new versions at:"
msgstr "Cek versi baru di:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2110
+#: ../midori/main.c:2102
msgid "Saved logins and _passwords"
msgstr "Log masuk dan _sandi tersimpan"
-#: ../midori/main.c:2112
+#: ../midori/main.c:2104
msgid "Cookies and Website data"
msgstr "Data Kuki dan Situs Web"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2116 ../midori/midori-websettings.c:985
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
+#: ../midori/main.c:2108 ../midori/midori-preferences.c:505
+#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470
msgid "Web Cache"
msgstr "Tembolok Web"
-#: ../midori/main.c:2119
+#: ../midori/main.c:2111
msgid "Website icons"
msgstr "Ikon situs web"
-#: ../midori/main.c:2225
+#: ../midori/main.c:2215
msgid "An unknown error occured"
msgstr "Galat tak diketahui terjadi"
-#: ../midori/main.c:2331
+#: ../midori/main.c:2330
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Sebuah instansi Midori telah berjalan namun tidak merespon.\n"
-#: ../midori/main.c:2367
+#: ../midori/main.c:2364
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Penanda tak dapat dimuat: %s\n"
-#: ../midori/main.c:2415
+#: ../midori/main.c:2397
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Kotak sampah tak dapat dimuat: %s\n"
-#: ../midori/main.c:2428
+#: ../midori/main.c:2410
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Riwayat tak dapat dimuat: %s\n"
-#: ../midori/main.c:2444
+#: ../midori/main.c:2425
msgid "The following errors occured:"
msgstr "Galat berikut terjadi:"
-#: ../midori/main.c:2460
+#: ../midori/main.c:2441
msgid "_Ignore"
msgstr "_Abaikan"
-#: ../midori/midori-app.c:1331
-msgid "_Bookmark"
-msgstr "B_ookmark"
+#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:534
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Aksi tak diharapkan '%s'."
-#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:6027
+#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6251
msgid "_Bookmarks"
msgstr "B_ookmark"
-#: ../midori/midori-app.c:1333
+#: ../midori/midori-app.c:1373
msgid "Add Boo_kmark"
msgstr "Tambah P_enanda"
-#: ../midori/midori-app.c:1334
-msgid "_Console"
-msgstr "_Konsol"
-
-#: ../midori/midori-app.c:1335
+#: ../midori/midori-app.c:1374
msgid "_Extensions"
msgstr "_Ekstensi"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4555
+#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700
msgid "_History"
msgstr "_Riwayat"
-#: ../midori/midori-app.c:1337
-msgid "_Homepage"
-msgstr "_Beranda"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1376
msgid "_Userscripts"
msgstr "_Skrip pengguna"
-#: ../midori/midori-app.c:1339
+#: ../midori/midori-app.c:1377
+msgid "User_styles"
+msgstr "Ga_ya pengguna"
+
+#: ../midori/midori-app.c:1378
msgid "New _Tab"
msgstr "Tab _Baru"
-#: ../midori/midori-app.c:1340
+#: ../midori/midori-app.c:1379
msgid "_Transfers"
msgstr "_Transfer"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1380
msgid "Netscape p_lugins"
msgstr "P_lugin Netscape"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1381
msgid "_Closed Tabs"
msgstr "_Tab Tertutup"
-#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5183
+#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387
msgid "New _Window"
msgstr "Jendela _Baru"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1383
msgid "New _Folder"
msgstr "_Folder Baru"
+#: ../midori/midori-app.c:1437
+msgid "[Addresses]"
+msgstr "[Alamat]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Berkas tak ditemukan."
@@ -388,132 +441,105 @@ msgstr "Format penanda tak dikenal."
msgid "Writing failed."
msgstr "Penulisan gagal."
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5265
-#: ../midori/midori-browser.c:5274
+#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526
+msgid "Go forward to the next page"
+msgstr "Maju ke halaman berikutnya"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:354 ../midori/midori-browser.c:5534
+#: ../midori/midori-browser.c:5537
+msgid "Go to the next sub-page"
+msgstr "Maju ke sub-halaman berikutnya"
+
+#: ../midori/midori-browser.c:441 ../midori/midori-browser.c:5475
+#: ../midori/midori-browser.c:5484
msgid "Reload the current page"
msgstr "Muat ulang halaman ini"
-#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5271
+#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481
msgid "Stop loading the current page"
msgstr "Stop memuat halaman ini"
-#: ../midori/midori-browser.c:465
+#: ../midori/midori-browser.c:519
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Gagal memutakhirkan judul: %s\n"
-#: ../midori/midori-browser.c:478
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Aksi tak diharapkan '%s'."
-
-#: ../midori/midori-browser.c:568
+#: ../midori/midori-browser.c:614
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Meramban Privat)"
-#: ../midori/midori-browser.c:682 ../midori/midori-browser.c:715
-msgid "Toplevel folder"
-msgstr "Folder level atas"
+#: ../midori/midori-browser.c:724 ../midori/midori-browser.c:766
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Penanda"
-#: ../midori/midori-browser.c:773
+#: ../midori/midori-browser.c:826
msgid "New folder"
msgstr "Folder baru"
-#: ../midori/midori-browser.c:773
+#: ../midori/midori-browser.c:826
msgid "Edit folder"
msgstr "Sunting folder"
-#: ../midori/midori-browser.c:775
+#: ../midori/midori-browser.c:828
msgid "New bookmark"
msgstr "Penanda baru"
-#: ../midori/midori-browser.c:775
+#: ../midori/midori-browser.c:828
msgid "Edit bookmark"
msgstr "Sunting penanda"
-#: ../midori/midori-browser.c:817
-msgid "_Title:"
-msgstr "_Judul:"
+#: ../midori/midori-browser.c:862
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Ketik nama untuk penanda ini dan pilih tempat untuk menyimpannya."
-#: ../midori/midori-browser.c:837 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Alamat"
-
-#: ../midori/midori-browser.c:860 ../midori/midori-browser.c:4292
-msgid "_Folder:"
-msgstr "_Folder:"
-
-#: ../midori/midori-browser.c:876
+#: ../midori/midori-browser.c:923
msgid "Add to _Speed Dial"
msgstr "Tambah ke Panggil _Cepat"
-#: ../midori/midori-browser.c:889
+#: ../midori/midori-browser.c:929
msgid "Show in the tool_bar"
msgstr "Tampilkan di _batang alat"
-#: ../midori/midori-browser.c:904
+#: ../midori/midori-browser.c:937
msgid "Run as _web application"
msgstr "Jalankan sebagai aplikasi _web"
-#: ../midori/midori-browser.c:975
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "Berkas \"%s\" tak dapat disimpan di folder ini."
-
-#: ../midori/midori-browser.c:977
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "Anda tidak mempunyai hak akses untuk menulis di lokasi ini."
-
-#: ../midori/midori-browser.c:984
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "Tidak cukup ruang kosong untuk mengunduh \"%s\"."
-
-#: ../midori/midori-browser.c:987
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "Berkas memerlukan %s tapi hanya %s yang tersisa."
-
-#: ../midori/midori-browser.c:1025 ../midori/midori-browser.c:4361
+#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504
msgid "Save file as"
msgstr "Simpan berkas sebagai"
-#: ../midori/midori-browser.c:1319
-msgid "New Window"
-msgstr "Jendela Baru"
+#: ../midori/midori-browser.c:1065
+msgid "Save associated _resources"
+msgstr "Simpan sumbe_r terkait"
-#: ../midori/midori-browser.c:1319
+#: ../midori/midori-browser.c:1323
msgid "A new window has been opened"
msgstr "Sebuah jendela baru telah dibuka"
-#: ../midori/midori-browser.c:1322
-msgid "New Tab"
-msgstr "Tab Baru"
-
-#: ../midori/midori-browser.c:1322
+#: ../midori/midori-browser.c:1326
msgid "A new tab has been opened"
msgstr "Sebuah tab baru telah dibuka"
-#: ../midori/midori-browser.c:1357
+#: ../midori/midori-browser.c:1343
msgid "Error opening the image!"
msgstr "Galat membuka gambar!"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1344
msgid "Can not open selected image in a default viewer."
msgstr "Tak dapat membuka gambar terpilih di penampil standar."
-#: ../midori/midori-browser.c:1364
+#: ../midori/midori-browser.c:1350
msgid "Error downloading the image!"
msgstr "Gagal mengunduh gambar!"
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1351
msgid "Can not download selected image."
msgstr "Tak dapat mengunduh gambar terpilih."
-#: ../midori/midori-browser.c:1468
+#: ../midori/midori-browser.c:1408
msgid "Save file"
msgstr "Simpan berkas"
@@ -539,135 +565,151 @@ msgstr ""
msgid "New feed"
msgstr "Umpan baru"
-#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5334
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5550
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Tambah penanda baru"
-#: ../midori/midori-browser.c:3015 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Kosong"
-#: ../midori/midori-browser.c:3435
+#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507
msgid "Toggle text cursor navigation"
msgstr "Ubah navigasi kursor teks"
-#: ../midori/midori-browser.c:3751 ../midori/midori-browser.c:5720
+#: ../midori/midori-browser.c:3509
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Menekan tombol F7 akan mengalihkan mode Ramban Caret. Bila aktif, kursor "
+"teks akan muncul di semua situs web."
+
+#: ../midori/midori-browser.c:3512
+msgid "_Enable Caret Browsing"
+msgstr "Aktifkan Mode Ramban Ca_ret"
+
+#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Gagal memasukkan item riwayat baru: %s\n"
-#: ../midori/midori-browser.c:4080 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Buka semua di _Tab"
-#: ../midori/midori-browser.c:4087 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Buka di _Tab Baru"
-#: ../midori/midori-browser.c:4090 ../midori/midori-view.c:2632
-#: ../midori/midori-view.c:4583 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2952
+#: ../midori/midori-view.c:4928 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Buka di _Jendela Baru"
-#: ../midori/midori-browser.c:4179
+#: ../midori/midori-browser.c:4329
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4180
+#: ../midori/midori-browser.c:4330
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4181
+#: ../midori/midori-browser.c:4331
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4182
+#: ../midori/midori-browser.c:4332
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4183
+#: ../midori/midori-browser.c:4333
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4184
+#: ../midori/midori-browser.c:4334
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4205
-msgid "Import bookmarks..."
-msgstr "Impor penanda..."
+#: ../midori/midori-browser.c:4335
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4208 ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:4356
+msgid "Import bookmarks…"
+msgstr "Impor penanda…"
+
+#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555
msgid "_Import bookmarks"
msgstr "_Impor penanda"
-#: ../midori/midori-browser.c:4219
+#: ../midori/midori-browser.c:4370
msgid "_Application:"
msgstr "_Aplikasi:"
-#: ../midori/midori-browser.c:4284
+#: ../midori/midori-browser.c:4435
msgid "Import from XBEL or HTML file"
msgstr "Impor dari berkas XBEL atau HTML"
-#: ../midori/midori-browser.c:4319
+#: ../midori/midori-browser.c:4463
msgid "Import from a file"
msgstr "Impor dari berkas"
-#: ../midori/midori-browser.c:4331
+#: ../midori/midori-browser.c:4475
msgid "Failed to import bookmarks"
msgstr "Gagal mengimpor penanda"
-#: ../midori/midori-browser.c:4366
+#: ../midori/midori-browser.c:4509
msgid "XBEL Bookmarks"
msgstr "Penanda XBEL"
-#: ../midori/midori-browser.c:4371
+#: ../midori/midori-browser.c:4514
msgid "Netscape Bookmarks"
msgstr "Penanda Netscape"
-#: ../midori/midori-browser.c:4385
+#: ../midori/midori-browser.c:4528
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "Midori hanya dapat mengekspor ke XBEL (*.xbel) dan Netscape (*.html)"
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4543
msgid "Failed to export bookmarks"
msgstr "Gagal mengekspor penanda"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4522
+#: ../midori/midori-browser.c:4665
msgid "Clear Private Data"
msgstr "Hapus Data Pribadi"
-#: ../midori/midori-browser.c:4526
+#: ../midori/midori-browser.c:4669
msgid "_Clear private data"
msgstr "_Hapus data pribadi"
-#: ../midori/midori-browser.c:4539
+#: ../midori/midori-browser.c:4684
msgid "Clear the following data:"
msgstr "Hapus data berikut:"
-#: ../midori/midori-browser.c:4549
+#: ../midori/midori-browser.c:4694
msgid "Last open _tabs"
msgstr "Tab terakhir dibuka"
-#: ../midori/midori-browser.c:4575
+#: ../midori/midori-browser.c:4720
msgid "Clear private data when _quitting Midori"
msgstr "Hapus data pribadi ketika _keluar Midori"
-#: ../midori/midori-browser.c:4770
+#: ../midori/midori-browser.c:4935
msgid "A lightweight web browser."
msgstr "Peramban web ringan."
-#: ../midori/midori-browser.c:4771
+#: ../midori/midori-browser.c:4936
msgid "See about:version for version info."
msgstr "Lihaat tentang:versi untuk info versi."
-#: ../midori/midori-browser.c:4773
+#: ../midori/midori-browser.c:4938
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -679,921 +721,602 @@ msgstr ""
"dipublikasikan oleh Free Software Foundation; baik versi 2.1 dari Lisensi, "
"atau (menurut pilihan anda) versi apapun setelahnya."
-#: ../midori/midori-browser.c:4794
+#: ../midori/midori-browser.c:4968
msgid "translator-credits"
msgstr "Andhika Padmawan "
-#: ../midori/midori-browser.c:5181
+#: ../midori/midori-browser.c:5385
msgid "_File"
msgstr "_Berkas"
-#: ../midori/midori-browser.c:5184
+#: ../midori/midori-browser.c:5388
msgid "Open a new window"
msgstr "Buka di jendela baru"
-#: ../midori/midori-browser.c:5187
+#: ../midori/midori-browser.c:5391
msgid "Open a new tab"
msgstr "Buka di tab baru"
-#: ../midori/midori-browser.c:5189
+#: ../midori/midori-browser.c:5393
msgid "New P_rivate Browsing Window"
msgstr "Jendela Meramban P_rivat Baru"
-#: ../midori/midori-browser.c:5193
+#: ../midori/midori-browser.c:5397
msgid "Open a file"
msgstr "Buka berkas"
-#: ../midori/midori-browser.c:5195
-msgid "_Save Page As..."
-msgstr "_Simpan Halaman Sebagai..."
+#: ../midori/midori-browser.c:5399
+msgid "_Save Page As…"
+msgstr "_Simpan Halaman Sebagai…"
-#: ../midori/midori-browser.c:5196
+#: ../midori/midori-browser.c:5400
msgid "Save to a file"
msgstr "Simpan ke berkas"
-#: ../midori/midori-browser.c:5198
+#: ../midori/midori-browser.c:5402
msgid "Add to Speed _dial"
msgstr "Tambah ke Panggil _cepat"
-#: ../midori/midori-browser.c:5202
+#: ../midori/midori-browser.c:5406
msgid "Add Shortcut to the _desktop"
msgstr "Tambah jalan pintas ke _desktop"
-#: ../midori/midori-browser.c:5204
+#: ../midori/midori-browser.c:5408
msgid "Create _Launcher"
msgstr "Buat _Peluncur"
-#: ../midori/midori-browser.c:5208
+#: ../midori/midori-browser.c:5412
msgid "Subscribe to News _feed"
msgstr "Berlangganan ke umpan _berita"
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5418
msgid "_Close Tab"
msgstr "_Tutup Tab"
-#: ../midori/midori-browser.c:5215
+#: ../midori/midori-browser.c:5419
msgid "Close the current tab"
msgstr "Tutup tab saat ini"
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5421
msgid "C_lose Window"
msgstr "T_utup Jendela"
-#: ../midori/midori-browser.c:5221
+#: ../midori/midori-browser.c:5425
+msgid "_Share"
+msgstr "Ba_gikan"
+
+#: ../midori/midori-browser.c:5430
msgid "Print the current page"
msgstr "Cetak halaman saat ini"
-#: ../midori/midori-browser.c:5223
+#: ../midori/midori-browser.c:5433
msgid "Close a_ll Windows"
msgstr "T_utup semua Jendela"
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5436
msgid "_Edit"
msgstr "_Sunting"
-#: ../midori/midori-browser.c:5249
-msgid "_Find..."
-msgstr "_Cari..."
+#: ../midori/midori-browser.c:5459
+msgid "_Find…"
+msgstr "_Cari…"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5460
msgid "Find a word or phrase in the page"
msgstr "Cari kata atau frasa di halaman"
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5462
msgid "Find _Next"
msgstr "Cari _Berikutnya"
-#: ../midori/midori-browser.c:5255
+#: ../midori/midori-browser.c:5465
msgid "Find _Previous"
msgstr "Cari _Sebelumnya"
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5469
msgid "Configure the application preferences"
msgstr "Konfigurasi pilihan aplikasi"
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5471
msgid "_View"
msgstr "_Tampilan"
-#: ../midori/midori-browser.c:5262
+#: ../midori/midori-browser.c:5472
msgid "_Toolbars"
msgstr "_Batang Alat"
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5477
msgid "Reload page without caching"
msgstr "Muat ulang halaman tanpa menyimpan tembolok"
-#: ../midori/midori-browser.c:5277
+#: ../midori/midori-browser.c:5487
msgid "Increase the zoom level"
msgstr "Naikkan level pembesaran"
-#: ../midori/midori-browser.c:5280
+#: ../midori/midori-browser.c:5490
msgid "Decrease the zoom level"
msgstr "Turunkan level pembesaran"
-#: ../midori/midori-browser.c:5284
+#: ../midori/midori-browser.c:5494
msgid "_Encoding"
msgstr "_Penyandian"
-#: ../midori/midori-browser.c:5286
+#: ../midori/midori-browser.c:5496
msgid "View So_urce"
msgstr "Tampilkan S_umber"
-#: ../midori/midori-browser.c:5289
+#: ../midori/midori-browser.c:5499
msgid "Ca_ret Browsing"
msgstr "Meramban Ca_ret"
-#: ../midori/midori-browser.c:5293
+#: ../midori/midori-browser.c:5503
msgid "Toggle fullscreen view"
msgstr "Aktifkan tampilan layar penuh"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5505
msgid "Scroll _Left"
msgstr "Gulung _Kiri"
-#: ../midori/midori-browser.c:5298
+#: ../midori/midori-browser.c:5508
msgid "Scroll _Down"
msgstr "Gulung _Bawah"
-#: ../midori/midori-browser.c:5301
+#: ../midori/midori-browser.c:5511
msgid "Scroll _Up"
msgstr "Gulung _Atas"
-#: ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:5514
msgid "Scroll _Right"
msgstr "_Gulung Kanan"
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:5517
+msgid "_Readable"
+msgstr "_Dapat Dibaca"
+
+#: ../midori/midori-browser.c:5520
msgid "_Go"
msgstr "_Ke"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5523
msgid "Go back to the previous page"
msgstr "Mundur ke halaman sebelumnya"
-#: ../midori/midori-browser.c:5313
-msgid "Go forward to the next page"
-msgstr "Maju ke halaman berikutnya"
-
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5530
msgid "Go to the previous sub-page"
msgstr "Maju ke sub-halaman sebelumnya"
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5321
-msgid "Go to the next sub-page"
-msgstr "Maju ke sub-halaman berikutnya"
+#: ../midori/midori-browser.c:5539
+msgid "_Homepage"
+msgstr "_Beranda"
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5540
msgid "Go to your homepage"
msgstr "Ke laman anda"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5542
msgid "Empty Trash"
msgstr "Kosongkan Tempat Sampah"
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5545
msgid "Undo _Close Tab"
msgstr "Tak _Jadi Tutup Tab"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5552
msgid "Add a new _folder"
msgstr "Tambah sebuah _folder baru"
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5558
msgid "_Export bookmarks"
msgstr "_Ekspor penanda"
-#: ../midori/midori-browser.c:5345 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "_Atur Mesin Pencari"
-#: ../midori/midori-browser.c:5348
+#: ../midori/midori-browser.c:5564
msgid "_Clear Private Data"
msgstr "_Hapus Data Pribadi"
-#: ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:5567
msgid "_Inspect Page"
msgstr "_Inspeksi Halaman"
-#: ../midori/midori-browser.c:5355
+#: ../midori/midori-browser.c:5571
msgid "_Previous Tab"
msgstr "_Tab Sebelumnya"
-#: ../midori/midori-browser.c:5358
+#: ../midori/midori-browser.c:5574
msgid "_Next Tab"
msgstr "Tab _Berikutnya"
-#: ../midori/midori-browser.c:5360
+#: ../midori/midori-browser.c:5576
msgid "Move Tab _Backward"
msgstr "_Geser Tab ke Belakang"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5578
msgid "_Move Tab Forward"
msgstr "_Geser Tab ke Depan"
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5581
msgid "Focus _Current Tab"
msgstr "Fokus _Tab Saat Ini"
-#: ../midori/midori-browser.c:5368
+#: ../midori/midori-browser.c:5584
msgid "Focus _Next view"
msgstr "Tampilan Fokus _Berikutnya"
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5587
msgid "Only show the Icon of the _Current Tab"
msgstr "Hanya tampilkan Ikon dari Tab _Terkini"
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5590
msgid "_Duplicate Current Tab"
msgstr "_Duplikasi Tab Saat Ini"
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5593
msgid "Close Ot_her Tabs"
msgstr "_Tutup Tab Lainnya"
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5596
msgid "Open last _session"
msgstr "Buka _sesi terakhir"
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5599
msgid "_Help"
msgstr "Ba_ntuan"
-#: ../midori/midori-browser.c:5385
+#: ../midori/midori-browser.c:5601
msgid "_Frequent Questions"
msgstr "_Pertanyaan Sering Ditanyakan"
-#: ../midori/midori-browser.c:5388
-msgid "_Report a Problem..."
-msgstr "_Laporkan Masalah..."
+#: ../midori/midori-browser.c:5604
+msgid "_Report a Problem…"
+msgstr "_Laporkan Masalah…"
-#: ../midori/midori-browser.c:5400
-msgid "_Menubar"
-msgstr "_Batang menu"
-
-#: ../midori/midori-browser.c:5404
-msgid "_Navigationbar"
-msgstr "Batang _navigasi"
-
-#: ../midori/midori-browser.c:5408
-msgid "Side_panel"
-msgstr "Panel _sisi"
-
-#: ../midori/midori-browser.c:5409
-msgid "Sidepanel"
-msgstr "Panel sisi"
-
-#: ../midori/midori-browser.c:5412
-msgid "_Bookmarkbar"
-msgstr "Batang _penanda"
-
-#: ../midori/midori-browser.c:5416
-msgid "_Statusbar"
-msgstr "Batang stat_us"
-
-#: ../midori/midori-browser.c:5425 ../midori/midori-websettings.c:307
-msgid "_Automatic"
-msgstr "_Otomatis"
-
-#: ../midori/midori-browser.c:5428 ../midori/midori-websettings.c:232
-msgid "Chinese (BIG5)"
-msgstr "China (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5432
-msgid "Japanese (SHIFT__JIS)"
-msgstr "Jepang (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:5435 ../midori/midori-websettings.c:234
-msgid "Korean (EUC-KR)"
-msgstr "Korea (EUC-KR)"
-
-#: ../midori/midori-browser.c:5438 ../midori/midori-websettings.c:235
-msgid "Russian (KOI8-R)"
-msgstr "Rusia (KOI8-R)"
-
-#: ../midori/midori-browser.c:5441 ../midori/midori-websettings.c:236
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-browser.c:5444 ../midori/midori-websettings.c:237
-msgid "Western (ISO-8859-1)"
-msgstr "Barat (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5447 ../midori/midori-websettings.c:238
-#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635
-msgid "Custom..."
-msgstr "Suai..."
-
-#: ../midori/midori-browser.c:5952
-msgid "_Separator"
-msgstr "_Pemisah"
-
-#: ../midori/midori-browser.c:5959
-msgid "_Location..."
-msgstr "_Lokasi..."
-
-#: ../midori/midori-browser.c:5961
-msgid "Open a particular location"
-msgstr "Buka lokasi khusus"
-
-#: ../midori/midori-browser.c:5983
-msgid "_Web Search..."
-msgstr "Penelusuran _Web..."
-
-#: ../midori/midori-browser.c:5985
-msgid "Run a web search"
-msgstr "Jalankan penelusuran web"
-
-#: ../midori/midori-browser.c:6012
-msgid "Reopen a previously closed tab or window"
-msgstr "Buka kembali tab atau jendela yang sebelumnya tertutup"
-
-#: ../midori/midori-browser.c:6029
-msgid "Show the saved bookmarks"
-msgstr "Tampilkan penanda tersimpan"
-
-#: ../midori/midori-browser.c:6046
+#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270
msgid "_Tools"
msgstr "_Alat"
-#: ../midori/midori-browser.c:6062
+#: ../midori/midori-browser.c:5616
+msgid "_Menubar"
+msgstr "_Batang menu"
+
+#: ../midori/midori-browser.c:5620
+msgid "_Navigationbar"
+msgstr "Batang _navigasi"
+
+#: ../midori/midori-browser.c:5624
+msgid "Side_panel"
+msgstr "Panel _sisi"
+
+#: ../midori/midori-browser.c:5625
+msgid "Sidepanel"
+msgstr "Panel sisi"
+
+#: ../midori/midori-browser.c:5628
+msgid "_Bookmarkbar"
+msgstr "Batang _penanda"
+
+#: ../midori/midori-browser.c:5632
+msgid "_Statusbar"
+msgstr "Batang stat_us"
+
+#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199
+msgid "_Automatic"
+msgstr "_Otomatis"
+
+#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123
+msgid "Chinese Traditional (BIG5)"
+msgstr "Mandarin Tradisional (BIG5)"
+
+#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124
+msgid "Chinese Simplified (GB18030)"
+msgstr "Mandarin Sederhana (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5651
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Jepang (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126
+msgid "Korean (EUC-KR)"
+msgstr "Korea (EUC-KR)"
+
+#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127
+msgid "Russian (KOI8-R)"
+msgstr "Rusia (KOI8-R)"
+
+#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129
+msgid "Western (ISO-8859-1)"
+msgstr "Barat (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5666
+msgid "Custom…"
+msgstr "Suai…"
+
+#: ../midori/midori-browser.c:6176
+msgid "_Separator"
+msgstr "_Pemisah"
+
+#: ../midori/midori-browser.c:6183
+msgid "_Location…"
+msgstr "_Lokasi…"
+
+#: ../midori/midori-browser.c:6185
+msgid "Open a particular location"
+msgstr "Buka lokasi khusus"
+
+#: ../midori/midori-browser.c:6207
+msgid "_Web Search…"
+msgstr "Penelusuran _Web…"
+
+#: ../midori/midori-browser.c:6209
+msgid "Run a web search"
+msgstr "Jalankan penelusuran web"
+
+#: ../midori/midori-browser.c:6236
+msgid "Reopen a previously closed tab or window"
+msgstr "Buka kembali tab atau jendela yang sebelumnya tertutup"
+
+#: ../midori/midori-browser.c:6253
+msgid "Show the saved bookmarks"
+msgstr "Tampilkan penanda tersimpan"
+
+#: ../midori/midori-browser.c:6286
msgid "_Window"
msgstr "_Jendela"
-#: ../midori/midori-browser.c:6064
+#: ../midori/midori-browser.c:6288
msgid "Show a list of all open tabs"
msgstr "Tampilkan senarai semua tab yang terbuka"
-#: ../midori/midori-browser.c:6078
+#: ../midori/midori-browser.c:6302
msgid "_Menu"
msgstr "_Menu"
-#: ../midori/midori-browser.c:6080
+#: ../midori/midori-browser.c:6304
msgid "Menu"
msgstr "Menu"
-#: ../midori/midori-browser.c:6776
+#: ../midori/midori-browser.c:7134
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Pengaturan tak diharapkan '%s'"
-#: ../midori/midori-extension.c:310
+#: ../midori/midori-extension.c:330
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "Konfigurasi dari ekstensi '%s' tak dapat dimuat: %s\n"
-#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818
-#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:752 ../midori/midori-extension.c:849
+#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058
+#: ../extensions/addons.c:1686
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "Konfigurasi dari ekstensi '%s' tak dapat disimpan: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "Cari %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Cari dengan..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "Cari dengan…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "Gagal memilih dari riwayat\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "Mencari %s"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "Ekspor sertifikat"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "Otoritas penanda validitas sertifikat; tidak dikenal."
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"Sertifikat tidak sesuai dengan identitas yang dimiliki situs yang dikunjungi."
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "Waktu aktivasi sertifikat masih dalam masa tunggu."
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "Masa berlaku sertifikat telah kadaluarsa"
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr "Sertifikat telah dicabut berdasarkan daftar GTlsConnection."
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Algoritma sertifikat dinilai tidak aman."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "Beberapa galat terjadi saat memvallidasi sertifikat."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "_Ekspor sertifikat"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "Tandatangan mandiri"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "Rincian keamanan"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1399
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "Tempel dan l_anjutkan"
-#: ../midori/midori-locationaction.c:1767
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "Tidak diverifikasi"
-#: ../midori/midori-locationaction.c:1787
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "Koneksi terverifikasi dan terenkripsi"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-locationaction.c:1989
+msgid "Open, unencrypted connection"
+msgstr "Terbuka, koneksi tanpa enkripsi"
+
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Ratakan panel sisi ke kanan"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Tutup panel"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Ratakan panel sisi ke kiri"
-#: ../midori/midori-websettings.c:214
+#: ../midori/midori-websettings.c:105
msgid "Show Speed Dial"
msgstr "Tampilkan Panggil cepat"
-#: ../midori/midori-websettings.c:215
+#: ../midori/midori-websettings.c:106
msgid "Show Homepage"
msgstr "Tampilkan Beranda"
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:125
msgid "Japanese (SHIFT_JIS)"
msgstr "Jepang (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:253
+#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Suai…"
+
+#: ../midori/midori-websettings.c:145
msgid "New tab"
msgstr "Tab baru"
-#: ../midori/midori-websettings.c:254
+#: ../midori/midori-websettings.c:146
msgid "New window"
msgstr "Jendela baru"
-#: ../midori/midori-websettings.c:255
+#: ../midori/midori-websettings.c:147
msgid "Current tab"
msgstr "Tab saat ini"
-#: ../midori/midori-websettings.c:270
+#: ../midori/midori-websettings.c:162
msgid "Default"
msgstr "Standar"
-#: ../midori/midori-websettings.c:271
+#: ../midori/midori-websettings.c:163
msgid "Icons"
msgstr "Ikon"
-#: ../midori/midori-websettings.c:272
+#: ../midori/midori-websettings.c:164
msgid "Small icons"
msgstr "Ikon kecil"
-#: ../midori/midori-websettings.c:273
+#: ../midori/midori-websettings.c:165
msgid "Text"
msgstr "Teks"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:166
msgid "Icons and text"
msgstr "Ikon dan teks"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:167
msgid "Text beside icons"
msgstr "Teks di samping ikon"
-#: ../midori/midori-websettings.c:290
+#: ../midori/midori-websettings.c:182
msgid "Automatic (GNOME or environment)"
msgstr "Otomatis (GNOME atau lingkungan)"
-#: ../midori/midori-websettings.c:291
+#: ../midori/midori-websettings.c:183
msgid "HTTP proxy server"
msgstr "Server proxy HTTP"
-#: ../midori/midori-websettings.c:292
+#: ../midori/midori-websettings.c:184
msgid "No proxy server"
msgstr "Tak ada server proxy"
-#: ../midori/midori-websettings.c:309
+#: ../midori/midori-websettings.c:201
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:202
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:310
+#: ../midori/midori-websettings.c:203
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:311
+#: ../midori/midori-websettings.c:204
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:312
+#: ../midori/midori-websettings.c:205
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:388
-msgid "Remember last window size"
-msgstr "Ingat ukuran jendela terakhir"
-
-#: ../midori/midori-websettings.c:389
-msgid "Whether to save the last window size"
-msgstr "Apakah ingin menyimpan ukuran jendela yang terakhir tersimpan"
-
-#: ../midori/midori-websettings.c:397
-msgid "Last window width"
-msgstr "Lebar jendela terakhir"
-
-#: ../midori/midori-websettings.c:398
-msgid "The last saved window width"
-msgstr "Lebar jendela terakhir tersimpan"
-
-#: ../midori/midori-websettings.c:406
-msgid "Last window height"
-msgstr "Tinggi jendela terakhir"
-
-#: ../midori/midori-websettings.c:407
-msgid "The last saved window height"
-msgstr "Tinggi jendela terakhir tersimpan"
-
-#: ../midori/midori-websettings.c:432
-msgid "Last panel position"
-msgstr "Posisi panel terakhir"
-
-#: ../midori/midori-websettings.c:433
-msgid "The last saved panel position"
-msgstr "Posisi panel terakhir tersimpan"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:442
-msgid "Last panel page"
-msgstr "Halaman panel terakhir"
-
-#: ../midori/midori-websettings.c:443
-msgid "The last saved panel page"
-msgstr "Halaman panel terakhir tersimpan"
-
-#: ../midori/midori-websettings.c:451
-msgid "Last Web search"
-msgstr "Penelusuran Web terakhir"
-
-#: ../midori/midori-websettings.c:452
-msgid "The last saved Web search"
-msgstr "Penelusuran Web terakhir tersimpan"
-
-#: ../midori/midori-websettings.c:461
-msgid "Show Menubar"
-msgstr "Tampilkan Batang Menu"
-
-#: ../midori/midori-websettings.c:462
-msgid "Whether to show the menubar"
-msgstr "Apakah ingin menampilkan batang menu"
-
-#: ../midori/midori-websettings.c:470
-msgid "Show Navigationbar"
-msgstr "Tampilkan Batang Navigasi"
-
-#: ../midori/midori-websettings.c:471
-msgid "Whether to show the navigationbar"
-msgstr "Apakah ingin menampilkan batang navigasi"
-
-#: ../midori/midori-websettings.c:479
-msgid "Show Bookmarkbar"
-msgstr "Tampilkan Batang Penanda"
-
-#: ../midori/midori-websettings.c:480
-msgid "Whether to show the bookmarkbar"
-msgstr "Apakah ingin menampilkan batang penanda"
-
-#: ../midori/midori-websettings.c:488
-msgid "Show Panel"
-msgstr "Tampilkan Panel"
-
-#: ../midori/midori-websettings.c:489
-msgid "Whether to show the panel"
-msgstr "Apakah ingin menampilkan panel"
-
-#: ../midori/midori-websettings.c:497
-msgid "Show Statusbar"
-msgstr "Tampilkan Batang Status"
-
-#: ../midori/midori-websettings.c:498
-msgid "Whether to show the statusbar"
-msgstr "Apakah ingin menampilkan batang status"
-
-#: ../midori/midori-websettings.c:507
+#: ../midori/midori-websettings.c:278
msgid "Toolbar Style:"
msgstr "Gaya Batang Alat:"
-#: ../midori/midori-websettings.c:508
+#: ../midori/midori-websettings.c:279
msgid "The style of the toolbar"
msgstr "Gaya dari batang alat"
-#: ../midori/midori-websettings.c:517
-msgid "Toolbar Items"
-msgstr "Item Batang Alat"
-
-#: ../midori/midori-websettings.c:518
-msgid "The items to show on the toolbar"
-msgstr "Item yang akan ditampilkan di batang alat"
-
-#: ../midori/midori-websettings.c:526
-msgid "Compact Sidepanel"
-msgstr "Panel Sisi Kompak"
-
-#: ../midori/midori-websettings.c:527
-msgid "Whether to make the sidepanel compact"
-msgstr "Apakah ingin membuat panel sisi kompak"
-
-#: ../midori/midori-websettings.c:542
-msgid "Align sidepanel on the right"
-msgstr "Ratakan panel sisi di kanan"
-
-#: ../midori/midori-websettings.c:543
-msgid "Whether to align the sidepanel on the right"
-msgstr "Apakah ingin meratakan panel sisi di sebelah kanan"
-
-#: ../midori/midori-websettings.c:558
-msgid "Open panels in separate windows"
-msgstr "Buka panel di jendela yang terpisah"
-
-#: ../midori/midori-websettings.c:559
-msgid "Whether to always open panels in separate windows"
-msgstr "Apakah ingin selalu membuka panel jendela yang terpisah"
-
-#: ../midori/midori-websettings.c:568
+#: ../midori/midori-websettings.c:288
msgid "When Midori starts:"
msgstr "Jika Midori dijalankan:"
-#: ../midori/midori-websettings.c:569
-msgid "What to do when Midori starts"
-msgstr "Apa yang akan dilakukan saat Midori dijalankan"
-
-#: ../midori/midori-websettings.c:578
-msgid "Homepage:"
-msgstr "Beranda:"
-
-#: ../midori/midori-websettings.c:579
-msgid "The homepage"
-msgstr "Laman"
-
-#: ../midori/midori-websettings.c:594
-msgid "Show crash dialog"
-msgstr "Tampilkan dialog macet"
-
-#: ../midori/midori-websettings.c:595
-msgid "Show a dialog after Midori crashed"
-msgstr "Tampilkan sebuah dialog setelah Midori macet"
-
-#: ../midori/midori-websettings.c:603
-msgid "Save downloaded files to:"
-msgstr "Simpan berkas yang diunduh ke:"
-
-#: ../midori/midori-websettings.c:604
-msgid "The folder downloaded files are saved to"
-msgstr "Folder berkas terunduh disimpan di"
-
-#: ../midori/midori-websettings.c:612
-msgid "Text Editor"
-msgstr "Penyunting Teks"
-
-#: ../midori/midori-websettings.c:613
-msgid "An external text editor"
-msgstr "Penyunting teks eksternal"
-
-#: ../midori/midori-websettings.c:628
-msgid "News Aggregator"
-msgstr "Agregator Berita"
-
-#: ../midori/midori-websettings.c:629
-msgid "An external news aggregator"
-msgstr "Sebuah agregator berita eksternal"
-
-#: ../midori/midori-websettings.c:637
-msgid "Location entry Search"
-msgstr "Pencari entri lokasi"
-
-#: ../midori/midori-websettings.c:638
-msgid "The search to perform inside the location entry"
-msgstr "Pencarian yang dilakukan di dalam entri lokasi"
-
-#: ../midori/midori-websettings.c:646
+#: ../midori/midori-websettings.c:298
msgid "Preferred Encoding"
msgstr "Penyandian Kesukaan"
-#: ../midori/midori-websettings.c:647
-msgid "The preferred character encoding"
-msgstr "Penyandian karakter kesukaan"
-
-#: ../midori/midori-websettings.c:657
-msgid "Always Show Tabbar"
-msgstr "Selalu Tampilkan Batang Tab"
-
-#: ../midori/midori-websettings.c:658
-msgid "Always show the tabbar"
-msgstr "Selalu tampilkan batang tab"
-
-#: ../midori/midori-websettings.c:672
-msgid "Close Buttons on Tabs"
-msgstr "Tutup Tombol di Tab"
-
-#: ../midori/midori-websettings.c:673
-msgid "Whether tabs have close buttons"
-msgstr "Apakah tab memiliki tombol tutup"
-
-#: ../midori/midori-websettings.c:698
+#: ../midori/midori-websettings.c:325
msgid "Open new pages in:"
msgstr "Buka halaman baru di:"
-#: ../midori/midori-websettings.c:699
-msgid "Where to open new pages"
-msgstr "Dimana membuka halaman baru"
-
-#: ../midori/midori-websettings.c:708
-msgid "Middle click opens Selection"
-msgstr "Klik Tengah Membuka Pilihan"
-
-#: ../midori/midori-websettings.c:709
-msgid "Load an address from the selection via middle click"
-msgstr "Muat sebuah alamat dari pilihan via klik tengah"
-
-#: ../midori/midori-websettings.c:717
-msgid "Open tabs in the background"
-msgstr "Buka Tab di Latar Belakang"
-
-#: ../midori/midori-websettings.c:718
-msgid "Whether to open new tabs in the background"
-msgstr "Apakah ingin membuka tab baru di latar belakang"
-
-#: ../midori/midori-websettings.c:726
-msgid "Open Tabs next to Current"
-msgstr "Buka Tab di Samping Saat Ini"
-
-#: ../midori/midori-websettings.c:727
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr ""
-"Apakah ingin membuka tab baru di sebelah tab saat ini atau setelah tab "
-"terakhir"
-
-#: ../midori/midori-websettings.c:735
-msgid "Open popups in tabs"
-msgstr "Buka popup di tab"
-
-#: ../midori/midori-websettings.c:736
-msgid "Whether to open popup windows in tabs"
-msgstr "Apakah ingin membuka jendela popup di tab"
-
-#: ../midori/midori-websettings.c:746 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Muat gambar secara otomatis"
-
-#: ../midori/midori-websettings.c:747
-msgid "Load and display images automatically"
-msgstr "Muat dan tampilkan gambar secara otomatis"
-
-#: ../midori/midori-websettings.c:754 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Aktifkan skrip"
-
-#: ../midori/midori-websettings.c:755
-msgid "Enable embedded scripting languages"
-msgstr "Aktifkan bahasa skrip terbenam"
-
-#: ../midori/midori-websettings.c:762 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Aktifkan plugin Netscape"
-
-#: ../midori/midori-websettings.c:763
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Aktifkan objek plugin Netscape terbenam"
-
-#: ../midori/midori-websettings.c:778
-msgid "Enable Spell Checking"
-msgstr "Aktifkan Pemeriksa Ejaan"
-
-#: ../midori/midori-websettings.c:779
-msgid "Enable spell checking while typing"
-msgstr "Aktifkan pemeriksa ejaan ketika mengetik"
-
-#: ../midori/midori-websettings.c:785
-msgid "Enable HTML5 database support"
-msgstr "Aktifkan dukungan basis data HTML5"
-
-#: ../midori/midori-websettings.c:786
-msgid "Whether to enable HTML5 database support"
-msgstr "Apakah akan mengaktifkan dukungan basis data HTML5"
-
-#: ../midori/midori-websettings.c:792
-msgid "Enable HTML5 local storage support"
-msgstr "Aktifkan dukungan penyimpanan lokal HTML5"
-
-#: ../midori/midori-websettings.c:793
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Apakah akan mengaktifkan dukungan penyimpanan lokal HTML5"
-
-#: ../midori/midori-websettings.c:799
-msgid "Enable offline web application cache"
-msgstr "Aktifkan tembolok aplikasi web luring"
-
-#: ../midori/midori-websettings.c:800
-msgid "Whether to enable offline web application cache"
-msgstr "Apakah akan mengaktifkan tembolok aplikasi web luring"
-
-#: ../midori/midori-websettings.c:816
-msgid "Flash window on background tabs"
-msgstr "Kedipkan jendela yang membuka tab di latar belakang"
-
-#: ../midori/midori-websettings.c:817
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr "Kedipkan jendela peramban jika tab baru dibuka di latar belakang"
-
-#: ../midori/midori-websettings.c:825
-msgid "Enable WebGL support"
-msgstr "Aktifkan dukungan WebGL"
-
-#: ../midori/midori-websettings.c:826
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Izinkan situs web untuk menggunakan sesuaian OpenGL"
-
-#: ../midori/midori-websettings.c:852
-msgid "Zoom Text and Images"
-msgstr "Pembesaran Teks dan Gambar"
-
-#: ../midori/midori-websettings.c:853
-msgid "Whether to zoom text and images"
-msgstr "Apakah ingin memperbesar teks dan gambar"
-
-#: ../midori/midori-websettings.c:868
-msgid "Find inline while typing"
-msgstr "Cari dalam baris ketika mengetik"
-
-#: ../midori/midori-websettings.c:869
-msgid "Whether to automatically find inline while typing"
-msgstr "Apakah akan secara otomatis mencari dalam baris ketika mengetik"
-
-#: ../midori/midori-websettings.c:884
-msgid "Kinetic scrolling"
-msgstr "Menggulung kinetis"
-
-#: ../midori/midori-websettings.c:885
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Apakah menggulung harus bergeser secara kinetis tergantung kecepatan"
-
-#: ../midori/midori-websettings.c:893
-msgid "Delete old Cookies after:"
-msgstr "Hapus kuki lama setelah:"
-
-#: ../midori/midori-websettings.c:894
-msgid "The maximum number of days to save cookies for"
-msgstr "Jumlah maksimum hari untuk menyimpan kuki"
-
-#: ../midori/midori-websettings.c:910
-msgid "Only accept Cookies from sites you visit"
-msgstr "Hanya terima kuki dari situs yang anda kunjungi"
-
-#: ../midori/midori-websettings.c:911
-msgid "Block cookies sent by third-party websites"
-msgstr "Blok kuki yang dikirim dari situs web pihak ketiga"
-
-#: ../midori/midori-websettings.c:925
-msgid "Delete pages from history after:"
-msgstr "Hapus halaman dari riwayat setelah:"
-
-#: ../midori/midori-websettings.c:926
-msgid "The maximum number of days to save the history for"
-msgstr "Jumlah maksimum hari untuk tetap menyimpan riwayat"
-
-#: ../midori/midori-websettings.c:941
-msgid "Proxy server"
-msgstr "Server proxy"
-
-#: ../midori/midori-websettings.c:942
-msgid "The type of proxy server to use"
-msgstr "Tipe server proxy yang akan digunakan"
-
-#: ../midori/midori-websettings.c:951
-msgid "HTTP Proxy Server"
-msgstr "Server Proxy HTTP"
-
-#: ../midori/midori-websettings.c:952
-msgid "The proxy server used for HTTP connections"
-msgstr "Proxy server yang digunakan untuk koneksi HTTP"
-
-#: ../midori/midori-websettings.c:967
-msgid "Port"
-msgstr "Pangkalan"
-
-#: ../midori/midori-websettings.c:968
-msgid "The proxy server port used for HTTP connections"
-msgstr "Proxy server yang digunakan untuk koneksi HTTP"
-
-#: ../midori/midori-websettings.c:986
-msgid "The maximum size of cached pages on disk"
-msgstr "Ukuran maksimum dari halaman tembolok di cakram"
-
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1003
+#: ../midori/midori-websettings.c:388
msgid "Identify as"
msgstr "Identifikasi sebagai"
-#: ../midori/midori-websettings.c:1004
+#: ../midori/midori-websettings.c:389
msgid "What to identify as to web pages"
msgstr "Apa yang diidentifikasi sebagai halaman web"
-#: ../midori/midori-websettings.c:1020
-msgid "Identification string"
-msgstr "Tali identifikasi"
-
-#: ../midori/midori-websettings.c:1021
-msgid "The application identification string"
-msgstr "Tali identifikasi aplikasi"
-
-#: ../midori/midori-websettings.c:1037
+#: ../midori/midori-websettings.c:422
msgid "Preferred languages"
msgstr "Penyandian kesukaan"
-#: ../midori/midori-websettings.c:1038
+#: ../midori/midori-websettings.c:423
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1602,503 +1325,320 @@ msgstr ""
"web multibahasa, misalnya \"de\", \"ru,nl\" atau \"en-us;q=1.0, fr-fr;"
"q=0.667\""
-#: ../midori/midori-websettings.c:1053
-msgid "Clear private data"
-msgstr "Hapus data pribadi"
-
-#: ../midori/midori-websettings.c:1054
-msgid "The private data selected for deletion"
-msgstr "Data pribadi yang dipilih untuk dihapus"
-
-#: ../midori/midori-websettings.c:1069
-msgid "Clear data"
-msgstr "Hapus data"
-
-#: ../midori/midori-websettings.c:1070
-msgid "The data selected for deletion"
-msgstr "Data terpilih untuk dihapus"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1119
-msgid "Strip referrer details sent to websites"
-msgstr "Hapus detail rujukan yang dikirim ke situs web"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1121
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Apakah tajuk \"Rujukan\" harus dipendekkan ke nama host"
-
-#: ../midori/midori-websettings.c:1135
+#: ../midori/midori-websettings.c:472
msgid "Always use my font choices"
msgstr "Selalu gunakan fonta pilihan saya"
-#: ../midori/midori-websettings.c:1136
+#: ../midori/midori-websettings.c:473
msgid "Override fonts picked by websites with user preferences"
msgstr "Timpa fonta yang dipilih oleh situs web dengan pengaturan pengguna"
-#: ../midori/midori-view.c:1345
+#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151
+msgid "Trust this website"
+msgstr "Masukkan dalam daftar situs terpercaya"
+
+#: ../midori/midori-view.c:1149
+msgid "Security unknown"
+msgstr "Tingkat keamanan tidak diketahui"
+
+#: ../midori/midori-view.c:1447
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s ingin menyimpan basis data HTML5."
-#: ../midori/midori-view.c:1349 ../midori/midori-view.c:1381
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Deny"
msgstr "_Tolak"
-#: ../midori/midori-view.c:1349 ../midori/midori-view.c:1381
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Allow"
msgstr "_Izinkan"
-#: ../midori/midori-view.c:1377
+#: ../midori/midori-view.c:1480
#, c-format
msgid "%s wants to know your location."
msgstr "%s ingin mengetahui lokasi anda."
-#: ../midori/midori-view.c:1468
+#: ../midori/midori-view.c:1576
#, c-format
msgid "Error - %s"
msgstr "Galat - %s"
-#: ../midori/midori-view.c:1469
+#: ../midori/midori-view.c:1577
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Halaman bernama '%s' tak dapat dimuat"
-#: ../midori/midori-view.c:1471
+#: ../midori/midori-view.c:1579
msgid "Try again"
msgstr "Coba lagi"
-#: ../midori/midori-view.c:1668 ../midori/midori-view.c:2573
+#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887
#, c-format
msgid "Send a message to %s"
msgstr "Kirim sebuah pesan ke %s"
-#: ../midori/midori-view.c:2403 ../midori/midori-view.c:2722
+#: ../midori/midori-view.c:2673
+msgid "Add _search engine..."
+msgstr "Tambah me_sin pencari..."
+
+#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043
msgid "Inspect _Element"
msgstr "Inspeksi _Elemen"
-#: ../midori/midori-view.c:2455
+#: ../midori/midori-view.c:2769
msgid "Open Link in New _Tab"
msgstr "Buka Taut di _Tab Baru"
-#: ../midori/midori-view.c:2459
+#: ../midori/midori-view.c:2773
msgid "Open Link in _Foreground Tab"
msgstr "Buka Tautan di _Tab Depan"
-#: ../midori/midori-view.c:2460
+#: ../midori/midori-view.c:2774
msgid "Open Link in _Background Tab"
msgstr "Buka Tautan di _Tab Belakang"
-#: ../midori/midori-view.c:2463
+#: ../midori/midori-view.c:2777
msgid "Open Link in New _Window"
msgstr "Buka Tautan di _Jendela Baru"
-#: ../midori/midori-view.c:2466
+#: ../midori/midori-view.c:2780
msgid "Open Link as Web A_pplication"
msgstr "Buka Tautan Sebagai A_plikasi Web"
-#: ../midori/midori-view.c:2471
+#: ../midori/midori-view.c:2785
msgid "Copy Link de_stination"
msgstr "Salin Tu_juan Tautan"
-#: ../midori/midori-view.c:2487
+#: ../midori/midori-view.c:2801
msgid "Open _Image in New Tab"
msgstr "Buka Gambar di _Tab Baru"
-#: ../midori/midori-view.c:2490
+#: ../midori/midori-view.c:2804
msgid "Copy Image _Address"
msgstr "Salin _Alamat Gambar"
-#: ../midori/midori-view.c:2493
+#: ../midori/midori-view.c:2807
msgid "Save I_mage"
msgstr "Simpan Ga_mbar"
-#: ../midori/midori-view.c:2496
+#: ../midori/midori-view.c:2810
msgid "Open in Image _Viewer"
msgstr "Buka di _Penampil Gambar"
-#: ../midori/midori-view.c:2503
+#: ../midori/midori-view.c:2817
msgid "Copy Video _Address"
msgstr "Salin _Alamat Video"
-#: ../midori/midori-view.c:2506
+#: ../midori/midori-view.c:2820
msgid "Save _Video"
msgstr "Simpan _Video"
-#: ../midori/midori-view.c:2506
+#: ../midori/midori-view.c:2820
msgid "Download _Video"
msgstr "Unduh _Video"
-#: ../midori/midori-view.c:2532
+#: ../midori/midori-view.c:2846
msgid "Search _with"
msgstr "Cari _dengan"
-#: ../midori/midori-view.c:2564
+#: ../midori/midori-view.c:2878
msgid "_Search the Web"
msgstr "_Cari web"
-#: ../midori/midori-view.c:2581
+#: ../midori/midori-view.c:2895
msgid "Open Address in New _Tab"
msgstr "Buka Alamat di _Tab Baru"
-#: ../midori/midori-view.c:2870
-msgid "Open or download file"
-msgstr "Buka atau unduh berkas"
+#: ../midori/midori-view.c:2948
+msgid "Open _Frame in New Tab"
+msgstr "Buka _Bingkai di Tab Baru"
-#: ../midori/midori-view.c:2889
+#: ../midori/midori-view.c:3203
#, c-format
-msgid "File Type: '%s'"
-msgstr "Tipe Berkas: '%s'"
+msgid "Open or download file from %s"
+msgstr "Buka atau unduh berkas dari %s"
-#: ../midori/midori-view.c:2891
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Tipe Berkas: %s ('%s')"
-
-#: ../midori/midori-view.c:2895
+#: ../midori/midori-view.c:3216
#, c-format
msgid "File Name: %s"
msgstr "Nama Berkas: %s"
+#: ../midori/midori-view.c:3221
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Tipe Berkas: '%s'"
+
+#: ../midori/midori-view.c:3223
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Tipe Berkas: %s ('%s')"
+
+#: ../midori/midori-view.c:3260
+#, c-format
+msgid "Size: %s"
+msgstr "Ukuran: %s"
+
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2914
+#: ../midori/midori-view.c:3271
#, c-format
msgid "Open %s"
msgstr "Buka %s"
-#: ../midori/midori-view.c:3539
+#: ../midori/midori-view.c:3882
#, c-format
msgid "Inspect page - %s"
msgstr "Periksa halaman - %s"
-#: ../midori/midori-view.c:3840
-msgid "Speed Dial"
-msgstr "Panggil cepat"
-
-#: ../midori/midori-view.c:3841 ../midori/midori-view.c:3937
-msgid "Click to add a shortcut"
-msgstr "Klik untuk menambah jalan pintas"
-
-#: ../midori/midori-view.c:3842
-msgid "Enter shortcut address"
-msgstr "Masukkan alamat jalan pintas"
-
-#: ../midori/midori-view.c:3843
-msgid "Enter shortcut title"
-msgstr "Masukkan judul jalan pintas"
-
-#: ../midori/midori-view.c:3844
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "Anda yakin ingin menghapus jalan pintas ini?"
-
-#: ../midori/midori-view.c:4006
+#: ../midori/midori-view.c:4279
#, c-format
msgid "No documentation installed"
msgstr "Tak ada dokumentasi yang terinstal"
-#: ../midori/midori-view.c:4082
+#: ../midori/midori-view.c:4356
msgid "Midori doesn't store any personal data:"
msgstr "Midori tidak menyimpan data pribadi apapun:"
-#: ../midori/midori-view.c:4083
+#: ../midori/midori-view.c:4357
msgid "No history or web cookies are being saved."
msgstr "Tak ada riwayat atau kuki web yang disimpan."
-#: ../midori/midori-view.c:4084
+#: ../midori/midori-view.c:4358
msgid "Extensions are disabled."
msgstr "Ekstensi dinonaktifkan."
-#: ../midori/midori-view.c:4085
+#: ../midori/midori-view.c:4359
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
"Penyimpanan HTML5, basis data lokal dan tembolok aplikasi dinonaktifkan."
-#: ../midori/midori-view.c:4086
+#: ../midori/midori-view.c:4360
msgid "Midori prevents websites from tracking the user:"
msgstr "Midori mencegah situs web melacak pengguna:"
-#: ../midori/midori-view.c:4087
+#: ../midori/midori-view.c:4361
msgid "Referrer URLs are stripped down to the hostname."
msgstr "Perujuk URL dicopot dari nama host."
-#: ../midori/midori-view.c:4088
+#: ../midori/midori-view.c:4362
msgid "DNS prefetching is disabled."
msgstr "Praambil DNS dinonaktifkan."
-#: ../midori/midori-view.c:4089
+#: ../midori/midori-view.c:4363
msgid "The language and timezone are not revealed to websites."
msgstr "Bahasa dan zona waktu tidak diberikan ke situs web."
-#: ../midori/midori-view.c:4090
+#: ../midori/midori-view.c:4364
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr ""
"Flash dan plugin Netscape lainnya tidak bisa ditampilkan oleh situs web."
-#: ../midori/midori-view.c:4128
+#: ../midori/midori-view.c:4450
msgid "Version numbers in brackets show the version used at runtime."
msgstr ""
"Nomor versi dalam kurung menunjukkan versi yang digunakan dalam runtime."
-#: ../midori/midori-view.c:4184
+#: ../midori/midori-view.c:4499
msgid "Page loading delayed"
msgstr "Memuat halaman ditunda"
-#: ../midori/midori-view.c:4185
+#: ../midori/midori-view.c:4500
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr "Memuat ditunda karena macet yang baru terjadi atau pengaturan awal."
-#: ../midori/midori-view.c:4186
+#: ../midori/midori-view.c:4501
msgid "Load Page"
msgstr "Memuat Halaman"
-#: ../midori/midori-view.c:4325
+#: ../midori/midori-view.c:4668
msgid "Blank page"
msgstr "Halaman kosong"
-#: ../midori/midori-view.c:4587
+#: ../midori/midori-view.c:4932
msgid "_Duplicate Tab"
msgstr "_Duplikasi Tab"
-#: ../midori/midori-view.c:4592
+#: ../midori/midori-view.c:4937
msgid "Show Tab _Label"
msgstr "Tampilkan _Label Tab"
-#: ../midori/midori-view.c:4592
+#: ../midori/midori-view.c:4937
msgid "Show Tab _Icon Only"
msgstr "Hanya Tampilkan _Ikon Tab"
-#: ../midori/midori-view.c:4598
-msgid "Close ot_her Tabs"
-msgstr "Tutup Tab _Lainnya"
+#: ../midori/midori-view.c:4944
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "_Tutup Tab Lainnya"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5369
+#: ../midori/midori-view.c:5701
msgid "previous"
msgstr "sebelumnya"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5388
+#: ../midori/midori-view.c:5720
msgid "next"
msgstr "berikutnya"
-#: ../midori/midori-view.c:5401
+#: ../midori/midori-view.c:5733
msgid "Print background images"
msgstr "Cetak gambar latar belakang"
-#: ../midori/midori-view.c:5402
+#: ../midori/midori-view.c:5734
msgid "Whether background images should be printed"
msgstr "Apakah gambar latar belakang harus dicetak"
-#: ../midori/midori-view.c:5434
+#: ../midori/midori-view.c:5766
msgid "Features"
msgstr "Fitur"
-#: ../midori/midori-preferences.c:297
-msgid "Startup"
-msgstr "Mulai"
-
-#: ../midori/midori-preferences.c:310
-msgid "Use _current page"
-msgstr "Gunakan _halaman saat ini"
-
-#: ../midori/midori-preferences.c:314
-msgid "Use current page as homepage"
-msgstr "Gunakan halaman saat ini sebagai beranda"
-
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
-msgid "Fonts"
-msgstr "Fonta"
-
-#: ../midori/midori-preferences.c:326
-msgid "Proportional Font Family"
-msgstr "Keluarga Fonta Proporsional"
-
-#: ../midori/midori-preferences.c:330
-msgid "The default font family used to display text"
-msgstr "Keluarga fonta standar yang digunakan untuk menampilkan teks"
-
-#: ../midori/midori-preferences.c:333
-msgid "The default font size used to display text"
-msgstr "Ukuran fonta standar yang digunakan untuk menampilkan teks"
-
-#: ../midori/midori-preferences.c:335
-msgid "Fixed-width Font Family"
-msgstr "Keluarga Fonta Sesuai Lebar"
-
-#: ../midori/midori-preferences.c:339
-msgid "The font family used to display fixed-width text"
-msgstr "Keluarga fonta yang digunakan untuk menampilkan teks sesuai lebar"
-
-#: ../midori/midori-preferences.c:342
-msgid "The font size used to display fixed-width text"
-msgstr "Ukuran fonta yang digunakan untuk menampilkan teks sesuai lebar"
-
-#: ../midori/midori-preferences.c:344
-msgid "Minimum Font Size"
-msgstr "Ukuran Fonta Minimum"
-
-#: ../midori/midori-preferences.c:348
-msgid "The minimum font size used to display text"
-msgstr "Ukuran fonta minimum yang digunakan untuk menampilkan teks"
-
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
-msgid "Behavior"
-msgstr "Perilaku"
-
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
-msgstr "Izinkan skrip untuk membuka popup"
-
-#: ../midori/midori-preferences.c:386
-msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr "Apakah skrip diizinkan untuk membuka popup jendela secara otomatis"
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:416
-msgid "Browsing"
-msgstr "Meramban"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:456
-msgid "Network"
-msgstr "Jaringan"
-
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "Nama Host"
-
-#: ../midori/midori-preferences.c:487
-msgid "MB"
-msgstr "MB"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Add search engine"
-msgstr "Tambah mesin pencari"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Edit search engine"
-msgstr "Sunting mesin pencari"
-
-#: ../midori/midori-searchaction.c:931
-msgid "_Name:"
-msgstr "_Nama:"
-
-#: ../midori/midori-searchaction.c:947
-msgid "_Description:"
-msgstr "_Keterangan:"
-
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Ikon:"
-
-#: ../midori/midori-searchaction.c:995
-msgid "_Token:"
-msgstr "_Token:"
-
-#: ../midori/midori-searchaction.c:1295
-msgid "Manage Search Engines"
-msgstr "Atur Mesin Pencari"
-
-#: ../midori/midori-searchaction.c:1395
-msgid "Use as _default"
-msgstr "Gunakan sebagai stan_dar"
-
-#: ../midori/sokoke.c:412
-msgid "Open with"
-msgstr "Buka dengan"
-
-#: ../midori/sokoke.c:420
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:48
#, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Pilih sebuah aplikasi atau perintah untuk membuka \"%s\":"
+msgid "%s of %s"
+msgstr "%s dari %s"
-#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499
-#: ../midori/sokoke.c:528 ../midori/sokoke.c:542
-msgid "Could not run external program."
-msgstr "Tak dapat menjalankan program eksternal."
-
-#: ../midori/sokoke.c:1653
+#: ../midori/midori-download.vala:64
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d jam"
-#: ../midori/sokoke.c:1654
+#: ../midori/midori-download.vala:65
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d menit"
-#: ../midori/sokoke.c:1655
+#: ../midori/midori-download.vala:66
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d detik"
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267
-#, c-format
-msgid "%s of %s"
-msgstr "%s dari %s"
-
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1672
-msgid "?B"
-msgstr "?B"
-
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1675
-#, c-format
-msgid " (%s/s)"
-msgstr " (%s/s)"
-
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1692
+#: ../midori/midori-download.vala:82
#, c-format
msgid " - %s remaining"
msgstr " - %s tersisa"
-#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:263
-msgid "_Inline Find:"
-msgstr "_Cari Dalam Baris:"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:92
+msgid "?B"
+msgstr "?B"
-#: ../toolbars/midori-findbar.c:289
-msgid "Previous"
-msgstr "Sebelumnya"
-
-#: ../toolbars/midori-findbar.c:295
-msgid "Next"
-msgstr "Berikutnya"
-
-#: ../toolbars/midori-findbar.c:299
-msgid "Match Case"
-msgstr "Cocokkan Huruf"
-
-#: ../toolbars/midori-findbar.c:308
-msgid "Highlight Matches"
-msgstr "Sorot Kecocokan"
-
-#: ../toolbars/midori-findbar.c:319
-msgid "Close Findbar"
-msgstr "Tutup batang cari"
-
-#: ../toolbars/midori-transferbar.c:122
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:94
#, c-format
-msgid "The file '%s ' has been downloaded."
-msgstr "Berkas '%s ' telah diunduh."
+msgid " (%s/s)"
+msgstr " (%s/s)"
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "Transfer selesai"
-
-#: ../toolbars/midori-transferbar.c:193
+#: ../midori/midori-download.vala:188
msgid "The downloaded file is erroneous."
msgstr "Berkas yang diunduh galat."
-#: ../toolbars/midori-transferbar.c:194
+#: ../midori/midori-download.vala:189
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2106,47 +1646,345 @@ msgstr ""
"Checksum yang disediakan oleh tautan tidak cocok. Hal ini mungkin berarti "
"berkas tidak lengkap atau dimodifikasi setelahnya."
-#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141
+#: ../midori/midori-download.vala:300
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Berkas \"%s\" tak dapat disimpan di folder ini."
+
+#: ../midori/midori-download.vala:302
+msgid "You don't have permission to write in this location."
+msgstr "Anda tidak mempunyai hak akses untuk menulis di lokasi ini."
+
+#: ../midori/midori-download.vala:305
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Tidak cukup ruang kosong untuk mengunduh \"%s\"."
+
+#: ../midori/midori-download.vala:307
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Berkas memerlukan %s tapi hanya %s yang tersisa."
+
+#: ../midori/midori-speeddial.vala:180
+msgid "Speed Dial"
+msgstr "Panggil cepat"
+
+#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+msgid "Click to add a shortcut"
+msgstr "Klik untuk menambah jalan pintas"
+
+#: ../midori/midori-speeddial.vala:182
+msgid "Enter shortcut address"
+msgstr "Masukkan alamat jalan pintas"
+
+#: ../midori/midori-speeddial.vala:183
+msgid "Enter shortcut title"
+msgstr "Masukkan judul jalan pintas"
+
+#: ../midori/midori-speeddial.vala:184
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Anda yakin ingin menghapus jalan pintas ini?"
+
+#: ../midori/midori-preferences.c:299
+msgid "Startup"
+msgstr "Mulai"
+
+#: ../midori/midori-preferences.c:305
+msgid "Homepage:"
+msgstr "Beranda:"
+
+#: ../midori/midori-preferences.c:313
+msgid "Use _current page"
+msgstr "Gunakan _halaman saat ini"
+
+#: ../midori/midori-preferences.c:317
+msgid "Use current page as homepage"
+msgstr "Gunakan halaman saat ini sebagai beranda"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:326
+msgid "Fonts"
+msgstr "Fonta"
+
+#: ../midori/midori-preferences.c:329
+msgid "Proportional Font Family"
+msgstr "Keluarga Fonta Proporsional"
+
+#: ../midori/midori-preferences.c:333
+msgid "The default font family used to display text"
+msgstr "Keluarga fonta standar yang digunakan untuk menampilkan teks"
+
+#: ../midori/midori-preferences.c:336
+msgid "The default font size used to display text"
+msgstr "Ukuran fonta standar yang digunakan untuk menampilkan teks"
+
+#: ../midori/midori-preferences.c:338
+msgid "Fixed-width Font Family"
+msgstr "Keluarga Fonta Sesuai Lebar"
+
+#: ../midori/midori-preferences.c:342
+msgid "The font family used to display fixed-width text"
+msgstr "Keluarga fonta yang digunakan untuk menampilkan teks sesuai lebar"
+
+#: ../midori/midori-preferences.c:345
+msgid "The font size used to display fixed-width text"
+msgstr "Ukuran fonta yang digunakan untuk menampilkan teks sesuai lebar"
+
+#: ../midori/midori-preferences.c:347
+msgid "Minimum Font Size"
+msgstr "Ukuran Fonta Minimum"
+
+#: ../midori/midori-preferences.c:351
+msgid "The minimum font size used to display text"
+msgstr "Ukuran fonta minimum yang digunakan untuk menampilkan teks"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:362
+msgid "Behavior"
+msgstr "Perilaku"
+
+#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Muat gambar secara otomatis"
+
+#: ../midori/midori-preferences.c:369
+msgid "Enable Spell Checking"
+msgstr "Aktifkan Pemeriksa Ejaan"
+
+#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Aktifkan skrip"
+
+#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Aktifkan plugin Netscape"
+
+#: ../midori/midori-preferences.c:391
+msgid "Zoom Text and Images"
+msgstr "Pembesaran Teks dan Gambar"
+
+#: ../midori/midori-preferences.c:394
+msgid "Allow scripts to open popups"
+msgstr "Izinkan skrip untuk membuka popup"
+
+#: ../midori/midori-preferences.c:395
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Apakah skrip diizinkan untuk membuka popup jendela secara otomatis"
+
+#: ../midori/midori-preferences.c:401
+msgid "Kinetic scrolling"
+msgstr "Menggulung kinetis"
+
+#: ../midori/midori-preferences.c:402
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr "Apakah menggulung harus bergeser secara kinetis tergantung kecepatan"
+
+#: ../midori/midori-preferences.c:407
+msgid "Middle click opens Selection"
+msgstr "Klik Tengah Membuka Pilihan"
+
+#: ../midori/midori-preferences.c:408
+msgid "Load an address from the selection via middle click"
+msgstr "Muat sebuah alamat dari pilihan via klik tengah"
+
+#: ../midori/midori-preferences.c:414
+msgid "Enable WebGL support"
+msgstr "Aktifkan dukungan WebGL"
+
+#: ../midori/midori-preferences.c:419
+msgid "Flash window on background tabs"
+msgstr "Kedipkan jendela yang membuka tab di latar belakang"
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Simpan berkas yang diunduh ke:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Meramban"
+
+#: ../midori/midori-preferences.c:451
+msgid "Close Buttons on Tabs"
+msgstr "Tutup Tombol di Tab"
+
+#: ../midori/midori-preferences.c:455
+msgid "Always Show Tabbar"
+msgstr "Selalu Tampilkan Batang Tab"
+
+#: ../midori/midori-preferences.c:459
+msgid "Open Tabs next to Current"
+msgstr "Buka Tab di Samping Saat Ini"
+
+#: ../midori/midori-preferences.c:460
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Apakah ingin membuka tab baru di sebelah tab saat ini atau setelah tab "
+"terakhir"
+
+#: ../midori/midori-preferences.c:463
+msgid "Open tabs in the background"
+msgstr "Buka Tab di Latar Belakang"
+
+#: ../midori/midori-preferences.c:467
+msgid "Text Editor"
+msgstr "Penyunting Teks"
+
+#: ../midori/midori-preferences.c:472
+msgid "News Aggregator"
+msgstr "Agregator Berita"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:479
+msgid "Network"
+msgstr "Jaringan"
+
+#: ../midori/midori-preferences.c:481
+msgid "Proxy server"
+msgstr "Server proxy"
+
+#: ../midori/midori-preferences.c:486
+msgid "Hostname"
+msgstr "Nama Host"
+
+#: ../midori/midori-preferences.c:494
+msgid "Port"
+msgstr "Pangkalan"
+
+#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509
+msgid "The maximum size of cached pages on disk"
+msgstr "Ukuran maksimum dari halaman tembolok di cakram"
+
+#: ../midori/midori-preferences.c:511
+msgid "MB"
+msgstr "MB"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Add search engine"
+msgstr "Tambah mesin pencari"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Edit search engine"
+msgstr "Sunting mesin pencari"
+
+#: ../midori/midori-searchaction.c:985
+msgid "_Name:"
+msgstr "_Nama:"
+
+#: ../midori/midori-searchaction.c:1000
+msgid "_Description:"
+msgstr "_Keterangan:"
+
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Alamat"
+
+#: ../midori/midori-searchaction.c:1032
+msgid "_Token:"
+msgstr "_Token:"
+
+#: ../midori/midori-searchaction.c:1330
+msgid "Manage Search Engines"
+msgstr "Atur Mesin Pencari"
+
+#: ../midori/midori-searchaction.c:1432
+msgid "Use as _default"
+msgstr "Gunakan sebagai stan_dar"
+
+#: ../midori/sokoke.c:353
+msgid "Open with"
+msgstr "Buka dengan"
+
+#: ../midori/sokoke.c:361
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Pilih sebuah aplikasi atau perintah untuk membuka \"%s\":"
+
+#: ../midori/sokoke.c:476 ../midori/sokoke.c:490
+msgid "Could not run external program."
+msgstr "Tak dapat menjalankan program eksternal."
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:265
+msgid "_Inline Find:"
+msgstr "_Cari Dalam Baris:"
+
+#: ../toolbars/midori-findbar.c:287
+msgid "Previous"
+msgstr "Sebelumnya"
+
+#: ../toolbars/midori-findbar.c:293
+msgid "Next"
+msgstr "Berikutnya"
+
+#: ../toolbars/midori-findbar.c:297
+msgid "Match Case"
+msgstr "Cocokkan Huruf"
+
+#: ../toolbars/midori-findbar.c:306
+msgid "Highlight Matches"
+msgstr "Sorot Kecocokan"
+
+#: ../toolbars/midori-findbar.c:317
+msgid "Close Findbar"
+msgstr "Tutup batang cari"
+
+#: ../toolbars/midori-transferbar.c:109
+#, c-format
+msgid "The file '%s ' has been downloaded."
+msgstr "Berkas '%s ' telah diunduh."
+
+#: ../toolbars/midori-transferbar.c:114
+msgid "Transfer completed"
+msgstr "Transfer selesai"
+
+#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
msgid "Clear All"
msgstr "Bersihkan Semua"
-#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370
+#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
msgid "Some files are being downloaded"
msgstr "Beberapa berkas sedang diunduh"
-#: ../toolbars/midori-transferbar.c:374
+#: ../toolbars/midori-transferbar.c:278
msgid "_Quit Midori"
msgstr "_Keluar Midori"
-#: ../toolbars/midori-transferbar.c:376
+#: ../toolbars/midori-transferbar.c:280
msgid "The transfers will be cancelled if Midori quits."
msgstr "Transfer akan dibatalkan jika Midori keluar."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Penanda"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Gagal menambah item penanda: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Gagal memutakhirkan penanda : %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Sunting penanda terpilih"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Hapus penanda terpilih"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Tambah folder baru"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Pemisah "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Cari dalam Penanda"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Riwayat"
@@ -2169,6 +2007,11 @@ msgstr[0] "%d hari yang lalu"
msgid "A week ago"
msgstr "Seminggu yang lalu"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Gagal menghapus item riwayat: %s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Anda yakin ingin menghapus semua item riwayat?"
@@ -2185,15 +2028,20 @@ msgstr "Hapus item riwayat terpilih"
msgid "Clear the entire history"
msgstr "Bersihkan seluruh riwayat"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Cari dalam Riwayat"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Transfer"
-#: ../panels/midori-transfers.c:467
+#: ../panels/midori-transfers.c:435
msgid "Open Destination _Folder"
msgstr "Buka _Folder Tujuan"
-#: ../panels/midori-transfers.c:470
+#: ../panels/midori-transfers.c:438
msgid "Copy Link Loc_ation"
msgstr "Salin Tautan Lok_asi"
@@ -2235,54 +2083,62 @@ msgstr "Stok ikon '%s' tak dapat dimuat"
msgid "Animation frames are broken"
msgstr "Bingkai animasi rusak"
-#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Properti '%s' tidak sah untuk %s"
-#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514
-#: ../extensions/addons.c:308
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:309
msgid "Choose file"
msgstr "Pilih berkas"
-#: ../katze/katze-utils.c:500
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Pilih folder"
-#: ../katze/katze-utils.c:604
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Tak ada"
-#: ../katze/katze-utils.c:719
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 jam"
-#: ../katze/katze-utils.c:720
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 hari"
-#: ../katze/katze-utils.c:721
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 minggu"
-#: ../katze/katze-utils.c:722
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 bulan"
-#: ../katze/katze-utils.c:723
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 tahun"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Pengaturan untuk %s"
-#: ../extensions/adblock.c:467
+#: ../katze/midori-uri.vala:173
+msgid "MD5-Checksum:"
+msgstr "MD5-Checksum:"
+
+#: ../katze/midori-uri.vala:180
+msgid "SHA1-Checksum:"
+msgstr "SHA1-Checksum:"
+
+#: ../extensions/adblock.c:495
msgid "Configure Advertisement filters"
msgstr "Atur filter Iklan"
-#: ../extensions/adblock.c:498
+#: ../extensions/adblock.c:528
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2292,112 +2148,112 @@ msgstr ""
"dalam entri teks dan klik \"Tambah\" untuk menambahkannya ke senarai. Anda "
"dapat menemukan lebih banyak senarai di %s."
-#: ../extensions/adblock.c:846
+#: ../extensions/adblock.c:944
msgid "Edit rule"
msgstr "Sunting aturan"
-#: ../extensions/adblock.c:860
+#: ../extensions/adblock.c:958
msgid "_Rule:"
msgstr "_Aturan:"
-#: ../extensions/adblock.c:914
+#: ../extensions/adblock.c:1012
msgid "Bl_ock image"
msgstr "Bl_ok gambar"
-#: ../extensions/adblock.c:919
+#: ../extensions/adblock.c:1017
msgid "Bl_ock link"
msgstr "Bl_ok tautan"
-#: ../extensions/adblock.c:1620
+#: ../extensions/adblock.c:1915
msgid "Advertisement blocker"
msgstr "Pemblokir Iklan"
-#: ../extensions/adblock.c:1621
+#: ../extensions/adblock.c:1916
msgid "Block advertisements according to a filter list"
msgstr "Blok iklan berdasarkan sebuah senarai filter"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
+#: ../extensions/addons.c:222
msgid "This page appears to contain a user script. Do you wish to install it?"
msgstr ""
"Halaman ini sepertinya berisi sebuah skrip pengguna. Anda ingin "
"menginstalnya?"
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
msgid "_Install user script"
msgstr "_Instal skrip pengguna"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
msgid "This page appears to contain a user style. Do you wish to install it?"
msgstr ""
"Halaman ini sepertinya berisi sebuah gaya pengguna. Anda ingin menginstalnya?"
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
msgid "_Install user style"
msgstr "_Instal gaya pengguna"
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
msgid "Don't install"
msgstr "Jangan instal"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:320 ../extensions/addons.c:675
msgid "Userscripts"
msgstr "Skrip pengguna"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:325 ../extensions/addons.c:677
msgid "Userstyles"
msgstr "Gaya pengguna"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:371 ../extensions/addons.c:450
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Galat"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:412
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Anda ingin menghapus '%s'?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:418
msgid "Delete user script"
msgstr "Hapys skrip pengguna"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:419
msgid "Delete user style"
msgstr "Hapus gaya pengguna"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:422
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Berkas '%s ' akan secara permanen dihapus."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:564 ../extensions/addons.c:641
msgid "Open in Text Editor"
msgstr "Buka di Penyunting Teks"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:566 ../extensions/addons.c:650
msgid "Open Target Folder"
msgstr "Buka Folder Tujuan"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:632
msgid "Add new addon"
msgstr "Tambah pengaya baru"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:658
msgid "Remove selected addon"
msgstr "Hapus pengaya terpilih"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1687 ../extensions/addons.c:1905
msgid "User addons"
msgstr "Pengaya pengguna"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1817
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Tak dapat memonitor folder '%s': %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1906
msgid "Support for userscripts and userstyles"
msgstr "Dukungan untuk skrip pengguna dan gaya pengguna"
@@ -2484,29 +2340,21 @@ msgstr ""
"Ranah : %s\n"
"Kuki : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Nama"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "_Perluas Semua"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "P_erkecil Semua"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filter:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Masukkan sebuah tali filter untuk menampilkan hanya kuki yang nama atau "
-"daerah ranahnya cocok dengan filter yang dimasukkan"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Cari Kuki berdasarkan Nama atau Domain"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2720,11 +2568,11 @@ msgstr "Tampilkan tab di latar belakang (Senarai Riwayat)"
msgid "Display the current selected tab in background"
msgstr "Tampilkan tab terpilih saat ini di latar belakang"
-#: ../extensions/history-list.vala:569
+#: ../extensions/history-list.vala:566
msgid "History List"
msgstr "Senarai Riwayat"
-#: ../extensions/history-list.vala:570
+#: ../extensions/history-list.vala:567
msgid "Move to the last used tab when switching or closing tabs"
msgstr "Pindah ke tab terakhir digunakan ketika berpindah atau menutup tab"
@@ -2746,7 +2594,7 @@ msgstr "Sesuaikan jalan pintas Papan Ketik"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "Sesuaikan J_alan Pintas..."
+msgstr "Sesuaikan J_alan Pintas…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2764,35 +2612,35 @@ msgstr "Jam Batang Status"
msgid "Display date and time in the statusbar"
msgstr "Tampilkan tanggal dan waktu di batang status"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Gambar"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Skrip"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Plugin Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Fitur Batang Status"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "Matikan atau hidupkan dengan mudah fitur-fitur di halaman web"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Panel Tab"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "Panel T_ab"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Tampilkan tab di sebuah panel vertikal"
@@ -2804,11 +2652,11 @@ msgstr "Hanya Ikon di Tab sebagai standar"
msgid "New tabs have no label by default"
msgstr "Tab baru tidak mempunyai label sebagai standar"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Sesuaikan Batang Alat"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2816,34 +2664,274 @@ msgstr ""
"Pilih item yang akan ditampilkan di batang alat. Item dapat diubah urutannya "
"dengan seret dan taruh."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Item Tersedia"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Item Ditampilkan"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Sesuaikan _Batang Alat..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "Sesuaikan _Batang Alat…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Sesuaikan..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Penyunting Batang Alat"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Sunting tata letak batang alat dengan mudah"
-#: ../extensions/web-cache.c:463
+#: ../extensions/web-cache.c:462
msgid "Cache HTTP communication on disk"
msgstr "Tembolok komunikasi HTTP di cakram"
+#~ msgid "_Bookmark"
+#~ msgstr "B_ookmark"
+
+#~ msgid "_Console"
+#~ msgstr "_Konsol"
+
+#~ msgid "Remember last window size"
+#~ msgstr "Ingat ukuran jendela terakhir"
+
+#~ msgid "Whether to save the last window size"
+#~ msgstr "Apakah ingin menyimpan ukuran jendela yang terakhir tersimpan"
+
+#~ msgid "Last window width"
+#~ msgstr "Lebar jendela terakhir"
+
+#~ msgid "The last saved window width"
+#~ msgstr "Lebar jendela terakhir tersimpan"
+
+#~ msgid "Last window height"
+#~ msgstr "Tinggi jendela terakhir"
+
+#~ msgid "The last saved window height"
+#~ msgstr "Tinggi jendela terakhir tersimpan"
+
+#~ msgid "Last panel position"
+#~ msgstr "Posisi panel terakhir"
+
+#~ msgid "The last saved panel position"
+#~ msgstr "Posisi panel terakhir tersimpan"
+
+#~ msgid "Last panel page"
+#~ msgstr "Halaman panel terakhir"
+
+#~ msgid "The last saved panel page"
+#~ msgstr "Halaman panel terakhir tersimpan"
+
+#~ msgid "Last Web search"
+#~ msgstr "Penelusuran Web terakhir"
+
+#~ msgid "The last saved Web search"
+#~ msgstr "Penelusuran Web terakhir tersimpan"
+
+#~ msgid "Show Menubar"
+#~ msgstr "Tampilkan Batang Menu"
+
+#~ msgid "Whether to show the menubar"
+#~ msgstr "Apakah ingin menampilkan batang menu"
+
+#~ msgid "Show Navigationbar"
+#~ msgstr "Tampilkan Batang Navigasi"
+
+#~ msgid "Whether to show the navigationbar"
+#~ msgstr "Apakah ingin menampilkan batang navigasi"
+
+#~ msgid "Show Bookmarkbar"
+#~ msgstr "Tampilkan Batang Penanda"
+
+#~ msgid "Whether to show the bookmarkbar"
+#~ msgstr "Apakah ingin menampilkan batang penanda"
+
+#~ msgid "Show Panel"
+#~ msgstr "Tampilkan Panel"
+
+#~ msgid "Whether to show the panel"
+#~ msgstr "Apakah ingin menampilkan panel"
+
+#~ msgid "Show Statusbar"
+#~ msgstr "Tampilkan Batang Status"
+
+#~ msgid "Whether to show the statusbar"
+#~ msgstr "Apakah ingin menampilkan batang status"
+
+#~ msgid "Toolbar Items"
+#~ msgstr "Item Batang Alat"
+
+#~ msgid "The items to show on the toolbar"
+#~ msgstr "Item yang akan ditampilkan di batang alat"
+
+#~ msgid "Compact Sidepanel"
+#~ msgstr "Panel Sisi Kompak"
+
+#~ msgid "Whether to make the sidepanel compact"
+#~ msgstr "Apakah ingin membuat panel sisi kompak"
+
+#~ msgid "Align sidepanel on the right"
+#~ msgstr "Ratakan panel sisi di kanan"
+
+#~ msgid "Whether to align the sidepanel on the right"
+#~ msgstr "Apakah ingin meratakan panel sisi di sebelah kanan"
+
+#~ msgid "Open panels in separate windows"
+#~ msgstr "Buka panel di jendela yang terpisah"
+
+#~ msgid "Whether to always open panels in separate windows"
+#~ msgstr "Apakah ingin selalu membuka panel jendela yang terpisah"
+
+#~ msgid "What to do when Midori starts"
+#~ msgstr "Apa yang akan dilakukan saat Midori dijalankan"
+
+#~ msgid "The homepage"
+#~ msgstr "Laman"
+
+#~ msgid "Show crash dialog"
+#~ msgstr "Tampilkan dialog macet"
+
+#~ msgid "The folder downloaded files are saved to"
+#~ msgstr "Folder berkas terunduh disimpan di"
+
+#~ msgid "An external text editor"
+#~ msgstr "Penyunting teks eksternal"
+
+#~ msgid "An external news aggregator"
+#~ msgstr "Sebuah agregator berita eksternal"
+
+#~ msgid "Location entry Search"
+#~ msgstr "Pencari entri lokasi"
+
+#~ msgid "The search to perform inside the location entry"
+#~ msgstr "Pencarian yang dilakukan di dalam entri lokasi"
+
+#~ msgid "The preferred character encoding"
+#~ msgstr "Penyandian karakter kesukaan"
+
+#~ msgid "Always show the tabbar"
+#~ msgstr "Selalu tampilkan batang tab"
+
+#~ msgid "Whether tabs have close buttons"
+#~ msgstr "Apakah tab memiliki tombol tutup"
+
+#~ msgid "Where to open new pages"
+#~ msgstr "Dimana membuka halaman baru"
+
+#~ msgid "Whether to open new tabs in the background"
+#~ msgstr "Apakah ingin membuka tab baru di latar belakang"
+
+#~ msgid "Open popups in tabs"
+#~ msgstr "Buka popup di tab"
+
+#~ msgid "Whether to open popup windows in tabs"
+#~ msgstr "Apakah ingin membuka jendela popup di tab"
+
+#~ msgid "Load and display images automatically"
+#~ msgstr "Muat dan tampilkan gambar secara otomatis"
+
+#~ msgid "Enable embedded scripting languages"
+#~ msgstr "Aktifkan bahasa skrip terbenam"
+
+#~ msgid "Enable embedded Netscape plugin objects"
+#~ msgstr "Aktifkan objek plugin Netscape terbenam"
+
+#~ msgid "Enable spell checking while typing"
+#~ msgstr "Aktifkan pemeriksa ejaan ketika mengetik"
+
+#~ msgid "Enable HTML5 database support"
+#~ msgstr "Aktifkan dukungan basis data HTML5"
+
+#~ msgid "Whether to enable HTML5 database support"
+#~ msgstr "Apakah akan mengaktifkan dukungan basis data HTML5"
+
+#~ msgid "Whether to enable HTML5 local storage support"
+#~ msgstr "Apakah akan mengaktifkan dukungan penyimpanan lokal HTML5"
+
+#~ msgid "Whether to enable offline web application cache"
+#~ msgstr "Apakah akan mengaktifkan tembolok aplikasi web luring"
+
+#~ msgid "Flash the browser window if a new tab was opened in the background"
+#~ msgstr "Kedipkan jendela peramban jika tab baru dibuka di latar belakang"
+
+#~ msgid "Allow websites to use OpenGL rendering"
+#~ msgstr "Izinkan situs web untuk menggunakan sesuaian OpenGL"
+
+#~ msgid "Whether to zoom text and images"
+#~ msgstr "Apakah ingin memperbesar teks dan gambar"
+
+#~ msgid "Find inline while typing"
+#~ msgstr "Cari dalam baris ketika mengetik"
+
+#~ msgid "Whether to automatically find inline while typing"
+#~ msgstr "Apakah akan secara otomatis mencari dalam baris ketika mengetik"
+
+#~ msgid "The type of proxy server to use"
+#~ msgstr "Tipe server proxy yang akan digunakan"
+
+#~ msgid "HTTP Proxy Server"
+#~ msgstr "Server Proxy HTTP"
+
+#~ msgid "The proxy server used for HTTP connections"
+#~ msgstr "Proxy server yang digunakan untuk koneksi HTTP"
+
+#~ msgid "The proxy server port used for HTTP connections"
+#~ msgstr "Proxy server yang digunakan untuk koneksi HTTP"
+
+#~ msgid "Identification string"
+#~ msgstr "Tali identifikasi"
+
+#~ msgid "The application identification string"
+#~ msgstr "Tali identifikasi aplikasi"
+
+#~ msgid "Clear private data"
+#~ msgstr "Hapus data pribadi"
+
+#~ msgid "The private data selected for deletion"
+#~ msgstr "Data pribadi yang dipilih untuk dihapus"
+
+#~ msgid "Clear data"
+#~ msgstr "Hapus data"
+
+#~ msgid "The data selected for deletion"
+#~ msgstr "Data terpilih untuk dihapus"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Tutup Tab _Lainnya"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Ikon:"
+
+#~ msgid "Filter:"
+#~ msgstr "Filter:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Masukkan sebuah tali filter untuk menampilkan hanya kuki yang nama atau "
+#~ "daerah ranahnya cocok dengan filter yang dimasukkan"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Folder level atas"
+
+#~ msgid "_Title:"
+#~ msgstr "_Judul:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Folder:"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Sesuaikan…"
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Bookmark tak dapat disimpan. %s"
+
+#~ msgid "The specified configuration folder is invalid."
+#~ msgstr "Folder konfigurasi yang ditentukan tidak valid."
+
#~ msgid "Cookies"
#~ msgstr "Kuki"
@@ -2937,14 +3025,14 @@ msgstr "Tembolok komunikasi HTTP di cakram"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Tambah sebuah folder penanda baru"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Tambah, sunting dan hapus mesin pencari..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Tambah, sunting dan hapus mesin pencari…"
-#~ msgid "Clear private data..."
-#~ msgstr "Hapus data pribadi..."
+#~ msgid "Clear private data…"
+#~ msgstr "Hapus data pribadi…"
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr "Inspeksi detail halaman dan akses alat pengembang..."
+#~ msgid "Inspect page details and access developer tools…"
+#~ msgstr "Inspeksi detail halaman dan akses alat pengembang…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Pindah ke tab sebelumnya"
@@ -3000,12 +3088,6 @@ msgstr "Tembolok komunikasi HTTP di cakram"
#~ msgid "Show statusbar"
#~ msgstr "Tampilkan batang status"
-#~ msgid "MD5-Checksum:"
-#~ msgstr "MD5-Checksum:"
-
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "SHA1-Checksum:"
-
#~ msgid "Set number of columns and rows"
#~ msgstr "Atur jumlah kolom dan baris"
@@ -3048,8 +3130,8 @@ msgstr "Tembolok komunikasi HTTP di cakram"
#~ msgid "Enforce a video dot density of 96 DPI"
#~ msgstr "Paksa kerapatan titik video 96 DPI"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Atur filter _Iklan..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Atur filter _Iklan…"
#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
#~ msgstr ""
@@ -3324,9 +3406,6 @@ msgstr "Tembolok komunikasi HTTP di cakram"
#~ "Senarai dipisahkan koma dari bahasa yang akan digunakan untuk pemeriksa "
#~ "ejaan, misalnya \"en_GB,de_DE\""
-#~ msgid "User_styles"
-#~ msgstr "Ga_ya pengguna"
-
#~ msgid "Console"
#~ msgstr "Konsol"
@@ -3390,9 +3469,6 @@ msgstr "Tembolok komunikasi HTTP di cakram"
#~ msgid "%s.%s cannot be accessed"
#~ msgstr "%s.%s tak dapat diakses"
-#~ msgid "_Enable"
-#~ msgstr "_Aktifkan"
-
#~ msgid "_Disable"
#~ msgstr "_Non Aktifkan"
diff --git a/po/it.po b/po/it.po
index 4fb9fbec..4a10ef39 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: midori 0.1.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-22 02:48+0000\n"
+"POT-Creation-Date: 2012-09-16 14:12+0000\n"
"PO-Revision-Date: 2011-12-24 09:51+0100\n"
"Last-Translator: Cristian Marchi \n"
"Language-Team: Italian \n"
@@ -27,12 +27,28 @@ msgstr "Naviga nel web"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1922 ../midori/main.c:1946
+#: ../midori/main.c:1960 ../midori/midori-websettings.c:200
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Browser web Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Nuova finestra di navigazione privata"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326
+msgid "New Tab"
+msgstr "Nuova scheda"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323
+msgid "New Window"
+msgstr "Nuova finestra"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Browser web"
@@ -44,82 +60,87 @@ msgstr "Navigazione privata di Midori"
msgid "Open a new private browsing window"
msgstr "Apre una nuova finestra di navigazione privata"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4355
msgid "Private Browsing"
msgstr "Navigazione privata"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Le impostazioni non possono essere caricate: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Il valore «%s» non è valido per %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Valore di configurazione «%s» non valido"
-#: ../midori/main.c:380
+#: ../midori/main.c:365
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "I motori di ricerca non possono essere caricati. %s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:419
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Errore nella cancellazione della cronologia: %s\n"
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Errore nella connessione al database: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:513
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Errore nella cancellazione dei vecchi elementi della cronologia: %s\n"
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Errore nell'eliminazione dell'elemento della cronologia: %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "I segnalibri non possono essere salvati. %s"
-
-#: ../midori/main.c:633
+#: ../midori/main.c:535
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Le impostazioni non possono essere salvate. %s"
-#: ../midori/main.c:668
+#: ../midori/main.c:561
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "I motori di ricerca non possono essere salvati. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:598
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Il cestino non può essere salvato. %s"
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
+#: ../midori/main.c:671 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Estensioni"
-#: ../midori/main.c:760
+#: ../midori/main.c:685
msgid "Privacy"
msgstr "Privacy"
-#: ../midori/main.c:772
+#: ../midori/main.c:687
+msgid "Delete old Cookies after:"
+msgstr "Elimina i cookie obsoleti dopo:"
+
+#: ../midori/main.c:689 ../midori/main.c:692
+msgid "The maximum number of days to save cookies for"
+msgstr "Numero massimo di giorni per cui possono essere validi i cookie"
+
+#: ../midori/main.c:696
+msgid "Only accept Cookies from sites you visit"
+msgstr "Accettare i cookie solo dai siti visitati"
+
+#: ../midori/main.c:697
+msgid "Block cookies sent by third-party websites"
+msgstr "Blocca i cookie inviati da siti di terze parti"
+
+#: ../midori/main.c:702
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -127,19 +148,45 @@ msgstr ""
"I cookie immagazzinano i dati di accesso, i giochi salvati o i profili "
"dell'utente per scopi pubblicitari."
-#: ../midori/main.c:828
+#: ../midori/main.c:709
+msgid "Enable offline web application cache"
+msgstr "Abilita la cache delle applicazioni web offline"
+
+#: ../midori/main.c:712
+msgid "Enable HTML5 local storage support"
+msgstr "Abilita il supporto allo storage locale HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/main.c:716
+msgid "Strip referrer details sent to websites"
+msgstr "Scarta i dettagli del referer inviati ai siti web"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/main.c:718
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Se il \"referer\" deve essere accorciato al nome host"
+
+#: ../midori/main.c:721
+msgid "Delete pages from history after:"
+msgstr "Elimina le pagine dalla cronologia dopo:"
+
+#: ../midori/main.c:723 ../midori/main.c:726
+msgid "The maximum number of days to save the history for"
+msgstr "Numero massimo di giorni per cui deve essere salvata la cronologia"
+
+#: ../midori/main.c:767
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "La sessione non può essere salvata. %s"
-#: ../midori/main.c:1046
+#: ../midori/main.c:989
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Non è disponibile nessun certificato di root. I certificati SSL non possono "
"essere verificati."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1084
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -148,229 +195,240 @@ msgstr ""
"usato. Se dovesse capitare spesso, provare una delle seguenti opzioni per "
"risolvere il problema."
-#: ../midori/main.c:1134
+#: ../midori/main.c:1103
msgid "Modify _preferences"
msgstr "Modifica _preferenze"
-#: ../midori/main.c:1138
+#: ../midori/main.c:1107
msgid "Disable all _extensions"
msgstr "Disabilita tutte le _estensioni"
-#: ../midori/main.c:1151
+#: ../midori/main.c:1116
+msgid "Show a dialog after Midori crashed"
+msgstr ""
+"Abilitare questa opzione per mostrare una finestra nel caso Midori si sia "
+"chiuso inaspettatamente"
+
+#: ../midori/main.c:1121
msgid "Discard old tabs"
msgstr "Scarta le schede vecchie"
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1122 ../midori/midori-websettings.c:108
msgid "Show last tabs without loading"
msgstr "Mostra le ultime schede senza caricarle"
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1123 ../midori/midori-websettings.c:107
msgid "Show last open tabs"
msgstr "Mostra le ultime schede aperte"
-#: ../midori/main.c:1400 ../midori/main.c:2464
+#: ../midori/main.c:1370 ../midori/main.c:2382
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "La sessione non può essere caricata: %s\n"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1508
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Istantanea salvata in: %s\n"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1837
msgid "Run ADDRESS as a web application"
msgstr "Esegue INDIRIZZO come applicazione web"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1837
msgid "ADDRESS"
msgstr "INDIRIZZO"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1840
msgid "Use FOLDER as configuration folder"
msgstr "Usa CARTELLA come cartella di configurazione"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1840
msgid "FOLDER"
msgstr "CARTELLA"
-#: ../midori/main.c:1957
+#: ../midori/main.c:1843
msgid "Private browsing, no changes are saved"
msgstr "Navigazione privata: non verrà salvata alcuna modifica"
-#: ../midori/main.c:1959
+#: ../midori/main.c:1846
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Modalità portatile: tutti i file della sessione sono salvati in una unica posizione"
+
+#: ../midori/main.c:1849
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr ""
+
+#: ../midori/main.c:1851
msgid "Show a diagnostic dialog"
msgstr "Mostra finestra di diagnostica"
-#: ../midori/main.c:1961
+#: ../midori/main.c:1853
msgid "Run the specified filename as javascript"
msgstr "Esegue il file specificato come javascript"
-#: ../midori/main.c:1963
+#: ../midori/main.c:1855
msgid "Take a snapshot of the specified URI"
msgstr "Scatta istantanea dell'URL specificato"
-#: ../midori/main.c:1965
+#: ../midori/main.c:1857
msgid "Execute the specified command"
msgstr "Esegue il comando specificato"
-#: ../midori/main.c:1967
+#: ../midori/main.c:1859
msgid "List available commands to execute with -e/ --execute"
msgstr "Elenca i comandi disponibili per l'esecuzione con -e/ --execute"
-#: ../midori/main.c:1969
+#: ../midori/main.c:1861
msgid "Display program version"
msgstr "Visualizza la versione dell'applicazione"
-#: ../midori/main.c:1971
+#: ../midori/main.c:1863
msgid "Addresses"
msgstr "Indirizzi"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1865
msgid "Block URIs according to regular expression PATTERN"
msgstr "Blocca le URI secondo l'espressione regolare SCHEMA"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1865
msgid "PATTERN"
msgstr "SCHEMA"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:1869
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Riavvia Midori dopo SECONDI secondi di inattività"
-#: ../midori/main.c:1977
+#: ../midori/main.c:1869
msgid "SECONDS"
msgstr "SECONDI"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1872
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Redirige gli avvisi di console al NOMEFILE specificato"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1872
msgid "FILENAME"
msgstr "NOMEFILE"
-#: ../midori/main.c:2045
-msgid "[Addresses]"
-msgstr "[Indirizzi]"
-
# fp suggerisce "a:", mantengo "su:" per uniformita´ con le trad xfce
-#: ../midori/main.c:2087
+#: ../midori/main.c:1961
msgid "Please report comments, suggestions and bugs to:"
msgstr "Segnalare commenti, suggerimenti e bug su:"
-#: ../midori/main.c:2089
+#: ../midori/main.c:1963
msgid "Check for new versions at:"
msgstr "Controlla nuove versioni su:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
+#: ../midori/main.c:2102
msgid "Saved logins and _passwords"
msgstr "_Password e login salvati"
-#: ../midori/main.c:2175
+#: ../midori/main.c:2104
msgid "Cookies and Website data"
msgstr "Dati dei siti web e cookie"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
+#: ../midori/main.c:2108 ../midori/midori-preferences.c:505
+#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470
msgid "Web Cache"
msgstr "Cache web"
-#: ../midori/main.c:2182
+#: ../midori/main.c:2111
msgid "Website icons"
msgstr "Icone dei siti"
-#: ../midori/main.c:2288
+#: ../midori/main.c:2215
msgid "An unknown error occured"
msgstr "Si è verificato un errore sconosciuto"
-#: ../midori/main.c:2395
+#: ../midori/main.c:2330
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Un'istanza di Midori è già in esecuzione, ma non risponde.\n"
-#: ../midori/main.c:2431
+#: ../midori/main.c:2364
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "I segnalibri non possono essere caricati: %s\n"
-#: ../midori/main.c:2479
+#: ../midori/main.c:2397
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Il cestino non può essere caricato: %s\n"
-#: ../midori/main.c:2492
+#: ../midori/main.c:2410
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "La cronologia non può essere caricata: %s\n"
-#: ../midori/main.c:2508
+#: ../midori/main.c:2425
msgid "The following errors occured:"
msgstr "Si sono presentati i seguenti errori:"
-#: ../midori/main.c:2524
+#: ../midori/main.c:2441
msgid "_Ignore"
msgstr "_Ignora"
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "S_egnalibro"
+#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:534
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Azione \"%s\" inaspettata."
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060
+#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6251
msgid "_Bookmarks"
msgstr "Segnali_bri"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1373
msgid "Add Boo_kmark"
msgstr "Aggiungi se_gnalibro"
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_Console"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1374
msgid "_Extensions"
msgstr "_Estensioni"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589
+#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700
msgid "_History"
msgstr "C_ronologia"
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "_Pagina iniziale"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1376
msgid "_Userscripts"
msgstr "Script dell'_utente"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1377
+msgid "User_styles"
+msgstr "_Stili dell'utente"
+
+#: ../midori/midori-app.c:1378
msgid "New _Tab"
msgstr "Nuova _scheda"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1379
msgid "_Transfers"
msgstr "_Trasferimenti"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1380
msgid "Netscape p_lugins"
msgstr "Plugin N_etscape"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1381
msgid "_Closed Tabs"
msgstr "Schede _chiuse"
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216
+#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387
msgid "New _Window"
msgstr "N_uova finestra"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1383
msgid "New _Folder"
msgstr "Nuova _cartella"
+#: ../midori/midori-app.c:1437
+msgid "[Addresses]"
+msgstr "[Indirizzi]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "File non trovato."
@@ -388,141 +446,114 @@ msgstr "Formato del segnalibro non riconosciuto."
msgid "Writing failed."
msgstr "Errore di scrittura."
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526
+msgid "Go forward to the next page"
+msgstr "Va alla pagina successiva"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:354 ../midori/midori-browser.c:5534
+#: ../midori/midori-browser.c:5537
+msgid "Go to the next sub-page"
+msgstr "Va alla sottopagina successiva"
+
+#: ../midori/midori-browser.c:441 ../midori/midori-browser.c:5475
+#: ../midori/midori-browser.c:5484
msgid "Reload the current page"
msgstr "Ricarica la pagina corrente"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481
msgid "Stop loading the current page"
msgstr "Interrompe il caricamento della pagina corrente"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:519
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Errore nell'aggiornamento del titolo: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Azione \"%s\" inaspettata."
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:614
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Navigazione privata)"
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "Livello principale"
+#: ../midori/midori-browser.c:724 ../midori/midori-browser.c:766
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Segnalibri"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:826
msgid "New folder"
msgstr "Nuova cartella"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:826
msgid "Edit folder"
msgstr "Modifica cartella"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:828
msgid "New bookmark"
msgstr "Nuovo segnalibro"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:828
msgid "Edit bookmark"
msgstr "Modifica segnalibro"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Titolo:"
+#: ../midori/midori-browser.c:862
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Inserire un nome per ils egnalibri e selezionare la posizione in cui conservarlo"
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Indirizzo:"
-
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326
-msgid "_Folder:"
-msgstr "_Cartella:"
-
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:923
msgid "Add to _Speed Dial"
msgstr "Aggiungi a _selezione veloce"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:929
msgid "Show in the tool_bar"
msgstr "Mostra nella _barra degli strumenti"
-#: ../midori/midori-browser.c:905
+#: ../midori/midori-browser.c:937
msgid "Run as _web application"
msgstr "Esegui come applicazione _web"
-#: ../midori/midori-browser.c:976
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "Il file «%s» non può essere salvato in questa cartella."
-
-#: ../midori/midori-browser.c:978
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "Non si ha il permesso di scrivere in questa posizione."
-
-#: ../midori/midori-browser.c:985
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "Spazio insufficiente per scaricare \"%s\"."
-
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "Il file ha bisogno di %s ma sono rimasti solo %s."
-
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504
msgid "Save file as"
msgstr "Salva come"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Nuova finestra"
+#: ../midori/midori-browser.c:1065
+msgid "Save associated _resources"
+msgstr ""
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1323
msgid "A new window has been opened"
msgstr "È stata aperta una nuova finestra"
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Nuova scheda"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1326
msgid "A new tab has been opened"
msgstr "È stata aperta una nuova scheda"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1343
msgid "Error opening the image!"
msgstr "Errore di apertura dell'immagine"
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1344
msgid "Can not open selected image in a default viewer."
msgstr ""
"Impossibile aprire l'immagine selezionata in un visualizzatore predefinito."
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1350
msgid "Error downloading the image!"
msgstr "Errore di scaricamento dell'immagine"
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1351
msgid "Can not download selected image."
msgstr "Impossibile scaricare l'immagine selezionata."
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1408
msgid "Save file"
msgstr "Salva file"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2335
msgid "Open file"
msgstr "Apre file"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2467
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -536,141 +567,157 @@ msgstr ""
"un aggregatore di notizie; al prossimo clic sull'icona del feed delle "
"notizie, questo verrà aggiunto automaticamente"
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2473 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Nuovo feed"
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5550
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Aggiunge un nuovo segnalibro"
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Vuoto"
-#: ../midori/midori-browser.c:3467
+#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507
msgid "Toggle text cursor navigation"
msgstr "Abilita o disabilita la navigazione a cursore"
-#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753
+#: ../midori/midori-browser.c:3509
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Premendo F7 verrà abilitata la navigazione Caret. Quando è attiva, apparirà "
+"un cursore di testo in tutti i siti web."
+
+#: ../midori/midori-browser.c:3512
+msgid "_Enable Caret Browsing"
+msgstr "Abilita navigazione ca_ret"
+
+#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Errore nell'inserimento dell'elemento della cronologia: %s\n"
-#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Apri _tutti in nuove schede"
-#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Apri in una nuova sc_heda"
-#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657
-#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2952
+#: ../midori/midori-view.c:4928 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Apri in una nuova _finestra"
-#: ../midori/midori-browser.c:4213
+#: ../midori/midori-browser.c:4329
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4214
+#: ../midori/midori-browser.c:4330
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4331
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4332
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4333
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4334
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4239
-msgid "Import bookmarks..."
-msgstr "Importa segnalibri..."
+#: ../midori/midori-browser.c:4335
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:4356
+msgid "Import bookmarks…"
+msgstr "Importa segnalibri…"
+
+#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555
msgid "_Import bookmarks"
msgstr "_Importa segnalibri"
-#: ../midori/midori-browser.c:4253
+#: ../midori/midori-browser.c:4370
msgid "_Application:"
msgstr "_Applicazione:"
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4435
msgid "Import from XBEL or HTML file"
msgstr "Importa da un file XBEL o HTML"
-#: ../midori/midori-browser.c:4353
+#: ../midori/midori-browser.c:4463
msgid "Import from a file"
msgstr "Importa da un file"
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4475
msgid "Failed to import bookmarks"
msgstr "Impossibile importare i segnalibri"
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4509
msgid "XBEL Bookmarks"
msgstr "Segnalibri XBEL"
-#: ../midori/midori-browser.c:4405
+#: ../midori/midori-browser.c:4514
msgid "Netscape Bookmarks"
msgstr "Segnalibri Netscape"
-#: ../midori/midori-browser.c:4419
+#: ../midori/midori-browser.c:4528
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr ""
"Midori può esportare solamente in formato XBEL (*.xbel) e Netscape (*.html)"
-#: ../midori/midori-browser.c:4434
+#: ../midori/midori-browser.c:4543
msgid "Failed to export bookmarks"
msgstr "Impossibile esportare i segnalibri"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4556
+#: ../midori/midori-browser.c:4665
msgid "Clear Private Data"
msgstr "Pulizia dati personali"
-#: ../midori/midori-browser.c:4560
+#: ../midori/midori-browser.c:4669
msgid "_Clear private data"
msgstr "_Pulizia dati personali"
-#: ../midori/midori-browser.c:4573
+#: ../midori/midori-browser.c:4684
msgid "Clear the following data:"
msgstr "Rimuovi i seguenti dati:"
-#: ../midori/midori-browser.c:4583
+#: ../midori/midori-browser.c:4694
msgid "Last open _tabs"
msgstr "Ultime sc_hede aperte"
# cri.penta version
-#: ../midori/midori-browser.c:4609
+#: ../midori/midori-browser.c:4720
msgid "Clear private data when _quitting Midori"
msgstr "Cancella i dati personali _quando Midori viene chiuso"
-#: ../midori/midori-browser.c:4804
+#: ../midori/midori-browser.c:4935
msgid "A lightweight web browser."
msgstr "Un browser web leggero"
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:4936
msgid "See about:version for version info."
msgstr "Consultare about:info per le informazioni di versione."
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:4938
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -682,7 +729,7 @@ msgstr ""
"pubblicata dalla Free Software Foundation; sia nella versione 2.1 della "
"licenza che (a scelta) in una versione successiva."
-#: ../midori/midori-browser.c:4828
+#: ../midori/midori-browser.c:4968
msgid "translator-credits"
msgstr ""
"Sergio Durzu \n"
@@ -691,948 +738,602 @@ msgstr ""
"Gianluca Foddis \n"
"Cristian Marchi , 2010"
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5385
msgid "_File"
msgstr "_File"
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5388
msgid "Open a new window"
msgstr "Apre una nuova finestra"
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5391
msgid "Open a new tab"
msgstr "Apre una nuova scheda"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5393
msgid "New P_rivate Browsing Window"
msgstr "Nuova _finestra di navigazione privata"
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5397
msgid "Open a file"
msgstr "Apre un file"
-#: ../midori/midori-browser.c:5228
-msgid "_Save Page As..."
-msgstr "Sa_lva pagina come..."
+#: ../midori/midori-browser.c:5399
+msgid "_Save Page As…"
+msgstr "Sa_lva pagina come…"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5400
msgid "Save to a file"
msgstr "Salva in un file"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5402
msgid "Add to Speed _dial"
msgstr "Aggiungi a selezione _veloce"
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5406
msgid "Add Shortcut to the _desktop"
msgstr "Aggiungi collegamento sulla _scrivania"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5408
msgid "Create _Launcher"
msgstr "Crea avvia_tore"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5412
msgid "Subscribe to News _feed"
msgstr "Abbonati al _feed di notizie"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5418
msgid "_Close Tab"
msgstr "_Chiudi scheda"
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5419
msgid "Close the current tab"
msgstr "Chiude la scheda corrente"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5421
msgid "C_lose Window"
msgstr "C_hiudi finestra"
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5425
+msgid "_Share"
+msgstr ""
+
+#: ../midori/midori-browser.c:5430
msgid "Print the current page"
msgstr "Stampa la pagina corrente"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5433
msgid "Close a_ll Windows"
msgstr "Chiudi _tutte le finestre"
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5436
msgid "_Edit"
msgstr "Mo_difica"
-#: ../midori/midori-browser.c:5282
-msgid "_Find..."
-msgstr "_Cerca..."
+#: ../midori/midori-browser.c:5459
+msgid "_Find…"
+msgstr "_Cerca…"
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5460
msgid "Find a word or phrase in the page"
msgstr "Cerca una parola o una frase nella pagina"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5462
msgid "Find _Next"
msgstr "Trova s_uccessivo"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5465
msgid "Find _Previous"
msgstr "Trova _precedente"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5469
msgid "Configure the application preferences"
msgstr "Imposta le preferenze dell'applicazione"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5471
msgid "_View"
msgstr "_Visualizza"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5472
msgid "_Toolbars"
msgstr "Barre degli _strumenti"
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5477
msgid "Reload page without caching"
msgstr "Ricarica la pagina senza effettuare il caching"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5487
msgid "Increase the zoom level"
msgstr "Aumenta il livello di ingrandimento"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5490
msgid "Decrease the zoom level"
msgstr "Diminuisce il livello di ingrandimento"
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5494
msgid "_Encoding"
msgstr "_Codifica"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5496
msgid "View So_urce"
msgstr "Visualizza s_orgente"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5499
msgid "Ca_ret Browsing"
msgstr "Navigazione ca_ret"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5503
msgid "Toggle fullscreen view"
msgstr "Schermo intero"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5505
msgid "Scroll _Left"
msgstr "Scorri a _sinistra"
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5508
msgid "Scroll _Down"
msgstr "Scorri in _basso"
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5511
msgid "Scroll _Up"
msgstr "Scorri in _alto"
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5514
msgid "Scroll _Right"
msgstr "Scorri a _destra"
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5517
+#, fuzzy
+msgid "_Readable"
+msgstr "_Abilita"
+
+#: ../midori/midori-browser.c:5520
msgid "_Go"
msgstr "V_ai"
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5523
msgid "Go back to the previous page"
msgstr "Va alla pagina precedente"
-#: ../midori/midori-browser.c:5346
-msgid "Go forward to the next page"
-msgstr "Va alla pagina successiva"
-
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5530
msgid "Go to the previous sub-page"
msgstr "Va alla sottopagina precedente"
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5354
-msgid "Go to the next sub-page"
-msgstr "Va alla sottopagina successiva"
+#: ../midori/midori-browser.c:5539
+msgid "_Homepage"
+msgstr "_Pagina iniziale"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5540
msgid "Go to your homepage"
msgstr "Va alla pagina iniziale"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5542
msgid "Empty Trash"
msgstr "Svuota cestino"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5545
msgid "Undo _Close Tab"
msgstr "Annulla chi_usura scheda"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5552
msgid "Add a new _folder"
msgstr "Aggiungi una nuova _cartella"
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5558
msgid "_Export bookmarks"
msgstr "Esp_orta segnalibri"
-#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "Gestione _motori di ricerca"
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5564
msgid "_Clear Private Data"
msgstr "_Rimuovi dati privati"
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5567
msgid "_Inspect Page"
msgstr "Ispeziona pa_gina"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5571
msgid "_Previous Tab"
msgstr "Scheda _precedente"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5574
msgid "_Next Tab"
msgstr "Scheda _successiva"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5576
msgid "Move Tab _Backward"
msgstr "Sposta scheda in_dietro"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5578
msgid "_Move Tab Forward"
msgstr "Sposta scheda da_vanti"
# comando per selezionare la scheda corrente
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5581
msgid "Focus _Current Tab"
msgstr "Scheda _corrente"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5584
msgid "Focus _Next view"
msgstr "Metti a fuoco la vista _successiva"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5587
msgid "Only show the Icon of the _Current Tab"
msgstr "Mostra solo l'icona della scheda corren_te"
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5590
msgid "_Duplicate Current Tab"
msgstr "_Duplica la scheda corrente"
# acceleratore sulla h per evitare conflitti
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5593
msgid "Close Ot_her Tabs"
msgstr "Chiudi le altre sc_hede"
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5596
msgid "Open last _session"
msgstr "Apri ultima s_essione"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5599
msgid "_Help"
msgstr "A_iuto"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5601
msgid "_Frequent Questions"
msgstr "Domande fre_quenti"
-#: ../midori/midori-browser.c:5421
-msgid "_Report a Problem..."
-msgstr "Segnala un _problema..."
+#: ../midori/midori-browser.c:5604
+msgid "_Report a Problem…"
+msgstr "Segnala un _problema…"
-#: ../midori/midori-browser.c:5433
-msgid "_Menubar"
-msgstr "Barra dei _menu"
-
-#: ../midori/midori-browser.c:5437
-msgid "_Navigationbar"
-msgstr "Barra di _navigazione"
-
-#: ../midori/midori-browser.c:5441
-msgid "Side_panel"
-msgstr "Pannello _laterale"
-
-#: ../midori/midori-browser.c:5442
-msgid "Sidepanel"
-msgstr "Pannello laterale"
-
-#: ../midori/midori-browser.c:5445
-msgid "_Bookmarkbar"
-msgstr "Barra dei s_egnalibri"
-
-#: ../midori/midori-browser.c:5449
-msgid "_Statusbar"
-msgstr "Barra di stat_o"
-
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311
-msgid "_Automatic"
-msgstr "_Automatico"
-
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "Cinese (BIGS)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5465
-msgid "Japanese (SHIFT__JIS)"
-msgstr "Giapponese (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238
-msgid "Korean (EUC-KR)"
-msgstr "Coreano (EUC-KR)"
-
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239
-msgid "Russian (KOI8-R)"
-msgstr "Russo (KOI8-R)"
-
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241
-msgid "Western (ISO-8859-1)"
-msgstr "Occidentale (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242
-#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Personalizzato..."
-
-#: ../midori/midori-browser.c:5985
-msgid "_Separator"
-msgstr "_Separatore"
-
-#: ../midori/midori-browser.c:5992
-msgid "_Location..."
-msgstr "I_ndirizzo..."
-
-#: ../midori/midori-browser.c:5994
-msgid "Open a particular location"
-msgstr "Apre un indirizzo specifico"
-
-#: ../midori/midori-browser.c:6016
-msgid "_Web Search..."
-msgstr "Ricerca sul _web..."
-
-#: ../midori/midori-browser.c:6018
-msgid "Run a web search"
-msgstr "Esegue una ricerca sul web"
-
-#: ../midori/midori-browser.c:6045
-msgid "Reopen a previously closed tab or window"
-msgstr "Riapre una scheda o una finestra chiusa precedentemente"
-
-#: ../midori/midori-browser.c:6062
-msgid "Show the saved bookmarks"
-msgstr "Mostra i segnalibri salvati"
-
-#: ../midori/midori-browser.c:6079
+#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270
msgid "_Tools"
msgstr "_Strumenti"
-#: ../midori/midori-browser.c:6095
+#: ../midori/midori-browser.c:5616
+msgid "_Menubar"
+msgstr "Barra dei _menu"
+
+#: ../midori/midori-browser.c:5620
+msgid "_Navigationbar"
+msgstr "Barra di _navigazione"
+
+#: ../midori/midori-browser.c:5624
+msgid "Side_panel"
+msgstr "Pannello _laterale"
+
+#: ../midori/midori-browser.c:5625
+msgid "Sidepanel"
+msgstr "Pannello laterale"
+
+#: ../midori/midori-browser.c:5628
+msgid "_Bookmarkbar"
+msgstr "Barra dei s_egnalibri"
+
+#: ../midori/midori-browser.c:5632
+msgid "_Statusbar"
+msgstr "Barra di stat_o"
+
+#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199
+msgid "_Automatic"
+msgstr "_Automatico"
+
+#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123
+msgid "Chinese Traditional (BIG5)"
+msgstr "Cinese tradizionale (BIG5)"
+
+#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124
+msgid "Chinese Simplified (GB18030)"
+msgstr "Cinese semplificato (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5651
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Giapponese (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126
+msgid "Korean (EUC-KR)"
+msgstr "Coreano (EUC-KR)"
+
+#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127
+msgid "Russian (KOI8-R)"
+msgstr "Russo (KOI8-R)"
+
+#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129
+msgid "Western (ISO-8859-1)"
+msgstr "Occidentale (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5666
+msgid "Custom…"
+msgstr "Personalizzato…"
+
+#: ../midori/midori-browser.c:6176
+msgid "_Separator"
+msgstr "_Separatore"
+
+#: ../midori/midori-browser.c:6183
+msgid "_Location…"
+msgstr "I_ndirizzo…"
+
+#: ../midori/midori-browser.c:6185
+msgid "Open a particular location"
+msgstr "Apre un indirizzo specifico"
+
+#: ../midori/midori-browser.c:6207
+msgid "_Web Search…"
+msgstr "Ricerca sul _web…"
+
+#: ../midori/midori-browser.c:6209
+msgid "Run a web search"
+msgstr "Esegue una ricerca sul web"
+
+#: ../midori/midori-browser.c:6236
+msgid "Reopen a previously closed tab or window"
+msgstr "Riapre una scheda o una finestra chiusa precedentemente"
+
+#: ../midori/midori-browser.c:6253
+msgid "Show the saved bookmarks"
+msgstr "Mostra i segnalibri salvati"
+
+#: ../midori/midori-browser.c:6286
msgid "_Window"
msgstr "Fi_nestra"
-#: ../midori/midori-browser.c:6097
+#: ../midori/midori-browser.c:6288
msgid "Show a list of all open tabs"
msgstr "Mostra un elenco delle schede aperte"
-#: ../midori/midori-browser.c:6111
+#: ../midori/midori-browser.c:6302
msgid "_Menu"
msgstr "_Menu"
-#: ../midori/midori-browser.c:6113
+#: ../midori/midori-browser.c:6304
msgid "Menu"
msgstr "Menu"
-#: ../midori/midori-browser.c:6927
+#: ../midori/midori-browser.c:7134
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Impostazione \"%s\" non prevista"
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:330
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "La configurazione dell'estensione \"%s\" non può essere caricata: %s\n"
-#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
-#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:752 ../midori/midori-extension.c:849
+#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058
+#: ../extensions/addons.c:1686
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "La configurazione dell'estensione \"%s\" non può essere salvata: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "Cerca con %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Cerca con..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "Cerca con…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "Impossibile selezionare dalla cronologia\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "Cerca %s"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "Esporta il certificato"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "Il certificato non corrisponde all'identità del sito da cui è stato ottenuto."
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "Il certificato è scaduto"
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "L'algoritmo del certificato è considerato insicuro."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "Si è verificato un errore durante la validazione del certificato."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "_Esporta certificato"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "Dettagli di sicurezza"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "Incolla e p_rocedi"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "Non verificata"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "Connessione verificata e cifrata"
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1989
msgid "Open, unencrypted connection"
msgstr "Connessione aperta, non cifrata"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Allinea il pannello laterale a destra"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Chiude il pannello"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Allinea il pannello laterale a sinistra"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:105
msgid "Show Speed Dial"
msgstr "Mostra selezione veloce"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:106
msgid "Show Homepage"
msgstr "Mostra la pagina iniziale"
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:125
msgid "Japanese (SHIFT_JIS)"
msgstr "Giapponese (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206
+#: ../katze/katze-utils.c:633
+#, fuzzy
+msgid "Custom..."
+msgstr "Personalizzato…"
+
+#: ../midori/midori-websettings.c:145
msgid "New tab"
msgstr "Nuova scheda"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:146
msgid "New window"
msgstr "Nuova finestra"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:147
msgid "Current tab"
msgstr "Scheda corrente"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:162
msgid "Default"
msgstr "Predefinito"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:163
msgid "Icons"
msgstr "Icone"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:164
msgid "Small icons"
msgstr "Icone piccole"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:165
msgid "Text"
msgstr "Testo"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:166
msgid "Icons and text"
msgstr "Icone e testo"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:167
msgid "Text beside icons"
msgstr "Testo accanto alle icone"
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:182
msgid "Automatic (GNOME or environment)"
msgstr "Automatico (GNOME o ambiente)"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:183
msgid "HTTP proxy server"
msgstr "Server proxy HTTP"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:184
msgid "No proxy server"
msgstr "Nessun proxy"
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:201
+#, fuzzy
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:202
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:203
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:204
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:205
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:400
-msgid "Remember last window size"
-msgstr "Ricorda la dimensione dell'ultima finestra"
-
-#: ../midori/midori-websettings.c:401
-msgid "Whether to save the last window size"
-msgstr ""
-"Abilitare questa opzione per salvare le dimensioni dell'ultima finestra"
-
-#: ../midori/midori-websettings.c:409
-msgid "Last window width"
-msgstr "Larghezza dell'ultima finestra"
-
-#: ../midori/midori-websettings.c:410
-msgid "The last saved window width"
-msgstr "L'ultima larghezza salvata per la finestra"
-
-#: ../midori/midori-websettings.c:418
-msgid "Last window height"
-msgstr "Altezza dell'ultima finestra"
-
-#: ../midori/midori-websettings.c:419
-msgid "The last saved window height"
-msgstr "L'ultima altezza salvata per la finestra"
-
-#: ../midori/midori-websettings.c:444
-msgid "Last panel position"
-msgstr "Posizione del pannello"
-
-#: ../midori/midori-websettings.c:445
-msgid "The last saved panel position"
-msgstr "L'ultima posizione salvata per il pannello"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
-msgid "Last panel page"
-msgstr "Pagina dell'ultimo pannello"
-
-#: ../midori/midori-websettings.c:455
-msgid "The last saved panel page"
-msgstr "L'ultima pagina salvata per il pannello"
-
-#: ../midori/midori-websettings.c:463
-msgid "Last Web search"
-msgstr "Ultima ricerca web"
-
-#: ../midori/midori-websettings.c:464
-msgid "The last saved Web search"
-msgstr "L'ultima ricerca web salvata"
-
-#: ../midori/midori-websettings.c:473
-msgid "Show Menubar"
-msgstr "Mostra barra dei menu"
-
-#: ../midori/midori-websettings.c:474
-msgid "Whether to show the menubar"
-msgstr "Abilitare questa opzione per mostrare la barra dei menu"
-
-#: ../midori/midori-websettings.c:482
-msgid "Show Navigationbar"
-msgstr "Mostra barra di navigazione"
-
-#: ../midori/midori-websettings.c:483
-msgid "Whether to show the navigationbar"
-msgstr "Abilitare questa opzione per mostrare la barra di navigazione"
-
-#: ../midori/midori-websettings.c:491
-msgid "Show Bookmarkbar"
-msgstr "Mostra barra dei segnalibri"
-
-#: ../midori/midori-websettings.c:492
-msgid "Whether to show the bookmarkbar"
-msgstr "Abilitare questa opzione per mostrare la barra dei segnalibri"
-
-#: ../midori/midori-websettings.c:500
-msgid "Show Panel"
-msgstr "Mostra pannello"
-
-#: ../midori/midori-websettings.c:501
-msgid "Whether to show the panel"
-msgstr "Abilitare questa opzione per mostrare il pannello"
-
-#: ../midori/midori-websettings.c:509
-msgid "Show Statusbar"
-msgstr "Mostra barra di stato"
-
-#: ../midori/midori-websettings.c:510
-msgid "Whether to show the statusbar"
-msgstr "Abilitare questa opzione per mostrare la barra di stato"
-
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:278
msgid "Toolbar Style:"
msgstr "Stile della barra degli strumenti:"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:279
msgid "The style of the toolbar"
msgstr "Scegliere lo stile della barra degli strumenti"
-#: ../midori/midori-websettings.c:529
-msgid "Toolbar Items"
-msgstr "Elementi barra degli strumenti"
-
-#: ../midori/midori-websettings.c:530
-msgid "The items to show on the toolbar"
-msgstr "Indicare gli elementi da mostrare nella barra degli strumenti"
-
-#: ../midori/midori-websettings.c:538
-msgid "Compact Sidepanel"
-msgstr "Pannello compatto"
-
-#: ../midori/midori-websettings.c:539
-msgid "Whether to make the sidepanel compact"
-msgstr "Abilitare questa opzione per la visualizzazione compatta del pannello"
-
-#: ../midori/midori-websettings.c:554
-msgid "Align sidepanel on the right"
-msgstr "Allinea a destra il pannello laterale"
-
-#: ../midori/midori-websettings.c:555
-msgid "Whether to align the sidepanel on the right"
-msgstr "Abilitare questa opzione per allineare il pannello laterale a destra"
-
-#: ../midori/midori-websettings.c:570
-msgid "Open panels in separate windows"
-msgstr "Apri i pannelli in finestre separate"
-
-#: ../midori/midori-websettings.c:571
-msgid "Whether to always open panels in separate windows"
-msgstr ""
-"Abilitare questa opzione per aprire sempre i pannelli in finestre separate"
-
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:288
msgid "When Midori starts:"
msgstr "All'avvio di Midori:"
-#: ../midori/midori-websettings.c:581
-msgid "What to do when Midori starts"
-msgstr "Cosa fare all'avvio di Midori"
-
-#: ../midori/midori-websettings.c:590
-msgid "Homepage:"
-msgstr "Pagina iniziale:"
-
-#: ../midori/midori-websettings.c:591
-msgid "The homepage"
-msgstr "La pagina iniziale"
-
-#: ../midori/midori-websettings.c:606
-msgid "Show crash dialog"
-msgstr "Mostra finestra di errore"
-
-#: ../midori/midori-websettings.c:607
-msgid "Show a dialog after Midori crashed"
-msgstr ""
-"Abilitare questa opzione per mostrare una finestra nel caso Midori si sia "
-"chiuso inaspettatamente"
-
-#: ../midori/midori-websettings.c:615
-msgid "Save downloaded files to:"
-msgstr "Salva i file scaricati in:"
-
-#: ../midori/midori-websettings.c:616
-msgid "The folder downloaded files are saved to"
-msgstr "Scegliere la cartella dove devono essere salvati i file scaricati"
-
-#: ../midori/midori-websettings.c:624
-msgid "Text Editor"
-msgstr "Editor di testo"
-
-#: ../midori/midori-websettings.c:625
-msgid "An external text editor"
-msgstr "Inserire un editor di testo esterno"
-
-#: ../midori/midori-websettings.c:640
-msgid "News Aggregator"
-msgstr "Aggregatore notizie"
-
-#: ../midori/midori-websettings.c:641
-msgid "An external news aggregator"
-msgstr "Aggregatore di notizie esterno"
-
-#: ../midori/midori-websettings.c:649
-msgid "Location entry Search"
-msgstr "Motore di ricerca predefinito"
-
-#: ../midori/midori-websettings.c:650
-msgid "The search to perform inside the location entry"
-msgstr ""
-"Inserire il motore di ricerca predefinito da utilizzare dalla barra degli "
-"indirizzi"
-
-#: ../midori/midori-websettings.c:658
+#: ../midori/midori-websettings.c:298
msgid "Preferred Encoding"
msgstr "Codifica preferita"
-#: ../midori/midori-websettings.c:659
-msgid "The preferred character encoding"
-msgstr "Scegliere la codifica dei caratteri preferita"
-
-#: ../midori/midori-websettings.c:669
-msgid "Always Show Tabbar"
-msgstr "Mostra sempre le schede"
-
-#: ../midori/midori-websettings.c:670
-msgid "Always show the tabbar"
-msgstr "Abilitare questa opzione per mostrare sempre le etichette delle schede"
-
-#: ../midori/midori-websettings.c:683
-msgid "Close Buttons on Tabs"
-msgstr "Pulsante di chiusura schede"
-
-#: ../midori/midori-websettings.c:684
-msgid "Whether tabs have close buttons"
-msgstr ""
-"Abilitare questa opzione per visualizzare il pulsante di chiusura nelle "
-"schede"
-
-#: ../midori/midori-websettings.c:709
+#: ../midori/midori-websettings.c:325
msgid "Open new pages in:"
msgstr "Apri le nuove pagine in:"
-#: ../midori/midori-websettings.c:710
-msgid "Where to open new pages"
-msgstr "Scegliere dove aprire le nuove pagine"
-
-#: ../midori/midori-websettings.c:719
-msgid "Middle click opens Selection"
-msgstr "Tasto centrale apre la selezione"
-
-#: ../midori/midori-websettings.c:720
-msgid "Load an address from the selection via middle click"
-msgstr ""
-"Abilitare questa opzione per poter caricare un indirizzo da una selezione "
-"tramite il clic col tasto centrale"
-
-#: ../midori/midori-websettings.c:728
-msgid "Open tabs in the background"
-msgstr "Apri schede sullo sfondo"
-
-#: ../midori/midori-websettings.c:729
-msgid "Whether to open new tabs in the background"
-msgstr "Abilitare questa opzione per aprire le nuove schede sullo sfondo"
-
-#: ../midori/midori-websettings.c:737
-msgid "Open Tabs next to Current"
-msgstr "Apri schede dopo quella corrente"
-
-#: ../midori/midori-websettings.c:738
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr ""
-"Abilitare questa opzione per aprire le nuove schede dopo la scheda attuale "
-"oppure disabilitarla per aprirle dopo l'ultima"
-
-#: ../midori/midori-websettings.c:746
-msgid "Open popups in tabs"
-msgstr "Apri popup in schede"
-
-#: ../midori/midori-websettings.c:747
-msgid "Whether to open popup windows in tabs"
-msgstr "Abilitare questa opzione per aprire le finestre popup in schede"
-
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Carica immagini automaticamente"
-
-#: ../midori/midori-websettings.c:758
-msgid "Load and display images automatically"
-msgstr ""
-"Abilitare questa opzione per caricare e visualizzare automaticamente le "
-"immagini"
-
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Abilita script"
-
-#: ../midori/midori-websettings.c:766
-msgid "Enable embedded scripting languages"
-msgstr ""
-"Abilitare questa opzione per attivare i linguaggi di scripting integrati"
-
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Abilita plugin di Netscape"
-
-#: ../midori/midori-websettings.c:774
-msgid "Enable embedded Netscape plugin objects"
-msgstr ""
-"Abilitare questa opzione per attivare gli oggetti integrati con i plugin di "
-"Netscape"
-
-#: ../midori/midori-websettings.c:789
-msgid "Enable Spell Checking"
-msgstr "Abilita controllo ortografico"
-
-#: ../midori/midori-websettings.c:790
-msgid "Enable spell checking while typing"
-msgstr ""
-"Abilita questa opzione per attivare il controllo ortografico durante la "
-"digitazione"
-
-#: ../midori/midori-websettings.c:796
-msgid "Enable HTML5 database support"
-msgstr "Abilita il supporto al database HTML5"
-
-#: ../midori/midori-websettings.c:797
-msgid "Whether to enable HTML5 database support"
-msgstr "Abilitare questa opzione per attivare il supporto al database HTML5"
-
-#: ../midori/midori-websettings.c:803
-msgid "Enable HTML5 local storage support"
-msgstr "Abilita il supporto allo storage locale HTML5"
-
-#: ../midori/midori-websettings.c:804
-msgid "Whether to enable HTML5 local storage support"
-msgstr ""
-"Abilitare questa opzione per attivare il supporto allo storage locale HTML5"
-
-#: ../midori/midori-websettings.c:810
-msgid "Enable offline web application cache"
-msgstr "Abilita la cache delle applicazioni web offline"
-
-#: ../midori/midori-websettings.c:811
-msgid "Whether to enable offline web application cache"
-msgstr ""
-"Abilitare questa opzione per attivare la cache delle applicazioni web quando "
-"offline"
-
-#: ../midori/midori-websettings.c:827
-msgid "Flash window on background tabs"
-msgstr "Lampeggia la finestra se ci sono schede in secondo piano"
-
-#: ../midori/midori-websettings.c:828
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr ""
-"Lampeggia la finestra del browser se viene aperta una nuova scheda in "
-"secondo piano"
-
-#: ../midori/midori-websettings.c:836
-msgid "Enable WebGL support"
-msgstr "Abilita il supporto a WebGL"
-
-#: ../midori/midori-websettings.c:837
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Permette ai siti internet di utilizzare la visualizzazione OpenGL"
-
-#: ../midori/midori-websettings.c:863
-msgid "Zoom Text and Images"
-msgstr "Ingrandimento testo e immagini"
-
-#: ../midori/midori-websettings.c:864
-msgid "Whether to zoom text and images"
-msgstr "Abilitare questa opzione per ingrandire il testo e le immagini"
-
-#: ../midori/midori-websettings.c:879
-msgid "Find inline while typing"
-msgstr "Cerca nella pagina durante la digitazione"
-
-#: ../midori/midori-websettings.c:880
-msgid "Whether to automatically find inline while typing"
-msgstr ""
-"Abilitare questa opzione per cercare automaticamente nella pagina durante la "
-"digitazione"
-
-#: ../midori/midori-websettings.c:895
-msgid "Kinetic scrolling"
-msgstr "Scorrimento per movimento"
-
-#: ../midori/midori-websettings.c:896
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr ""
-"Se durante lo scorrimento si deve tener conto della velocità del movimento"
-
-#: ../midori/midori-websettings.c:904
-msgid "Delete old Cookies after:"
-msgstr "Elimina i cookie obsoleti dopo:"
-
-#: ../midori/midori-websettings.c:905
-msgid "The maximum number of days to save cookies for"
-msgstr "Numero massimo di giorni per cui possono essere validi i cookie"
-
-#: ../midori/midori-websettings.c:921
-msgid "Only accept Cookies from sites you visit"
-msgstr "Accettare i cookie solo dai siti visitati"
-
-#: ../midori/midori-websettings.c:922
-msgid "Block cookies sent by third-party websites"
-msgstr "Blocca i cookie inviati da siti di terze parti"
-
-#: ../midori/midori-websettings.c:936
-msgid "Delete pages from history after:"
-msgstr "Elimina le pagine dalla cronologia dopo:"
-
-#: ../midori/midori-websettings.c:937
-msgid "The maximum number of days to save the history for"
-msgstr "Numero massimo di giorni per cui deve essere salvata la cronologia"
-
-#: ../midori/midori-websettings.c:952
-msgid "Proxy server"
-msgstr "Server proxy"
-
-#: ../midori/midori-websettings.c:953
-msgid "The type of proxy server to use"
-msgstr "Il tipo di server proxy da usare"
-
-#: ../midori/midori-websettings.c:962
-msgid "HTTP Proxy Server"
-msgstr "Server proxy HTTP"
-
-#: ../midori/midori-websettings.c:963
-msgid "The proxy server used for HTTP connections"
-msgstr "Il server proxy usato per le connessioni HTTP"
-
-#: ../midori/midori-websettings.c:978
-msgid "Port"
-msgstr "Porta"
-
-#: ../midori/midori-websettings.c:979
-msgid "The proxy server port used for HTTP connections"
-msgstr "La porta per il server proxy usato per le connessioni HTTP"
-
-#: ../midori/midori-websettings.c:997
-msgid "The maximum size of cached pages on disk"
-msgstr "La dimensione massima della cache delle pagine su disco"
-
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
+#: ../midori/midori-websettings.c:388
msgid "Identify as"
msgstr "Identifica come"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:389
msgid "What to identify as to web pages"
msgstr "Come essere identificati sul web"
-#: ../midori/midori-websettings.c:1031
-msgid "Identification string"
-msgstr "Stringa di identificazione"
-
-#: ../midori/midori-websettings.c:1032
-msgid "The application identification string"
-msgstr "Inserire la stringa di identificazione dell'applicazione"
-
-#: ../midori/midori-websettings.c:1048
+#: ../midori/midori-websettings.c:422
msgid "Preferred languages"
msgstr "Lingue preferite"
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:423
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1641,520 +1342,334 @@ msgstr ""
"di pagine web multilingua, per esempio \"de\", \"ru,nl\" o \"en-us;q=1.0, fr-"
"fr;q=0.667\""
-#: ../midori/midori-websettings.c:1064
-msgid "Clear private data"
-msgstr "Cancella i dati personali"
-
-#: ../midori/midori-websettings.c:1065
-msgid "The private data selected for deletion"
-msgstr "Dati privati selezionati per la cancellazione"
-
-#: ../midori/midori-websettings.c:1080
-msgid "Clear data"
-msgstr "Cancella i dati"
-
-#: ../midori/midori-websettings.c:1081
-msgid "The data selected for deletion"
-msgstr "I dati selezionati per la cancellazione"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
-msgid "Strip referrer details sent to websites"
-msgstr "Scarta i dettagli del referer inviati ai siti web"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Se il \"referer\" deve essere accorciato al nome host"
-
-#: ../midori/midori-websettings.c:1146
+#: ../midori/midori-websettings.c:472
msgid "Always use my font choices"
msgstr "Usa sempre il tipo di carattere di mia scelta"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:473
msgid "Override fonts picked by websites with user preferences"
msgstr ""
"Preferisci le impostazioni utente degli stili di carattere a quelle dei siti"
-#: ../midori/midori-view.c:1360
+#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:1149
+msgid "Security unknown"
+msgstr "Sicurezza sconosciuta"
+
+#: ../midori/midori-view.c:1447
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s vuole salvare un database HTML5."
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Deny"
msgstr "_Nega"
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Allow"
msgstr "_Permetti"
-#: ../midori/midori-view.c:1392
+#: ../midori/midori-view.c:1480
#, c-format
msgid "%s wants to know your location."
msgstr "%s vuole conoscere la propria posizione."
-#: ../midori/midori-view.c:1485
+#: ../midori/midori-view.c:1576
#, c-format
msgid "Error - %s"
msgstr "Errore - %s"
-#: ../midori/midori-view.c:1486
+#: ../midori/midori-view.c:1577
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "La pagina \"%s\" non può essere caricata."
-#: ../midori/midori-view.c:1488
+#: ../midori/midori-view.c:1579
msgid "Try again"
msgstr "Riprova"
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
+#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887
#, c-format
msgid "Send a message to %s"
msgstr "Invia un messaggio a %s"
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
+#: ../midori/midori-view.c:2673
+#, fuzzy
+msgid "Add _search engine..."
+msgstr "Aggiungi motore di ricerca"
+
+#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043
msgid "Inspect _Element"
msgstr "Ispeziona _elemento"
-#: ../midori/midori-view.c:2480
+#: ../midori/midori-view.c:2769
msgid "Open Link in New _Tab"
msgstr "Apri collegamento in una nuova sc_heda"
-#: ../midori/midori-view.c:2484
+#: ../midori/midori-view.c:2773
msgid "Open Link in _Foreground Tab"
msgstr "Apri collegamento in una scheda in primo _piano"
-#: ../midori/midori-view.c:2485
+#: ../midori/midori-view.c:2774
msgid "Open Link in _Background Tab"
msgstr "Apri collegamento in una scheda in secondo p_iano"
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2777
msgid "Open Link in New _Window"
msgstr "Apri collegamento in una nuova _finestra"
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2780
msgid "Open Link as Web A_pplication"
msgstr "Apri il collegamento come applicazione _web"
-#: ../midori/midori-view.c:2496
+#: ../midori/midori-view.c:2785
msgid "Copy Link de_stination"
msgstr "Copia l'indirizzo di de_stinazione"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2801
msgid "Open _Image in New Tab"
msgstr "Apri _immagine in nuova scheda"
-#: ../midori/midori-view.c:2515
+#: ../midori/midori-view.c:2804
msgid "Copy Image _Address"
msgstr "Copi_a indirizzo immagine"
-#: ../midori/midori-view.c:2518
+#: ../midori/midori-view.c:2807
msgid "Save I_mage"
msgstr "Salva i_mmagine"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2810
msgid "Open in Image _Viewer"
msgstr "Apri immagine nel _visualizzatore"
-#: ../midori/midori-view.c:2528
+#: ../midori/midori-view.c:2817
msgid "Copy Video _Address"
msgstr "Copi_a indirizzo video"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2820
msgid "Save _Video"
msgstr "Salva _video"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2820
msgid "Download _Video"
msgstr "Scarica _video"
-#: ../midori/midori-view.c:2557
+#: ../midori/midori-view.c:2846
msgid "Search _with"
msgstr "Cerca _con"
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:2878
msgid "_Search the Web"
msgstr "_Cerca nel web"
-#: ../midori/midori-view.c:2606
+#: ../midori/midori-view.c:2895
msgid "Open Address in New _Tab"
msgstr "Apri indirizzi in una nuova _scheda"
-#: ../midori/midori-view.c:2909
-msgid "Open or download file"
-msgstr "Apri o scarica file"
+#: ../midori/midori-view.c:2948
+msgid "Open _Frame in New Tab"
+msgstr "Apri _cornice in nuova scheda"
-#: ../midori/midori-view.c:2929
+#: ../midori/midori-view.c:3203
#, c-format
-msgid "File Type: '%s'"
-msgstr "Tipo di file: \"%s\""
+msgid "Open or download file from %s"
+msgstr "Apri o scarica file da %s"
-#: ../midori/midori-view.c:2931
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Tipo di file: %s (\"%s\")"
-
-#: ../midori/midori-view.c:2935
+#: ../midori/midori-view.c:3216
#, c-format
msgid "File Name: %s"
msgstr "Nome file: %s"
-#: ../midori/midori-view.c:2955
+#: ../midori/midori-view.c:3221
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Tipo di file: \"%s\""
+
+#: ../midori/midori-view.c:3223
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Tipo di file: %s (\"%s\")"
+
+#: ../midori/midori-view.c:3260
+#, c-format
+msgid "Size: %s"
+msgstr "Dimensione: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3271
#, c-format
msgid "Open %s"
msgstr "Apri %s"
-#: ../midori/midori-view.c:3576
+#: ../midori/midori-view.c:3882
#, c-format
msgid "Inspect page - %s"
msgstr "Controllo pagina - %s"
-#: ../midori/midori-view.c:3923
-msgid "Speed Dial"
-msgstr "Selezione veloce"
-
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
-msgid "Click to add a shortcut"
-msgstr "Fare clic per aggiungere un collegamento"
-
-#: ../midori/midori-view.c:3925
-msgid "Enter shortcut address"
-msgstr "Inserire l'indirizzo del collegamento"
-
-#: ../midori/midori-view.c:3926
-msgid "Enter shortcut title"
-msgstr "Inserire il titolo del collegamento"
-
-#: ../midori/midori-view.c:3927
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "Eliminare davvero questo collegamento?"
-
-#: ../midori/midori-view.c:4089
+#: ../midori/midori-view.c:4279
#, c-format
msgid "No documentation installed"
msgstr "La documentazione non è installata"
-#: ../midori/midori-view.c:4165
+#: ../midori/midori-view.c:4356
msgid "Midori doesn't store any personal data:"
msgstr "Midori non salva alcun dato personale:"
-#: ../midori/midori-view.c:4166
+#: ../midori/midori-view.c:4357
msgid "No history or web cookies are being saved."
msgstr "Non sono salvati cronologia o cookie."
-#: ../midori/midori-view.c:4167
+#: ../midori/midori-view.c:4358
msgid "Extensions are disabled."
msgstr "Le estensioni sono disabilitate."
-#: ../midori/midori-view.c:4168
+#: ../midori/midori-view.c:4359
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
"L'immagazzinamento HTML5, i database locali e le cache dell'applicazione "
"sono disabilitati."
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4360
msgid "Midori prevents websites from tracking the user:"
msgstr "Midori impedisce ai siti web di tracciare l'utente:"
-#: ../midori/midori-view.c:4170
+#: ../midori/midori-view.c:4361
msgid "Referrer URLs are stripped down to the hostname."
msgstr "Gli URL referenti sono limitati al nome host."
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:4362
msgid "DNS prefetching is disabled."
msgstr "Il prefetching DNS è disabilitato."
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:4363
msgid "The language and timezone are not revealed to websites."
msgstr ""
"La lingua e il fuso orario di appartenenza non sono rivelati ai siti web."
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:4364
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr ""
"Flash e gli altri plugin di Netscape non possono essere elencati dai siti "
"web."
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:4450
msgid "Version numbers in brackets show the version used at runtime."
msgstr ""
"I numeri di versione tra parentesi indicano la versione usata durante "
"l'esecuzione."
-#: ../midori/midori-view.c:4278
+#: ../midori/midori-view.c:4499
msgid "Page loading delayed"
msgstr "Caricamento pagina ritardato"
-#: ../midori/midori-view.c:4279
+#: ../midori/midori-view.c:4500
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"Caricamento ritardato a causa di un errore recente o delle preferenze di "
"avvio"
-#: ../midori/midori-view.c:4280
+#: ../midori/midori-view.c:4501
msgid "Load Page"
msgstr "Carica pagina"
-#: ../midori/midori-view.c:4446
+#: ../midori/midori-view.c:4668
msgid "Blank page"
msgstr "Pagina vuota"
-#: ../midori/midori-view.c:4708
+#: ../midori/midori-view.c:4932
msgid "_Duplicate Tab"
msgstr "_Duplica scheda"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4937
msgid "Show Tab _Label"
msgstr "Mostra l'_etichetta nelle schede"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4937
msgid "Show Tab _Icon Only"
msgstr "Mostra solo l'_icona nelle schede"
-#: ../midori/midori-view.c:4719
-msgid "Close ot_her Tabs"
-msgstr "Chiudi le altre sc_hede"
+# acceleratore sulla h per evitare conflitti
+#: ../midori/midori-view.c:4944
+#, fuzzy
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Chiudi le altre sc_hede"
+msgstr[1] "Chiudi le altre sc_hede"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5532
+#: ../midori/midori-view.c:5701
msgid "previous"
msgstr "precedente"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5551
+#: ../midori/midori-view.c:5720
msgid "next"
msgstr "successiva"
-#: ../midori/midori-view.c:5564
+#: ../midori/midori-view.c:5733
msgid "Print background images"
msgstr "Stampa immagini di sfondo"
-#: ../midori/midori-view.c:5565
+#: ../midori/midori-view.c:5734
msgid "Whether background images should be printed"
msgstr "Abilitare questa opzione per stampare le immagini di sfondo"
-#: ../midori/midori-view.c:5597
+#: ../midori/midori-view.c:5766
msgid "Features"
msgstr "Opzioni"
-#: ../midori/midori-preferences.c:297
-msgid "Startup"
-msgstr "Avvio"
-
-#: ../midori/midori-preferences.c:310
-msgid "Use _current page"
-msgstr "Usa la pagina co_rrente"
-
-#: ../midori/midori-preferences.c:314
-msgid "Use current page as homepage"
-msgstr "Usa la pagina corrente come homepage"
-
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
-msgid "Fonts"
-msgstr "Carattere"
-
-#: ../midori/midori-preferences.c:326
-msgid "Proportional Font Family"
-msgstr "Famiglia di caratteri proporzionale"
-
-#: ../midori/midori-preferences.c:330
-msgid "The default font family used to display text"
-msgstr ""
-"Scegliere la famiglia predefinita dei caratteri per visualizzare il testo"
-
-#: ../midori/midori-preferences.c:333
-msgid "The default font size used to display text"
-msgstr ""
-"Scegliere la dimensione predefinita dei caratteri per visualizzare il testo"
-
-#: ../midori/midori-preferences.c:335
-msgid "Fixed-width Font Family"
-msgstr "Caratteri a larghezza fissa"
-
-#: ../midori/midori-preferences.c:339
-msgid "The font family used to display fixed-width text"
-msgstr ""
-"Dimensione dei caratteri del testo per visualizzare testi di larghezza "
-"predefinita"
-
-#: ../midori/midori-preferences.c:342
-msgid "The font size used to display fixed-width text"
-msgstr ""
-"Dimensione dei caratteri utilizzati per visualizzare il testo di altezza "
-"fissa"
-
-#: ../midori/midori-preferences.c:344
-msgid "Minimum Font Size"
-msgstr "Dimensione minima caratteri"
-
-#: ../midori/midori-preferences.c:348
-msgid "The minimum font size used to display text"
-msgstr "Scegliere la dimensione minima dei caratteri per visualizzare il testo"
-
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
-msgid "Behavior"
-msgstr "Comportamento"
-
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
-msgstr "Permetti agli script di aprire popup"
-
-#: ../midori/midori-preferences.c:386
-msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr ""
-"Abilitare questa opzione per consentire l'apertura automatica delle finestre "
-"di popup"
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:416
-msgid "Browsing"
-msgstr "Navigazione"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:456
-msgid "Network"
-msgstr "Rete"
-
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "Nome host"
-
-#: ../midori/midori-preferences.c:487
-msgid "MB"
-msgstr "MB"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Add search engine"
-msgstr "Aggiungi motore di ricerca"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Edit search engine"
-msgstr "Modifica motore di ricerca"
-
-#: ../midori/midori-searchaction.c:931
-msgid "_Name:"
-msgstr "_Nome:"
-
-#: ../midori/midori-searchaction.c:947
-msgid "_Description:"
-msgstr "_Descrizione:"
-
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "I_cona:"
-
-#: ../midori/midori-searchaction.c:995
-msgid "_Token:"
-msgstr "Parame_tro:"
-
-#: ../midori/midori-searchaction.c:1295
-msgid "Manage Search Engines"
-msgstr "Gestione motori di ricerca"
-
-#: ../midori/midori-searchaction.c:1395
-msgid "Use as _default"
-msgstr "Usa come _predefinito"
-
-#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr "Apri con"
-
-#: ../midori/sokoke.c:362
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:48
#, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Selezionare un'applicazione o un comando per aprire \"%s\":"
+msgid "%s of %s"
+msgstr "%s di %s"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
-msgid "Could not run external program."
-msgstr "Non è possibile eseguire l'applicazione esterna."
-
-#: ../midori/sokoke.c:1595
+#: ../midori/midori-download.vala:64
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d ora"
msgstr[1] "%d ore"
-#: ../midori/sokoke.c:1596
+#: ../midori/midori-download.vala:65
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minuti"
-#: ../midori/sokoke.c:1597
+#: ../midori/midori-download.vala:66
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d secondo"
msgstr[1] "%d secondi"
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
-#, c-format
-msgid "%s of %s"
-msgstr "%s di %s"
-
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
-msgid "?B"
-msgstr "?B"
-
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
-#, c-format
-msgid " (%s/s)"
-msgstr " (%s/s)"
-
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/midori-download.vala:82
#, c-format
msgid " - %s remaining"
msgstr " - %s restanti"
-#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
-msgid "_Inline Find:"
-msgstr "Cerca nel _testo:"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:92
+msgid "?B"
+msgstr "?B"
-#: ../toolbars/midori-findbar.c:317
-msgid "Previous"
-msgstr "Precedente"
-
-#: ../toolbars/midori-findbar.c:323
-msgid "Next"
-msgstr "Successiva"
-
-#: ../toolbars/midori-findbar.c:327
-msgid "Match Case"
-msgstr "Maiuscole/minuscole"
-
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr "Evidenzia risultati"
-
-#: ../toolbars/midori-findbar.c:347
-msgid "Close Findbar"
-msgstr "Chiudi barra ricerca"
-
-#: ../toolbars/midori-transferbar.c:122
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:94
#, c-format
-msgid "The file '%s ' has been downloaded."
-msgstr "Il file «%s » è stato trasferito."
+msgid " (%s/s)"
+msgstr " (%s/s)"
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "Trasferimento completato"
-
-#: ../toolbars/midori-transferbar.c:193
+#: ../midori/midori-download.vala:188
msgid "The downloaded file is erroneous."
msgstr "Il file scaricato è erroneo."
-#: ../toolbars/midori-transferbar.c:194
+#: ../midori/midori-download.vala:189
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2162,47 +1677,356 @@ msgstr ""
"Il checksum fornito con il collegamento non corrisponde. Ciò significa che "
"il file è probabilmente incompleto o è stato modificato successivamente."
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../midori/midori-download.vala:300
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Il file «%s» non può essere salvato in questa cartella."
+
+#: ../midori/midori-download.vala:302
+msgid "You don't have permission to write in this location."
+msgstr "Non si ha il permesso di scrivere in questa posizione."
+
+#: ../midori/midori-download.vala:305
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Spazio insufficiente per scaricare \"%s\"."
+
+#: ../midori/midori-download.vala:307
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Il file ha bisogno di %s ma sono rimasti solo %s."
+
+#: ../midori/midori-speeddial.vala:180
+msgid "Speed Dial"
+msgstr "Selezione veloce"
+
+#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+msgid "Click to add a shortcut"
+msgstr "Fare clic per aggiungere un collegamento"
+
+#: ../midori/midori-speeddial.vala:182
+msgid "Enter shortcut address"
+msgstr "Inserire l'indirizzo del collegamento"
+
+#: ../midori/midori-speeddial.vala:183
+msgid "Enter shortcut title"
+msgstr "Inserire il titolo del collegamento"
+
+#: ../midori/midori-speeddial.vala:184
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Eliminare davvero questo collegamento?"
+
+#: ../midori/midori-preferences.c:299
+msgid "Startup"
+msgstr "Avvio"
+
+#: ../midori/midori-preferences.c:305
+msgid "Homepage:"
+msgstr "Pagina iniziale:"
+
+#: ../midori/midori-preferences.c:313
+msgid "Use _current page"
+msgstr "Usa la pagina co_rrente"
+
+#: ../midori/midori-preferences.c:317
+msgid "Use current page as homepage"
+msgstr "Usa la pagina corrente come homepage"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:326
+msgid "Fonts"
+msgstr "Carattere"
+
+#: ../midori/midori-preferences.c:329
+msgid "Proportional Font Family"
+msgstr "Famiglia di caratteri proporzionale"
+
+#: ../midori/midori-preferences.c:333
+msgid "The default font family used to display text"
+msgstr ""
+"Scegliere la famiglia predefinita dei caratteri per visualizzare il testo"
+
+#: ../midori/midori-preferences.c:336
+msgid "The default font size used to display text"
+msgstr ""
+"Scegliere la dimensione predefinita dei caratteri per visualizzare il testo"
+
+#: ../midori/midori-preferences.c:338
+msgid "Fixed-width Font Family"
+msgstr "Caratteri a larghezza fissa"
+
+#: ../midori/midori-preferences.c:342
+msgid "The font family used to display fixed-width text"
+msgstr ""
+"Dimensione dei caratteri del testo per visualizzare testi di larghezza "
+"predefinita"
+
+#: ../midori/midori-preferences.c:345
+msgid "The font size used to display fixed-width text"
+msgstr ""
+"Dimensione dei caratteri utilizzati per visualizzare il testo di altezza "
+"fissa"
+
+#: ../midori/midori-preferences.c:347
+msgid "Minimum Font Size"
+msgstr "Dimensione minima caratteri"
+
+#: ../midori/midori-preferences.c:351
+msgid "The minimum font size used to display text"
+msgstr "Scegliere la dimensione minima dei caratteri per visualizzare il testo"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:362
+msgid "Behavior"
+msgstr "Comportamento"
+
+#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Carica immagini automaticamente"
+
+#: ../midori/midori-preferences.c:369
+msgid "Enable Spell Checking"
+msgstr "Abilita controllo ortografico"
+
+#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Abilita script"
+
+#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Abilita plugin di Netscape"
+
+#: ../midori/midori-preferences.c:391
+msgid "Zoom Text and Images"
+msgstr "Ingrandimento testo e immagini"
+
+#: ../midori/midori-preferences.c:394
+msgid "Allow scripts to open popups"
+msgstr "Permetti agli script di aprire popup"
+
+#: ../midori/midori-preferences.c:395
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+"Abilitare questa opzione per consentire l'apertura automatica delle finestre "
+"di popup"
+
+#: ../midori/midori-preferences.c:401
+msgid "Kinetic scrolling"
+msgstr "Scorrimento per movimento"
+
+#: ../midori/midori-preferences.c:402
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr ""
+"Se durante lo scorrimento si deve tener conto della velocità del movimento"
+
+#: ../midori/midori-preferences.c:407
+msgid "Middle click opens Selection"
+msgstr "Tasto centrale apre la selezione"
+
+#: ../midori/midori-preferences.c:408
+msgid "Load an address from the selection via middle click"
+msgstr ""
+"Abilitare questa opzione per poter caricare un indirizzo da una selezione "
+"tramite il clic col tasto centrale"
+
+#: ../midori/midori-preferences.c:414
+msgid "Enable WebGL support"
+msgstr "Abilita il supporto a WebGL"
+
+#: ../midori/midori-preferences.c:419
+msgid "Flash window on background tabs"
+msgstr "Lampeggia la finestra se ci sono schede in secondo piano"
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Salva i file scaricati in:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Navigazione"
+
+#: ../midori/midori-preferences.c:451
+msgid "Close Buttons on Tabs"
+msgstr "Pulsante di chiusura schede"
+
+#: ../midori/midori-preferences.c:455
+msgid "Always Show Tabbar"
+msgstr "Mostra sempre le schede"
+
+#: ../midori/midori-preferences.c:459
+msgid "Open Tabs next to Current"
+msgstr "Apri schede dopo quella corrente"
+
+#: ../midori/midori-preferences.c:460
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Abilitare questa opzione per aprire le nuove schede dopo la scheda attuale "
+"oppure disabilitarla per aprirle dopo l'ultima"
+
+#: ../midori/midori-preferences.c:463
+msgid "Open tabs in the background"
+msgstr "Apri schede sullo sfondo"
+
+#: ../midori/midori-preferences.c:467
+msgid "Text Editor"
+msgstr "Editor di testo"
+
+#: ../midori/midori-preferences.c:472
+msgid "News Aggregator"
+msgstr "Aggregatore notizie"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:479
+msgid "Network"
+msgstr "Rete"
+
+#: ../midori/midori-preferences.c:481
+msgid "Proxy server"
+msgstr "Server proxy"
+
+#: ../midori/midori-preferences.c:486
+msgid "Hostname"
+msgstr "Nome host"
+
+#: ../midori/midori-preferences.c:494
+msgid "Port"
+msgstr "Porta"
+
+#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509
+msgid "The maximum size of cached pages on disk"
+msgstr "La dimensione massima della cache delle pagine su disco"
+
+#: ../midori/midori-preferences.c:511
+msgid "MB"
+msgstr "MB"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Add search engine"
+msgstr "Aggiungi motore di ricerca"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Edit search engine"
+msgstr "Modifica motore di ricerca"
+
+#: ../midori/midori-searchaction.c:985
+msgid "_Name:"
+msgstr "_Nome:"
+
+#: ../midori/midori-searchaction.c:1000
+msgid "_Description:"
+msgstr "_Descrizione:"
+
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Indirizzo:"
+
+#: ../midori/midori-searchaction.c:1032
+msgid "_Token:"
+msgstr "Parame_tro:"
+
+#: ../midori/midori-searchaction.c:1330
+msgid "Manage Search Engines"
+msgstr "Gestione motori di ricerca"
+
+#: ../midori/midori-searchaction.c:1432
+msgid "Use as _default"
+msgstr "Usa come _predefinito"
+
+#: ../midori/sokoke.c:353
+msgid "Open with"
+msgstr "Apri con"
+
+#: ../midori/sokoke.c:361
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Selezionare un'applicazione o un comando per aprire \"%s\":"
+
+#: ../midori/sokoke.c:476 ../midori/sokoke.c:490
+msgid "Could not run external program."
+msgstr "Non è possibile eseguire l'applicazione esterna."
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:265
+msgid "_Inline Find:"
+msgstr "Cerca nel _testo:"
+
+#: ../toolbars/midori-findbar.c:287
+msgid "Previous"
+msgstr "Precedente"
+
+#: ../toolbars/midori-findbar.c:293
+msgid "Next"
+msgstr "Successiva"
+
+#: ../toolbars/midori-findbar.c:297
+msgid "Match Case"
+msgstr "Maiuscole/minuscole"
+
+#: ../toolbars/midori-findbar.c:306
+msgid "Highlight Matches"
+msgstr "Evidenzia risultati"
+
+#: ../toolbars/midori-findbar.c:317
+msgid "Close Findbar"
+msgstr "Chiudi barra ricerca"
+
+#: ../toolbars/midori-transferbar.c:109
+#, c-format
+msgid "The file '%s ' has been downloaded."
+msgstr "Il file «%s » è stato trasferito."
+
+#: ../toolbars/midori-transferbar.c:114
+msgid "Transfer completed"
+msgstr "Trasferimento completato"
+
+#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
msgid "Clear All"
msgstr "Cancella tutto"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
msgid "Some files are being downloaded"
msgstr "Alcuni file sono stati scaricati"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:278
msgid "_Quit Midori"
msgstr "_Chiudi Midori"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:280
msgid "The transfers will be cancelled if Midori quits."
msgstr "I trasferimenti verranno cancellati se Midori viene chiuso"
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Segnalibri"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Impossibile aggiungere il segnalibro: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Impossibile aggiornare il segnalibro: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Modifica il segnalibro selezionato"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Elimina il segnalibro selezionato"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Aggiunge una nuova cartella"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Separatore "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Cerca tra i segnalibri"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Cronologia"
@@ -2226,6 +2050,11 @@ msgstr[1] "%d giorni fa"
msgid "A week ago"
msgstr "Una settimana fa"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Errore nell'eliminazione dell'elemento della cronologia: %s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Cancellare completamente la cronologia?"
@@ -2242,15 +2071,20 @@ msgstr "Elimina l'elemento selezionato dalla cronologia"
msgid "Clear the entire history"
msgstr "Cancella l'intera cronologia"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Cerca nella cronologia"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Trasferimenti"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:435
msgid "Open Destination _Folder"
msgstr "Apri _cartella di destinazione"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:438
msgid "Copy Link Loc_ation"
msgstr "Copia l'indirizzo del colle_gamento"
@@ -2292,54 +2126,62 @@ msgstr "L'icona \"%s\" dello stock non può essere caricata"
msgid "Animation frames are broken"
msgstr "I fotogrammi dell'animazione sono danneggiati"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "La proprietà \"%s\" non è valida per %s"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
-#: ../extensions/addons.c:308
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:309
msgid "Choose file"
msgstr "Selezionare un file"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Selezionare una cartella"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Nessuno"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 ora"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 giorno"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 settimana"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 mese"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 anno"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Preferenze per %s"
-#: ../extensions/adblock.c:473
+#: ../katze/midori-uri.vala:173
+msgid "MD5-Checksum:"
+msgstr "MD5-Checksum:"
+
+#: ../katze/midori-uri.vala:180
+msgid "SHA1-Checksum:"
+msgstr "SHA1-Checksum:"
+
+#: ../extensions/adblock.c:495
msgid "Configure Advertisement filters"
msgstr "Configurazione dei filtri per gli avvisi pubblicitari"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:528
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2349,109 +2191,109 @@ msgstr ""
"testo e fare clic su \"Aggiungi\" per aggiungerlo alla lista. È possibile "
"trovare altre liste su %s."
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:944
msgid "Edit rule"
msgstr "Modifica regola"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:958
msgid "_Rule:"
msgstr "_Regola:"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:1012
msgid "Bl_ock image"
msgstr "Bl_occa immagine"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:1017
msgid "Bl_ock link"
msgstr "Bl_occa collegamento"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1915
msgid "Advertisement blocker"
msgstr "Blocca avvisi pubblicitari"
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1916
msgid "Block advertisements according to a filter list"
msgstr "Blocca gli avvisi pubblicitari in accordo alla lista dei filtri"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
+#: ../extensions/addons.c:222
msgid "This page appears to contain a user script. Do you wish to install it?"
msgstr "La pagina sembra contenere uno script utente. Si desidera installarlo?"
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
msgid "_Install user script"
msgstr "_Installa script utente"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
msgid "This page appears to contain a user style. Do you wish to install it?"
msgstr "La pagina sembra contenere uno stile utente. Si desidera installarlo?"
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
msgid "_Install user style"
msgstr "_Installa stile utente"
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
msgid "Don't install"
msgstr "Non installare"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:320 ../extensions/addons.c:675
msgid "Userscripts"
msgstr "Script dell'utente"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:325 ../extensions/addons.c:677
msgid "Userstyles"
msgstr "Stili dell'utente"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:371 ../extensions/addons.c:450
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Errore"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:412
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Cancellare \"%s\"?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:418
msgid "Delete user script"
msgstr "Elimina script dell'utente"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:419
msgid "Delete user style"
msgstr "Elimina stile utente"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:422
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Il file «%s » verrà eliminato definitivamente."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:564 ../extensions/addons.c:641
msgid "Open in Text Editor"
msgstr "Apre nell'editor di testo"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:566 ../extensions/addons.c:650
msgid "Open Target Folder"
msgstr "Apri cartella di destinazione"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:632
msgid "Add new addon"
msgstr "Aggiunge nuovo addon"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:658
msgid "Remove selected addon"
msgstr "Rimuove l'addon selezionato"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1687 ../extensions/addons.c:1905
msgid "User addons"
msgstr "Estensioni utente"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1817
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Impossibile monitorare la cartella «%s»: %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1906
msgid "Support for userscripts and userstyles"
msgstr "Supporto per script utente e stili utente"
@@ -2538,29 +2380,21 @@ msgstr ""
"Dominio : %s\n"
"Cookie : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Nome"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "_Espandi tutto"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "_Riduci tutto"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filtro:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Inserisci una stringa filtro per mostrare i soli cookie il cui nome o "
-"dominio corrisponda a quello del filtro inserito"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Cerca i cookie per nome o dominio"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2773,11 +2607,11 @@ msgstr "Visualizza scheda in secondo piano (lista cronologia)"
msgid "Display the current selected tab in background"
msgstr "Visualizza la scheda selezionata in secondo piano"
-#: ../extensions/history-list.vala:569
+#: ../extensions/history-list.vala:566
msgid "History List"
msgstr "Lista cronologia"
-#: ../extensions/history-list.vala:570
+#: ../extensions/history-list.vala:567
msgid "Move to the last used tab when switching or closing tabs"
msgstr ""
"Va all'ultima scheda utilizzata quando si cambia o si chiude una scheda"
@@ -2818,37 +2652,37 @@ msgstr "Orologio della barra di stato"
msgid "Display date and time in the statusbar"
msgstr "Mostra la data e l'ora nella barra di stato"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Immagini"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Script"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Plugin di Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Proprietà della barra di stato"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr ""
"Permette di attivare o disattivare facilmente determinate funzionalità sulle "
"pagine internet"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Pannello a scheda"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "Pannello _a scheda"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Mostra le schede in un pannello verticale"
@@ -2860,11 +2694,11 @@ msgstr "Solo icone sulle schede"
msgid "New tabs have no label by default"
msgstr "Le nuove schede non hanno alcuna etichetta di default"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Personalizza la barra degli strumenti"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2872,35 +2706,296 @@ msgstr ""
"Selezionare gli oggetti da visualizzare nella barra degli strumenti. Gli "
"oggetti possono essere riordinati tramite trascinamento."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Oggetti disponibili"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Oggetti visualizzati"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
msgstr "Personalizza barra degli s_trumenti..."
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Personalizza..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Editor della barra degli strumenti"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr ""
"Permette di modificare facilmente la disposizione della barra degli strumenti"
-#: ../extensions/web-cache.c:463
+#: ../extensions/web-cache.c:462
msgid "Cache HTTP communication on disk"
msgstr "Memorizza la comunicazione HTTP sul disco"
+#~ msgid "_Bookmark"
+#~ msgstr "S_egnalibro"
+
+#~ msgid "_Console"
+#~ msgstr "_Console"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Livello principale"
+
+#~ msgid "_Title:"
+#~ msgstr "_Titolo:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Cartella:"
+
+#~ msgid "Remember last window size"
+#~ msgstr "Ricorda la dimensione dell'ultima finestra"
+
+#~ msgid "Whether to save the last window size"
+#~ msgstr ""
+#~ "Abilitare questa opzione per salvare le dimensioni dell'ultima finestra"
+
+#~ msgid "Last window width"
+#~ msgstr "Larghezza dell'ultima finestra"
+
+#~ msgid "The last saved window width"
+#~ msgstr "L'ultima larghezza salvata per la finestra"
+
+#~ msgid "Last window height"
+#~ msgstr "Altezza dell'ultima finestra"
+
+#~ msgid "The last saved window height"
+#~ msgstr "L'ultima altezza salvata per la finestra"
+
+#~ msgid "Last panel position"
+#~ msgstr "Posizione del pannello"
+
+#~ msgid "The last saved panel position"
+#~ msgstr "L'ultima posizione salvata per il pannello"
+
+#~ msgid "Last panel page"
+#~ msgstr "Pagina dell'ultimo pannello"
+
+#~ msgid "The last saved panel page"
+#~ msgstr "L'ultima pagina salvata per il pannello"
+
+#~ msgid "Last Web search"
+#~ msgstr "Ultima ricerca web"
+
+#~ msgid "The last saved Web search"
+#~ msgstr "L'ultima ricerca web salvata"
+
+#~ msgid "Show Menubar"
+#~ msgstr "Mostra barra dei menu"
+
+#~ msgid "Whether to show the menubar"
+#~ msgstr "Abilitare questa opzione per mostrare la barra dei menu"
+
+#~ msgid "Show Navigationbar"
+#~ msgstr "Mostra barra di navigazione"
+
+#~ msgid "Whether to show the navigationbar"
+#~ msgstr "Abilitare questa opzione per mostrare la barra di navigazione"
+
+#~ msgid "Show Bookmarkbar"
+#~ msgstr "Mostra barra dei segnalibri"
+
+#~ msgid "Whether to show the bookmarkbar"
+#~ msgstr "Abilitare questa opzione per mostrare la barra dei segnalibri"
+
+#~ msgid "Show Panel"
+#~ msgstr "Mostra pannello"
+
+#~ msgid "Whether to show the panel"
+#~ msgstr "Abilitare questa opzione per mostrare il pannello"
+
+#~ msgid "Show Statusbar"
+#~ msgstr "Mostra barra di stato"
+
+#~ msgid "Whether to show the statusbar"
+#~ msgstr "Abilitare questa opzione per mostrare la barra di stato"
+
+#~ msgid "Toolbar Items"
+#~ msgstr "Elementi barra degli strumenti"
+
+#~ msgid "The items to show on the toolbar"
+#~ msgstr "Indicare gli elementi da mostrare nella barra degli strumenti"
+
+#~ msgid "Compact Sidepanel"
+#~ msgstr "Pannello compatto"
+
+#~ msgid "Whether to make the sidepanel compact"
+#~ msgstr ""
+#~ "Abilitare questa opzione per la visualizzazione compatta del pannello"
+
+#~ msgid "Align sidepanel on the right"
+#~ msgstr "Allinea a destra il pannello laterale"
+
+#~ msgid "Whether to align the sidepanel on the right"
+#~ msgstr ""
+#~ "Abilitare questa opzione per allineare il pannello laterale a destra"
+
+#~ msgid "Open panels in separate windows"
+#~ msgstr "Apri i pannelli in finestre separate"
+
+#~ msgid "Whether to always open panels in separate windows"
+#~ msgstr ""
+#~ "Abilitare questa opzione per aprire sempre i pannelli in finestre separate"
+
+#~ msgid "What to do when Midori starts"
+#~ msgstr "Cosa fare all'avvio di Midori"
+
+#~ msgid "The homepage"
+#~ msgstr "La pagina iniziale"
+
+#~ msgid "Show crash dialog"
+#~ msgstr "Mostra finestra di errore"
+
+#~ msgid "The folder downloaded files are saved to"
+#~ msgstr "Scegliere la cartella dove devono essere salvati i file scaricati"
+
+#~ msgid "An external text editor"
+#~ msgstr "Inserire un editor di testo esterno"
+
+#~ msgid "An external news aggregator"
+#~ msgstr "Aggregatore di notizie esterno"
+
+#~ msgid "Location entry Search"
+#~ msgstr "Motore di ricerca predefinito"
+
+#~ msgid "The search to perform inside the location entry"
+#~ msgstr ""
+#~ "Inserire il motore di ricerca predefinito da utilizzare dalla barra degli "
+#~ "indirizzi"
+
+#~ msgid "The preferred character encoding"
+#~ msgstr "Scegliere la codifica dei caratteri preferita"
+
+#~ msgid "Always show the tabbar"
+#~ msgstr ""
+#~ "Abilitare questa opzione per mostrare sempre le etichette delle schede"
+
+#~ msgid "Whether tabs have close buttons"
+#~ msgstr ""
+#~ "Abilitare questa opzione per visualizzare il pulsante di chiusura nelle "
+#~ "schede"
+
+#~ msgid "Where to open new pages"
+#~ msgstr "Scegliere dove aprire le nuove pagine"
+
+#~ msgid "Whether to open new tabs in the background"
+#~ msgstr "Abilitare questa opzione per aprire le nuove schede sullo sfondo"
+
+#~ msgid "Open popups in tabs"
+#~ msgstr "Apri popup in schede"
+
+#~ msgid "Whether to open popup windows in tabs"
+#~ msgstr "Abilitare questa opzione per aprire le finestre popup in schede"
+
+#~ msgid "Load and display images automatically"
+#~ msgstr ""
+#~ "Abilitare questa opzione per caricare e visualizzare automaticamente le "
+#~ "immagini"
+
+#~ msgid "Enable embedded scripting languages"
+#~ msgstr ""
+#~ "Abilitare questa opzione per attivare i linguaggi di scripting integrati"
+
+#~ msgid "Enable embedded Netscape plugin objects"
+#~ msgstr ""
+#~ "Abilitare questa opzione per attivare gli oggetti integrati con i plugin "
+#~ "di Netscape"
+
+#~ msgid "Enable spell checking while typing"
+#~ msgstr ""
+#~ "Abilita questa opzione per attivare il controllo ortografico durante la "
+#~ "digitazione"
+
+#~ msgid "Enable HTML5 database support"
+#~ msgstr "Abilita il supporto al database HTML5"
+
+#~ msgid "Whether to enable HTML5 database support"
+#~ msgstr "Abilitare questa opzione per attivare il supporto al database HTML5"
+
+#~ msgid "Whether to enable HTML5 local storage support"
+#~ msgstr ""
+#~ "Abilitare questa opzione per attivare il supporto allo storage locale "
+#~ "HTML5"
+
+#~ msgid "Whether to enable offline web application cache"
+#~ msgstr ""
+#~ "Abilitare questa opzione per attivare la cache delle applicazioni web "
+#~ "quando offline"
+
+#~ msgid "Flash the browser window if a new tab was opened in the background"
+#~ msgstr ""
+#~ "Lampeggia la finestra del browser se viene aperta una nuova scheda in "
+#~ "secondo piano"
+
+#~ msgid "Allow websites to use OpenGL rendering"
+#~ msgstr "Permette ai siti internet di utilizzare la visualizzazione OpenGL"
+
+#~ msgid "Whether to zoom text and images"
+#~ msgstr "Abilitare questa opzione per ingrandire il testo e le immagini"
+
+#~ msgid "Find inline while typing"
+#~ msgstr "Cerca nella pagina durante la digitazione"
+
+#~ msgid "Whether to automatically find inline while typing"
+#~ msgstr ""
+#~ "Abilitare questa opzione per cercare automaticamente nella pagina durante "
+#~ "la digitazione"
+
+#~ msgid "The type of proxy server to use"
+#~ msgstr "Il tipo di server proxy da usare"
+
+#~ msgid "HTTP Proxy Server"
+#~ msgstr "Server proxy HTTP"
+
+#~ msgid "The proxy server used for HTTP connections"
+#~ msgstr "Il server proxy usato per le connessioni HTTP"
+
+#~ msgid "The proxy server port used for HTTP connections"
+#~ msgstr "La porta per il server proxy usato per le connessioni HTTP"
+
+#~ msgid "Identification string"
+#~ msgstr "Stringa di identificazione"
+
+#~ msgid "The application identification string"
+#~ msgstr "Inserire la stringa di identificazione dell'applicazione"
+
+#~ msgid "Clear private data"
+#~ msgstr "Cancella i dati personali"
+
+#~ msgid "The private data selected for deletion"
+#~ msgstr "Dati privati selezionati per la cancellazione"
+
+#~ msgid "Clear data"
+#~ msgstr "Cancella i dati"
+
+#~ msgid "The data selected for deletion"
+#~ msgstr "I dati selezionati per la cancellazione"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Chiudi le altre sc_hede"
+
+#~ msgid "_Icon:"
+#~ msgstr "I_cona:"
+
+#~ msgid "Filter:"
+#~ msgstr "Filtro:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Inserisci una stringa filtro per mostrare i soli cookie il cui nome o "
+#~ "dominio corrisponda a quello del filtro inserito"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Personalizza…"
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "I segnalibri non possono essere salvati. %s"
+
#~ msgid "The specified configuration folder is invalid."
#~ msgstr "La cartella di configurazione specificata non è valida."
@@ -3003,15 +3098,15 @@ msgstr "Memorizza la comunicazione HTTP sul disco"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Aggiunge un nuova cartella di preferiti"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Aggiunge, modifica e elimina motori di ricerca..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Aggiunge, modifica e elimina motori di ricerca…"
-#~ msgid "Clear private data..."
-#~ msgstr "Rimozione dati privati..."
+#~ msgid "Clear private data…"
+#~ msgstr "Rimozione dati privati…"
-#~ msgid "Inspect page details and access developer tools..."
+#~ msgid "Inspect page details and access developer tools…"
#~ msgstr ""
-#~ "Vedi i dettagli della pagina ed accedi agli strumenti per sviluppatori..."
+#~ "Vedi i dettagli della pagina ed accedi agli strumenti per sviluppatori…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Passa alla scheda precedente"
@@ -3067,12 +3162,6 @@ msgstr "Memorizza la comunicazione HTTP sul disco"
#~ msgid "Show statusbar"
#~ msgstr "Mostra la barra di stato"
-#~ msgid "MD5-Checksum:"
-#~ msgstr "MD5-Checksum:"
-
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "SHA1-Checksum:"
-
#~ msgid "Set number of columns and rows"
#~ msgstr "Imposta il numero di righe e colonne"
@@ -3109,8 +3198,8 @@ msgstr "Memorizza la comunicazione HTTP sul disco"
#~ msgid "Enforce a video dot density of 96 DPI"
#~ msgstr "Abilitare questa opzione per forzare la densità dei punti a 96 DPI"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Configura i filtri per gli av_visi pubblicitari..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Configura i filtri per gli av_visi pubblicitari…"
#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
#~ msgstr "Scorre tra le schede con i tasti Ctrl+Tab in ordine di utilizzo"
@@ -3467,12 +3556,6 @@ msgstr "Memorizza la comunicazione HTTP sul disco"
#~ msgid "Warning: You are using a superuser account!"
#~ msgstr "Attenzione: si sta eseguendo l'applicazione come amministratore."
-#~ msgid "User_styles"
-#~ msgstr "_Stili dell'utente"
-
-#~ msgid "_Enable"
-#~ msgstr "_Abilita"
-
#~ msgid "Enable"
#~ msgstr "Abilita"
diff --git a/po/ja.po b/po/ja.po
index f998d826..9eb32205 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,24 +1,24 @@
# Japanese translations for midori package.
# Copyright (C) 2008-2012 THE midori'S COPYRIGHT HOLDER
# This file is distributed under the same license as the midori package.
-# Masato Hashimoto 2008-2012
+# Masato Hashimoto , 2008-2012.
#
msgid ""
msgstr ""
"Project-Id-Version: Midori 0.1.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-22 16:34+0900\n"
-"PO-Revision-Date: 2012-04-25 20:31+0900\n"
+"POT-Creation-Date: 2012-09-12 21:43+0900\n"
+"PO-Revision-Date: 2012-09-12 21:41+0900\n"
"Last-Translator: Masato Hashimoto \n"
-"Language-Team: Japanese \n"
+"Language-Team: Japanese \n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../data/midori.desktop.in.h:1 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:1 ../midori/main.c:1922 ../midori/main.c:1946
+#: ../midori/main.c:1960 ../midori/midori-websettings.c:200
msgid "Midori"
msgstr "Midori"
@@ -27,18 +27,34 @@ msgid "Web Browser"
msgstr "ウェブブラウザー"
#: ../data/midori.desktop.in.h:3
+msgid "Midori Web Browser"
+msgstr "Midori ウェブブラウザー"
+
+#: ../data/midori.desktop.in.h:4
msgid "Browse the Web"
msgstr "ウェブを閲覧します"
-#: ../data/midori.desktop.in.h:4
+#: ../data/midori.desktop.in.h:5
msgid "Internet;WWW;Explorer"
msgstr "インターネット;WWW;エクスプローラー"
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1325
+msgid "New Tab"
+msgstr "新しいタブ"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1322
+msgid "New Window"
+msgstr "新しいウィンドウ"
+
+#: ../data/midori.desktop.in.h:8
+msgid "New Private Browsing Window"
+msgstr "新しいプライベートブラウジングウィンドウ"
+
#: ../data/midori-private.desktop.in.h:1
msgid "Midori Private Browsing"
msgstr "Midori プライベートブラウジング"
-#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:4164
+#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:4349
msgid "Private Browsing"
msgstr "プライベートブラウジング"
@@ -46,78 +62,84 @@ msgstr "プライベートブラウジング"
msgid "Open a new private browsing window"
msgstr "新しいプライベートブラウジングウィンドウを開きます"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "設定を読み込めませんでした: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "'%s' は %s の値として無効です"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "無効な設定値 '%s'"
-#: ../midori/main.c:380
+#: ../midori/main.c:365
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "検索エンジンを読み込めませんでした。%s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:419
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "履歴のクリアに失敗しました: %s\n"
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "データベースのオープンに失敗しました: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:513
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "古い履歴アイテムの削除に失敗しました: %s\n"
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "履歴アイテムの削除に失敗しました: %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "ブックマークを保存できませんでした。%s"
-
-#: ../midori/main.c:633
+#: ../midori/main.c:535
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "設定を保存できませんでした。%s"
-#: ../midori/main.c:668
+#: ../midori/main.c:561
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "検索エンジンを保存できませんでした。%s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:598
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "ゴミ箱を保存できませんでした。%s"
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
+#: ../midori/main.c:671 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "エクステンション"
-#: ../midori/main.c:760
+#: ../midori/main.c:685
msgid "Privacy"
msgstr "プライバシー"
-#: ../midori/main.c:772
+#: ../midori/main.c:687
+msgid "Delete old Cookies after:"
+msgstr "古い Cookie を削除:"
+
+# tooltip
+#: ../midori/main.c:689 ../midori/main.c:692
+msgid "The maximum number of days to save cookies for"
+msgstr "Cookie を保存する最大日数です"
+
+#: ../midori/main.c:696
+msgid "Only accept Cookies from sites you visit"
+msgstr "訪問したウェブサイトからの Cookie のみ受け入れる"
+
+#: ../midori/main.c:697
+msgid "Block cookies sent by third-party websites"
+msgstr "サードパーティウェブサイトから送られた Cookie はブロックします"
+
+#: ../midori/main.c:702
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -125,17 +147,44 @@ msgstr ""
"Cookie には、ログインデータやゲームデータ、広告用のユーザープロファイルなどが"
"格納されます。"
-#: ../midori/main.c:828
+#: ../midori/main.c:709
+msgid "Enable offline web application cache"
+msgstr "オフラインウェブアプリケーションキャッシュを有効にする"
+
+#: ../midori/main.c:712
+msgid "Enable HTML5 local storage support"
+msgstr "HTML5 ローカルストレージサポートを有効にする"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/main.c:716
+msgid "Strip referrer details sent to websites"
+msgstr "外部サイトへ送るリファラーの詳細情報を除去する"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/main.c:718
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "\"Referer\" ヘッダーはホスト名に短縮されます"
+
+#: ../midori/main.c:721
+msgid "Delete pages from history after:"
+msgstr "履歴から古いページを削除:"
+
+# tooltip
+#: ../midori/main.c:723 ../midori/main.c:726
+msgid "The maximum number of days to save the history for"
+msgstr "履歴を保存する最大日数です"
+
+#: ../midori/main.c:767
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "セッションは保存できませんでした。%s"
-#: ../midori/main.c:1046
+#: ../midori/main.c:989
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr "ルート証明書が利用できません。SSL 認証書を照合できませんでした。"
-#: ../midori/main.c:1115
+#: ../midori/main.c:1084
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -143,239 +192,252 @@ msgstr ""
"Midori は最後に開いた時にクラッシュしたようです。もしこれが繰り返し発生するよ"
"うであれば、問題解決のために以下のオプションのいずれかを試してみてください。"
-#: ../midori/main.c:1134
+#: ../midori/main.c:1103
msgid "Modify _preferences"
msgstr "設定を変更する(_P)"
-#: ../midori/main.c:1138
+#: ../midori/main.c:1107
msgid "Disable all _extensions"
msgstr "すべてのエクステンションを無効にする(_E)"
-#: ../midori/main.c:1151
+# tooltip
+#: ../midori/main.c:1116
+msgid "Show a dialog after Midori crashed"
+msgstr "Midori がクラッシュした後の起動時にダイアログを表示します"
+
+#: ../midori/main.c:1121
msgid "Discard old tabs"
msgstr "以前のタブを破棄"
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1122 ../midori/midori-websettings.c:108
msgid "Show last tabs without loading"
msgstr "最後のタブを読み込まずに表示"
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1123 ../midori/midori-websettings.c:107
msgid "Show last open tabs"
msgstr "最後に開いたタブを表示"
-#: ../midori/main.c:1400 ../midori/main.c:2464
+#: ../midori/main.c:1370 ../midori/main.c:2382
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "セッションを読み込めませんでした: %s\n"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1508
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "スナップショットを取得しました: %s\n"
# CLI --help
-#: ../midori/main.c:1951
+#: ../midori/main.c:1837
msgid "Run ADDRESS as a web application"
msgstr "ADDRESS をウェブアプリケーションとして実行する"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1837
msgid "ADDRESS"
msgstr "ADDRESS"
# CLI --help
-#: ../midori/main.c:1954
+#: ../midori/main.c:1840
msgid "Use FOLDER as configuration folder"
msgstr "設定フォルダーとして FOLDER を使用する"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1840
msgid "FOLDER"
msgstr "FOLDER"
# CLI --help
-#: ../midori/main.c:1957
+#: ../midori/main.c:1843
msgid "Private browsing, no changes are saved"
msgstr "プライベートブラウジングで変更を保存しない"
-#: ../midori/main.c:1959
+# CLI --help
+#: ../midori/main.c:1846
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "ポータブルモード。すべてのランタイムファイルを 1 箇所に格納する"
+
+# CLI --help
+#: ../midori/main.c:1849
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "GtkLauncher と同種の、WebKit を使用したプレーン GTK+ ウィンドウ"
+
+# CLI --help
+#: ../midori/main.c:1851
msgid "Show a diagnostic dialog"
msgstr "診断ダイアログを表示する"
# CLI --help
-#: ../midori/main.c:1961
+#: ../midori/main.c:1853
msgid "Run the specified filename as javascript"
msgstr "指定されたファイル名を javascript として実行する"
# CLI --help
-#: ../midori/main.c:1963
+#: ../midori/main.c:1855
msgid "Take a snapshot of the specified URI"
msgstr "指定された URI のスナップショットを取得する"
# CLI --help
-#: ../midori/main.c:1965
+#: ../midori/main.c:1857
msgid "Execute the specified command"
msgstr "指定されたコマンドを実行する"
# CLI help
-#: ../midori/main.c:1967
+#: ../midori/main.c:1859
msgid "List available commands to execute with -e/ --execute"
msgstr "-e/ --execute で実行できるコマンドの一覧を表示する"
# CLI --help
-#: ../midori/main.c:1969
+#: ../midori/main.c:1861
msgid "Display program version"
msgstr "プログラムのバージョンを表示する"
-#: ../midori/main.c:1971
+#: ../midori/main.c:1863
msgid "Addresses"
msgstr "アドレス"
# CLI --help
-#: ../midori/main.c:1973
+#: ../midori/main.c:1865
msgid "Block URIs according to regular expression PATTERN"
msgstr "正規表現 PATTERN に従って URI をブロックする"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1865
msgid "PATTERN"
msgstr "PATTERN"
# CLI --help
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:1869
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "非アクティブになって SECONDS 秒後に Midori をリセットする"
-#: ../midori/main.c:1977
+#: ../midori/main.c:1869
msgid "SECONDS"
msgstr "SECONDS"
# CLI --help
-#: ../midori/main.c:1980
+#: ../midori/main.c:1872
msgid "Redirects console warnings to the specified FILENAME"
msgstr "コンソール警告を指定された FILENAME にリダイレクトする"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1872
msgid "FILENAME"
msgstr "FILENAME"
-#: ../midori/main.c:2045
-msgid "[Addresses]"
-msgstr "[アドレス]"
-
-#: ../midori/main.c:2087
+#: ../midori/main.c:1961
msgid "Please report comments, suggestions and bugs to:"
msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:"
-#: ../midori/main.c:2089
+#: ../midori/main.c:1963
msgid "Check for new versions at:"
msgstr "新しいバージョンのチェックはこちら:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
+#: ../midori/main.c:2102
msgid "Saved logins and _passwords"
msgstr "ログインおよびパスワード情報(_P)"
-#: ../midori/main.c:2175
+#: ../midori/main.c:2104
msgid "Cookies and Website data"
msgstr "Cookie およびウェブサイトデータ"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
+#: ../midori/main.c:2108 ../midori/midori-preferences.c:505
+#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470
msgid "Web Cache"
msgstr "ウェブキャッシュ"
-#: ../midori/main.c:2182
+#: ../midori/main.c:2111
msgid "Website icons"
msgstr "ウェブサイトアイコン"
-#: ../midori/main.c:2288
+#: ../midori/main.c:2215
msgid "An unknown error occured"
msgstr "未知のエラーが発生しました"
-#: ../midori/main.c:2395
+#: ../midori/main.c:2330
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n"
-#: ../midori/main.c:2431
+#: ../midori/main.c:2364
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "ブックマークを読み込めませんでした: %s\n"
-#: ../midori/main.c:2479
+#: ../midori/main.c:2397
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "ゴミ箱を読み込めませんでした: %s\n"
-#: ../midori/main.c:2492
+#: ../midori/main.c:2410
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "履歴を読み込めませんでした: %s\n"
-#: ../midori/main.c:2508
+#: ../midori/main.c:2425
msgid "The following errors occured:"
msgstr "次のエラーが発生しました:"
-#: ../midori/main.c:2524
+#: ../midori/main.c:2441
msgid "_Ignore"
msgstr "無視(_I)"
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "ブックマーク(_B)"
+#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:533
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "'%s' は想定外のアクションです。"
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060
+#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6224
msgid "_Bookmarks"
msgstr "ブックマーク(_B)"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1373
msgid "Add Boo_kmark"
msgstr "ブックマークに追加(_K)"
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "コンソール(_C)"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1374
msgid "_Extensions"
msgstr "エクステンション(_E)"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589
+#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4677
msgid "_History"
msgstr "履歴(_H)"
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "ホームページ(_H)"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1376
msgid "_Userscripts"
msgstr "ユーザースクリプト(_U)"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1377
+msgid "User_styles"
+msgstr "ユーザースタイル(_S)"
+
+#: ../midori/midori-app.c:1378
msgid "New _Tab"
msgstr "新しいタブ(_T)"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1379
msgid "_Transfers"
msgstr "転送(_T)"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1380
msgid "Netscape p_lugins"
msgstr "Netscape プラグイン(_L)"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1381
msgid "_Closed Tabs"
msgstr "閉じたタブ(_C)"
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216
+#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5360
msgid "New _Window"
msgstr "新しいウィンドウ(_W)"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1383
msgid "New _Folder"
msgstr "新しいフォルダー(_F)"
+#: ../midori/midori-app.c:1437
+msgid "[Addresses]"
+msgstr "[アドレス]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "ファイルが見つかりません。"
@@ -393,140 +455,115 @@ msgstr "認識できないブックマーク形式です。"
msgid "Writing failed."
msgstr "書き込みに失敗しました。"
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298
-#: ../midori/midori-browser.c:5307
+# tooltip
+#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5499
+msgid "Go forward to the next page"
+msgstr "次のページへ進みます"
+
+# tooltip
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:353 ../midori/midori-browser.c:5507
+#: ../midori/midori-browser.c:5510
+msgid "Go to the next sub-page"
+msgstr "次のサブページへ進みます"
+
+#: ../midori/midori-browser.c:440 ../midori/midori-browser.c:5448
+#: ../midori/midori-browser.c:5457
msgid "Reload the current page"
msgstr "現在のページを再読み込みします"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:448 ../midori/midori-browser.c:5454
msgid "Stop loading the current page"
msgstr "現在のページの読み込みを中止します"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:518
#, c-format
msgid "Failed to update title: %s\n"
msgstr "タイトルの更新に失敗しました: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "'%s' は想定外のアクションです。"
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:613
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (プライベートブラウジング)"
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "トップレベルフォルダー"
+#: ../midori/midori-browser.c:723 ../midori/midori-browser.c:765
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "ブックマーク"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:825
msgid "New folder"
msgstr "新しいフォルダー"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:825
msgid "Edit folder"
msgstr "フォルダーの編集"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:827
msgid "New bookmark"
msgstr "新しいブックマーク"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:827
msgid "Edit bookmark"
msgstr "ブックマークの編集"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "タイトル(_T):"
+#: ../midori/midori-browser.c:861
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "このブックマークの名前のと追加先を指定してください。"
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "アドレス(_A):"
-
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326
-msgid "_Folder:"
-msgstr "フォルダー(_F):"
-
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:922
msgid "Add to _Speed Dial"
msgstr "スピードダイアルに追加(_S)"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:928
msgid "Show in the tool_bar"
msgstr "ツールバーに表示する(_B)"
-#: ../midori/midori-browser.c:905
+#: ../midori/midori-browser.c:936
msgid "Run as _web application"
msgstr "ウェブアプリケーションとして実行する(_W)"
-#: ../midori/midori-browser.c:976
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "ファイル \"%s\" をこのフォルダーに保存することはできません。"
-
-#: ../midori/midori-browser.c:978
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "この場所への書き込み権がありません。"
-
-#: ../midori/midori-browser.c:985
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "\"%s\" をダウンロードする十分な空きスペースがありません。"
-
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "ファイルのダウンロードには %s 必要ですが、%s しか空きがありません。"
-
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:1054 ../midori/midori-browser.c:4481
msgid "Save file as"
msgstr "名前を付けて保存"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "新しいウィンドウ"
+#: ../midori/midori-browser.c:1064
+msgid "Save associated _resources"
+msgstr "関連リソースも保存する(_R)"
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1322
msgid "A new window has been opened"
msgstr "新しいウィンドウが開かれました"
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "新しいタブ"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1325
msgid "A new tab has been opened"
msgstr "新しいタブが開かれました"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1342
msgid "Error opening the image!"
msgstr "画像を開く際にエラーが発生しました"
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1343
msgid "Can not open selected image in a default viewer."
msgstr "デフォルトの画像ビューアーでは選択された画像を開けません。"
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1349
msgid "Error downloading the image!"
msgstr "画像をダウンロードする際にエラーが発生しました"
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1350
msgid "Can not download selected image."
msgstr "選択された画像をダウンロードできません。"
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1407
msgid "Save file"
msgstr "ファイルの保存"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2312
msgid "Open file"
msgstr "ファイルを開く"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2444
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -539,143 +576,159 @@ msgstr ""
"もしくは Midori の設定のアプリケーションタブでフィードリーダーを指定してくだ"
"さい。次にニュースフィードアイコンをクリックした時に自動的に追加されます。"
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2450 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "新しいフィード"
# tooltip
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2493 ../midori/midori-browser.c:5523
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "新しいブックマークを追加します"
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3037 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "空です"
-#: ../midori/midori-browser.c:3467
+#: ../midori/midori-browser.c:3483 ../midori/midori-browser.c:3484
msgid "Toggle text cursor navigation"
-msgstr "テキストカーソルでのナビゲーションに切り替えます"
+msgstr "テキストカーソルナビゲーションへの切り替え"
-#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753
+#: ../midori/midori-browser.c:3486
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"F7 キーでキャレットブラウジングに切り替えます。有効にすると、テキストカーソル"
+"がすべてのウェブサイト上に表示されます。"
+
+#: ../midori/midori-browser.c:3489
+msgid "_Enable Caret Browsing"
+msgstr "キャレットブラウジングを有効にする(_E)"
+
+#: ../midori/midori-browser.c:3881 ../midori/midori-browser.c:5917
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "新規履歴アイテムの挿入に失敗しました: %s\n"
-#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "タブですべて開く(_T)"
-#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "新しいタブで開く(_T)"
-#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657
-#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2952
+#: ../midori/midori-view.c:4922 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "新しいウィンドウで開く(_W)"
-#: ../midori/midori-browser.c:4213
+#: ../midori/midori-browser.c:4306
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4214
+#: ../midori/midori-browser.c:4307
msgid "Kazehakase"
msgstr "風博士"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4308
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4309
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4310
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4311
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4239
-msgid "Import bookmarks..."
-msgstr "ブックマークのインポート..."
+#: ../midori/midori-browser.c:4312
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:4333
+msgid "Import bookmarks…"
+msgstr "ブックマークのインポート…"
+
+#: ../midori/midori-browser.c:4336 ../midori/midori-browser.c:5528
msgid "_Import bookmarks"
msgstr "ブックマークのインポート(_I)"
-#: ../midori/midori-browser.c:4253
+#: ../midori/midori-browser.c:4347
msgid "_Application:"
msgstr "アプリケーション(_A):"
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4412
msgid "Import from XBEL or HTML file"
msgstr "XBEL または HTML ファイルからインポート"
-#: ../midori/midori-browser.c:4353
+#: ../midori/midori-browser.c:4440
msgid "Import from a file"
msgstr "ファイルからインポート"
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4452
msgid "Failed to import bookmarks"
msgstr "ブックマークのインポートに失敗しました"
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4486
msgid "XBEL Bookmarks"
msgstr "XBEL ブックマーク"
-#: ../midori/midori-browser.c:4405
+#: ../midori/midori-browser.c:4491
msgid "Netscape Bookmarks"
msgstr "Netscape ブックマーク"
-#: ../midori/midori-browser.c:4419
+#: ../midori/midori-browser.c:4505
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr ""
"Midori は XBEL (*.xbel) および Netscape (*.html) へのみエクスポートできます"
-#: ../midori/midori-browser.c:4434
+#: ../midori/midori-browser.c:4520
msgid "Failed to export bookmarks"
msgstr "ブックマークのエクスポートに失敗しました"
# Dialog title
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4556
+#: ../midori/midori-browser.c:4642
msgid "Clear Private Data"
msgstr "プライベートデータのクリア"
# Button label
-#: ../midori/midori-browser.c:4560
+#: ../midori/midori-browser.c:4646
msgid "_Clear private data"
msgstr "プライベートデータのクリア(_C)"
-#: ../midori/midori-browser.c:4573
+#: ../midori/midori-browser.c:4661
msgid "Clear the following data:"
msgstr "以下のデータをクリアします:"
-#: ../midori/midori-browser.c:4583
+#: ../midori/midori-browser.c:4671
msgid "Last open _tabs"
msgstr "最後に開いたタブ(_T)"
-#: ../midori/midori-browser.c:4609
+#: ../midori/midori-browser.c:4697
msgid "Clear private data when _quitting Midori"
msgstr "Midori 終了時にプライベートデータをクリアする(_Q)"
-#: ../midori/midori-browser.c:4804
+#: ../midori/midori-browser.c:4912
msgid "A lightweight web browser."
msgstr "軽快なウェブブラウザー"
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:4913
msgid "See about:version for version info."
msgstr "バージョン情報は about:version をご覧ください。"
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:4915
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -686,990 +739,625 @@ msgstr ""
"団が発行する GNU 劣等一般公衆利用許諾契約書バージョン 2.1 あるいはそれ以降の"
"いずれかの版で定める条件下で再配布および/または改変することができます。"
-#: ../midori/midori-browser.c:4828
+#: ../midori/midori-browser.c:4945
msgid "translator-credits"
msgstr "Masato Hashimoto "
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5358
msgid "_File"
msgstr "ファイル(_F)"
# tooltip
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5361
msgid "Open a new window"
msgstr "新しいウィンドウを開きます"
# tooltip
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5364
msgid "Open a new tab"
msgstr "新しいタブを開きます"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5366
msgid "New P_rivate Browsing Window"
msgstr "新しいプライベートブラウジングウィンドウ(_R)"
# tooltip
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5370
msgid "Open a file"
msgstr "ファイルを開きます"
-#: ../midori/midori-browser.c:5228
-msgid "_Save Page As..."
-msgstr "名前を付けてページを保存(_S)"
+#: ../midori/midori-browser.c:5372
+msgid "_Save Page As…"
+msgstr "名前を付けてページを保存(_S)…"
# tooltip
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5373
msgid "Save to a file"
msgstr "ファイルへ保存します"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5375
msgid "Add to Speed _dial"
msgstr "スピードダイアルに追加(_D)"
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5379
msgid "Add Shortcut to the _desktop"
msgstr "デスクトップにショートカットを追加(_D)"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5381
msgid "Create _Launcher"
msgstr "ランチャーの作成(_L)"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5385
msgid "Subscribe to News _feed"
msgstr "ニュースフィードを購読(_F)"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5391
msgid "_Close Tab"
msgstr "タブを閉じる(_C)"
# tooltip
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5392
msgid "Close the current tab"
msgstr "現在のタブを閉じます"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5394
msgid "C_lose Window"
msgstr "ウィンドウを閉じる(_L)"
+#: ../midori/midori-browser.c:5398
+msgid "_Share"
+msgstr "共有(_S)"
+
# tooltip
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5403
msgid "Print the current page"
msgstr "現在のページを印刷します"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5406
msgid "Close a_ll Windows"
msgstr "すべてのウィンドウを閉じる(_L)"
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5409
msgid "_Edit"
msgstr "編集(_E)"
-#: ../midori/midori-browser.c:5282
-msgid "_Find..."
-msgstr "検索(_F)..."
+#: ../midori/midori-browser.c:5432
+msgid "_Find…"
+msgstr "検索(_F)…"
# tooltip
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5433
msgid "Find a word or phrase in the page"
msgstr "ページ内の単語やフレーズを検索します"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5435
msgid "Find _Next"
msgstr "次を検索(_N)"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5438
msgid "Find _Previous"
msgstr "前を検索(_P)"
# tooltip
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5442
msgid "Configure the application preferences"
msgstr "このアプリケーションの設定を行います"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5444
msgid "_View"
msgstr "表示(_V)"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5445
msgid "_Toolbars"
msgstr "ツールバー(_T)"
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5450
msgid "Reload page without caching"
msgstr "ページをキャッシュせずに再読み込み"
# tooltip
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5460
msgid "Increase the zoom level"
msgstr "ズームレベルを大きくします"
# tooltip
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5463
msgid "Decrease the zoom level"
msgstr "ズームレベルを小さくします"
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5467
msgid "_Encoding"
msgstr "エンコーディング(_E)"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5469
msgid "View So_urce"
msgstr "ソースを表示(_U)"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5472
msgid "Ca_ret Browsing"
msgstr "キャレットブラウジング(_R)"
# tooltip
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5476
msgid "Toggle fullscreen view"
msgstr "全画面表示/解除を切り替えます"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5478
msgid "Scroll _Left"
msgstr "左へスクロール(_L)"
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5481
msgid "Scroll _Down"
msgstr "下へスクロール(_D)"
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5484
msgid "Scroll _Up"
msgstr "上へスクロール(_U)"
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5487
msgid "Scroll _Right"
msgstr "右へスクロール(_R)"
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5490
+msgid "_Readable"
+msgstr "読み込み可(_R)"
+
+#: ../midori/midori-browser.c:5493
msgid "_Go"
msgstr "移動(_G)"
# tooltip
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5496
msgid "Go back to the previous page"
msgstr "前のページへ戻ります"
-# tooltip
-#: ../midori/midori-browser.c:5346
-msgid "Go forward to the next page"
-msgstr "次のページへ進みます"
-
# tooltip
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5503
msgid "Go to the previous sub-page"
msgstr "前のサブページへ戻ります"
-# tooltip
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5354
-msgid "Go to the next sub-page"
-msgstr "次のサブページへ進みます"
+#: ../midori/midori-browser.c:5512
+msgid "_Homepage"
+msgstr "ホームページ(_H)"
# tooltip
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5513
msgid "Go to your homepage"
msgstr "ホームページに移動します"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5515
msgid "Empty Trash"
msgstr "ゴミ箱を空にする"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5518
msgid "Undo _Close Tab"
msgstr "閉じたタブを元に戻す(_C)"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5525
msgid "Add a new _folder"
msgstr "新しいフォルダーの追加(_F)"
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5531
msgid "_Export bookmarks"
msgstr "ブックマークのエクスポート(_E)"
-#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5534 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "検索エンジンの管理(_M)"
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5537
msgid "_Clear Private Data"
msgstr "プライベートデータのクリア(_C)"
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5540
msgid "_Inspect Page"
msgstr "ページの調査(_I)"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5544
msgid "_Previous Tab"
msgstr "前のタブ(_P)"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5547
msgid "_Next Tab"
msgstr "次のタブ(_N)"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5549
msgid "Move Tab _Backward"
msgstr "後ろのタブへ移動(_B)"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5551
msgid "_Move Tab Forward"
msgstr "前のタブへ移動(_M)"
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5554
msgid "Focus _Current Tab"
msgstr "現在のタブにフォーカス(_C)"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5557
msgid "Focus _Next view"
msgstr "次のビューをフォーカス(_N)"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5560
msgid "Only show the Icon of the _Current Tab"
msgstr "現在のタブのアイコンのみ表示(_C)"
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5563
msgid "_Duplicate Current Tab"
msgstr "現在のタブの複製(_D)"
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5566
msgid "Close Ot_her Tabs"
msgstr "他のタブを閉じる(_H)"
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5569
msgid "Open last _session"
msgstr "最後のセッションを開く(_S)"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5572
msgid "_Help"
msgstr "ヘルプ(_H)"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5574
msgid "_Frequent Questions"
msgstr "よくある質問(_F)"
-#: ../midori/midori-browser.c:5421
-msgid "_Report a Problem..."
-msgstr "問題を報告(_R)"
+#: ../midori/midori-browser.c:5577
+msgid "_Report a Problem…"
+msgstr "問題を報告(_R)…"
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5582 ../midori/midori-browser.c:6243
+msgid "_Tools"
+msgstr "ツール(_T)"
+
+#: ../midori/midori-browser.c:5589
msgid "_Menubar"
msgstr "メニューバー(_M)"
-#: ../midori/midori-browser.c:5437
+#: ../midori/midori-browser.c:5593
msgid "_Navigationbar"
msgstr "ナビゲーションバー(_N)"
-#: ../midori/midori-browser.c:5441
+#: ../midori/midori-browser.c:5597
msgid "Side_panel"
msgstr "サイドパネル(_P)"
-#: ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:5598
msgid "Sidepanel"
msgstr "サイドパネル"
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5601
msgid "_Bookmarkbar"
msgstr "ブックマークバー(_B)"
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5605
msgid "_Statusbar"
msgstr "ステータスバー(_S)"
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311
+#: ../midori/midori-browser.c:5614 ../midori/midori-websettings.c:199
msgid "_Automatic"
msgstr "自動(_A)"
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "中国語 (BIG5)"
+#: ../midori/midori-browser.c:5617 ../midori/midori-websettings.c:123
+msgid "Chinese Traditional (BIG5)"
+msgstr "中国語繁体字 (BIG5)"
+
+#: ../midori/midori-browser.c:5620 ../midori/midori-websettings.c:124
+msgid "Chinese Simplified (GB18030)"
+msgstr "中国語簡体字 (GB18030)"
#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5465
+#: ../midori/midori-browser.c:5624
msgid "Japanese (SHIFT__JIS)"
msgstr "日本語 (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238
+#: ../midori/midori-browser.c:5627 ../midori/midori-websettings.c:126
msgid "Korean (EUC-KR)"
msgstr "韓国語 (EUC-KR)"
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5630 ../midori/midori-websettings.c:127
msgid "Russian (KOI8-R)"
msgstr "ロシア語 (KOI8-R)"
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5633 ../midori/midori-websettings.c:128
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5636 ../midori/midori-websettings.c:129
msgid "Western (ISO-8859-1)"
msgstr "西欧 (ISO-8859-1)"
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242
-#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "カスタム..."
+#: ../midori/midori-browser.c:5639
+msgid "Custom…"
+msgstr "カスタム…"
-#: ../midori/midori-browser.c:5985
+#: ../midori/midori-browser.c:6149
msgid "_Separator"
msgstr "セパレーター(_S)"
-#: ../midori/midori-browser.c:5992
-msgid "_Location..."
-msgstr "場所(_L)..."
+#: ../midori/midori-browser.c:6156
+msgid "_Location…"
+msgstr "場所(_L)…"
# tooltip
-#: ../midori/midori-browser.c:5994
+#: ../midori/midori-browser.c:6158
msgid "Open a particular location"
msgstr "指定された場所を開きます"
-#: ../midori/midori-browser.c:6016
-msgid "_Web Search..."
-msgstr "ウェブ検索(_W)..."
+#: ../midori/midori-browser.c:6180
+msgid "_Web Search…"
+msgstr "ウェブ検索(_W)…"
# tooltip
-#: ../midori/midori-browser.c:6018
+#: ../midori/midori-browser.c:6182
msgid "Run a web search"
msgstr "ウェブ検索を実行します"
# tooltip
-#: ../midori/midori-browser.c:6045
+#: ../midori/midori-browser.c:6209
msgid "Reopen a previously closed tab or window"
msgstr "これまでに閉じられたタブやウィンドウを再び開きます"
# tooltip
-#: ../midori/midori-browser.c:6062
+#: ../midori/midori-browser.c:6226
msgid "Show the saved bookmarks"
msgstr "ブックマークを表示します"
-#: ../midori/midori-browser.c:6079
-msgid "_Tools"
-msgstr "ツール(_T)"
-
-#: ../midori/midori-browser.c:6095
+#: ../midori/midori-browser.c:6259
msgid "_Window"
msgstr "ウィンドウ(_W)"
# tooltip
-#: ../midori/midori-browser.c:6097
+#: ../midori/midori-browser.c:6261
msgid "Show a list of all open tabs"
msgstr "開いているすべてのタブのリストを表示します"
-#: ../midori/midori-browser.c:6111
+#: ../midori/midori-browser.c:6275
msgid "_Menu"
msgstr "メニュー(_M)"
-#: ../midori/midori-browser.c:6113
+#: ../midori/midori-browser.c:6277
msgid "Menu"
msgstr "メニュー"
-#: ../midori/midori-browser.c:6927
+#: ../midori/midori-browser.c:7107
#, c-format
msgid "Unexpected setting '%s'"
msgstr "'%s' は予想外の設定です"
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:330
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "エクステンション '%s' の設定を読み込めませんでした: %s\n"
-#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
-#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:752 ../midori/midori-extension.c:849
+#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058
+#: ../extensions/addons.c:1686
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "エクステンション '%s' の設定を保存できませんでした: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "%s で検索"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "他の検索エンジンで検索..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "検索…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "履歴からの選択に失敗しました\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "%s を検索"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "証明書のエクスポート"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "未知の署名認証局です。"
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "証明書が、それが回収されたサイトから想定されるものと一致しません。"
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "証明書のアクティベート日時がまだ未来なままです。"
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "証明書は失効しています"
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr "GTlsConnection の証明書失効リストに従いこの証明書は破棄されました。"
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "この証明書のアルゴリズムはセキュアでないと考えられます。"
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "この証明書の認証中にいくつか他のエラーが発生しました。"
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "証明書のエクスポート(_E)"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "自己署名"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "セキュリティ詳細"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "貼り付けて開く(_R)"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "未検証"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "検証済および暗号化接続"
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1989
msgid "Open, unencrypted connection"
msgstr "公開、非暗号化接続"
# tooltip
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "サイドパネルを右側に配置します"
# tooltip
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "パネルを閉じます"
# tooltip
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "サイドパネルを左側に配置します"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:105
msgid "Show Speed Dial"
msgstr "スピードダイアルを表示"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:106
msgid "Show Homepage"
msgstr "ホームページを表示"
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:125
msgid "Japanese (SHIFT_JIS)"
msgstr "日本語 (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "カスタム..."
+
+#: ../midori/midori-websettings.c:145
msgid "New tab"
msgstr "新しいタブ"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:146
msgid "New window"
msgstr "新しいウィンドウ"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:147
msgid "Current tab"
msgstr "現在のタブ"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:162
msgid "Default"
msgstr "デフォルト"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:163
msgid "Icons"
msgstr "アイコン"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:164
msgid "Small icons"
msgstr "小さいアイコン"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:165
msgid "Text"
msgstr "文字"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:166
msgid "Icons and text"
msgstr "アイコンと文字"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:167
msgid "Text beside icons"
msgstr "アイコンと文字 (横方向)"
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:182
msgid "Automatic (GNOME or environment)"
msgstr "自動 (GNOME または環境変数)"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:183
msgid "HTTP proxy server"
msgstr "HTTP プロキシサーバー"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:184
msgid "No proxy server"
msgstr "プロキシサーバーなし"
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:201
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:202
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:203
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:204
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:205
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:400
-msgid "Remember last window size"
-msgstr "最後のウィンドウサイズを記憶する"
-
-# tooltip
-#: ../midori/midori-websettings.c:401
-msgid "Whether to save the last window size"
-msgstr "最後のウィンドウサイズを記憶します"
-
-#: ../midori/midori-websettings.c:409
-msgid "Last window width"
-msgstr "最後のウィンドウの幅"
-
-#: ../midori/midori-websettings.c:410
-msgid "The last saved window width"
-msgstr "最後に保存されたウィンドウ幅"
-
-#: ../midori/midori-websettings.c:418
-msgid "Last window height"
-msgstr "最後のウィンドウの高さ"
-
-# tooltip
-#: ../midori/midori-websettings.c:419
-msgid "The last saved window height"
-msgstr "最後に保存されたウィンドウの高さにします"
-
-#: ../midori/midori-websettings.c:444
-msgid "Last panel position"
-msgstr "最後のパネルの位置"
-
-# tooltip
-#: ../midori/midori-websettings.c:445
-msgid "The last saved panel position"
-msgstr "最後に保存されたパネルの位置にします"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
-msgid "Last panel page"
-msgstr "最後のパネルページ"
-
-# tooltip
-#: ../midori/midori-websettings.c:455
-msgid "The last saved panel page"
-msgstr "最後に保存されたパネルのページです"
-
-#: ../midori/midori-websettings.c:463
-msgid "Last Web search"
-msgstr "最後のウェブ検索"
-
-#: ../midori/midori-websettings.c:464
-msgid "The last saved Web search"
-msgstr "最後に保存されたウェブ検索です"
-
-#: ../midori/midori-websettings.c:473
-msgid "Show Menubar"
-msgstr "メニューバーを表示する"
-
-# tooltip
-#: ../midori/midori-websettings.c:474
-msgid "Whether to show the menubar"
-msgstr "メニューバーを表示します"
-
-#: ../midori/midori-websettings.c:482
-msgid "Show Navigationbar"
-msgstr "ナビゲーションバーを表示する"
-
-# tooltip
-#: ../midori/midori-websettings.c:483
-msgid "Whether to show the navigationbar"
-msgstr "ナビゲーションバーを表示します"
-
-#: ../midori/midori-websettings.c:491
-msgid "Show Bookmarkbar"
-msgstr "ブックマークバーを表示する"
-
-# tooltip
-#: ../midori/midori-websettings.c:492
-msgid "Whether to show the bookmarkbar"
-msgstr "ブックマークバーを表示します"
-
-#: ../midori/midori-websettings.c:500
-msgid "Show Panel"
-msgstr "パネルを表示する"
-
-# tooltip
-#: ../midori/midori-websettings.c:501
-msgid "Whether to show the panel"
-msgstr "パネルを表示します"
-
-#: ../midori/midori-websettings.c:509
-msgid "Show Statusbar"
-msgstr "ステータスバーを表示する"
-
-# tooltip
-#: ../midori/midori-websettings.c:510
-msgid "Whether to show the statusbar"
-msgstr "ステータスバーを表示します"
-
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:278
msgid "Toolbar Style:"
msgstr "ツールバー方式:"
# tooltip
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:279
msgid "The style of the toolbar"
msgstr "ツールバーの表示方式を指定します"
-#: ../midori/midori-websettings.c:529
-msgid "Toolbar Items"
-msgstr "ツールバーアイテム"
-
-# tooltip
-#: ../midori/midori-websettings.c:530
-msgid "The items to show on the toolbar"
-msgstr "ツールバーに表示するアイテムを指定します"
-
-#: ../midori/midori-websettings.c:538
-msgid "Compact Sidepanel"
-msgstr "サイドパネルをコンパクトにする"
-
-# tooltip
-#: ../midori/midori-websettings.c:539
-msgid "Whether to make the sidepanel compact"
-msgstr "サイドパネルの表示をコンパクトにします"
-
-#: ../midori/midori-websettings.c:554
-msgid "Align sidepanel on the right"
-msgstr "サイドパネルを右側に配置する"
-
-# tooltip
-#: ../midori/midori-websettings.c:555
-msgid "Whether to align the sidepanel on the right"
-msgstr "サイドパネルを右側に表示します"
-
-#: ../midori/midori-websettings.c:570
-msgid "Open panels in separate windows"
-msgstr "パネルを別のウィンドウで開く"
-
-# tooltip
-#: ../midori/midori-websettings.c:571
-msgid "Whether to always open panels in separate windows"
-msgstr "パネルを常に別のウィンドウで開きます"
-
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:288
msgid "When Midori starts:"
msgstr "Midori を起動した時:"
-# tooltip
-#: ../midori/midori-websettings.c:581
-msgid "What to do when Midori starts"
-msgstr "Midori の起動時に表示するページを指定します"
-
-#: ../midori/midori-websettings.c:590
-msgid "Homepage:"
-msgstr "ホームページ:"
-
-# tooltip
-#: ../midori/midori-websettings.c:591
-msgid "The homepage"
-msgstr "ホームページを指定します"
-
-#: ../midori/midori-websettings.c:606
-msgid "Show crash dialog"
-msgstr "クラッシュダイアログを表示する"
-
-# tooltip
-#: ../midori/midori-websettings.c:607
-msgid "Show a dialog after Midori crashed"
-msgstr "Midori がクラッシュした後の起動時にダイアログを表示します"
-
-#: ../midori/midori-websettings.c:615
-msgid "Save downloaded files to:"
-msgstr "ダウンロードファイルの保存先:"
-
-# tooltip
-#: ../midori/midori-websettings.c:616
-msgid "The folder downloaded files are saved to"
-msgstr "ダウンロードファイルの保存先を指定します"
-
-#: ../midori/midori-websettings.c:624
-msgid "Text Editor"
-msgstr "テキストエディター"
-
-# tooltip
-#: ../midori/midori-websettings.c:625
-msgid "An external text editor"
-msgstr "外部テキストエディターを指定します"
-
-#: ../midori/midori-websettings.c:640
-msgid "News Aggregator"
-msgstr "フィードリーダー"
-
-# tooltip
-#: ../midori/midori-websettings.c:641
-msgid "An external news aggregator"
-msgstr "外部フィードリーダーを指定します"
-
-#: ../midori/midori-websettings.c:649
-msgid "Location entry Search"
-msgstr "ロケーションエントリの検索"
-
-# tooltip
-#: ../midori/midori-websettings.c:650
-msgid "The search to perform inside the location entry"
-msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します"
-
-#: ../midori/midori-websettings.c:658
+#: ../midori/midori-websettings.c:298
msgid "Preferred Encoding"
msgstr "文字のエンコーディング"
-# tooltip
-#: ../midori/midori-websettings.c:659
-msgid "The preferred character encoding"
-msgstr "文字のエンコーディングを指定します"
-
-#: ../midori/midori-websettings.c:669
-msgid "Always Show Tabbar"
-msgstr "常にタブバーを表示する"
-
-# tooltip
-#: ../midori/midori-websettings.c:670
-msgid "Always show the tabbar"
-msgstr "常にタブバーを表示します"
-
-#: ../midori/midori-websettings.c:683
-msgid "Close Buttons on Tabs"
-msgstr "タブに閉じるボタンを表示する"
-
-# tooltip
-#: ../midori/midori-websettings.c:684
-msgid "Whether tabs have close buttons"
-msgstr "タブに閉じるボタンを表示します"
-
-#: ../midori/midori-websettings.c:709
+#: ../midori/midori-websettings.c:325
msgid "Open new pages in:"
msgstr "新しくページを開く時:"
-# tooltip
-#: ../midori/midori-websettings.c:710
-msgid "Where to open new pages"
-msgstr "新しいページをどこに開くか指定します"
-
-#: ../midori/midori-websettings.c:719
-msgid "Middle click opens Selection"
-msgstr "選択範囲を中央クリックで開く"
-
-# tooltip
-#: ../midori/midori-websettings.c:720
-msgid "Load an address from the selection via middle click"
-msgstr "選択したアドレスをマウスの中央クリックで読み込みます"
-
-#: ../midori/midori-websettings.c:728
-msgid "Open tabs in the background"
-msgstr "タブをバックグラウンドで開く"
-
-# tooltip
-#: ../midori/midori-websettings.c:729
-msgid "Whether to open new tabs in the background"
-msgstr "新しいタブをバックグラウンドで開きます"
-
-#: ../midori/midori-websettings.c:737
-msgid "Open Tabs next to Current"
-msgstr "現在のタブの隣に開く"
-
-# tooltip
-#: ../midori/midori-websettings.c:738
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します"
-
-#: ../midori/midori-websettings.c:746
-msgid "Open popups in tabs"
-msgstr "ポップアップをタブに開く"
-
-# tooltip
-#: ../midori/midori-websettings.c:747
-msgid "Whether to open popup windows in tabs"
-msgstr "ポップアップウィンドウをタブに開きます"
-
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "画像を自動的に読み込む"
-
-# tooltip
-#: ../midori/midori-websettings.c:758
-msgid "Load and display images automatically"
-msgstr "画像を自動的に読み込んで表示します"
-
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "スクリプトを有効にする"
-
-# tooltip
-#: ../midori/midori-websettings.c:766
-msgid "Enable embedded scripting languages"
-msgstr "組み込みスクリプト言語を有効にします"
-
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Netscape プラグインを有効にする"
-
-# tooltip
-#: ../midori/midori-websettings.c:774
-msgid "Enable embedded Netscape plugin objects"
-msgstr "組み込み Netscape プラグインオブジェクトを有効にします"
-
-#: ../midori/midori-websettings.c:789
-msgid "Enable Spell Checking"
-msgstr "スペルチェックを有効にする"
-
-# tooltip
-#: ../midori/midori-websettings.c:790
-msgid "Enable spell checking while typing"
-msgstr "キー入力中のスペルチェックを有効にします"
-
-#: ../midori/midori-websettings.c:796
-msgid "Enable HTML5 database support"
-msgstr "HTML5 データベースサポートを有効にする"
-
-#: ../midori/midori-websettings.c:797
-msgid "Whether to enable HTML5 database support"
-msgstr "HTML5 データベースサポートを有効にします"
-
-#: ../midori/midori-websettings.c:803
-msgid "Enable HTML5 local storage support"
-msgstr "HTML5 ローカルストレージサポートを有効にする"
-
-#: ../midori/midori-websettings.c:804
-msgid "Whether to enable HTML5 local storage support"
-msgstr "HTML5 ローカルストレージサポートを有効にします"
-
-#: ../midori/midori-websettings.c:810
-msgid "Enable offline web application cache"
-msgstr "オフラインウェブアプリケーションキャッシュを有効にする"
-
-#: ../midori/midori-websettings.c:811
-msgid "Whether to enable offline web application cache"
-msgstr "オフラインウェブアプリケーションキャッシュを有効にします"
-
-#: ../midori/midori-websettings.c:827
-msgid "Flash window on background tabs"
-msgstr "バックグラウンドでタブが開いた時にウィンドウを点滅する"
-
-#: ../midori/midori-websettings.c:828
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr ""
-"新しいタブがバックグラウンドで開かれたときにブラウザーウィンドウを点滅します"
-
-#: ../midori/midori-websettings.c:836
-msgid "Enable WebGL support"
-msgstr "WebGL サポートを有効にする"
-
-#: ../midori/midori-websettings.c:837
-msgid "Allow websites to use OpenGL rendering"
-msgstr "すべてのウェブサイトで OpenGL レンダリングを許可します"
-
-#: ../midori/midori-websettings.c:863
-msgid "Zoom Text and Images"
-msgstr "文字や画像を拡大/縮小する"
-
-# tooltip
-#: ../midori/midori-websettings.c:864
-msgid "Whether to zoom text and images"
-msgstr "文字や画像の拡大/縮小を可能にします"
-
-#: ../midori/midori-websettings.c:879
-msgid "Find inline while typing"
-msgstr "キー入力中に自動的に検索する"
-
-# tooltip
-#: ../midori/midori-websettings.c:880
-msgid "Whether to automatically find inline while typing"
-msgstr "インライン検索において、キー入力に従い自動的に検索します"
-
-#: ../midori/midori-websettings.c:895
-msgid "Kinetic scrolling"
-msgstr "慣性スクロール"
-
-#: ../midori/midori-websettings.c:896
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "速度にしたがって慣性がかかったようにスクロールします"
-
-#: ../midori/midori-websettings.c:904
-msgid "Delete old Cookies after:"
-msgstr "古い Cookie を削除:"
-
-# tooltip
-#: ../midori/midori-websettings.c:905
-msgid "The maximum number of days to save cookies for"
-msgstr "Cookie を保存する最大日数です"
-
-#: ../midori/midori-websettings.c:921
-msgid "Only accept Cookies from sites you visit"
-msgstr "訪問したウェブサイトからの Cookie のみ受け入れる"
-
-#: ../midori/midori-websettings.c:922
-msgid "Block cookies sent by third-party websites"
-msgstr "サードパーティウェブサイトから送られた Cookie はブロックします"
-
-#: ../midori/midori-websettings.c:936
-msgid "Delete pages from history after:"
-msgstr "履歴から古いページを削除:"
-
-# tooltip
-#: ../midori/midori-websettings.c:937
-msgid "The maximum number of days to save the history for"
-msgstr "履歴を保存する最大日数です"
-
-#: ../midori/midori-websettings.c:952
-msgid "Proxy server"
-msgstr "プロキシサーバー"
-
-#: ../midori/midori-websettings.c:953
-msgid "The type of proxy server to use"
-msgstr "使用するプロキシサーバーの種類を指定します"
-
-#: ../midori/midori-websettings.c:962
-msgid "HTTP Proxy Server"
-msgstr "HTTP プロキシサーバー"
-
-# tooltip
-#: ../midori/midori-websettings.c:963
-msgid "The proxy server used for HTTP connections"
-msgstr "HTTP 接続でプロキシサーバーを使用する場合に設定します"
-
-#: ../midori/midori-websettings.c:978
-msgid "Port"
-msgstr "ポート"
-
-# tooltip
-#: ../midori/midori-websettings.c:979
-msgid "The proxy server port used for HTTP connections"
-msgstr "HTTP 接続で使用するプロキシサーバーのポート番号を設定します"
-
-# tooltip
-#: ../midori/midori-websettings.c:997
-msgid "The maximum size of cached pages on disk"
-msgstr "ディスクのキャッシュページの最大サイズを指定します"
-
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
+#: ../midori/midori-websettings.c:388
msgid "Identify as"
msgstr "識別名"
# tooltip
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:389
msgid "What to identify as to web pages"
msgstr "ウェブページに報告するユーザーエージェントの識別名を指定します"
-#: ../midori/midori-websettings.c:1031
-msgid "Identification string"
-msgstr "識別文字列"
-
-# tooltip
-#: ../midori/midori-websettings.c:1032
-msgid "The application identification string"
-msgstr "アプリケーション識別文字列です"
-
-#: ../midori/midori-websettings.c:1048
+#: ../midori/midori-websettings.c:422
msgid "Preferred languages"
msgstr "言語の優先度"
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:423
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1677,516 +1365,322 @@ msgstr ""
"複数言語で構成されたウェブページを描画する際の言語の優先度をカンマで区切って"
"指定します。例: \"ja\"、\"en-us\"、\"ja;q=1.0, en-us;q=0.667\" など"
-# Button title
-#: ../midori/midori-websettings.c:1064
-msgid "Clear private data"
-msgstr "プライベートデータのクリア"
-
-# FIXME:
-#: ../midori/midori-websettings.c:1065
-msgid "The private data selected for deletion"
-msgstr "選択されているプライベートデータを削除します"
-
-#: ../midori/midori-websettings.c:1080
-msgid "Clear data"
-msgstr "データのクリア"
-
-# FIXME:
-#: ../midori/midori-websettings.c:1081
-msgid "The data selected for deletion"
-msgstr "選択されているデータを削除します"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
-msgid "Strip referrer details sent to websites"
-msgstr "外部サイトへ送るリファラーの詳細情報を除去する"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "\"Referer\" ヘッダーはホスト名に短縮されます"
-
-#: ../midori/midori-websettings.c:1146
+#: ../midori/midori-websettings.c:472
msgid "Always use my font choices"
msgstr "常にこの設定を使用する"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:473
msgid "Override fonts picked by websites with user preferences"
msgstr "ウェブサイトで指定されているフォントより本設定を優先します"
-#: ../midori/midori-view.c:1360
+#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151
+msgid "Trust this website"
+msgstr "このウェブサイトを信用する"
+
+#: ../midori/midori-view.c:1149
+msgid "Security unknown"
+msgstr "セキュリティ不明"
+
+#: ../midori/midori-view.c:1447
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s は HTML5 データベースの保存を要求しています。"
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Deny"
msgstr "許可しない(_D)"
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Allow"
msgstr "許可する(_A)"
-#: ../midori/midori-view.c:1392
+#: ../midori/midori-view.c:1480
#, c-format
msgid "%s wants to know your location."
msgstr "%s はあなたの場所を知ろうとしています。"
-#: ../midori/midori-view.c:1485
+#: ../midori/midori-view.c:1576
#, c-format
msgid "Error - %s"
msgstr "エラー - %s"
-#: ../midori/midori-view.c:1486
+#: ../midori/midori-view.c:1577
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "ページ '%s' を読み込めませんでした"
-#: ../midori/midori-view.c:1488
+#: ../midori/midori-view.c:1579
msgid "Try again"
msgstr "再試行"
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
+#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887
#, c-format
msgid "Send a message to %s"
msgstr "メッセージを送信します 宛先: %s"
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
+#: ../midori/midori-view.c:2673
+msgid "Add _search engine..."
+msgstr "検索エンジンの追加(_S)..."
+
+#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043
msgid "Inspect _Element"
msgstr "要素の検証(_E)"
-#: ../midori/midori-view.c:2480
+#: ../midori/midori-view.c:2769
msgid "Open Link in New _Tab"
msgstr "リンクを新しいタブで開く(_T)"
-#: ../midori/midori-view.c:2484
+#: ../midori/midori-view.c:2773
msgid "Open Link in _Foreground Tab"
msgstr "リンクをフォアグラウンドのタブで開く(_F)"
-#: ../midori/midori-view.c:2485
+#: ../midori/midori-view.c:2774
msgid "Open Link in _Background Tab"
msgstr "リンクをバックグラウンドのタブで開く(_B)"
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2777
msgid "Open Link in New _Window"
msgstr "リンクを新しいウィンドウで開く(_W)"
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2780
msgid "Open Link as Web A_pplication"
msgstr "ウェブアプリケーションとして実行する(_P)"
-#: ../midori/midori-view.c:2496
+#: ../midori/midori-view.c:2785
msgid "Copy Link de_stination"
msgstr "リンク先をコピー(_S)"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2801
msgid "Open _Image in New Tab"
msgstr "画像を新しいタブで開く(_I)"
-#: ../midori/midori-view.c:2515
+#: ../midori/midori-view.c:2804
msgid "Copy Image _Address"
msgstr "画像のアドレスをコピー(_A)"
-#: ../midori/midori-view.c:2518
+#: ../midori/midori-view.c:2807
msgid "Save I_mage"
msgstr "画像を保存(_M)"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2810
msgid "Open in Image _Viewer"
msgstr "画像ビューアーで開く(_V)"
-#: ../midori/midori-view.c:2528
+#: ../midori/midori-view.c:2817
msgid "Copy Video _Address"
msgstr "動画のアドレスをコピー(_A)"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2820
msgid "Save _Video"
msgstr "動画を保存(_V)"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2820
msgid "Download _Video"
msgstr "動画をダウンロード(_V)"
-#: ../midori/midori-view.c:2557
+#: ../midori/midori-view.c:2846
msgid "Search _with"
msgstr "検索(_W)"
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:2878
msgid "_Search the Web"
msgstr "ウェブで検索(_S)"
-#: ../midori/midori-view.c:2606
+#: ../midori/midori-view.c:2895
msgid "Open Address in New _Tab"
msgstr "アドレスを新しいタブで開く(_T)"
-#: ../midori/midori-view.c:2909
-msgid "Open or download file"
-msgstr "ファイルを開きますか、保存しますか?"
+#: ../midori/midori-view.c:2948
+msgid "Open _Frame in New Tab"
+msgstr "フレームを新しいタブで開く(_F)"
-#: ../midori/midori-view.c:2929
+#: ../midori/midori-view.c:3203
#, c-format
-msgid "File Type: '%s'"
-msgstr "ファイルタイプ: '%s'"
+msgid "Open or download file from %s"
+msgstr "%s を開く、またはダウンロードします"
-#: ../midori/midori-view.c:2931
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "ファイルタイプ: %s ('%s')"
-
-#: ../midori/midori-view.c:2935
+#: ../midori/midori-view.c:3216
#, c-format
msgid "File Name: %s"
msgstr "ファイル名: %s"
-#: ../midori/midori-view.c:2955
+#: ../midori/midori-view.c:3221
+#, c-format
+msgid "File Type: '%s'"
+msgstr "ファイルタイプ: '%s'"
+
+#: ../midori/midori-view.c:3223
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "ファイルタイプ: %s ('%s')"
+
+#: ../midori/midori-view.c:3260
+#, c-format
+msgid "Size: %s"
+msgstr "サイズ: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3271
#, c-format
msgid "Open %s"
msgstr "%s を開く"
-#: ../midori/midori-view.c:3576
+#: ../midori/midori-view.c:3876
#, c-format
msgid "Inspect page - %s"
msgstr "ページの調査 - %s"
-#: ../midori/midori-view.c:3923
-msgid "Speed Dial"
-msgstr "スピードダイアル"
-
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
-msgid "Click to add a shortcut"
-msgstr "クリックするとショートカットを追加できます"
-
-#: ../midori/midori-view.c:3925
-msgid "Enter shortcut address"
-msgstr "ショートカットのアドレスを入力してください"
-
-#: ../midori/midori-view.c:3926
-msgid "Enter shortcut title"
-msgstr "ショートカットの名前を入力してください"
-
-#: ../midori/midori-view.c:3927
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "このショートカットを削除してもよろしいですか?"
-
-#: ../midori/midori-view.c:4089
+#: ../midori/midori-view.c:4273
#, c-format
msgid "No documentation installed"
msgstr "ドキュメントはインストールされていません"
-#: ../midori/midori-view.c:4165
+#: ../midori/midori-view.c:4350
msgid "Midori doesn't store any personal data:"
msgstr "Midori はあらゆる個人データを保存しません:"
-#: ../midori/midori-view.c:4166
+#: ../midori/midori-view.c:4351
msgid "No history or web cookies are being saved."
msgstr "履歴あるいはウェブ Cookie は保存されません。"
-#: ../midori/midori-view.c:4167
+#: ../midori/midori-view.c:4352
msgid "Extensions are disabled."
msgstr "エクステンションは無効になります。"
-#: ../midori/midori-view.c:4168
+#: ../midori/midori-view.c:4353
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
"HTML5 ストレージ、ローカルデータベース、およびアプリケーションキャッシュは無"
"効になります。"
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4354
msgid "Midori prevents websites from tracking the user:"
msgstr "Midori はウェブサイトによるユーザーのトラッキングを阻止します:"
-#: ../midori/midori-view.c:4170
+#: ../midori/midori-view.c:4355
msgid "Referrer URLs are stripped down to the hostname."
msgstr "リファラー URL はホスト名に短縮されます。"
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:4356
msgid "DNS prefetching is disabled."
msgstr "DNS プリフェッチは無効になります。"
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:4357
msgid "The language and timezone are not revealed to websites."
msgstr "言語およびタイムゾーンはウェブサイトには通知されません。"
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:4358
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr ""
"Flash およびその他の Netscape プラグインはウェブサイトには記録されません。"
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:4444
msgid "Version numbers in brackets show the version used at runtime."
msgstr ""
"カッコ内のバージョン番号は実行中に使用されているバージョンを表しています。"
-#: ../midori/midori-view.c:4278
+#: ../midori/midori-view.c:4493
msgid "Page loading delayed"
msgstr "読み込みが保留されたページ"
-#: ../midori/midori-view.c:4279
+#: ../midori/midori-view.c:4494
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr "最近のクラッシュか起動設定により読み込みが保留されています。"
-#: ../midori/midori-view.c:4280
+#: ../midori/midori-view.c:4495
msgid "Load Page"
msgstr "ページを読み込む"
-#: ../midori/midori-view.c:4446
+#: ../midori/midori-view.c:4662
msgid "Blank page"
msgstr "空白ページ"
-#: ../midori/midori-view.c:4708
+#: ../midori/midori-view.c:4926
msgid "_Duplicate Tab"
msgstr "タブの複製(_D)"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4931
msgid "Show Tab _Label"
msgstr "タブラベルの表示(_L)"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4931
msgid "Show Tab _Icon Only"
msgstr "タブアイコンのみ表示(_I)"
-#: ../midori/midori-view.c:4719
-msgid "Close ot_her Tabs"
-msgstr "他のタブを閉じる(_H)"
+#: ../midori/midori-view.c:4938
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "他のタブを閉じる(_H)"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5532
+#: ../midori/midori-view.c:5695
msgid "previous"
msgstr "前"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5551
+#: ../midori/midori-view.c:5714
msgid "next"
msgstr "次"
-#: ../midori/midori-view.c:5564
+#: ../midori/midori-view.c:5727
msgid "Print background images"
msgstr "背景画像を印刷する"
# tooltip
-#: ../midori/midori-view.c:5565
+#: ../midori/midori-view.c:5728
msgid "Whether background images should be printed"
msgstr "印刷する時に背景画像も印刷します"
-#: ../midori/midori-view.c:5597
+#: ../midori/midori-view.c:5760
msgid "Features"
msgstr "機能"
-#: ../midori/midori-preferences.c:297
-msgid "Startup"
-msgstr "起動"
-
-#: ../midori/midori-preferences.c:310
-msgid "Use _current page"
-msgstr "現在のページを使用(_C)"
-
-#: ../midori/midori-preferences.c:314
-msgid "Use current page as homepage"
-msgstr "現在のページをホームページにする"
-
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
-msgid "Fonts"
-msgstr "フォント"
-
-#: ../midori/midori-preferences.c:326
-msgid "Proportional Font Family"
-msgstr "プロポーショナルフォントファミリ"
-
-# tooltip
-#: ../midori/midori-preferences.c:330
-msgid "The default font family used to display text"
-msgstr "文字表示で使用するデフォルトのフォントファミリを指定します"
-
-# tooltip
-#: ../midori/midori-preferences.c:333
-msgid "The default font size used to display text"
-msgstr "文字表示で使用するデフォルトのフォントサイズを指定します"
-
-#: ../midori/midori-preferences.c:335
-msgid "Fixed-width Font Family"
-msgstr "等幅フォントファミリ"
-
-# tooltip
-#: ../midori/midori-preferences.c:339
-msgid "The font family used to display fixed-width text"
-msgstr "等幅文字表示で使用するフォントファミリを指定します"
-
-# tooltip
-#: ../midori/midori-preferences.c:342
-msgid "The font size used to display fixed-width text"
-msgstr "等幅文字表示で使用するフォントのサイズを指定します"
-
-#: ../midori/midori-preferences.c:344
-msgid "Minimum Font Size"
-msgstr "最小フォントサイズ"
-
-# tooltip
-#: ../midori/midori-preferences.c:348
-msgid "The minimum font size used to display text"
-msgstr "文字表示で使用する最小のフォントサイズを指定します"
-
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
-msgid "Behavior"
-msgstr "振る舞い"
-
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
-msgstr "ポップアップを表示するスクリプトを許可する"
-
-# tooltip
-#: ../midori/midori-preferences.c:386
-msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr "ポップアップウィンドウを自動的に開くスクリプトの実行を許可します"
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:416
-msgid "Browsing"
-msgstr "ブラウジング"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:456
-msgid "Network"
-msgstr "ネットワーク"
-
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "ホスト名"
-
-#: ../midori/midori-preferences.c:487
-msgid "MB"
-msgstr "MB"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Add search engine"
-msgstr "検索エンジンの追加"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Edit search engine"
-msgstr "検索エンジンの編集"
-
-#: ../midori/midori-searchaction.c:931
-msgid "_Name:"
-msgstr "名前(_N):"
-
-#: ../midori/midori-searchaction.c:947
-msgid "_Description:"
-msgstr "説明(_D):"
-
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "アイコン(_I):"
-
-#: ../midori/midori-searchaction.c:995
-msgid "_Token:"
-msgstr "トークン(_T):"
-
-#: ../midori/midori-searchaction.c:1295
-msgid "Manage Search Engines"
-msgstr "検索エンジンの管理"
-
-#: ../midori/midori-searchaction.c:1395
-msgid "Use as _default"
-msgstr "デフォルトで使う(_D)"
-
-#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr "アプリケーションで開く"
-
-#: ../midori/sokoke.c:362
-#, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "\"%s\" を開くアプリケーションまたはコマンドを選択してください:"
-
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
-msgid "Could not run external program."
-msgstr "外部プログラムを実行できませんでした。"
-
-#: ../midori/sokoke.c:1595
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d 時間"
-msgstr[1] "%d 時間"
-
-#: ../midori/sokoke.c:1596
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d 分"
-msgstr[1] "%d 分"
-
-#: ../midori/sokoke.c:1597
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d 秒"
-msgstr[1] "%d 秒"
-
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
+#: ../midori/midori-download.vala:48
#, c-format
msgid "%s of %s"
msgstr "%s / %s"
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
-msgid "?B"
-msgstr "?B"
-
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
+#: ../midori/midori-download.vala:64
#, c-format
-msgid " (%s/s)"
-msgstr " (%s/s)"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 時間"
+
+#: ../midori/midori-download.vala:65
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分"
+
+#: ../midori/midori-download.vala:66
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/midori-download.vala:82
#, c-format
msgid " - %s remaining"
msgstr " - 残り %s"
-#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
-msgid "_Inline Find:"
-msgstr "インライン検索(_I)"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:92
+msgid "?B"
+msgstr "?B"
-#: ../toolbars/midori-findbar.c:317
-msgid "Previous"
-msgstr "前を検索"
-
-#: ../toolbars/midori-findbar.c:323
-msgid "Next"
-msgstr "次を検索"
-
-#: ../toolbars/midori-findbar.c:327
-msgid "Match Case"
-msgstr "大文字・小文字を区別"
-
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr "強調表示"
-
-#: ../toolbars/midori-findbar.c:347
-msgid "Close Findbar"
-msgstr "検索バーを閉じる"
-
-#: ../toolbars/midori-transferbar.c:122
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:94
#, c-format
-msgid "The file '%s ' has been downloaded."
-msgstr "ファイル '%s ' をダウンロードしました。"
+msgid " (%s/s)"
+msgstr " (%s/s)"
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "転送完了"
-
-#: ../toolbars/midori-transferbar.c:193
+#: ../midori/midori-download.vala:188
msgid "The downloaded file is erroneous."
msgstr "ダウンロードしたファイルに問題があります。"
-#: ../toolbars/midori-transferbar.c:194
+#: ../midori/midori-download.vala:189
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2194,49 +1688,354 @@ msgstr ""
"リンク先で示されているチェックサムとマッチしませんでした。ファイルのダウン"
"ロードが正常に終了しなかったか、その後変更された可能性があります。"
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../midori/midori-download.vala:298
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "ファイル \"%s\" をこのフォルダーに保存することはできません。"
+
+#: ../midori/midori-download.vala:300
+msgid "You don't have permission to write in this location."
+msgstr "この場所への書き込み権がありません。"
+
+#: ../midori/midori-download.vala:303
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "\"%s\" をダウンロードする十分な空きスペースがありません。"
+
+#: ../midori/midori-download.vala:305
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "ファイルのダウンロードには %s 必要ですが、%s しか空きがありません。"
+
+#: ../midori/midori-speeddial.vala:167
+msgid "Speed Dial"
+msgstr "スピードダイアル"
+
+#: ../midori/midori-speeddial.vala:168 ../midori/midori-speeddial.vala:253
+msgid "Click to add a shortcut"
+msgstr "クリックするとショートカットを追加できます"
+
+#: ../midori/midori-speeddial.vala:169
+msgid "Enter shortcut address"
+msgstr "ショートカットのアドレスを入力してください"
+
+#: ../midori/midori-speeddial.vala:170
+msgid "Enter shortcut title"
+msgstr "ショートカットの名前を入力してください"
+
+#: ../midori/midori-speeddial.vala:171
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "このショートカットを削除してもよろしいですか?"
+
+#: ../midori/midori-preferences.c:299
+msgid "Startup"
+msgstr "起動"
+
+#: ../midori/midori-preferences.c:305
+msgid "Homepage:"
+msgstr "ホームページ:"
+
+#: ../midori/midori-preferences.c:313
+msgid "Use _current page"
+msgstr "現在のページを使用(_C)"
+
+#: ../midori/midori-preferences.c:317
+msgid "Use current page as homepage"
+msgstr "現在のページをホームページにする"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:326
+msgid "Fonts"
+msgstr "フォント"
+
+#: ../midori/midori-preferences.c:329
+msgid "Proportional Font Family"
+msgstr "プロポーショナルフォントファミリ"
+
+# tooltip
+#: ../midori/midori-preferences.c:333
+msgid "The default font family used to display text"
+msgstr "文字表示で使用するデフォルトのフォントファミリを指定します"
+
+# tooltip
+#: ../midori/midori-preferences.c:336
+msgid "The default font size used to display text"
+msgstr "文字表示で使用するデフォルトのフォントサイズを指定します"
+
+#: ../midori/midori-preferences.c:338
+msgid "Fixed-width Font Family"
+msgstr "等幅フォントファミリ"
+
+# tooltip
+#: ../midori/midori-preferences.c:342
+msgid "The font family used to display fixed-width text"
+msgstr "等幅文字表示で使用するフォントファミリを指定します"
+
+# tooltip
+#: ../midori/midori-preferences.c:345
+msgid "The font size used to display fixed-width text"
+msgstr "等幅文字表示で使用するフォントのサイズを指定します"
+
+#: ../midori/midori-preferences.c:347
+msgid "Minimum Font Size"
+msgstr "最小フォントサイズ"
+
+# tooltip
+#: ../midori/midori-preferences.c:351
+msgid "The minimum font size used to display text"
+msgstr "文字表示で使用する最小のフォントサイズを指定します"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:362
+msgid "Behavior"
+msgstr "振る舞い"
+
+#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "画像を自動的に読み込む"
+
+#: ../midori/midori-preferences.c:369
+msgid "Enable Spell Checking"
+msgstr "スペルチェックを有効にする"
+
+#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "スクリプトを有効にする"
+
+#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Netscape プラグインを有効にする"
+
+#: ../midori/midori-preferences.c:391
+msgid "Zoom Text and Images"
+msgstr "文字や画像を拡大/縮小する"
+
+#: ../midori/midori-preferences.c:394
+msgid "Allow scripts to open popups"
+msgstr "ポップアップを表示するスクリプトを許可する"
+
+# tooltip
+#: ../midori/midori-preferences.c:395
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "ポップアップウィンドウを自動的に開くスクリプトの実行を許可します"
+
+#: ../midori/midori-preferences.c:401
+msgid "Kinetic scrolling"
+msgstr "慣性スクロール"
+
+#: ../midori/midori-preferences.c:402
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr "速度にしたがって慣性がかかったようにスクロールします"
+
+#: ../midori/midori-preferences.c:407
+msgid "Middle click opens Selection"
+msgstr "選択範囲を中央クリックで開く"
+
+# tooltip
+#: ../midori/midori-preferences.c:408
+msgid "Load an address from the selection via middle click"
+msgstr "選択したアドレスをマウスの中央クリックで読み込みます"
+
+#: ../midori/midori-preferences.c:414
+msgid "Enable WebGL support"
+msgstr "WebGL サポートを有効にする"
+
+#: ../midori/midori-preferences.c:419
+msgid "Flash window on background tabs"
+msgstr "バックグラウンドでタブが開いた時にウィンドウを点滅する"
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "ダウンロードファイルの保存先:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "ブラウジング"
+
+#: ../midori/midori-preferences.c:451
+msgid "Close Buttons on Tabs"
+msgstr "タブに閉じるボタンを表示する"
+
+#: ../midori/midori-preferences.c:455
+msgid "Always Show Tabbar"
+msgstr "常にタブバーを表示する"
+
+#: ../midori/midori-preferences.c:459
+msgid "Open Tabs next to Current"
+msgstr "現在のタブの隣に開く"
+
+# tooltip
+#: ../midori/midori-preferences.c:460
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します"
+
+#: ../midori/midori-preferences.c:463
+msgid "Open tabs in the background"
+msgstr "タブをバックグラウンドで開く"
+
+#: ../midori/midori-preferences.c:467
+msgid "Text Editor"
+msgstr "テキストエディター"
+
+#: ../midori/midori-preferences.c:472
+msgid "News Aggregator"
+msgstr "フィードリーダー"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:479
+msgid "Network"
+msgstr "ネットワーク"
+
+#: ../midori/midori-preferences.c:481
+msgid "Proxy server"
+msgstr "プロキシサーバー"
+
+#: ../midori/midori-preferences.c:486
+msgid "Hostname"
+msgstr "ホスト名"
+
+#: ../midori/midori-preferences.c:494
+msgid "Port"
+msgstr "ポート"
+
+# tooltip
+#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509
+msgid "The maximum size of cached pages on disk"
+msgstr "ディスクのキャッシュページの最大サイズを指定します"
+
+#: ../midori/midori-preferences.c:511
+msgid "MB"
+msgstr "MB"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Add search engine"
+msgstr "検索エンジンの追加"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Edit search engine"
+msgstr "検索エンジンの編集"
+
+#: ../midori/midori-searchaction.c:985
+msgid "_Name:"
+msgstr "名前(_N):"
+
+#: ../midori/midori-searchaction.c:1000
+msgid "_Description:"
+msgstr "説明(_D):"
+
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "アドレス(_A):"
+
+#: ../midori/midori-searchaction.c:1032
+msgid "_Token:"
+msgstr "トークン(_T):"
+
+#: ../midori/midori-searchaction.c:1330
+msgid "Manage Search Engines"
+msgstr "検索エンジンの管理"
+
+#: ../midori/midori-searchaction.c:1432
+msgid "Use as _default"
+msgstr "デフォルトで使う(_D)"
+
+#: ../midori/sokoke.c:353
+msgid "Open with"
+msgstr "アプリケーションで開く"
+
+#: ../midori/sokoke.c:361
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "\"%s\" を開くアプリケーションまたはコマンドを選択してください:"
+
+#: ../midori/sokoke.c:476 ../midori/sokoke.c:490
+msgid "Could not run external program."
+msgstr "外部プログラムを実行できませんでした。"
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:265
+msgid "_Inline Find:"
+msgstr "インライン検索(_I)"
+
+#: ../toolbars/midori-findbar.c:287
+msgid "Previous"
+msgstr "前を検索"
+
+#: ../toolbars/midori-findbar.c:293
+msgid "Next"
+msgstr "次を検索"
+
+#: ../toolbars/midori-findbar.c:297
+msgid "Match Case"
+msgstr "大文字・小文字を区別"
+
+#: ../toolbars/midori-findbar.c:306
+msgid "Highlight Matches"
+msgstr "強調表示"
+
+#: ../toolbars/midori-findbar.c:317
+msgid "Close Findbar"
+msgstr "検索バーを閉じる"
+
+#: ../toolbars/midori-transferbar.c:109
+#, c-format
+msgid "The file '%s ' has been downloaded."
+msgstr "ファイル '%s ' をダウンロードしました。"
+
+#: ../toolbars/midori-transferbar.c:114
+msgid "Transfer completed"
+msgstr "転送完了"
+
+#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
msgid "Clear All"
msgstr "すべてクリア"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
msgid "Some files are being downloaded"
msgstr "ファイルのダウンロード中です"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:278
msgid "_Quit Midori"
msgstr "Midori を終了(_Q)"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:280
msgid "The transfers will be cancelled if Midori quits."
msgstr "Midori を終了すると転送がキャンセルされます。"
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "ブックマーク"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "ブックマークアイテムの追加に失敗しました: %s\n"
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "ブックマークの更新に失敗しました: %s\n"
+
# tooltip
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "選択したブックマークを編集します"
# tooltip
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "選択したブックマークを削除します"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "新しいフォルダーの追加"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "セパレーター "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "ブックマークを検索"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "履歴"
@@ -2254,12 +2053,16 @@ msgstr "昨日"
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d 日前"
-msgstr[1] "%d 日前"
#: ../panels/midori-history.c:165 ../panels/midori-history.c:184
msgid "A week ago"
msgstr "一週間前"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "履歴アイテムの削除に失敗しました: %s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "すべての履歴アイテムを削除してよろしいですか?"
@@ -2279,15 +2082,20 @@ msgstr "選択した履歴アイテムを削除します"
msgid "Clear the entire history"
msgstr "すべての履歴をクリアします"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "履歴を検索"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "転送"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:435
msgid "Open Destination _Folder"
msgstr "保存先フォルダーを開く(_F)"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:438
msgid "Copy Link Loc_ation"
msgstr "リンクの場所をコピー(_A)"
@@ -2329,54 +2137,62 @@ msgstr "ストックアイコン '%s' を読み込めませんでした"
msgid "Animation frames are broken"
msgstr "アニメーションフレームは壊れています"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "'%s' は %s のプロパティとして無効です"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
-#: ../extensions/addons.c:308
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:309
msgid "Choose file"
msgstr "ファイルの選択"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "フォルダーの選択"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "なし"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 時間以上過去"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 日以上過去"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 週間以上過去"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 ヶ月以上過去"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 年以上過去"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "%s の設定"
-#: ../extensions/adblock.c:473
+#: ../katze/midori-uri.vala:173
+msgid "MD5-Checksum:"
+msgstr "MD5 チェックサム:"
+
+#: ../katze/midori-uri.vala:180
+msgid "SHA1-Checksum:"
+msgstr "SHA1 チェックサム:"
+
+#: ../extensions/adblock.c:495
msgid "Configure Advertisement filters"
msgstr "広告フィルターの設定"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:528
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2385,117 +2201,117 @@ msgstr ""
"リストに追加するには、フィルターリストのアドレスを入力し \"追加\" ボタンをク"
"リックしてください。フィルターリストは %s で見つけることができます。"
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:942
msgid "Edit rule"
msgstr "ルールの編集"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:956
msgid "_Rule:"
msgstr "ルール(_R):"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:1010
msgid "Bl_ock image"
msgstr "画像をブロック(_O)"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:1015
msgid "Bl_ock link"
msgstr "リンクをブロック(_O)"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1913
msgid "Advertisement blocker"
msgstr "広告ブロッカー"
# description
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1914
msgid "Block advertisements according to a filter list"
msgstr "フィルターリストに登録された広告をブロックします"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
+#: ../extensions/addons.c:222
msgid "This page appears to contain a user script. Do you wish to install it?"
msgstr ""
"このページにはユーザースクリプトが含まれているようです。それをインストールし"
"てもよろしいですか?"
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
msgid "_Install user script"
msgstr "ユーザースクリプトをインストール(_I)"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
msgid "This page appears to contain a user style. Do you wish to install it?"
msgstr ""
"このページはユーザースタイルを含んでいるようです。それをインストールしますか?"
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
msgid "_Install user style"
msgstr "ユーザースタイルをインストール(_I)"
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
msgid "Don't install"
msgstr "インストールしない"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:320 ../extensions/addons.c:675
msgid "Userscripts"
msgstr "ユーザースクリプト"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:325 ../extensions/addons.c:677
msgid "Userstyles"
msgstr "ユーザースタイル"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:371 ../extensions/addons.c:450
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "エラー"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:412
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "'%s' を削除してよろしいですか?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:418
msgid "Delete user script"
msgstr "ユーザースクリプトの削除"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:419
msgid "Delete user style"
msgstr "ユーザースタイルの削除"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:422
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "ファイル %s は完全に削除されます。"
# tooltip
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:564 ../extensions/addons.c:641
msgid "Open in Text Editor"
msgstr "テキストエディターで開きます"
# tooltip
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:566 ../extensions/addons.c:650
msgid "Open Target Folder"
msgstr "対象フォルダーを開きます"
# tooltip
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:632
msgid "Add new addon"
msgstr "新しいアドオンを追加します"
# tooltip
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:658
msgid "Remove selected addon"
msgstr "選択したアドオンを削除します"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1687 ../extensions/addons.c:1905
msgid "User addons"
msgstr "ユーザーアドオン"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1817
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "フォルダー '%s' をモニターできません: %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1906
msgid "Support for userscripts and userstyles"
msgstr "ユーザースクリプトやユーザースタイルをサポートします"
@@ -2589,30 +2405,21 @@ msgstr ""
"Cookie の数 : %d"
# Column name of cookie browser
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "名前"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "すべて展開する(_E)"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "すべて折り畳む(_C)"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "フィルター:"
-
-# tooltip
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"フィルターに入力された文字列と、名前またはドメインフィールドがマッチした "
-"Cookie のみ表示します。"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "名前またはドメインで Cookie を検索"
# description
#: ../extensions/cookie-manager/main.c:36
@@ -2873,37 +2680,37 @@ msgstr "ステータスバー時計"
msgid "Display date and time in the statusbar"
msgstr "ステータスバーに日付と時刻を表示します"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "画像"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "スクリプト"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Netscape プラグイン"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "ステータスバー機能"
# description
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "ウェブページへの機能のオン/オフを簡単に切り替えます"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "タブパネル"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "タブパネル(_A)"
# description
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "タブを縦のパネルに表示します"
@@ -2916,11 +2723,11 @@ msgstr "デフォルトでタブのアイコンのみ表示"
msgid "New tabs have no label by default"
msgstr "デフォルトで新しいタブのラベルを表示しません"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "ツールバーのカスタマイズ"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2928,35 +2735,325 @@ msgstr ""
"ツールバーに表示するアイテムを選択してください。表示順はドラッグアンドドロッ"
"プで変更できます。"
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "利用可能なアイテム"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "表示するアイテム"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "ツールバーのカスタマイズ(_T)..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "ツールバーのカスタマイズ(_C)…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "カスタマイズ(_C)..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "ツールバーエディター"
# description
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "ツールバーのレイアウトを簡単に編集できます"
-#: ../extensions/web-cache.c:463
+#: ../extensions/web-cache.c:462
msgid "Cache HTTP communication on disk"
msgstr "HTTP 通信をディスクにキャッシュします"
+#~ msgid "Remember last window size"
+#~ msgstr "最後のウィンドウサイズを記憶する"
+
+# tooltip
+#~ msgid "Whether to save the last window size"
+#~ msgstr "最後のウィンドウサイズを記憶します"
+
+#~ msgid "Last window width"
+#~ msgstr "最後のウィンドウの幅"
+
+#~ msgid "The last saved window width"
+#~ msgstr "最後に保存されたウィンドウ幅"
+
+#~ msgid "Last window height"
+#~ msgstr "最後のウィンドウの高さ"
+
+# tooltip
+#~ msgid "The last saved window height"
+#~ msgstr "最後に保存されたウィンドウの高さにします"
+
+#~ msgid "Last panel position"
+#~ msgstr "最後のパネルの位置"
+
+# tooltip
+#~ msgid "The last saved panel position"
+#~ msgstr "最後に保存されたパネルの位置にします"
+
+#~ msgid "Last panel page"
+#~ msgstr "最後のパネルページ"
+
+# tooltip
+#~ msgid "The last saved panel page"
+#~ msgstr "最後に保存されたパネルのページです"
+
+#~ msgid "Last Web search"
+#~ msgstr "最後のウェブ検索"
+
+#~ msgid "The last saved Web search"
+#~ msgstr "最後に保存されたウェブ検索です"
+
+#~ msgid "Show Menubar"
+#~ msgstr "メニューバーを表示する"
+
+# tooltip
+#~ msgid "Whether to show the menubar"
+#~ msgstr "メニューバーを表示します"
+
+#~ msgid "Show Navigationbar"
+#~ msgstr "ナビゲーションバーを表示する"
+
+# tooltip
+#~ msgid "Whether to show the navigationbar"
+#~ msgstr "ナビゲーションバーを表示します"
+
+#~ msgid "Show Bookmarkbar"
+#~ msgstr "ブックマークバーを表示する"
+
+# tooltip
+#~ msgid "Whether to show the bookmarkbar"
+#~ msgstr "ブックマークバーを表示します"
+
+#~ msgid "Show Panel"
+#~ msgstr "パネルを表示する"
+
+# tooltip
+#~ msgid "Whether to show the panel"
+#~ msgstr "パネルを表示します"
+
+#~ msgid "Show Statusbar"
+#~ msgstr "ステータスバーを表示する"
+
+# tooltip
+#~ msgid "Whether to show the statusbar"
+#~ msgstr "ステータスバーを表示します"
+
+#~ msgid "Toolbar Items"
+#~ msgstr "ツールバーアイテム"
+
+# tooltip
+#~ msgid "The items to show on the toolbar"
+#~ msgstr "ツールバーに表示するアイテムを指定します"
+
+#~ msgid "Compact Sidepanel"
+#~ msgstr "サイドパネルをコンパクトにする"
+
+# tooltip
+#~ msgid "Whether to make the sidepanel compact"
+#~ msgstr "サイドパネルの表示をコンパクトにします"
+
+#~ msgid "Align sidepanel on the right"
+#~ msgstr "サイドパネルを右側に配置する"
+
+# tooltip
+#~ msgid "Whether to align the sidepanel on the right"
+#~ msgstr "サイドパネルを右側に表示します"
+
+#~ msgid "Open panels in separate windows"
+#~ msgstr "パネルを別のウィンドウで開く"
+
+# tooltip
+#~ msgid "Whether to always open panels in separate windows"
+#~ msgstr "パネルを常に別のウィンドウで開きます"
+
+# tooltip
+#~ msgid "What to do when Midori starts"
+#~ msgstr "Midori の起動時に表示するページを指定します"
+
+# tooltip
+#~ msgid "The homepage"
+#~ msgstr "ホームページを指定します"
+
+#~ msgid "Show crash dialog"
+#~ msgstr "クラッシュダイアログを表示する"
+
+# tooltip
+#~ msgid "The folder downloaded files are saved to"
+#~ msgstr "ダウンロードファイルの保存先を指定します"
+
+# tooltip
+#~ msgid "An external text editor"
+#~ msgstr "外部テキストエディターを指定します"
+
+# tooltip
+#~ msgid "An external news aggregator"
+#~ msgstr "外部フィードリーダーを指定します"
+
+#~ msgid "Location entry Search"
+#~ msgstr "ロケーションエントリの検索"
+
+# tooltip
+#~ msgid "The search to perform inside the location entry"
+#~ msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します"
+
+# tooltip
+#~ msgid "The preferred character encoding"
+#~ msgstr "文字のエンコーディングを指定します"
+
+# tooltip
+#~ msgid "Always show the tabbar"
+#~ msgstr "常にタブバーを表示します"
+
+# tooltip
+#~ msgid "Whether tabs have close buttons"
+#~ msgstr "タブに閉じるボタンを表示します"
+
+# tooltip
+#~ msgid "Where to open new pages"
+#~ msgstr "新しいページをどこに開くか指定します"
+
+# tooltip
+#~ msgid "Whether to open new tabs in the background"
+#~ msgstr "新しいタブをバックグラウンドで開きます"
+
+#~ msgid "Open popups in tabs"
+#~ msgstr "ポップアップをタブに開く"
+
+# tooltip
+#~ msgid "Whether to open popup windows in tabs"
+#~ msgstr "ポップアップウィンドウをタブに開きます"
+
+# tooltip
+#~ msgid "Load and display images automatically"
+#~ msgstr "画像を自動的に読み込んで表示します"
+
+# tooltip
+#~ msgid "Enable embedded scripting languages"
+#~ msgstr "組み込みスクリプト言語を有効にします"
+
+# tooltip
+#~ msgid "Enable embedded Netscape plugin objects"
+#~ msgstr "組み込み Netscape プラグインオブジェクトを有効にします"
+
+# tooltip
+#~ msgid "Enable spell checking while typing"
+#~ msgstr "キー入力中のスペルチェックを有効にします"
+
+#~ msgid "Enable HTML5 database support"
+#~ msgstr "HTML5 データベースサポートを有効にする"
+
+#~ msgid "Whether to enable HTML5 database support"
+#~ msgstr "HTML5 データベースサポートを有効にします"
+
+#~ msgid "Whether to enable HTML5 local storage support"
+#~ msgstr "HTML5 ローカルストレージサポートを有効にします"
+
+#~ msgid "Whether to enable offline web application cache"
+#~ msgstr "オフラインウェブアプリケーションキャッシュを有効にします"
+
+#~ msgid "Flash the browser window if a new tab was opened in the background"
+#~ msgstr ""
+#~ "新しいタブがバックグラウンドで開かれたときにブラウザーウィンドウを点滅しま"
+#~ "す"
+
+#~ msgid "Allow websites to use OpenGL rendering"
+#~ msgstr "すべてのウェブサイトで OpenGL レンダリングを許可します"
+
+# tooltip
+#~ msgid "Whether to zoom text and images"
+#~ msgstr "文字や画像の拡大/縮小を可能にします"
+
+#~ msgid "Find inline while typing"
+#~ msgstr "キー入力中に自動的に検索する"
+
+# tooltip
+#~ msgid "Whether to automatically find inline while typing"
+#~ msgstr "インライン検索において、キー入力に従い自動的に検索します"
+
+#~ msgid "The type of proxy server to use"
+#~ msgstr "使用するプロキシサーバーの種類を指定します"
+
+#~ msgid "HTTP Proxy Server"
+#~ msgstr "HTTP プロキシサーバー"
+
+# tooltip
+#~ msgid "The proxy server used for HTTP connections"
+#~ msgstr "HTTP 接続でプロキシサーバーを使用する場合に設定します"
+
+# tooltip
+#~ msgid "The proxy server port used for HTTP connections"
+#~ msgstr "HTTP 接続で使用するプロキシサーバーのポート番号を設定します"
+
+#~ msgid "Identification string"
+#~ msgstr "識別文字列"
+
+# tooltip
+#~ msgid "The application identification string"
+#~ msgstr "アプリケーション識別文字列です"
+
+# Button title
+#~ msgid "Clear private data"
+#~ msgstr "プライベートデータのクリア"
+
+# FIXME:
+#~ msgid "The private data selected for deletion"
+#~ msgstr "選択されているプライベートデータを削除します"
+
+#~ msgid "Clear data"
+#~ msgstr "データのクリア"
+
+# FIXME:
+#~ msgid "The data selected for deletion"
+#~ msgstr "選択されているデータを削除します"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "他のタブを閉じる(_H)"
+
+#~ msgid "_Icon:"
+#~ msgstr "アイコン(_I):"
+
+#~ msgid "Filter:"
+#~ msgstr "フィルター:"
+
+# tooltip
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "フィルターに入力された文字列と、名前またはドメインフィールドがマッチした "
+#~ "Cookie のみ表示します。"
+
+#, fuzzy
+#~ msgid "Load page"
+#~ msgstr "ページを読み込む"
+
+#~ msgid "_Bookmark"
+#~ msgstr "ブックマーク(_B)"
+
+#~ msgid "_Console"
+#~ msgstr "コンソール(_C)"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "トップレベルフォルダー"
+
+#~ msgid "_Title:"
+#~ msgstr "タイトル(_T):"
+
+#~ msgid "_Folder:"
+#~ msgstr "フォルダー(_F):"
+
+#~ msgid "Import bookmarks..."
+#~ msgstr "ブックマークのインポート..."
+
+#~ msgid "Search with..."
+#~ msgstr "他の検索エンジンで検索..."
+
+#~ msgid "Customize _Toolbar..."
+#~ msgstr "ツールバーのカスタマイズ(_T)..."
+
+#~ msgid "_Customize..."
+#~ msgstr "カスタマイズ(_C)..."
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "ブックマークを保存できませんでした。%s"
+
#~ msgid "The specified configuration folder is invalid."
#~ msgstr "指定された設定フォルダーが正しくありません。"
diff --git a/po/ko.po b/po/ko.po
index 9730de2b..662d6791 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: midori 0.2.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-24 12:18+0000\n"
-"PO-Revision-Date: 2012-02-13 13:56+0900\n"
-"Last-Translator: Kim Boram \n"
+"POT-Creation-Date: 2012-09-19 11:45+0000\n"
+"PO-Revision-Date: 2012-08-28 21:59+0900\n"
+"Last-Translator: Kim, Boram \n"
"Language-Team: Kim Boram \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -36,12 +36,28 @@ msgstr "웹 찾아보기"
msgid "Internet;WWW;Explorer"
msgstr "인터넷;WWW;익스플로러"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1921 ../midori/main.c:1936
+#: ../midori/main.c:1949 ../midori/midori-websettings.c:200
msgid "Midori"
msgstr "미도리"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "미도리 웹 브라우저"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "새 사생활 보호 모드 창"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326
+msgid "New Tab"
+msgstr "새 탭"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323
+msgid "New Window"
+msgstr "새 창"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "웹 브라우저"
@@ -53,82 +69,87 @@ msgstr "미도리 개인 정보 보호 모드"
msgid "Open a new private browsing window"
msgstr "새 사생활 보호 모드 창 열기"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4307
msgid "Private Browsing"
msgstr "사생활 보호 모드"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:84 ../midori/main.c:90
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "설정을 읽을 수 없습니다: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:138
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "값 '%s'은(는) %s의 잘못된 값입니다"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:143 ../midori/main.c:247
#, c-format
msgid "Invalid configuration value '%s'"
msgstr " '%s'은(는) 잘못된 설정 값입니다."
-#: ../midori/main.c:380
+#: ../midori/main.c:357
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "검색 엔진을 불러올 수 없습니다. %s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:411
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "기록을 제거할 수 없습니다: %s\n"
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:433 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "데이터베이스에 접속할 수 없음: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:505
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "오래된 기록 항목을 지울 수 없습니다: %s\n"
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "기록 항목을 제거할 수 없습니다: %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "책갈피를 저장할 수 없습니다.%s"
-
-#: ../midori/main.c:633
+#: ../midori/main.c:527
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "설정을 저장할 수 없습니다. %s"
-#: ../midori/main.c:668
+#: ../midori/main.c:553
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "검색 엔진을 저장할 수 없습니다. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:590
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "휴지통을 저장할 수 없습니다.%s"
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
+#: ../midori/main.c:663 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "확장 기능"
-#: ../midori/main.c:760
+#: ../midori/main.c:677
msgid "Privacy"
msgstr "개인 정보"
-#: ../midori/main.c:772
+#: ../midori/main.c:679
+msgid "Delete old Cookies after:"
+msgstr "쿠키를 보존할 기간:"
+
+#: ../midori/main.c:681 ../midori/main.c:684
+msgid "The maximum number of days to save cookies for"
+msgstr "쿠키를 저장할 최장 기간을 설정합니다"
+
+#: ../midori/main.c:688
+msgid "Only accept Cookies from sites you visit"
+msgstr "방문한 사이트의 쿠키 만을 허용"
+
+#: ../midori/main.c:689
+msgid "Block cookies sent by third-party websites"
+msgstr "서드 파티 웹 사이트가 보낸 쿠키 막기"
+
+#: ../midori/main.c:694
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -136,18 +157,44 @@ msgstr ""
"쿠키는 로그인 데이터, 게임 기록 또는 광고 목적의 사용자 프로필을 보관하고 있"
"습니다."
-#: ../midori/main.c:828
+#: ../midori/main.c:701
+msgid "Enable offline web application cache"
+msgstr "오프라인 웹 응용 프로그램 캐시 사용"
+
+#: ../midori/main.c:704
+msgid "Enable HTML5 local storage support"
+msgstr "HTML5 로컬 기억 장치 지원 사용"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/main.c:708
+msgid "Strip referrer details sent to websites"
+msgstr "외부 사이트에 보낼 리퍼러의 자세한 내용을 제거"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/main.c:710
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "\"리퍼러\" 헤더를 호스트 이름으로 줄이기"
+
+#: ../midori/main.c:713
+msgid "Delete pages from history after:"
+msgstr "기록에 페이지를 보존할 기간:"
+
+#: ../midori/main.c:715 ../midori/main.c:718
+msgid "The maximum number of days to save the history for"
+msgstr "방문 기록을 저장할 최대 기간을 설정합니다"
+
+#: ../midori/main.c:759
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "세션을 저장할 수 없습니다.%s"
-#: ../midori/main.c:1046
+#: ../midori/main.c:981
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"사용 가능한 루트 인증서 파일이 없습니다. SSL 인증서를 검증할 수 없습니다."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1076
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -155,228 +202,237 @@ msgstr ""
"미도리를 마지막으로 실행했을 때 비 정상적으로 끝난 것 같습니다. 이런 일이 계"
"속된다면, 문제 해결을 위해 다음 중 하나를 선택하십시오."
-#: ../midori/main.c:1134
+#: ../midori/main.c:1095
msgid "Modify _preferences"
msgstr "기본 설정 수정(_P)"
-#: ../midori/main.c:1138
+#: ../midori/main.c:1099
msgid "Disable all _extensions"
msgstr "모든 확장 기능 사용하지 않기(_E)"
-#: ../midori/main.c:1151
+#: ../midori/main.c:1108
+msgid "Show a dialog after Midori crashed"
+msgstr "미도리가 충돌한 후 대화 상자를 표시합니다"
+
+#: ../midori/main.c:1113
msgid "Discard old tabs"
msgstr "오래된 탭 버리기"
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1114 ../midori/midori-websettings.c:108
msgid "Show last tabs without loading"
msgstr "마지막 탭을 불러오지는 않고 표시"
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1115 ../midori/midori-websettings.c:107
msgid "Show last open tabs"
msgstr "마지막에 연 탭 표시"
-#: ../midori/main.c:1400 ../midori/main.c:2464
+#: ../midori/main.c:1362 ../midori/main.c:2377
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "세션을 열 수 없습니다: %s\n"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1500
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "스냅샷을 다음에 저장했습니다: %s\n"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1836
msgid "Run ADDRESS as a web application"
msgstr "[주소]를 웹 응용 프로그램으로 실행"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1836
msgid "ADDRESS"
msgstr "[주소]"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1839
msgid "Use FOLDER as configuration folder"
msgstr "[폴더]를 설정 폴더로 사용"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1839
msgid "FOLDER"
msgstr "[폴더]"
-#: ../midori/main.c:1957
+#: ../midori/main.c:1842
msgid "Private browsing, no changes are saved"
msgstr "개인 정보 보호 모드, 바뀐 사항을 저장하지 않습니다."
-#: ../midori/main.c:1959
+#: ../midori/main.c:1845
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "휴대 모드, 모든 런타임 파일을 한 곳에 보관합니다."
+
+#: ../midori/main.c:1848
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "GtkLauncher와 유사한 웹킷을 사용하는 일반적인 GTK 창"
+
+#: ../midori/main.c:1850
msgid "Show a diagnostic dialog"
msgstr "진단 대화 상자 보기"
-#: ../midori/main.c:1961
+#: ../midori/main.c:1852
msgid "Run the specified filename as javascript"
msgstr "특정한 파일 이름을 자바 스크립트로 실행"
-#: ../midori/main.c:1963
+#: ../midori/main.c:1854
msgid "Take a snapshot of the specified URI"
msgstr "지정한 주소의 스냅샷 저장"
-#: ../midori/main.c:1965
+#: ../midori/main.c:1856
msgid "Execute the specified command"
msgstr "실행할 특정 명령어"
-#: ../midori/main.c:1967
+#: ../midori/main.c:1858
msgid "List available commands to execute with -e/ --execute"
msgstr "-e/ --execute와 함께 실행하시면 실행 가능한 명령어의 목록을 표시합니다"
-#: ../midori/main.c:1969
+#: ../midori/main.c:1860
msgid "Display program version"
msgstr "프로그램의 버전 표시"
-#: ../midori/main.c:1971
+#: ../midori/main.c:1862
msgid "Addresses"
msgstr "주소"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1864
msgid "Block URIs according to regular expression PATTERN"
msgstr "정규 표현 패턴에 따라 주소를 막기"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1864
msgid "PATTERN"
msgstr "[패턴]"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:1868
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "수 초 이상 활동이 없을 경우 미도리 초기화"
-#: ../midori/main.c:1977
+#: ../midori/main.c:1868
msgid "SECONDS"
msgstr "[초]"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1871
msgid "Redirects console warnings to the specified FILENAME"
msgstr "콘솔 경고를 지정한 파일로 전송합니다."
-#: ../midori/main.c:1980
+#: ../midori/main.c:1871
msgid "FILENAME"
msgstr "[파일 이름]"
-#: ../midori/main.c:2045
-msgid "[Addresses]"
-msgstr "[주소]"
-
-#: ../midori/main.c:2087
+#: ../midori/main.c:1950
msgid "Please report comments, suggestions and bugs to:"
msgstr "코멘트, 제안, 버그 등을 이곳에 보고해 주십시오:"
-#: ../midori/main.c:2089
+#: ../midori/main.c:1952
msgid "Check for new versions at:"
msgstr "다음에서 새 버전 검색:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
+#: ../midori/main.c:2091
msgid "Saved logins and _passwords"
msgstr "저장한 사용자 이름과 암호(_P)"
-#: ../midori/main.c:2175
+#: ../midori/main.c:2093
msgid "Cookies and Website data"
msgstr "쿠키와 웹사이트 데이터"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
+#: ../midori/main.c:2097 ../midori/midori-preferences.c:508
+#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470
msgid "Web Cache"
msgstr "웹 캐시"
-#: ../midori/main.c:2182
+#: ../midori/main.c:2100
msgid "Website icons"
msgstr "웹 사이트 아이콘"
-#: ../midori/main.c:2288
+#: ../midori/main.c:2210
msgid "An unknown error occured"
msgstr "알 수 없는 오류가 발생했습니다."
-#: ../midori/main.c:2395
+#: ../midori/main.c:2325
msgid "An instance of Midori is already running but not responding.\n"
msgstr "미도리를 이미 실행했지만 응답이 없습니다.\n"
-#: ../midori/main.c:2431
+#: ../midori/main.c:2359
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "책갈피를 읽어올 수 없습니다: %s\n"
-#: ../midori/main.c:2479
+#: ../midori/main.c:2392
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "휴지통을 열 수 없습니다: %s\n"
-#: ../midori/main.c:2492
+#: ../midori/main.c:2405
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "기록을 열 수 없습니다: %s\n"
-#: ../midori/main.c:2508
+#: ../midori/main.c:2420
msgid "The following errors occured:"
msgstr "다음의 오류가 발생했습니다:"
-#: ../midori/main.c:2524
+#: ../midori/main.c:2436
msgid "_Ignore"
msgstr "무시(_I)"
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "책갈피(_B)"
+#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:534
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "기대하지 않은 동작 '%s'."
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060
+#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6251
msgid "_Bookmarks"
msgstr "책갈피(_B)"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1373
msgid "Add Boo_kmark"
msgstr "책갈피 더하기(_K)"
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "콘솔(_C)"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1374
msgid "_Extensions"
msgstr "확장 기능(_E)"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589
+#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700
msgid "_History"
msgstr "기록(_H)"
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "홈페이지(_H)"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1376
msgid "_Userscripts"
msgstr "사용자 스크립트(_U)"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1377
+msgid "User_styles"
+msgstr "사용자 스타일(_S)"
+
+#: ../midori/midori-app.c:1378
msgid "New _Tab"
msgstr "새 탭(_T)"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1379
msgid "_Transfers"
msgstr "전송(_T)"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1380
msgid "Netscape p_lugins"
msgstr "넷스케이프 플러그인(_L)"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1381
msgid "_Closed Tabs"
-msgstr "닫은 탭 (_C)"
+msgstr "닫은 탭(_C)"
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216
+#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387
msgid "New _Window"
msgstr "새 창(_W)"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1383
msgid "New _Folder"
msgstr "새 폴더(_F)"
+#: ../midori/midori-app.c:1437
+msgid "[Addresses]"
+msgstr "[주소]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "파일이 없습니다."
@@ -394,140 +450,113 @@ msgstr "책갈피 형식을 알 수 없습니다."
msgid "Writing failed."
msgstr "쓸 수 없습니다."
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526
+msgid "Go forward to the next page"
+msgstr "다음 들렀던 페이지로 갑니다"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:354 ../midori/midori-browser.c:5534
+#: ../midori/midori-browser.c:5537
+msgid "Go to the next sub-page"
+msgstr "다음 들렀던 하위 페이지로 갑니다"
+
+#: ../midori/midori-browser.c:441 ../midori/midori-browser.c:5475
+#: ../midori/midori-browser.c:5484
msgid "Reload the current page"
msgstr "현재 페이지 다시 불러오기"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481
msgid "Stop loading the current page"
msgstr "현재 페이지 불러오기 중지"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:519
#, c-format
msgid "Failed to update title: %s\n"
msgstr "제목 업데이트 실패: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "기대하지 않은 동작 '%s'."
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:614
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (사생활 보호 모드)"
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "최상위 폴더"
+#: ../midori/midori-browser.c:724 ../midori/midori-browser.c:766
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "책갈피"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:826
msgid "New folder"
msgstr "새 폴더"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:826
msgid "Edit folder"
msgstr "폴더 편집"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:828
msgid "New bookmark"
msgstr "새 책갈피"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:828
msgid "Edit bookmark"
msgstr "책갈피 편집"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "제목(_T):"
+#: ../midori/midori-browser.c:862
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "이 책갈피의 이름을 입력한 후 보관할 장소를 선택하십시오."
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "주소(_A):"
-
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326
-msgid "_Folder:"
-msgstr "폴더(_F):"
-
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:923
msgid "Add to _Speed Dial"
msgstr "단축 번호에 더하기(_S)"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:929
msgid "Show in the tool_bar"
msgstr "도구 모음에 보이기(_B)"
-#: ../midori/midori-browser.c:905
+#: ../midori/midori-browser.c:937
msgid "Run as _web application"
msgstr "웹 응용 프로그램으로 실행(_W)"
-#: ../midori/midori-browser.c:976
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "이 폴더에 파일 \"%s\"을(를) 저장할 수 없습니다."
-
-#: ../midori/midori-browser.c:978
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "이 위치에 쓸 수 있는 권한을 가지고 있지 않습니다."
-
-#: ../midori/midori-browser.c:985
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "\"%s\"을(를) 다운로드 할 빈 공간이 부족합니다."
-
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "파일 다운로드에는 %s이(가) 필요합니다 만 %s 만이 남아있습니다."
-
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504
msgid "Save file as"
msgstr "다른 이름으로 저장"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "새 창"
+#: ../midori/midori-browser.c:1065
+msgid "Save associated _resources"
+msgstr "관련된 자원 저장(_R)"
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1323
msgid "A new window has been opened"
msgstr "새 창이 열렸습니다."
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "새 탭"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1326
msgid "A new tab has been opened"
msgstr "새 탭이 열렸습니다."
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1343
msgid "Error opening the image!"
msgstr "그림을 여는 중 오류가 발생했습니다!"
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1344
msgid "Can not open selected image in a default viewer."
msgstr "기본 그림 보기 프로그램으로 선택할 그림을 열 수 없습니다."
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1350
msgid "Error downloading the image!"
msgstr "그림을 다운로드하는 중 오류가 발생했습니다!"
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1351
msgid "Can not download selected image."
msgstr "선택한 그림을 다운로드할 수 없습니다."
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1408
msgid "Save file"
msgstr "파일 저장"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2335
msgid "Open file"
msgstr "파일 열기"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2467
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -540,140 +569,156 @@ msgstr ""
"이 외에 미도리 기본 설정 안 프로그램 탭으로 이동하여 뉴스 수집기를 선택하면 "
"다음 뉴스 피드 아이콘을 누를 때 자동으로 추가될 것입니다."
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2473 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "새 피드"
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5550
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "새 책갈피 더하기"
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "비어있음"
-#: ../midori/midori-browser.c:3467
+#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507
msgid "Toggle text cursor navigation"
msgstr ""
"키보드로 커서를 조작하여 페이지의 텍스트 사이를 이동하는 기능을 켜고 끄기"
-#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753
+#: ../midori/midori-browser.c:3509
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"캐럿 브라우징을 켜고 끄려면 F7 키를 눌러주십시오. 사용하게 되면 모든 웹사이트"
+"에 텍스트 커서가 표시됩니다."
+
+#: ../midori/midori-browser.c:3512
+msgid "_Enable Caret Browsing"
+msgstr "캐럿 브라우징 사용(_E)"
+
+#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "새 기록 항목 삽입 실패: %s\n"
-#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "전부 탭으로 열기(_T)"
-#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "새 탭에서 열기(_T)"
-#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657
-#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2904
+#: ../midori/midori-view.c:4880 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "새 창에서 열기(_W)"
-#: ../midori/midori-browser.c:4213
+#: ../midori/midori-browser.c:4329
msgid "Arora"
msgstr "아로라"
-#: ../midori/midori-browser.c:4214
+#: ../midori/midori-browser.c:4330
msgid "Kazehakase"
msgstr "카제하카세"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4331
msgid "Opera"
msgstr "오페라"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4332
msgid "Konqueror"
msgstr "컨쿼러"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4333
msgid "Epiphany"
msgstr "에피파니"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4334
#, c-format
msgid "Firefox (%s)"
msgstr "파이어폭스 (%s)"
-#: ../midori/midori-browser.c:4239
-msgid "Import bookmarks..."
-msgstr "책갈피 가져오기..."
+#: ../midori/midori-browser.c:4335
+msgid "Midori 0.2.6"
+msgstr "미도리 0.2.6"
-#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:4356
+msgid "Import bookmarks…"
+msgstr "책갈피 가져오기…"
+
+#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555
msgid "_Import bookmarks"
msgstr "책갈피 가져오기(_I)"
-#: ../midori/midori-browser.c:4253
+#: ../midori/midori-browser.c:4370
msgid "_Application:"
msgstr "응용 프로그램(_A):"
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4435
msgid "Import from XBEL or HTML file"
msgstr "XBEL 또는 HTML 파일에서 가져오기"
-#: ../midori/midori-browser.c:4353
+#: ../midori/midori-browser.c:4463
msgid "Import from a file"
msgstr "파일에서 가져오기"
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4475
msgid "Failed to import bookmarks"
msgstr "책갈피 가져오기 실패"
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4509
msgid "XBEL Bookmarks"
msgstr "XBEL 책갈피"
-#: ../midori/midori-browser.c:4405
+#: ../midori/midori-browser.c:4514
msgid "Netscape Bookmarks"
msgstr "넷스케이프 책갈피"
-#: ../midori/midori-browser.c:4419
+#: ../midori/midori-browser.c:4528
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "미도리는 XBEL(*.xbel) 그리고 넷스케이프(*.html)로만 내보낼 수 있습니다"
-#: ../midori/midori-browser.c:4434
+#: ../midori/midori-browser.c:4543
msgid "Failed to export bookmarks"
msgstr "책갈피 내보내기 실패"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4556
+#: ../midori/midori-browser.c:4665
msgid "Clear Private Data"
msgstr "개인 데이터 모두 지우기"
-#: ../midori/midori-browser.c:4560
+#: ../midori/midori-browser.c:4669
msgid "_Clear private data"
msgstr "개인 데이터 지우기(_C)"
-#: ../midori/midori-browser.c:4573
+#: ../midori/midori-browser.c:4684
msgid "Clear the following data:"
msgstr "다음의 데이터 지우기:"
-#: ../midori/midori-browser.c:4583
+#: ../midori/midori-browser.c:4694
msgid "Last open _tabs"
msgstr "마지막에 연 탭(_T)"
-#: ../midori/midori-browser.c:4609
+#: ../midori/midori-browser.c:4720
msgid "Clear private data when _quitting Midori"
msgstr "미도리를 종료할 때 개인 데이터를 제거합니다(_Q)"
-#: ../midori/midori-browser.c:4804
+#: ../midori/midori-browser.c:4935
msgid "A lightweight web browser."
msgstr "가벼운 웹 브라우저."
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:4936
msgid "See about:version for version info."
msgstr "버전 정보를 보려면 about:version 페이지를 확인하십시오."
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:4938
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -681,1431 +726,911 @@ msgid ""
"option) any later version."
msgstr ""
"이 라이브러리는 자유 소프트웨어입니다; 이 프로그램은 자유 소프트웨어 재단에"
-"서 발표한 GNU 약소 일반 공중 사용 허가서 버전 2.1 또는 이후 버전 (선택적)에 "
-"따라 재배포하거나 수정할 수 있습니다."
+"서 발표한 GNU 약소 일반 공중 사용 허가서 버전 2.1 또는 이후 버전(선택적)에 따"
+"라 재배포하거나 수정할 수 있습니다."
-#: ../midori/midori-browser.c:4828
+#: ../midori/midori-browser.c:4968
msgid "translator-credits"
msgstr ""
"Seo Sanghyeon \n"
"김보람 "
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5385
msgid "_File"
msgstr "파일(_F)"
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5388
msgid "Open a new window"
msgstr "새 창을 엽니다"
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5391
msgid "Open a new tab"
msgstr "새 탭을 엽니다"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5393
msgid "New P_rivate Browsing Window"
msgstr "새 사생활 보호 모드 창(_R)"
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5397
msgid "Open a file"
msgstr "파일을 엽니다"
-#: ../midori/midori-browser.c:5228
-msgid "_Save Page As..."
-msgstr "다른 이름으로 페이지 저장(_S)..."
+#: ../midori/midori-browser.c:5399
+msgid "_Save Page As…"
+msgstr "다른 이름으로 페이지 저장(_S)…"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5400
msgid "Save to a file"
msgstr "파일로 저장"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5402
msgid "Add to Speed _dial"
msgstr "단축 번호 더하기(_D)"
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5406
msgid "Add Shortcut to the _desktop"
msgstr "바로 가기를 바탕 화면에 추가(_D)"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5408
msgid "Create _Launcher"
msgstr "실행 아이콘 만들기(_L)"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5412
msgid "Subscribe to News _feed"
msgstr "뉴스 피드 구독(_F)"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5418
msgid "_Close Tab"
msgstr "탭 닫기(_C)"
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5419
msgid "Close the current tab"
msgstr "현재 탭을 닫습니다."
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5421
msgid "C_lose Window"
msgstr "창 닫기(_L)"
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5425
+msgid "_Share"
+msgstr "공유(_S)"
+
+#: ../midori/midori-browser.c:5430
msgid "Print the current page"
msgstr "현재 페이지를 인쇄합니다"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5433
msgid "Close a_ll Windows"
msgstr "모든 창 닫기(_L)"
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5436
msgid "_Edit"
msgstr "편집(_E)"
-#: ../midori/midori-browser.c:5282
-msgid "_Find..."
-msgstr "찾기(_F)..."
+#: ../midori/midori-browser.c:5459
+msgid "_Find…"
+msgstr "찾기(_F)…"
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5460
msgid "Find a word or phrase in the page"
msgstr "이 페이지에서 단어나 단락을 찾습니다"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5462
msgid "Find _Next"
msgstr "다음 찾기(_N)"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5465
msgid "Find _Previous"
msgstr "이전 찾기(_P)"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5469
msgid "Configure the application preferences"
msgstr "프로그램 기본 설정을 편집합니다"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5471
msgid "_View"
msgstr "보기(_V)"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5472
msgid "_Toolbars"
msgstr "도구 모음(_T)"
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5477
msgid "Reload page without caching"
msgstr "저장하지 않고 페이지 다시 불러오기"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5487
msgid "Increase the zoom level"
msgstr "확대/축소 단계 키우기"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5490
msgid "Decrease the zoom level"
msgstr "확대/축소 단계 줄이기"
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5494
msgid "_Encoding"
msgstr "인코딩(_E)"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5496
msgid "View So_urce"
msgstr "소스 보기(_U)"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5499
msgid "Ca_ret Browsing"
msgstr "캐럿 브라우징(_R)"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5503
msgid "Toggle fullscreen view"
msgstr "전체 화면 보기 전환"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5505
msgid "Scroll _Left"
msgstr "왼쪽으로 스크롤(_L)"
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5508
msgid "Scroll _Down"
msgstr "아래쪽으로 스크롤(_D)"
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5511
msgid "Scroll _Up"
msgstr "위쪽으로 스크롤(_U)"
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5514
msgid "Scroll _Right"
msgstr "오른쪽으로 스크롤(_R)"
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5517
+msgid "_Readable"
+msgstr "읽기 쉽게(_R)"
+
+#: ../midori/midori-browser.c:5520
msgid "_Go"
msgstr "이동(_G)"
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5523
msgid "Go back to the previous page"
msgstr "전에 들렀던 페이지로 갑니다"
-#: ../midori/midori-browser.c:5346
-msgid "Go forward to the next page"
-msgstr "다음 들렀던 페이지로 갑니다"
-
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5530
msgid "Go to the previous sub-page"
msgstr "전에 들렀던 하위 페이지로 갑니다"
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5354
-msgid "Go to the next sub-page"
-msgstr "다음 들렀던 하위 페이지로 갑니다"
+#: ../midori/midori-browser.c:5539
+msgid "_Homepage"
+msgstr "홈페이지(_H)"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5540
msgid "Go to your homepage"
msgstr "홈 페이지로 갑니다."
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5542
msgid "Empty Trash"
msgstr "휴지통 비우기"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5545
msgid "Undo _Close Tab"
msgstr "닫은 탭 되돌리기(_C)"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5552
msgid "Add a new _folder"
msgstr "새 폴더 더하기(_F)"
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5558
msgid "_Export bookmarks"
msgstr "책갈피 내보내기(_E)"
-#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "검색 엔진 관리(_M)"
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5564
msgid "_Clear Private Data"
msgstr "개인 데이터 지우기(_C)"
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5567
msgid "_Inspect Page"
msgstr "페이지 검사(_I)"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5571
msgid "_Previous Tab"
msgstr "이전 탭(_P)"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5574
msgid "_Next Tab"
msgstr "다음 탭(_N)"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5576
msgid "Move Tab _Backward"
msgstr "탭을 뒤로 옮기기(_B)"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5578
msgid "_Move Tab Forward"
msgstr "탭을 앞으로 옮기기(_M)"
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5581
msgid "Focus _Current Tab"
msgstr "현재 탭에 포커스 맞추기(_C)"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5584
msgid "Focus _Next view"
msgstr "다음 보기에 포커스(_N)"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5587
msgid "Only show the Icon of the _Current Tab"
msgstr "현재 탭의 아이콘만 보이기(_C)"
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5590
msgid "_Duplicate Current Tab"
msgstr "현재 탭 복제(_D)"
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5593
msgid "Close Ot_her Tabs"
msgstr "다른 탭 닫기(_H)"
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5596
msgid "Open last _session"
msgstr "마지막 세션 열기(_S)"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5599
msgid "_Help"
msgstr "도움말(_H)"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5601
msgid "_Frequent Questions"
msgstr "일반적인 질문들(_F)"
-#: ../midori/midori-browser.c:5421
-msgid "_Report a Problem..."
-msgstr "버그 보고(_R)..."
+#: ../midori/midori-browser.c:5604
+msgid "_Report a Problem…"
+msgstr "버그 보고(_R)…"
-#: ../midori/midori-browser.c:5433
-msgid "_Menubar"
-msgstr "메뉴 모음(_M)"
-
-#: ../midori/midori-browser.c:5437
-msgid "_Navigationbar"
-msgstr "내비게이션 줄(_N)"
-
-#: ../midori/midori-browser.c:5441
-msgid "Side_panel"
-msgstr "가장자리 패널(_P)"
-
-#: ../midori/midori-browser.c:5442
-msgid "Sidepanel"
-msgstr "가장자리 패널"
-
-#: ../midori/midori-browser.c:5445
-msgid "_Bookmarkbar"
-msgstr "책갈피 모음(_B)"
-
-#: ../midori/midori-browser.c:5449
-msgid "_Statusbar"
-msgstr "상태 표시줄(_S)"
-
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311
-msgid "_Automatic"
-msgstr "자동(_A)"
-
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "중국어 번체 (Big5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5465
-msgid "Japanese (SHIFT__JIS)"
-msgstr "일본어 (Shift_JIS)"
-
-#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238
-msgid "Korean (EUC-KR)"
-msgstr "한국어 (EUC-KR)"
-
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239
-msgid "Russian (KOI8-R)"
-msgstr "키릴어 (KOI8-R)"
-
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240
-msgid "Unicode (UTF-8)"
-msgstr "유니코드 (UTF-8)"
-
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241
-msgid "Western (ISO-8859-1)"
-msgstr "서양어 (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242
-#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "사용자 지정..."
-
-#: ../midori/midori-browser.c:5985
-msgid "_Separator"
-msgstr "구분선(_S)"
-
-#: ../midori/midori-browser.c:5992
-msgid "_Location..."
-msgstr "위치(_L)..."
-
-#: ../midori/midori-browser.c:5994
-msgid "Open a particular location"
-msgstr "특정 위치 열기"
-
-#: ../midori/midori-browser.c:6016
-msgid "_Web Search..."
-msgstr "웹 검색(_W)..."
-
-#: ../midori/midori-browser.c:6018
-msgid "Run a web search"
-msgstr "웹 검색 실행"
-
-#: ../midori/midori-browser.c:6045
-msgid "Reopen a previously closed tab or window"
-msgstr "이전에 닫은 탭이나 창을 다시 엽니다"
-
-#: ../midori/midori-browser.c:6062
-msgid "Show the saved bookmarks"
-msgstr "저장한 책갈피 보기"
-
-#: ../midori/midori-browser.c:6079
+#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270
msgid "_Tools"
msgstr "도구(_T)"
-#: ../midori/midori-browser.c:6095
+#: ../midori/midori-browser.c:5616
+msgid "_Menubar"
+msgstr "메뉴 모음(_M)"
+
+#: ../midori/midori-browser.c:5620
+msgid "_Navigationbar"
+msgstr "내비게이션 줄(_N)"
+
+#: ../midori/midori-browser.c:5624
+msgid "Side_panel"
+msgstr "가장자리 패널(_P)"
+
+#: ../midori/midori-browser.c:5625
+msgid "Sidepanel"
+msgstr "가장자리 패널"
+
+#: ../midori/midori-browser.c:5628
+msgid "_Bookmarkbar"
+msgstr "책갈피 모음(_B)"
+
+#: ../midori/midori-browser.c:5632
+msgid "_Statusbar"
+msgstr "상태 표시줄(_S)"
+
+#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199
+msgid "_Automatic"
+msgstr "자동(_A)"
+
+#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123
+msgid "Chinese Traditional (BIG5)"
+msgstr "중국어 번체(BIG5)"
+
+#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124
+msgid "Chinese Simplified (GB18030)"
+msgstr "중국어 간체(GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5651
+msgid "Japanese (SHIFT__JIS)"
+msgstr "일본어(Shift_JIS)"
+
+#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126
+msgid "Korean (EUC-KR)"
+msgstr "한국어(EUC-KR)"
+
+#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127
+msgid "Russian (KOI8-R)"
+msgstr "키릴어(KOI8-R)"
+
+#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128
+msgid "Unicode (UTF-8)"
+msgstr "유니코드(UTF-8)"
+
+#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129
+msgid "Western (ISO-8859-1)"
+msgstr "서양어(ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5666
+msgid "Custom…"
+msgstr "사용자 지정…"
+
+#: ../midori/midori-browser.c:6176
+msgid "_Separator"
+msgstr "구분선(_S)"
+
+#: ../midori/midori-browser.c:6183
+msgid "_Location…"
+msgstr "위치(_L)…"
+
+#: ../midori/midori-browser.c:6185
+msgid "Open a particular location"
+msgstr "특정 위치 열기"
+
+#: ../midori/midori-browser.c:6207
+msgid "_Web Search…"
+msgstr "웹 검색(_W)…"
+
+#: ../midori/midori-browser.c:6209
+msgid "Run a web search"
+msgstr "웹 검색 실행"
+
+#: ../midori/midori-browser.c:6236
+msgid "Reopen a previously closed tab or window"
+msgstr "이전에 닫은 탭이나 창을 다시 엽니다"
+
+#: ../midori/midori-browser.c:6253
+msgid "Show the saved bookmarks"
+msgstr "저장한 책갈피 보기"
+
+#: ../midori/midori-browser.c:6286
msgid "_Window"
msgstr "창(_W)"
-#: ../midori/midori-browser.c:6097
+#: ../midori/midori-browser.c:6288
msgid "Show a list of all open tabs"
msgstr "모든 열려있는 탭의 목록을 표시합니다"
-#: ../midori/midori-browser.c:6111
+#: ../midori/midori-browser.c:6302
msgid "_Menu"
msgstr "메뉴(_M)"
-#: ../midori/midori-browser.c:6113
+#: ../midori/midori-browser.c:6304
msgid "Menu"
msgstr "메뉴"
-#: ../midori/midori-browser.c:6927
+#: ../midori/midori-browser.c:7134
#, c-format
msgid "Unexpected setting '%s'"
msgstr "기대하지 않은 설정 '%s'"
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:330
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "확장 기능 '%s'의 설정을 불러올 수 없습니다: %s\n"
-#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
-#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:752 ../midori/midori-extension.c:849
+#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058
+#: ../extensions/addons.c:1686
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "확장 기능 '%s'의 설정을 저장할 수 없습니다: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "%s(으)로 검색"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "다음으로 검색..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "다음으로 검색…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "기록에서 선택 실패\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "%s을(를) 검색"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "인증서 내보내기"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "서명 인증 기관을 알 수 없습니다."
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "인증서가 사이트에서 가져온 신원 기대값과 일치하지 않습니다."
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "아직 인증서 활성 시간이 시작하지 않았습니다."
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "인증서가 만료되었습니다."
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr "인증서가 GTlsConnection의 인증 철회 목록에 의해 취소되었습니다."
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "인증서의 알고리즘이 안전하지 않습니다."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "인증서를 확인하던 중 다른 오류가 발생했습니다."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "인증서 내보내기(_E)"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "스스로 서명함"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "자세한 보안 내용"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "붙여넣기 후 진행(_R)"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "확인하지 않음"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "확인하였고 암호화 한 연결"
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1989
msgid "Open, unencrypted connection"
msgstr "열린, 암호화하지 않은 연결"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "창을 오른쪽으로 이동"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "패널 닫기"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "창을 왼쪽으로 이동"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:105
msgid "Show Speed Dial"
msgstr "단축 번호 보이기"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:106
msgid "Show Homepage"
msgstr "홈 페이지 표시"
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:125
msgid "Japanese (SHIFT_JIS)"
-msgstr "일본어 (Shift_JIS)"
+msgstr "일본어(Shift_JIS)"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "사용자 지정..."
+
+#: ../midori/midori-websettings.c:145
msgid "New tab"
msgstr "새 탭"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:146
msgid "New window"
msgstr "새 창"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:147
msgid "Current tab"
msgstr "현재 탭"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:162
msgid "Default"
msgstr "기본 값"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:163
msgid "Icons"
msgstr "아이콘"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:164
msgid "Small icons"
msgstr "작은 아이콘"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:165
msgid "Text"
msgstr "텍스트"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:166
msgid "Icons and text"
msgstr "아이콘 및 텍스트"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:167
msgid "Text beside icons"
msgstr "아이콘 옆에 글자"
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:182
msgid "Automatic (GNOME or environment)"
-msgstr "자동 (그놈 또는 환경 변수)"
+msgstr "자동(그놈 또는 환경 변수)"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:183
msgid "HTTP proxy server"
msgstr "HTTP 프록시 서버"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:184
msgid "No proxy server"
msgstr "프록시 서버 없음"
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:201
+msgid "Chrome"
+msgstr "크롬"
+
+#: ../midori/midori-websettings.c:202
msgid "Safari"
msgstr "사파리"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:203
msgid "iPhone"
msgstr "아이폰"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:204
msgid "Firefox"
msgstr "파이어폭스"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:205
msgid "Internet Explorer"
msgstr "인터넷 익스플로러"
-#: ../midori/midori-websettings.c:400
-msgid "Remember last window size"
-msgstr "마지막에 연 창 크기 기억"
-
-#: ../midori/midori-websettings.c:401
-msgid "Whether to save the last window size"
-msgstr "마지막에 연 창의 크기를 저장할지 결정합니다."
-
-#: ../midori/midori-websettings.c:409
-msgid "Last window width"
-msgstr "마지막에 연 창 너비"
-
-#: ../midori/midori-websettings.c:410
-msgid "The last saved window width"
-msgstr "마지막에 저장한 창의 너비"
-
-#: ../midori/midori-websettings.c:418
-msgid "Last window height"
-msgstr "마지막에 연 창 높이"
-
-#: ../midori/midori-websettings.c:419
-msgid "The last saved window height"
-msgstr "마지막에 저장한 창의 높이"
-
-#: ../midori/midori-websettings.c:444
-msgid "Last panel position"
-msgstr "마지막에 연 패널 위치"
-
-#: ../midori/midori-websettings.c:445
-msgid "The last saved panel position"
-msgstr "마지막에 저장한 연 패널의 위치"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
-msgid "Last panel page"
-msgstr "마지막 패널 페이지"
-
-#: ../midori/midori-websettings.c:455
-msgid "The last saved panel page"
-msgstr "마지막에 저장한 연 패널 페이지"
-
-#: ../midori/midori-websettings.c:463
-msgid "Last Web search"
-msgstr "마지막 웹 검색"
-
-#: ../midori/midori-websettings.c:464
-msgid "The last saved Web search"
-msgstr "마지막에 저장한 한 검색"
-
-#: ../midori/midori-websettings.c:473
-msgid "Show Menubar"
-msgstr "메뉴 모음 표시"
-
-#: ../midori/midori-websettings.c:474
-msgid "Whether to show the menubar"
-msgstr "메뉴 모음을 표시할 지 결정합니다."
-
-#: ../midori/midori-websettings.c:482
-msgid "Show Navigationbar"
-msgstr "내비게이션 바 표시"
-
-#: ../midori/midori-websettings.c:483
-msgid "Whether to show the navigationbar"
-msgstr "내비게이션 바를 표시할지 결정합니다."
-
-#: ../midori/midori-websettings.c:491
-msgid "Show Bookmarkbar"
-msgstr "책갈피 모음 표시"
-
-#: ../midori/midori-websettings.c:492
-msgid "Whether to show the bookmarkbar"
-msgstr "책갈피 모음을 표시할 지 결정합니다."
-
-#: ../midori/midori-websettings.c:500
-msgid "Show Panel"
-msgstr "패널 표시"
-
-#: ../midori/midori-websettings.c:501
-msgid "Whether to show the panel"
-msgstr "패널을 표시할 지 결정합니다."
-
-#: ../midori/midori-websettings.c:509
-msgid "Show Statusbar"
-msgstr "상태 표시줄을 보기"
-
-#: ../midori/midori-websettings.c:510
-msgid "Whether to show the statusbar"
-msgstr "상태를 표시할 지 결정합니다."
-
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:278
msgid "Toolbar Style:"
msgstr "도구 모음 유형:"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:279
msgid "The style of the toolbar"
msgstr "도구 모음 유형:"
-#: ../midori/midori-websettings.c:529
-msgid "Toolbar Items"
-msgstr "도구 모음 항목"
-
-#: ../midori/midori-websettings.c:530
-msgid "The items to show on the toolbar"
-msgstr "도구 모음에 보일 항목"
-
-#: ../midori/midori-websettings.c:538
-msgid "Compact Sidepanel"
-msgstr "간략한 사이드 패널(_C)"
-
-#: ../midori/midori-websettings.c:539
-msgid "Whether to make the sidepanel compact"
-msgstr "사이드 패널을 간단하게 표시할지 결정합니다."
-
-#: ../midori/midori-websettings.c:554
-msgid "Align sidepanel on the right"
-msgstr "사이드 표시 줄을 오른쪽에"
-
-#: ../midori/midori-websettings.c:555
-msgid "Whether to align the sidepanel on the right"
-msgstr "오른쪽에 사이드 패널을 보여줄 지 결정합니다."
-
-#: ../midori/midori-websettings.c:570
-msgid "Open panels in separate windows"
-msgstr "패널 별도의 창에 열기"
-
-#: ../midori/midori-websettings.c:571
-msgid "Whether to always open panels in separate windows"
-msgstr "패널을 항상 별도의 창에 보일지 선택합니다."
-
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:288
msgid "When Midori starts:"
msgstr "미도리를 시작할 때:"
-#: ../midori/midori-websettings.c:581
-msgid "What to do when Midori starts"
-msgstr "미도리를 시작할 때 실행할 동작을 설정합니다."
-
-#: ../midori/midori-websettings.c:590
-msgid "Homepage:"
-msgstr "홈페이지:"
-
-#: ../midori/midori-websettings.c:591
-msgid "The homepage"
-msgstr "홈페이지"
-
-#: ../midori/midori-websettings.c:606
-msgid "Show crash dialog"
-msgstr "충돌 대화 상자 보기"
-
-#: ../midori/midori-websettings.c:607
-msgid "Show a dialog after Midori crashed"
-msgstr "미도리가 충돌한 후 대화 상자를 표시합니다"
-
-#: ../midori/midori-websettings.c:615
-msgid "Save downloaded files to:"
-msgstr "다운로드한 파일을 저장할 경로:"
-
-#: ../midori/midori-websettings.c:616
-msgid "The folder downloaded files are saved to"
-msgstr "다운로드한 파일을 저장하는 폴더"
-
-#: ../midori/midori-websettings.c:624
-msgid "Text Editor"
-msgstr "텍스트 편집기"
-
-#: ../midori/midori-websettings.c:625
-msgid "An external text editor"
-msgstr "외부 텍스트 편집기"
-
-#: ../midori/midori-websettings.c:640
-msgid "News Aggregator"
-msgstr "뉴스 수집기"
-
-#: ../midori/midori-websettings.c:641
-msgid "An external news aggregator"
-msgstr "외부 뉴스 수집기"
-
-#: ../midori/midori-websettings.c:649
-msgid "Location entry Search"
-msgstr "위치 항목에서 검색"
-
-#: ../midori/midori-websettings.c:650
-msgid "The search to perform inside the location entry"
-msgstr "위치 항목 안에서 검색을 실행합니다."
-
-#: ../midori/midori-websettings.c:658
-msgid "Preferred Encoding"
-msgstr "우선할 인코딩"
-
-#: ../midori/midori-websettings.c:659
-msgid "The preferred character encoding"
-msgstr "우선할 문자 인코딩"
-
-#: ../midori/midori-websettings.c:669
-msgid "Always Show Tabbar"
-msgstr "탭 모음 항상 보기"
-
-#: ../midori/midori-websettings.c:670
-msgid "Always show the tabbar"
-msgstr "탭 모음을 항상 볼 수 있게 합니다."
-
-#: ../midori/midori-websettings.c:683
-msgid "Close Buttons on Tabs"
-msgstr "탭에 닫기 단추 표시"
-
-#: ../midori/midori-websettings.c:684
-msgid "Whether tabs have close buttons"
-msgstr "탭에 닫기 단추를 표시할지 결정합니다."
-
-#: ../midori/midori-websettings.c:709
+#: ../midori/midori-websettings.c:325
msgid "Open new pages in:"
msgstr "새 페이지 다음에 열기:"
-#: ../midori/midori-websettings.c:710
-msgid "Where to open new pages"
-msgstr "새 페이지를 어디에서 열지 결정합니다."
-
-#: ../midori/midori-websettings.c:719
-msgid "Middle click opens Selection"
-msgstr "가운데 버튼 클릭으로 선택한 주소 열기"
-
-#: ../midori/midori-websettings.c:720
-msgid "Load an address from the selection via middle click"
-msgstr "선택 후 마우스 가운데 버튼 클릭으로 주소를 불러옵니다."
-
-#: ../midori/midori-websettings.c:728
-msgid "Open tabs in the background"
-msgstr "탭을 연 후 바로 전환하지 않음"
-
-#: ../midori/midori-websettings.c:729
-msgid "Whether to open new tabs in the background"
-msgstr "탭이 열렸을 때 바로 전환할지 결정합니다"
-
-#: ../midori/midori-websettings.c:737
-msgid "Open Tabs next to Current"
-msgstr "탭을 현재 탭 옆에 열기"
-
-#: ../midori/midori-websettings.c:738
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "새 탭을 현재 탭의 옆에 열지 마지막 탭 다음에 열지 결정합니다."
-
-#: ../midori/midori-websettings.c:746
-msgid "Open popups in tabs"
-msgstr "팝업 창을 탭에 열기"
-
-#: ../midori/midori-websettings.c:747
-msgid "Whether to open popup windows in tabs"
-msgstr "팝업 창을 탭에 열지 결정합니다."
-
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "자동으로 그림 읽기"
-
-#: ../midori/midori-websettings.c:758
-msgid "Load and display images automatically"
-msgstr "그림을 자동으로 읽고 표시합니다."
-
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "스크립트 사용"
-
-#: ../midori/midori-websettings.c:766
-msgid "Enable embedded scripting languages"
-msgstr "스크립트 언어를 사용합니다."
-
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "넷스케이프 플러그인 사용"
-
-#: ../midori/midori-websettings.c:774
-msgid "Enable embedded Netscape plugin objects"
-msgstr "넷스케이프 플러그인 개체를 사용합니다."
-
-#: ../midori/midori-websettings.c:789
-msgid "Enable Spell Checking"
-msgstr "맞춤법 검사 사용"
-
-#: ../midori/midori-websettings.c:790
-msgid "Enable spell checking while typing"
-msgstr "입력 중 맞춤법 검사를 사용합니다."
-
-#: ../midori/midori-websettings.c:796
-msgid "Enable HTML5 database support"
-msgstr "HTML5 데이터 베이스 지원 사용"
-
-#: ../midori/midori-websettings.c:797
-msgid "Whether to enable HTML5 database support"
-msgstr "HTML5 데이터 베이스 지원을 사용할지 결정합니다."
-
-#: ../midori/midori-websettings.c:803
-msgid "Enable HTML5 local storage support"
-msgstr "HTML5 로컬 기억 장치 지원 사용"
-
-#: ../midori/midori-websettings.c:804
-msgid "Whether to enable HTML5 local storage support"
-msgstr "HTML5 로컬 기억 장치 지원을 사용할지 결정합니다."
-
-#: ../midori/midori-websettings.c:810
-msgid "Enable offline web application cache"
-msgstr "오프라인 웹 응용 프로그램 캐시 사용"
-
-#: ../midori/midori-websettings.c:811
-msgid "Whether to enable offline web application cache"
-msgstr "오프라인 웹 응용 프로그램 캐시를 사용할지 결정합니다."
-
-#: ../midori/midori-websettings.c:827
-msgid "Flash window on background tabs"
-msgstr "배경 탭에 있는 창 반짝거리게 하기"
-
-#: ../midori/midori-websettings.c:828
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr "배경에 새 탭이 열리면 브라우저 창을 반짝거리게 합니다"
-
-#: ../midori/midori-websettings.c:836
-msgid "Enable WebGL support"
-msgstr "웹GL 지원 사용"
-
-#: ../midori/midori-websettings.c:837
-msgid "Allow websites to use OpenGL rendering"
-msgstr "웹페이지를 오픈GL을 사용해 표현할 수 있도록 합니다."
-
-#: ../midori/midori-websettings.c:863
-msgid "Zoom Text and Images"
-msgstr "문자와 그림 확대"
-
-#: ../midori/midori-websettings.c:864
-msgid "Whether to zoom text and images"
-msgstr "글자와 그림을 확대할지 결정합니다."
-
-#: ../midori/midori-websettings.c:879
-msgid "Find inline while typing"
-msgstr "주소 창에 입력할 때 바로 찾기"
-
-#: ../midori/midori-websettings.c:880
-msgid "Whether to automatically find inline while typing"
-msgstr "입력 중 자동으로 찾을지 결정합니다."
-
-#: ../midori/midori-websettings.c:895
-msgid "Kinetic scrolling"
-msgstr "동역학 스크롤"
-
-#: ../midori/midori-websettings.c:896
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "속도에 따라 관성이 걸린 것처럼 스크롤 합니다."
-
-#: ../midori/midori-websettings.c:904
-msgid "Delete old Cookies after:"
-msgstr "쿠키를 보존할 기간:"
-
-#: ../midori/midori-websettings.c:905
-msgid "The maximum number of days to save cookies for"
-msgstr "쿠키를 저장할 최장 기간을 설정합니다"
-
-#: ../midori/midori-websettings.c:921
-msgid "Only accept Cookies from sites you visit"
-msgstr "방문한 사이트의 쿠키만을 허용"
-
-#: ../midori/midori-websettings.c:922
-msgid "Block cookies sent by third-party websites"
-msgstr "서드 파티 웹 사이트가 보낸 쿠키 막기"
-
-#: ../midori/midori-websettings.c:936
-msgid "Delete pages from history after:"
-msgstr "기록에 페이지를 보존할 기간:"
-
-#: ../midori/midori-websettings.c:937
-msgid "The maximum number of days to save the history for"
-msgstr "방문 기록을 저장할 최대 기간을 설정합니다"
-
-#: ../midori/midori-websettings.c:952
-msgid "Proxy server"
-msgstr "프록시 서버"
-
-#: ../midori/midori-websettings.c:953
-msgid "The type of proxy server to use"
-msgstr "사용할 프록시 서버의 종류"
-
-#: ../midori/midori-websettings.c:962
-msgid "HTTP Proxy Server"
-msgstr "HTTP 프록시 서버"
-
-#: ../midori/midori-websettings.c:963
-msgid "The proxy server used for HTTP connections"
-msgstr "HTTP 연결에 사용하는 프록시 서버"
-
-#: ../midori/midori-websettings.c:978
-msgid "Port"
-msgstr "포트"
-
-#: ../midori/midori-websettings.c:979
-msgid "The proxy server port used for HTTP connections"
-msgstr "HTTP 연결에 사용하는 프록시 서버 포트"
-
-#: ../midori/midori-websettings.c:997
-msgid "The maximum size of cached pages on disk"
-msgstr "디스크에 페이지를 저장할 최대 공간"
-
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
+#: ../midori/midori-websettings.c:388
msgid "Identify as"
msgstr "식별 명"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:389
msgid "What to identify as to web pages"
msgstr "웹 페이지에 보낼 식별 명을 지정합니다."
-#: ../midori/midori-websettings.c:1031
-msgid "Identification string"
-msgstr "식별 문자열"
-
-#: ../midori/midori-websettings.c:1032
-msgid "The application identification string"
-msgstr "응용 프로그램 식별 문자열"
-
-#: ../midori/midori-websettings.c:1048
-msgid "Preferred languages"
-msgstr "우선할 인코딩"
-
-#: ../midori/midori-websettings.c:1049
-msgid ""
-"A comma separated list of languages preferred for rendering multilingual "
-"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-msgstr ""
-"복수의 언어로 작성한 웹 페이지를 읽을 때 사용할 언어의 우선순위를 쉼표로 구분"
-"해 지정합니다. 예) \"de\", \"ru,nl\" 또는 \"en-us;q=1.0, fr-fr;q=0.667\""
-
-#: ../midori/midori-websettings.c:1064
-msgid "Clear private data"
-msgstr "개인 데이터 지우기"
-
-#: ../midori/midori-websettings.c:1065
-msgid "The private data selected for deletion"
-msgstr "삭제하기 위해 선택한 개인 데이터"
-
-#: ../midori/midori-websettings.c:1080
-msgid "Clear data"
-msgstr "데이터 지우기"
-
-#: ../midori/midori-websettings.c:1081
-msgid "The data selected for deletion"
-msgstr "삭제할 데이터를 선택했습니다"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
-msgid "Strip referrer details sent to websites"
-msgstr "외부 사이트에 보낼 리퍼러의 자세한 내용을 제거"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "\"리퍼러\" 헤더를 호스트 이름으로 줄이기"
-
-#: ../midori/midori-websettings.c:1146
+#: ../midori/midori-websettings.c:472
msgid "Always use my font choices"
msgstr "항상 사용자가 선택한 글꼴을 사용"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:473
msgid "Override fonts picked by websites with user preferences"
msgstr "웹 사이트에 설정된 글꼴을 사용자 기본 설정으로 대체"
-#: ../midori/midori-view.c:1360
+#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151
+msgid "Trust this website"
+msgstr "이 웹사이트를 신뢰"
+
+#: ../midori/midori-view.c:1149
+msgid "Security unknown"
+msgstr "보안 상태 알 수 없음"
+
+#: ../midori/midori-view.c:1447
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s이(가) HTML5 데이터 베이스를 저장하려 합니다."
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Deny"
msgstr "거부(_D)"
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Allow"
msgstr "허용(_A)"
-#: ../midori/midori-view.c:1392
+#: ../midori/midori-view.c:1480
#, c-format
msgid "%s wants to know your location."
msgstr "%s이(가) 위치를 알고 싶어합니다."
-#: ../midori/midori-view.c:1485
+#: ../midori/midori-view.c:1576
#, c-format
msgid "Error - %s"
msgstr "오류 - %s"
-#: ../midori/midori-view.c:1486
+#: ../midori/midori-view.c:1577
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "페이지 '%s'을(를) 불러올 수 없습니다."
-#: ../midori/midori-view.c:1488
+#: ../midori/midori-view.c:1579
msgid "Try again"
msgstr "다시 시도하십시오"
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
+#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2839
#, c-format
msgid "Send a message to %s"
msgstr "%s에 메시지 보내기"
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
+#: ../midori/midori-view.c:2622
+msgid "Add _search engine..."
+msgstr "검색 엔진 추가(_S)..."
+
+#: ../midori/midori-view.c:2666 ../midori/midori-view.c:2995
msgid "Inspect _Element"
msgstr "요소 검사(_E)"
-#: ../midori/midori-view.c:2480
+#: ../midori/midori-view.c:2718
msgid "Open Link in New _Tab"
msgstr "새 탭에 링크 열기(_T)"
-#: ../midori/midori-view.c:2484
+#: ../midori/midori-view.c:2722
msgid "Open Link in _Foreground Tab"
msgstr "새 탭에 링크 열고 전환(_F)"
-#: ../midori/midori-view.c:2485
+#: ../midori/midori-view.c:2723
msgid "Open Link in _Background Tab"
msgstr "새 탭에 링크 열고 전환 안 함(_B)"
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2726
msgid "Open Link in New _Window"
msgstr "새 창에 링크 열기(_W)"
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2729
msgid "Open Link as Web A_pplication"
msgstr "웹 응용 프로그램으로 링크 열기(_P)"
-#: ../midori/midori-view.c:2496
+#: ../midori/midori-view.c:2734
msgid "Copy Link de_stination"
msgstr "링크 위치 복사(_S)"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2750
msgid "Open _Image in New Tab"
msgstr "그림 새 탭에서 열기(_I)"
-#: ../midori/midori-view.c:2515
-msgid "Copy Image _Address"
-msgstr "그림 주소 복사(_A)"
+#: ../midori/midori-view.c:2753
+msgid "Copy Im_age"
+msgstr "그림 복사(_A)"
-#: ../midori/midori-view.c:2518
+#: ../midori/midori-view.c:2756
msgid "Save I_mage"
msgstr "그림 저장(_M)"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2759
msgid "Open in Image _Viewer"
msgstr "그림 보기 프로그램으로 열기(_V)"
-#: ../midori/midori-view.c:2528
+#: ../midori/midori-view.c:2766
msgid "Copy Video _Address"
msgstr "비디오 주소 복사(_A)"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2769
msgid "Save _Video"
msgstr "비디오 저장(_V)"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2769
msgid "Download _Video"
msgstr "비디오 다운로드(_V)"
-#: ../midori/midori-view.c:2557
+#: ../midori/midori-view.c:2795
msgid "Search _with"
msgstr "다음으로 검색(_W)"
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:2827
msgid "_Search the Web"
msgstr "웹 검색(_S)"
-#: ../midori/midori-view.c:2606
+#: ../midori/midori-view.c:2847
msgid "Open Address in New _Tab"
msgstr "주소 새 탭에서 열기(_T)"
-#: ../midori/midori-view.c:2909
-msgid "Open or download file"
-msgstr "파일을 열거나 다운로드 합니다"
+#: ../midori/midori-view.c:2900
+msgid "Open _Frame in New Tab"
+msgstr "프레임 새 탭에서 열기(_F)"
-#: ../midori/midori-view.c:2929
+#: ../midori/midori-view.c:3155
#, c-format
-msgid "File Type: '%s'"
-msgstr "파일 종류: '%s'"
+msgid "Open or download file from %s"
+msgstr "%s에서 파일을 열거나 다운로드"
-#: ../midori/midori-view.c:2931
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "파일 종류: %s ('%s')"
-
-#: ../midori/midori-view.c:2935
+#: ../midori/midori-view.c:3168
#, c-format
msgid "File Name: %s"
msgstr "파일 이름: %s"
-#: ../midori/midori-view.c:2955
+#: ../midori/midori-view.c:3173
+#, c-format
+msgid "File Type: '%s'"
+msgstr "파일 종류: '%s'"
+
+#: ../midori/midori-view.c:3175
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "파일 종류: %s ('%s')"
+
+#: ../midori/midori-view.c:3212
+#, c-format
+msgid "Size: %s"
+msgstr "크기: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3223
#, c-format
msgid "Open %s"
msgstr "%s 열기"
-#: ../midori/midori-view.c:3576
+#: ../midori/midori-view.c:3834
#, c-format
msgid "Inspect page - %s"
msgstr "페이지 살피기 - %s"
-#: ../midori/midori-view.c:3923
-msgid "Speed Dial"
-msgstr "단축 번호"
-
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
-msgid "Click to add a shortcut"
-msgstr "바로 가기를 더하려면 누르십시오"
-
-#: ../midori/midori-view.c:3925
-msgid "Enter shortcut address"
-msgstr "바로 가기 주소 입력"
-
-#: ../midori/midori-view.c:3926
-msgid "Enter shortcut title"
-msgstr "바로 가기 제목 입력"
-
-#: ../midori/midori-view.c:3927
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "이 바로 가기를 정말로 삭제하시겠습니까?"
-
-#: ../midori/midori-view.c:4089
+#: ../midori/midori-view.c:4231
#, c-format
msgid "No documentation installed"
msgstr "설치한 문서 도구가 없습니다"
-#: ../midori/midori-view.c:4165
+#: ../midori/midori-view.c:4308
msgid "Midori doesn't store any personal data:"
msgstr "미도리는 어떤 개인 정보도 보존하지 않습니다:"
-#: ../midori/midori-view.c:4166
+#: ../midori/midori-view.c:4309
msgid "No history or web cookies are being saved."
-msgstr "어떤 기록과 웹 쿠기도 저장하지 않습니다."
+msgstr "기록 또는 웹 쿠키를 저장하지 않습니다."
-#: ../midori/midori-view.c:4167
+#: ../midori/midori-view.c:4310
msgid "Extensions are disabled."
msgstr "확장 기능을 사용하지 않습니다."
-#: ../midori/midori-view.c:4168
+#: ../midori/midori-view.c:4311
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
"HTML5 저장소, 로컬 데이터베이스 그리고 프로그램 캐시를 사용하지 않습니다."
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4312
msgid "Midori prevents websites from tracking the user:"
msgstr "미도리가 사용자를 추적할 수 없게 합니다.:"
-#: ../midori/midori-view.c:4170
+#: ../midori/midori-view.c:4313
msgid "Referrer URLs are stripped down to the hostname."
msgstr "리퍼러 웹 주소는 호스트 이름에서 기본적인 것만 남깁니다."
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:4314
msgid "DNS prefetching is disabled."
msgstr "DNS 사전 판독을 사용하지 않습니다."
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:4315
msgid "The language and timezone are not revealed to websites."
-msgstr "언어와 시간대를 웹 사이트가 모르게합니다."
+msgstr "언어와 시간대를 웹 사이트가 알 수 없도록 합니다."
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:4316
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr "플래시와 넷스캐이프 플러그인을 웹 사이트가 알 수 없게 합니다."
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:4402
msgid "Version numbers in brackets show the version used at runtime."
msgstr "괄호 안의 버전 번호는 실행 중인 미도리가 사용하고 있는 버전입니다."
-#: ../midori/midori-view.c:4278
+#: ../midori/midori-view.c:4451
msgid "Page loading delayed"
msgstr "페이지 불러오기 연기"
-#: ../midori/midori-view.c:4279
+#: ../midori/midori-view.c:4452
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"최근 발생한 충돌이나 기본 설정 내 시작 페이지 설정으로 인해 페이지 불러오기"
"를 연기합니다."
-#: ../midori/midori-view.c:4280
+#: ../midori/midori-view.c:4453
msgid "Load Page"
msgstr "페이지 불러오기"
-#: ../midori/midori-view.c:4446
+#: ../midori/midori-view.c:4620
msgid "Blank page"
msgstr "빈 페이지"
-#: ../midori/midori-view.c:4708
+#: ../midori/midori-view.c:4884
msgid "_Duplicate Tab"
msgstr "탭 복제(_D)"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4889
msgid "Show Tab _Label"
msgstr "탭 이름 보이기(_L)"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4889
msgid "Show Tab _Icon Only"
msgstr "탭 아이콘만 보이기(_I)"
-#: ../midori/midori-view.c:4719
-msgid "Close ot_her Tabs"
-msgstr "다른 탭 닫기(_H)"
+#: ../midori/midori-view.c:4896
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "다른 탭 닫기(_H)"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5532
+#: ../midori/midori-view.c:5653
msgid "previous"
msgstr "이전"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5551
+#: ../midori/midori-view.c:5672
msgid "next"
msgstr "다음"
-#: ../midori/midori-view.c:5564
+#: ../midori/midori-view.c:5685
msgid "Print background images"
msgstr "배경 그림 인쇄"
-#: ../midori/midori-view.c:5565
+#: ../midori/midori-view.c:5686
msgid "Whether background images should be printed"
msgstr "배경 그림을 인쇄할 지 결정합니다"
-#: ../midori/midori-view.c:5597
+#: ../midori/midori-view.c:5718
msgid "Features"
msgstr "기능"
-#: ../midori/midori-preferences.c:297
-msgid "Startup"
-msgstr "시작"
-
-#: ../midori/midori-preferences.c:310
-msgid "Use _current page"
-msgstr "현재 페이지를 사용(_C)"
-
-#: ../midori/midori-preferences.c:314
-msgid "Use current page as homepage"
-msgstr "현재 페이지를 홈 페이지로 사용"
-
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
-msgid "Fonts"
-msgstr "글꼴"
-
-#: ../midori/midori-preferences.c:326
-msgid "Proportional Font Family"
-msgstr "가변 폭 글꼴 계열"
-
-#: ../midori/midori-preferences.c:330
-msgid "The default font family used to display text"
-msgstr "텍스트를 표시할 기본 글꼴 계열"
-
-#: ../midori/midori-preferences.c:333
-msgid "The default font size used to display text"
-msgstr "텍스트를 표시할 기본 글꼴 크기"
-
-#: ../midori/midori-preferences.c:335
-msgid "Fixed-width Font Family"
-msgstr "고정 폭 글꼴 계열"
-
-#: ../midori/midori-preferences.c:339
-msgid "The font family used to display fixed-width text"
-msgstr "고정 폭 텍스트를 표시할 글꼴 계열"
-
-#: ../midori/midori-preferences.c:342
-msgid "The font size used to display fixed-width text"
-msgstr "고정 폭 텍스트를 표시할 글꼴 크기"
-
-#: ../midori/midori-preferences.c:344
-msgid "Minimum Font Size"
-msgstr "최소 글꼴 크기"
-
-#: ../midori/midori-preferences.c:348
-msgid "The minimum font size used to display text"
-msgstr "문자를 표시할 최소 글꼴 크기"
-
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
-msgid "Behavior"
-msgstr "행동"
-
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
-msgstr "팝업 열기 스크립트 허용"
-
-#: ../midori/midori-preferences.c:386
-msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr "스크립트가 팝업 창을 자동으로 열 수 있게 할지 선택합니다."
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:416
-msgid "Browsing"
-msgstr "탐색"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:456
-msgid "Network"
-msgstr "네트워크"
-
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "호스트 이름"
-
-#: ../midori/midori-preferences.c:487
-msgid "MB"
-msgstr "MB"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Add search engine"
-msgstr "검색 엔진 더하기"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Edit search engine"
-msgstr "검색 엔진 편집"
-
-#: ../midori/midori-searchaction.c:931
-msgid "_Name:"
-msgstr "이름(_N):"
-
-#: ../midori/midori-searchaction.c:947
-msgid "_Description:"
-msgstr "설명(_D):"
-
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "아이콘(_I):"
-
-#: ../midori/midori-searchaction.c:995
-msgid "_Token:"
-msgstr "토큰(_T):"
-
-#: ../midori/midori-searchaction.c:1295
-msgid "Manage Search Engines"
-msgstr "검색 엔진 관리"
-
-#: ../midori/midori-searchaction.c:1395
-msgid "Use as _default"
-msgstr "기본 값으로 사용(_D)"
-
-#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr "다음으로 열기"
-
-#: ../midori/sokoke.c:362
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:48
#, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "\"%s\"을(를) 열기 위한 응용 프로그램 또는 명령어를 선택해 주십시오:"
+msgid "%s of %s"
+msgstr "%s / %s"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
-msgid "Could not run external program."
-msgstr "외부 프로그램을 실행할 수 없습니다."
-
-#: ../midori/sokoke.c:1595
+#: ../midori/midori-download.vala:64
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d 시간"
-#: ../midori/sokoke.c:1596
+#: ../midori/midori-download.vala:65
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d 분"
-#: ../midori/sokoke.c:1597
+#: ../midori/midori-download.vala:66
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d 초"
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
-#, c-format
-msgid "%s of %s"
-msgstr "%s / %s"
-
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
-msgid "?B"
-msgstr "?B"
-
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
-#, c-format
-msgid " (%s/s)"
-msgstr "(%s/초)"
-
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/midori-download.vala:82
#, c-format
msgid " - %s remaining"
msgstr "- %s 남음"
-#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
-msgid "_Inline Find:"
-msgstr "바로 찾기(_I):"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:92
+msgid "?B"
+msgstr "?B"
-#: ../toolbars/midori-findbar.c:317
-msgid "Previous"
-msgstr "이전"
-
-#: ../toolbars/midori-findbar.c:323
-msgid "Next"
-msgstr "다음"
-
-#: ../toolbars/midori-findbar.c:327
-msgid "Match Case"
-msgstr "대소문자 일치"
-
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr "일치하는 단어 강조 표시"
-
-#: ../toolbars/midori-findbar.c:347
-msgid "Close Findbar"
-msgstr "찾기 줄 닫기"
-
-#: ../toolbars/midori-transferbar.c:122
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:94
#, c-format
-msgid "The file '%s ' has been downloaded."
-msgstr "파일 '%s '을(를) 다운로드 했습니다."
+msgid " (%s/s)"
+msgstr "(%s/초)"
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "전송이 끝났습니다"
-
-#: ../toolbars/midori-transferbar.c:193
+#: ../midori/midori-download.vala:188
msgid "The downloaded file is erroneous."
msgstr "다운로드한 파일에 오류가 있습니다."
-#: ../toolbars/midori-transferbar.c:194
+#: ../midori/midori-download.vala:189
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2113,47 +1638,359 @@ msgstr ""
"링크가 가리키고 있는 체크섬과 일치하지 않습니다. 이 것은 파일을 온전하게 다운"
"로드하지 못했거나 다운로드한 후 수정했다는 것을 의미합니다."
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../midori/midori-download.vala:302
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "이 폴더에 파일 \"%s\"을(를) 저장할 수 없습니다."
+
+#: ../midori/midori-download.vala:304
+msgid "You don't have permission to write in this location."
+msgstr "이 위치에 쓸 수 있는 권한을 가지고 있지 않습니다."
+
+#: ../midori/midori-download.vala:307
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "\"%s\"을(를) 다운로드 할 빈 공간이 부족합니다."
+
+#: ../midori/midori-download.vala:309
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "파일 다운로드에는 %s이(가) 필요합니다 만 %s 만이 남아있습니다."
+
+#: ../midori/midori-speeddial.vala:180
+msgid "Speed Dial"
+msgstr "단축 번호"
+
+#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+msgid "Click to add a shortcut"
+msgstr "바로 가기를 더하려면 누르십시오"
+
+#: ../midori/midori-speeddial.vala:182
+msgid "Enter shortcut address"
+msgstr "바로 가기 주소 입력"
+
+#: ../midori/midori-speeddial.vala:183
+msgid "Enter shortcut title"
+msgstr "바로 가기 제목 입력"
+
+#: ../midori/midori-speeddial.vala:184
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "이 바로 가기를 정말로 삭제하시겠습니까?"
+
+#: ../midori/midori-preferences.c:299
+msgid "Startup"
+msgstr "시작"
+
+#: ../midori/midori-preferences.c:305
+msgid "Homepage:"
+msgstr "홈페이지:"
+
+#: ../midori/midori-preferences.c:313
+msgid "Use _current page"
+msgstr "현재 페이지를 사용(_C)"
+
+#: ../midori/midori-preferences.c:317
+msgid "Use current page as homepage"
+msgstr "현재 페이지를 홈 페이지로 사용"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:326
+msgid "Fonts"
+msgstr "글꼴"
+
+#: ../midori/midori-preferences.c:329
+msgid "Proportional Font Family"
+msgstr "가변 폭 글꼴 계열"
+
+#: ../midori/midori-preferences.c:333
+msgid "The default font family used to display text"
+msgstr "텍스트를 표시할 기본 글꼴 계열"
+
+#: ../midori/midori-preferences.c:336
+msgid "The default font size used to display text"
+msgstr "텍스트를 표시할 기본 글꼴 크기"
+
+#: ../midori/midori-preferences.c:338
+msgid "Fixed-width Font Family"
+msgstr "고정 폭 글꼴 계열"
+
+#: ../midori/midori-preferences.c:342
+msgid "The font family used to display fixed-width text"
+msgstr "고정 폭 텍스트를 표시할 글꼴 계열"
+
+#: ../midori/midori-preferences.c:345
+msgid "The font size used to display fixed-width text"
+msgstr "고정 폭 텍스트를 표시할 글꼴 크기"
+
+#: ../midori/midori-preferences.c:347
+msgid "Minimum Font Size"
+msgstr "최소 글꼴 크기"
+
+#: ../midori/midori-preferences.c:351
+msgid "The minimum font size used to display text"
+msgstr "문자를 표시할 최소 글꼴 크기"
+
+#: ../midori/midori-preferences.c:356
+msgid "Preferred Encoding"
+msgstr "우선할 인코딩"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:363
+msgid "Behavior"
+msgstr "행동"
+
+#: ../midori/midori-preferences.c:367 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "자동으로 그림 읽기"
+
+#: ../midori/midori-preferences.c:370
+msgid "Enable Spell Checking"
+msgstr "맞춤법 검사 사용"
+
+#: ../midori/midori-preferences.c:384 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "스크립트 사용"
+
+#: ../midori/midori-preferences.c:387 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "넷스케이프 플러그인 사용"
+
+#: ../midori/midori-preferences.c:392
+msgid "Zoom Text and Images"
+msgstr "문자와 그림 확대"
+
+#: ../midori/midori-preferences.c:395
+msgid "Allow scripts to open popups"
+msgstr "팝업 열기 스크립트 허용"
+
+#: ../midori/midori-preferences.c:396
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "스크립트가 팝업 창을 자동으로 열 수 있게 할지 선택합니다."
+
+#: ../midori/midori-preferences.c:402
+msgid "Kinetic scrolling"
+msgstr "동역학 스크롤"
+
+#: ../midori/midori-preferences.c:403
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr "속도에 따라 관성이 걸린 것처럼 스크롤 합니다."
+
+#: ../midori/midori-preferences.c:408
+msgid "Middle click opens Selection"
+msgstr "가운데 버튼 클릭으로 선택한 주소 열기"
+
+#: ../midori/midori-preferences.c:409
+msgid "Load an address from the selection via middle click"
+msgstr "선택 후 마우스 가운데 버튼 클릭으로 주소를 불러옵니다."
+
+#: ../midori/midori-preferences.c:415
+msgid "Enable WebGL support"
+msgstr "웹GL 지원 사용"
+
+#: ../midori/midori-preferences.c:420
+msgid "Flash window on background tabs"
+msgstr "배경 탭에 있는 창 반짝거리게 하기"
+
+#: ../midori/midori-preferences.c:425
+msgid "Preferred languages"
+msgstr "우선할 인코딩"
+
+#: ../midori/midori-preferences.c:429
+msgid ""
+"A comma separated list of languages preferred for rendering multilingual "
+"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+msgstr ""
+"복수의 언어로 작성한 웹 페이지를 읽을 때 사용할 언어의 우선순위를 쉼표로 구분"
+"해 지정합니다. 예) \"de\", \"ru,nl\" 또는 \"en-us;q=1.0, fr-fr;q=0.667\""
+
+#: ../midori/midori-preferences.c:431
+msgid "Save downloaded files to:"
+msgstr "다운로드한 파일을 저장할 경로:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:438
+msgid "Browsing"
+msgstr "탐색"
+
+#: ../midori/midori-preferences.c:454
+msgid "Close Buttons on Tabs"
+msgstr "탭에 닫기 단추 표시"
+
+#: ../midori/midori-preferences.c:458
+msgid "Always Show Tabbar"
+msgstr "탭 모음 항상 보기"
+
+#: ../midori/midori-preferences.c:462
+msgid "Open Tabs next to Current"
+msgstr "탭을 현재 탭 옆에 열기"
+
+#: ../midori/midori-preferences.c:463
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr "새 탭을 현재 탭의 옆에 열지 마지막 탭 다음에 열지 결정합니다."
+
+#: ../midori/midori-preferences.c:466
+msgid "Open tabs in the background"
+msgstr "탭을 연 후 바로 전환하지 않음"
+
+#: ../midori/midori-preferences.c:470
+msgid "Text Editor"
+msgstr "텍스트 편집기"
+
+#: ../midori/midori-preferences.c:475
+msgid "News Aggregator"
+msgstr "뉴스 수집기"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:482
+msgid "Network"
+msgstr "네트워크"
+
+#: ../midori/midori-preferences.c:484
+msgid "Proxy server"
+msgstr "프록시 서버"
+
+#: ../midori/midori-preferences.c:489
+msgid "Hostname"
+msgstr "호스트 이름"
+
+#: ../midori/midori-preferences.c:497
+msgid "Port"
+msgstr "포트"
+
+#: ../midori/midori-preferences.c:509 ../midori/midori-preferences.c:512
+msgid "The maximum size of cached pages on disk"
+msgstr "디스크에 페이지를 저장할 최대 공간"
+
+#: ../midori/midori-preferences.c:514
+msgid "MB"
+msgstr "MB"
+
+#: ../midori/midori-searchaction.c:1074
+msgid "Add search engine"
+msgstr "검색 엔진 더하기"
+
+#: ../midori/midori-searchaction.c:1074
+msgid "Edit search engine"
+msgstr "검색 엔진 편집"
+
+#: ../midori/midori-searchaction.c:1102
+msgid "_Name:"
+msgstr "이름(_N):"
+
+#: ../midori/midori-searchaction.c:1117
+msgid "_Description:"
+msgstr "설명(_D):"
+
+#: ../midori/midori-searchaction.c:1130 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "주소(_A):"
+
+#: ../midori/midori-searchaction.c:1149
+msgid "_Token:"
+msgstr "토큰(_T):"
+
+#: ../midori/midori-searchaction.c:1447
+msgid "Manage Search Engines"
+msgstr "검색 엔진 관리"
+
+#: ../midori/midori-searchaction.c:1549
+msgid "Use as _default"
+msgstr "기본 값으로 사용(_D)"
+
+#: ../midori/sokoke.c:355
+msgid "Open with"
+msgstr "다음으로 열기"
+
+#: ../midori/sokoke.c:363
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "\"%s\"을(를) 열기 위한 응용 프로그램 또는 명령어를 선택해 주십시오:"
+
+#: ../midori/sokoke.c:478 ../midori/sokoke.c:492
+msgid "Could not run external program."
+msgstr "외부 프로그램을 실행할 수 없습니다."
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:265
+msgid "_Inline Find:"
+msgstr "바로 찾기(_I):"
+
+#: ../toolbars/midori-findbar.c:287
+msgid "Previous"
+msgstr "이전"
+
+#: ../toolbars/midori-findbar.c:293
+msgid "Next"
+msgstr "다음"
+
+#: ../toolbars/midori-findbar.c:297
+msgid "Match Case"
+msgstr "대소문자 일치"
+
+#: ../toolbars/midori-findbar.c:306
+msgid "Highlight Matches"
+msgstr "일치하는 단어 강조 표시"
+
+#: ../toolbars/midori-findbar.c:317
+msgid "Close Findbar"
+msgstr "찾기 줄 닫기"
+
+#: ../toolbars/midori-transferbar.c:109
+#, c-format
+msgid "The file '%s ' has been downloaded."
+msgstr "파일 '%s '을(를) 다운로드 했습니다."
+
+#: ../toolbars/midori-transferbar.c:114
+msgid "Transfer completed"
+msgstr "전송이 끝났습니다"
+
+#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
msgid "Clear All"
msgstr "모두 지우기"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
msgid "Some files are being downloaded"
msgstr "파일을 다운로드 하고 있습니다"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:278
msgid "_Quit Midori"
msgstr "미도리 종료(_Q)"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:280
msgid "The transfers will be cancelled if Midori quits."
msgstr "미도리를 종료하시면 파일 다운로드를 취소합니다."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "책갈피"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "책갈피 항목을 추가하지 못했습니다: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "책갈피를 업데이트할 수 없습니다: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "선택한 책갈피를 편집합니다"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "선택한 책갈피를 지웁니다"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "새 폴더를 더합니다"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "구분선 "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "책갈피 검색"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "기록"
@@ -2176,6 +2013,11 @@ msgstr[0] "%d 일 전"
msgid "A week ago"
msgstr "일 주 전"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "기록 항목을 제거할 수 없습니다: %s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "정말 모든 기록 항목을 지우시겠습니까?"
@@ -2192,15 +2034,20 @@ msgstr "선택한 기록 항목을 지웁니다"
msgid "Clear the entire history"
msgstr "모든 기록 제거"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "기록 검색"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "전송"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:435
msgid "Open Destination _Folder"
msgstr "다운로드 폴더 열기(_F)"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:438
msgid "Copy Link Loc_ation"
msgstr "링크 위치 복사(_A)"
@@ -2242,54 +2089,62 @@ msgstr "보관한 아이콘 '%s'을(를) 열 수 없습니다."
msgid "Animation frames are broken"
msgstr "애니메이션 프레임이 망가졌습니다"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "속성 '%s'은(는) %s에 적당하지 않음"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
-#: ../extensions/addons.c:308
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:309
msgid "Choose file"
msgstr "파일 선택"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "폴더 선택"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "없음"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "한 시간"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "하루"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "일 주"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "한 달"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "일 년"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "%s을(를) 위한 기본 설정"
-#: ../extensions/adblock.c:473
+#: ../katze/midori-uri.vala:168
+msgid "MD5-Checksum:"
+msgstr "MD5 체크섬:"
+
+#: ../katze/midori-uri.vala:175
+msgid "SHA1-Checksum:"
+msgstr "SHA1 체크섬:"
+
+#: ../extensions/adblock.c:495
msgid "Configure Advertisement filters"
msgstr "광고 필터 설정"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:528
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2298,109 +2153,109 @@ msgstr ""
"텍스트 항목에 미리 설정한 필터 목록의 주소를 입력하시고, \"추가\"를 눌러 목록"
"에 추가해주십시오. 더 많은 목록은 %s에서 찾을 수 있습니다."
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:944
msgid "Edit rule"
msgstr "규칙 편집"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:958
msgid "_Rule:"
msgstr "규칙(_R):"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:1012
msgid "Bl_ock image"
msgstr "그림 막기(_O)"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:1017
msgid "Bl_ock link"
msgstr "링크 막기(_O)"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1915
msgid "Advertisement blocker"
msgstr "광고 막기"
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1916
msgid "Block advertisements according to a filter list"
msgstr "필터 목록에 따라 광고를 막습니다"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
+#: ../extensions/addons.c:222
msgid "This page appears to contain a user script. Do you wish to install it?"
msgstr "이 페이지는 사용자 스크립트를 포함하고 있습니다. 설치하시겠습니까?"
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
msgid "_Install user script"
msgstr "사용자 스크립트 설치(_I)"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
msgid "This page appears to contain a user style. Do you wish to install it?"
msgstr "이 페이지는 사용자 스타일을 포함하고 있습니다. 설치하시겠습니까?"
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
msgid "_Install user style"
msgstr "사용자 스타일 설치(_I)"
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
msgid "Don't install"
msgstr "설치 안 함"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:320 ../extensions/addons.c:675
msgid "Userscripts"
msgstr "사용자 스크립트"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:325 ../extensions/addons.c:677
msgid "Userstyles"
msgstr "사용자 스타일"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:371 ../extensions/addons.c:450
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "오류"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:412
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "'%s'을(를) 삭제하시겠습니까?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:418
msgid "Delete user script"
msgstr "사용자 스크립트 삭제"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:419
msgid "Delete user style"
msgstr "사용자 스타일 삭제"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:422
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "파일 '%s '을(를) 영구적으로 삭제합니다."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:564 ../extensions/addons.c:641
msgid "Open in Text Editor"
msgstr "텍스트 편집기로 열기"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:566 ../extensions/addons.c:650
msgid "Open Target Folder"
msgstr "대상 폴더 열기"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:632
msgid "Add new addon"
msgstr "새 추가 기능 추가"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:658
msgid "Remove selected addon"
msgstr "선택한 추가 기능 제거"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1687 ../extensions/addons.c:1905
msgid "User addons"
msgstr "사용자 추가 기능"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1817
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "폴더 '%s'을(를) 감시할 수 없습니다: %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1906
msgid "Support for userscripts and userstyles"
msgstr "사용자 스크립트와 사용자 스타일을 지원합니다."
@@ -2487,29 +2342,21 @@ msgstr ""
"도메인 : %s\n"
"쿠키 : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "이름"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "모두 펴기(_E)"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "모두 접기(_C)"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "필터:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"이름 또는 도메인 필드가 입력한 필터와 맞는 쿠키만 보려면 필터 문자열을 입력하"
-"세요"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "이름 또는 도메인으로 쿠키 검색"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2700,7 +2547,7 @@ msgstr "최근 연 탭으로 전환"
#: ../extensions/history-list.vala:423
msgid "Next new Tab (History List)"
-msgstr "다음 새 탭 (기록 목록)"
+msgstr "다음 새 탭(기록 목록)"
#: ../extensions/history-list.vala:424
msgid "Next new tab from history"
@@ -2708,7 +2555,7 @@ msgstr "기록 목록에서 다음 새 탭으로 전환합니다"
#: ../extensions/history-list.vala:433
msgid "Previous new Tab (History List)"
-msgstr "이전 새 탭 (기록 목록)"
+msgstr "이전 새 탭(기록 목록)"
#: ../extensions/history-list.vala:434
msgid "Previous new tab from history"
@@ -2716,17 +2563,17 @@ msgstr "기록 목록에서 이전 새 탭으로 전환합니다"
#: ../extensions/history-list.vala:443
msgid "Display tab in background (History List)"
-msgstr "배경에 탭 표시 (기록 목록)"
+msgstr "배경에 탭 표시(기록 목록)"
#: ../extensions/history-list.vala:444
msgid "Display the current selected tab in background"
msgstr "지금 선택한 탭을 배경에 표시"
-#: ../extensions/history-list.vala:569
+#: ../extensions/history-list.vala:566
msgid "History List"
msgstr "기록 목록"
-#: ../extensions/history-list.vala:570
+#: ../extensions/history-list.vala:567
msgid "Move to the last used tab when switching or closing tabs"
msgstr "탭을 닫거나 전환할 때 마지막에 사용한 탭으로 이동합니다"
@@ -2748,7 +2595,7 @@ msgstr "키보드 바로 가기 설정"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "바로 가기 사용자 설정(_O)..."
+msgstr "사용자 설정 바로 가기(_O)..."
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2766,35 +2613,35 @@ msgstr "상태 표시줄에 시계 표시"
msgid "Display date and time in the statusbar"
msgstr "상태 표시줄에 시간과 날짜를 표시합니다"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "그림"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "스크립트"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "넷스케이프 플러그인"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "상태 표시줄 기능"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "웹 페이지의 기능을 쉽게 켜고 끕니다"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "탭 패널"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "탭 패널(_A)"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "탭을 수직 패널에서 보여줍니다"
@@ -2806,11 +2653,11 @@ msgstr "기본으로 탭에 아이콘만 표시"
msgid "New tabs have no label by default"
msgstr "기본으로 새 탭에 이름을 보이지 않습니다."
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "도구 모음 사용자 설정"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2818,33 +2665,270 @@ msgstr ""
"도구 모음에 표시할 항목을 설정합니다. 끌어다 놓기로 항목을 다시 배치할 수 있"
"습니다."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "가능한 항목"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "표시한 항목"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "도구 모음 사용자 설정(_T)..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "사용자 설정 도구 모음(_C)…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "사용자 지정(_C)..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "도구 모음 편집기"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "도구 모음 배치를 쉽게 편집합니다"
-#: ../extensions/web-cache.c:463
+#: ../extensions/web-cache.c:462
msgid "Cache HTTP communication on disk"
msgstr "디스크에 HTTP 통신을 저장합니다."
+#~ msgid "Remember last window size"
+#~ msgstr "마지막에 연 창 크기 기억"
+
+#~ msgid "Whether to save the last window size"
+#~ msgstr "마지막에 연 창의 크기를 저장할지 결정합니다."
+
+#~ msgid "Last window width"
+#~ msgstr "마지막에 연 창 너비"
+
+#~ msgid "The last saved window width"
+#~ msgstr "마지막에 저장한 창의 너비"
+
+#~ msgid "Last window height"
+#~ msgstr "마지막에 연 창 높이"
+
+#~ msgid "The last saved window height"
+#~ msgstr "마지막에 저장한 창의 높이"
+
+#~ msgid "Last panel position"
+#~ msgstr "마지막에 연 패널 위치"
+
+#~ msgid "The last saved panel position"
+#~ msgstr "마지막에 저장한 연 패널의 위치"
+
+#~ msgid "Last panel page"
+#~ msgstr "마지막 패널 페이지"
+
+#~ msgid "The last saved panel page"
+#~ msgstr "마지막에 저장한 연 패널 페이지"
+
+#~ msgid "Last Web search"
+#~ msgstr "마지막 웹 검색"
+
+#~ msgid "The last saved Web search"
+#~ msgstr "마지막에 저장한 한 검색"
+
+#~ msgid "Show Menubar"
+#~ msgstr "메뉴 모음 표시"
+
+#~ msgid "Whether to show the menubar"
+#~ msgstr "메뉴 모음을 표시할 지 결정합니다."
+
+#~ msgid "Show Navigationbar"
+#~ msgstr "내비게이션 바 표시"
+
+#~ msgid "Whether to show the navigationbar"
+#~ msgstr "내비게이션 바를 표시할지 결정합니다."
+
+#~ msgid "Show Bookmarkbar"
+#~ msgstr "책갈피 모음 표시"
+
+#~ msgid "Whether to show the bookmarkbar"
+#~ msgstr "책갈피 모음을 표시할 지 결정합니다."
+
+#~ msgid "Show Panel"
+#~ msgstr "패널 표시"
+
+#~ msgid "Whether to show the panel"
+#~ msgstr "패널을 표시할 지 결정합니다."
+
+#~ msgid "Show Statusbar"
+#~ msgstr "상태 표시줄을 보기"
+
+#~ msgid "Whether to show the statusbar"
+#~ msgstr "상태를 표시할 지 결정합니다."
+
+#~ msgid "Toolbar Items"
+#~ msgstr "도구 모음 항목"
+
+#~ msgid "The items to show on the toolbar"
+#~ msgstr "도구 모음에 보일 항목"
+
+#~ msgid "Compact Sidepanel"
+#~ msgstr "간략한 사이드 패널(_C)"
+
+#~ msgid "Whether to make the sidepanel compact"
+#~ msgstr "사이드 패널을 간단하게 표시할지 결정합니다."
+
+#~ msgid "Align sidepanel on the right"
+#~ msgstr "사이드 표시 줄을 오른쪽에"
+
+#~ msgid "Whether to align the sidepanel on the right"
+#~ msgstr "오른쪽에 사이드 패널을 보여줄 지 결정합니다."
+
+#~ msgid "Open panels in separate windows"
+#~ msgstr "패널 별도의 창에 열기"
+
+#~ msgid "Whether to always open panels in separate windows"
+#~ msgstr "패널을 항상 별도의 창에 보일지 선택합니다."
+
+#~ msgid "What to do when Midori starts"
+#~ msgstr "미도리를 시작할 때 실행할 동작을 설정합니다."
+
+#~ msgid "The homepage"
+#~ msgstr "홈페이지"
+
+#~ msgid "Show crash dialog"
+#~ msgstr "충돌 대화 상자 보기"
+
+#~ msgid "The folder downloaded files are saved to"
+#~ msgstr "다운로드한 파일을 저장하는 폴더"
+
+#~ msgid "An external text editor"
+#~ msgstr "외부 텍스트 편집기"
+
+#~ msgid "An external news aggregator"
+#~ msgstr "외부 뉴스 수집기"
+
+#~ msgid "Location entry Search"
+#~ msgstr "위치 항목에서 검색"
+
+#~ msgid "The search to perform inside the location entry"
+#~ msgstr "위치 항목 안에서 검색을 실행합니다."
+
+#~ msgid "The preferred character encoding"
+#~ msgstr "우선할 문자 인코딩"
+
+#~ msgid "Always show the tabbar"
+#~ msgstr "탭 모음을 항상 볼 수 있게 합니다."
+
+#~ msgid "Whether tabs have close buttons"
+#~ msgstr "탭에 닫기 단추를 표시할지 결정합니다."
+
+#~ msgid "Where to open new pages"
+#~ msgstr "새 페이지를 어디에서 열지 결정합니다."
+
+#~ msgid "Whether to open new tabs in the background"
+#~ msgstr "탭이 열렸을 때 바로 전환할지 결정합니다"
+
+#~ msgid "Open popups in tabs"
+#~ msgstr "팝업 창을 탭에 열기"
+
+#~ msgid "Whether to open popup windows in tabs"
+#~ msgstr "팝업 창을 탭에 열지 결정합니다."
+
+#~ msgid "Load and display images automatically"
+#~ msgstr "그림을 자동으로 읽고 표시합니다."
+
+#~ msgid "Enable embedded scripting languages"
+#~ msgstr "스크립트 언어를 사용합니다."
+
+#~ msgid "Enable embedded Netscape plugin objects"
+#~ msgstr "넷스케이프 플러그인 개체를 사용합니다."
+
+#~ msgid "Enable spell checking while typing"
+#~ msgstr "입력 중 맞춤법 검사를 사용합니다."
+
+#~ msgid "Enable HTML5 database support"
+#~ msgstr "HTML5 데이터 베이스 지원 사용"
+
+#~ msgid "Whether to enable HTML5 database support"
+#~ msgstr "HTML5 데이터 베이스 지원을 사용할지 결정합니다."
+
+#~ msgid "Whether to enable HTML5 local storage support"
+#~ msgstr "HTML5 로컬 기억 장치 지원을 사용할지 결정합니다."
+
+#~ msgid "Whether to enable offline web application cache"
+#~ msgstr "오프라인 웹 응용 프로그램 캐시를 사용할지 결정합니다."
+
+#~ msgid "Flash the browser window if a new tab was opened in the background"
+#~ msgstr "배경에 새 탭이 열리면 브라우저 창을 반짝거리게 합니다"
+
+#~ msgid "Allow websites to use OpenGL rendering"
+#~ msgstr "웹페이지를 오픈GL을 사용해 표현할 수 있도록 합니다."
+
+#~ msgid "Whether to zoom text and images"
+#~ msgstr "글자와 그림을 확대할지 결정합니다."
+
+#~ msgid "Find inline while typing"
+#~ msgstr "주소 창에 입력할 때 바로 찾기"
+
+#~ msgid "Whether to automatically find inline while typing"
+#~ msgstr "입력 중 자동으로 찾을지 결정합니다."
+
+#~ msgid "The type of proxy server to use"
+#~ msgstr "사용할 프록시 서버의 종류"
+
+#~ msgid "HTTP Proxy Server"
+#~ msgstr "HTTP 프록시 서버"
+
+#~ msgid "The proxy server used for HTTP connections"
+#~ msgstr "HTTP 연결에 사용하는 프록시 서버"
+
+#~ msgid "The proxy server port used for HTTP connections"
+#~ msgstr "HTTP 연결에 사용하는 프록시 서버 포트"
+
+#~ msgid "Identification string"
+#~ msgstr "식별 문자열"
+
+#~ msgid "The application identification string"
+#~ msgstr "응용 프로그램 식별 문자열"
+
+#~ msgid "Clear private data"
+#~ msgstr "개인 데이터 지우기"
+
+#~ msgid "The private data selected for deletion"
+#~ msgstr "삭제하기 위해 선택한 개인 데이터"
+
+#~ msgid "Clear data"
+#~ msgstr "데이터 지우기"
+
+#~ msgid "The data selected for deletion"
+#~ msgstr "삭제할 데이터를 선택했습니다"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "다른 탭 닫기(_H)"
+
+#~ msgid "_Icon:"
+#~ msgstr "아이콘(_I):"
+
+#~ msgid "Filter:"
+#~ msgstr "필터:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "이름 또는 도메인 필드가 입력한 필터와 맞는 쿠키만 보려면 필터 문자열을 입"
+#~ "력하세요"
+
+#~ msgid "_Bookmark"
+#~ msgstr "책갈피(_B)"
+
+#~ msgid "_Console"
+#~ msgstr "콘솔(_C)"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "최상위 폴더"
+
+#~ msgid "_Title:"
+#~ msgstr "제목(_T):"
+
+#~ msgid "_Folder:"
+#~ msgstr "폴더(_F):"
+
+#~ msgid "_Customize…"
+#~ msgstr "사용자 지정(_C)…"
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "책갈피를 저장할 수 없습니다.%s"
+
#~ msgid "The specified configuration folder is invalid."
#~ msgstr "지정한 설정 폴더가 올바르지 않습니다."
diff --git a/po/lt.po b/po/lt.po
index 113774b6..ac035ff1 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -598,8 +598,8 @@ msgid "Firefox (%s)"
msgstr "Firefox (%s)"
#: ../midori/midori-browser.c:4239
-msgid "Import bookmarks..."
-msgstr "Importuoti adresyną ..."
+msgid "Import bookmarks…"
+msgstr "Importuoti adresyną …"
#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
msgid "_Import bookmarks"
@@ -705,8 +705,8 @@ msgid "Open a file"
msgstr "Atverti failą"
#: ../midori/midori-browser.c:5228
-msgid "_Save Page As..."
-msgstr "_Išsaugoti tinklapį kaip..."
+msgid "_Save Page As…"
+msgstr "_Išsaugoti tinklapį kaip…"
#: ../midori/midori-browser.c:5229
msgid "Save to a file"
@@ -753,8 +753,8 @@ msgid "_Edit"
msgstr "K_eisti"
#: ../midori/midori-browser.c:5282
-msgid "_Find..."
-msgstr "Iešk_oti ..."
+msgid "_Find…"
+msgstr "Iešk_oti …"
#: ../midori/midori-browser.c:5283
msgid "Find a word or phrase in the page"
@@ -927,8 +927,8 @@ msgid "_Frequent Questions"
msgstr "_Klausimai ir atsakymai"
#: ../midori/midori-browser.c:5421
-msgid "_Report a Problem..."
-msgstr "Pranešti apie pro_blemą..."
+msgid "_Report a Problem…"
+msgstr "Pranešti apie pro_blemą…"
#: ../midori/midori-browser.c:5433
msgid "_Menubar"
@@ -985,24 +985,24 @@ msgstr "Vakarų (ISO-8859-1)"
#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242
#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Pasirinktas..."
+msgid "Custom…"
+msgstr "Pasirinktas…"
#: ../midori/midori-browser.c:5985
msgid "_Separator"
msgstr "_Skirtukas"
#: ../midori/midori-browser.c:5992
-msgid "_Location..."
-msgstr "_Vieta..."
+msgid "_Location…"
+msgstr "_Vieta…"
#: ../midori/midori-browser.c:5994
msgid "Open a particular location"
msgstr "Atverti tam tikrą adresą"
#: ../midori/midori-browser.c:6016
-msgid "_Web Search..."
-msgstr "_Paieška žiniatinklyje ..."
+msgid "_Web Search…"
+msgstr "_Paieška žiniatinklyje …"
#: ../midori/midori-browser.c:6018
msgid "Run a web search"
@@ -1059,8 +1059,8 @@ msgid "Search with %s"
msgstr "Ieškoti su %s"
#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Ieškoti su..."
+msgid "Search with…"
+msgstr "Ieškoti su…"
#: ../midori/midori-locationaction.c:537
#, c-format
@@ -2752,8 +2752,8 @@ msgid "Customize Keyboard shortcuts"
msgstr "Derinti klaviatūros susiejimus"
#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
-msgstr "Derinti _susiejimus..."
+msgid "Customize Sh_ortcuts…"
+msgstr "Derinti _susiejimus…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2832,12 +2832,12 @@ msgid "Displayed Items"
msgstr "Rodomi elementai"
#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
+msgid "Customize _Toolbar…"
msgstr "Įrankių juostos _derinimas"
#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Derinti..."
+msgid "_Customize…"
+msgstr "_Derinti…"
#: ../extensions/toolbar-editor.c:627
msgid "Toolbar Editor"
diff --git a/po/nl.po b/po/nl.po
index 2b13f06a..c8124924 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,14 +2,14 @@
# Copyright (C) The Xfce development team.
# This file is distributed under the same license as the midori package.
# Vincent Tunru 2008
-# Emmo, 2011 (assisted by Pjotr).
+# Emmo, 2011-2012 (assisted by Pjotr).
#
msgid ""
msgstr ""
"Project-Id-Version: midori\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-14 07:30+0000\n"
-"PO-Revision-Date: 2011-09-08 12:02+0200\n"
+"POT-Creation-Date: 2012-09-19 11:45+0000\n"
+"PO-Revision-Date: 2012-07-25 12:02+0200\n"
"Last-Translator: Emmo (assisted by Pjotr)\n"
"Language-Team: Dutch (Flemish)\n"
"MIME-Version: 1.0\n"
@@ -26,12 +26,28 @@ msgstr "Blader door het Web"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Verkenner"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996
-#: ../midori/main.c:2010 ../midori/midori-websettings.c:313
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1921 ../midori/main.c:1936
+#: ../midori/main.c:1949 ../midori/midori-websettings.c:200
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Webbrowser Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Nieuw privé-surfvenster"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326
+msgid "New Tab"
+msgstr "Nieuw tabblad"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323
+msgid "New Window"
+msgstr "Nieuw venster"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Webbrowser"
@@ -43,71 +59,87 @@ msgstr "Midori Privé-surfen"
msgid "Open a new private browsing window"
msgstr "Open een nieuw privé-surfvenster"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4288
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4307
msgid "Private Browsing"
msgstr "Privé-surfen"
-#: ../midori/main.c:97 ../midori/main.c:103
+#: ../midori/main.c:84 ../midori/main.c:90
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Configuratie kon niet geladen worden: %s\n"
-#: ../midori/main.c:151
+#: ../midori/main.c:138
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Waarde '%s' is ongeldig voor %s"
-#: ../midori/main.c:156 ../midori/main.c:260
+#: ../midori/main.c:143 ../midori/main.c:247
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Ongeldige configuratiewaarde '%s'"
-#: ../midori/main.c:381
+#: ../midori/main.c:357
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "De zoekmachines konden niet worden geladen. %s\n"
-#: ../midori/main.c:435
+#: ../midori/main.c:411
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Niet gelukt om geschiedenis te verwijderen: %s\n"
-#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:433 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Kon gegevensbank niet openen: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:525
+#: ../midori/main.c:505
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Kon oude elementen in geschiedenis niet verwijderen: %s\n"
-#: ../midori/main.c:547
+#: ../midori/main.c:527
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "De instellingen konden niet worden opgeslagen. %s"
-#: ../midori/main.c:582
+#: ../midori/main.c:553
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "De zoekmachines konden niet opgeslagen worden. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:619
+#: ../midori/main.c:590
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "De prullenbak kon niet worden opgeslagen. %s"
-#: ../midori/main.c:660 ../panels/midori-extensions.c:91
+#: ../midori/main.c:663 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Extensies"
-#: ../midori/main.c:674
+#: ../midori/main.c:677
msgid "Privacy"
msgstr "Privacy"
-#: ../midori/main.c:686
+#: ../midori/main.c:679
+msgid "Delete old Cookies after:"
+msgstr "Verwijder oude koekjes na:"
+
+#: ../midori/main.c:681 ../midori/main.c:684
+msgid "The maximum number of days to save cookies for"
+msgstr "Hoeveel dagen een koekje maximaal bewaard mag worden"
+
+#: ../midori/main.c:688
+msgid "Only accept Cookies from sites you visit"
+msgstr "Alleen koekjes aanvaarden van websites die u bezoekt"
+
+#: ../midori/main.c:689
+msgid "Block cookies sent by third-party websites"
+msgstr "Blokkeer koekjes verzonden door derden"
+
+#: ../midori/main.c:694
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -115,19 +147,45 @@ msgstr ""
"Koekjes slaan aanmeldgegevens, opgeslagen spelletjes of gebruikerprofielen "
"op voor adverteerdoeleinden."
-#: ../midori/main.c:742
+#: ../midori/main.c:701
+msgid "Enable offline web application cache"
+msgstr "Offline webtoepassingsopslag gebruiken"
+
+#: ../midori/main.c:704
+msgid "Enable HTML5 local storage support"
+msgstr "HTML5 lokale opslagondersteuning activeren"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/main.c:708
+msgid "Strip referrer details sent to websites"
+msgstr "Verwijder naar websites gestuurde verwijzingdetails"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/main.c:710
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Of de 'Referer'-koptekst moet worden verkort tot de hostnaam"
+
+#: ../midori/main.c:713
+msgid "Delete pages from history after:"
+msgstr "Verwijder pagina's uit de geschiedenis na:"
+
+#: ../midori/main.c:715 ../midori/main.c:718
+msgid "The maximum number of days to save the history for"
+msgstr "Hoeveel dagen de geschiedenis bewaard moeten blijven"
+
+#: ../midori/main.c:759
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "De sessie kon niet worden opgeslagen. %s"
-#: ../midori/main.c:960
+#: ../midori/main.c:981
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Geen root-certificaatbestand aanwezig. SSL-certificaten kunnen niet worden "
"geverifieerd."
-#: ../midori/main.c:1036
+#: ../midori/main.c:1076
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."
@@ -136,230 +194,240 @@ msgstr ""
"Als dit herhaaldelijk gebeurt, probeer dan een van de volgende opties om het "
"probleem op te lossen."
-#: ../midori/main.c:1055
+#: ../midori/main.c:1095
msgid "Modify _preferences"
msgstr "_Voorkeuren wijzigen"
-#: ../midori/main.c:1059
+#: ../midori/main.c:1099
msgid "Disable all _extensions"
msgstr "Schakel alle _extensies uit"
-#: ../midori/main.c:1072
+#: ../midori/main.c:1108
+msgid "Show a dialog after Midori crashed"
+msgstr "Toon een dialoogvenster nadat Midori is vastgelopen"
+
+#: ../midori/main.c:1113
msgid "Discard old tabs"
msgstr "Verwijder oude tabbladen"
-#: ../midori/main.c:1073 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1114 ../midori/midori-websettings.c:108
msgid "Show last tabs without loading"
msgstr "Toon laatste tabbladen zonder te laden"
-#: ../midori/main.c:1074 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1115 ../midori/midori-websettings.c:107
msgid "Show last open tabs"
msgstr "Toon laatst geopende tabbladen"
-#: ../midori/main.c:1321 ../midori/main.c:2399
+#: ../midori/main.c:1362 ../midori/main.c:2377
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "De sessie kon niet geladen worden: %s\n"
-#: ../midori/main.c:1459
+#: ../midori/main.c:1500
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Momentopname opgeslagen in: %s\n"
-#: ../midori/main.c:1875
+#: ../midori/main.c:1836
msgid "Run ADDRESS as a web application"
msgstr "ADRES uitvoeren als een webtoepassing"
-#: ../midori/main.c:1875
+#: ../midori/main.c:1836
msgid "ADDRESS"
msgstr "ADRES"
-#: ../midori/main.c:1878
+#: ../midori/main.c:1839
msgid "Use FOLDER as configuration folder"
msgstr "Gebruik MAP als configuratiemap"
-#: ../midori/main.c:1878
+#: ../midori/main.c:1839
msgid "FOLDER"
msgstr "MAP"
-#: ../midori/main.c:1881
+#: ../midori/main.c:1842
msgid "Private browsing, no changes are saved"
msgstr "Privé-surfen, veranderingen worden niet opgeslagen."
-#: ../midori/main.c:1883
+#: ../midori/main.c:1845
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr ""
+"Draagbare modus, alle uitvoeringsbestanden worden opgeslagen op één plek"
+
+#: ../midori/main.c:1848
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Standaardvenster van GTK+ met WebKit, lijkend op GtkLauncher"
+
+#: ../midori/main.c:1850
msgid "Show a diagnostic dialog"
msgstr "Toon een diagnostisch venster"
-#: ../midori/main.c:1885
+#: ../midori/main.c:1852
msgid "Run the specified filename as javascript"
msgstr "Voer de opgegeven bestandnaam uit als javascript"
-#: ../midori/main.c:1887
+#: ../midori/main.c:1854
msgid "Take a snapshot of the specified URI"
msgstr "Maak een momentopname van de opgegeven URI"
-#: ../midori/main.c:1889
+#: ../midori/main.c:1856
msgid "Execute the specified command"
msgstr "Voer de opgegeven opdracht uit"
-#: ../midori/main.c:1891
+#: ../midori/main.c:1858
msgid "List available commands to execute with -e/ --execute"
msgstr "Lijst beschikbare opdrachten uit te voeren met -e/ --execute"
-#: ../midori/main.c:1893
+#: ../midori/main.c:1860
msgid "Display program version"
msgstr "Versie-informatie weergeven"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1862
msgid "Addresses"
msgstr "Adressen"
-#: ../midori/main.c:1897
+#: ../midori/main.c:1864
msgid "Block URIs according to regular expression PATTERN"
msgstr "Blokkeer URIs die overeenstemmen met reguliere expressie PATROON"
-#: ../midori/main.c:1897
+#: ../midori/main.c:1864
msgid "PATTERN"
msgstr "PATROON"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1901
+#: ../midori/main.c:1868
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr ""
"Zet Midori na SECONDEN seconden van inactiviteit, terug op de "
"standaardwaarden"
-#: ../midori/main.c:1901
+#: ../midori/main.c:1868
msgid "SECONDS"
msgstr "SECONDEN"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1871
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Verwijst terminalwaarschuwingen naar de opgegeven BESTANDNAAM"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1871
msgid "FILENAME"
msgstr "BESTANDNAAM"
-#: ../midori/main.c:1969
-msgid "[Addresses]"
-msgstr "[Adressen]"
-
-#: ../midori/main.c:2011
+#: ../midori/main.c:1950
msgid "Please report comments, suggestions and bugs to:"
msgstr "Gelieve commentaar, suggesties en fouten te melden bij:"
-#: ../midori/main.c:2013
+#: ../midori/main.c:1952
msgid "Check for new versions at:"
msgstr "Controleer op nieuwe versies op:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2108
+#: ../midori/main.c:2091
msgid "Saved logins and _passwords"
msgstr "Opgeslagen aanmeldingen en _wachtwoorden"
-#: ../midori/main.c:2110
+#: ../midori/main.c:2093
msgid "Cookies and Website data"
msgstr "Koekjes en websitegegevens"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2114 ../midori/midori-websettings.c:997
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
+#: ../midori/main.c:2097 ../midori/midori-preferences.c:508
+#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470
msgid "Web Cache"
msgstr "Webopslag"
-#: ../midori/main.c:2117
+#: ../midori/main.c:2100
msgid "Website icons"
msgstr "Website-pictogrammen"
-#: ../midori/main.c:2223
+#: ../midori/main.c:2210
msgid "An unknown error occured"
msgstr "Er is een onbekende fout opgetreden"
-#: ../midori/main.c:2330
+#: ../midori/main.c:2325
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Midori is al actief maar reageert niet.\n"
-#: ../midori/main.c:2366
+#: ../midori/main.c:2359
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "De bladwijzers konden niet worden geladen: %s\n"
-#: ../midori/main.c:2414
+#: ../midori/main.c:2392
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "De prullenbak kon niet geladen worden: %s\n"
-#: ../midori/main.c:2427
+#: ../midori/main.c:2405
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "De geschiedenis kon niet geladen worden: %s\n"
-#: ../midori/main.c:2443
+#: ../midori/main.c:2420
msgid "The following errors occured:"
msgstr "De volgende fouten hebben plaatsgevonden:"
-#: ../midori/main.c:2459
+#: ../midori/main.c:2436
msgid "_Ignore"
msgstr "_Negeren"
-#: ../midori/midori-app.c:1339
-msgid "_Bookmark"
-msgstr "_Bladwijzer"
+#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:534
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Onverwachte actie '%s'."
-#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066
+#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6251
msgid "_Bookmarks"
msgstr "_Bladwijzers"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1373
msgid "Add Boo_kmark"
msgstr "Bladwijzer _toevoegen"
-#: ../midori/midori-app.c:1342
-msgid "_Console"
-msgstr "Terminalvenster"
-
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1374
msgid "_Extensions"
msgstr "_Extensies"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591
+#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700
msgid "_History"
msgstr "_Geschiedenis"
-#: ../midori/midori-app.c:1345
-msgid "_Homepage"
-msgstr "_Thuispagina"
-
-#: ../midori/midori-app.c:1346
+#: ../midori/midori-app.c:1376
msgid "_Userscripts"
msgstr "Gebruikers_scripts"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1377
+msgid "User_styles"
+msgstr "Gebruikers_stijlen"
+
+#: ../midori/midori-app.c:1378
msgid "New _Tab"
msgstr "Nieuw _tabblad"
-#: ../midori/midori-app.c:1348
+#: ../midori/midori-app.c:1379
msgid "_Transfers"
msgstr "Bestand_overdrachten"
-#: ../midori/midori-app.c:1349
+#: ../midori/midori-app.c:1380
msgid "Netscape p_lugins"
-msgstr "Netscape p_lugins"
+msgstr "Netscape-invoegtoepassingen"
-#: ../midori/midori-app.c:1350
+#: ../midori/midori-app.c:1381
msgid "_Closed Tabs"
msgstr "Ge_sloten tabbladen"
-#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218
+#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387
msgid "New _Window"
msgstr "Nieuw _venster"
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1383
msgid "New _Folder"
msgstr "Nieuwe _map"
+#: ../midori/midori-app.c:1437
+msgid "[Addresses]"
+msgstr "[Adressen]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Bestand niet gevonden."
@@ -377,140 +445,114 @@ msgstr "Onbekende bladwijzeropmaak."
msgid "Writing failed."
msgstr "Schrijven is mislukt."
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526
+msgid "Go forward to the next page"
+msgstr "Ga naar de volgende pagina"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:354 ../midori/midori-browser.c:5534
+#: ../midori/midori-browser.c:5537
+msgid "Go to the next sub-page"
+msgstr "Ga naar de volgende subpagina"
+
+#: ../midori/midori-browser.c:441 ../midori/midori-browser.c:5475
+#: ../midori/midori-browser.c:5484
msgid "Reload the current page"
msgstr "De huidige pagina opnieuw laden"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481
msgid "Stop loading the current page"
msgstr "Stop met het laden van de huidige pagina"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:519
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Kon titel niet aanpassen: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Onverwachte actie '%s'."
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:614
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Privé-surfen)"
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "Hoofdmap"
+#: ../midori/midori-browser.c:724 ../midori/midori-browser.c:766
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Bladwijzers"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:826
msgid "New folder"
msgstr "Nieuwe map"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:826
msgid "Edit folder"
msgstr "Map bewerken"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:828
msgid "New bookmark"
msgstr "Nieuwe bladwijzer"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:828
msgid "Edit bookmark"
msgstr "Bladwijzer bewerken"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Titel:"
+#: ../midori/midori-browser.c:862
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr ""
+"Tik een naam voor deze bladwijzer en kies waar die bewaard moet worden."
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Adres:"
-
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328
-msgid "_Folder:"
-msgstr "_Map:"
-
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:923
msgid "Add to _Speed Dial"
msgstr "Toevoegen aan _snelkiezen"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:929
msgid "Show in the tool_bar"
msgstr "Laat in de werk_balk zien"
-#: ../midori/midori-browser.c:905
+#: ../midori/midori-browser.c:937
msgid "Run as _web application"
msgstr "Uitvoeren als _webtoepassing"
-#: ../midori/midori-browser.c:976
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr " Het bestand \"%s\" kan niet worden opgeslagen in deze map."
-
-#: ../midori/midori-browser.c:978
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "U heeft geen rechten om op deze plaats te schrijven."
-
-#: ../midori/midori-browser.c:985
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "Er is niet voldoende schijfruimte om \"%s\" binnen te halen."
-
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "Het bestand heeft %s nodig maar slechts %s is over."
-
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397
+#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504
msgid "Save file as"
msgstr "Bestand opslaan als"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Nieuw venster"
+#: ../midori/midori-browser.c:1065
+msgid "Save associated _resources"
+msgstr "Geassocieerde hulpbronnen opslaan"
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1323
msgid "A new window has been opened"
msgstr "Er is een nieuw venster geopend"
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Nieuw tabblad"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1326
msgid "A new tab has been opened"
msgstr "Er is een nieuw tabblad geopend"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1343
msgid "Error opening the image!"
msgstr "Fout bij het openen van de afbeelding."
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1344
msgid "Can not open selected image in a default viewer."
msgstr "Kan de gekozen afbeelding niet openen in een standaardkijker."
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1350
msgid "Error downloading the image!"
msgstr "Fout bij het binnenhalen van de afbeelding."
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1351
msgid "Can not download selected image."
msgstr "Kan de gekozen afbeelding niet binnenhalen."
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1408
msgid "Save file"
msgstr "Bestand opslaan"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2335
msgid "Open file"
msgstr "Bestand openen"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2467
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -519,145 +561,161 @@ msgid ""
"automatically."
msgstr ""
"Om de bovenstaande URI te openen heeft u een nieuwsaggregator nodig. Daar is "
-"meestal een menu of knop \"Nieuw abonnement\", \"Nieuwe nieuwsvoeding\" of "
+"meestal een menu of knop 'Nieuw abonnement', 'Nieuwe nieuwsvoeding' of "
"vergelijkbaar.\n"
"Anders kunt u gaan naar Voorkeuren, Toepassingen in Midori en een "
"Nieuwsaggregator kiezen. De volgende keer dat u het pictogram van "
"nieuwsvoeding aanklikt, zal dit automatisch worden toegevoegd."
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2473 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Nieuwe voeding"
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5550
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Nieuwe bladwijzer toevoegen"
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Leeg"
-#: ../midori/midori-browser.c:3469
+#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507
msgid "Toggle text cursor navigation"
msgstr "Schakel tekstaanwijzer-navigatie"
-#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759
+#: ../midori/midori-browser.c:3509
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Het indrukken van F7 schakelt de cursormodus om. Wanneer deze actief is, "
+"verschijnt er op alle websites een tekstcursor."
+
+#: ../midori/midori-browser.c:3512
+msgid "_Enable Caret Browsing"
+msgstr "Cursormodus inschakelen"
+
+#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Kon nieuw element in geschiedenis niet toevoegen: %s\n"
-#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745
-#: ../panels/midori-history.c:803
+#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Alles openen in _tabbladen"
-#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "In nieuw _tabblad openen"
-#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2688
-#: ../midori/midori-view.c:4848 ../panels/midori-bookmarks.c:753
-#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2904
+#: ../midori/midori-view.c:4880 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "In nieuw _venster openen"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4329
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4330
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4331
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4332
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4219
+#: ../midori/midori-browser.c:4333
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4220
+#: ../midori/midori-browser.c:4334
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4241
-msgid "Import bookmarks..."
-msgstr "Bladwijzers invoeren..."
+#: ../midori/midori-browser.c:4335
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:4356
+msgid "Import bookmarks…"
+msgstr "Bladwijzers invoeren…"
+
+#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555
msgid "_Import bookmarks"
msgstr "Bladwijzers _invoeren"
-#: ../midori/midori-browser.c:4255
+#: ../midori/midori-browser.c:4370
msgid "_Application:"
msgstr "_Toepassing:"
-#: ../midori/midori-browser.c:4320
+#: ../midori/midori-browser.c:4435
msgid "Import from XBEL or HTML file"
msgstr "Invoeren vanuit een XBEL- of HTML-bestand"
-#: ../midori/midori-browser.c:4355
+#: ../midori/midori-browser.c:4463
msgid "Import from a file"
msgstr "Invoeren vanuit een bestand"
-#: ../midori/midori-browser.c:4367
+#: ../midori/midori-browser.c:4475
msgid "Failed to import bookmarks"
msgstr "Bladwijzers invoeren mislukt"
-#: ../midori/midori-browser.c:4402
+#: ../midori/midori-browser.c:4509
msgid "XBEL Bookmarks"
msgstr "XBEL-bladwijzers"
-#: ../midori/midori-browser.c:4407
+#: ../midori/midori-browser.c:4514
msgid "Netscape Bookmarks"
msgstr "Netscape-bladwijzers"
-#: ../midori/midori-browser.c:4421
+#: ../midori/midori-browser.c:4528
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "Midori kan alleen uitvoeren naar XBEL (*.xbel) en Netscape (*.html)"
-#: ../midori/midori-browser.c:4436
+#: ../midori/midori-browser.c:4543
msgid "Failed to export bookmarks"
msgstr "Bladwijzers uitvoeren mislukt"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4558
+#: ../midori/midori-browser.c:4665
msgid "Clear Private Data"
msgstr "Wis privégegevens"
-#: ../midori/midori-browser.c:4562
+#: ../midori/midori-browser.c:4669
msgid "_Clear private data"
msgstr "Privégegevens _wissen"
-#: ../midori/midori-browser.c:4575
+#: ../midori/midori-browser.c:4684
msgid "Clear the following data:"
msgstr "Wis de volgende gegevens:"
-#: ../midori/midori-browser.c:4585
+#: ../midori/midori-browser.c:4694
msgid "Last open _tabs"
msgstr "Laatst openstaande _tabbladen"
-#: ../midori/midori-browser.c:4611
+#: ../midori/midori-browser.c:4720
msgid "Clear private data when _quitting Midori"
msgstr "Privégegevens wissen bij het _afsluiten van Midori"
-#: ../midori/midori-browser.c:4806
+#: ../midori/midori-browser.c:4935
msgid "A lightweight web browser."
msgstr "Een lichtgewicht webbrowser."
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:4936
msgid "See about:version for version info."
msgstr "Ga naar about:version voor informatie over de versie."
-#: ../midori/midori-browser.c:4809
+#: ../midori/midori-browser.c:4938
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -669,1451 +727,922 @@ msgstr ""
"zoals gepubliceerd door de Free Software Foundation; hetzij versie 2.1 van "
"de licentie hetzij een latere versie (naar keuze)."
-#: ../midori/midori-browser.c:4830
+#: ../midori/midori-browser.c:4968
msgid "translator-credits"
msgstr ""
"Timo Verbeek \n"
"Pascal De Vuyst \n"
"Emmo"
-#: ../midori/midori-browser.c:5216
+#: ../midori/midori-browser.c:5385
msgid "_File"
msgstr "_Bestand"
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5388
msgid "Open a new window"
msgstr "Nieuw venster openen"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5391
msgid "Open a new tab"
msgstr "Nieuw tabblad openen"
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5393
msgid "New P_rivate Browsing Window"
msgstr "Nieuw p_rivé-surfvenster"
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5397
msgid "Open a file"
msgstr "Bestand openen"
-#: ../midori/midori-browser.c:5230
-msgid "_Save Page As..."
-msgstr "_Sla pagina op als..."
+#: ../midori/midori-browser.c:5399
+msgid "_Save Page As…"
+msgstr "_Sla pagina op als…"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5400
msgid "Save to a file"
msgstr "Opslaan naar bestand"
-#: ../midori/midori-browser.c:5233
+#: ../midori/midori-browser.c:5402
msgid "Add to Speed _dial"
msgstr "Toevoegen aan _snelkiezen"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5406
msgid "Add Shortcut to the _desktop"
msgstr "Voeg snelkoppeling toe op _bureaublad"
-#: ../midori/midori-browser.c:5239
+#: ../midori/midori-browser.c:5408
msgid "Create _Launcher"
msgstr "Maak _starter"
-#: ../midori/midori-browser.c:5243
+#: ../midori/midori-browser.c:5412
msgid "Subscribe to News _feed"
msgstr "Abonneren op nieuws_voeding"
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5418
msgid "_Close Tab"
msgstr "Tabblad _sluiten"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5419
msgid "Close the current tab"
msgstr "Huidig tabblad sluiten"
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5421
msgid "C_lose Window"
msgstr "Venster _sluiten"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5425
+msgid "_Share"
+msgstr "Delen"
+
+#: ../midori/midori-browser.c:5430
msgid "Print the current page"
msgstr "Huidige pagina afdrukken"
-#: ../midori/midori-browser.c:5258
+#: ../midori/midori-browser.c:5433
msgid "Close a_ll Windows"
msgstr "A_lle Vensters Sluiten"
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5436
msgid "_Edit"
msgstr "_Bewerken"
-#: ../midori/midori-browser.c:5284
-msgid "_Find..."
-msgstr "_Zoek..."
+#: ../midori/midori-browser.c:5459
+msgid "_Find…"
+msgstr "_Zoek…"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5460
msgid "Find a word or phrase in the page"
msgstr "Zoek naar een woord of zin in deze pagina"
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5462
msgid "Find _Next"
msgstr "Vo_lgende zoeken"
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5465
msgid "Find _Previous"
msgstr "Vo_rige zoeken"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5469
msgid "Configure the application preferences"
msgstr "Toepassingsvoorkeuren instellen"
-#: ../midori/midori-browser.c:5296
+#: ../midori/midori-browser.c:5471
msgid "_View"
msgstr "_Beeld"
-#: ../midori/midori-browser.c:5297
+#: ../midori/midori-browser.c:5472
msgid "_Toolbars"
msgstr "_Werkbalken"
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5477
msgid "Reload page without caching"
msgstr "Vernieuw de pagina zonder gegevensopslag"
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5487
msgid "Increase the zoom level"
msgstr "Zoomniveau verhogen"
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5490
msgid "Decrease the zoom level"
msgstr "Zoomniveau verlagen"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5494
msgid "_Encoding"
msgstr "_Codering"
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5496
msgid "View So_urce"
msgstr "_Bron bekijken"
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5499
msgid "Ca_ret Browsing"
-msgstr "Be_schermd surfen"
+msgstr "Cursor-surfen"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5503
msgid "Toggle fullscreen view"
msgstr "Schakel volledig-scherm-weergave"
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5505
msgid "Scroll _Left"
msgstr "Naar _links bladeren"
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5508
msgid "Scroll _Down"
msgstr "Naar _beneden bladeren"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5511
msgid "Scroll _Up"
msgstr "Naar _omhoog bladeren"
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5514
msgid "Scroll _Right"
msgstr "Naar _rechts bladeren"
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5517
+msgid "_Readable"
+msgstr "Leesbaar"
+
+#: ../midori/midori-browser.c:5520
msgid "_Go"
msgstr "_Ga"
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5523
msgid "Go back to the previous page"
msgstr "Ga terug naar de vorige pagina"
-#: ../midori/midori-browser.c:5348
-msgid "Go forward to the next page"
-msgstr "Ga naar de volgende pagina"
-
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5352
+#: ../midori/midori-browser.c:5530
msgid "Go to the previous sub-page"
msgstr "Ga naar de vorige subpagina"
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5356
-msgid "Go to the next sub-page"
-msgstr "Ga naar de volgende subpagina"
+#: ../midori/midori-browser.c:5539
+msgid "_Homepage"
+msgstr "_Thuispagina"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5540
msgid "Go to your homepage"
msgstr "Ga naar de thuispagina"
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5542
msgid "Empty Trash"
msgstr "Prullenbak leegmaken"
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5545
msgid "Undo _Close Tab"
msgstr "Tabblad _sluiten ongedaan maken"
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5552
msgid "Add a new _folder"
msgstr "Nieuwe _map toevoegen"
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5558
msgid "_Export bookmarks"
msgstr "Bladwijzers _exporteren"
-#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "_Zoekmachines beheren"
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5564
msgid "_Clear Private Data"
msgstr "Privé-gegevens _Wissen"
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5567
msgid "_Inspect Page"
msgstr "Pagina _inspecteren"
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5571
msgid "_Previous Tab"
msgstr "Vo_rig tabblad"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5574
msgid "_Next Tab"
msgstr "Vo_lgend tabblad"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5576
msgid "Move Tab _Backward"
msgstr "Verplaats tabblad naar _achteren"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5578
msgid "_Move Tab Forward"
msgstr "_Verplaats tabblad naar voren"
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5581
msgid "Focus _Current Tab"
msgstr "Focus _huidig tabblad"
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5584
msgid "Focus _Next view"
msgstr "Focus _volgende weergave"
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5587
msgid "Only show the Icon of the _Current Tab"
msgstr "Toon alleen het Pictogram van het _Huidige Tabblad"
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5590
msgid "_Duplicate Current Tab"
msgstr "Huidig tabblad _dupliceren"
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5593
msgid "Close Ot_her Tabs"
msgstr "An_dere tabbladen sluiten"
-#: ../midori/midori-browser.c:5415
+#: ../midori/midori-browser.c:5596
msgid "Open last _session"
msgstr "Open laatste _sessie"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5599
msgid "_Help"
msgstr "_Hulp"
-#: ../midori/midori-browser.c:5420
+#: ../midori/midori-browser.c:5601
msgid "_Frequent Questions"
msgstr "_Veelgestelde vragen"
-#: ../midori/midori-browser.c:5423
-msgid "_Report a Problem..."
-msgstr "_Meld een probleem..."
+#: ../midori/midori-browser.c:5604
+msgid "_Report a Problem…"
+msgstr "_Meld een probleem…"
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270
+msgid "_Tools"
+msgstr "_Hulpmiddelen"
+
+#: ../midori/midori-browser.c:5616
msgid "_Menubar"
msgstr "_Menubalk"
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5620
msgid "_Navigationbar"
msgstr "_Navigatiebalk"
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5624
msgid "Side_panel"
msgstr "_Zijbalk"
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:5625
msgid "Sidepanel"
msgstr "Zijbalk"
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5628
msgid "_Bookmarkbar"
msgstr "_Bladwijzerbalk"
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5632
msgid "_Statusbar"
msgstr "_Statusbalk"
-#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312
+#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199
msgid "_Automatic"
msgstr "_Automatisch"
-#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236
+#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123
msgid "Chinese Traditional (BIG5)"
msgstr "Chinees traditioneel (BIG5)"
-#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237
+#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124
msgid "Chinese Simplified (GB18030)"
msgstr "Chinees vereenvoudigd (GB18030)"
#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5470
+#: ../midori/midori-browser.c:5651
msgid "Japanese (SHIFT__JIS)"
msgstr "Japans (SHIFT__JIS)"
-#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126
msgid "Korean (EUC-KR)"
msgstr "Koreaans (EUC-KR)"
-#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127
msgid "Russian (KOI8-R)"
msgstr "Russisch (KOI8-R)"
-#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242
+#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129
msgid "Western (ISO-8859-1)"
msgstr "Westers (ISO-8859-1)"
-#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243
-#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Aangepast..."
+#: ../midori/midori-browser.c:5666
+msgid "Custom…"
+msgstr "Aangepast…"
-#: ../midori/midori-browser.c:5991
+#: ../midori/midori-browser.c:6176
msgid "_Separator"
msgstr "_Scheidingsteken"
-#: ../midori/midori-browser.c:5998
-msgid "_Location..."
-msgstr "_Locatie..."
+#: ../midori/midori-browser.c:6183
+msgid "_Location…"
+msgstr "_Locatie…"
-#: ../midori/midori-browser.c:6000
+#: ../midori/midori-browser.c:6185
msgid "Open a particular location"
msgstr "Open een specifieke locatie"
-#: ../midori/midori-browser.c:6022
-msgid "_Web Search..."
-msgstr "Zoeken op het _web..."
+#: ../midori/midori-browser.c:6207
+msgid "_Web Search…"
+msgstr "Zoeken op het _web…"
-#: ../midori/midori-browser.c:6024
+#: ../midori/midori-browser.c:6209
msgid "Run a web search"
msgstr "Doorzoek het web"
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:6236
msgid "Reopen a previously closed tab or window"
msgstr "Heropen een eerder gesloten tabblad of venster"
-#: ../midori/midori-browser.c:6068
+#: ../midori/midori-browser.c:6253
msgid "Show the saved bookmarks"
msgstr "Opgeslagen bladwijzers weergeven"
-#: ../midori/midori-browser.c:6085
-msgid "_Tools"
-msgstr "_Hulpmiddelen"
-
-#: ../midori/midori-browser.c:6101
+#: ../midori/midori-browser.c:6286
msgid "_Window"
msgstr "_Venster"
-#: ../midori/midori-browser.c:6103
+#: ../midori/midori-browser.c:6288
msgid "Show a list of all open tabs"
msgstr "Geef een lijst van alle open tabbladen weer"
-#: ../midori/midori-browser.c:6117
+#: ../midori/midori-browser.c:6302
msgid "_Menu"
msgstr "_Menu"
-#: ../midori/midori-browser.c:6119
+#: ../midori/midori-browser.c:6304
msgid "Menu"
msgstr "Menu"
-#: ../midori/midori-browser.c:6933
+#: ../midori/midori-browser.c:7134
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Onverwachte configuratie-optie '%s'"
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:330
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "De configuratie van de extensie '%s' kon niet worden geladen: %s\n"
-#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
-#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:752 ../midori/midori-extension.c:849
+#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058
+#: ../extensions/addons.c:1686
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "De configuratie van de extensie '%s' kon niet worden opgeslagen: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "Zoek met %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Doorzoeken met..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "Doorzoeken met…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "Kon niet kiezen uit geschiedenis\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "Zoek naar %s"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "Uitvoercertificaat"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "De ondertekenende certificaatautoriteit is niet bekend."
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"Het certificaat komt niet overeen met de verwachte identiteit van de webstek "
+"waar hij van is opgehaald."
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "De activatietijd van het certificaat is nog steeds in de toekomst."
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "Het certificaat is verlopen"
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"Het certificaat is ingetrokken volgens de intrekkingslijst voor certificaten "
+"van GTlsConnection."
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Het algoritme van het certificaat wordt beschouwd als onveilig."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "Bij het valideren van het certificaat vond er een andere fout plaats."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "_Uitvoercertificaat"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "Zelf-ondertekend"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "Veiligheidsdetails"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "Plakken en _doorgaan"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "Niet geverifieerd"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "Geverifieerde en versleutelde verbinding"
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1989
msgid "Open, unencrypted connection"
msgstr "Open, niet-versleutelde verbinding"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Zijbalk rechts plaatsen"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Balk sluiten"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Zijbalk links plaatsen"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:105
msgid "Show Speed Dial"
msgstr "Toon snelkeuzemenu"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:106
msgid "Show Homepage"
msgstr "Toon startpagina"
-#: ../midori/midori-websettings.c:238
+#: ../midori/midori-websettings.c:125
msgid "Japanese (SHIFT_JIS)"
msgstr "Japans (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Aangepast…"
+
+#: ../midori/midori-websettings.c:145
msgid "New tab"
msgstr "Nieuw tabblad"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:146
msgid "New window"
msgstr "Nieuw venster"
-#: ../midori/midori-websettings.c:260
+#: ../midori/midori-websettings.c:147
msgid "Current tab"
msgstr "Huidig tabblad"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:162
msgid "Default"
msgstr "Standaard"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:163
msgid "Icons"
msgstr "Pictogrammen"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:164
msgid "Small icons"
msgstr "Kleine pictogrammen"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:165
msgid "Text"
msgstr "Tekst"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:166
msgid "Icons and text"
msgstr "Pictogrammen en tekst"
-#: ../midori/midori-websettings.c:280
+#: ../midori/midori-websettings.c:167
msgid "Text beside icons"
msgstr "Tekst naast pictogrammen"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:182
msgid "Automatic (GNOME or environment)"
msgstr "Automatisch (GNOME of omgeving)"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:183
msgid "HTTP proxy server"
msgstr "HTTP proxy-server"
-#: ../midori/midori-websettings.c:297
+#: ../midori/midori-websettings.c:184
msgid "No proxy server"
msgstr "Geen proxy-server"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:201
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:202
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:203
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:204
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:317
+#: ../midori/midori-websettings.c:205
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:401
-msgid "Remember last window size"
-msgstr "Laatst gebruikte venstergrootte onthouden"
-
-#: ../midori/midori-websettings.c:402
-msgid "Whether to save the last window size"
-msgstr "Al dan niet de laatst gebruikte venstergrootte opslaan"
-
-#: ../midori/midori-websettings.c:410
-msgid "Last window width"
-msgstr "Laatst gebruikte vensterbreedte"
-
-#: ../midori/midori-websettings.c:411
-msgid "The last saved window width"
-msgstr "De laatst opgeslagen vensterbreedte"
-
-#: ../midori/midori-websettings.c:419
-msgid "Last window height"
-msgstr "Laatst gebruikte vensterhoogte"
-
-#: ../midori/midori-websettings.c:420
-msgid "The last saved window height"
-msgstr "De laatste opgeslagen vensterhoogte"
-
-#: ../midori/midori-websettings.c:445
-msgid "Last panel position"
-msgstr "Laatst gebruikte positie van paneel"
-
-#: ../midori/midori-websettings.c:446
-msgid "The last saved panel position"
-msgstr "De laatste opgeslagen positie van het paneel"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:455
-msgid "Last panel page"
-msgstr "Laatst geopende werkbalkpagina"
-
-#: ../midori/midori-websettings.c:456
-msgid "The last saved panel page"
-msgstr "De laatst opgeslagen werkbalkpagina"
-
-#: ../midori/midori-websettings.c:464
-msgid "Last Web search"
-msgstr "Laatste webzoekactie"
-
-#: ../midori/midori-websettings.c:465
-msgid "The last saved Web search"
-msgstr "De laatst bewaarde webzoekactie"
-
-#: ../midori/midori-websettings.c:474
-msgid "Show Menubar"
-msgstr "Menubalk weergeven"
-
-#: ../midori/midori-websettings.c:475
-msgid "Whether to show the menubar"
-msgstr "Menubalk weergeven"
-
-#: ../midori/midori-websettings.c:483
-msgid "Show Navigationbar"
-msgstr "Navigatiebalk weergeven"
-
-#: ../midori/midori-websettings.c:484
-msgid "Whether to show the navigationbar"
-msgstr "Al dan niet de navigatiebalk weergeven"
-
-#: ../midori/midori-websettings.c:492
-msgid "Show Bookmarkbar"
-msgstr "Bladwijzerbalk weergeven"
-
-#: ../midori/midori-websettings.c:493
-msgid "Whether to show the bookmarkbar"
-msgstr "Al dan niet bladwijzerbalk weergeven"
-
-#: ../midori/midori-websettings.c:501
-msgid "Show Panel"
-msgstr "Werkbalk weergeven"
-
-#: ../midori/midori-websettings.c:502
-msgid "Whether to show the panel"
-msgstr "Al dan niet de werkbalk weergeven"
-
-#: ../midori/midori-websettings.c:510
-msgid "Show Statusbar"
-msgstr "Statusbalk weergeven"
-
-#: ../midori/midori-websettings.c:511
-msgid "Whether to show the statusbar"
-msgstr "Al dan niet de statusbalk weergeven"
-
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:278
msgid "Toolbar Style:"
msgstr "Stijl van de werkbalk:"
-#: ../midori/midori-websettings.c:521
+#: ../midori/midori-websettings.c:279
msgid "The style of the toolbar"
msgstr "De stijl van de werkbalk"
-#: ../midori/midori-websettings.c:530
-msgid "Toolbar Items"
-msgstr "Elementen in de werkbalk"
-
-#: ../midori/midori-websettings.c:531
-msgid "The items to show on the toolbar"
-msgstr "De elementen om weer te geven in de werkbalk"
-
-#: ../midori/midori-websettings.c:539
-msgid "Compact Sidepanel"
-msgstr "Compacte zijbalk"
-
-#: ../midori/midori-websettings.c:540
-msgid "Whether to make the sidepanel compact"
-msgstr "Al dan niet de zijbalk compact weergeven"
-
-#: ../midori/midori-websettings.c:555
-msgid "Align sidepanel on the right"
-msgstr "Plaats zijbalk rechts"
-
-#: ../midori/midori-websettings.c:556
-msgid "Whether to align the sidepanel on the right"
-msgstr "Of de zijbalk aan de rechterkant dient te worden geplaatst"
-
-#: ../midori/midori-websettings.c:571
-msgid "Open panels in separate windows"
-msgstr "Open werkbalken in aparte vensters"
-
-#: ../midori/midori-websettings.c:572
-msgid "Whether to always open panels in separate windows"
-msgstr "Of tabbladen altijd dienen te worden geopend in aparte vensters"
-
-#: ../midori/midori-websettings.c:581
+#: ../midori/midori-websettings.c:288
msgid "When Midori starts:"
msgstr "Bij starten van Midori:"
-#: ../midori/midori-websettings.c:582
-msgid "What to do when Midori starts"
-msgstr "Wat er dient te gebeuren bij starten van Midori"
-
-#: ../midori/midori-websettings.c:591
-msgid "Homepage:"
-msgstr "Startpagina:"
-
-#: ../midori/midori-websettings.c:592
-msgid "The homepage"
-msgstr "De startpagina"
-
-#: ../midori/midori-websettings.c:607
-msgid "Show crash dialog"
-msgstr "Toon vastloopdialoogvenster"
-
-#: ../midori/midori-websettings.c:608
-msgid "Show a dialog after Midori crashed"
-msgstr "Toon een dialoogvenster nadat Midori is vastgelopen"
-
-#: ../midori/midori-websettings.c:616
-msgid "Save downloaded files to:"
-msgstr "Bewaar binnengehaalde bestanden in:"
-
-#: ../midori/midori-websettings.c:617
-msgid "The folder downloaded files are saved to"
-msgstr "De map waarin binnengehaalde bestanden worden opgeslagen"
-
-#: ../midori/midori-websettings.c:625
-msgid "Text Editor"
-msgstr "Tekstverwerker"
-
-#: ../midori/midori-websettings.c:626
-msgid "An external text editor"
-msgstr "Een externe tekstverwerker"
-
-#: ../midori/midori-websettings.c:641
-msgid "News Aggregator"
-msgstr "Nieuwsaggregator"
-
-#: ../midori/midori-websettings.c:642
-msgid "An external news aggregator"
-msgstr "Een externe nieuwaggregator"
-
-#: ../midori/midori-websettings.c:650
-msgid "Location entry Search"
-msgstr "Zoeken vanuit locatieveld"
-
-#: ../midori/midori-websettings.c:651
-msgid "The search to perform inside the location entry"
-msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld"
-
-#: ../midori/midori-websettings.c:659
-msgid "Preferred Encoding"
-msgstr "Voorkeurcodering"
-
-#: ../midori/midori-websettings.c:660
-msgid "The preferred character encoding"
-msgstr "De voorkeurcodering van tekens"
-
-#: ../midori/midori-websettings.c:670
-msgid "Always Show Tabbar"
-msgstr "Balk met tabbladen altijd weergeven"
-
-#: ../midori/midori-websettings.c:671
-msgid "Always show the tabbar"
-msgstr "De balk met tabbladen altijd weergeven"
-
-#: ../midori/midori-websettings.c:684
-msgid "Close Buttons on Tabs"
-msgstr "Sluitknoppen op tabbladen"
-
-#: ../midori/midori-websettings.c:685
-msgid "Whether tabs have close buttons"
-msgstr "Of tabbladen sluitknoppen hebben"
-
-#: ../midori/midori-websettings.c:710
+#: ../midori/midori-websettings.c:325
msgid "Open new pages in:"
msgstr "Nieuwe pagina's openen in:"
-#: ../midori/midori-websettings.c:711
-msgid "Where to open new pages"
-msgstr "Waar nieuwe pagina's geopend moeten worden"
-
-#: ../midori/midori-websettings.c:720
-msgid "Middle click opens Selection"
-msgstr "Klikken met middelste muisknop opent selectie"
-
-#: ../midori/midori-websettings.c:721
-msgid "Load an address from the selection via middle click"
-msgstr "Een adres vanuit de selectie laden met middelste muisknop"
-
-#: ../midori/midori-websettings.c:729
-msgid "Open tabs in the background"
-msgstr "Tabbladen op de achtergrond openen"
-
-#: ../midori/midori-websettings.c:730
-msgid "Whether to open new tabs in the background"
-msgstr "Of tabbladen op de achtergrond geopend dienen te worden"
-
-#: ../midori/midori-websettings.c:738
-msgid "Open Tabs next to Current"
-msgstr "Tabbladen naast het huidige tabblad openen"
-
-#: ../midori/midori-websettings.c:739
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr ""
-"Of nieuwe tabbladen naast het huidige tabblad geopend dienen te worden of na "
-"het laatste tabblad"
-
-#: ../midori/midori-websettings.c:747
-msgid "Open popups in tabs"
-msgstr "Opduikvensters in tabbladen openen"
-
-#: ../midori/midori-websettings.c:748
-msgid "Whether to open popup windows in tabs"
-msgstr "Of opduikvensters in tabbladen geopend dienen te worden"
-
-#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Afbeeldingen automatisch laden"
-
-#: ../midori/midori-websettings.c:759
-msgid "Load and display images automatically"
-msgstr "Afbeeldingen automatisch laden en weergeven"
-
-#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Scripts aanzetten"
-
-#: ../midori/midori-websettings.c:767
-msgid "Enable embedded scripting languages"
-msgstr "Ingebedde scripttalen uitvoeren"
-
-#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Netscape-plugins uitvoeren"
-
-#: ../midori/midori-websettings.c:775
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Ingebedde Netscape-pluginobjecten uitvoeren"
-
-#: ../midori/midori-websettings.c:790
-msgid "Enable Spell Checking"
-msgstr "Spellingscontrole aanzetten"
-
-#: ../midori/midori-websettings.c:791
-msgid "Enable spell checking while typing"
-msgstr "Spellingscontrole tijdens het typen activeren"
-
-#: ../midori/midori-websettings.c:797
-msgid "Enable HTML5 database support"
-msgstr "Ondersteuning van HTML5-gegevensbank activeren"
-
-#: ../midori/midori-websettings.c:798
-msgid "Whether to enable HTML5 database support"
-msgstr "Of ondersteuning van de HTML5-gegevensbank dient te worden geactiveerd"
-
-#: ../midori/midori-websettings.c:804
-msgid "Enable HTML5 local storage support"
-msgstr "HTML5 lokale opslagondersteuning activeren"
-
-#: ../midori/midori-websettings.c:805
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Of HTML5 locale opslagondersteuning dient te worden geactiveerd"
-
-#: ../midori/midori-websettings.c:811
-msgid "Enable offline web application cache"
-msgstr "Offline webtoepassingsopslag gebruiken"
-
-#: ../midori/midori-websettings.c:812
-msgid "Whether to enable offline web application cache"
-msgstr "Of offline webtoepassingsopslag dient te worden gebruikt"
-
-#: ../midori/midori-websettings.c:828
-msgid "Flash window on background tabs"
-msgstr "Laat venster op achtergrond-tabbladen opflitsen"
-
-#: ../midori/midori-websettings.c:829
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr ""
-"Laat het browser-venster opflitsen indien er een nieuw tabblad werd geopend "
-"in de achtergrond"
-
-#: ../midori/midori-websettings.c:837
-msgid "Enable WebGL support"
-msgstr "WebGL-ondersteuning inschakelen"
-
-#: ../midori/midori-websettings.c:838
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Sta websites toe om OpenGL-weergave te gebruiken"
-
-#: ../midori/midori-websettings.c:864
-msgid "Zoom Text and Images"
-msgstr "Tekst en afbeeldingen zoomen"
-
-#: ../midori/midori-websettings.c:865
-msgid "Whether to zoom text and images"
-msgstr "Of tekst en afbeeldingen gezoomd dienen te worden"
-
-#: ../midori/midori-websettings.c:880
-msgid "Find inline while typing"
-msgstr "Zoeken tijdens typen can regel"
-
-#: ../midori/midori-websettings.c:881
-msgid "Whether to automatically find inline while typing"
-msgstr "Of automatisch gezocht moet worden tijdens typen van regel"
-
-#: ../midori/midori-websettings.c:896
-msgid "Kinetic scrolling"
-msgstr "Kinetisch bladeren"
-
-#: ../midori/midori-websettings.c:897
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Of bladeren kinetisch dient te gebeuren volgens de snelheid"
-
-#: ../midori/midori-websettings.c:905
-msgid "Delete old Cookies after:"
-msgstr "Verwijder oude koekjes na:"
-
-#: ../midori/midori-websettings.c:906
-msgid "The maximum number of days to save cookies for"
-msgstr "Hoeveel dagen een koekje maximaal bewaard mag worden"
-
-#: ../midori/midori-websettings.c:922
-msgid "Only accept Cookies from sites you visit"
-msgstr "Alleen koekjes aanvaarden van websites die u bezoekt"
-
-#: ../midori/midori-websettings.c:923
-msgid "Block cookies sent by third-party websites"
-msgstr "Blokkeer koekjes verzonden door derden"
-
-#: ../midori/midori-websettings.c:937
-msgid "Delete pages from history after:"
-msgstr "Verwijder pagina's uit de geschiedenis na:"
-
-#: ../midori/midori-websettings.c:938
-msgid "The maximum number of days to save the history for"
-msgstr "Hoeveel dagen de geschiedenis bewaard moeten blijven"
-
-#: ../midori/midori-websettings.c:953
-msgid "Proxy server"
-msgstr "Proxyserver"
-
-#: ../midori/midori-websettings.c:954
-msgid "The type of proxy server to use"
-msgstr "De te gebruiken proxyserver"
-
-#: ../midori/midori-websettings.c:963
-msgid "HTTP Proxy Server"
-msgstr "HTTP Proxyserver"
-
-#: ../midori/midori-websettings.c:964
-msgid "The proxy server used for HTTP connections"
-msgstr "De proxyserver die gebruikt wordt voor HTTP-verbindingen"
-
-#: ../midori/midori-websettings.c:979
-msgid "Port"
-msgstr "Poort"
-
-#: ../midori/midori-websettings.c:980
-msgid "The proxy server port used for HTTP connections"
-msgstr "De proxyserver die gebruikt wordt voor HTTP-verbindingen"
-
-#: ../midori/midori-websettings.c:998
-msgid "The maximum size of cached pages on disk"
-msgstr "De maximale grootte van opgeslagen pagina's op de harde schijf"
-
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:388
msgid "Identify as"
msgstr "Identificeren als"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:389
msgid "What to identify as to web pages"
msgstr "Hoe zich te identificeren op webpagina's"
-#: ../midori/midori-websettings.c:1032
-msgid "Identification string"
-msgstr "Identificatie-tekstsnoer"
-
-#: ../midori/midori-websettings.c:1033
-msgid "The application identification string"
-msgstr "Het identificatie-tekstsnoer van de toepassing"
-
-#: ../midori/midori-websettings.c:1049
-msgid "Preferred languages"
-msgstr "Voorkeurstalen"
-
-#: ../midori/midori-websettings.c:1050
-msgid ""
-"A comma separated list of languages preferred for rendering multilingual "
-"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-msgstr ""
-"Een door komma's gescheiden lijst van voorkeurstalen om meertalige "
-"webpagina's in weer te geven, bijvoorbeeld \"de\", \"ru,nl\" of \"en-us;"
-"q=1.0, fr-fr;q=0.667\""
-
-#: ../midori/midori-websettings.c:1065
-msgid "Clear private data"
-msgstr "Privé-gegevens wissen"
-
-#: ../midori/midori-websettings.c:1066
-msgid "The private data selected for deletion"
-msgstr "De te verwijderen privé-gegevens"
-
-#: ../midori/midori-websettings.c:1081
-msgid "Clear data"
-msgstr "Gegevens wissen"
-
-#: ../midori/midori-websettings.c:1082
-msgid "The data selected for deletion"
-msgstr "De te verwijderen gegevens"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1131
-msgid "Strip referrer details sent to websites"
-msgstr "Verwijder naar websites gestuurde verwijzingdetails"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1133
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Of de \"Referer\" koptekst moet worden verkort tot de hostnaam"
-
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:472
msgid "Always use my font choices"
msgstr "Altijd mijn lettertypekeuzes gebruiken"
-#: ../midori/midori-websettings.c:1148
+#: ../midori/midori-websettings.c:473
msgid "Override fonts picked by websites with user preferences"
msgstr "Lettertypes van websites vervangen door gebruikersvoorkeuren"
-#: ../midori/midori-view.c:1375
+#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151
+msgid "Trust this website"
+msgstr "Vertrouw deze website"
+
+#: ../midori/midori-view.c:1149
+msgid "Security unknown"
+msgstr "Veiligheid onbekend"
+
+#: ../midori/midori-view.c:1447
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s wil een HTML5-gegevensbank opslaan."
-#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Deny"
msgstr "_Weigeren"
-#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Allow"
msgstr "_Toestaan"
-#: ../midori/midori-view.c:1407
+#: ../midori/midori-view.c:1480
#, c-format
msgid "%s wants to know your location."
msgstr "%s wil uw locatie weten."
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1576
#, c-format
msgid "Error - %s"
msgstr "Fout - %s"
-#: ../midori/midori-view.c:1501
+#: ../midori/midori-view.c:1577
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "De pagina '%s' kan niet worden geladen"
-#: ../midori/midori-view.c:1503
+#: ../midori/midori-view.c:1579
msgid "Try again"
msgstr "Probeer opnieuw"
-#: ../midori/midori-view.c:1701 ../midori/midori-view.c:2623
+#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2839
#, c-format
msgid "Send a message to %s"
msgstr "Stuur een bericht naar %s"
-#: ../midori/midori-view.c:2453 ../midori/midori-view.c:2779
+#: ../midori/midori-view.c:2622
+msgid "Add _search engine..."
+msgstr "Zoekmachine toevoegen"
+
+#: ../midori/midori-view.c:2666 ../midori/midori-view.c:2995
msgid "Inspect _Element"
msgstr "_Element inspecteren"
-#: ../midori/midori-view.c:2505
+#: ../midori/midori-view.c:2718
msgid "Open Link in New _Tab"
msgstr "Koppeling in nieuw _tabblad openen"
-#: ../midori/midori-view.c:2509
+#: ../midori/midori-view.c:2722
msgid "Open Link in _Foreground Tab"
msgstr "Koppeling in nieuw tabblad op _voorgrond openen"
-#: ../midori/midori-view.c:2510
+#: ../midori/midori-view.c:2723
msgid "Open Link in _Background Tab"
msgstr "Koppeling in nieuw tabblad op _achtergrond openen"
-#: ../midori/midori-view.c:2513
+#: ../midori/midori-view.c:2726
msgid "Open Link in New _Window"
msgstr "Koppeling in nieuw _venster Openen"
-#: ../midori/midori-view.c:2516
+#: ../midori/midori-view.c:2729
msgid "Open Link as Web A_pplication"
msgstr "Koppeling als webt_oepassing openen"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2734
msgid "Copy Link de_stination"
msgstr "Koppelingbe_stemming kopiëren"
-#: ../midori/midori-view.c:2537
+#: ../midori/midori-view.c:2750
msgid "Open _Image in New Tab"
msgstr "Open _afbeelding in nieuw tabblad"
-#: ../midori/midori-view.c:2540
-msgid "Copy Image _Address"
-msgstr "_Adres van afbeelding kopiëren"
+#: ../midori/midori-view.c:2753
+msgid "Copy Im_age"
+msgstr "Afbeelding kopiëren"
-#: ../midori/midori-view.c:2543
+#: ../midori/midori-view.c:2756
msgid "Save I_mage"
msgstr "A_fbeelding opslaan"
-#: ../midori/midori-view.c:2546
+#: ../midori/midori-view.c:2759
msgid "Open in Image _Viewer"
msgstr "Openen in afbeeldingkijker."
-#: ../midori/midori-view.c:2553
+#: ../midori/midori-view.c:2766
msgid "Copy Video _Address"
msgstr "_Adres van video kopiëren"
-#: ../midori/midori-view.c:2556
+#: ../midori/midori-view.c:2769
msgid "Save _Video"
msgstr "_Video opslaan"
-#: ../midori/midori-view.c:2556
+#: ../midori/midori-view.c:2769
msgid "Download _Video"
msgstr "_Video binnenhalen"
-#: ../midori/midori-view.c:2582
+#: ../midori/midori-view.c:2795
msgid "Search _with"
msgstr "Zoeken _met"
-#: ../midori/midori-view.c:2614
+#: ../midori/midori-view.c:2827
msgid "_Search the Web"
msgstr "_Zoek op internet"
-#: ../midori/midori-view.c:2631
+#: ../midori/midori-view.c:2847
msgid "Open Address in New _Tab"
msgstr "Adres in nieuw _tabblad openen"
-#: ../midori/midori-view.c:2684
+#: ../midori/midori-view.c:2900
msgid "Open _Frame in New Tab"
msgstr "Open omlijsting in nieuw tabblad"
-#: ../midori/midori-view.c:2988
-msgid "Open or download file"
-msgstr "Bestand openen of downloaden"
-
-#: ../midori/midori-view.c:3008
+#: ../midori/midori-view.c:3155
#, c-format
-msgid "File Type: '%s'"
-msgstr "Bestandtype: '%s'"
+msgid "Open or download file from %s"
+msgstr "Bestand openen of binnenhalen vanaf %s"
-#: ../midori/midori-view.c:3010
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Bestandtype: %s ('%s')"
-
-#: ../midori/midori-view.c:3014
+#: ../midori/midori-view.c:3168
#, c-format
msgid "File Name: %s"
msgstr "Bestandnaam: %s"
-#: ../midori/midori-view.c:3041
+#: ../midori/midori-view.c:3173
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Bestandtype: '%s'"
+
+#: ../midori/midori-view.c:3175
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Bestandtype: %s ('%s')"
+
+#: ../midori/midori-view.c:3212
+#, c-format
+msgid "Size: %s"
+msgstr "Grootte: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3223
#, c-format
msgid "Open %s"
msgstr "Openen %s"
-#: ../midori/midori-view.c:3700
+#: ../midori/midori-view.c:3834
#, c-format
msgid "Inspect page - %s"
msgstr "Pagina analyseren - %s"
-#: ../midori/midori-view.c:4047
-msgid "Speed Dial"
-msgstr "Snelkeuze"
-
-#: ../midori/midori-view.c:4048 ../midori/midori-view.c:4144
-msgid "Click to add a shortcut"
-msgstr "Klik om een sneltoets toe te voegen"
-
-#: ../midori/midori-view.c:4049
-msgid "Enter shortcut address"
-msgstr "Voer adres voor sneltoets in"
-
-#: ../midori/midori-view.c:4050
-msgid "Enter shortcut title"
-msgstr "Voer titel voor sneltoets in"
-
-#: ../midori/midori-view.c:4051
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "Weet u zeker dat u deze sneltoets wilt wissen?"
-
-#: ../midori/midori-view.c:4213
+#: ../midori/midori-view.c:4231
#, c-format
msgid "No documentation installed"
msgstr "Geen documentatie geïnstalleerd"
-#: ../midori/midori-view.c:4289
+#: ../midori/midori-view.c:4308
msgid "Midori doesn't store any personal data:"
msgstr "Midori slaat geen persoonlijke gegevens op:"
-#: ../midori/midori-view.c:4290
+#: ../midori/midori-view.c:4309
msgid "No history or web cookies are being saved."
msgstr "Webgeschiedenis en webkoekjes worden niet opgeslagen."
-#: ../midori/midori-view.c:4291
+#: ../midori/midori-view.c:4310
msgid "Extensions are disabled."
msgstr "Extensies zijn uitgeschakeld."
-#: ../midori/midori-view.c:4292
+#: ../midori/midori-view.c:4311
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
"HTML5-opslag, plaatselijke gegevensbank en toepassingopslag zijn "
"uitgeschakeld."
-#: ../midori/midori-view.c:4293
+#: ../midori/midori-view.c:4312
msgid "Midori prevents websites from tracking the user:"
msgstr "Midori verhindert websites om de gebruiker te volgen:"
-#: ../midori/midori-view.c:4294
+#: ../midori/midori-view.c:4313
msgid "Referrer URLs are stripped down to the hostname."
msgstr "Verwijzingskoppelingen worden teruggebracht tot de hostnaam."
-#: ../midori/midori-view.c:4295
+#: ../midori/midori-view.c:4314
msgid "DNS prefetching is disabled."
msgstr "Vooraf DNS binnenhalen is uitgeschakeld."
-#: ../midori/midori-view.c:4296
+#: ../midori/midori-view.c:4315
msgid "The language and timezone are not revealed to websites."
msgstr "De taal en de tijdzone worden niet bekendgemaakt aan websites."
-#: ../midori/midori-view.c:4297
+#: ../midori/midori-view.c:4316
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr ""
"Flash en andere Netscape (Firefox)-plugins, kunnen niet worden geregistreerd "
"door websites."
-#: ../midori/midori-view.c:4370
+#: ../midori/midori-view.c:4402
msgid "Version numbers in brackets show the version used at runtime."
msgstr ""
"Versienummers tussen haakjes tonen de versie die tijdens de runtime wordt "
"gebruikt"
-#: ../midori/midori-view.c:4422
+#: ../midori/midori-view.c:4451
msgid "Page loading delayed"
msgstr "Het laden van de pagina is vertraagd"
-#: ../midori/midori-view.c:4423
+#: ../midori/midori-view.c:4452
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"Het laden is vertraagd ofwel door een recente crash ofwel door "
"opstartvoorkeuren."
-#: ../midori/midori-view.c:4424
+#: ../midori/midori-view.c:4453
msgid "Load Page"
msgstr "Pagina laden"
-#: ../midori/midori-view.c:4590
+#: ../midori/midori-view.c:4620
msgid "Blank page"
msgstr "Blanco pagina"
-#: ../midori/midori-view.c:4852
+#: ../midori/midori-view.c:4884
msgid "_Duplicate Tab"
msgstr "Tabblad _dupliceren"
-#: ../midori/midori-view.c:4857
+#: ../midori/midori-view.c:4889
msgid "Show Tab _Label"
msgstr "Toon tabblad_etiket"
-#: ../midori/midori-view.c:4857
+#: ../midori/midori-view.c:4889
msgid "Show Tab _Icon Only"
msgstr "Toon alleen tabblad_pictogram"
-#: ../midori/midori-view.c:4863
-msgid "Close ot_her Tabs"
-msgstr "An_dere tabbladen sluiten"
+#: ../midori/midori-view.c:4896
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Andere tabblad sluiten"
+msgstr[1] "Andere tabbladen sluiten"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5676
+#: ../midori/midori-view.c:5653
msgid "previous"
msgstr "vorige"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5695
+#: ../midori/midori-view.c:5672
msgid "next"
msgstr "volgende"
-#: ../midori/midori-view.c:5708
+#: ../midori/midori-view.c:5685
msgid "Print background images"
msgstr "Achtergrondafbeeldingen meenemen in afdrukken"
-#: ../midori/midori-view.c:5709
+#: ../midori/midori-view.c:5686
msgid "Whether background images should be printed"
msgstr "Of achtergrondafbeeldingen dienen te worden afgedrukt"
-#: ../midori/midori-view.c:5741
+#: ../midori/midori-view.c:5718
msgid "Features"
msgstr "Opties"
-#: ../midori/midori-preferences.c:297
-msgid "Startup"
-msgstr "Opstarten"
-
-#: ../midori/midori-preferences.c:310
-msgid "Use _current page"
-msgstr "Gebruik _huidige pagina"
-
-#: ../midori/midori-preferences.c:314
-msgid "Use current page as homepage"
-msgstr "Gebruik de huidige pagina als startpagina"
-
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
-msgid "Fonts"
-msgstr "Lettertypes"
-
-#: ../midori/midori-preferences.c:326
-msgid "Proportional Font Family"
-msgstr "Proportionele lettertypen-familie"
-
-#: ../midori/midori-preferences.c:330
-msgid "The default font family used to display text"
-msgstr "De standaardlettertype-familie om tekst weer te geven"
-
-#: ../midori/midori-preferences.c:333
-msgid "The default font size used to display text"
-msgstr "De standaard lettergrootte om tekst weer te geven"
-
-#: ../midori/midori-preferences.c:335
-msgid "Fixed-width Font Family"
-msgstr "Lettertype-familie met vaste breedte"
-
-#: ../midori/midori-preferences.c:339
-msgid "The font family used to display fixed-width text"
-msgstr "De lettertype-familie om tekst met vaste breedte weer te geven"
-
-#: ../midori/midori-preferences.c:342
-msgid "The font size used to display fixed-width text"
-msgstr "De lettertypegrootte om tekst met vaste breedte weer te geven"
-
-#: ../midori/midori-preferences.c:344
-msgid "Minimum Font Size"
-msgstr "Minimale lettertypegrootte"
-
-#: ../midori/midori-preferences.c:348
-msgid "The minimum font size used to display text"
-msgstr "De minimale lettertypegrootte om tekst weer te geven"
-
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
-msgid "Behavior"
-msgstr "Gedrag"
-
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
-msgstr "Scripts toelaten om opduikvensters te openen"
-
-#: ../midori/midori-preferences.c:386
-msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr ""
-"Of het toegelaten is voor scripts om opduikvensters automatisch te openen"
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:416
-msgid "Browsing"
-msgstr "Surfen"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:456
-msgid "Network"
-msgstr "Netwerk"
-
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "Hostnaam"
-
-#: ../midori/midori-preferences.c:487
-msgid "MB"
-msgstr "MB"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Add search engine"
-msgstr "Zoekmachine toevoegen"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Edit search engine"
-msgstr "Zoekmachine bewerken"
-
-#: ../midori/midori-searchaction.c:931
-msgid "_Name:"
-msgstr "_Naam:"
-
-#: ../midori/midori-searchaction.c:947
-msgid "_Description:"
-msgstr "_Beschrijving:"
-
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Pictogram:"
-
-#: ../midori/midori-searchaction.c:995
-msgid "_Token:"
-msgstr "_Trefwoord:"
-
-#: ../midori/midori-searchaction.c:1295
-msgid "Manage Search Engines"
-msgstr "Zoekmachines beheren"
-
-#: ../midori/midori-searchaction.c:1395
-msgid "Use as _default"
-msgstr "Als _standaard gebruiken"
-
-#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr "Openen met"
-
-#: ../midori/sokoke.c:362
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:48
#, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Kies een toepassing of opdracht om \"%s\" te openen:"
+msgid "%s of %s"
+msgstr "%s van %s"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
-msgid "Could not run external program."
-msgstr "Kon extern programma niet uitvoeren."
-
-#: ../midori/sokoke.c:1595
+#: ../midori/midori-download.vala:64
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d uur"
msgstr[1] "%d uur"
-#: ../midori/sokoke.c:1596
+#: ../midori/midori-download.vala:65
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuut"
msgstr[1] "%d minuten"
-#: ../midori/sokoke.c:1597
+#: ../midori/midori-download.vala:66
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d seconde"
msgstr[1] "%d seconden"
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
-#, c-format
-msgid "%s of %s"
-msgstr "%s van %s"
-
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
-msgid "?B"
-msgstr "?B"
-
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
-#, c-format
-msgid " (%s/s)"
-msgstr " (%s/s)"
-
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/midori-download.vala:82
#, c-format
msgid " - %s remaining"
msgstr " - %s over"
-#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
-msgid "_Inline Find:"
-msgstr "_Zoeken in regel:"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:92
+msgid "?B"
+msgstr "?B"
-#: ../toolbars/midori-findbar.c:317
-msgid "Previous"
-msgstr "Vorig"
-
-#: ../toolbars/midori-findbar.c:323
-msgid "Next"
-msgstr "Volgend"
-
-#: ../toolbars/midori-findbar.c:327
-msgid "Match Case"
-msgstr "Hoofdlettergevoelig"
-
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr "Overeenkomsten markeren"
-
-#: ../toolbars/midori-findbar.c:347
-msgid "Close Findbar"
-msgstr "Zoekbalk sluiten"
-
-#: ../toolbars/midori-transferbar.c:122
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:94
#, c-format
-msgid "The file '%s ' has been downloaded."
-msgstr "Het bestand '%s' is binnengehaald."
+msgid " (%s/s)"
+msgstr " (%s/s)"
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "Overdracht compleet"
-
-#: ../toolbars/midori-transferbar.c:193
+#: ../midori/midori-download.vala:188
msgid "The downloaded file is erroneous."
msgstr "Het binnengehaalde bestand is foutief."
-#: ../toolbars/midori-transferbar.c:194
+#: ../midori/midori-download.vala:189
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2122,48 +1651,364 @@ msgstr ""
"betekent dat het bestand waarschijnlijk incompleet is of achteraf gewijzigd "
"werd."
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../midori/midori-download.vala:302
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr " Het bestand '%s' kan niet worden opgeslagen in deze map."
+
+#: ../midori/midori-download.vala:304
+msgid "You don't have permission to write in this location."
+msgstr "U heeft geen rechten om op deze plaats te schrijven."
+
+#: ../midori/midori-download.vala:307
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Er is niet voldoende schijfruimte om '%s' binnen te halen."
+
+#: ../midori/midori-download.vala:309
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Het bestand heeft %s nodig maar slechts %s zijn over."
+
+#: ../midori/midori-speeddial.vala:180
+msgid "Speed Dial"
+msgstr "Snelkeuze"
+
+#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+msgid "Click to add a shortcut"
+msgstr "Klik om een sneltoets toe te voegen"
+
+#: ../midori/midori-speeddial.vala:182
+msgid "Enter shortcut address"
+msgstr "Voer adres voor sneltoets in"
+
+#: ../midori/midori-speeddial.vala:183
+msgid "Enter shortcut title"
+msgstr "Voer titel voor sneltoets in"
+
+#: ../midori/midori-speeddial.vala:184
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Weet u zeker dat u deze sneltoets wilt wissen?"
+
+#: ../midori/midori-preferences.c:299
+msgid "Startup"
+msgstr "Opstarten"
+
+#: ../midori/midori-preferences.c:305
+msgid "Homepage:"
+msgstr "Startpagina:"
+
+#: ../midori/midori-preferences.c:313
+msgid "Use _current page"
+msgstr "Gebruik _huidige pagina"
+
+#: ../midori/midori-preferences.c:317
+msgid "Use current page as homepage"
+msgstr "Gebruik de huidige pagina als startpagina"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:326
+msgid "Fonts"
+msgstr "Lettertypes"
+
+#: ../midori/midori-preferences.c:329
+msgid "Proportional Font Family"
+msgstr "Proportionele lettertypen-familie"
+
+#: ../midori/midori-preferences.c:333
+msgid "The default font family used to display text"
+msgstr "De standaardlettertype-familie om tekst weer te geven"
+
+#: ../midori/midori-preferences.c:336
+msgid "The default font size used to display text"
+msgstr "De standaard lettergrootte om tekst weer te geven"
+
+#: ../midori/midori-preferences.c:338
+msgid "Fixed-width Font Family"
+msgstr "Lettertype-familie met vaste breedte"
+
+#: ../midori/midori-preferences.c:342
+msgid "The font family used to display fixed-width text"
+msgstr "De lettertype-familie om tekst met vaste breedte weer te geven"
+
+#: ../midori/midori-preferences.c:345
+msgid "The font size used to display fixed-width text"
+msgstr "De lettertypegrootte om tekst met vaste breedte weer te geven"
+
+#: ../midori/midori-preferences.c:347
+msgid "Minimum Font Size"
+msgstr "Minimale lettertypegrootte"
+
+#: ../midori/midori-preferences.c:351
+msgid "The minimum font size used to display text"
+msgstr "De minimale lettertypegrootte om tekst weer te geven"
+
+#: ../midori/midori-preferences.c:356
+msgid "Preferred Encoding"
+msgstr "Voorkeurcodering"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:363
+msgid "Behavior"
+msgstr "Gedrag"
+
+#: ../midori/midori-preferences.c:367 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Afbeeldingen automatisch laden"
+
+#: ../midori/midori-preferences.c:370
+msgid "Enable Spell Checking"
+msgstr "Spellingscontrole aanzetten"
+
+#: ../midori/midori-preferences.c:384 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Scripts aanzetten"
+
+#: ../midori/midori-preferences.c:387 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Netscape-plugins uitvoeren"
+
+#: ../midori/midori-preferences.c:392
+msgid "Zoom Text and Images"
+msgstr "Tekst en afbeeldingen zoomen"
+
+#: ../midori/midori-preferences.c:395
+msgid "Allow scripts to open popups"
+msgstr "Scripts toelaten om opduikvensters te openen"
+
+#: ../midori/midori-preferences.c:396
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+"Of het toegelaten is voor scripts om opduikvensters automatisch te openen"
+
+#: ../midori/midori-preferences.c:402
+msgid "Kinetic scrolling"
+msgstr "Kinetisch bladeren"
+
+#: ../midori/midori-preferences.c:403
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr "Of bladeren kinetisch dient te gebeuren volgens de snelheid"
+
+#: ../midori/midori-preferences.c:408
+msgid "Middle click opens Selection"
+msgstr "Klikken met middelste muisknop opent selectie"
+
+#: ../midori/midori-preferences.c:409
+msgid "Load an address from the selection via middle click"
+msgstr "Een adres vanuit de selectie laden met middelste muisknop"
+
+#: ../midori/midori-preferences.c:415
+msgid "Enable WebGL support"
+msgstr "WebGL-ondersteuning inschakelen"
+
+#: ../midori/midori-preferences.c:420
+msgid "Flash window on background tabs"
+msgstr "Laat venster op achtergrond-tabbladen opflitsen"
+
+#: ../midori/midori-preferences.c:425
+msgid "Preferred languages"
+msgstr "Voorkeurstalen"
+
+#: ../midori/midori-preferences.c:429
+msgid ""
+"A comma separated list of languages preferred for rendering multilingual "
+"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+msgstr ""
+"Een door komma's gescheiden lijst van voorkeurstalen om meertalige "
+"webpagina's in weer te geven, bijvoorbeeld 'de', 'ru,nl' of 'en-us;q=1.0, fr-"
+"fr;q=0.667'"
+
+#: ../midori/midori-preferences.c:431
+msgid "Save downloaded files to:"
+msgstr "Bewaar binnengehaalde bestanden in:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:438
+msgid "Browsing"
+msgstr "Surfen"
+
+#: ../midori/midori-preferences.c:454
+msgid "Close Buttons on Tabs"
+msgstr "Sluitknoppen op tabbladen"
+
+#: ../midori/midori-preferences.c:458
+msgid "Always Show Tabbar"
+msgstr "Balk met tabbladen altijd weergeven"
+
+#: ../midori/midori-preferences.c:462
+msgid "Open Tabs next to Current"
+msgstr "Tabbladen naast het huidige tabblad openen"
+
+#: ../midori/midori-preferences.c:463
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Of nieuwe tabbladen naast het huidige tabblad geopend dienen te worden of na "
+"het laatste tabblad"
+
+#: ../midori/midori-preferences.c:466
+msgid "Open tabs in the background"
+msgstr "Tabbladen op de achtergrond openen"
+
+#: ../midori/midori-preferences.c:470
+msgid "Text Editor"
+msgstr "Tekstverwerker"
+
+#: ../midori/midori-preferences.c:475
+msgid "News Aggregator"
+msgstr "Nieuwsaggregator"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:482
+msgid "Network"
+msgstr "Netwerk"
+
+#: ../midori/midori-preferences.c:484
+msgid "Proxy server"
+msgstr "Proxyserver"
+
+#: ../midori/midori-preferences.c:489
+msgid "Hostname"
+msgstr "Hostnaam"
+
+#: ../midori/midori-preferences.c:497
+msgid "Port"
+msgstr "Poort"
+
+#: ../midori/midori-preferences.c:509 ../midori/midori-preferences.c:512
+msgid "The maximum size of cached pages on disk"
+msgstr "De maximale grootte van opgeslagen pagina's op de harde schijf"
+
+#: ../midori/midori-preferences.c:514
+msgid "MB"
+msgstr "MB"
+
+#: ../midori/midori-searchaction.c:1074
+msgid "Add search engine"
+msgstr "Zoekmachine toevoegen"
+
+#: ../midori/midori-searchaction.c:1074
+msgid "Edit search engine"
+msgstr "Zoekmachine bewerken"
+
+#: ../midori/midori-searchaction.c:1102
+msgid "_Name:"
+msgstr "_Naam:"
+
+#: ../midori/midori-searchaction.c:1117
+msgid "_Description:"
+msgstr "_Beschrijving:"
+
+#: ../midori/midori-searchaction.c:1130 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Adres:"
+
+#: ../midori/midori-searchaction.c:1149
+msgid "_Token:"
+msgstr "_Trefwoord:"
+
+#: ../midori/midori-searchaction.c:1447
+msgid "Manage Search Engines"
+msgstr "Zoekmachines beheren"
+
+#: ../midori/midori-searchaction.c:1549
+msgid "Use as _default"
+msgstr "Als _standaard gebruiken"
+
+#: ../midori/sokoke.c:355
+msgid "Open with"
+msgstr "Openen met"
+
+#: ../midori/sokoke.c:363
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Kies een toepassing of opdracht om \"%s\" te openen:"
+
+#: ../midori/sokoke.c:478 ../midori/sokoke.c:492
+msgid "Could not run external program."
+msgstr "Kon extern programma niet uitvoeren."
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:265
+msgid "_Inline Find:"
+msgstr "_Zoeken in regel:"
+
+#: ../toolbars/midori-findbar.c:287
+msgid "Previous"
+msgstr "Vorig"
+
+#: ../toolbars/midori-findbar.c:293
+msgid "Next"
+msgstr "Volgend"
+
+#: ../toolbars/midori-findbar.c:297
+msgid "Match Case"
+msgstr "Hoofdlettergevoelig"
+
+#: ../toolbars/midori-findbar.c:306
+msgid "Highlight Matches"
+msgstr "Overeenkomsten markeren"
+
+#: ../toolbars/midori-findbar.c:317
+msgid "Close Findbar"
+msgstr "Zoekbalk sluiten"
+
+#: ../toolbars/midori-transferbar.c:109
+#, c-format
+msgid "The file '%s ' has been downloaded."
+msgstr "Het bestand '%s' is binnengehaald."
+
+#: ../toolbars/midori-transferbar.c:114
+msgid "Transfer completed"
+msgstr "Overdracht compleet"
+
+#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
msgid "Clear All"
msgstr "Alles wissen"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
msgid "Some files are being downloaded"
msgstr "Sommige bestanden worden binnengehaald"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:278
msgid "_Quit Midori"
msgstr "Midori _afsluiten"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:280
msgid "The transfers will be cancelled if Midori quits."
msgstr ""
"De bestandoverdrachten zullen worden geannuleerd als Midori wordt afgesloten."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Bladwijzers"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Niet gelukt om bladwijzerelement toe te voegen: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Kon bladwijzer niet bijwerken : %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Geselecteerde bladwijzer bewerken"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Geselecteerde bladwijzer verwijderen"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Een nieuwe map toevoegen"
-#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Scheidingsteken "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Bladwijzers zoeken"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Geschiedenis"
@@ -2208,15 +2053,20 @@ msgstr "Geselecteerde element uit geschiedenis verwijderen"
msgid "Clear the entire history"
msgstr "Volledige geschiedenis wissen"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Zoekgeschiedenis"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Overdrachten"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:435
msgid "Open Destination _Folder"
msgstr "Open bestemmings_map"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:438
msgid "Copy Link Loc_ation"
msgstr "Kopieer _koppelingsverwijzing"
@@ -2258,168 +2108,176 @@ msgstr "Standaardpictogram '%s' kon niet geladen worden"
msgid "Animation frames are broken"
msgstr "Animatiebeelden zijn gebroken"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Eigenschap '%s' is ongeldig voor %s"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
-#: ../extensions/addons.c:308
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:309
msgid "Choose file"
msgstr "Bestand kiezen"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Map kiezen"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Geen"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 uur"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 dag"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 week"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 maand"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 jaar"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Voorkeuren voor %s"
-#: ../extensions/adblock.c:473
+#: ../katze/midori-uri.vala:168
+msgid "MD5-Checksum:"
+msgstr "MD5-Controlesom:"
+
+#: ../katze/midori-uri.vala:175
+msgid "SHA1-Checksum:"
+msgstr "SHA1-Controlesom:"
+
+#: ../extensions/adblock.c:495
msgid "Configure Advertisement filters"
msgstr "Configureer advertentiefilters"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:528
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
"\"Add\" to add it to the list. You can find more lists at %s."
msgstr ""
"Tik het adres van een voorgeconfigureerde filterlijst in het tekstvak en "
-"klik \"\\Toevoegen\" om het aan de lijst toe te voegen. Meer lijsten zijn "
+"klik op 'Toevoegen' om het aan de lijst toe te voegen. Meer lijsten zijn "
"beschikbaar op %s."
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:944
msgid "Edit rule"
msgstr "Regel bewerken"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:958
msgid "_Rule:"
msgstr "_Regel:"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:1012
msgid "Bl_ock image"
msgstr "Afbeelding bl_okkeren"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:1017
msgid "Bl_ock link"
msgstr "Koppeling bl_okkeren"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1915
msgid "Advertisement blocker"
msgstr "Advertentieblokkeerder"
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1916
msgid "Block advertisements according to a filter list"
msgstr "Blokkeer advertenties volgens filterlijst"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
+#: ../extensions/addons.c:222
msgid "This page appears to contain a user script. Do you wish to install it?"
msgstr ""
"Deze pagina lijkt een gebruikersscript te bevatten. Wilt u het installeren?"
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
msgid "_Install user script"
msgstr "Gebruikerscript _installeren"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
msgid "This page appears to contain a user style. Do you wish to install it?"
msgstr ""
"Deze pagina lijkt een gebruikersstijl te bevatten. Wilt u het installeren?"
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
msgid "_Install user style"
msgstr "Gebruikersstijl _installeren"
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
msgid "Don't install"
msgstr "Niet installeren"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:320 ../extensions/addons.c:675
msgid "Userscripts"
msgstr "Gebruikersscripts"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:325 ../extensions/addons.c:677
msgid "Userstyles"
msgstr "Gebruikersopmaakprofielen"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:371 ../extensions/addons.c:450
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Fout"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:412
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Wilt u '%s' verwijderen?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:418
msgid "Delete user script"
msgstr "Gebruikersscript verwijderen"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:419
msgid "Delete user style"
msgstr "Gebruikersstijl verwijderen"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:422
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Het bestand '%s' zal blijvend worden verwijderd."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:564 ../extensions/addons.c:641
msgid "Open in Text Editor"
msgstr "In tekstbewerker openen"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:566 ../extensions/addons.c:650
msgid "Open Target Folder"
msgstr "Bestemmingsmap openen"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:632
msgid "Add new addon"
msgstr "Nieuwe extensie toevoegen"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:658
msgid "Remove selected addon"
msgstr "Geselecteerde extensie verwijderen"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1687 ../extensions/addons.c:1905
msgid "User addons"
msgstr "Gebruikersextensies"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1817
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Kan map '%s': %s niet bewaken"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1906
msgid "Support for userscripts and userstyles"
msgstr "Ondersteuning voor gebruikersscripts en -stijlen"
@@ -2506,29 +2364,21 @@ msgstr ""
"Domein : %s\n"
"Koekjes : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Naam"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "Alles _uitvouwen"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "Alles _invouwen"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filter:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Geef een filterwaarde op om enkel de koekjes te tonen welker naam of domein "
-"overeenkomen met het ingegeven filter."
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Zoek koekjes op naam of domein"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2548,18 +2398,18 @@ msgstr "Kopieer de adressen van alle tabbladen naar het klembord"
#: ../extensions/feed-panel/feed-atom.c:209
msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr "Kan vereiste Atom \"entry\" elementen niet vinden in XML data."
+msgstr "Kan vereiste Atom 'entry'-elementen niet vinden in XML-gegevens."
#: ../extensions/feed-panel/feed-atom.c:315
msgid "Failed to find required Atom \"feed\" elements in XML data."
-msgstr "Kan vereiste Atom \"feed\" elementen niet vinden in XML data."
+msgstr "Kan vereiste Atom 'feed'-elementen niet vinden in XML-gegevens."
#. i18n: The local date a feed was last updated
#: ../extensions/feed-panel/feed-panel.c:387
#, c-format
msgctxt "Feed"
msgid "Last updated: %s."
-msgstr "Laatst aangepast: %s."
+msgstr "Laatst bijgewerkt: %s."
#: ../extensions/feed-panel/feed-panel.c:653
msgid "Feeds"
@@ -2594,7 +2444,7 @@ msgstr "Kan XML-voeding niet openen: %s"
#: ../extensions/feed-panel/feed-rss.c:46
msgid "Failed to find \"channel\" element in RSS XML data."
-msgstr "Kan \"kanaal\" element in RSS XML-gegevens niet vinden."
+msgstr "Kan 'kanaal'-element in RSS XML-gegevens niet vinden."
#: ../extensions/feed-panel/feed-rss.c:51
msgid "Unsupported RSS version found."
@@ -2602,11 +2452,11 @@ msgstr "Niet-ondersteunde RSS-versie gevonden."
#: ../extensions/feed-panel/feed-rss.c:148
msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr "Kan vereiste RSS \"onderdeel\" elementen niet vinden in XML-gegevens."
+msgstr "Kan vereiste RSS 'onderdeel'-elementen niet vinden in XML-gegevens."
#: ../extensions/feed-panel/feed-rss.c:248
msgid "Failed to find required RSS \"channel\" elements in XML data."
-msgstr "Kan vereiste RSS \"kanaal\" elementen niet vinden in XML-gegevens."
+msgstr "Kan vereiste RSS 'kanaal'-elementen niet vinden in XML-gegevens."
#: ../extensions/feed-panel/main.c:131
#, c-format
@@ -2676,7 +2526,7 @@ msgstr "Kan bewering van gegevensbank niet uitvoeren: %s\n"
#: ../extensions/formhistory/formhistory.c:629
msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
msgstr ""
-"activeer formuliergeschiedenis alleen via sneltoets (Ctrl+Shift+F) per "
+"Activeer formuliergeschiedenis alleen via sneltoets (Ctrl+Shift+F) per "
"tabblad"
#: ../extensions/formhistory/formhistory.c:668
@@ -2742,11 +2592,11 @@ msgstr "Toon tabblad in achtergrond (Geschiedenislijst)"
msgid "Display the current selected tab in background"
msgstr "Toon het thans gekozen tabblad in achtergrond"
-#: ../extensions/history-list.vala:569
+#: ../extensions/history-list.vala:566
msgid "History List"
msgstr "Geschiedenislijst"
-#: ../extensions/history-list.vala:570
+#: ../extensions/history-list.vala:567
msgid "Move to the last used tab when switching or closing tabs"
msgstr ""
"Ga naar het laatst gebruikte tabblad bij tabbladwissel of tabbladsluiting"
@@ -2769,7 +2619,7 @@ msgstr "Sneltoetsen aanpassen"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "Snelt_oetsen aanpassen..."
+msgstr "Sneltoetsen aanpassen…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2781,41 +2631,41 @@ msgstr "Sneltoetsen tonen en bewerken"
#: ../extensions/status-clock.c:174
msgid "Statusbar Clock"
-msgstr "_Statusbalk-klok"
+msgstr "Statusbalk-klok"
#: ../extensions/status-clock.c:175
msgid "Display date and time in the statusbar"
msgstr "Datum en tijd in de statusbalk tonen"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Afbeeldingen"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Scripts"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Netscape plugins"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Statusbalkfuncties"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "Eenvoudig schakelen van gedrag van webpagina's"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Tabbladwerkbalk"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "T_abbladwerkbalk"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Tabbladen in een verticale werkbalk tonen"
@@ -2827,11 +2677,11 @@ msgstr "Standaard alleen pictogrammen op tabbladen"
msgid "New tabs have no label by default"
msgstr "Nieuwe tabbladen hebben geen standaardetiket"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Werkbalk aanpassen"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2839,34 +2689,271 @@ msgstr ""
"Selecteer elementen die op de werkbalk dienen te worden weergegeven. "
"Elementen kunnen via slepen en neerzetten van plaats worden veranderd."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Beschikbare elementen"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Weergegeven elementen"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "_Werkbalk aanpassen..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "Werkbalk aanpassen…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Aanpassen..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Werkbalkbewerker"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "De werkbalkvormgeving eenvoudig aanpassen"
-#: ../extensions/web-cache.c:463
+#: ../extensions/web-cache.c:462
msgid "Cache HTTP communication on disk"
msgstr "HTTP-communicatie op schijf opslaan"
+#~ msgid "Remember last window size"
+#~ msgstr "Laatst gebruikte venstergrootte onthouden"
+
+#~ msgid "Whether to save the last window size"
+#~ msgstr "Al dan niet de laatst gebruikte venstergrootte opslaan"
+
+#~ msgid "Last window width"
+#~ msgstr "Laatst gebruikte vensterbreedte"
+
+#~ msgid "The last saved window width"
+#~ msgstr "De laatst opgeslagen vensterbreedte"
+
+#~ msgid "Last window height"
+#~ msgstr "Laatst gebruikte vensterhoogte"
+
+#~ msgid "The last saved window height"
+#~ msgstr "De laatste opgeslagen vensterhoogte"
+
+#~ msgid "Last panel position"
+#~ msgstr "Laatst gebruikte positie van paneel"
+
+#~ msgid "The last saved panel position"
+#~ msgstr "De laatste opgeslagen positie van het paneel"
+
+#~ msgid "Last panel page"
+#~ msgstr "Laatst geopende werkbalkpagina"
+
+#~ msgid "The last saved panel page"
+#~ msgstr "De laatst opgeslagen werkbalkpagina"
+
+#~ msgid "Last Web search"
+#~ msgstr "Laatste webzoekactie"
+
+#~ msgid "The last saved Web search"
+#~ msgstr "De laatst bewaarde webzoekactie"
+
+#~ msgid "Show Menubar"
+#~ msgstr "Menubalk weergeven"
+
+#~ msgid "Whether to show the menubar"
+#~ msgstr "Menubalk weergeven"
+
+#~ msgid "Show Navigationbar"
+#~ msgstr "Navigatiebalk weergeven"
+
+#~ msgid "Whether to show the navigationbar"
+#~ msgstr "Al dan niet de navigatiebalk weergeven"
+
+#~ msgid "Show Bookmarkbar"
+#~ msgstr "Bladwijzerbalk weergeven"
+
+#~ msgid "Whether to show the bookmarkbar"
+#~ msgstr "Al dan niet bladwijzerbalk weergeven"
+
+#~ msgid "Show Panel"
+#~ msgstr "Werkbalk weergeven"
+
+#~ msgid "Whether to show the panel"
+#~ msgstr "Al dan niet de werkbalk weergeven"
+
+#~ msgid "Show Statusbar"
+#~ msgstr "Statusbalk weergeven"
+
+#~ msgid "Whether to show the statusbar"
+#~ msgstr "Al dan niet de statusbalk weergeven"
+
+#~ msgid "Toolbar Items"
+#~ msgstr "Elementen in de werkbalk"
+
+#~ msgid "The items to show on the toolbar"
+#~ msgstr "De elementen om weer te geven in de werkbalk"
+
+#~ msgid "Compact Sidepanel"
+#~ msgstr "Compacte zijbalk"
+
+#~ msgid "Whether to make the sidepanel compact"
+#~ msgstr "Al dan niet de zijbalk compact weergeven"
+
+#~ msgid "Align sidepanel on the right"
+#~ msgstr "Plaats zijbalk rechts"
+
+#~ msgid "Whether to align the sidepanel on the right"
+#~ msgstr "Of de zijbalk aan de rechterkant dient te worden geplaatst"
+
+#~ msgid "Open panels in separate windows"
+#~ msgstr "Open werkbalken in aparte vensters"
+
+#~ msgid "Whether to always open panels in separate windows"
+#~ msgstr "Of tabbladen altijd dienen te worden geopend in aparte vensters"
+
+#~ msgid "What to do when Midori starts"
+#~ msgstr "Wat er dient te gebeuren bij starten van Midori"
+
+#~ msgid "The homepage"
+#~ msgstr "De startpagina"
+
+#~ msgid "Show crash dialog"
+#~ msgstr "Toon vastloopdialoogvenster"
+
+#~ msgid "The folder downloaded files are saved to"
+#~ msgstr "De map waarin binnengehaalde bestanden worden opgeslagen"
+
+#~ msgid "An external text editor"
+#~ msgstr "Een externe tekstverwerker"
+
+#~ msgid "An external news aggregator"
+#~ msgstr "Een externe nieuwaggregator"
+
+#~ msgid "Location entry Search"
+#~ msgstr "Zoeken vanuit locatieveld"
+
+#~ msgid "The search to perform inside the location entry"
+#~ msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld"
+
+#~ msgid "The preferred character encoding"
+#~ msgstr "De voorkeurcodering van tekens"
+
+#~ msgid "Always show the tabbar"
+#~ msgstr "De balk met tabbladen altijd weergeven"
+
+#~ msgid "Whether tabs have close buttons"
+#~ msgstr "Of tabbladen sluitknoppen hebben"
+
+#~ msgid "Where to open new pages"
+#~ msgstr "Waar nieuwe pagina's geopend moeten worden"
+
+#~ msgid "Whether to open new tabs in the background"
+#~ msgstr "Of tabbladen op de achtergrond geopend dienen te worden"
+
+#~ msgid "Open popups in tabs"
+#~ msgstr "Opduikvensters in tabbladen openen"
+
+#~ msgid "Whether to open popup windows in tabs"
+#~ msgstr "Of opduikvensters in tabbladen geopend dienen te worden"
+
+#~ msgid "Load and display images automatically"
+#~ msgstr "Afbeeldingen automatisch laden en weergeven"
+
+#~ msgid "Enable embedded scripting languages"
+#~ msgstr "Ingebedde scripttalen uitvoeren"
+
+#~ msgid "Enable embedded Netscape plugin objects"
+#~ msgstr "Ingebedde Netscape-pluginobjecten uitvoeren"
+
+#~ msgid "Enable spell checking while typing"
+#~ msgstr "Spellingscontrole tijdens het typen activeren"
+
+#~ msgid "Enable HTML5 database support"
+#~ msgstr "Ondersteuning van HTML5-gegevensbank activeren"
+
+#~ msgid "Whether to enable HTML5 database support"
+#~ msgstr ""
+#~ "Of ondersteuning van de HTML5-gegevensbank dient te worden geactiveerd"
+
+#~ msgid "Whether to enable HTML5 local storage support"
+#~ msgstr "Of HTML5 locale opslagondersteuning dient te worden geactiveerd"
+
+#~ msgid "Whether to enable offline web application cache"
+#~ msgstr "Of offline webtoepassingsopslag dient te worden gebruikt"
+
+#~ msgid "Flash the browser window if a new tab was opened in the background"
+#~ msgstr ""
+#~ "Laat het browser-venster opflitsen indien er een nieuw tabblad werd "
+#~ "geopend in de achtergrond"
+
+#~ msgid "Allow websites to use OpenGL rendering"
+#~ msgstr "Sta websites toe om OpenGL-weergave te gebruiken"
+
+#~ msgid "Whether to zoom text and images"
+#~ msgstr "Of tekst en afbeeldingen gezoomd dienen te worden"
+
+#~ msgid "Find inline while typing"
+#~ msgstr "Zoeken tijdens typen can regel"
+
+#~ msgid "Whether to automatically find inline while typing"
+#~ msgstr "Of automatisch gezocht moet worden tijdens typen van regel"
+
+#~ msgid "The type of proxy server to use"
+#~ msgstr "De te gebruiken proxyserver"
+
+#~ msgid "HTTP Proxy Server"
+#~ msgstr "HTTP Proxyserver"
+
+#~ msgid "The proxy server used for HTTP connections"
+#~ msgstr "De proxyserver die gebruikt wordt voor HTTP-verbindingen"
+
+#~ msgid "The proxy server port used for HTTP connections"
+#~ msgstr "De proxyserver die gebruikt wordt voor HTTP-verbindingen"
+
+#~ msgid "Identification string"
+#~ msgstr "Identificatie-tekstsnoer"
+
+#~ msgid "The application identification string"
+#~ msgstr "Het identificatie-tekstsnoer van de toepassing"
+
+#~ msgid "Clear private data"
+#~ msgstr "Privé-gegevens wissen"
+
+#~ msgid "The private data selected for deletion"
+#~ msgstr "De te verwijderen privé-gegevens"
+
+#~ msgid "Clear data"
+#~ msgstr "Gegevens wissen"
+
+#~ msgid "The data selected for deletion"
+#~ msgstr "De te verwijderen gegevens"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "An_dere tabbladen sluiten"
+
+#~ msgid "Filter:"
+#~ msgstr "Filter:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Geef een filterwaarde op om enkel de koekjes te tonen welker naam of "
+#~ "domein overeenkomen met het ingegeven filter."
+
+#~ msgid "_Icon:"
+#~ msgstr "_Pictogram:"
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Bladwijzer"
+
+#~ msgid "_Console"
+#~ msgstr "Terminalvenster"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Hoofdmap"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Aanpassen…"
+
+#~ msgid "_Title:"
+#~ msgstr "_Titel:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Map:"
+
#~ msgid "The bookmarks couldn't be saved. %s"
#~ msgstr "De bladwijzers konden niet opgeslagen worden. %s"
@@ -2969,14 +3056,14 @@ msgstr "HTTP-communicatie op schijf opslaan"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Nieuwe bladwijzermap toevoegen"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Zoekmachines toevoegen, bewerken en verwijderen..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Zoekmachines toevoegen, bewerken en verwijderen…"
-#~ msgid "Clear private data..."
-#~ msgstr "Privé-gegevens wissen..."
+#~ msgid "Clear private data…"
+#~ msgstr "Privé-gegevens wissen…"
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr "Inspecteer paginadetails en gebruik ontwikkelaarsgereedschappen..."
+#~ msgid "Inspect page details and access developer tools…"
+#~ msgstr "Inspecteer paginadetails en gebruik ontwikkelaarsgereedschappen…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Overschakelen naar het vorige tabblad"
@@ -3032,12 +3119,6 @@ msgstr "HTTP-communicatie op schijf opslaan"
#~ msgid "Show statusbar"
#~ msgstr "Statusbalk weergeven"
-#~ msgid "MD5-Checksum:"
-#~ msgstr "MD5-Controlesom:"
-
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "SHA1-Controlesom:"
-
#~ msgid "No filename specified"
#~ msgstr "Geen bestandnaam opgegeven"
@@ -3065,8 +3146,8 @@ msgstr "HTTP-communicatie op schijf opslaan"
#~ msgid "Reset the last _session"
#~ msgstr "Zet de laatste _sessie terug op de standaardwaarden"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Configureer _advertentiefilters..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Configureer _advertentiefilters…"
#~ msgid "Not found - %s"
#~ msgstr "Niet gevonden - %s"
@@ -3312,9 +3393,6 @@ msgstr "HTTP-communicatie op schijf opslaan"
#~ msgid "Open Image in New Wi_ndow"
#~ msgstr "Afbeelding in nieuw _venster openen"
-#~ msgid "User_styles"
-#~ msgstr "Gebruikers_stijlen"
-
#~ msgid "_Quick Find"
#~ msgstr "_Snelzoeken"
@@ -3381,9 +3459,6 @@ msgstr "HTTP-communicatie op schijf opslaan"
#~ msgid "%s.%s cannot be accessed"
#~ msgstr "%s.%s is niet toegankelijk"
-#~ msgid "_Enable"
-#~ msgstr "_Inschakelen"
-
#~ msgid "_Disable"
#~ msgstr "_Uitschakelen"
diff --git a/po/no.po b/po/no.po
index bb8960ba..e19ed819 100644
--- a/po/no.po
+++ b/po/no.po
@@ -598,16 +598,16 @@ msgid "_Manage Search Engines"
msgstr "_Håndter søkemotorer"
#: ../midori/midori-browser.c:4282
-msgid "Add, edit and remove search engines..."
-msgstr "Legg til, endre og fjern søkemotorer..."
+msgid "Add, edit and remove search engines…"
+msgstr "Legg til, endre og fjern søkemotorer…"
#: ../midori/midori-browser.c:4285
msgid "_Clear Private Data"
msgstr "_Slett private data"
#: ../midori/midori-browser.c:4286
-msgid "Clear private data..."
-msgstr "Slett private data..."
+msgid "Clear private data…"
+msgstr "Slett private data…"
#: ../midori/midori-browser.c:4290
msgid "_Previous Tab"
@@ -745,24 +745,24 @@ msgstr "Vestlig (ISO-8859-1)"
#: ../midori/midori-browser.c:4368
#: ../midori/midori-websettings.c:219
#: ../midori/midori-websettings.c:291
-msgid "Custom..."
-msgstr "Tilpasset..."
+msgid "Custom…"
+msgstr "Tilpasset…"
#: ../midori/midori-browser.c:4806
msgid "_Separator"
msgstr "_Separator"
#: ../midori/midori-browser.c:4813
-msgid "_Location..."
-msgstr "_Sted..."
+msgid "_Location…"
+msgstr "_Sted…"
#: ../midori/midori-browser.c:4815
msgid "Open a particular location"
msgstr "Åpne et gitt sted"
#: ../midori/midori-browser.c:4839
-msgid "_Web Search..."
-msgstr "_Nettsøk..."
+msgid "_Web Search…"
+msgstr "_Nettsøk…"
#: ../midori/midori-browser.c:4841
msgid "Run a web search"
@@ -1964,7 +1964,7 @@ msgid "Configure Advertisement filters"
msgstr "Konfiguer annonsefiltre"
#: ../extensions/adblock.c:304
-msgid "Configure _Advertisement filters..."
+msgid "Configure _Advertisement filters…"
msgstr "Konfiguer _annonsefiltre"
#: ../extensions/adblock.c:562
@@ -2180,7 +2180,7 @@ msgid "Customize Keyboard shortcuts"
msgstr "Tilpass tastatursnarveier"
#: ../extensions/shortcuts.c:264
-msgid "Customize Sh_ortcuts..."
+msgid "Customize Sh_ortcuts…"
msgstr "Tilpass tastat_ursnarveier"
#: ../extensions/shortcuts.c:303
@@ -2237,7 +2237,7 @@ msgid "Displayed Items"
msgstr "Viste elementer"
#: ../extensions/toolbar-editor.c:579
-msgid "Customize _Toolbar..."
+msgid "Customize _Toolbar…"
msgstr "Tilpass _verktøylinje"
#: ../extensions/toolbar-editor.c:611
diff --git a/po/pa.po b/po/pa.po
index 8058c2f0..e99057b3 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -403,8 +403,8 @@ msgid "Epiphany"
msgstr "ਏਪੀਫਨੀ"
#: ../midori/midori-browser.c:4533 ../panels/midori-bookmarks.c:271
-msgid "Import bookmarks..."
-msgstr "ਬੁੱਕਮਾਰਕ ਇੰਪੋਰਟ ਕਰੋ..."
+msgid "Import bookmarks…"
+msgstr "ਬੁੱਕਮਾਰਕ ਇੰਪੋਰਟ ਕਰੋ…"
#: ../midori/midori-browser.c:4536 ../midori/midori-browser.c:5496
msgid "_Import bookmarks"
@@ -417,8 +417,8 @@ msgstr "ਐਪਲੀਕੇਸ਼ਨ(_A):"
#: ../midori/midori-browser.c:4574 ../midori/midori-browser.c:5600
#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323
#: ../katze/katze-utils.c:688
-msgid "Custom..."
-msgstr "ਕਸਟਮ..."
+msgid "Custom…"
+msgstr "ਕਸਟਮ…"
#: ../midori/midori-browser.c:4648
msgid "Failed to import bookmarks"
@@ -749,7 +749,7 @@ msgid "_Manage Search Engines"
msgstr "ਖੋਜ ਇੰਜਣ ਪਰਬੰਧ(_M)"
#: ../midori/midori-browser.c:5503
-msgid "Add, edit and remove search engines..."
+msgid "Add, edit and remove search engines…"
msgstr ""
#: ../midori/midori-browser.c:5506
@@ -757,15 +757,15 @@ msgid "_Clear Private Data"
msgstr "ਪ੍ਰਾਈਵੇਟ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ(_C)"
#: ../midori/midori-browser.c:5507
-msgid "Clear private data..."
-msgstr "ਪ੍ਰਾਈਵੇਟ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ..."
+msgid "Clear private data…"
+msgstr "ਪ੍ਰਾਈਵੇਟ ਡਾਟਾ ਸਾਫ਼ ਕਰੋ…"
#: ../midori/midori-browser.c:5511
msgid "_Inspect Page"
msgstr ""
#: ../midori/midori-browser.c:5512
-msgid "Inspect page details and access developer tools..."
+msgid "Inspect page details and access developer tools…"
msgstr ""
#: ../midori/midori-browser.c:5517
@@ -914,16 +914,16 @@ msgid "_Separator"
msgstr ""
#: ../midori/midori-browser.c:6152
-msgid "_Location..."
-msgstr "ਟਿਕਾਣਾ(_L)..."
+msgid "_Location…"
+msgstr "ਟਿਕਾਣਾ(_L)…"
#: ../midori/midori-browser.c:6154
msgid "Open a particular location"
msgstr ""
#: ../midori/midori-browser.c:6178
-msgid "_Web Search..."
-msgstr "ਵੈੱਬ ਖੋਜ(_W)..."
+msgid "_Web Search…"
+msgstr "ਵੈੱਬ ਖੋਜ(_W)…"
#: ../midori/midori-browser.c:6180
msgid "Run a web search"
@@ -2232,7 +2232,7 @@ msgid ""
msgstr ""
#: ../extensions/adblock.c:570
-msgid "Configure _Advertisement filters..."
+msgid "Configure _Advertisement filters…"
msgstr ""
#: ../extensions/adblock.c:818
@@ -2490,7 +2490,7 @@ msgid "Customize Keyboard shortcuts"
msgstr ""
#: ../extensions/shortcuts.c:276
-msgid "Customize Sh_ortcuts..."
+msgid "Customize Sh_ortcuts…"
msgstr ""
#: ../extensions/shortcuts.c:315
@@ -2560,7 +2560,7 @@ msgid "Displayed Items"
msgstr ""
#: ../extensions/toolbar-editor.c:577
-msgid "Customize _Toolbar..."
+msgid "Customize _Toolbar…"
msgstr ""
#: ../extensions/toolbar-editor.c:608
diff --git a/po/pl.po b/po/pl.po
index af5084c4..fba506b1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,123 +3,129 @@
# This file is distributed under the same license as the midori package.
# Przemysław Sitek , 2008.
# Łukasz Romanowicz , 2008.
-# Piotr Sokół , 2010, 2011.
-#
+# Piotr Sokół , 2010, 2011, 2012.
+#
msgid ""
msgstr ""
-"Project-Id-Version: midori 0.4.2\n"
+"Project-Id-Version: midori 0.4.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-25 11:18+0000\n"
-"PO-Revision-Date: 2011-11-24 17:37+0100\n"
+"POT-Creation-Date: 2012-07-26 21:00+0000\n"
+"PO-Revision-Date: 2012-07-27 10:08+0200\n"
"Last-Translator: Piotr Sokół \n"
"Language-Team: polski <>\n"
+"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bits\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2));\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n"
+"%100<10 || n%100>=20)) ? 1 : 2));\n"
#: ../data/midori.desktop.in.h:1
msgid "Browse the Web"
-msgstr "Wyszukaj w sieci"
+msgstr "Umożliwia przeglądanie zawartości sieci internetowej"
#: ../data/midori.desktop.in.h:2
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:1989 ../midori/main.c:2009
-#: ../midori/main.c:2023 ../midori/midori-websettings.c:308
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:2028 ../midori/main.c:2052
+#: ../midori/main.c:2066 ../midori/midori-websettings.c:315
msgid "Midori"
-msgstr "Przeglądarka internetowa Midori"
+msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Przeglądarka internetowa Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Nowe okno prywatne"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1429
+msgid "New Tab"
+msgstr "Nowa karta"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1426
+msgid "New Window"
+msgstr "Nowe okno"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Przeglądarka internetowa"
#: ../data/midori-private.desktop.in.h:1
msgid "Midori Private Browsing"
-msgstr "Tryb prywatny przeglądarki Midori"
+msgstr "Tryb prywatny Midori"
#: ../data/midori-private.desktop.in.h:2
msgid "Open a new private browsing window"
msgstr "Otwiera nowe, prywatne okno przeglądarki"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4117
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4481
msgid "Private Browsing"
-msgstr "Prywatne przeglądanie"
+msgstr "Przeglądanie w trybie prywatnym"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Nie można wczytać ustawień: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
-msgstr "Wartość „%s” nie jest poprawna dla %s"
+msgstr "Wartość „%s” nie jest prawidłowa dla %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Błędna wartość konfiguracyjna „%s”"
-#: ../midori/main.c:364
+#: ../midori/main.c:375
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Nie można wczytać wyszukiwarek internetowych. %s\n"
-#: ../midori/main.c:418
+#: ../midori/main.c:429
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Nie udało się wyczyścić historii: %s\n"
-#: ../midori/main.c:438 ../midori/main.c:562
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Nie udało się uzyskać dostępu do bazy danych: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:505
+#: ../midori/main.c:523
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Nie udało się usunąć przestarzałych elementów historii: %s\n"
-#: ../midori/main.c:545 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Nie udało się usunąć elementu historii: %s\n"
-
-#: ../midori/main.c:592
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Nie można zapisać zakładek. %s"
-
-#: ../midori/main.c:614
+#: ../midori/main.c:545
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Nie można zapisać ustawień. %s"
-#: ../midori/main.c:649
+#: ../midori/main.c:571
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Nie można zapisać wyszukiwarek internetowych. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:686
+#: ../midori/main.c:608
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Nie można zapisać listy ostatnio zamkniętych kart i okien. %s"
-#: ../midori/main.c:727 ../panels/midori-extensions.c:91
+#: ../midori/main.c:681 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Wtyczki"
-#: ../midori/main.c:741
+#: ../midori/main.c:695
msgid "Privacy"
msgstr "Prywatność"
-#: ../midori/main.c:753
+#: ../midori/main.c:707
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -127,18 +133,18 @@ msgstr ""
"Ciasteczka przechowują dane logowania, zapisane stany gier lub profile "
"użytkownika używane w celach reklamowych."
-#: ../midori/main.c:809
+#: ../midori/main.c:763
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Nie można zapisać sesji. %s"
-#: ../midori/main.c:1027
+#: ../midori/main.c:1001
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Brak pliku głównego certyfikatu. Nie można zweryfikować certyfikatu SSL."
-#: ../midori/main.c:1096
+#: ../midori/main.c:1093
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -146,230 +152,223 @@ msgstr ""
"Program uległ awarii odkąd został uruchomiony ostatni raz. Jeżeli problem "
"się powtarza, należy spróbować poniższych opcji w celu rozwiązania problemu."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1112
msgid "Modify _preferences"
msgstr "Zmodyfikuj p_referencje"
-#: ../midori/main.c:1119
+#: ../midori/main.c:1116
msgid "Disable all _extensions"
msgstr "Wyłącz wszystkie _wtyczki"
-#: ../midori/main.c:1132
+#: ../midori/main.c:1129
msgid "Discard old tabs"
msgstr "Porzucenie ostatnich kart"
-#: ../midori/main.c:1133 ../midori/midori-websettings.c:217
+#: ../midori/main.c:1130 ../midori/midori-websettings.c:223
msgid "Show last tabs without loading"
msgstr "Wyświetlenie ostatnich kart bez wczytywania"
-#: ../midori/main.c:1134 ../midori/midori-websettings.c:216
+#: ../midori/main.c:1131 ../midori/midori-websettings.c:222
msgid "Show last open tabs"
-msgstr "Wyświetlenie ostatnich\t kart"
+msgstr "Wyświetlenie ostatnich kart"
-#: ../midori/main.c:1342 ../midori/main.c:2400
+#: ../midori/main.c:1379 ../midori/main.c:2436
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Nie można wczytać sesji: %s\n"
-#: ../midori/main.c:1480
+#: ../midori/main.c:1517
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Obraz strony internetowej zapisano do pliku %s\n"
-#: ../midori/main.c:1892
+#: ../midori/main.c:1933
msgid "Run ADDRESS as a web application"
msgstr "Otwiera ADRES jako stronę usługi internetowej"
-#: ../midori/main.c:1892
+#: ../midori/main.c:1933
msgid "ADDRESS"
msgstr "ADRES"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1936
msgid "Use FOLDER as configuration folder"
msgstr "Używa KATALOGU do przechowywania konfiguracji programu"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1936
msgid "FOLDER"
msgstr "KATALOG"
-#: ../midori/main.c:1898
+#: ../midori/main.c:1939
msgid "Private browsing, no changes are saved"
msgstr ""
"Otwiera wystąpienie programu, które nie zapisuje żadnych prywatnych danych"
-#: ../midori/main.c:1900
+#: ../midori/main.c:1941
msgid "Show a diagnostic dialog"
msgstr "Wyświetla okno diagnostyczne po wystąpieniu awarii"
-#: ../midori/main.c:1902
+#: ../midori/main.c:1943
msgid "Run the specified filename as javascript"
msgstr "Uruchamia określony plik jako skrypt javascript"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1945
msgid "Take a snapshot of the specified URI"
msgstr "Przechwytuje obraz strony określonej jako ADRES"
-#: ../midori/main.c:1906
+#: ../midori/main.c:1947
msgid "Execute the specified command"
msgstr "Wykonuje wprowadzone polecenie"
-#: ../midori/main.c:1908
+#: ../midori/main.c:1949
msgid "List available commands to execute with -e/ --execute"
-msgstr "Wypisuje polecenia dostępne z opcją -e/ --execute"
+msgstr "Wypisuje polecenia dostępne z opcją -e lub --execute"
-#: ../midori/main.c:1910
+#: ../midori/main.c:1951
msgid "Display program version"
msgstr "Wypisuje wersję programu"
-#: ../midori/main.c:1912
+#: ../midori/main.c:1953
msgid "Addresses"
msgstr "Adresy"
-#: ../midori/main.c:1914
+#: ../midori/main.c:1955
msgid "Block URIs according to regular expression PATTERN"
msgstr "Blokuje adresy URI określone przez WZÓR"
-#: ../midori/main.c:1914
+#: ../midori/main.c:1955
msgid "PATTERN"
msgstr "WZÓR"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1918
+#: ../midori/main.c:1959
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Resetuje działanie programu po czasie wyrażonym ilością SEKUND"
-#: ../midori/main.c:1918
+#: ../midori/main.c:1959
msgid "SECONDS"
msgstr "SEKUNDY"
-#: ../midori/main.c:1921
+#: ../midori/main.c:1962
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Przekierowuje ostrzeżenia terminala do określonego PLIKU"
-#: ../midori/main.c:1921
+#: ../midori/main.c:1962
msgid "FILENAME"
msgstr "PLIK"
-#: ../midori/main.c:1986
+#: ../midori/main.c:2025
msgid "[Addresses]"
-msgstr "[ADRES...]"
+msgstr "[ADRES…]"
-#: ../midori/main.c:1996
-msgid "The specified configuration folder is invalid."
-msgstr "Podany katalog konfiguracyjny jest niepoprawny"
-
-#: ../midori/main.c:2024
+#: ../midori/main.c:2067
msgid "Please report comments, suggestions and bugs to:"
msgstr "Prosimy o zgłaszanie uwag, sugestii i błędów na adres:"
-#: ../midori/main.c:2026
+#: ../midori/main.c:2069
msgid "Check for new versions at:"
msgstr "Sprawdź nową wersję na:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2110
+#: ../midori/main.c:2164
msgid "Saved logins and _passwords"
msgstr "Zapisane nazwy użytkowników i _hasła"
-#: ../midori/main.c:2112
+#: ../midori/main.c:2166
msgid "Cookies and Website data"
msgstr "Ciasteczka i dane witryn"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2116 ../midori/midori-websettings.c:984
+#: ../midori/main.c:2170 ../midori/midori-websettings.c:1020
#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
msgstr "Pamięć podręczna:"
-#: ../midori/main.c:2119
+#: ../midori/main.c:2173
msgid "Website icons"
msgstr "Ikony stron internetowych"
-#: ../midori/main.c:2225
+#: ../midori/main.c:2277
msgid "An unknown error occured"
msgstr "Wystąpił nieznany błąd."
-#: ../midori/main.c:2331
+#: ../midori/main.c:2384
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Pogram Midori jest już uruchomiony lecz nie odpowiada.\n"
-#: ../midori/main.c:2367
+#: ../midori/main.c:2418
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Nie można wczytać zakładek: %s\n"
-#: ../midori/main.c:2415
+#: ../midori/main.c:2451
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Nie można wczytać listy ostatnio zamkniętych kart i okien: %s\n"
-#: ../midori/main.c:2428
+#: ../midori/main.c:2464
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Nie można wczytać historii: %s\n"
-#: ../midori/main.c:2444
+#: ../midori/main.c:2479
msgid "The following errors occured:"
msgstr "Napotkano błędy:"
-#: ../midori/main.c:2460
+#: ../midori/main.c:2495
msgid "_Ignore"
msgstr "_Ignoruj"
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "_Zakładka"
+#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:494
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Niespodziewana czynność „%s”."
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6039
+#: ../midori/midori-app.c:1453 ../midori/midori-browser.c:6388
msgid "_Bookmarks"
msgstr "_Zakładki"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1454
msgid "Add Boo_kmark"
msgstr "_Dodaj zakładkę"
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_Konsola"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1455
msgid "_Extensions"
msgstr "_Wtyczki"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4566
+#: ../midori/midori-app.c:1456 ../midori/midori-browser.c:4834
msgid "_History"
msgstr "_Historia"
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "_Strona główna"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1457
msgid "_Userscripts"
msgstr "Skrypty _użytkownika"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1458
+msgid "User_styles"
+msgstr "_Style użytkownika"
+
+#: ../midori/midori-app.c:1459
msgid "New _Tab"
msgstr "Nowa kar_ta"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1460
msgid "_Transfers"
msgstr "_Pobieranie plików"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1461
msgid "Netscape p_lugins"
msgstr "Wtyczki _Netscape"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1462
msgid "_Closed Tabs"
msgstr "_Zamknięte karty"
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5195
+#: ../midori/midori-app.c:1463 ../midori/midori-browser.c:5527
msgid "New _Window"
msgstr "_Nowe okno"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1464
msgid "New _Folder"
msgstr "Nowy _katalog"
@@ -390,141 +389,125 @@ msgstr "Nierozpoznany format zakładek."
msgid "Writing failed."
msgstr "Zapisywanie nie udało się."
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5277
-#: ../midori/midori-browser.c:5286
+#: ../midori/midori-browser.c:355 ../midori/midori-browser.c:5615
+#: ../midori/midori-browser.c:5624
msgid "Reload the current page"
msgstr "Wczytuje ponownie bieżącą stronę"
-#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5621
msgid "Stop loading the current page"
msgstr "Zatrzymuje wczytywanie bieżącej strony"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:481
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Nie udało się zaktualizować tytułu: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Niespodziewana czynność „%s”."
-
-#: ../midori/midori-browser.c:579
+#: ../midori/midori-browser.c:574
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Tryb prywatny)"
-#: ../midori/midori-browser.c:693 ../midori/midori-browser.c:726
-msgid "Toplevel folder"
-msgstr "Katalog główny"
+#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:729
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Zakładki"
-#: ../midori/midori-browser.c:784
+#: ../midori/midori-browser.c:789
msgid "New folder"
msgstr "Nowy katalog"
-#: ../midori/midori-browser.c:784
+#: ../midori/midori-browser.c:789
msgid "Edit folder"
msgstr "Edytuj katalog"
-#: ../midori/midori-browser.c:786
+#: ../midori/midori-browser.c:791
msgid "New bookmark"
msgstr "Nowa zakładka"
-#: ../midori/midori-browser.c:786
+#: ../midori/midori-browser.c:791
msgid "Edit bookmark"
msgstr "Edytuj zakładkę"
-#: ../midori/midori-browser.c:828
-msgid "_Title:"
-msgstr "_Tytuł:"
+#: ../midori/midori-browser.c:825
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr ""
+"Proszę wprowadzić nazwę zakładki i wybrać jej położenie przechowywania."
-#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Adres:"
-
-#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4303
-msgid "_Folder:"
-msgstr "_Katalog:"
-
-#: ../midori/midori-browser.c:887
+#: ../midori/midori-browser.c:886
msgid "Add to _Speed Dial"
msgstr "Dodaj odnośnik _szybkiego wybierania"
-#: ../midori/midori-browser.c:900
+#: ../midori/midori-browser.c:892
msgid "Show in the tool_bar"
msgstr "Wyświetlanie na pasku _zakładek"
-#: ../midori/midori-browser.c:915
+#: ../midori/midori-browser.c:900
msgid "Run as _web application"
msgstr "Otwieranie jako stronę usługi _internetowej"
-#: ../midori/midori-browser.c:986
+#: ../midori/midori-browser.c:970
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "Nie można zapisać pliku „%s” we wskazanym katalogu."
-#: ../midori/midori-browser.c:988
+#: ../midori/midori-browser.c:972
#, c-format
msgid "You don't have permission to write in this location."
msgstr "Brak uprawnień do zapisywania we wskazanym położeniu."
-#: ../midori/midori-browser.c:995
+#: ../midori/midori-browser.c:979
#, c-format
msgid "There is not enough free space to download \"%s\"."
msgstr "Nie ma wystarczająco dużo wolnej przestrzeni aby pobrać „%s”."
-#: ../midori/midori-browser.c:998
+#: ../midori/midori-browser.c:982
#, c-format
msgid "The file needs %s but only %s are left."
msgstr ""
"Pobranie pliku wymaga %s wolnej przestrzeni ale dostępne jest tylko %s."
-#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4372
+#: ../midori/midori-browser.c:1118 ../midori/midori-browser.c:4635
msgid "Save file as"
msgstr "Wybór pliku"
-#: ../midori/midori-browser.c:1330
-msgid "New Window"
-msgstr "Nowe okno"
+#: ../midori/midori-browser.c:1124
+msgid "Save associated _resources"
+msgstr "Zapisz powiązane _zasoby"
-#: ../midori/midori-browser.c:1330
+#: ../midori/midori-browser.c:1426
msgid "A new window has been opened"
msgstr "Otwarto nowe okno"
-#: ../midori/midori-browser.c:1333
-msgid "New Tab"
-msgstr "Nowa karta"
-
-#: ../midori/midori-browser.c:1333
+#: ../midori/midori-browser.c:1429
msgid "A new tab has been opened"
msgstr "Otwarto nową kartę"
-#: ../midori/midori-browser.c:1368
+#: ../midori/midori-browser.c:1446
msgid "Error opening the image!"
msgstr "Błąd przy otwieraniu obrazka!"
-#: ../midori/midori-browser.c:1369
+#: ../midori/midori-browser.c:1447
msgid "Can not open selected image in a default viewer."
msgstr "Nie można otworzyć obrazka w domyślnej przeglądarce"
-#: ../midori/midori-browser.c:1375
+#: ../midori/midori-browser.c:1453
msgid "Error downloading the image!"
-msgstr "Wystąpił błąd podczas ściągania obrazu!"
+msgstr "Wystąpił błąd podczas pobierania obrazu!"
-#: ../midori/midori-browser.c:1376
+#: ../midori/midori-browser.c:1454
msgid "Can not download selected image."
-msgstr "Nie można ściągnąć wybranego obrazu."
+msgstr "Nie można pobrać wybranego obrazu."
-#: ../midori/midori-browser.c:1479
+#: ../midori/midori-browser.c:1575
msgid "Save file"
msgstr "Wybór pliku"
-#: ../midori/midori-browser.c:2346
+#: ../midori/midori-browser.c:2471
msgid "Open file"
msgstr "Wybór pliku"
-#: ../midori/midori-browser.c:2478
+#: ../midori/midori-browser.c:2603
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -540,143 +523,159 @@ msgstr ""
"karcie „Programy”, co umożliwi dodawanie źródeł wiadomości do czytnika w "
"sposób automatyczny po kliknięciu w odnośnik."
-#: ../midori/midori-browser.c:2484 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2609 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Nowe źródło wiadomości"
-#: ../midori/midori-browser.c:2527 ../midori/midori-browser.c:5346
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2652 ../midori/midori-browser.c:5687
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Dodaje nową zakładkę"
-#: ../midori/midori-browser.c:3026 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3196 ../midori/midori-searchaction.c:488
msgid "Empty"
msgstr "Puste"
-#: ../midori/midori-browser.c:3446
+#: ../midori/midori-browser.c:3639 ../midori/midori-browser.c:3640
msgid "Toggle text cursor navigation"
msgstr "Przełącza przeglądanie kursorem klawiatury"
-#: ../midori/midori-browser.c:3762 ../midori/midori-browser.c:5732
+#: ../midori/midori-browser.c:3642
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Naciśnięcie klawisza F7 przełącza przeglądanie kursorem klawiatury. Po "
+"włączeniu kursor tekstowy pojawi się na wszystkich stronach internetowych."
+
+#: ../midori/midori-browser.c:3645
+msgid "_Enable Caret Browsing"
+msgstr "Przeglądanie _kursorem klawiatury"
+
+#: ../midori/midori-browser.c:4035 ../midori/midori-browser.c:6081
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Nie udało się dodać nowego elementu historii: %s\n"
-#: ../midori/midori-browser.c:4091 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4361 ../panels/midori-bookmarks.c:847
+#: ../panels/midori-history.c:803
msgid "Open all in _Tabs"
msgstr "Otwórz wszystkie w nowych _kartach"
-#: ../midori/midori-browser.c:4098 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4368 ../panels/midori-bookmarks.c:853
+#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Otwórz w nowej _karcie"
-#: ../midori/midori-browser.c:4101 ../midori/midori-view.c:2648
-#: ../midori/midori-view.c:4646 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4371 ../midori/midori-view.c:2940
+#: ../midori/midori-view.c:5058 ../panels/midori-bookmarks.c:855
+#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Otwórz w nowym _oknie"
-#: ../midori/midori-browser.c:4190
+#: ../midori/midori-browser.c:4460
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4191
+#: ../midori/midori-browser.c:4461
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4192
+#: ../midori/midori-browser.c:4462
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4193
+#: ../midori/midori-browser.c:4463
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4194
+#: ../midori/midori-browser.c:4464
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4195
+#: ../midori/midori-browser.c:4465
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4216
-msgid "Import bookmarks..."
+#: ../midori/midori-browser.c:4466
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
+
+#: ../midori/midori-browser.c:4487
+msgid "Import bookmarks…"
msgstr "Importowanie zakładek"
-#: ../midori/midori-browser.c:4219 ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:4490 ../midori/midori-browser.c:5692
msgid "_Import bookmarks"
-msgstr "_Importuj zakładki..."
+msgstr "_Importuj zakładki…"
-#: ../midori/midori-browser.c:4230
+#: ../midori/midori-browser.c:4501
msgid "_Application:"
msgstr "_Program:"
-#: ../midori/midori-browser.c:4295
+#: ../midori/midori-browser.c:4566
msgid "Import from XBEL or HTML file"
msgstr "Plik XBEL lub HTML"
-#: ../midori/midori-browser.c:4330
+#: ../midori/midori-browser.c:4594
msgid "Import from a file"
msgstr "Z pliku"
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4606
msgid "Failed to import bookmarks"
msgstr "Nie udało się zaimportować zakładek"
-#: ../midori/midori-browser.c:4377
+#: ../midori/midori-browser.c:4640
msgid "XBEL Bookmarks"
msgstr "Zakładki XBEL"
-#: ../midori/midori-browser.c:4382
+#: ../midori/midori-browser.c:4645
msgid "Netscape Bookmarks"
msgstr "Zakładki Netscape"
-#: ../midori/midori-browser.c:4396
+#: ../midori/midori-browser.c:4659
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr ""
"Program Midori umożliwia tylko eksportowanie zakładek w formatach XBEL (*."
"xbel) i Netscape (*.html)"
-#: ../midori/midori-browser.c:4411
+#: ../midori/midori-browser.c:4674
msgid "Failed to export bookmarks"
msgstr "Nie udało się wyeksportować zakładek"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4533
+#: ../midori/midori-browser.c:4796
msgid "Clear Private Data"
msgstr "Usuwanie danych"
-#: ../midori/midori-browser.c:4537
+#: ../midori/midori-browser.c:4800
msgid "_Clear private data"
msgstr "_Usuń prywatne dane"
-#: ../midori/midori-browser.c:4550
+#: ../midori/midori-browser.c:4818
msgid "Clear the following data:"
msgstr "Prywatne dane:"
-#: ../midori/midori-browser.c:4560
+#: ../midori/midori-browser.c:4828
msgid "Last open _tabs"
msgstr "Ostatnio otwarte _karty"
-#: ../midori/midori-browser.c:4586
+#: ../midori/midori-browser.c:4854
msgid "Clear private data when _quitting Midori"
msgstr "Usunięcie danych podczas _kończenia programu"
-#: ../midori/midori-browser.c:4781
+#: ../midori/midori-browser.c:5069
msgid "A lightweight web browser."
-msgstr "Lekka przeglądarka internetowa."
+msgstr "Umożliwia przeglądanie zawartości sieci internetowej"
-#: ../midori/midori-browser.c:4782
+#: ../midori/midori-browser.c:5070
msgid "See about:version for version info."
msgstr ""
"Proszę wprowadzić w pasku adresu about:version, aby uzyskać szczegółowe "
"informacje o wersji."
-#: ../midori/midori-browser.c:4784
+#: ../midori/midori-browser.c:5072
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 "
@@ -688,378 +687,393 @@ msgstr ""
"Fundację Wolnego Oprogramowania - według wersji drugiej tej Licencji lub "
"którejś z późniejszych wersji."
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:5113
msgid "translator-credits"
msgstr ""
"Przemysław Sitek , 2008.\n"
"Łukasz Romanowicz , 2008.\n"
-"Piotr Sokół , 2010, 2011."
+"Piotr Sokół , 2010, 2011, 2012."
-#: ../midori/midori-browser.c:5193
+#: ../midori/midori-browser.c:5525
msgid "_File"
msgstr "_Plik"
-#: ../midori/midori-browser.c:5196
+#: ../midori/midori-browser.c:5528
msgid "Open a new window"
msgstr "Otwiera nowe okno programu"
-#: ../midori/midori-browser.c:5199
+#: ../midori/midori-browser.c:5531
msgid "Open a new tab"
msgstr "Otwiera nową kartę"
-#: ../midori/midori-browser.c:5201
+#: ../midori/midori-browser.c:5533
msgid "New P_rivate Browsing Window"
msgstr "Nowe okno p_rywatne"
-#: ../midori/midori-browser.c:5205
+#: ../midori/midori-browser.c:5537
msgid "Open a file"
msgstr "Otwiera plik strony"
-#: ../midori/midori-browser.c:5207
-msgid "_Save Page As..."
-msgstr "Zapisz j_ako..."
+#: ../midori/midori-browser.c:5539
+msgid "_Save Page As…"
+msgstr "Zapisz j_ako…"
-#: ../midori/midori-browser.c:5208
+#: ../midori/midori-browser.c:5540
msgid "Save to a file"
msgstr "Zapisuje stronę do pliku"
-#: ../midori/midori-browser.c:5210
+#: ../midori/midori-browser.c:5542
msgid "Add to Speed _dial"
msgstr "Utwórz odnośnik _szybkiego wybierania"
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5546
msgid "Add Shortcut to the _desktop"
msgstr "Utwórz odnośnik na _pulpicie"
-#: ../midori/midori-browser.c:5216
+#: ../midori/midori-browser.c:5548
msgid "Create _Launcher"
msgstr "Utwórz _aktywator"
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5552
msgid "Subscribe to News _feed"
msgstr "Zasubskrybuj _kanał wiadomości"
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5558
msgid "_Close Tab"
msgstr "_Zamknij kartę"
-#: ../midori/midori-browser.c:5227
+#: ../midori/midori-browser.c:5559
msgid "Close the current tab"
msgstr "Zamyka bieżącą kartę"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5561
msgid "C_lose Window"
msgstr "Za_mknij okno"
-#: ../midori/midori-browser.c:5233
+#: ../midori/midori-browser.c:5565
+msgid "_Share"
+msgstr ""
+
+#: ../midori/midori-browser.c:5570
msgid "Print the current page"
msgstr "Drukuje bieżącą stronę"
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5573
msgid "Close a_ll Windows"
msgstr "Za_mknij wszystkie okna"
-#: ../midori/midori-browser.c:5238
+#: ../midori/midori-browser.c:5576
msgid "_Edit"
msgstr "_Edycja"
-#: ../midori/midori-browser.c:5261
-msgid "_Find..."
-msgstr "_Wyszukaj..."
+#: ../midori/midori-browser.c:5599
+msgid "_Find…"
+msgstr "_Wyszukaj…"
-#: ../midori/midori-browser.c:5262
+#: ../midori/midori-browser.c:5600
msgid "Find a word or phrase in the page"
msgstr "Wyszukuje słowa lub wyrażenia na stronie"
-#: ../midori/midori-browser.c:5264
+#: ../midori/midori-browser.c:5602
msgid "Find _Next"
msgstr "Znajdź _następne"
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5605
msgid "Find _Previous"
msgstr "Znajdź _poprzednie"
-#: ../midori/midori-browser.c:5271
+#: ../midori/midori-browser.c:5609
msgid "Configure the application preferences"
msgstr "Otwiera okno preferencji programu"
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5611
msgid "_View"
msgstr "_Widok"
-#: ../midori/midori-browser.c:5274
+#: ../midori/midori-browser.c:5612
msgid "_Toolbars"
msgstr "Paski _narzędziowe"
-#: ../midori/midori-browser.c:5279
+#: ../midori/midori-browser.c:5617
msgid "Reload page without caching"
-msgstr "Odśwież bez wczytywania pamięci podręcznej"
+msgstr "Wczytaj ponownie pomijając pamięć podręczną"
-#: ../midori/midori-browser.c:5289
+#: ../midori/midori-browser.c:5627
msgid "Increase the zoom level"
msgstr "Powiększa rozmiar strony"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5630
msgid "Decrease the zoom level"
msgstr "Zmniejsza rozmiar strony"
-#: ../midori/midori-browser.c:5296
+#: ../midori/midori-browser.c:5634
msgid "_Encoding"
msgstr "_Kodowanie znaków"
-#: ../midori/midori-browser.c:5298
+#: ../midori/midori-browser.c:5636
msgid "View So_urce"
msgstr "Wyświetl ź_ródło"
-#: ../midori/midori-browser.c:5301
+#: ../midori/midori-browser.c:5639
msgid "Ca_ret Browsing"
msgstr "Przeglądanie _kursorem klawiatury"
-#: ../midori/midori-browser.c:5305
+#: ../midori/midori-browser.c:5643
msgid "Toggle fullscreen view"
msgstr "Przełącza widok trybu pełnoekranowego"
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:5645
msgid "Scroll _Left"
msgstr "Przewiń w _lewo"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5648
msgid "Scroll _Down"
msgstr "Przewiń w _dół"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5651
msgid "Scroll _Up"
msgstr "Przewiń w _górę"
-#: ../midori/midori-browser.c:5316
+#: ../midori/midori-browser.c:5654
msgid "Scroll _Right"
msgstr "Przewiń w _prawo"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5657
+msgid "_Readable"
+msgstr "Tryb zwiększonej _czytelności"
+
+#: ../midori/midori-browser.c:5660
msgid "_Go"
msgstr "P_rzejdź"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5663
msgid "Go back to the previous page"
msgstr "Przechodzi do poprzedniej odwiedzonej strony"
-#: ../midori/midori-browser.c:5325
+#: ../midori/midori-browser.c:5666
msgid "Go forward to the next page"
msgstr "Przechodzi do następnej odwiedzonej strony"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5329
+#: ../midori/midori-browser.c:5670
msgid "Go to the previous sub-page"
msgstr "Przechodzi do poprzedniej podstrony"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5674
msgid "Go to the next sub-page"
msgstr "Przechodzi do następnej podstrony"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5676
+msgid "_Homepage"
+msgstr "_Strona główna"
+
+#: ../midori/midori-browser.c:5677
msgid "Go to your homepage"
msgstr "Przechodzi do strony głównej"
-#: ../midori/midori-browser.c:5338
+#: ../midori/midori-browser.c:5679
msgid "Empty Trash"
msgstr "Wyczyść listę"
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5682
msgid "Undo _Close Tab"
msgstr "Przywróć _zamkniętą kartę"
-#: ../midori/midori-browser.c:5348
+#: ../midori/midori-browser.c:5689
msgid "Add a new _folder"
msgstr "Utwórz _katalog"
-#: ../midori/midori-browser.c:5354
+#: ../midori/midori-browser.c:5695
msgid "_Export bookmarks"
-msgstr "_Eksportuj zakładki..."
+msgstr "_Eksportuj zakładki…"
-#: ../midori/midori-browser.c:5357 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5698 ../midori/midori-searchaction.c:497
msgid "_Manage Search Engines"
-msgstr "_Zarządzaj wyszukiwarkami..."
+msgstr "_Zarządzaj wyszukiwarkami…"
-#: ../midori/midori-browser.c:5360
+#: ../midori/midori-browser.c:5701
msgid "_Clear Private Data"
-msgstr "_Usuń prywatne dane..."
+msgstr "_Usuń prywatne dane…"
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5704
msgid "_Inspect Page"
-msgstr "_Zbadaj stronę..."
+msgstr "_Zbadaj stronę…"
-#: ../midori/midori-browser.c:5367
+#: ../midori/midori-browser.c:5708
msgid "_Previous Tab"
msgstr "_Poprzednia karta"
-#: ../midori/midori-browser.c:5370
+#: ../midori/midori-browser.c:5711
msgid "_Next Tab"
msgstr "_Następna karta"
-#: ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:5713
msgid "Move Tab _Backward"
msgstr "Przemieść kartę w _lewo"
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5715
msgid "_Move Tab Forward"
msgstr "Przemieść kartę w p_rawo"
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5718
msgid "Focus _Current Tab"
msgstr "Uaktywnij _zawartość"
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5721
msgid "Focus _Next view"
msgstr "Uaktywnij n_astępny element"
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5724
msgid "Only show the Icon of the _Current Tab"
msgstr "Ukryj etykietę _bieżącej karty"
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5727
msgid "_Duplicate Current Tab"
msgstr "_Powiel bieżącą kartę"
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5730
msgid "Close Ot_her Tabs"
msgstr "Zamknij pozo_stałe karty"
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5733
msgid "Open last _session"
msgstr "Przywróć ostatnią _sesję"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5736
msgid "_Help"
msgstr "Pomo_c"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5738
msgid "_Frequent Questions"
msgstr "_Często zadawane pytania"
-#: ../midori/midori-browser.c:5400
-msgid "_Report a Problem..."
+#: ../midori/midori-browser.c:5741
+msgid "_Report a Problem…"
msgstr "_Zgłoś błąd w programie"
-#: ../midori/midori-browser.c:5412
-msgid "_Menubar"
-msgstr "Pasek _menu"
-
-#: ../midori/midori-browser.c:5416
-msgid "_Navigationbar"
-msgstr "Pasek _narzędzi nawigacyjnych"
-
-#: ../midori/midori-browser.c:5420
-msgid "Side_panel"
-msgstr "Panel _boczny"
-
-#: ../midori/midori-browser.c:5421
-msgid "Sidepanel"
-msgstr "Panel boczny"
-
-#: ../midori/midori-browser.c:5424
-msgid "_Bookmarkbar"
-msgstr "Pasek _zakładek"
-
-#: ../midori/midori-browser.c:5428
-msgid "_Statusbar"
-msgstr "Pasek stanu"
-
-#: ../midori/midori-browser.c:5437 ../midori/midori-websettings.c:307
-msgid "_Automatic"
-msgstr "Wybór _automatyczny"
-
-#: ../midori/midori-browser.c:5440 ../midori/midori-websettings.c:232
-msgid "Chinese (BIG5)"
-msgstr "Chiński tradycyjny (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5444
-msgid "Japanese (SHIFT__JIS)"
-msgstr "Japoński (SHIFT_JIS)"
-
-#: ../midori/midori-browser.c:5447 ../midori/midori-websettings.c:234
-msgid "Korean (EUC-KR)"
-msgstr "Koreański (EUC-KR)"
-
-#: ../midori/midori-browser.c:5450 ../midori/midori-websettings.c:235
-msgid "Russian (KOI8-R)"
-msgstr "Rosyjski (KOI8-R)"
-
-#: ../midori/midori-browser.c:5453 ../midori/midori-websettings.c:236
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-browser.c:5456 ../midori/midori-websettings.c:237
-msgid "Western (ISO-8859-1)"
-msgstr "Zachodni (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5459 ../midori/midori-websettings.c:238
-#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635
-msgid "Custom..."
-msgstr "Dostosuj..."
-
-#: ../midori/midori-browser.c:5964
-msgid "_Separator"
-msgstr "_Separator"
-
-#: ../midori/midori-browser.c:5971
-msgid "_Location..."
-msgstr "_Pasek położenia"
-
-#: ../midori/midori-browser.c:5973
-msgid "Open a particular location"
-msgstr "Wprowadza określone położenie"
-
-#: ../midori/midori-browser.c:5995
-msgid "_Web Search..."
-msgstr "_Wyszukiwarka"
-
-#: ../midori/midori-browser.c:5997
-msgid "Run a web search"
-msgstr "Wyszukuje wyrażenia przy pomocy wyszukiwarki internetowej"
-
-#: ../midori/midori-browser.c:6024
-msgid "Reopen a previously closed tab or window"
-msgstr "Wyświetla listę ostatnio zamkniętych kart i okien"
-
-#: ../midori/midori-browser.c:6041
-msgid "Show the saved bookmarks"
-msgstr "Wyświetla zapisane zakładki"
-
-#: ../midori/midori-browser.c:6058
+#: ../midori/midori-browser.c:5746 ../midori/midori-browser.c:6407
msgid "_Tools"
msgstr "_Narzędzia"
-#: ../midori/midori-browser.c:6074
+#: ../midori/midori-browser.c:5753
+msgid "_Menubar"
+msgstr "Pasek _menu"
+
+#: ../midori/midori-browser.c:5757
+msgid "_Navigationbar"
+msgstr "Pasek _narzędzi nawigacyjnych"
+
+#: ../midori/midori-browser.c:5761
+msgid "Side_panel"
+msgstr "Panel _boczny"
+
+#: ../midori/midori-browser.c:5762
+msgid "Sidepanel"
+msgstr "Panel boczny"
+
+#: ../midori/midori-browser.c:5765
+msgid "_Bookmarkbar"
+msgstr "Pasek _zakładek"
+
+#: ../midori/midori-browser.c:5769
+msgid "_Statusbar"
+msgstr "Pasek stanu"
+
+#: ../midori/midori-browser.c:5778 ../midori/midori-websettings.c:314
+msgid "_Automatic"
+msgstr "Wybór _automatyczny"
+
+#: ../midori/midori-browser.c:5781 ../midori/midori-websettings.c:238
+msgid "Chinese Traditional (BIG5)"
+msgstr "Chiński tradycyjny (BIG5)"
+
+#: ../midori/midori-browser.c:5784 ../midori/midori-websettings.c:239
+msgid "Chinese Simplified (GB18030)"
+msgstr "Chiński uproszczony (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5788
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japoński (SHIFT_JIS)"
+
+#: ../midori/midori-browser.c:5791 ../midori/midori-websettings.c:241
+msgid "Korean (EUC-KR)"
+msgstr "Koreański (EUC-KR)"
+
+#: ../midori/midori-browser.c:5794 ../midori/midori-websettings.c:242
+msgid "Russian (KOI8-R)"
+msgstr "Rosyjski (KOI8-R)"
+
+#: ../midori/midori-browser.c:5797 ../midori/midori-websettings.c:243
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5800 ../midori/midori-websettings.c:244
+msgid "Western (ISO-8859-1)"
+msgstr "Zachodni (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5803
+msgid "Custom…"
+msgstr "Dostosuj…"
+
+#: ../midori/midori-browser.c:6313
+msgid "_Separator"
+msgstr "_Separator"
+
+#: ../midori/midori-browser.c:6320
+msgid "_Location…"
+msgstr "_Pasek położenia"
+
+#: ../midori/midori-browser.c:6322
+msgid "Open a particular location"
+msgstr "Wprowadza określone położenie"
+
+#: ../midori/midori-browser.c:6344
+msgid "_Web Search…"
+msgstr "_Wyszukiwarka"
+
+#: ../midori/midori-browser.c:6346
+msgid "Run a web search"
+msgstr "Wyszukuje wyrażenia przy pomocy wyszukiwarki internetowej"
+
+#: ../midori/midori-browser.c:6373
+msgid "Reopen a previously closed tab or window"
+msgstr "Wyświetla listę ostatnio zamkniętych kart i okien"
+
+#: ../midori/midori-browser.c:6390
+msgid "Show the saved bookmarks"
+msgstr "Wyświetla zapisane zakładki"
+
+#: ../midori/midori-browser.c:6423
msgid "_Window"
msgstr "_Okno"
-#: ../midori/midori-browser.c:6076
+#: ../midori/midori-browser.c:6425
msgid "Show a list of all open tabs"
msgstr "Wyświetla listę otwartych kart"
-#: ../midori/midori-browser.c:6090
+#: ../midori/midori-browser.c:6439
msgid "_Menu"
msgstr "_Menu"
-#: ../midori/midori-browser.c:6092
+#: ../midori/midori-browser.c:6441
msgid "Menu"
-msgstr "Wyświetla listę poleceń paska menu"
+msgstr "Wyświetla polecenia paska menu"
-#: ../midori/midori-browser.c:6904
+#: ../midori/midori-browser.c:7271
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Niespodziewane ustawienie „%s”"
-#: ../midori/midori-extension.c:310
+#: ../midori/midori-extension.c:329
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "Nie można wczytać ustawień wtyczki „%s”: %s\n"
-#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818
-#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
+#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
+#: ../extensions/addons.c:1688
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "Nie można zapisać ustawień wtyczki „%s”: %s\n"
@@ -1069,549 +1083,610 @@ msgstr "Nie można zapisać ustawień wtyczki „%s”: %s\n"
msgid "Search with %s"
msgstr "Wyszukaj za pomocą %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Wyszukaj za pomocą..."
+#: ../midori/midori-locationaction.c:414
+msgid "Search with…"
+msgstr "Wyszukaj za pomocą…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:541
#, c-format
msgid "Failed to select from history\n"
msgstr "Nie udało się wybrać z historii\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:628
#, c-format
msgid "Search for %s"
msgstr "Wyszukaj wyrażenie „%s”"
+#: ../midori/midori-locationaction.c:1195
+msgid "Export certificate"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1227
+msgid "The signing certificate authority is not known."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1229
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1231
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1233
+msgid "The certificate has expired"
+msgstr "Certyfikat wygasł"
+
+#: ../midori/midori-locationaction.c:1235
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1237
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Algorytm certyfikatu został oceniony jako niepewny."
+
+#: ../midori/midori-locationaction.c:1239
+msgid "Some other error occurred validating the certificate."
+msgstr "Wystąpił błąd podczas próby sprawdzenia certyfikatu"
+
+#: ../midori/midori-locationaction.c:1286
+msgid "_Export certificate"
+msgstr "_Wyeksportuj certyfikat"
+
+#: ../midori/midori-locationaction.c:1301
+msgid "Self-signed"
+msgstr ""
+
+#: ../midori/midori-locationaction.c:1335
+msgid "Security details"
+msgstr "Szczegóły zabezpieczeń"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1400
+#: ../midori/midori-locationaction.c:1618
msgid "Paste and p_roceed"
msgstr "Wklej i p_rzejdź"
-#: ../midori/midori-locationaction.c:1768
+#: ../midori/midori-locationaction.c:1942
msgid "Not verified"
-msgstr "Nie zweryfikowany"
+msgstr "Nie zweryfikowane"
-#: ../midori/midori-locationaction.c:1788
+#: ../midori/midori-locationaction.c:1950
msgid "Verified and encrypted connection"
msgstr "Zweryfikowane i szyfrowane połączenie"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-locationaction.c:1957
+msgid "Open, unencrypted connection"
+msgstr "Otwarte, nieszyfrowane połączenie"
+
+#: ../midori/midori-panel.c:316 ../midori/midori-panel.c:318
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
msgid "Align sidepanel to the right"
msgstr "Przemieszcza panel boczny na prawą stronę okna"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:328 ../midori/midori-panel.c:329
msgid "Close panel"
msgstr "Zamyka panel"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:482 ../midori/midori-panel.c:485
msgid "Align sidepanel to the left"
msgstr "Przemieszcza panel boczny na lewą stronę okna"
-#: ../midori/midori-websettings.c:214
+#: ../midori/midori-websettings.c:220
msgid "Show Speed Dial"
msgstr "Wyświetlenie strony szybkiego wybierania"
-#: ../midori/midori-websettings.c:215
+#: ../midori/midori-websettings.c:221
msgid "Show Homepage"
msgstr "Wyświetlenie strony głównej"
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:240
msgid "Japanese (SHIFT_JIS)"
msgstr "Japoński (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:253
+#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Własny..."
+
+#: ../midori/midori-websettings.c:260
msgid "New tab"
msgstr "W nowej karcie"
-#: ../midori/midori-websettings.c:254
+#: ../midori/midori-websettings.c:261
msgid "New window"
msgstr "W nowym oknie"
-#: ../midori/midori-websettings.c:255
+#: ../midori/midori-websettings.c:262
msgid "Current tab"
msgstr "W bieżącej karcie"
-#: ../midori/midori-websettings.c:270
+#: ../midori/midori-websettings.c:277
msgid "Default"
msgstr "Domyślny"
-#: ../midori/midori-websettings.c:271
+#: ../midori/midori-websettings.c:278
msgid "Icons"
msgstr "Tylko ikony"
-#: ../midori/midori-websettings.c:272
+#: ../midori/midori-websettings.c:279
msgid "Small icons"
msgstr "Małe ikony"
-#: ../midori/midori-websettings.c:273
+#: ../midori/midori-websettings.c:280
msgid "Text"
msgstr "Tylko etykiety"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:281
msgid "Icons and text"
msgstr "Etykiety poniżej ikon"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:282
msgid "Text beside icons"
msgstr "Etykiety obok ikon"
-#: ../midori/midori-websettings.c:290
+#: ../midori/midori-websettings.c:297
msgid "Automatic (GNOME or environment)"
msgstr "Ustawienia środowiska"
-#: ../midori/midori-websettings.c:291
+#: ../midori/midori-websettings.c:298
msgid "HTTP proxy server"
msgstr "HTTP"
-#: ../midori/midori-websettings.c:292
+#: ../midori/midori-websettings.c:299
msgid "No proxy server"
msgstr "Brak"
-#: ../midori/midori-websettings.c:309
+#: ../midori/midori-websettings.c:316
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:317
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:310
+#: ../midori/midori-websettings.c:318
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:311
+#: ../midori/midori-websettings.c:319
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:312
+#: ../midori/midori-websettings.c:320
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:388
+#: ../midori/midori-websettings.c:404
msgid "Remember last window size"
msgstr "Pamiętaj ostatni rozmiar okna"
-#: ../midori/midori-websettings.c:389
+#: ../midori/midori-websettings.c:405
msgid "Whether to save the last window size"
msgstr "Zapamiętuje ostatni rozmiar okna programu"
-#: ../midori/midori-websettings.c:397
+#: ../midori/midori-websettings.c:413
msgid "Last window width"
msgstr "Ostatnia szerokość okna"
-#: ../midori/midori-websettings.c:398
+#: ../midori/midori-websettings.c:414
msgid "The last saved window width"
msgstr "Ostatnia zapisana szerokość okna"
-#: ../midori/midori-websettings.c:406
+#: ../midori/midori-websettings.c:422
msgid "Last window height"
msgstr "Ostatnia wysokość okna"
-#: ../midori/midori-websettings.c:407
+#: ../midori/midori-websettings.c:423
msgid "The last saved window height"
msgstr "Ostatnia zapisana wysokość okna"
-#: ../midori/midori-websettings.c:432
+#: ../midori/midori-websettings.c:448
msgid "Last panel position"
msgstr "Ostatnia pozycja panelu"
-#: ../midori/midori-websettings.c:433
+#: ../midori/midori-websettings.c:449
msgid "The last saved panel position"
msgstr "Ostatnio zapisana pozycja panelu"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:442
+#: ../midori/midori-websettings.c:458
msgid "Last panel page"
msgstr "Ostatni panel strony"
-#: ../midori/midori-websettings.c:443
+#: ../midori/midori-websettings.c:459
msgid "The last saved panel page"
msgstr "Ostatnio zapamiętany panel strony"
-#: ../midori/midori-websettings.c:451
+#: ../midori/midori-websettings.c:467
msgid "Last Web search"
msgstr "Ostatnie wyszukiwanie"
-#: ../midori/midori-websettings.c:452
+#: ../midori/midori-websettings.c:468
msgid "The last saved Web search"
msgstr "Ostatnio zapisane wyszukiwanie"
-#: ../midori/midori-websettings.c:461
+#: ../midori/midori-websettings.c:492
msgid "Show Menubar"
msgstr "Przełącza widoczność paska poleceń"
-#: ../midori/midori-websettings.c:462
+#: ../midori/midori-websettings.c:493
msgid "Whether to show the menubar"
msgstr "Przełącza wyświetlanie paska poleceń"
-#: ../midori/midori-websettings.c:470
+#: ../midori/midori-websettings.c:501
msgid "Show Navigationbar"
msgstr "Pokaż pasek nawigacji"
-#: ../midori/midori-websettings.c:471
+#: ../midori/midori-websettings.c:502
msgid "Whether to show the navigationbar"
msgstr "Przełącza wyświetlanie paska nawigacyjnego"
-#: ../midori/midori-websettings.c:479
+#: ../midori/midori-websettings.c:510
msgid "Show Bookmarkbar"
msgstr "Wyświetlanie paska zakładek"
-#: ../midori/midori-websettings.c:480
+#: ../midori/midori-websettings.c:511
msgid "Whether to show the bookmarkbar"
msgstr "Przełącza wyświetlanie paska zakładek"
-#: ../midori/midori-websettings.c:488
+#: ../midori/midori-websettings.c:519
msgid "Show Panel"
msgstr "Pokaż panel"
-#: ../midori/midori-websettings.c:489
+#: ../midori/midori-websettings.c:520
msgid "Whether to show the panel"
msgstr "Przełącza wyświetlanie panelu bocznego"
-#: ../midori/midori-websettings.c:497
+#: ../midori/midori-websettings.c:528
msgid "Show Statusbar"
msgstr "Pasek _stanu"
-#: ../midori/midori-websettings.c:498
+#: ../midori/midori-websettings.c:529
msgid "Whether to show the statusbar"
msgstr "Przełącza wyświetlanie paska stanu"
-#: ../midori/midori-websettings.c:507
+#: ../midori/midori-websettings.c:538
msgid "Toolbar Style:"
msgstr "Wygląd:"
-#: ../midori/midori-websettings.c:508
+#: ../midori/midori-websettings.c:539
msgid "The style of the toolbar"
msgstr "Określa styl paska narzędzi"
-#: ../midori/midori-websettings.c:517
+#: ../midori/midori-websettings.c:548
msgid "Toolbar Items"
msgstr "Elementy paska narzędziowego"
-#: ../midori/midori-websettings.c:518
+#: ../midori/midori-websettings.c:549
msgid "The items to show on the toolbar"
msgstr "Określa wygląd paska narzędziowego"
-#: ../midori/midori-websettings.c:526
+#: ../midori/midori-websettings.c:557
msgid "Compact Sidepanel"
msgstr "Zwarty panel boczny"
-#: ../midori/midori-websettings.c:527
+#: ../midori/midori-websettings.c:558
msgid "Whether to make the sidepanel compact"
msgstr "Przełącza wyświetlanie panelu bocznego w trybie zwartym"
-#: ../midori/midori-websettings.c:542
+#: ../midori/midori-websettings.c:573
msgid "Align sidepanel on the right"
msgstr "Przypnij panel boczny do prawej strony"
-#: ../midori/midori-websettings.c:543
+#: ../midori/midori-websettings.c:574
msgid "Whether to align the sidepanel on the right"
msgstr ""
-#: ../midori/midori-websettings.c:558
+#: ../midori/midori-websettings.c:589
msgid "Open panels in separate windows"
msgstr "Otwieranie paneli w oddzielnych oknach"
-#: ../midori/midori-websettings.c:559
+#: ../midori/midori-websettings.c:590
msgid "Whether to always open panels in separate windows"
msgstr "Otwiera wszystkie panale w oddzielnych oknach"
-#: ../midori/midori-websettings.c:568
+#: ../midori/midori-websettings.c:599
msgid "When Midori starts:"
msgstr "Domyślna czynność:"
-#: ../midori/midori-websettings.c:569
+#: ../midori/midori-websettings.c:600
msgid "What to do when Midori starts"
msgstr "Określa domyślną czynność wykonywaną po uruchomieniu programu"
-#: ../midori/midori-websettings.c:578
+#: ../midori/midori-websettings.c:609
msgid "Homepage:"
msgstr "Strona główna:"
-#: ../midori/midori-websettings.c:579
+#: ../midori/midori-websettings.c:610
msgid "The homepage"
msgstr "Wprowadza adres strony głównej"
-#: ../midori/midori-websettings.c:594
+#: ../midori/midori-websettings.c:625
msgid "Show crash dialog"
msgstr "Wyświetlanie okna diagnostycznego po wystąpieniu awarii"
-#: ../midori/midori-websettings.c:595
+#: ../midori/midori-websettings.c:626
msgid "Show a dialog after Midori crashed"
msgstr "Wyświetla okno diagnostyczne po wystąpieniu awarii programu"
-#: ../midori/midori-websettings.c:603
+#: ../midori/midori-websettings.c:634
msgid "Save downloaded files to:"
msgstr "Położenie pobierania:"
-#: ../midori/midori-websettings.c:604
+#: ../midori/midori-websettings.c:635
msgid "The folder downloaded files are saved to"
msgstr "Określa katalog, w którym są zapisywane pobierane pliki"
-#: ../midori/midori-websettings.c:612
+#: ../midori/midori-websettings.c:643
msgid "Text Editor"
msgstr "Edytor tekstu:"
-#: ../midori/midori-websettings.c:613
+#: ../midori/midori-websettings.c:644
msgid "An external text editor"
msgstr "Określa zewnętrzny edytor tekstu"
-#: ../midori/midori-websettings.c:628
+#: ../midori/midori-websettings.c:659
msgid "News Aggregator"
msgstr "Czytnik wiadomości:"
-#: ../midori/midori-websettings.c:629
+#: ../midori/midori-websettings.c:660
msgid "An external news aggregator"
msgstr "Określa zewnętrzny czytnik wiadomości"
-#: ../midori/midori-websettings.c:637
+#: ../midori/midori-websettings.c:668
msgid "Location entry Search"
msgstr "Adres domyślnej wyszukiwarki internetowej"
-#: ../midori/midori-websettings.c:638
+#: ../midori/midori-websettings.c:669
msgid "The search to perform inside the location entry"
msgstr ""
-#: ../midori/midori-websettings.c:646
+#: ../midori/midori-websettings.c:677
msgid "Preferred Encoding"
msgstr "Kodowanie znaków:"
-#: ../midori/midori-websettings.c:647
+#: ../midori/midori-websettings.c:678
msgid "The preferred character encoding"
msgstr "Określa preferowane kodowanie znaków"
-#: ../midori/midori-websettings.c:657
+#: ../midori/midori-websettings.c:688
msgid "Always Show Tabbar"
msgstr "Zawsze widoczny pasek kart"
-#: ../midori/midori-websettings.c:658
+#: ../midori/midori-websettings.c:689
msgid "Always show the tabbar"
msgstr "Wyświetla pasek kart nawet gdy otwarto tylko jedną kartę"
-#: ../midori/midori-websettings.c:671
+#: ../midori/midori-websettings.c:702
msgid "Close Buttons on Tabs"
msgstr "Przyciski zamykania kart"
-#: ../midori/midori-websettings.c:672
+#: ../midori/midori-websettings.c:703
msgid "Whether tabs have close buttons"
msgstr "Wyświetla przyciski zamykania na kartach"
-#: ../midori/midori-websettings.c:697
+#: ../midori/midori-websettings.c:728
msgid "Open new pages in:"
msgstr "Otwieranie nowych stron:"
-#: ../midori/midori-websettings.c:698
+#: ../midori/midori-websettings.c:729
msgid "Where to open new pages"
msgstr "Określa sposób otwierania nowych stron"
-#: ../midori/midori-websettings.c:707
+#: ../midori/midori-websettings.c:738
msgid "Middle click opens Selection"
msgstr ""
"Otwieranie odnośników zaznaczonych adresów URL\n"
"kliknięciem środkowego przycisku myszy"
-#: ../midori/midori-websettings.c:708
+#: ../midori/midori-websettings.c:739
msgid "Load an address from the selection via middle click"
msgstr "Otwiera zaznaczony adres kliknięciem środkowego przycisku myszy"
-#: ../midori/midori-websettings.c:716
+#: ../midori/midori-websettings.c:747
msgid "Open tabs in the background"
msgstr "Otwieranie kart w tle"
-#: ../midori/midori-websettings.c:717
+#: ../midori/midori-websettings.c:748
msgid "Whether to open new tabs in the background"
msgstr "Otwiera karty w tle"
-#: ../midori/midori-websettings.c:725
+#: ../midori/midori-websettings.c:756
msgid "Open Tabs next to Current"
msgstr "Otwieranie kart za bieżącą kartą"
-#: ../midori/midori-websettings.c:726
+#: ../midori/midori-websettings.c:757
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr ""
"Określa czy nowe karty będą umieszczane zaraz za bieżącą kartą czy za "
"ostatnią"
-#: ../midori/midori-websettings.c:734
+#: ../midori/midori-websettings.c:765
msgid "Open popups in tabs"
msgstr "Otwieranie wyskakującyh okienek jako karty"
-#: ../midori/midori-websettings.c:735
+#: ../midori/midori-websettings.c:766
msgid "Whether to open popup windows in tabs"
msgstr "Czy otwierać wyskakujące okienka jako karty"
-#: ../midori/midori-websettings.c:745 ../extensions/statusbar-features.c:134
+#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155
msgid "Load images automatically"
msgstr "Wczytywanie obrazów"
-#: ../midori/midori-websettings.c:746
+#: ../midori/midori-websettings.c:777
msgid "Load and display images automatically"
msgstr "Wczytuje i wyświetla obrazy automatycznie"
-#: ../midori/midori-websettings.c:753 ../extensions/statusbar-features.c:143
+#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165
msgid "Enable scripts"
msgstr "Wykonywanie skryptów"
-#: ../midori/midori-websettings.c:754
+#: ../midori/midori-websettings.c:785
msgid "Enable embedded scripting languages"
msgstr "Wykonuje osadzone skrypty"
-#: ../midori/midori-websettings.c:761 ../extensions/statusbar-features.c:154
+#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177
msgid "Enable Netscape plugins"
msgstr "Obsługa wtyczek Netscape"
-#: ../midori/midori-websettings.c:762
+#: ../midori/midori-websettings.c:793
msgid "Enable embedded Netscape plugin objects"
msgstr "Używa wbudowanych wtyczek Netscape"
-#: ../midori/midori-websettings.c:777
+#: ../midori/midori-websettings.c:808
msgid "Enable Spell Checking"
msgstr "Sprawdzanie pisowni"
-#: ../midori/midori-websettings.c:778
+#: ../midori/midori-websettings.c:809
msgid "Enable spell checking while typing"
msgstr "Sprawdza pisownię podczas wprowadzania tekstu"
-#: ../midori/midori-websettings.c:784
+#: ../midori/midori-websettings.c:815
msgid "Enable HTML5 database support"
msgstr "Obsługa baz danych HTML5"
-#: ../midori/midori-websettings.c:785
+#: ../midori/midori-websettings.c:816
msgid "Whether to enable HTML5 database support"
msgstr "Przełącza obsługę baz danych HTML5"
-#: ../midori/midori-websettings.c:791
+#: ../midori/midori-websettings.c:822
msgid "Enable HTML5 local storage support"
msgstr "Obsługa lokalnego magazynu HTML5"
-#: ../midori/midori-websettings.c:792
+#: ../midori/midori-websettings.c:823
msgid "Whether to enable HTML5 local storage support"
msgstr "Przełącza obsługę lokalnych magazynów HTML5"
-#: ../midori/midori-websettings.c:798
+#: ../midori/midori-websettings.c:829
msgid "Enable offline web application cache"
msgstr "Pamięć podręczna rozłączonych usług internetowych"
-#: ../midori/midori-websettings.c:799
+#: ../midori/midori-websettings.c:830
msgid "Whether to enable offline web application cache"
msgstr "Włącza pamięć podręczną rozłączonych usług internetowych"
-#: ../midori/midori-websettings.c:815
+#: ../midori/midori-websettings.c:851
msgid "Flash window on background tabs"
msgstr "Miganie okna po otwarciu karty w tle"
-#: ../midori/midori-websettings.c:816
+#: ../midori/midori-websettings.c:852
msgid "Flash the browser window if a new tab was opened in the background"
msgstr "Powiadamianie miganiem okna o otwarciu karty w tle"
-#: ../midori/midori-websettings.c:824
+#: ../midori/midori-websettings.c:860
msgid "Enable WebGL support"
-msgstr "Włącz obsługę WebGL"
+msgstr "Obsługa WebGL"
-#: ../midori/midori-websettings.c:825
+#: ../midori/midori-websettings.c:861
msgid "Allow websites to use OpenGL rendering"
-msgstr "Pozwól na używanie OpenGL do renderowania stron internetowych"
+msgstr "Umożliwia używanie OpenGL do renderowania stron internetowych"
-#: ../midori/midori-websettings.c:851
+#: ../midori/midori-websettings.c:887
msgid "Zoom Text and Images"
msgstr "Skalowanie tekstu i obrazów"
-#: ../midori/midori-websettings.c:852
+#: ../midori/midori-websettings.c:888
msgid "Whether to zoom text and images"
msgstr "Umożliwia skalowanie tekstu i obrazów"
-#: ../midori/midori-websettings.c:867
+#: ../midori/midori-websettings.c:903
msgid "Find inline while typing"
msgstr "Wyszukiwanie inkrementalne podczas wpisywania tekstu"
-#: ../midori/midori-websettings.c:868
+#: ../midori/midori-websettings.c:904
msgid "Whether to automatically find inline while typing"
msgstr ""
"Wyszukuje tekst automatycznie podczas jego wpisywania w polu wyszukiwania"
-#: ../midori/midori-websettings.c:883
+#: ../midori/midori-websettings.c:919
msgid "Kinetic scrolling"
msgstr "Kinetyczne przewijanie"
-#: ../midori/midori-websettings.c:884
+#: ../midori/midori-websettings.c:920
msgid "Whether scrolling should kinetically move according to speed"
msgstr ""
"Dopasowuje prędkość przewijania, do prędkości ruchu urządzenia wskazującego"
-#: ../midori/midori-websettings.c:892
+#: ../midori/midori-websettings.c:928
msgid "Delete old Cookies after:"
msgstr "Czas przechowywania ciasteczek:"
-#: ../midori/midori-websettings.c:893
+#: ../midori/midori-websettings.c:929
msgid "The maximum number of days to save cookies for"
msgstr ""
"Określa maksymalny czas przechowywania ciasteczek dla stron internetowych"
-#: ../midori/midori-websettings.c:909
+#: ../midori/midori-websettings.c:945
msgid "Only accept Cookies from sites you visit"
msgstr "Akceptowanie ciasteczek pochodzących tylko z odwiedzonych stron"
-#: ../midori/midori-websettings.c:910
+#: ../midori/midori-websettings.c:946
msgid "Block cookies sent by third-party websites"
msgstr "Blokuje ciasteczka wysyłane przez nieodwiedzone strony"
-#: ../midori/midori-websettings.c:924
+#: ../midori/midori-websettings.c:960
msgid "Delete pages from history after:"
msgstr "Czas przechowywania historii:"
-#: ../midori/midori-websettings.c:925
+#: ../midori/midori-websettings.c:961
msgid "The maximum number of days to save the history for"
msgstr "Określa maksymalny czas przechowywania historii odwiedzonych stron"
-#: ../midori/midori-websettings.c:940
+#: ../midori/midori-websettings.c:976
msgid "Proxy server"
msgstr "Serwer pośredniczący:"
-#: ../midori/midori-websettings.c:941
+#: ../midori/midori-websettings.c:977
msgid "The type of proxy server to use"
msgstr "Określa typ używanego serwera pośredniczącego"
-#: ../midori/midori-websettings.c:950
+#: ../midori/midori-websettings.c:986
msgid "HTTP Proxy Server"
msgstr "Serwer pośredniczący HTTP:"
-#: ../midori/midori-websettings.c:951
+#: ../midori/midori-websettings.c:987
msgid "The proxy server used for HTTP connections"
msgstr "Określa serwer pośredniczący w połączeniach HTTP"
-#: ../midori/midori-websettings.c:966
+#: ../midori/midori-websettings.c:1002
msgid "Port"
msgstr "Port:"
-#: ../midori/midori-websettings.c:967
+#: ../midori/midori-websettings.c:1003
msgid "The proxy server port used for HTTP connections"
msgstr "Określa port serwera pośredniczącego w połączeniach HTTP"
-#: ../midori/midori-websettings.c:985
+#: ../midori/midori-websettings.c:1021
msgid "The maximum size of cached pages on disk"
msgstr "Określa maksymalny rozmiar pamięci podręcznej stron"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1002
+#: ../midori/midori-websettings.c:1038
msgid "Identify as"
msgstr "Identyfikator:"
-#: ../midori/midori-websettings.c:1003
+#: ../midori/midori-websettings.c:1039
msgid "What to identify as to web pages"
msgstr ""
"Określa jak przeglądarka ma się identyfikować przed stronami internetowymi"
-#: ../midori/midori-websettings.c:1019
+#: ../midori/midori-websettings.c:1055
msgid "Identification string"
msgstr "Identyfikacja"
-#: ../midori/midori-websettings.c:1020
+#: ../midori/midori-websettings.c:1056
msgid "The application identification string"
msgstr "Ciąg indentyfikujący przeglądarkę"
-#: ../midori/midori-websettings.c:1036
+#: ../midori/midori-websettings.c:1072
msgid "Preferred languages"
msgstr "Preferowane języki:"
-#: ../midori/midori-websettings.c:1037
+#: ../midori/midori-websettings.c:1073
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1620,434 +1695,464 @@ msgstr ""
"wielojęzycznych, rozdzielonych znakiem przecinka. Np.: „pl”, „ru,nl” or „en-"
"us;q=1.0, fr-fr;q=0.667”."
-#: ../midori/midori-websettings.c:1052
+#: ../midori/midori-websettings.c:1088
msgid "Clear private data"
msgstr "Usuń prywatne dane"
-#: ../midori/midori-websettings.c:1053
+#: ../midori/midori-websettings.c:1089
msgid "The private data selected for deletion"
msgstr "Prywatne dane zaznaczone do usunięcia"
-#: ../midori/midori-websettings.c:1068
+#: ../midori/midori-websettings.c:1104
msgid "Clear data"
msgstr "Usuń dane"
-#: ../midori/midori-websettings.c:1069
+#: ../midori/midori-websettings.c:1105
msgid "The data selected for deletion"
msgstr "Dane zaznaczone do usunięcia"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1118
+#: ../midori/midori-websettings.c:1154
msgid "Strip referrer details sent to websites"
msgstr ""
-"Skracanie adresów przekierowanych stron internetowych\n"
-"w nagłówkach HTTP"
+"Skracanie adresów przekierowanych stron internetowych w\n"
+"nagłówkach HTTP"
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1120
+#: ../midori/midori-websettings.c:1156
msgid "Whether the \"Referer\" header should be shortened to the hostname"
msgstr ""
"Skraca adresy przekierowywanych stron internetowych, wysyłane do serwerów w "
"nagłówkach HTTP, jedynie do nazw komputerów"
-#: ../midori/midori-websettings.c:1134
+#: ../midori/midori-websettings.c:1170
msgid "Always use my font choices"
msgstr "Wymuszenie używania wybranej czcionki"
-#: ../midori/midori-websettings.c:1135
+#: ../midori/midori-websettings.c:1171
msgid "Override fonts picked by websites with user preferences"
msgstr ""
"Używa czcionek wybranych przez użytkownika, bez względu na preferencje stron"
-#: ../midori/midori-view.c:1353
+#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140
+msgid "Trust this website"
+msgstr ""
+
+#: ../midori/midori-view.c:1138
+msgid "Security unknown"
+msgstr "Nieznany stan zabezpieczeń"
+
+#: ../midori/midori-view.c:1436
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "Strona „%s” chce zapisać bazę danych HTML5."
-#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Deny"
msgstr "_Odmów"
-#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Allow"
msgstr "_Zezwól"
-#: ../midori/midori-view.c:1385
+#: ../midori/midori-view.c:1469
#, c-format
msgid "%s wants to know your location."
-msgstr "Strona „%s” chce poznać położenie użytkownika."
+msgstr "Strona „%s” chce poznać lokalizację użytkownika."
-#: ../midori/midori-view.c:1476
+#: ../midori/midori-view.c:1565
#, c-format
msgid "Error - %s"
msgstr "Błąd - %s"
-#: ../midori/midori-view.c:1477
+#: ../midori/midori-view.c:1566
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Nie można wczytać strony „%s”."
-#: ../midori/midori-view.c:1479
+#: ../midori/midori-view.c:1568
msgid "Try again"
msgstr "Wczytaj ponownie"
-#: ../midori/midori-view.c:1676 ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875
#, c-format
msgid "Send a message to %s"
msgstr "Wyślij wiadomość na adres %s"
-#: ../midori/midori-view.c:2419 ../midori/midori-view.c:2738
-msgid "Inspect _Element"
-msgstr "Zbadaj _element..."
+#: ../midori/midori-view.c:2661
+msgid "Add _search engine..."
+msgstr "Dodaj _wyszukiwarkę..."
-#: ../midori/midori-view.c:2471
+#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031
+msgid "Inspect _Element"
+msgstr "Zbadaj _element…"
+
+#: ../midori/midori-view.c:2757
msgid "Open Link in New _Tab"
msgstr "Otwórz w nowej _karcie"
-#: ../midori/midori-view.c:2475
+#: ../midori/midori-view.c:2761
msgid "Open Link in _Foreground Tab"
msgstr "Otwórz odnośnik w nowej karcie"
-#: ../midori/midori-view.c:2476
+#: ../midori/midori-view.c:2762
msgid "Open Link in _Background Tab"
msgstr "Otwórz w nowej karcie w _tle"
-#: ../midori/midori-view.c:2479
+#: ../midori/midori-view.c:2765
msgid "Open Link in New _Window"
msgstr "Otwórz w nowym _oknie"
-#: ../midori/midori-view.c:2482
+#: ../midori/midori-view.c:2768
msgid "Open Link as Web A_pplication"
msgstr "Otwórz jako stronę _usługi internetowej"
-#: ../midori/midori-view.c:2487
+#: ../midori/midori-view.c:2773
msgid "Copy Link de_stination"
msgstr "_Skopiuj adres odnośnika"
-#: ../midori/midori-view.c:2503
+#: ../midori/midori-view.c:2789
msgid "Open _Image in New Tab"
msgstr "Otwórz obraz w nowej _karcie"
-#: ../midori/midori-view.c:2506
+#: ../midori/midori-view.c:2792
msgid "Copy Image _Address"
msgstr "Skopiuj _adres obrazu"
-#: ../midori/midori-view.c:2509
+#: ../midori/midori-view.c:2795
msgid "Save I_mage"
msgstr "Zapisz _obraz"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2798
msgid "Open in Image _Viewer"
msgstr "Otwórz w przeglądarce obrazów"
-#: ../midori/midori-view.c:2519
+#: ../midori/midori-view.c:2805
msgid "Copy Video _Address"
msgstr "_Skopiuj adres nagrania wideo"
-#: ../midori/midori-view.c:2522
+#: ../midori/midori-view.c:2808
msgid "Save _Video"
msgstr "Zapisz nagranie _wideo"
-#: ../midori/midori-view.c:2522
+#: ../midori/midori-view.c:2808
msgid "Download _Video"
msgstr "Pobierz nagranie _wideo"
-#: ../midori/midori-view.c:2548
+#: ../midori/midori-view.c:2834
msgid "Search _with"
msgstr "Wyszukaj _za pomocą"
-#: ../midori/midori-view.c:2580
+#: ../midori/midori-view.c:2866
msgid "_Search the Web"
msgstr "_Wyszukaj w internecie"
-#: ../midori/midori-view.c:2597
+#: ../midori/midori-view.c:2883
msgid "Open Address in New _Tab"
msgstr "Otwórz adres w nowej _karcie"
-#: ../midori/midori-view.c:2886
+#: ../midori/midori-view.c:2936
+msgid "Open _Frame in New Tab"
+msgstr "Otwórz _ramkę w nowej karcie"
+
+#: ../midori/midori-view.c:3189
msgid "Open or download file"
msgstr "Pobieranie pliku"
-#: ../midori/midori-view.c:2905
+#: ../midori/midori-view.c:3213
+#, c-format
+msgid "File Name: %s"
+msgstr "Nazwa pliku: %s"
+
+#: ../midori/midori-view.c:3218
#, c-format
msgid "File Type: '%s'"
msgstr "Typ pliku: „%s”"
-#: ../midori/midori-view.c:2907
+#: ../midori/midori-view.c:3220
#, c-format
msgid "File Type: %s ('%s')"
msgstr "Typ pliku: %s („%s”)"
-#: ../midori/midori-view.c:2911
+#: ../midori/midori-view.c:3255
#, c-format
-msgid "File Name: %s"
-msgstr "Typ pliku: %s"
+msgid "Size: %s"
+msgstr "Rozmiar: %s"
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2930
+#: ../midori/midori-view.c:3266
#, c-format
msgid "Open %s"
msgstr "Otwieranie %s"
-#: ../midori/midori-view.c:3575
+#: ../midori/midori-view.c:3885
#, c-format
msgid "Inspect page - %s"
msgstr "Badanie - %s"
-#: ../midori/midori-view.c:3876
+#: ../midori/midori-view.c:4239
msgid "Speed Dial"
msgstr "Szybkie wybieranie"
-#: ../midori/midori-view.c:3877 ../midori/midori-view.c:3973
+#: ../midori/midori-view.c:4240 ../midori/midori-view.c:4336
msgid "Click to add a shortcut"
msgstr "Proszę kliknąć, aby dodać odnośnik"
-#: ../midori/midori-view.c:3878
+#: ../midori/midori-view.c:4241
msgid "Enter shortcut address"
msgstr "Proszę wprowadzić adres URL odnośnika:"
-#: ../midori/midori-view.c:3879
+#: ../midori/midori-view.c:4242
msgid "Enter shortcut title"
msgstr "Proszę wprowadzić nazwę odnośnika:"
-#: ../midori/midori-view.c:3880
+#: ../midori/midori-view.c:4243
msgid "Are you sure you want to delete this shortcut?"
msgstr "Usunąć odnośnik?"
-#: ../midori/midori-view.c:4042
+#: ../midori/midori-view.c:4405
#, c-format
msgid "No documentation installed"
msgstr "Brak zainstalowanej dokumentacji"
-#: ../midori/midori-view.c:4118
+#: ../midori/midori-view.c:4482
msgid "Midori doesn't store any personal data:"
msgstr "Midori nie przechowuje żadnych danych osobistych:"
-#: ../midori/midori-view.c:4119
+#: ../midori/midori-view.c:4483
msgid "No history or web cookies are being saved."
-msgstr "Historia i ciasteczka nie są zapisywane "
+msgstr "historia i ciasteczka nie są zapisywane,"
-#: ../midori/midori-view.c:4120
+#: ../midori/midori-view.c:4484
msgid "Extensions are disabled."
-msgstr "Rozszerzenia są wyłączone. "
+msgstr "rozszerzenia są wyłączone,"
-#: ../midori/midori-view.c:4121
+#: ../midori/midori-view.c:4485
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
+"magazyn HTML5, lokalna baza danych i pamięć podręczna usług sieciowych są "
+"wyłączone."
-#: ../midori/midori-view.c:4122
+#: ../midori/midori-view.c:4486
msgid "Midori prevents websites from tracking the user:"
-msgstr "Midori zapobiega śledzeniu użytkownika przez witryny "
+msgstr "Midori zapobiega śledzeniu użytkownika przez witryny:"
-#: ../midori/midori-view.c:4123
+#: ../midori/midori-view.c:4487
msgid "Referrer URLs are stripped down to the hostname."
msgstr ""
+"adresy przekierowywanych stron internetowych, wysyłane do serwerów w "
+"nagłówkach HTTP są skracane do nazw komputerów,"
-#: ../midori/midori-view.c:4124
+#: ../midori/midori-view.c:4488
msgid "DNS prefetching is disabled."
-msgstr "Wczesne pobieranie wpisów DNS jest wyłączone."
+msgstr "wczesne pobieranie wpisów DNS jest wyłączone,"
-#: ../midori/midori-view.c:4125
+#: ../midori/midori-view.c:4489
msgid "The language and timezone are not revealed to websites."
-msgstr "Domyślny język oraz strefa czasowa nie ujawniany witrynom."
+msgstr ""
+"domyślny język oraz strefa czasowa nie są ujawniane stronom internetowym,"
-#: ../midori/midori-view.c:4126
+#: ../midori/midori-view.c:4490
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr ""
+"informacje o wtyczce Flash i innych wtyczkach Netscape nie są ujawniane "
+"stronom internetowym."
-#: ../midori/midori-view.c:4164
+#: ../midori/midori-view.c:4579
msgid "Version numbers in brackets show the version used at runtime."
msgstr ""
"Numery wersji w nawiasach oznaczają wersje komponentów użytych do "
"uruchomienia programu."
-#: ../midori/midori-view.c:4220
+#: ../midori/midori-view.c:4629
msgid "Page loading delayed"
msgstr "Wstrzymano wczytywanie strony"
-#: ../midori/midori-view.c:4221
+#: ../midori/midori-view.c:4630
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"Wczytywanie zostało wstrzymane z powodu ostatniej awarii lub niewłaściwych "
"preferencji programu."
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:4631
msgid "Load Page"
msgstr "Wczytaj stronę"
-#: ../midori/midori-view.c:4388
+#: ../midori/midori-view.c:4798
msgid "Blank page"
msgstr "Pusta strona"
-#: ../midori/midori-view.c:4650
+#: ../midori/midori-view.c:5062
msgid "_Duplicate Tab"
msgstr "_Powiel kartę"
-#: ../midori/midori-view.c:4655
+#: ../midori/midori-view.c:5067
msgid "Show Tab _Label"
msgstr "Wyświetl _etykietę karty"
-#: ../midori/midori-view.c:4655
+#: ../midori/midori-view.c:5067
msgid "Show Tab _Icon Only"
msgstr "Ukryj _etykietę karty"
-#: ../midori/midori-view.c:4661
-msgid "Close ot_her Tabs"
-msgstr "Zamknij pozo_stałe karty"
+#: ../midori/midori-view.c:5074
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Zamknij pozo_stałą kartę"
+msgstr[1] "Zamknij pozo_stałe karty"
+msgstr[2] "Zamknij pozo_stałe karty"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5474
+#: ../midori/midori-view.c:5910
msgid "previous"
msgstr "Poprzednie"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5493
+#: ../midori/midori-view.c:5929
msgid "next"
msgstr "Następne"
-#: ../midori/midori-view.c:5506
+#: ../midori/midori-view.c:5942
msgid "Print background images"
msgstr "Drukowanie obrazów tła"
-#: ../midori/midori-view.c:5507
+#: ../midori/midori-view.c:5943
msgid "Whether background images should be printed"
msgstr "Drukuje obrazy tła stron"
-#: ../midori/midori-view.c:5539
+#: ../midori/midori-view.c:5975
msgid "Features"
msgstr "Treść"
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:298
msgid "Startup"
msgstr "Uruchamianie"
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:311
msgid "Use _current page"
msgstr "Wprowadza adres bieżącej strony jako adres strony głównej"
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:315
msgid "Use current page as homepage"
msgstr "Ustaw bieżącą stronę"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:324
msgid "Fonts"
msgstr "Czcionki"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:327
msgid "Proportional Font Family"
msgstr "Czcionka o zmiennej szerokości:"
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:331
msgid "The default font family used to display text"
msgstr "Określa domyślny krój czcionki używany do wyświetlania tekstu"
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:334
msgid "The default font size used to display text"
msgstr "Określa domyślny rozmiar czcionki używany do wyświetlania tekstu"
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:336
msgid "Fixed-width Font Family"
msgstr "Czcionka stałej szerokości:"
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:340
msgid "The font family used to display fixed-width text"
msgstr ""
"Określa krój czcionki używany do wyświetlania testu o stałej szerokości "
"znaków"
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:343
msgid "The font size used to display fixed-width text"
msgstr ""
"Określa rozmiar czcionki używany do wyświetlania tekstu o stałej szerokości "
"znaków"
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:345
msgid "Minimum Font Size"
msgstr "Minimalny rozmiar czcionki:"
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:349
msgid "The minimum font size used to display text"
msgstr "Określa minimalny rozmiar czcionki używany do wyświetlania tekstu"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:360
msgid "Behavior"
msgstr "Zachowanie"
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:386
msgid "Allow scripts to open popups"
msgstr "Otwieranie nowych okien przez skrypty"
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:387
msgid "Whether scripts are allowed to open popup windows automatically"
msgstr "Umożliwia skryptom automatyczne otwieranie nowych okien"
#. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:418
msgid "Browsing"
msgstr "Przeglądanie"
#. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:458
msgid "Network"
msgstr "Sieć"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:465
msgid "Hostname"
msgstr "Nazwa serwera:"
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:489
msgid "MB"
msgstr "MB"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:958
msgid "Add search engine"
msgstr "Nowa wyszukiwarka"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:958
msgid "Edit search engine"
msgstr "Edycja wyszukiwarki"
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:986
msgid "_Name:"
msgstr "_Nazwa:"
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1001
msgid "_Description:"
msgstr "_Opis:"
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Ikona:"
+#: ../midori/midori-searchaction.c:1014 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Adres:"
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1033
msgid "_Token:"
msgstr "Słowo _kluczowe:"
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1331
msgid "Manage Search Engines"
msgstr "Wyszukiwarki"
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1436
msgid "Use as _default"
msgstr "Ustaw _domyślną"
-#: ../midori/sokoke.c:412
+#: ../midori/sokoke.c:346
msgid "Open with"
msgstr "Otwórz za pomocą"
-#: ../midori/sokoke.c:420
+#: ../midori/sokoke.c:354
#, c-format
msgid "Choose an application or command to open \"%s\":"
msgstr "Proszę wprowadzić polecenie służące do otworzenia „%s”:"
-#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499
-#: ../midori/sokoke.c:528 ../midori/sokoke.c:542
+#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
msgid "Could not run external program."
msgstr "Nie można uruchomić zewnętrznego programu."
-#: ../midori/sokoke.c:1653
+#: ../midori/sokoke.c:1529
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -2055,7 +2160,7 @@ msgstr[0] "%d godzina"
msgstr[1] "%d godziny"
msgstr[2] "%d godzin"
-#: ../midori/sokoke.c:1654
+#: ../midori/sokoke.c:1530
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -2063,7 +2168,7 @@ msgstr[0] "%d minuta"
msgstr[1] "%d minuty"
msgstr[2] "%d minut"
-#: ../midori/sokoke.c:1655
+#: ../midori/sokoke.c:1531
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2072,67 +2177,67 @@ msgstr[1] "%d sekundy"
msgstr[2] "%d sekund"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267
+#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269
#, c-format
msgid "%s of %s"
msgstr "Pobrano %s z %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1672
+#: ../midori/sokoke.c:1548
msgid "?B"
msgstr "?B"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1675
+#: ../midori/sokoke.c:1551
#, c-format
msgid " (%s/s)"
msgstr " (%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1692
+#: ../midori/sokoke.c:1568
#, c-format
msgid " - %s remaining"
msgstr " - pozostało %s"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:264
+#: ../toolbars/midori-findbar.c:280
msgid "_Inline Find:"
msgstr "_Wyszukiwanie:"
-#: ../toolbars/midori-findbar.c:290
+#: ../toolbars/midori-findbar.c:306
msgid "Previous"
msgstr "Poprzednie"
-#: ../toolbars/midori-findbar.c:296
+#: ../toolbars/midori-findbar.c:312
msgid "Next"
msgstr "Następne"
-#: ../toolbars/midori-findbar.c:300
+#: ../toolbars/midori-findbar.c:316
msgid "Match Case"
msgstr "Uwzględnianie wielkości liter"
-#: ../toolbars/midori-findbar.c:309
+#: ../toolbars/midori-findbar.c:325
msgid "Highlight Matches"
msgstr "Wyróżnianie"
-#: ../toolbars/midori-findbar.c:320
+#: ../toolbars/midori-findbar.c:336
msgid "Close Findbar"
msgstr "Zamyka pasek wyszukiwania"
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:124
#, c-format
msgid "The file '%s ' has been downloaded."
msgstr "Pobrano plik „%s ”."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:127
msgid "Transfer completed"
msgstr "Zakończono pobieranie"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:195
msgid "The downloaded file is erroneous."
msgstr "Pobrany plik jest uszkodzony."
-#: ../toolbars/midori-transferbar.c:194
+#: ../toolbars/midori-transferbar.c:196
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2141,44 +2246,45 @@ msgstr ""
"obliczona. Oznacza to, że prawdopodobnie plik jest niekompletny lub został "
"zmodyfikowany."
-#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:339 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Wyczyść wszystko"
-#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370
+#: ../toolbars/midori-transferbar.c:376 ../toolbars/midori-transferbar.c:378
msgid "Some files are being downloaded"
msgstr "Trwa pobieranie plików"
-#: ../toolbars/midori-transferbar.c:374
+#: ../toolbars/midori-transferbar.c:382
msgid "_Quit Midori"
msgstr "Za_kończ program"
-#: ../toolbars/midori-transferbar.c:376
+#: ../toolbars/midori-transferbar.c:384
msgid "The transfers will be cancelled if Midori quits."
msgstr "Pobieranie plików zostanie anulowane wraz z zakończeniem programu."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Zakładki"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Nie udało się dodać zakładki: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Nie udało się uaktualnić zakładki: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Edytuj wybraną zakładkę"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Usuń wybraną zakładkę"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Tworzy nowy katalog zakładek"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:694 ../panels/midori-history.c:635
msgid "Separator "
msgstr "Separator "
@@ -2206,6 +2312,11 @@ msgstr[2] "%d dni temu"
msgid "A week ago"
msgstr "Tydzień temu"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Nie udało się usunąć elementu historii: %s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Czy na pewno usunąć wszystkie elementy historii?"
@@ -2222,15 +2333,15 @@ msgstr "Usuwa zaznaczony element historii"
msgid "Clear the entire history"
msgstr "Czyści całą historię"
-#: ../panels/midori-transfers.c:86
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Pobieranie plików"
-#: ../panels/midori-transfers.c:467
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
msgstr "Otwórz _katalog pobierania"
-#: ../panels/midori-transfers.c:470
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
msgstr "Skopiuj położ_enie pliku"
@@ -2270,54 +2381,54 @@ msgstr "Nie udało się wczytać standardowej ikony „%s”"
msgid "Animation frames are broken"
msgstr "Klatki animacji są uszkodzone"
-#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Właściwość „%s” jest niepoprawna dla %s"
-#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
#: ../extensions/addons.c:308
msgid "Choose file"
msgstr "Wybierz plik"
-#: ../katze/katze-utils.c:500
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Wybór katalogu"
-#: ../katze/katze-utils.c:604
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Brak"
-#: ../katze/katze-utils.c:719
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "Godzina"
-#: ../katze/katze-utils.c:720
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "Dzień"
-#: ../katze/katze-utils.c:721
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "Tydzień"
-#: ../katze/katze-utils.c:722
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "Miesiąc"
-#: ../katze/katze-utils.c:723
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "Rok"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Preferencje %s"
-#: ../extensions/adblock.c:467
+#: ../extensions/adblock.c:470
msgid "Configure Advertisement filters"
msgstr "Filtr reklam"
-#: ../extensions/adblock.c:498
+#: ../extensions/adblock.c:506
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2327,27 +2438,27 @@ msgstr ""
"„Dodaj”, aby umieścić ją na poniższej liście. Więcej list można znaleźć pod "
"adresem %s."
-#: ../extensions/adblock.c:846
+#: ../extensions/adblock.c:920
msgid "Edit rule"
msgstr "Edycja reguły"
-#: ../extensions/adblock.c:860
+#: ../extensions/adblock.c:934
msgid "_Rule:"
msgstr "_Reguła:"
-#: ../extensions/adblock.c:914
+#: ../extensions/adblock.c:988
msgid "Bl_ock image"
msgstr "Za_blokuj obraz"
-#: ../extensions/adblock.c:919
+#: ../extensions/adblock.c:993
msgid "Bl_ock link"
msgstr "Za_blokuj odnośnik"
-#: ../extensions/adblock.c:1620
+#: ../extensions/adblock.c:1692
msgid "Advertisement blocker"
msgstr "Filtr reklam"
-#: ../extensions/adblock.c:1621
+#: ../extensions/adblock.c:1693
msgid "Block advertisements according to a filter list"
msgstr "Blokuje wyświetlanie treści według określonych filtrów"
@@ -2373,63 +2484,63 @@ msgstr "_Zainstaluj styl"
msgid "Don't install"
msgstr "Nie instaluj"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:677
msgid "Userscripts"
msgstr "Skrypty użytkownika"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:679
msgid "Userstyles"
msgstr "Style użytkownika"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Błąd"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Usunąć „%s”?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
msgid "Delete user script"
msgstr "Usuwa skrypt użytkownika"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
msgid "Delete user style"
msgstr "Usuwa styl użytkownika"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Plik „%s ” zostanie usunięty."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:566 ../extensions/addons.c:643
msgid "Open in Text Editor"
msgstr "Otwiera w edytorze tekstu"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:568 ../extensions/addons.c:652
msgid "Open Target Folder"
msgstr "Otwiera katalog docelowy"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:634
msgid "Add new addon"
msgstr "Dodaje nowy dodatek"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:660
msgid "Remove selected addon"
msgstr "Usuwa zaznaczony dodatek"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
msgid "User addons"
msgstr "Dodatki użytkownika"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1819
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Nie można obserwować katalogu „%s”: %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1908
msgid "Support for userscripts and userstyles"
msgstr "Obsługuje własne skrypty i style"
@@ -2516,23 +2627,23 @@ msgstr ""
"Domena : %s\n"
"Ilość ciasteczek : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1021
msgid "Name"
msgstr "Nazwa:"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1072
msgid "_Expand All"
msgstr "_Rozwiń wszystko"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1080
msgid "_Collapse All"
msgstr "_Zwiń wszystko"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
+#: ../extensions/cookie-manager/cookie-manager-page.c:1134
msgid "Filter:"
msgstr "Filtr:"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
+#: ../extensions/cookie-manager/cookie-manager-page.c:1139
msgid ""
"Enter a filter string to show only cookies whose name or domain field match "
"the entered filter"
@@ -2686,10 +2797,10 @@ msgid "Failed to execute database statement: %s\n"
msgstr "Nie udało się wykonać zapytania bazy danych: %s\n"
#: ../extensions/formhistory/formhistory.c:629
-#, fuzzy
msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
msgstr ""
-"Wyświetlanie historii pól formularzy tylko po wciśnięciu skrótu klawiszowego"
+"Wyświetlanie historii pól formularzy na bieżącej karcie,\n"
+"tylko po wciśnięciu skrótu klawiszowego (Ctrl+Shift+F) "
#: ../extensions/formhistory/formhistory.c:668
msgid "Form history filler"
@@ -2701,9 +2812,9 @@ msgstr "Przechowuje historię uzupełnionych pól formularzy"
#: ../extensions/formhistory/formhistory-gdom-frontend.c:225
#: ../extensions/formhistory/formhistory-js-frontend.c:106
-#, fuzzy, c-format
+#, c-format
msgid "Failed to select suggestions\n"
-msgstr "Nie udało się wybrać z historii\n"
+msgstr "Nie udało się wybrać sugestii\n"
#: ../extensions/history-list.vala:197
msgid "There are no unvisited tabs"
@@ -2756,7 +2867,7 @@ msgstr "Wyświetl kartę w tle (Lista historii)"
#: ../extensions/history-list.vala:444
msgid "Display the current selected tab in background"
-msgstr "Wyświetl aktualną kartę w tle"
+msgstr "Wyświetl aktualnie wybraną kartę w tle"
#: ../extensions/history-list.vala:569
msgid "History List"
@@ -2777,7 +2888,7 @@ msgstr "Umożliwia kontrolowanie przeglądarki za pomocą gestów myszy"
#: ../extensions/shortcuts.c:109
msgid "Reload page or stop loading"
-msgstr "Odśwież lub zatrzymaj wczytywanie"
+msgstr "Wczytaj ponownie lub zatrzymaj wczytywanie"
#: ../extensions/shortcuts.c:176
msgid "Customize Keyboard shortcuts"
@@ -2803,36 +2914,36 @@ msgstr "Zegar paska stanu"
msgid "Display date and time in the statusbar"
msgstr "Wyświetla datę i czas na pasku stanu"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Obrazy"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Skrypty użytkownika"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Wtyczki Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Dodatki paska stanu"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr ""
"Umożliwia przełączanie wczytywania i wykonywania określonych elementów stron"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Panel kart"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "Panel _kart"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Wyświetla karty w panelu bocznym"
@@ -2844,11 +2955,11 @@ msgstr "Ikony kart"
msgid "New tabs have no label by default"
msgstr "Ukrywa etykiety nowo otwieranych kart"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:390
msgid "Customize Toolbar"
msgstr "Modyfikowanie paska narzędziowego"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:406
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2857,27 +2968,23 @@ msgstr ""
"Kolejność elementów można zmieniać przeciągając je na odpowiednie pozycje "
"listy."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:422
msgid "Available Items"
msgstr "Dostępne elementy"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:443
msgid "Displayed Items"
msgstr "Wyświetlane elementy"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
+#: ../extensions/toolbar-editor.c:583
+msgid "_Customize Toolbar…"
msgstr "Dostosuj pasek _narzędziowy..."
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Dostosuj..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:612
msgid "Toolbar Editor"
msgstr "Edytor paska narzędziowego"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:613
msgid "Easily edit the toolbar layout"
msgstr "Umożliwia modyfikację układu paska narzędziowego"
@@ -2885,6 +2992,36 @@ msgstr "Umożliwia modyfikację układu paska narzędziowego"
msgid "Cache HTTP communication on disk"
msgstr "Przechowuje dane komunikacji HTTP na dysku"
+#~ msgid "_Bookmark"
+#~ msgstr "_Zakładka"
+
+#~ msgid "_Console"
+#~ msgstr "_Konsola"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Zamknij pozo_stałe karty"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Ikona:"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Katalog główny"
+
+#~ msgid "_Title:"
+#~ msgstr "_Tytuł:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Katalog:"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Dostosuj…"
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Nie można zapisać zakładek. %s"
+
+#~ msgid "The specified configuration folder is invalid."
+#~ msgstr "Podany katalog konfiguracyjny jest niepoprawny"
+
#~ msgid "Lightweight web browser"
#~ msgstr "Umożliwia przeglądanie zawartości sieci internetowej"
@@ -2985,13 +3122,13 @@ msgstr "Przechowuje dane komunikacji HTTP na dysku"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Tworzy nowy katalog zakładek"
-#~ msgid "Add, edit and remove search engines..."
+#~ msgid "Add, edit and remove search engines…"
#~ msgstr "Zarządza wyszukiwarkami internetowymi"
-#~ msgid "Clear private data..."
-#~ msgstr "Usuwa prywatne dane zapisane przez program..."
+#~ msgid "Clear private data…"
+#~ msgstr "Usuwa prywatne dane zapisane przez program…"
-#~ msgid "Inspect page details and access developer tools..."
+#~ msgid "Inspect page details and access developer tools…"
#~ msgstr ""
#~ "Umożliwia analizowanie szczegółów strony i udostępnia narzędzia "
#~ "programistyczne"
@@ -3077,8 +3214,8 @@ msgstr "Przechowuje dane komunikacji HTTP na dysku"
#~ msgid "Reset the last _session"
#~ msgstr "Nie przywracaj ostatniej _sesji"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Skonfiguruj filtr _reklam..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Skonfiguruj filtr _reklam…"
#~ msgid "Not found - %s"
#~ msgstr "Nie znaleziono - %s"
@@ -3388,9 +3525,6 @@ msgstr "Przechowuje dane komunikacji HTTP na dysku"
#~ msgid "Encoding"
#~ msgstr "Kodowanie znaków"
-#~ msgid "User_styles"
-#~ msgstr "_Style użytkownika"
-
#~ msgid "Enable"
#~ msgstr "Skrypty użytkownika"
@@ -3404,7 +3538,7 @@ msgstr "Przechowuje dane komunikacji HTTP na dysku"
#~ msgstr "Adresy URI"
#~ msgid "[URIs]"
-#~ msgstr "[ADRES URI...]"
+#~ msgstr "[ADRES URI…]"
#~ msgid "_URL:"
#~ msgstr "_URL:"
diff --git a/po/pt.po b/po/pt.po
index 996ef859..71e4fa4e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: midori\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-22 08:33+0000\n"
+"POT-Creation-Date: 2012-09-19 11:45+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: Sérgio Marques \n"
"Language-Team: Portuguese\n"
@@ -27,12 +27,28 @@ msgstr "Navegar na web"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorador"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1921 ../midori/main.c:1936
+#: ../midori/main.c:1949 ../midori/midori-websettings.c:200
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Navegador web Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Nova janela de navegação privada"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1326
+msgid "New Tab"
+msgstr "Novo separador"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1323
+msgid "New Window"
+msgstr "Nova janela"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Navegador Web"
@@ -44,82 +60,87 @@ msgstr "Midori (Navegação privada)"
msgid "Open a new private browsing window"
msgstr "Abrir nova janela de navegação privada"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4307
msgid "Private Browsing"
msgstr "Navegação privada"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:84 ../midori/main.c:90
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "A configuração não foi carregada: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:138
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "O valor \"%s\" é inválido para %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:143 ../midori/main.c:247
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "O valor de configuração \"%s\" é inválido "
-#: ../midori/main.c:380
+#: ../midori/main.c:357
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Os motores de pesquisa não foram carregados. %s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:411
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Falha ao apagar o histórico: %s\n"
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:433 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Falha ao abrir a base de dados: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:505
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Falha ao remover histórico mais antigo: %s\n"
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Falha ao remover histórico: %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Os marcadores não foram gravados. %s"
-
-#: ../midori/main.c:633
+#: ../midori/main.c:527
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "A configuração não foi gravada. %s"
-#: ../midori/main.c:668
+#: ../midori/main.c:553
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Os motores de pesquisa não foram gravados. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:590
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "O lixo não foi gravado. %s"
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
+#: ../midori/main.c:663 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Extensões"
-#: ../midori/main.c:760
+#: ../midori/main.c:677
msgid "Privacy"
msgstr "Privacidade"
-#: ../midori/main.c:772
+#: ../midori/main.c:679
+msgid "Delete old Cookies after:"
+msgstr "Apagar cookies após:"
+
+#: ../midori/main.c:681 ../midori/main.c:684
+msgid "The maximum number of days to save cookies for"
+msgstr "O número máximo de dias para guardar os cookies"
+
+#: ../midori/main.c:688
+msgid "Only accept Cookies from sites you visit"
+msgstr "Aceitar cookies dos sítios que eu visitar"
+
+#: ../midori/main.c:689
+msgid "Block cookies sent by third-party websites"
+msgstr "Bloquear cookies de sítios de terceiros"
+
+#: ../midori/main.c:694
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -127,18 +148,44 @@ msgstr ""
"Os \"cookies\" guardam dados ou perfis de utilizador para publicitar "
"produtos."
-#: ../midori/main.c:828
+#: ../midori/main.c:701
+msgid "Enable offline web application cache"
+msgstr "Ativar \"cache\" de aplicações web \"offline\""
+
+#: ../midori/main.c:704
+msgid "Enable HTML5 local storage support"
+msgstr "Ativar suporte a armazenagem local HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/main.c:708
+msgid "Strip referrer details sent to websites"
+msgstr "Detalhes enviados para sítios externos"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/main.c:710
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Se o cabeçalho \"Referer\" deve ser abreviado no nome do servidor"
+
+#: ../midori/main.c:713
+msgid "Delete pages from history after:"
+msgstr "Apagar páginas no histórico após:"
+
+#: ../midori/main.c:715 ../midori/main.c:718
+msgid "The maximum number of days to save the history for"
+msgstr "O número máximo de dias para guardar o histórico"
+
+#: ../midori/main.c:759
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "A sessão não foi gravada. %s"
-#: ../midori/main.c:1046
+#: ../midori/main.c:981
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Nenhum certificado disponível. Os certificados SSL não podem ser verificados."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1076
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."
@@ -146,228 +193,237 @@ msgstr ""
"O Midori encerrou inesperadamente na última vez que foi aberto. Se isto "
"ocorrer novamente, tente uma das seguintes opções para resolver o problema."
-#: ../midori/main.c:1134
+#: ../midori/main.c:1095
msgid "Modify _preferences"
msgstr "Modificar _preferências"
-#: ../midori/main.c:1138
+#: ../midori/main.c:1099
msgid "Disable all _extensions"
msgstr "Desativar todas as _extensões"
-#: ../midori/main.c:1151
+#: ../midori/main.c:1108
+msgid "Show a dialog after Midori crashed"
+msgstr "Mostrar a janela após o encerramento do Midori"
+
+#: ../midori/main.c:1113
msgid "Discard old tabs"
msgstr "Rejeitar separadores antigos"
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1114 ../midori/midori-websettings.c:108
msgid "Show last tabs without loading"
msgstr "Mostrar últimos separadores sem os carregar"
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1115 ../midori/midori-websettings.c:107
msgid "Show last open tabs"
msgstr "Mostrar últimos separadores abertos"
-#: ../midori/main.c:1400 ../midori/main.c:2464
+#: ../midori/main.c:1362 ../midori/main.c:2377
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "A sessão não foi carregada: %s\n"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1500
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Captura gravada em: %s\n"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1836
msgid "Run ADDRESS as a web application"
msgstr "Executar ENDEREÇO como aplicação web"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1836
msgid "ADDRESS"
msgstr "ENDEREÇO"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1839
msgid "Use FOLDER as configuration folder"
msgstr "Usar PASTA como pasta de configuração"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1839
msgid "FOLDER"
msgstr "PASTA"
-#: ../midori/main.c:1957
+#: ../midori/main.c:1842
msgid "Private browsing, no changes are saved"
msgstr "Navegação privada, as alterações não são gravadas"
-#: ../midori/main.c:1959
+#: ../midori/main.c:1845
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Modo portátil em que todas as rotinas são guardadas num só local"
+
+#: ../midori/main.c:1848
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Janela GTK+ com WebKit, similar ao GtkLauncher"
+
+#: ../midori/main.c:1850
msgid "Show a diagnostic dialog"
msgstr "Mostrar janela de diagnóstico"
-#: ../midori/main.c:1961
+#: ../midori/main.c:1852
msgid "Run the specified filename as javascript"
msgstr "Executar o ficheiro como \"javascript\""
-#: ../midori/main.c:1963
+#: ../midori/main.c:1854
msgid "Take a snapshot of the specified URI"
msgstr "Obter uma captura da URI especificada"
-#: ../midori/main.c:1965
+#: ../midori/main.c:1856
msgid "Execute the specified command"
msgstr "Executar o comando especificado"
-#: ../midori/main.c:1967
+#: ../midori/main.c:1858
msgid "List available commands to execute with -e/ --execute"
msgstr "Lista dos comandos disponíveis para executar com -e/ --execute"
-#: ../midori/main.c:1969
+#: ../midori/main.c:1860
msgid "Display program version"
msgstr "Exibir versão do programa"
-#: ../midori/main.c:1971
+#: ../midori/main.c:1862
msgid "Addresses"
msgstr "Endereços "
-#: ../midori/main.c:1973
+#: ../midori/main.c:1864
msgid "Block URIs according to regular expression PATTERN"
msgstr "Bloquear URIs conforme a expressão PADRÃO"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1864
msgid "PATTERN"
msgstr "PADRÃO"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:1868
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Repor Midori após SEGUNDOS segundos de inatividade"
-#: ../midori/main.c:1977
+#: ../midori/main.c:1868
msgid "SECONDS"
msgstr "SEGUNDOS"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1871
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Avisos de reencaminhamento para o NOMEDEFICHEIRO especificado"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1871
msgid "FILENAME"
msgstr "NOMEDEFICHEIRO"
-#: ../midori/main.c:2045
-msgid "[Addresses]"
-msgstr "[Endereços]"
-
-#: ../midori/main.c:2087
+#: ../midori/main.c:1950
msgid "Please report comments, suggestions and bugs to:"
msgstr "Por favor reporte comentários, sugestões e erros em:"
-#: ../midori/main.c:2089
+#: ../midori/main.c:1952
msgid "Check for new versions at:"
msgstr "Verificar por novas versões a:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
+#: ../midori/main.c:2091
msgid "Saved logins and _passwords"
msgstr "Autenticações e sen_has gravadas"
-#: ../midori/main.c:2175
+#: ../midori/main.c:2093
msgid "Cookies and Website data"
msgstr "Cookies e dados da página web"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
+#: ../midori/main.c:2097 ../midori/midori-preferences.c:508
+#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470
msgid "Web Cache"
msgstr "\"Web cache\""
-#: ../midori/main.c:2182
+#: ../midori/main.c:2100
msgid "Website icons"
msgstr "Ícones de sítios web"
-#: ../midori/main.c:2288
+#: ../midori/main.c:2210
msgid "An unknown error occured"
msgstr "Ocorreu um erro desconhecido"
-#: ../midori/main.c:2395
+#: ../midori/main.c:2325
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Já está ativa uma instância de Midori mas que não está a responder.\n"
-#: ../midori/main.c:2431
+#: ../midori/main.c:2359
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Os marcadores não foram carregados: %s\n"
-#: ../midori/main.c:2479
+#: ../midori/main.c:2392
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "O lixo não foi carregado: %s\n"
-#: ../midori/main.c:2492
+#: ../midori/main.c:2405
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "O histórico não foi carregado: %s\n"
-#: ../midori/main.c:2508
+#: ../midori/main.c:2420
msgid "The following errors occured:"
msgstr "Ocorreram os seguintes erros:"
-#: ../midori/main.c:2524
+#: ../midori/main.c:2436
msgid "_Ignore"
msgstr "_Ignorar "
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "_Marcador"
+#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:534
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Ação inesperada \"%s\"."
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060
+#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6251
msgid "_Bookmarks"
msgstr "_Marcadores"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1373
msgid "Add Boo_kmark"
msgstr "Adicionar mar_cador"
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_Consola"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1374
msgid "_Extensions"
msgstr "_Extensões"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589
+#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4700
msgid "_History"
msgstr "_Histórico"
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "_Página inicial"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1376
msgid "_Userscripts"
msgstr "\"Scripts\" de _utilizador"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1377
+msgid "User_styles"
+msgstr "Estilo_s de utilizador"
+
+#: ../midori/midori-app.c:1378
msgid "New _Tab"
msgstr "No_vo separador"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1379
msgid "_Transfers"
msgstr "_Transferências"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1380
msgid "Netscape p_lugins"
msgstr "\"P_lug-ins\" Netscape"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1381
msgid "_Closed Tabs"
msgstr "Separadores _fechados"
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216
+#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5387
msgid "New _Window"
msgstr "_Nova janela"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1383
msgid "New _Folder"
msgstr "Nova _pasta"
+#: ../midori/midori-app.c:1437
+msgid "[Addresses]"
+msgstr "[Endereços]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Ficheiro não encontrado."
@@ -385,140 +441,113 @@ msgstr "Formato de marcadores não reconhecido."
msgid "Writing failed."
msgstr "Falha ao escrever."
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:347 ../midori/midori-browser.c:5526
+msgid "Go forward to the next page"
+msgstr "Ir para a página seguinte"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:354 ../midori/midori-browser.c:5534
+#: ../midori/midori-browser.c:5537
+msgid "Go to the next sub-page"
+msgstr "Ir para a sub-página seguinte"
+
+#: ../midori/midori-browser.c:441 ../midori/midori-browser.c:5475
+#: ../midori/midori-browser.c:5484
msgid "Reload the current page"
msgstr "Recarregar página atual"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5481
msgid "Stop loading the current page"
msgstr "Parar de carregar da página atual"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:519
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Falha ao atualizar título: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Ação inesperada \"%s\"."
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:614
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Navegação privada)"
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "Pasta superior"
+#: ../midori/midori-browser.c:724 ../midori/midori-browser.c:766
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Marcadores"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:826
msgid "New folder"
msgstr "Nova pasta"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:826
msgid "Edit folder"
msgstr "Editar pasta"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:828
msgid "New bookmark"
msgstr "Novo marcador"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:828
msgid "Edit bookmark"
msgstr "Editar marcador"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Título:"
+#: ../midori/midori-browser.c:862
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Escolha o nome e o local para este marcador."
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Endereço:"
-
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326
-msgid "_Folder:"
-msgstr "_Pasta:"
-
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:923
msgid "Add to _Speed Dial"
msgstr "Adicionar à _ligação rápida"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:929
msgid "Show in the tool_bar"
msgstr "Mostrar na _barra de ferramentas"
-#: ../midori/midori-browser.c:905
+#: ../midori/midori-browser.c:937
msgid "Run as _web application"
msgstr "Executar como aplicação _web"
-#: ../midori/midori-browser.c:976
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "O ficheiro \"%s\" não pode ser gravado nesta pasta."
-
-#: ../midori/midori-browser.c:978
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "Não tem permissão para escrever nesta localização."
-
-#: ../midori/midori-browser.c:985
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "Não possui espaço suficiente para transferir \"%s\"."
-
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "Precisa de %s e apenas tem livre %s."
-
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4504
msgid "Save file as"
msgstr "Gravar como"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Nova janela"
+#: ../midori/midori-browser.c:1065
+msgid "Save associated _resources"
+msgstr "Gravar _recursos associados"
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1323
msgid "A new window has been opened"
msgstr "Foi aberta uma nova janela"
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Novo separador"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1326
msgid "A new tab has been opened"
msgstr "Foi aberto um novo separador"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1343
msgid "Error opening the image!"
msgstr "Ocorreu um erro ao abrir a imagem!"
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1344
msgid "Can not open selected image in a default viewer."
msgstr "Não é possível abrir a imagem no visualizador de imagens."
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1350
msgid "Error downloading the image!"
msgstr "Ocorreu um erro ao transferir a imagem!"
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1351
msgid "Can not download selected image."
msgstr "não é possível transferir a imagem."
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1408
msgid "Save file"
msgstr "Gravar ficheiro"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2335
msgid "Open file"
msgstr "Abrir ficheiro"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2467
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -532,139 +561,155 @@ msgstr ""
"notícias. Da próxima vez que clicar no ícone de fontes, esta será "
"automaticamente adicionada."
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2473 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Nova fonte"
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2516 ../midori/midori-browser.c:5550
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Adicionar novo marcador"
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3060 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Vazio"
-#: ../midori/midori-browser.c:3467
+#: ../midori/midori-browser.c:3506 ../midori/midori-browser.c:3507
msgid "Toggle text cursor navigation"
msgstr "Alternar navegação de cursor de texto"
-#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753
+#: ../midori/midori-browser.c:3509
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Se premir F7 alterna a navegação com cursor. Se ativa, surgirá um cursor de "
+"texto em todas as páginas web."
+
+#: ../midori/midori-browser.c:3512
+msgid "_Enable Caret Browsing"
+msgstr "Ativar nav_egação por cursor"
+
+#: ../midori/midori-browser.c:3904 ../midori/midori-browser.c:5944
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Falha ao inserir novo item no histórico: %s\n"
-#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Abrir todos em _separadores"
-#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Abrir em novo _separador"
-#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657
-#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2904
+#: ../midori/midori-view.c:4880 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Abrir em nova _janela"
-#: ../midori/midori-browser.c:4213
+#: ../midori/midori-browser.c:4329
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4214
+#: ../midori/midori-browser.c:4330
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4331
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4332
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4333
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4334
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4239
-msgid "Import bookmarks..."
-msgstr "Importar marcadores..."
+#: ../midori/midori-browser.c:4335
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:4356
+msgid "Import bookmarks…"
+msgstr "Importar marcadores…"
+
+#: ../midori/midori-browser.c:4359 ../midori/midori-browser.c:5555
msgid "_Import bookmarks"
msgstr "_Importar marcadores"
-#: ../midori/midori-browser.c:4253
+#: ../midori/midori-browser.c:4370
msgid "_Application:"
msgstr "_Aplicação:"
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4435
msgid "Import from XBEL or HTML file"
msgstr "Importar de XBEL ou HTML"
-#: ../midori/midori-browser.c:4353
+#: ../midori/midori-browser.c:4463
msgid "Import from a file"
msgstr "Importar de um ficheiro"
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4475
msgid "Failed to import bookmarks"
msgstr "Falha ao importar marcadores"
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4509
msgid "XBEL Bookmarks"
msgstr "Marcadores XBEL"
-#: ../midori/midori-browser.c:4405
+#: ../midori/midori-browser.c:4514
msgid "Netscape Bookmarks"
msgstr "Marcadores Netscape"
-#: ../midori/midori-browser.c:4419
+#: ../midori/midori-browser.c:4528
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "O Midori só consegue exportar para XBEL (*.xbel) e Netscape (*.html)"
-#: ../midori/midori-browser.c:4434
+#: ../midori/midori-browser.c:4543
msgid "Failed to export bookmarks"
msgstr "Falha ao exportar marcadores"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4556
+#: ../midori/midori-browser.c:4665
msgid "Clear Private Data"
msgstr "Limpar dados privados"
-#: ../midori/midori-browser.c:4560
+#: ../midori/midori-browser.c:4669
msgid "_Clear private data"
msgstr "_Limpar dados privados"
-#: ../midori/midori-browser.c:4573
+#: ../midori/midori-browser.c:4684
msgid "Clear the following data:"
msgstr "Limpar os seguintes dados:"
-#: ../midori/midori-browser.c:4583
+#: ../midori/midori-browser.c:4694
msgid "Last open _tabs"
msgstr "Úl_timos separadores abertos"
-#: ../midori/midori-browser.c:4609
+#: ../midori/midori-browser.c:4720
msgid "Clear private data when _quitting Midori"
msgstr "Limpar dados privados ao _sair do Midori"
-#: ../midori/midori-browser.c:4804
+#: ../midori/midori-browser.c:4935
msgid "A lightweight web browser."
msgstr "Um navegador web rápido."
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:4936
msgid "See about:version for version info."
msgstr "Veja about:version para informações da versão."
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:4938
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -676,1438 +721,916 @@ msgstr ""
"Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente "
"(por opção)."
-#: ../midori/midori-browser.c:4828
+#: ../midori/midori-browser.c:4968
msgid "translator-credits"
msgstr "Sérgio Marques "
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5385
msgid "_File"
msgstr "_Ficheiro"
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5388
msgid "Open a new window"
msgstr "Abrir nova janela"
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5391
msgid "Open a new tab"
msgstr "Abrir novo separador"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5393
msgid "New P_rivate Browsing Window"
msgstr "Nova janela de navegação p_rivada"
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5397
msgid "Open a file"
msgstr "Abrir ficheiro"
-#: ../midori/midori-browser.c:5228
-msgid "_Save Page As..."
+#: ../midori/midori-browser.c:5399
+msgid "_Save Page As…"
msgstr "_Gravar página como"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5400
msgid "Save to a file"
msgstr "Gravar para ficheiro"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5402
msgid "Add to Speed _dial"
msgstr "Adicionar à ligação rápi_da"
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5406
msgid "Add Shortcut to the _desktop"
msgstr "A_dicionar atalho ao ambiente de trabalho"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5408
msgid "Create _Launcher"
msgstr "Criar lança_dor"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5412
msgid "Subscribe to News _feed"
msgstr "Subscrever _fonte de notícias"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5418
msgid "_Close Tab"
msgstr "_Fechar separador"
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5419
msgid "Close the current tab"
msgstr "Fechar o separador atual"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5421
msgid "C_lose Window"
msgstr "Fec_har janela"
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5425
+msgid "_Share"
+msgstr "_Partilhar"
+
+#: ../midori/midori-browser.c:5430
msgid "Print the current page"
msgstr "Imprimir a página atual"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5433
msgid "Close a_ll Windows"
msgstr "Fechar todas as jane_las"
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5436
msgid "_Edit"
msgstr "_Editar"
-#: ../midori/midori-browser.c:5282
-msgid "_Find..."
-msgstr "_Localizar..."
+#: ../midori/midori-browser.c:5459
+msgid "_Find…"
+msgstr "_Localizar…"
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5460
msgid "Find a word or phrase in the page"
msgstr "Localizar palavra ou frase na página"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5462
msgid "Find _Next"
msgstr "Localizar seg_uinte"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5465
msgid "Find _Previous"
msgstr "Localizar _anterior"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5469
msgid "Configure the application preferences"
msgstr "Configurar preferências da aplicação"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5471
msgid "_View"
msgstr "_Ver"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5472
msgid "_Toolbars"
msgstr "_Barra de ferramentas"
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5477
msgid "Reload page without caching"
msgstr "Recarregar página sem colocar em cache"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5487
msgid "Increase the zoom level"
msgstr "Aumentar a ampliação"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5490
msgid "Decrease the zoom level"
msgstr "Diminuir a ampliação"
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5494
msgid "_Encoding"
msgstr "_Codificação"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5496
msgid "View So_urce"
msgstr "Ver código f_onte"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5499
msgid "Ca_ret Browsing"
msgstr "Navegação ca_ret"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5503
msgid "Toggle fullscreen view"
msgstr "Alternar para ecrã completo"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5505
msgid "Scroll _Left"
msgstr "Deslocar à _esquerda"
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5508
msgid "Scroll _Down"
msgstr "Deslocar para _baixo"
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5511
msgid "Scroll _Up"
msgstr "Deslocar para _cima"
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5514
msgid "Scroll _Right"
msgstr "Deslocar à _direita"
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5517
+msgid "_Readable"
+msgstr "Pode se_r lido"
+
+#: ../midori/midori-browser.c:5520
msgid "_Go"
msgstr "_Ir"
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5523
msgid "Go back to the previous page"
msgstr "Ir para a página anterior"
-#: ../midori/midori-browser.c:5346
-msgid "Go forward to the next page"
-msgstr "Ir para a página seguinte"
-
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5530
msgid "Go to the previous sub-page"
msgstr "Ir para a sub-página anterior"
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5354
-msgid "Go to the next sub-page"
-msgstr "Ir para a sub-página seguinte"
+#: ../midori/midori-browser.c:5539
+msgid "_Homepage"
+msgstr "_Página inicial"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5540
msgid "Go to your homepage"
msgstr "Ir para a página inicial"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5542
msgid "Empty Trash"
msgstr "Esvaziar lixo"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5545
msgid "Undo _Close Tab"
msgstr "Anular _fecho de separadores"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5552
msgid "Add a new _folder"
msgstr "Adicionar _nova pasta"
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5558
msgid "_Export bookmarks"
msgstr "_Exportar marcadores"
-#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5561 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "_Gerir motores de pesquisa"
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5564
msgid "_Clear Private Data"
msgstr "_Limpar dados privados"
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5567
msgid "_Inspect Page"
msgstr "_Inspecionar página"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5571
msgid "_Previous Tab"
msgstr "Separador _anterior"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5574
msgid "_Next Tab"
msgstr "Separador _seguinte"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5576
msgid "Move Tab _Backward"
msgstr "M_over separador para trás"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5578
msgid "_Move Tab Forward"
msgstr "_Mover separador para a frente"
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5581
msgid "Focus _Current Tab"
msgstr "_Focar o separador atual"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5584
msgid "Focus _Next view"
msgstr "Focar visualização segui_nte"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5587
msgid "Only show the Icon of the _Current Tab"
msgstr "Apenas mostrar o ícone do separador _atual"
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5590
msgid "_Duplicate Current Tab"
msgstr "_Duplicar o separador atual"
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5593
msgid "Close Ot_her Tabs"
msgstr "Fec_har os outros separadores"
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5596
msgid "Open last _session"
msgstr "Abrir últi_ma sessão"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5599
msgid "_Help"
msgstr "_Ajuda"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5601
msgid "_Frequent Questions"
msgstr "_Questões frequentes"
-#: ../midori/midori-browser.c:5421
-msgid "_Report a Problem..."
-msgstr "_Reportar um problema..."
+#: ../midori/midori-browser.c:5604
+msgid "_Report a Problem…"
+msgstr "_Reportar um problema…"
-#: ../midori/midori-browser.c:5433
-msgid "_Menubar"
-msgstr "Barra de _menu"
-
-#: ../midori/midori-browser.c:5437
-msgid "_Navigationbar"
-msgstr "Barra de _navegação"
-
-#: ../midori/midori-browser.c:5441
-msgid "Side_panel"
-msgstr "Painel _lateral"
-
-#: ../midori/midori-browser.c:5442
-msgid "Sidepanel"
-msgstr "Painel lateral"
-
-#: ../midori/midori-browser.c:5445
-msgid "_Bookmarkbar"
-msgstr "_Barra de marcadores"
-
-#: ../midori/midori-browser.c:5449
-msgid "_Statusbar"
-msgstr "Barra de _estado"
-
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311
-msgid "_Automatic"
-msgstr "_Automático"
-
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "Chinês (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5465
-msgid "Japanese (SHIFT__JIS)"
-msgstr "Japonês (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238
-msgid "Korean (EUC-KR)"
-msgstr "Coreano (EUC-KR)"
-
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239
-msgid "Russian (KOI8-R)"
-msgstr "Russo (KOI8-R)"
-
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241
-msgid "Western (ISO-8859-1)"
-msgstr "Ocidental (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242
-#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Personalizado..."
-
-#: ../midori/midori-browser.c:5985
-msgid "_Separator"
-msgstr "_Separador"
-
-#: ../midori/midori-browser.c:5992
-msgid "_Location..."
-msgstr "_Localização..."
-
-#: ../midori/midori-browser.c:5994
-msgid "Open a particular location"
-msgstr "Abrir localização específica"
-
-#: ../midori/midori-browser.c:6016
-msgid "_Web Search..."
-msgstr "Pesquisa _web..."
-
-#: ../midori/midori-browser.c:6018
-msgid "Run a web search"
-msgstr "Executar uma pesquisa web"
-
-#: ../midori/midori-browser.c:6045
-msgid "Reopen a previously closed tab or window"
-msgstr "Reabrir janela ou separador anteriormente fechado"
-
-#: ../midori/midori-browser.c:6062
-msgid "Show the saved bookmarks"
-msgstr "Mostrar marcadores gravados"
-
-#: ../midori/midori-browser.c:6079
+#: ../midori/midori-browser.c:5609 ../midori/midori-browser.c:6270
msgid "_Tools"
msgstr "Ferramen_tas"
-#: ../midori/midori-browser.c:6095
+#: ../midori/midori-browser.c:5616
+msgid "_Menubar"
+msgstr "Barra de _menu"
+
+#: ../midori/midori-browser.c:5620
+msgid "_Navigationbar"
+msgstr "Barra de _navegação"
+
+#: ../midori/midori-browser.c:5624
+msgid "Side_panel"
+msgstr "Painel _lateral"
+
+#: ../midori/midori-browser.c:5625
+msgid "Sidepanel"
+msgstr "Painel lateral"
+
+#: ../midori/midori-browser.c:5628
+msgid "_Bookmarkbar"
+msgstr "_Barra de marcadores"
+
+#: ../midori/midori-browser.c:5632
+msgid "_Statusbar"
+msgstr "Barra de _estado"
+
+#: ../midori/midori-browser.c:5641 ../midori/midori-websettings.c:199
+msgid "_Automatic"
+msgstr "_Automático"
+
+#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:123
+msgid "Chinese Traditional (BIG5)"
+msgstr "Mandarim tradicional (BIG5)"
+
+#: ../midori/midori-browser.c:5647 ../midori/midori-websettings.c:124
+msgid "Chinese Simplified (GB18030)"
+msgstr "mandarim simplificado (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5651
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japonês (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:126
+msgid "Korean (EUC-KR)"
+msgstr "Coreano (EUC-KR)"
+
+#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:127
+msgid "Russian (KOI8-R)"
+msgstr "Russo (KOI8-R)"
+
+#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:128
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5663 ../midori/midori-websettings.c:129
+msgid "Western (ISO-8859-1)"
+msgstr "Ocidental (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5666
+msgid "Custom…"
+msgstr "Personalizado…"
+
+#: ../midori/midori-browser.c:6176
+msgid "_Separator"
+msgstr "_Separador"
+
+#: ../midori/midori-browser.c:6183
+msgid "_Location…"
+msgstr "_Localização…"
+
+#: ../midori/midori-browser.c:6185
+msgid "Open a particular location"
+msgstr "Abrir localização específica"
+
+#: ../midori/midori-browser.c:6207
+msgid "_Web Search…"
+msgstr "Pesquisa _web…"
+
+#: ../midori/midori-browser.c:6209
+msgid "Run a web search"
+msgstr "Executar uma pesquisa web"
+
+#: ../midori/midori-browser.c:6236
+msgid "Reopen a previously closed tab or window"
+msgstr "Reabrir janela ou separador anteriormente fechado"
+
+#: ../midori/midori-browser.c:6253
+msgid "Show the saved bookmarks"
+msgstr "Mostrar marcadores gravados"
+
+#: ../midori/midori-browser.c:6286
msgid "_Window"
msgstr "_Janela"
-#: ../midori/midori-browser.c:6097
+#: ../midori/midori-browser.c:6288
msgid "Show a list of all open tabs"
msgstr "Mostrar lista de separadores abertos"
-#: ../midori/midori-browser.c:6111
+#: ../midori/midori-browser.c:6302
msgid "_Menu"
msgstr "_Menu"
-#: ../midori/midori-browser.c:6113
+#: ../midori/midori-browser.c:6304
msgid "Menu"
msgstr "Menu"
-#: ../midori/midori-browser.c:6927
+#: ../midori/midori-browser.c:7134
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Definição inesperada \"%s\""
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:330
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "A configuração da extensão \"%s\" não foi carregada: %s\n"
-#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
-#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:752 ../midori/midori-extension.c:849
+#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058
+#: ../extensions/addons.c:1686
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "A configuração da extensão \"%s\" não foi gravada: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "Pesquisar com %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Pesquisar _com..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "Pesquisar _com…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "Falha ao selecionar do histórico\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "Pesquisar por %s"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "Exportar certificado"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "A autoridade de certificação não é conhecida."
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"O certificado não coincide com a identidade do sítio para o qual foi obtido."
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "A data e hora de ativação do certificado é no futuro."
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "O certificado expirou."
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"O certificado foi revogado de acordo com a lista de revogações "
+"GTlsConnection's."
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "O algoritmo do certificado não é seguro."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "Ocorreram alguns erros ao validar o certificado."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "_Exportar certificado"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "Autoassinado"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "Detalhes de segurança"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "Cola_r e prosseguir"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "Não verificada"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "Ligação verificada e encriptada"
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1989
msgid "Open, unencrypted connection"
msgstr "Ligação aberta e não codificada"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Alinhar painel lateral à direita"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Fechar painel"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Alinhar painel lateral à esquerda"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:105
msgid "Show Speed Dial"
msgstr "Mostrar ligação rápida"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:106
msgid "Show Homepage"
msgstr "Mostrar página inicial"
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:125
msgid "Japanese (SHIFT_JIS)"
msgstr "Japonês (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:130 ../midori/midori-websettings.c:206
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Personalizar…"
+
+#: ../midori/midori-websettings.c:145
msgid "New tab"
msgstr "Novo separador"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:146
msgid "New window"
msgstr "Nova janela"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:147
msgid "Current tab"
msgstr "Separador atual"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:162
msgid "Default"
msgstr "Omissão"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:163
msgid "Icons"
msgstr "Ícones"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:164
msgid "Small icons"
msgstr "Ícones pequenos"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:165
msgid "Text"
msgstr "Texto"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:166
msgid "Icons and text"
msgstr "Ícones e texto"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:167
msgid "Text beside icons"
msgstr "Texto ao lado dos ícones"
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:182
msgid "Automatic (GNOME or environment)"
msgstr "Automático (GNOME ou ambiente)"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:183
msgid "HTTP proxy server"
msgstr "Servidor proxy HTTP"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:184
msgid "No proxy server"
msgstr "Sem servidor proxy"
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:201
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:202
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:203
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:204
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:205
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:400
-msgid "Remember last window size"
-msgstr "Lembrar último tamanho da janela"
-
-#: ../midori/midori-websettings.c:401
-msgid "Whether to save the last window size"
-msgstr "Marque se quiser gravar o último tamanho da janela"
-
-#: ../midori/midori-websettings.c:409
-msgid "Last window width"
-msgstr "Largura da última janela"
-
-#: ../midori/midori-websettings.c:410
-msgid "The last saved window width"
-msgstr "Última largura de janela gravada"
-
-#: ../midori/midori-websettings.c:418
-msgid "Last window height"
-msgstr "Altura da última janela"
-
-#: ../midori/midori-websettings.c:419
-msgid "The last saved window height"
-msgstr "Última altura de janela gravada"
-
-#: ../midori/midori-websettings.c:444
-msgid "Last panel position"
-msgstr "Última posição do painel"
-
-#: ../midori/midori-websettings.c:445
-msgid "The last saved panel position"
-msgstr "Última posição de painel gravada"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
-msgid "Last panel page"
-msgstr "Última página do painel"
-
-#: ../midori/midori-websettings.c:455
-msgid "The last saved panel page"
-msgstr "Última página de painel gravada"
-
-#: ../midori/midori-websettings.c:463
-msgid "Last Web search"
-msgstr "Última pesquisa web"
-
-#: ../midori/midori-websettings.c:464
-msgid "The last saved Web search"
-msgstr "Última pesquisa web gravada"
-
-#: ../midori/midori-websettings.c:473
-msgid "Show Menubar"
-msgstr "Mostrar barra de menu"
-
-#: ../midori/midori-websettings.c:474
-msgid "Whether to show the menubar"
-msgstr "Marque se quiser mostrar a barra de menu"
-
-#: ../midori/midori-websettings.c:482
-msgid "Show Navigationbar"
-msgstr "Mostrar barra de navegação"
-
-#: ../midori/midori-websettings.c:483
-msgid "Whether to show the navigationbar"
-msgstr "Marque se quiser mostrar a barra de navegação"
-
-#: ../midori/midori-websettings.c:491
-msgid "Show Bookmarkbar"
-msgstr "Mostrar barra de marcadores"
-
-#: ../midori/midori-websettings.c:492
-msgid "Whether to show the bookmarkbar"
-msgstr "Marque se quiser mostrar a barra de marcadores"
-
-#: ../midori/midori-websettings.c:500
-msgid "Show Panel"
-msgstr "Mostrar painel"
-
-#: ../midori/midori-websettings.c:501
-msgid "Whether to show the panel"
-msgstr "Marque se quiser mostrar o painel"
-
-#: ../midori/midori-websettings.c:509
-msgid "Show Statusbar"
-msgstr "Mostrar barra de estado"
-
-#: ../midori/midori-websettings.c:510
-msgid "Whether to show the statusbar"
-msgstr "Marque se quiser mostrar a barra de estado"
-
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:278
msgid "Toolbar Style:"
msgstr "Estilo da barra de ferramentas:"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:279
msgid "The style of the toolbar"
msgstr "O estilo da barra de ferramentas"
-#: ../midori/midori-websettings.c:529
-msgid "Toolbar Items"
-msgstr "Itens da barra de ferramentas"
-
-#: ../midori/midori-websettings.c:530
-msgid "The items to show on the toolbar"
-msgstr "Itens a mostrar na barra de ferramentas"
-
-#: ../midori/midori-websettings.c:538
-msgid "Compact Sidepanel"
-msgstr "Compactar painel lateral"
-
-#: ../midori/midori-websettings.c:539
-msgid "Whether to make the sidepanel compact"
-msgstr "Marque se quiser compactar o painel lateral"
-
-#: ../midori/midori-websettings.c:554
-msgid "Align sidepanel on the right"
-msgstr "Alinhar painel lateral à direita"
-
-#: ../midori/midori-websettings.c:555
-msgid "Whether to align the sidepanel on the right"
-msgstr "Marque se quiser alinhar o painel lateral à direita"
-
-#: ../midori/midori-websettings.c:570
-msgid "Open panels in separate windows"
-msgstr "Abrir painéis em janelas distintas"
-
-#: ../midori/midori-websettings.c:571
-msgid "Whether to always open panels in separate windows"
-msgstr "Marque se quiser abrir os painéis em janelas distintas"
-
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:288
msgid "When Midori starts:"
msgstr "Ao iniciar o Midori:"
-#: ../midori/midori-websettings.c:581
-msgid "What to do when Midori starts"
-msgstr "O que fazer ao iniciar o Midori"
-
-#: ../midori/midori-websettings.c:590
-msgid "Homepage:"
-msgstr "Página inicial:"
-
-#: ../midori/midori-websettings.c:591
-msgid "The homepage"
-msgstr "A página inicial"
-
-#: ../midori/midori-websettings.c:606
-msgid "Show crash dialog"
-msgstr "Mostrar janela de encerramento"
-
-#: ../midori/midori-websettings.c:607
-msgid "Show a dialog after Midori crashed"
-msgstr "Mostrar a janela após o encerramento do Midori"
-
-#: ../midori/midori-websettings.c:615
-msgid "Save downloaded files to:"
-msgstr "Gravar ficheiros transferidos em:"
-
-#: ../midori/midori-websettings.c:616
-msgid "The folder downloaded files are saved to"
-msgstr "A pasta para gravar as transferências"
-
-#: ../midori/midori-websettings.c:624
-msgid "Text Editor"
-msgstr "Editor de texto"
-
-#: ../midori/midori-websettings.c:625
-msgid "An external text editor"
-msgstr "Um editor de texto externo"
-
-#: ../midori/midori-websettings.c:640
-msgid "News Aggregator"
-msgstr "Agregador de notícias"
-
-#: ../midori/midori-websettings.c:641
-msgid "An external news aggregator"
-msgstr "Um agregador de notícias externo"
-
-#: ../midori/midori-websettings.c:649
-msgid "Location entry Search"
-msgstr "Pesquisa no endereço"
-
-#: ../midori/midori-websettings.c:650
-msgid "The search to perform inside the location entry"
-msgstr "A pesquisa a executar na barra do endereço"
-
-#: ../midori/midori-websettings.c:658
-msgid "Preferred Encoding"
-msgstr "Codificação preferida"
-
-#: ../midori/midori-websettings.c:659
-msgid "The preferred character encoding"
-msgstr "A codificação de caracteres preferida"
-
-#: ../midori/midori-websettings.c:669
-msgid "Always Show Tabbar"
-msgstr "Mostrar sempre barra de separadores"
-
-#: ../midori/midori-websettings.c:670
-msgid "Always show the tabbar"
-msgstr "Mostrar sempre barra de separadores"
-
-#: ../midori/midori-websettings.c:683
-msgid "Close Buttons on Tabs"
-msgstr "Botão Fechar nos separadores"
-
-#: ../midori/midori-websettings.c:684
-msgid "Whether tabs have close buttons"
-msgstr "Marque se quiser que os separadores tenham os ícones para fechar"
-
-#: ../midori/midori-websettings.c:709
+#: ../midori/midori-websettings.c:325
msgid "Open new pages in:"
msgstr "Abrir novas páginas em:"
-#: ../midori/midori-websettings.c:710
-msgid "Where to open new pages"
-msgstr "Onde abrir novas páginas"
-
-#: ../midori/midori-websettings.c:719
-msgid "Middle click opens Selection"
-msgstr "Clique na roda do rato abre seleção"
-
-#: ../midori/midori-websettings.c:720
-msgid "Load an address from the selection via middle click"
-msgstr "Carregar endereço através do clique na roda do rato"
-
-#: ../midori/midori-websettings.c:728
-msgid "Open tabs in the background"
-msgstr "Abrir separadores em segundo plano"
-
-#: ../midori/midori-websettings.c:729
-msgid "Whether to open new tabs in the background"
-msgstr "Marque se quiser abrir os novos separadores em segundo plano"
-
-#: ../midori/midori-websettings.c:737
-msgid "Open Tabs next to Current"
-msgstr "Abrir separadores perto do atual"
-
-#: ../midori/midori-websettings.c:738
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr ""
-"Marque se quiser abrir os novos separadores perto do atual ou após o último "
-
-#: ../midori/midori-websettings.c:746
-msgid "Open popups in tabs"
-msgstr "Abrir \"pop-ups\" em separadores"
-
-#: ../midori/midori-websettings.c:747
-msgid "Whether to open popup windows in tabs"
-msgstr "Marque se quiser abrir janelas \"pop-up\" em separadores"
-
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Carregar imagens automaticamente"
-
-#: ../midori/midori-websettings.c:758
-msgid "Load and display images automatically"
-msgstr "Carregar e exibir automaticamente as imagens "
-
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Ativar \"scripts\""
-
-#: ../midori/midori-websettings.c:766
-msgid "Enable embedded scripting languages"
-msgstr "Ativar linguagem de \"scripts\" incorporados"
-
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Ativar \"plug-ins\" Netscape"
-
-#: ../midori/midori-websettings.c:774
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Ativar \"plug-ins\" Netscape incorporados"
-
-#: ../midori/midori-websettings.c:789
-msgid "Enable Spell Checking"
-msgstr "Ativar verificação ortográfica"
-
-#: ../midori/midori-websettings.c:790
-msgid "Enable spell checking while typing"
-msgstr "Ativar verificação ortográfica ao escrever"
-
-#: ../midori/midori-websettings.c:796
-msgid "Enable HTML5 database support"
-msgstr "Ativar suporte a dados HTML5"
-
-#: ../midori/midori-websettings.c:797
-msgid "Whether to enable HTML5 database support"
-msgstr "Marque se quiser ativar o suporte a dados HTML5"
-
-#: ../midori/midori-websettings.c:803
-msgid "Enable HTML5 local storage support"
-msgstr "Ativar suporte a armazenagem local HTML5"
-
-#: ../midori/midori-websettings.c:804
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Marque se quiser ativar o suporte à armazenagem local HTML5"
-
-#: ../midori/midori-websettings.c:810
-msgid "Enable offline web application cache"
-msgstr "Ativar \"cache\" de aplicações web \"offline\""
-
-#: ../midori/midori-websettings.c:811
-msgid "Whether to enable offline web application cache"
-msgstr "Marque se quiser ativar \"cache\" de aplicações web \"offline\""
-
-#: ../midori/midori-websettings.c:827
-msgid "Flash window on background tabs"
-msgstr "Janela intermitente nos separadores secundários"
-
-#: ../midori/midori-websettings.c:828
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr "Janela intermitente se um novo separador for aberto em segundo plano"
-
-#: ../midori/midori-websettings.c:836
-msgid "Enable WebGL support"
-msgstr "Ativar suporte a WebGL"
-
-#: ../midori/midori-websettings.c:837
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Permite que os sítios web utilizem o OpenGL"
-
-#: ../midori/midori-websettings.c:863
-msgid "Zoom Text and Images"
-msgstr "Ampliar texto e imagens"
-
-#: ../midori/midori-websettings.c:864
-msgid "Whether to zoom text and images"
-msgstr "Marque se quiser ajustar o texto e as imagens"
-
-#: ../midori/midori-websettings.c:879
-msgid "Find inline while typing"
-msgstr "Encontrar ao escrever"
-
-#: ../midori/midori-websettings.c:880
-msgid "Whether to automatically find inline while typing"
-msgstr "Marque se quiser encontrar automaticamente ao escrever"
-
-#: ../midori/midori-websettings.c:895
-msgid "Kinetic scrolling"
-msgstr "Deslocamento cinético"
-
-#: ../midori/midori-websettings.c:896
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr ""
-"Marque se quiser que o deslocamento se mova cineticamente conforme a "
-"velocidade"
-
-#: ../midori/midori-websettings.c:904
-msgid "Delete old Cookies after:"
-msgstr "Apagar cookies após:"
-
-#: ../midori/midori-websettings.c:905
-msgid "The maximum number of days to save cookies for"
-msgstr "O número máximo de dias para guardar os cookies"
-
-#: ../midori/midori-websettings.c:921
-msgid "Only accept Cookies from sites you visit"
-msgstr "Aceitar cookies dos sítios que eu visitar"
-
-#: ../midori/midori-websettings.c:922
-msgid "Block cookies sent by third-party websites"
-msgstr "Bloquear cookies de sítios de terceiros"
-
-#: ../midori/midori-websettings.c:936
-msgid "Delete pages from history after:"
-msgstr "Apagar páginas no histórico após:"
-
-#: ../midori/midori-websettings.c:937
-msgid "The maximum number of days to save the history for"
-msgstr "O número máximo de dias para guardar o histórico"
-
-#: ../midori/midori-websettings.c:952
-msgid "Proxy server"
-msgstr "Servidor proxy"
-
-#: ../midori/midori-websettings.c:953
-msgid "The type of proxy server to use"
-msgstr "O tipo de servidor proxy a utilizar"
-
-#: ../midori/midori-websettings.c:962
-msgid "HTTP Proxy Server"
-msgstr "Servidor proxy HTTP"
-
-#: ../midori/midori-websettings.c:963
-msgid "The proxy server used for HTTP connections"
-msgstr "Servidor proxy para ligações HTTP"
-
-#: ../midori/midori-websettings.c:978
-msgid "Port"
-msgstr "Porta"
-
-#: ../midori/midori-websettings.c:979
-msgid "The proxy server port used for HTTP connections"
-msgstr "A porta do servidor proxy para ligações HTTP"
-
-#: ../midori/midori-websettings.c:997
-msgid "The maximum size of cached pages on disk"
-msgstr "O tamanho máximo, no disco, das páginas em cache"
-
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
+#: ../midori/midori-websettings.c:388
msgid "Identify as"
msgstr "Identificar como"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:389
msgid "What to identify as to web pages"
msgstr "Identificar nas páginas web como"
-#: ../midori/midori-websettings.c:1031
-msgid "Identification string"
-msgstr "Texto da identificação"
-
-#: ../midori/midori-websettings.c:1032
-msgid "The application identification string"
-msgstr "O texto de identificação da aplicação"
-
-#: ../midori/midori-websettings.c:1048
-msgid "Preferred languages"
-msgstr "Idiomas preferidos"
-
-#: ../midori/midori-websettings.c:1049
-msgid ""
-"A comma separated list of languages preferred for rendering multilingual "
-"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-msgstr ""
-"Uma lista de idiomas, separada por vírgulas, para o processamento de páginas "
-"web multi-idiomas, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-fr;"
-"q=0.667\""
-
-#: ../midori/midori-websettings.c:1064
-msgid "Clear private data"
-msgstr "Limpar dados privados"
-
-#: ../midori/midori-websettings.c:1065
-msgid "The private data selected for deletion"
-msgstr "Os dados privados selecionados para apagar"
-
-#: ../midori/midori-websettings.c:1080
-msgid "Clear data"
-msgstr "Limpar dados"
-
-#: ../midori/midori-websettings.c:1081
-msgid "The data selected for deletion"
-msgstr "Os dados selecionados para apagar"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
-msgid "Strip referrer details sent to websites"
-msgstr "Detalhes enviados para sítios externos"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Se o cabeçalho \"Referer\" deve ser abreviado no nome do servidor"
-
-#: ../midori/midori-websettings.c:1146
+#: ../midori/midori-websettings.c:472
msgid "Always use my font choices"
msgstr "Utilizar sempre as minhas escolhas de tipo de letras"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:473
msgid "Override fonts picked by websites with user preferences"
msgstr ""
"Substituir tipo de letra dos sítios web pelas que forem definidas pelo "
"utilizador"
-#: ../midori/midori-view.c:1360
+#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151
+msgid "Trust this website"
+msgstr "Confiar neste sítio web"
+
+#: ../midori/midori-view.c:1149
+msgid "Security unknown"
+msgstr "Segurança desconhecida"
+
+#: ../midori/midori-view.c:1447
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s pretende gravar uma base de dados HTML5."
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Deny"
msgstr "_Rejeitar"
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Allow"
msgstr "_Permitir"
-#: ../midori/midori-view.c:1392
+#: ../midori/midori-view.c:1480
#, c-format
msgid "%s wants to know your location."
msgstr "%s pretende saber a sua localização."
-#: ../midori/midori-view.c:1485
+#: ../midori/midori-view.c:1576
#, c-format
msgid "Error - %s"
msgstr "Erro - %s"
-#: ../midori/midori-view.c:1486
+#: ../midori/midori-view.c:1577
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "A página \"%s\" não foi carregada."
-#: ../midori/midori-view.c:1488
+#: ../midori/midori-view.c:1579
msgid "Try again"
msgstr "Tente novamente"
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
+#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2839
#, c-format
msgid "Send a message to %s"
msgstr "Enviar mensagem a %s"
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
+#: ../midori/midori-view.c:2622
+msgid "Add _search engine..."
+msgstr "Adicionar motor de pe_squisa"
+
+#: ../midori/midori-view.c:2666 ../midori/midori-view.c:2995
msgid "Inspect _Element"
msgstr "Inspecionar _elementos"
-#: ../midori/midori-view.c:2480
+#: ../midori/midori-view.c:2718
msgid "Open Link in New _Tab"
msgstr "_Abrir ligação em novo separador"
-#: ../midori/midori-view.c:2484
+#: ../midori/midori-view.c:2722
msgid "Open Link in _Foreground Tab"
msgstr "Abrir ligação no _separador principal"
-#: ../midori/midori-view.c:2485
+#: ../midori/midori-view.c:2723
msgid "Open Link in _Background Tab"
msgstr "Abrir _ligação no separador secundário"
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2726
msgid "Open Link in New _Window"
msgstr "Abrir ligação em _nova janela"
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2729
msgid "Open Link as Web A_pplication"
msgstr "Abrir ligação como a_plicação web"
-#: ../midori/midori-view.c:2496
+#: ../midori/midori-view.c:2734
msgid "Copy Link de_stination"
msgstr "_Copiar destino da ligação"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2750
msgid "Open _Image in New Tab"
msgstr "Abrir _imagem em novo separador"
-#: ../midori/midori-view.c:2515
-msgid "Copy Image _Address"
-msgstr "Copiar _endereço da imagem"
+#: ../midori/midori-view.c:2753
+msgid "Copy Im_age"
+msgstr "Copiar im_agem"
-#: ../midori/midori-view.c:2518
+#: ../midori/midori-view.c:2756
msgid "Save I_mage"
msgstr "Gravar image_m"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2759
msgid "Open in Image _Viewer"
msgstr "Abrir no _visualizador de imagens"
-#: ../midori/midori-view.c:2528
+#: ../midori/midori-view.c:2766
msgid "Copy Video _Address"
msgstr "Copiar _endereço do vídeo"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2769
msgid "Save _Video"
msgstr "Gravar _vídeo"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2769
msgid "Download _Video"
msgstr "Transferir _vídeo"
-#: ../midori/midori-view.c:2557
+#: ../midori/midori-view.c:2795
msgid "Search _with"
msgstr "Pesquisar _com"
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:2827
msgid "_Search the Web"
msgstr "_Pesquisar na web"
-#: ../midori/midori-view.c:2606
+#: ../midori/midori-view.c:2847
msgid "Open Address in New _Tab"
msgstr "Abrir endereço em novo _separador"
-#: ../midori/midori-view.c:2909
-msgid "Open or download file"
-msgstr "Abrir ou transferir ficheiro"
+#: ../midori/midori-view.c:2900
+msgid "Open _Frame in New Tab"
+msgstr "Abrir mol_dura em novo separador"
-#: ../midori/midori-view.c:2929
+#: ../midori/midori-view.c:3155
#, c-format
-msgid "File Type: '%s'"
-msgstr "Tipo de ficheiro: \"%s\""
+msgid "Open or download file from %s"
+msgstr "Abrir ou transferir ficheiro de %s"
-#: ../midori/midori-view.c:2931
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Tipo de ficheiro: %s (\"%s\")"
-
-#: ../midori/midori-view.c:2935
+#: ../midori/midori-view.c:3168
#, c-format
msgid "File Name: %s"
msgstr "Nome do ficheiro: %s"
-#: ../midori/midori-view.c:2955
+#: ../midori/midori-view.c:3173
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Tipo de ficheiro: \"%s\""
+
+#: ../midori/midori-view.c:3175
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Tipo de ficheiro: %s (\"%s\")"
+
+#: ../midori/midori-view.c:3212
+#, c-format
+msgid "Size: %s"
+msgstr "Tamanho: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3223
#, c-format
msgid "Open %s"
msgstr "Abrir %s"
-#: ../midori/midori-view.c:3576
+#: ../midori/midori-view.c:3834
#, c-format
msgid "Inspect page - %s"
msgstr "Inspecionar página - %s"
-#: ../midori/midori-view.c:3923
-msgid "Speed Dial"
-msgstr "Ligação rápida"
-
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
-msgid "Click to add a shortcut"
-msgstr "Clique para adicionar atalho"
-
-#: ../midori/midori-view.c:3925
-msgid "Enter shortcut address"
-msgstr "Introduza o endereço do atalho"
-
-#: ../midori/midori-view.c:3926
-msgid "Enter shortcut title"
-msgstr "Introduza o título do atalho"
-
-#: ../midori/midori-view.c:3927
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "Tem a certeza que quer apagar este atalho?"
-
-#: ../midori/midori-view.c:4089
+#: ../midori/midori-view.c:4231
#, c-format
msgid "No documentation installed"
msgstr "Nenhuma documentação instalada"
-#: ../midori/midori-view.c:4165
+#: ../midori/midori-view.c:4308
msgid "Midori doesn't store any personal data:"
msgstr "O Midori não guarda quaisquer dados privados."
-#: ../midori/midori-view.c:4166
+#: ../midori/midori-view.c:4309
msgid "No history or web cookies are being saved."
msgstr "O histórico e os cookies não são guardados."
-#: ../midori/midori-view.c:4167
+#: ../midori/midori-view.c:4310
msgid "Extensions are disabled."
msgstr "As extensões estão inativas."
-#: ../midori/midori-view.c:4168
+#: ../midori/midori-view.c:4311
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
"O armazenamento local de HTML5, base de dados e \"cache\" da aplicação estão "
"inativas."
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4312
msgid "Midori prevents websites from tracking the user:"
msgstr "O Midori impede que os sítios web obtenham dados do utilizador."
-#: ../midori/midori-view.c:4170
+#: ../midori/midori-view.c:4313
msgid "Referrer URLs are stripped down to the hostname."
msgstr "Os URL são removidos do nome do servidor."
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:4314
msgid "DNS prefetching is disabled."
msgstr "A obtenção prévia de DNS está inativa."
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:4315
msgid "The language and timezone are not revealed to websites."
msgstr "O idioma e o fuso horário não são transmitidos aos sítios web."
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:4316
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr "Os \"plug-ins\" Flash e Netscape não são listados nos sítios web."
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:4402
msgid "Version numbers in brackets show the version used at runtime."
msgstr "Os números em parênteses mostram a versão utilizada."
-#: ../midori/midori-view.c:4278
+#: ../midori/midori-view.c:4451
msgid "Page loading delayed"
msgstr "Atualização de página atrasada"
-#: ../midori/midori-view.c:4279
+#: ../midori/midori-view.c:4452
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"O atraso na atualização foi devido a um encerramento brusco ou às "
"preferências de arranque."
-#: ../midori/midori-view.c:4280
+#: ../midori/midori-view.c:4453
msgid "Load Page"
msgstr "Carregar página"
-#: ../midori/midori-view.c:4446
+#: ../midori/midori-view.c:4620
msgid "Blank page"
msgstr "Página em branco"
-#: ../midori/midori-view.c:4708
+#: ../midori/midori-view.c:4884
msgid "_Duplicate Tab"
msgstr "_Duplicar separador"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4889
msgid "Show Tab _Label"
msgstr "Mostrar _texto do separador"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4889
msgid "Show Tab _Icon Only"
msgstr "Mostrar apenas o í_cone"
-#: ../midori/midori-view.c:4719
-msgid "Close ot_her Tabs"
-msgstr "Fec_har outros separadores"
+#: ../midori/midori-view.c:4896
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Fec_har o outro separador"
+msgstr[1] "Fec_har os outros separadores"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5532
+#: ../midori/midori-view.c:5653
msgid "previous"
msgstr "anterior"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5551
+#: ../midori/midori-view.c:5672
msgid "next"
msgstr "seguinte"
-#: ../midori/midori-view.c:5564
+#: ../midori/midori-view.c:5685
msgid "Print background images"
msgstr "Imprimir imagens de fundo"
-#: ../midori/midori-view.c:5565
+#: ../midori/midori-view.c:5686
msgid "Whether background images should be printed"
msgstr "Marque se quiser imprimir as imagens de fundo"
-#: ../midori/midori-view.c:5597
+#: ../midori/midori-view.c:5718
msgid "Features"
msgstr "Funcionalidades"
-#: ../midori/midori-preferences.c:297
-msgid "Startup"
-msgstr "Arranque"
-
-#: ../midori/midori-preferences.c:310
-msgid "Use _current page"
-msgstr "Utili_zar página atual"
-
-#: ../midori/midori-preferences.c:314
-msgid "Use current page as homepage"
-msgstr "Usar página atual como página inicial"
-
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
-msgid "Fonts"
-msgstr "Tipo de letra"
-
-#: ../midori/midori-preferences.c:326
-msgid "Proportional Font Family"
-msgstr "Família de letras proporcionais"
-
-#: ../midori/midori-preferences.c:330
-msgid "The default font family used to display text"
-msgstr "A família das letras a utilizar para exibir o texto"
-
-#: ../midori/midori-preferences.c:333
-msgid "The default font size used to display text"
-msgstr "O tamanho das letras utilizadas para exibir o texto"
-
-#: ../midori/midori-preferences.c:335
-msgid "Fixed-width Font Family"
-msgstr "Letras com largura fixa"
-
-#: ../midori/midori-preferences.c:339
-msgid "The font family used to display fixed-width text"
-msgstr "A família de letras utilizada para exibir o texto com largura fixa"
-
-#: ../midori/midori-preferences.c:342
-msgid "The font size used to display fixed-width text"
-msgstr "O tamanho das letras utilizadas para exibir o texto com largura fixa"
-
-#: ../midori/midori-preferences.c:344
-msgid "Minimum Font Size"
-msgstr "Tamanho mínimo da letra"
-
-#: ../midori/midori-preferences.c:348
-msgid "The minimum font size used to display text"
-msgstr "Tamanho mínimo da letra para exibir o texto"
-
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
-msgid "Behavior"
-msgstr "Comportamento"
-
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
-msgstr "Permitir que os \"scripts\" abram \"pop-ups\""
-
-#: ../midori/midori-preferences.c:386
-msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr ""
-"Marque para permitir que os \"scripts\" abram janelas \"pop-up\" "
-"automaticamente"
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:416
-msgid "Browsing"
-msgstr "Navegar"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:456
-msgid "Network"
-msgstr "Rede"
-
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "Nome de anfitrião"
-
-#: ../midori/midori-preferences.c:487
-msgid "MB"
-msgstr "MB"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Add search engine"
-msgstr "Adicionar motor de pesquisa"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Edit search engine"
-msgstr "Editar motor de pesquisa"
-
-#: ../midori/midori-searchaction.c:931
-msgid "_Name:"
-msgstr "_Nome:"
-
-#: ../midori/midori-searchaction.c:947
-msgid "_Description:"
-msgstr "_Descrição:"
-
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "Í_cone:"
-
-#: ../midori/midori-searchaction.c:995
-msgid "_Token:"
-msgstr "\"_Token\":"
-
-#: ../midori/midori-searchaction.c:1295
-msgid "Manage Search Engines"
-msgstr "Gerir motores de pesquisa"
-
-#: ../midori/midori-searchaction.c:1395
-msgid "Use as _default"
-msgstr "Usar por _omissão"
-
-#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr "Abrir com"
-
-#: ../midori/sokoke.c:362
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:48
#, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Escolha a aplicação ou comando para abrir \"%s\":"
+msgid "%s of %s"
+msgstr "%s de %s"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
-msgid "Could not run external program."
-msgstr "Não é possível executar o programa externo."
-
-#: ../midori/sokoke.c:1595
+#: ../midori/midori-download.vala:64
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: ../midori/sokoke.c:1596
+#: ../midori/midori-download.vala:65
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: ../midori/sokoke.c:1597
+#: ../midori/midori-download.vala:66
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
-#, c-format
-msgid "%s of %s"
-msgstr "%s de %s"
-
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
-msgid "?B"
-msgstr "?B"
-
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
-#, c-format
-msgid " (%s/s)"
-msgstr " (%s/s)"
-
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/midori-download.vala:82
#, c-format
msgid " - %s remaining"
msgstr " - %s restante(s)"
-#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
-msgid "_Inline Find:"
-msgstr "Local_izar:"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:92
+msgid "?B"
+msgstr "?B"
-#: ../toolbars/midori-findbar.c:317
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../toolbars/midori-findbar.c:323
-msgid "Next"
-msgstr "Seguinte"
-
-#: ../toolbars/midori-findbar.c:327
-msgid "Match Case"
-msgstr "Sensível a maiúsculas"
-
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr "Realçar ocorrências"
-
-#: ../toolbars/midori-findbar.c:347
-msgid "Close Findbar"
-msgstr "Fechar"
-
-#: ../toolbars/midori-transferbar.c:122
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:94
#, c-format
-msgid "The file '%s ' has been downloaded."
-msgstr "O ficheiro \"%s \" foi transferido."
+msgid " (%s/s)"
+msgstr " (%s/s)"
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "Transferência concluída"
-
-#: ../toolbars/midori-transferbar.c:193
+#: ../midori/midori-download.vala:188
msgid "The downloaded file is erroneous."
msgstr "O ficheiro transferido contém erros."
-#: ../toolbars/midori-transferbar.c:194
+#: ../midori/midori-download.vala:189
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2116,47 +1639,365 @@ msgstr ""
"ficheiro não foi transferido integralmente ou então foi modificado "
"posteriormente."
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../midori/midori-download.vala:302
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "O ficheiro \"%s\" não pode ser gravado nesta pasta."
+
+#: ../midori/midori-download.vala:304
+msgid "You don't have permission to write in this location."
+msgstr "Não tem permissão para escrever nesta localização."
+
+#: ../midori/midori-download.vala:307
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Não possui espaço suficiente para transferir \"%s\"."
+
+#: ../midori/midori-download.vala:309
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Precisa de %s e apenas tem livre %s."
+
+#: ../midori/midori-speeddial.vala:180
+msgid "Speed Dial"
+msgstr "Ligação rápida"
+
+#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261
+msgid "Click to add a shortcut"
+msgstr "Clique para adicionar atalho"
+
+#: ../midori/midori-speeddial.vala:182
+msgid "Enter shortcut address"
+msgstr "Introduza o endereço do atalho"
+
+#: ../midori/midori-speeddial.vala:183
+msgid "Enter shortcut title"
+msgstr "Introduza o título do atalho"
+
+#: ../midori/midori-speeddial.vala:184
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Tem a certeza que quer apagar este atalho?"
+
+#: ../midori/midori-preferences.c:299
+msgid "Startup"
+msgstr "Arranque"
+
+#: ../midori/midori-preferences.c:305
+msgid "Homepage:"
+msgstr "Página inicial:"
+
+#: ../midori/midori-preferences.c:313
+msgid "Use _current page"
+msgstr "Utili_zar página atual"
+
+#: ../midori/midori-preferences.c:317
+msgid "Use current page as homepage"
+msgstr "Usar página atual como página inicial"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:326
+msgid "Fonts"
+msgstr "Tipo de letra"
+
+#: ../midori/midori-preferences.c:329
+msgid "Proportional Font Family"
+msgstr "Família de letras proporcionais"
+
+#: ../midori/midori-preferences.c:333
+msgid "The default font family used to display text"
+msgstr "A família das letras a utilizar para exibir o texto"
+
+#: ../midori/midori-preferences.c:336
+msgid "The default font size used to display text"
+msgstr "O tamanho das letras utilizadas para exibir o texto"
+
+#: ../midori/midori-preferences.c:338
+msgid "Fixed-width Font Family"
+msgstr "Letras com largura fixa"
+
+#: ../midori/midori-preferences.c:342
+msgid "The font family used to display fixed-width text"
+msgstr "A família de letras utilizada para exibir o texto com largura fixa"
+
+#: ../midori/midori-preferences.c:345
+msgid "The font size used to display fixed-width text"
+msgstr "O tamanho das letras utilizadas para exibir o texto com largura fixa"
+
+#: ../midori/midori-preferences.c:347
+msgid "Minimum Font Size"
+msgstr "Tamanho mínimo da letra"
+
+#: ../midori/midori-preferences.c:351
+msgid "The minimum font size used to display text"
+msgstr "Tamanho mínimo da letra para exibir o texto"
+
+#: ../midori/midori-preferences.c:356
+msgid "Preferred Encoding"
+msgstr "Codificação preferida"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:363
+msgid "Behavior"
+msgstr "Comportamento"
+
+#: ../midori/midori-preferences.c:367 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Carregar imagens automaticamente"
+
+#: ../midori/midori-preferences.c:370
+msgid "Enable Spell Checking"
+msgstr "Ativar verificação ortográfica"
+
+#: ../midori/midori-preferences.c:384 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Ativar \"scripts\""
+
+#: ../midori/midori-preferences.c:387 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Ativar \"plug-ins\" Netscape"
+
+#: ../midori/midori-preferences.c:392
+msgid "Zoom Text and Images"
+msgstr "Ampliar texto e imagens"
+
+#: ../midori/midori-preferences.c:395
+msgid "Allow scripts to open popups"
+msgstr "Permitir que os \"scripts\" abram \"pop-ups\""
+
+#: ../midori/midori-preferences.c:396
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr ""
+"Marque para permitir que os \"scripts\" abram janelas \"pop-up\" "
+"automaticamente"
+
+#: ../midori/midori-preferences.c:402
+msgid "Kinetic scrolling"
+msgstr "Deslocamento cinético"
+
+#: ../midori/midori-preferences.c:403
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr ""
+"Marque se quiser que o deslocamento se mova cineticamente conforme a "
+"velocidade"
+
+#: ../midori/midori-preferences.c:408
+msgid "Middle click opens Selection"
+msgstr "Clique na roda do rato abre seleção"
+
+#: ../midori/midori-preferences.c:409
+msgid "Load an address from the selection via middle click"
+msgstr "Carregar endereço através do clique na roda do rato"
+
+#: ../midori/midori-preferences.c:415
+msgid "Enable WebGL support"
+msgstr "Ativar suporte a WebGL"
+
+#: ../midori/midori-preferences.c:420
+msgid "Flash window on background tabs"
+msgstr "Janela intermitente nos separadores secundários"
+
+#: ../midori/midori-preferences.c:425
+msgid "Preferred languages"
+msgstr "Idiomas preferidos"
+
+#: ../midori/midori-preferences.c:429
+msgid ""
+"A comma separated list of languages preferred for rendering multilingual "
+"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+msgstr ""
+"Uma lista de idiomas, separada por vírgulas, para o processamento de páginas "
+"web multi-idiomas, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-fr;"
+"q=0.667\""
+
+#: ../midori/midori-preferences.c:431
+msgid "Save downloaded files to:"
+msgstr "Gravar ficheiros transferidos em:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:438
+msgid "Browsing"
+msgstr "Navegar"
+
+#: ../midori/midori-preferences.c:454
+msgid "Close Buttons on Tabs"
+msgstr "Botão Fechar nos separadores"
+
+#: ../midori/midori-preferences.c:458
+msgid "Always Show Tabbar"
+msgstr "Mostrar sempre barra de separadores"
+
+#: ../midori/midori-preferences.c:462
+msgid "Open Tabs next to Current"
+msgstr "Abrir separadores perto do atual"
+
+#: ../midori/midori-preferences.c:463
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Marque se quiser abrir os novos separadores perto do atual ou após o último "
+
+#: ../midori/midori-preferences.c:466
+msgid "Open tabs in the background"
+msgstr "Abrir separadores em segundo plano"
+
+#: ../midori/midori-preferences.c:470
+msgid "Text Editor"
+msgstr "Editor de texto"
+
+#: ../midori/midori-preferences.c:475
+msgid "News Aggregator"
+msgstr "Agregador de notícias"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:482
+msgid "Network"
+msgstr "Rede"
+
+#: ../midori/midori-preferences.c:484
+msgid "Proxy server"
+msgstr "Servidor proxy"
+
+#: ../midori/midori-preferences.c:489
+msgid "Hostname"
+msgstr "Nome de anfitrião"
+
+#: ../midori/midori-preferences.c:497
+msgid "Port"
+msgstr "Porta"
+
+#: ../midori/midori-preferences.c:509 ../midori/midori-preferences.c:512
+msgid "The maximum size of cached pages on disk"
+msgstr "O tamanho máximo, no disco, das páginas em cache"
+
+#: ../midori/midori-preferences.c:514
+msgid "MB"
+msgstr "MB"
+
+#: ../midori/midori-searchaction.c:1074
+msgid "Add search engine"
+msgstr "Adicionar motor de pesquisa"
+
+#: ../midori/midori-searchaction.c:1074
+msgid "Edit search engine"
+msgstr "Editar motor de pesquisa"
+
+#: ../midori/midori-searchaction.c:1102
+msgid "_Name:"
+msgstr "_Nome:"
+
+#: ../midori/midori-searchaction.c:1117
+msgid "_Description:"
+msgstr "_Descrição:"
+
+#: ../midori/midori-searchaction.c:1130 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Endereço:"
+
+#: ../midori/midori-searchaction.c:1149
+msgid "_Token:"
+msgstr "\"_Token\":"
+
+#: ../midori/midori-searchaction.c:1447
+msgid "Manage Search Engines"
+msgstr "Gerir motores de pesquisa"
+
+#: ../midori/midori-searchaction.c:1549
+msgid "Use as _default"
+msgstr "Usar por _omissão"
+
+#: ../midori/sokoke.c:355
+msgid "Open with"
+msgstr "Abrir com"
+
+#: ../midori/sokoke.c:363
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Escolha a aplicação ou comando para abrir \"%s\":"
+
+#: ../midori/sokoke.c:478 ../midori/sokoke.c:492
+msgid "Could not run external program."
+msgstr "Não é possível executar o programa externo."
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:265
+msgid "_Inline Find:"
+msgstr "Local_izar:"
+
+#: ../toolbars/midori-findbar.c:287
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../toolbars/midori-findbar.c:293
+msgid "Next"
+msgstr "Seguinte"
+
+#: ../toolbars/midori-findbar.c:297
+msgid "Match Case"
+msgstr "Sensível a maiúsculas"
+
+#: ../toolbars/midori-findbar.c:306
+msgid "Highlight Matches"
+msgstr "Realçar ocorrências"
+
+#: ../toolbars/midori-findbar.c:317
+msgid "Close Findbar"
+msgstr "Fechar"
+
+#: ../toolbars/midori-transferbar.c:109
+#, c-format
+msgid "The file '%s ' has been downloaded."
+msgstr "O ficheiro \"%s \" foi transferido."
+
+#: ../toolbars/midori-transferbar.c:114
+msgid "Transfer completed"
+msgstr "Transferência concluída"
+
+#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
msgid "Clear All"
msgstr "Limpar tudo"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
msgid "Some files are being downloaded"
msgstr "Existem ficheiros a ser transferidos"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:278
msgid "_Quit Midori"
msgstr "_Sair do Midori"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:280
msgid "The transfers will be cancelled if Midori quits."
msgstr "As transferências serão canceladas se sair do Midori."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Marcadores"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Falha ao adicionar marcador: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Falha ao atualizar marcador: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Editar o marcador selecionado"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Apagar o marcador selecionado"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Adicionar nova pasta"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Separador "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Procurar nos marcadores"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Histórico"
@@ -2180,6 +2021,11 @@ msgstr[1] "%d dias atrás"
msgid "A week ago"
msgstr "Uma semana atrás"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Falha ao remover histórico: %s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Tem a certeza de que quer remover todo o histórico?"
@@ -2196,15 +2042,20 @@ msgstr "Apagar o item de histórico selecionado"
msgid "Clear the entire history"
msgstr "Limpar todo o histórico"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Procurar no histórico"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Transferências"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:435
msgid "Open Destination _Folder"
msgstr "Abrir pas_ta de destino"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:438
msgid "Copy Link Loc_ation"
msgstr "Copiar localização da lig_ação"
@@ -2246,54 +2097,62 @@ msgstr "O ícone \"%s\" não foi carregado"
msgid "Animation frames are broken"
msgstr "As \"frames\" de animação estão danificadas"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "A propriedade \"%s\" é inválida para %s"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
-#: ../extensions/addons.c:308
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:309
msgid "Choose file"
msgstr "Escolha o ficheiro"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Escolha a pasta"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Nenhum"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 hora"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 dia"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 semana"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 mês"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 ano"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Preferências para %s"
-#: ../extensions/adblock.c:473
+#: ../katze/midori-uri.vala:168
+msgid "MD5-Checksum:"
+msgstr "Verificação MD5:"
+
+#: ../katze/midori-uri.vala:175
+msgid "SHA1-Checksum:"
+msgstr "Verificação SHA1:"
+
+#: ../extensions/adblock.c:495
msgid "Configure Advertisement filters"
msgstr "Configurar filtros de publicidade"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:528
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2303,110 +2162,110 @@ msgstr ""
"\"Adicionar\" para a adicionar à lista.\n"
"Pode encontrar mais listas em %s."
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:944
msgid "Edit rule"
msgstr "Editar regra"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:958
msgid "_Rule:"
msgstr "_Regra:"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:1012
msgid "Bl_ock image"
msgstr "Bl_oquear imagem"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:1017
msgid "Bl_ock link"
msgstr "Bl_oquear ligação"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1915
msgid "Advertisement blocker"
msgstr "Bloqueador de publicidade"
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1916
msgid "Block advertisements according to a filter list"
msgstr "Bloquear publicidade de acordo com o filtro"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
+#: ../extensions/addons.c:222
msgid "This page appears to contain a user script. Do you wish to install it?"
msgstr ""
"Parece que a página contém um \"script\" de utilizador. Pretende instalar?"
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
msgid "_Install user script"
msgstr "_Instalar \"script\" de utilizador"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
msgid "This page appears to contain a user style. Do you wish to install it?"
msgstr "Parece que a página contém um estilo de utilizador. Pretende instalar?"
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
msgid "_Install user style"
msgstr "_Instalar estilo de utilizador"
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
msgid "Don't install"
msgstr "Não instalar"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:320 ../extensions/addons.c:675
msgid "Userscripts"
msgstr "\"Scripts\" de utilizador"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:325 ../extensions/addons.c:677
msgid "Userstyles"
msgstr "Estilos de utilizador"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:371 ../extensions/addons.c:450
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Erro"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:412
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Pretende apagar \"%s\"?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:418
msgid "Delete user script"
msgstr "Apagar \"script\" de utilizador"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:419
msgid "Delete user style"
msgstr "Apagar estilo de utilizador"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:422
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "O ficheiro \"%s \" será apagado permanentemente."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:564 ../extensions/addons.c:641
msgid "Open in Text Editor"
msgstr "Abrir no editor de texto"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:566 ../extensions/addons.c:650
msgid "Open Target Folder"
msgstr "Abrir pasta de destino"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:632
msgid "Add new addon"
msgstr "Adicionar novo extra"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:658
msgid "Remove selected addon"
msgstr "Remover o extra selecionado"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1687 ../extensions/addons.c:1905
msgid "User addons"
msgstr "Extras de utilizador"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1817
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Não é possível vigiar a pasta \"%s\": %s "
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1906
msgid "Support for userscripts and userstyles"
msgstr "Suporte a \"scripts\" e estilos de utilizador"
@@ -2493,29 +2352,21 @@ msgstr ""
"Domínio : %s\n"
"\"Cookies\" : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Nome"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "_Expandir tudo"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "Re_colher tudo"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filtro:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Introduza um filtro para só mostrar os \"cookies\" cujo nome ou domínio "
-"coincidam com o filtro"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Procurar \"cookies\" por nome ou domínio"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2728,11 +2579,11 @@ msgstr "Exibir separador em segundo plano (histórico)"
msgid "Display the current selected tab in background"
msgstr "Exibir separador selecionado em segundo plano"
-#: ../extensions/history-list.vala:569
+#: ../extensions/history-list.vala:566
msgid "History List"
msgstr "Lista de histórico"
-#: ../extensions/history-list.vala:570
+#: ../extensions/history-list.vala:567
msgid "Move to the last used tab when switching or closing tabs"
msgstr ""
"Mover para o último separador utilizado ao trocar ou fechar separadores"
@@ -2755,7 +2606,7 @@ msgstr "Personalizar atalhos de teclado"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "Personalizar atalh_os..."
+msgstr "Personalizar atalh_os…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2773,35 +2624,35 @@ msgstr "Relógio de barra de estado"
msgid "Display date and time in the statusbar"
msgstr "Mostrar data e hora na barra de estado"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Imagens"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "\"Scripts\""
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "\"Plug-ins\" Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Funções na barra de estado"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "Ligar/desligar facilmente as funções em páginas web"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Painel de separadores"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "P_ainel de separadores"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Mostrar separadores num painel vertical"
@@ -2813,11 +2664,11 @@ msgstr "Por omissão, mostrar apenas os ícones"
msgid "New tabs have no label by default"
msgstr "Os novos separadores não mostram texto"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Personalizar barra de ferramentas"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2825,34 +2676,275 @@ msgstr ""
"Selecione os itens a exibir na barra de ferramentas. Os itens podem ser "
"ordenados por arrastamento."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Itens disponíveis"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Itens exibidos"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Personalizar barra de ferramen_tas..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "Personalizar barra de ferramen_tas…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "Personali_zar..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Editor da barra de ferramentas"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Editar facilmente a barra de ferramentas"
-#: ../extensions/web-cache.c:463
+#: ../extensions/web-cache.c:462
msgid "Cache HTTP communication on disk"
msgstr "Pôr comunicações HTTP em cache"
+#~ msgid "Remember last window size"
+#~ msgstr "Lembrar último tamanho da janela"
+
+#~ msgid "Whether to save the last window size"
+#~ msgstr "Marque se quiser gravar o último tamanho da janela"
+
+#~ msgid "Last window width"
+#~ msgstr "Largura da última janela"
+
+#~ msgid "The last saved window width"
+#~ msgstr "Última largura de janela gravada"
+
+#~ msgid "Last window height"
+#~ msgstr "Altura da última janela"
+
+#~ msgid "The last saved window height"
+#~ msgstr "Última altura de janela gravada"
+
+#~ msgid "Last panel position"
+#~ msgstr "Última posição do painel"
+
+#~ msgid "The last saved panel position"
+#~ msgstr "Última posição de painel gravada"
+
+#~ msgid "Last panel page"
+#~ msgstr "Última página do painel"
+
+#~ msgid "The last saved panel page"
+#~ msgstr "Última página de painel gravada"
+
+#~ msgid "Last Web search"
+#~ msgstr "Última pesquisa web"
+
+#~ msgid "The last saved Web search"
+#~ msgstr "Última pesquisa web gravada"
+
+#~ msgid "Show Menubar"
+#~ msgstr "Mostrar barra de menu"
+
+#~ msgid "Whether to show the menubar"
+#~ msgstr "Marque se quiser mostrar a barra de menu"
+
+#~ msgid "Show Navigationbar"
+#~ msgstr "Mostrar barra de navegação"
+
+#~ msgid "Whether to show the navigationbar"
+#~ msgstr "Marque se quiser mostrar a barra de navegação"
+
+#~ msgid "Show Bookmarkbar"
+#~ msgstr "Mostrar barra de marcadores"
+
+#~ msgid "Whether to show the bookmarkbar"
+#~ msgstr "Marque se quiser mostrar a barra de marcadores"
+
+#~ msgid "Show Panel"
+#~ msgstr "Mostrar painel"
+
+#~ msgid "Whether to show the panel"
+#~ msgstr "Marque se quiser mostrar o painel"
+
+#~ msgid "Show Statusbar"
+#~ msgstr "Mostrar barra de estado"
+
+#~ msgid "Whether to show the statusbar"
+#~ msgstr "Marque se quiser mostrar a barra de estado"
+
+#~ msgid "Toolbar Items"
+#~ msgstr "Itens da barra de ferramentas"
+
+#~ msgid "The items to show on the toolbar"
+#~ msgstr "Itens a mostrar na barra de ferramentas"
+
+#~ msgid "Compact Sidepanel"
+#~ msgstr "Compactar painel lateral"
+
+#~ msgid "Whether to make the sidepanel compact"
+#~ msgstr "Marque se quiser compactar o painel lateral"
+
+#~ msgid "Align sidepanel on the right"
+#~ msgstr "Alinhar painel lateral à direita"
+
+#~ msgid "Whether to align the sidepanel on the right"
+#~ msgstr "Marque se quiser alinhar o painel lateral à direita"
+
+#~ msgid "Open panels in separate windows"
+#~ msgstr "Abrir painéis em janelas distintas"
+
+#~ msgid "Whether to always open panels in separate windows"
+#~ msgstr "Marque se quiser abrir os painéis em janelas distintas"
+
+#~ msgid "What to do when Midori starts"
+#~ msgstr "O que fazer ao iniciar o Midori"
+
+#~ msgid "The homepage"
+#~ msgstr "A página inicial"
+
+#~ msgid "Show crash dialog"
+#~ msgstr "Mostrar janela de encerramento"
+
+#~ msgid "The folder downloaded files are saved to"
+#~ msgstr "A pasta para gravar as transferências"
+
+#~ msgid "An external text editor"
+#~ msgstr "Um editor de texto externo"
+
+#~ msgid "An external news aggregator"
+#~ msgstr "Um agregador de notícias externo"
+
+#~ msgid "Location entry Search"
+#~ msgstr "Pesquisa no endereço"
+
+#~ msgid "The search to perform inside the location entry"
+#~ msgstr "A pesquisa a executar na barra do endereço"
+
+#~ msgid "The preferred character encoding"
+#~ msgstr "A codificação de caracteres preferida"
+
+#~ msgid "Always show the tabbar"
+#~ msgstr "Mostrar sempre barra de separadores"
+
+#~ msgid "Whether tabs have close buttons"
+#~ msgstr "Marque se quiser que os separadores tenham os ícones para fechar"
+
+#~ msgid "Where to open new pages"
+#~ msgstr "Onde abrir novas páginas"
+
+#~ msgid "Whether to open new tabs in the background"
+#~ msgstr "Marque se quiser abrir os novos separadores em segundo plano"
+
+#~ msgid "Open popups in tabs"
+#~ msgstr "Abrir \"pop-ups\" em separadores"
+
+#~ msgid "Whether to open popup windows in tabs"
+#~ msgstr "Marque se quiser abrir janelas \"pop-up\" em separadores"
+
+#~ msgid "Load and display images automatically"
+#~ msgstr "Carregar e exibir automaticamente as imagens "
+
+#~ msgid "Enable embedded scripting languages"
+#~ msgstr "Ativar linguagem de \"scripts\" incorporados"
+
+#~ msgid "Enable embedded Netscape plugin objects"
+#~ msgstr "Ativar \"plug-ins\" Netscape incorporados"
+
+#~ msgid "Enable spell checking while typing"
+#~ msgstr "Ativar verificação ortográfica ao escrever"
+
+#~ msgid "Enable HTML5 database support"
+#~ msgstr "Ativar suporte a dados HTML5"
+
+#~ msgid "Whether to enable HTML5 database support"
+#~ msgstr "Marque se quiser ativar o suporte a dados HTML5"
+
+#~ msgid "Whether to enable HTML5 local storage support"
+#~ msgstr "Marque se quiser ativar o suporte à armazenagem local HTML5"
+
+#~ msgid "Whether to enable offline web application cache"
+#~ msgstr "Marque se quiser ativar \"cache\" de aplicações web \"offline\""
+
+#~ msgid "Flash the browser window if a new tab was opened in the background"
+#~ msgstr ""
+#~ "Janela intermitente se um novo separador for aberto em segundo plano"
+
+#~ msgid "Allow websites to use OpenGL rendering"
+#~ msgstr "Permite que os sítios web utilizem o OpenGL"
+
+#~ msgid "Whether to zoom text and images"
+#~ msgstr "Marque se quiser ajustar o texto e as imagens"
+
+#~ msgid "Find inline while typing"
+#~ msgstr "Encontrar ao escrever"
+
+#~ msgid "Whether to automatically find inline while typing"
+#~ msgstr "Marque se quiser encontrar automaticamente ao escrever"
+
+#~ msgid "The type of proxy server to use"
+#~ msgstr "O tipo de servidor proxy a utilizar"
+
+#~ msgid "HTTP Proxy Server"
+#~ msgstr "Servidor proxy HTTP"
+
+#~ msgid "The proxy server used for HTTP connections"
+#~ msgstr "Servidor proxy para ligações HTTP"
+
+#~ msgid "The proxy server port used for HTTP connections"
+#~ msgstr "A porta do servidor proxy para ligações HTTP"
+
+#~ msgid "Identification string"
+#~ msgstr "Texto da identificação"
+
+#~ msgid "The application identification string"
+#~ msgstr "O texto de identificação da aplicação"
+
+#~ msgid "Clear private data"
+#~ msgstr "Limpar dados privados"
+
+#~ msgid "The private data selected for deletion"
+#~ msgstr "Os dados privados selecionados para apagar"
+
+#~ msgid "Clear data"
+#~ msgstr "Limpar dados"
+
+#~ msgid "The data selected for deletion"
+#~ msgstr "Os dados selecionados para apagar"
+
+#~ msgid "Filter:"
+#~ msgstr "Filtro:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Introduza um filtro para só mostrar os \"cookies\" cujo nome ou domínio "
+#~ "coincidam com o filtro"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Fec_har outros separadores"
+
+#~ msgid "_Icon:"
+#~ msgstr "Í_cone:"
+
+#~ msgid "Load page"
+#~ msgstr "Carregar página"
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Marcador"
+
+#~ msgid "_Console"
+#~ msgstr "_Consola"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Pasta superior"
+
+#~ msgid "_Title:"
+#~ msgstr "_Título:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Pasta:"
+
+#~ msgid "_Customize…"
+#~ msgstr "Personali_zar…"
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Os marcadores não foram gravados. %s"
+
#~ msgid "The specified configuration folder is invalid."
#~ msgstr "A pasta de configuração especificada é inválida."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 13381ddd..61929af0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the midori package.
# Rogério Brito 2009
# Sergio Cipolla 2010, 2011
+# Rafael Ferreira 2012
#
msgid ""
msgstr ""
"Project-Id-Version: Midori 0.2.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-12 01:18+0000\n"
-"PO-Revision-Date: 2011-06-09 18:00-0300\n"
-"Last-Translator: Sérgio Cipolla \n"
-"Language-Team: Brazilian Portuguese \n"
+"POT-Creation-Date: 2012-09-03 21:15+0000\n"
+"PO-Revision-Date: 2012-08-14 22:47-0300\n"
+"Last-Translator: Rafael Ferreira \n"
+"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -26,12 +27,28 @@ msgstr "Navegue na Web"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1937 ../midori/main.c:1961
+#: ../midori/main.c:1975 ../midori/midori-websettings.c:199
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Navegador Web Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Nova janela de navegação privada"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1420
+msgid "New Tab"
+msgstr "Nova aba"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1417
+msgid "New Window"
+msgstr "Nova janela"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Navegador web"
@@ -43,82 +60,87 @@ msgstr "Navegação Privada Midori"
msgid "Open a new private browsing window"
msgstr "Abrir uma nova janela de navegação privada"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4166
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4375
msgid "Private Browsing"
msgstr "Navegação Privada"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "A configuração não pôde ser carregada: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "O valor '%s' é inválido para %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Valor de configuração '%s' inválido "
-#: ../midori/main.c:380
+#: ../midori/main.c:365
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Os motores de pesquisa não puderam ser carregados. %s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:419
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Falha ao limpar o histórico: %s\n"
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Falha ao abrir a base de dados: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:513
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Falha ao excluir itens antigos do histórico: %s\n"
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Falha ao excluir item do histórico: %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Os favoritos não puderam ser salvos. %s"
-
-#: ../midori/main.c:633
+#: ../midori/main.c:535
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "A configuração não pôde ser salva. %s"
-#: ../midori/main.c:668
+#: ../midori/main.c:561
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Os motores de pesquisa não puderam ser salvos. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:598
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "O lixo não pôde ser salvo. %s"
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
+#: ../midori/main.c:671 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Extensões"
-#: ../midori/main.c:760
+#: ../midori/main.c:685
msgid "Privacy"
msgstr "Privacidade"
-#: ../midori/main.c:772
+#: ../midori/main.c:687
+msgid "Delete old Cookies after:"
+msgstr "Excluir cookies antigos após:"
+
+#: ../midori/main.c:689 ../midori/main.c:692
+msgid "The maximum number of days to save cookies for"
+msgstr "O número máximo de dias para manter cookies salvos"
+
+#: ../midori/main.c:696
+msgid "Only accept Cookies from sites you visit"
+msgstr "Aceitar coockies apenas de sites visitados"
+
+#: ../midori/main.c:697
+msgid "Block cookies sent by third-party websites"
+msgstr "Bloquear coockies enviados por outros sites"
+
+#: ../midori/main.c:702
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -126,19 +148,45 @@ msgstr ""
"Os cookies armazenam dados de autenticação, jogos salvos ou perfis do "
"usuário para fins de propaganda."
-#: ../midori/main.c:828
+#: ../midori/main.c:709
+msgid "Enable offline web application cache"
+msgstr "Habilitar cache de aplicativos web offline"
+
+#: ../midori/main.c:712
+msgid "Enable HTML5 local storage support"
+msgstr "Habilitar suporte a armazenagem local HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/main.c:716
+msgid "Strip referrer details sent to websites"
+msgstr "Eliminar detalhes do referrer enviados a sites externos"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/main.c:718
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Se o cabeçalho \"Referer\" deve limitar-se ao nome do host"
+
+#: ../midori/main.c:721
+msgid "Delete pages from history after:"
+msgstr "Excluir páginas do histórico após:"
+
+#: ../midori/main.c:723 ../midori/main.c:726
+msgid "The maximum number of days to save the history for"
+msgstr "O número máximo de dias para os quais manter um histórico"
+
+#: ../midori/main.c:767
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "A sessão não pôde ser salva. %s"
-#: ../midori/main.c:1046
+#: ../midori/main.c:993
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Nenhum certificado raiz disponível. Os certificados SSL não podem ser "
"verificados."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1088
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -147,229 +195,234 @@ msgstr ""
"ocorrer repetidamente, tente uma das seguintes opções para resolver o "
"problema."
-#: ../midori/main.c:1134
+#: ../midori/main.c:1107
msgid "Modify _preferences"
msgstr "Modificar _preferências"
-#: ../midori/main.c:1138
+#: ../midori/main.c:1111
msgid "Disable all _extensions"
msgstr "Desabilitar todas as _extensões"
-#: ../midori/main.c:1151
+#: ../midori/main.c:1120
+msgid "Show a dialog after Midori crashed"
+msgstr "Exibir um diálogo após o encerramento abrupto do Midori"
+
+#: ../midori/main.c:1125
msgid "Discard old tabs"
msgstr "Descartar abas antigas"
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1126 ../midori/midori-websettings.c:107
msgid "Show last tabs without loading"
msgstr "Exibir as últimas abas sem carregá-las"
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1127 ../midori/midori-websettings.c:106
msgid "Show last open tabs"
msgstr "Exibir as últimas abas abertas"
-#: ../midori/main.c:1400 ../midori/main.c:2464
+#: ../midori/main.c:1374 ../midori/main.c:2353
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "A sessão não pôde ser carregada: %s\n"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1512
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Captura salva em: %s\n"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1840
msgid "Run ADDRESS as a web application"
msgstr "Executar ENDEREÇO como aplicativo web"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1840
msgid "ADDRESS"
msgstr "ENDEREÇO"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1843
msgid "Use FOLDER as configuration folder"
msgstr "Usar PASTA como pasta de configuração"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1843
msgid "FOLDER"
msgstr "PASTA"
-#: ../midori/main.c:1957
+#: ../midori/main.c:1846
msgid "Private browsing, no changes are saved"
msgstr "Navegação privada, nenhuma modificação é salva"
-#: ../midori/main.c:1959
+#: ../midori/main.c:1849
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Modo portátil, todos arquivos de runtime armazenados em um só lugar"
+
+#: ../midori/main.c:1852
msgid "Show a diagnostic dialog"
msgstr "Exibir diálogo de diagnóstico"
-#: ../midori/main.c:1961
+#: ../midori/main.c:1854
msgid "Run the specified filename as javascript"
msgstr "Executar o arquivo especificado como javascript"
-#: ../midori/main.c:1963
+#: ../midori/main.c:1856
msgid "Take a snapshot of the specified URI"
msgstr "Capturar o URI especificado num arquivo PDF"
-#: ../midori/main.c:1965
+#: ../midori/main.c:1858
msgid "Execute the specified command"
msgstr "Executar o comando especificado"
-#: ../midori/main.c:1967
+#: ../midori/main.c:1860
msgid "List available commands to execute with -e/ --execute"
msgstr "Listar comandos disponíveis para execução com -e/ --execute"
-#: ../midori/main.c:1969
+#: ../midori/main.c:1862
msgid "Display program version"
msgstr "Exibir a versão do programa"
-#: ../midori/main.c:1971
+#: ../midori/main.c:1864
msgid "Addresses"
msgstr "Endereços"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1866
msgid "Block URIs according to regular expression PATTERN"
msgstr "Bloquear URIs conforme a expressão regular PADRÃO"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1866
msgid "PATTERN"
msgstr "PADRÃO"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:1870
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Limpar a sessão do Midori após SEGUNDOS segundos de inatividade"
-#: ../midori/main.c:1977
+#: ../midori/main.c:1870
msgid "SECONDS"
msgstr "SEGUNDOS"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1873
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Redirecionar alertas do console para o ARQUIVO especificado"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1873
msgid "FILENAME"
msgstr "ARQUIVO"
-#: ../midori/main.c:2045
-msgid "[Addresses]"
-msgstr "[Endereços]"
-
-#: ../midori/main.c:2087
+#: ../midori/main.c:1976
msgid "Please report comments, suggestions and bugs to:"
msgstr "Por favor, envie comentários, sugestões e relatos de erros para:"
-#: ../midori/main.c:2089
+#: ../midori/main.c:1978
msgid "Check for new versions at:"
msgstr "Verificar por novas versões em:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
+#: ../midori/main.c:2073
msgid "Saved logins and _passwords"
msgstr "Nomes de _usuário e senhas salvos"
-#: ../midori/main.c:2175
+#: ../midori/main.c:2075
msgid "Cookies and Website data"
msgstr "Cookies e dados de sites"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
+#: ../midori/main.c:2079 ../midori/midori-preferences.c:505
+#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470
msgid "Web Cache"
msgstr "Cache da web"
-#: ../midori/main.c:2182
+#: ../midori/main.c:2082
msgid "Website icons"
msgstr "Ícones de sites"
-#: ../midori/main.c:2288
+#: ../midori/main.c:2186
msgid "An unknown error occured"
msgstr "Ocorreu um erro desconhecido."
-#: ../midori/main.c:2395
+#: ../midori/main.c:2301
msgid "An instance of Midori is already running but not responding.\n"
msgstr ""
"Uma instância do Midori já está em execução mas não está respondendo.\n"
-#: ../midori/main.c:2431
+#: ../midori/main.c:2335
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Os favoritos não puderam ser carregados: %s\n"
-#: ../midori/main.c:2479
+#: ../midori/main.c:2368
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "O lixo não pôde ser carregado: %s\n"
-#: ../midori/main.c:2492
+#: ../midori/main.c:2381
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "O histórico não pôde ser carregado: %s\n"
-#: ../midori/main.c:2508
+#: ../midori/main.c:2396
msgid "The following errors occured:"
msgstr "Ocorreram os seguintes erros:"
-#: ../midori/main.c:2524
+#: ../midori/main.c:2412
msgid "_Ignore"
msgstr "_Ignorar "
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "_Favorito"
+#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:542
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Ação inesperada '%s'."
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6042
+#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6379
msgid "_Bookmarks"
msgstr "_Favoritos"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1373
msgid "Add Boo_kmark"
msgstr "Adicionar _favorito"
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "_Console"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1374
msgid "_Extensions"
msgstr "_Extensões"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4569
+#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4832
msgid "_History"
msgstr "_Histórico"
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "_Página inicial"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1376
msgid "_Userscripts"
msgstr "Scripts de _usuário"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1377
+msgid "User_styles"
+msgstr "E_stilos de usuário"
+
+#: ../midori/midori-app.c:1378
msgid "New _Tab"
msgstr "_Nova aba"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1379
msgid "_Transfers"
msgstr "_Transferências"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1380
msgid "Netscape p_lugins"
msgstr "P_lugins Netscape"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1381
msgid "_Closed Tabs"
msgstr "Abas _fechadas"
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5198
+#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5515
msgid "New _Window"
msgstr "Nova _janela"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1383
msgid "New _Folder"
msgstr "Nova _pasta"
+#: ../midori/midori-app.c:1437
+msgid "[Addresses]"
+msgstr "[Endereços]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Arquivo não encontrado."
@@ -387,140 +440,133 @@ msgstr "Formato de favoritos não reconhecido."
msgid "Writing failed."
msgstr "Falha na escrita."
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5280
-#: ../midori/midori-browser.c:5289
+#: ../midori/midori-browser.c:355 ../midori/midori-browser.c:5654
+msgid "Go forward to the next page"
+msgstr "Ir para a página seguinte"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:362 ../midori/midori-browser.c:5662
+#: ../midori/midori-browser.c:5665
+msgid "Go to the next sub-page"
+msgstr "Ir para a subpágina seguinte"
+
+#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5603
+#: ../midori/midori-browser.c:5612
msgid "Reload the current page"
msgstr "Recarregar a página atual"
-#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5286
+#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5609
msgid "Stop loading the current page"
msgstr "Parar o carregamento da página atual"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:527
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Falha ao atualizar título: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Ação inesperada '%s'."
-
-#: ../midori/midori-browser.c:579
+#: ../midori/midori-browser.c:622
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (navegação privada)"
-#: ../midori/midori-browser.c:693 ../midori/midori-browser.c:726
-msgid "Toplevel folder"
-msgstr "Pasta principal"
+#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Favoritos"
-#: ../midori/midori-browser.c:784
+#: ../midori/midori-browser.c:834
msgid "New folder"
msgstr "Nova pasta"
-#: ../midori/midori-browser.c:784
+#: ../midori/midori-browser.c:834
msgid "Edit folder"
msgstr "Editar pasta"
-#: ../midori/midori-browser.c:786
+#: ../midori/midori-browser.c:836
msgid "New bookmark"
msgstr "Novo favorito"
-#: ../midori/midori-browser.c:786
+#: ../midori/midori-browser.c:836
msgid "Edit bookmark"
msgstr "Editar favorito"
-#: ../midori/midori-browser.c:828
-msgid "_Title:"
-msgstr "_Título:"
+#: ../midori/midori-browser.c:870
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Digite um nome para este favorito e escolha onde deseja mantê-lo."
-#: ../midori/midori-browser.c:848 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Endereço:"
-
-#: ../midori/midori-browser.c:871 ../midori/midori-browser.c:4306
-msgid "_Folder:"
-msgstr "_Pasta:"
-
-#: ../midori/midori-browser.c:887
+#: ../midori/midori-browser.c:931
msgid "Add to _Speed Dial"
msgstr "Adicionar à _ligação rápida"
-#: ../midori/midori-browser.c:900
+#: ../midori/midori-browser.c:937
msgid "Show in the tool_bar"
msgstr "Exibir na _barra de ferramentas"
-#: ../midori/midori-browser.c:915
+#: ../midori/midori-browser.c:945
msgid "Run as _web application"
msgstr "Executar como aplicativo _web"
-#: ../midori/midori-browser.c:986
+#: ../midori/midori-browser.c:1016
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "O arquivo \"%s\" não pode ser salvo nessa pasta."
-#: ../midori/midori-browser.c:988
+#: ../midori/midori-browser.c:1018
#, c-format
msgid "You don't have permission to write in this location."
msgstr "Você não tem permissão de escrita nesse local."
-#: ../midori/midori-browser.c:995
+#: ../midori/midori-browser.c:1025
#, c-format
msgid "There is not enough free space to download \"%s\"."
msgstr "Não há espaço livre suficiente para baixar \"%s\"."
-#: ../midori/midori-browser.c:998
+#: ../midori/midori-browser.c:1028
#, c-format
msgid "The file needs %s but only %s are left."
msgstr "O arquivo precisa de %s e só há %s livre."
-#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4375
+#: ../midori/midori-browser.c:1164 ../midori/midori-browser.c:4636
msgid "Save file as"
msgstr "Salvar como"
-#: ../midori/midori-browser.c:1330
-msgid "New Window"
-msgstr "Nova janela"
+#: ../midori/midori-browser.c:1170
+msgid "Save associated _resources"
+msgstr "Salvar _recursos associados"
-#: ../midori/midori-browser.c:1330
+#: ../midori/midori-browser.c:1417
msgid "A new window has been opened"
msgstr "Uma nova janela foi aberta"
-#: ../midori/midori-browser.c:1333
-msgid "New Tab"
-msgstr "Nova aba"
-
-#: ../midori/midori-browser.c:1333
+#: ../midori/midori-browser.c:1420
msgid "A new tab has been opened"
msgstr "Uma nova aba foi aberta"
-#: ../midori/midori-browser.c:1368
+#: ../midori/midori-browser.c:1437
msgid "Error opening the image!"
msgstr "Erro ao abrir a imagem!"
-#: ../midori/midori-browser.c:1369
+#: ../midori/midori-browser.c:1438
msgid "Can not open selected image in a default viewer."
msgstr "Não é possível abrir imagem selecionada em um visualizador padrão."
-#: ../midori/midori-browser.c:1375
+#: ../midori/midori-browser.c:1444
msgid "Error downloading the image!"
msgstr "Erro ao baixar a imagem!"
-#: ../midori/midori-browser.c:1376
+#: ../midori/midori-browser.c:1445
msgid "Can not download selected image."
msgstr "Não é possível baixar a imagem selecionada."
-#: ../midori/midori-browser.c:1481
+#: ../midori/midori-browser.c:1564
msgid "Save file"
msgstr "Salvar arquivo"
-#: ../midori/midori-browser.c:2349
+#: ../midori/midori-browser.c:2467
msgid "Open file"
msgstr "Abrir arquivo"
-#: ../midori/midori-browser.c:2481
+#: ../midori/midori-browser.c:2599
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -534,139 +580,155 @@ msgstr ""
"de notícias. Na próxima vez em que clicar no ícone de um feed de notícias "
"ele será adicionado automaticamente."
-#: ../midori/midori-browser.c:2487 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2605 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Novo feed"
-#: ../midori/midori-browser.c:2530 ../midori/midori-browser.c:5349
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2648 ../midori/midori-browser.c:5678
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Adicionar novo favorito"
-#: ../midori/midori-browser.c:3029 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3192 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Vazio"
-#: ../midori/midori-browser.c:3449
+#: ../midori/midori-browser.c:3638 ../midori/midori-browser.c:3639
msgid "Toggle text cursor navigation"
msgstr "Habilitar/desabilitar navegação por cursor de texto"
-#: ../midori/midori-browser.c:3765 ../midori/midori-browser.c:5735
+#: ../midori/midori-browser.c:3641
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Pressione F7 para ativar ou desativar Caret Browsing. Quando ativo, um "
+"cursor de texto aparece em todos os websites."
+
+#: ../midori/midori-browser.c:3644
+msgid "_Enable Caret Browsing"
+msgstr "Habilitar Nav_egação por cursor"
+
+#: ../midori/midori-browser.c:4036 ../midori/midori-browser.c:6072
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Falha ao inserir novo item no histórico: %s\n"
-#: ../midori/midori-browser.c:4094 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4362 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Abrir tudo em a_bas"
-#: ../midori/midori-browser.c:4101 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4369 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Abrir em nova a_ba"
-#: ../midori/midori-browser.c:4104 ../midori/midori-view.c:2648
-#: ../midori/midori-view.c:4706 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4372 ../midori/midori-view.c:2938
+#: ../midori/midori-view.c:4948 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Abrir em nova _janela"
-#: ../midori/midori-browser.c:4193
+#: ../midori/midori-browser.c:4461
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4194
+#: ../midori/midori-browser.c:4462
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4195
+#: ../midori/midori-browser.c:4463
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4196
+#: ../midori/midori-browser.c:4464
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4197
+#: ../midori/midori-browser.c:4465
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4198
+#: ../midori/midori-browser.c:4466
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4219
-msgid "Import bookmarks..."
-msgstr "Importar favoritos..."
+#: ../midori/midori-browser.c:4467
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4222 ../midori/midori-browser.c:5354
+#: ../midori/midori-browser.c:4488
+msgid "Import bookmarks…"
+msgstr "Importar favoritos…"
+
+#: ../midori/midori-browser.c:4491 ../midori/midori-browser.c:5683
msgid "_Import bookmarks"
msgstr "_Importar favoritos"
-#: ../midori/midori-browser.c:4233
+#: ../midori/midori-browser.c:4502
msgid "_Application:"
msgstr "_Aplicativo:"
-#: ../midori/midori-browser.c:4298
+#: ../midori/midori-browser.c:4567
msgid "Import from XBEL or HTML file"
msgstr "Importar de um arquivo XBEL ou HTML"
-#: ../midori/midori-browser.c:4333
+#: ../midori/midori-browser.c:4595
msgid "Import from a file"
msgstr "Importar de um arquivo"
-#: ../midori/midori-browser.c:4345
+#: ../midori/midori-browser.c:4607
msgid "Failed to import bookmarks"
msgstr "Falha ao importar favoritos"
-#: ../midori/midori-browser.c:4380
+#: ../midori/midori-browser.c:4641
msgid "XBEL Bookmarks"
msgstr "Favoritos XBEL"
-#: ../midori/midori-browser.c:4385
+#: ../midori/midori-browser.c:4646
msgid "Netscape Bookmarks"
msgstr "Favoritos Netscape"
-#: ../midori/midori-browser.c:4399
+#: ../midori/midori-browser.c:4660
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "O Midori só pode exportar para XBEL (*.xbel) e Netscape (*.html)"
-#: ../midori/midori-browser.c:4414
+#: ../midori/midori-browser.c:4675
msgid "Failed to export bookmarks"
msgstr "Falha ao exportar favoritos"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4536
+#: ../midori/midori-browser.c:4797
msgid "Clear Private Data"
msgstr "Limpar dados privados"
-#: ../midori/midori-browser.c:4540
+#: ../midori/midori-browser.c:4801
msgid "_Clear private data"
msgstr "_Limpar dados privados"
-#: ../midori/midori-browser.c:4553
+#: ../midori/midori-browser.c:4816
msgid "Clear the following data:"
msgstr "Limpar os seguintes dados:"
-#: ../midori/midori-browser.c:4563
+#: ../midori/midori-browser.c:4826
msgid "Last open _tabs"
msgstr "Últimas abas abertas"
-#: ../midori/midori-browser.c:4589
+#: ../midori/midori-browser.c:4852
msgid "Clear private data when _quitting Midori"
msgstr "Limpar dados privados ao _sair do Midori"
-#: ../midori/midori-browser.c:4784
+#: ../midori/midori-browser.c:5067
msgid "A lightweight web browser."
msgstr "Um navegador web leve."
-#: ../midori/midori-browser.c:4785
+#: ../midori/midori-browser.c:5068
msgid "See about:version for version info."
msgstr "Veja about:version para informações da versão."
-#: ../midori/midori-browser.c:4787
+#: ../midori/midori-browser.c:5070
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -678,923 +740,608 @@ msgstr ""
"Software Foundation; tanto na versão 2.1 ou (por sua opção) qualquer versão "
"mais recente."
-#: ../midori/midori-browser.c:4808
+#: ../midori/midori-browser.c:5100
msgid "translator-credits"
msgstr ""
"Sérgio Cipolla \n"
-"Rogério Brito "
+"Rogério Brito \n"
+"Rafael Ferreira "
-#: ../midori/midori-browser.c:5196
+#: ../midori/midori-browser.c:5513
msgid "_File"
msgstr "_Arquivo"
-#: ../midori/midori-browser.c:5199
+#: ../midori/midori-browser.c:5516
msgid "Open a new window"
msgstr "Abrir nova janela"
-#: ../midori/midori-browser.c:5202
+#: ../midori/midori-browser.c:5519
msgid "Open a new tab"
msgstr "Abrir nova aba"
-#: ../midori/midori-browser.c:5204
+#: ../midori/midori-browser.c:5521
msgid "New P_rivate Browsing Window"
msgstr "Nova janela de navegação pri_vada"
-#: ../midori/midori-browser.c:5208
+#: ../midori/midori-browser.c:5525
msgid "Open a file"
-msgstr "Abrir arquivo"
+msgstr "Abrir um arquivo"
-#: ../midori/midori-browser.c:5210
-msgid "_Save Page As..."
-msgstr "_Salvar página como..."
+#: ../midori/midori-browser.c:5527
+msgid "_Save Page As…"
+msgstr "_Salvar página como…"
-#: ../midori/midori-browser.c:5211
+#: ../midori/midori-browser.c:5528
msgid "Save to a file"
msgstr "Salvar para arquivo"
-#: ../midori/midori-browser.c:5213
+#: ../midori/midori-browser.c:5530
msgid "Add to Speed _dial"
msgstr "Adicionar à li_gação rápida"
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5534
msgid "Add Shortcut to the _desktop"
msgstr "A_dicionar atalho à área de trabalho"
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5536
msgid "Create _Launcher"
msgstr "Criar lança_dor"
-#: ../midori/midori-browser.c:5223
+#: ../midori/midori-browser.c:5540
msgid "Subscribe to News _feed"
msgstr "Inscrever _feed de notícias"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5546
msgid "_Close Tab"
msgstr "_Fechar aba"
-#: ../midori/midori-browser.c:5230
+#: ../midori/midori-browser.c:5547
msgid "Close the current tab"
msgstr "Fechar a aba atual"
-#: ../midori/midori-browser.c:5232
+#: ../midori/midori-browser.c:5549
msgid "C_lose Window"
msgstr "Fechar jane_la"
-#: ../midori/midori-browser.c:5236
+#: ../midori/midori-browser.c:5553
+msgid "_Share"
+msgstr "_Compartilhar"
+
+#: ../midori/midori-browser.c:5558
msgid "Print the current page"
msgstr "Imprimir a página atual"
-#: ../midori/midori-browser.c:5238
+#: ../midori/midori-browser.c:5561
msgid "Close a_ll Windows"
msgstr "Fechar _todas as janelas"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5564
msgid "_Edit"
msgstr "_Editar"
-#: ../midori/midori-browser.c:5264
-msgid "_Find..."
-msgstr "Locali_zar..."
+#: ../midori/midori-browser.c:5587
+msgid "_Find…"
+msgstr "Locali_zar…"
-#: ../midori/midori-browser.c:5265
+#: ../midori/midori-browser.c:5588
msgid "Find a word or phrase in the page"
msgstr "Localizar palavra ou frase na página"
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5590
msgid "Find _Next"
msgstr "Localizar _seguinte"
-#: ../midori/midori-browser.c:5270
+#: ../midori/midori-browser.c:5593
msgid "Find _Previous"
msgstr "Localizar _anterior"
-#: ../midori/midori-browser.c:5274
+#: ../midori/midori-browser.c:5597
msgid "Configure the application preferences"
msgstr "Configurar preferências do aplicativo"
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5599
msgid "_View"
msgstr "_Ver"
-#: ../midori/midori-browser.c:5277
+#: ../midori/midori-browser.c:5600
msgid "_Toolbars"
msgstr "_Barras de ferramentas"
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5605
msgid "Reload page without caching"
msgstr "Recarregar a página sem caching"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5615
msgid "Increase the zoom level"
msgstr "Ampliar"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5618
msgid "Decrease the zoom level"
msgstr "Reduzir"
-#: ../midori/midori-browser.c:5299
+#: ../midori/midori-browser.c:5622
msgid "_Encoding"
msgstr "_Codificação"
-#: ../midori/midori-browser.c:5301
+#: ../midori/midori-browser.c:5624
msgid "View So_urce"
msgstr "Ver _fonte"
-#: ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:5627
msgid "Ca_ret Browsing"
msgstr "Navegação _por cursor"
-#: ../midori/midori-browser.c:5308
+#: ../midori/midori-browser.c:5631
msgid "Toggle fullscreen view"
msgstr "Alternar tela cheia"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5633
msgid "Scroll _Left"
msgstr "Rolar à _esquerda"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5636
msgid "Scroll _Down"
msgstr "Rolar para _baixo"
-#: ../midori/midori-browser.c:5316
+#: ../midori/midori-browser.c:5639
msgid "Scroll _Up"
msgstr "Rolar para _cima"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5642
msgid "Scroll _Right"
msgstr "Rolar à _direita"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5645
+msgid "_Readable"
+msgstr "_Legível"
+
+#: ../midori/midori-browser.c:5648
msgid "_Go"
msgstr "_Ir"
-#: ../midori/midori-browser.c:5325
+#: ../midori/midori-browser.c:5651
msgid "Go back to the previous page"
msgstr "Ir para a página anterior"
-#: ../midori/midori-browser.c:5328
-msgid "Go forward to the next page"
-msgstr "Ir para a página seguinte"
-
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5332
+#: ../midori/midori-browser.c:5658
msgid "Go to the previous sub-page"
msgstr "Ir para a subpágina anterior"
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5336
-msgid "Go to the next sub-page"
-msgstr "Ir para a subpágina seguinte"
+#: ../midori/midori-browser.c:5667
+msgid "_Homepage"
+msgstr "_Página inicial"
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5668
msgid "Go to your homepage"
msgstr "Ir para a página inicial"
-#: ../midori/midori-browser.c:5341
+#: ../midori/midori-browser.c:5670
msgid "Empty Trash"
msgstr "Esvaziar lixo"
-#: ../midori/midori-browser.c:5344
+#: ../midori/midori-browser.c:5673
msgid "Undo _Close Tab"
msgstr "De_sfazer fechar aba"
-#: ../midori/midori-browser.c:5351
+#: ../midori/midori-browser.c:5680
msgid "Add a new _folder"
msgstr "Adicionar _nova pasta"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5686
msgid "_Export bookmarks"
msgstr "_Exportar favoritos"
-#: ../midori/midori-browser.c:5360 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5689 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "Gerenciar motores de _pesquisa"
-#: ../midori/midori-browser.c:5363
+#: ../midori/midori-browser.c:5692
msgid "_Clear Private Data"
msgstr "Limpar _dados privados"
-#: ../midori/midori-browser.c:5366
+#: ../midori/midori-browser.c:5695
msgid "_Inspect Page"
msgstr "_Inspecionar página"
-#: ../midori/midori-browser.c:5370
+#: ../midori/midori-browser.c:5699
msgid "_Previous Tab"
msgstr "Aba _anterior"
-#: ../midori/midori-browser.c:5373
+#: ../midori/midori-browser.c:5702
msgid "_Next Tab"
msgstr "Aba _seguinte"
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5704
msgid "Move Tab _Backward"
msgstr "Mover a aba para _trás"
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5706
msgid "_Move Tab Forward"
msgstr "Mover a aba para a _frente"
-#: ../midori/midori-browser.c:5380
+#: ../midori/midori-browser.c:5709
msgid "Focus _Current Tab"
msgstr "_Focar a aba atual"
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5712
msgid "Focus _Next view"
msgstr "Focar o _campo de visão seguinte"
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5715
msgid "Only show the Icon of the _Current Tab"
msgstr "Exibir apenas o _ícone da aba atual"
-#: ../midori/midori-browser.c:5389
+#: ../midori/midori-browser.c:5718
msgid "_Duplicate Current Tab"
msgstr "Duplicar a_ba atual"
-#: ../midori/midori-browser.c:5392
+#: ../midori/midori-browser.c:5721
msgid "Close Ot_her Tabs"
msgstr "Fec_har outras abas"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5724
msgid "Open last _session"
msgstr "Abrir a _última sessão"
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5727
msgid "_Help"
msgstr "Aj_uda"
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5729
msgid "_Frequent Questions"
msgstr "Perguntas fre_quentes"
-#: ../midori/midori-browser.c:5403
-msgid "_Report a Problem..."
-msgstr "_Relatar um problema..."
+#: ../midori/midori-browser.c:5732
+msgid "_Report a Problem…"
+msgstr "_Relatar um problema…"
-#: ../midori/midori-browser.c:5415
-msgid "_Menubar"
-msgstr "Barra de _menu"
-
-#: ../midori/midori-browser.c:5419
-msgid "_Navigationbar"
-msgstr "Barra de _navegação"
-
-#: ../midori/midori-browser.c:5423
-msgid "Side_panel"
-msgstr "Painel _lateral"
-
-#: ../midori/midori-browser.c:5424
-msgid "Sidepanel"
-msgstr "Painel lateral"
-
-#: ../midori/midori-browser.c:5427
-msgid "_Bookmarkbar"
-msgstr "Barra de _favoritos"
-
-#: ../midori/midori-browser.c:5431
-msgid "_Statusbar"
-msgstr "Barra de _status"
-
-#: ../midori/midori-browser.c:5440 ../midori/midori-websettings.c:311
-msgid "_Automatic"
-msgstr "_Automático"
-
-#: ../midori/midori-browser.c:5443 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "Chinês (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5447
-msgid "Japanese (SHIFT__JIS)"
-msgstr "Japonês (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:5450 ../midori/midori-websettings.c:238
-msgid "Korean (EUC-KR)"
-msgstr "Coreano (EUC-KR)"
-
-#: ../midori/midori-browser.c:5453 ../midori/midori-websettings.c:239
-msgid "Russian (KOI8-R)"
-msgstr "Russo (KOI8-R)"
-
-#: ../midori/midori-browser.c:5456 ../midori/midori-websettings.c:240
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-browser.c:5459 ../midori/midori-websettings.c:241
-msgid "Western (ISO-8859-1)"
-msgstr "Ocidental (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5462 ../midori/midori-websettings.c:242
-#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Personalizado..."
-
-#: ../midori/midori-browser.c:5967
-msgid "_Separator"
-msgstr "_Aba"
-
-#: ../midori/midori-browser.c:5974
-msgid "_Location..."
-msgstr "_Localização..."
-
-#: ../midori/midori-browser.c:5976
-msgid "Open a particular location"
-msgstr "Abrir localização específica"
-
-#: ../midori/midori-browser.c:5998
-msgid "_Web Search..."
-msgstr "Pesquisa _web..."
-
-#: ../midori/midori-browser.c:6000
-msgid "Run a web search"
-msgstr "Pesquisar na web"
-
-#: ../midori/midori-browser.c:6027
-msgid "Reopen a previously closed tab or window"
-msgstr "Reabrir janela ou aba anteriormente fechada"
-
-#: ../midori/midori-browser.c:6044
-msgid "Show the saved bookmarks"
-msgstr "Exibir favoritos salvos"
-
-#: ../midori/midori-browser.c:6061
+#: ../midori/midori-browser.c:5737 ../midori/midori-browser.c:6398
msgid "_Tools"
msgstr "Ferramen_tas"
-#: ../midori/midori-browser.c:6077
+#: ../midori/midori-browser.c:5744
+msgid "_Menubar"
+msgstr "Barra de _menu"
+
+#: ../midori/midori-browser.c:5748
+msgid "_Navigationbar"
+msgstr "Barra de _navegação"
+
+#: ../midori/midori-browser.c:5752
+msgid "Side_panel"
+msgstr "Painel _lateral"
+
+#: ../midori/midori-browser.c:5753
+msgid "Sidepanel"
+msgstr "Painel lateral"
+
+#: ../midori/midori-browser.c:5756
+msgid "_Bookmarkbar"
+msgstr "Barra de _favoritos"
+
+#: ../midori/midori-browser.c:5760
+msgid "_Statusbar"
+msgstr "Barra de _status"
+
+#: ../midori/midori-browser.c:5769 ../midori/midori-websettings.c:198
+msgid "_Automatic"
+msgstr "_Automático"
+
+#: ../midori/midori-browser.c:5772 ../midori/midori-websettings.c:122
+msgid "Chinese Traditional (BIG5)"
+msgstr "Chinês Tradicional (BIG5)"
+
+#: ../midori/midori-browser.c:5775 ../midori/midori-websettings.c:123
+msgid "Chinese Simplified (GB18030)"
+msgstr "Chinês Simplificado (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5779
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japonês (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5782 ../midori/midori-websettings.c:125
+msgid "Korean (EUC-KR)"
+msgstr "Coreano (EUC-KR)"
+
+#: ../midori/midori-browser.c:5785 ../midori/midori-websettings.c:126
+msgid "Russian (KOI8-R)"
+msgstr "Russo (KOI8-R)"
+
+#: ../midori/midori-browser.c:5788 ../midori/midori-websettings.c:127
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5791 ../midori/midori-websettings.c:128
+msgid "Western (ISO-8859-1)"
+msgstr "Ocidental (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5794
+msgid "Custom…"
+msgstr "Personalizado…"
+
+#: ../midori/midori-browser.c:6304
+msgid "_Separator"
+msgstr "_Aba"
+
+#: ../midori/midori-browser.c:6311
+msgid "_Location…"
+msgstr "_Localização…"
+
+#: ../midori/midori-browser.c:6313
+msgid "Open a particular location"
+msgstr "Abrir localização específica"
+
+#: ../midori/midori-browser.c:6335
+msgid "_Web Search…"
+msgstr "Pesquisa _web…"
+
+#: ../midori/midori-browser.c:6337
+msgid "Run a web search"
+msgstr "Pesquisar na web"
+
+#: ../midori/midori-browser.c:6364
+msgid "Reopen a previously closed tab or window"
+msgstr "Reabrir janela ou aba anteriormente fechada"
+
+#: ../midori/midori-browser.c:6381
+msgid "Show the saved bookmarks"
+msgstr "Exibir favoritos salvos"
+
+#: ../midori/midori-browser.c:6414
msgid "_Window"
msgstr "_Janela"
-#: ../midori/midori-browser.c:6079
+#: ../midori/midori-browser.c:6416
msgid "Show a list of all open tabs"
msgstr "Exibir lista das abas abertas"
-#: ../midori/midori-browser.c:6093
+#: ../midori/midori-browser.c:6430
msgid "_Menu"
msgstr "_Menu"
-#: ../midori/midori-browser.c:6095
+#: ../midori/midori-browser.c:6432
msgid "Menu"
msgstr "Menu"
-#: ../midori/midori-browser.c:6909
+#: ../midori/midori-browser.c:7257
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Configuração inesperada '%s'"
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:330
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "A configuração da extensão '%s' não pôde ser carregada: %s\n"
-#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
-#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:749 ../midori/midori-extension.c:846
+#: ../midori/midori-extension.c:943 ../midori/midori-extension.c:1055
+#: ../extensions/addons.c:1685
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "A configuração da extensão '%s' não pôde ser salva: %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "Pesquisar com %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Pesquisar com..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "Pesquisar com…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "Falha ao selecionar do histórico\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "Pesquisar por %s"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "Exportar certificado"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "A autoridade certificado signatária é desconhecida."
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"O certificado não corresponde à identidade experada para o site do qual o "
+"certificado foi adquirido."
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "O tempo de ativação do certificado está no futuro."
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "O certificado expirou"
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"O certificado foi revogado, de acordo com a lista de revogação de "
+"certificado da GTlsConnection"
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "O algoritmo do certificado é considerado inseguro."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "Alguns erros ocorreram na validação do certificado."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "_Exportar certificado"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "Auto-assinado"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "Detalhes da segurança"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1400
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "Cola_r e prosseguir"
-#: ../midori/midori-locationaction.c:1768
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "Não verificado"
-#: ../midori/midori-locationaction.c:1788
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "Verificado e conexão criptografada"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-locationaction.c:1989
+msgid "Open, unencrypted connection"
+msgstr "Aberto, conexão não criptografada"
+
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Alinhar painel lateral à direita"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Fechar painel"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Alinhar painel lateral à esquerda"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:104
msgid "Show Speed Dial"
msgstr "Exibir ligação rápida"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:105
msgid "Show Homepage"
msgstr "Exibir a página inicial"
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:124
msgid "Japanese (SHIFT_JIS)"
msgstr "Japonês (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:129 ../midori/midori-websettings.c:205
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Personalizado..."
+
+#: ../midori/midori-websettings.c:144
msgid "New tab"
msgstr "Nova aba"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:145
msgid "New window"
msgstr "Nova janela"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:146
msgid "Current tab"
msgstr "Aba atual"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:161
msgid "Default"
msgstr "Padrão"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:162
msgid "Icons"
msgstr "Ícones"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:163
msgid "Small icons"
msgstr "Ícones pequenos"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:164
msgid "Text"
msgstr "Texto"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:165
msgid "Icons and text"
msgstr "Ícones e texto"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:166
msgid "Text beside icons"
msgstr "Texto ao lado dos ícones"
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:181
msgid "Automatic (GNOME or environment)"
msgstr "Automático (GNOME ou ambiente)"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:182
msgid "HTTP proxy server"
msgstr "Servidor proxy HTTP"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:183
msgid "No proxy server"
msgstr "Sem servidor proxy"
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:200
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:201
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:202
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:203
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:204
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:400
-msgid "Remember last window size"
-msgstr "Lembrar último tamanho da janela"
-
-#: ../midori/midori-websettings.c:401
-msgid "Whether to save the last window size"
-msgstr "Se o último tamanho da janela deve ser salvo"
-
-#: ../midori/midori-websettings.c:409
-msgid "Last window width"
-msgstr "Última largura da janela"
-
-#: ../midori/midori-websettings.c:410
-msgid "The last saved window width"
-msgstr "Última largura da janela salva"
-
-#: ../midori/midori-websettings.c:418
-msgid "Last window height"
-msgstr "Última altura da janela"
-
-#: ../midori/midori-websettings.c:419
-msgid "The last saved window height"
-msgstr "Última altura da janela salva"
-
-#: ../midori/midori-websettings.c:444
-msgid "Last panel position"
-msgstr "Última posição do painel"
-
-#: ../midori/midori-websettings.c:445
-msgid "The last saved panel position"
-msgstr "Última posição do painel salva"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
-msgid "Last panel page"
-msgstr "Última página do painel"
-
-#: ../midori/midori-websettings.c:455
-msgid "The last saved panel page"
-msgstr "Última página do painel salva"
-
-#: ../midori/midori-websettings.c:463
-msgid "Last Web search"
-msgstr "Última pesquisa na web"
-
-#: ../midori/midori-websettings.c:464
-msgid "The last saved Web search"
-msgstr "Última pesquisa na web salva"
-
-#: ../midori/midori-websettings.c:473
-msgid "Show Menubar"
-msgstr "Exibir barra de menu"
-
-#: ../midori/midori-websettings.c:474
-msgid "Whether to show the menubar"
-msgstr "Se a barra de menu deve ser exibida"
-
-#: ../midori/midori-websettings.c:482
-msgid "Show Navigationbar"
-msgstr "Exibir barra de navegação"
-
-#: ../midori/midori-websettings.c:483
-msgid "Whether to show the navigationbar"
-msgstr "Se a barra de navegação deve ser exibida"
-
-#: ../midori/midori-websettings.c:491
-msgid "Show Bookmarkbar"
-msgstr "Exibir barra de favoritos"
-
-#: ../midori/midori-websettings.c:492
-msgid "Whether to show the bookmarkbar"
-msgstr "Se a barra de favoritos deve ser exibida"
-
-#: ../midori/midori-websettings.c:500
-msgid "Show Panel"
-msgstr "Exibir painel"
-
-#: ../midori/midori-websettings.c:501
-msgid "Whether to show the panel"
-msgstr "Se o painel deve ser exibido"
-
-#: ../midori/midori-websettings.c:509
-msgid "Show Statusbar"
-msgstr "Exibir barra de status"
-
-#: ../midori/midori-websettings.c:510
-msgid "Whether to show the statusbar"
-msgstr "Se a barra de status deve ser exibida"
-
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:277
msgid "Toolbar Style:"
msgstr "Estilo da barra de ferramentas:"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:278
msgid "The style of the toolbar"
msgstr "O estilo da barra de ferramentas"
-#: ../midori/midori-websettings.c:529
-msgid "Toolbar Items"
-msgstr "Itens da barra de ferramentas"
-
-#: ../midori/midori-websettings.c:530
-msgid "The items to show on the toolbar"
-msgstr "Itens a serem exibidos na barra de ferramentas"
-
-#: ../midori/midori-websettings.c:538
-msgid "Compact Sidepanel"
-msgstr "Painel lateral compacto"
-
-#: ../midori/midori-websettings.c:539
-msgid "Whether to make the sidepanel compact"
-msgstr "Se o painel lateral deve ser compacto"
-
-#: ../midori/midori-websettings.c:554
-msgid "Align sidepanel on the right"
-msgstr "Alinhar painel lateral à direita"
-
-#: ../midori/midori-websettings.c:555
-msgid "Whether to align the sidepanel on the right"
-msgstr "Se o painel lateral deve ser alinhado à direita"
-
-#: ../midori/midori-websettings.c:570
-msgid "Open panels in separate windows"
-msgstr "Abrir painéis em janelas separadas"
-
-#: ../midori/midori-websettings.c:571
-msgid "Whether to always open panels in separate windows"
-msgstr "Se os painéis devem ser sempre abertos em janelas separadas"
-
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:287
msgid "When Midori starts:"
msgstr "Ao iniciar o Midori:"
-#: ../midori/midori-websettings.c:581
-msgid "What to do when Midori starts"
-msgstr "O que fazer ao iniciar o Midori"
-
-#: ../midori/midori-websettings.c:590
-msgid "Homepage:"
-msgstr "Página inicial:"
-
-#: ../midori/midori-websettings.c:591
-msgid "The homepage"
-msgstr "A página inicial"
-
-#: ../midori/midori-websettings.c:606
-msgid "Show crash dialog"
-msgstr "Exibir diálogo de encerramento abrupto"
-
-#: ../midori/midori-websettings.c:607
-msgid "Show a dialog after Midori crashed"
-msgstr "Exibir um diálogo após o encerramento abrupto do Midori"
-
-#: ../midori/midori-websettings.c:615
-msgid "Save downloaded files to:"
-msgstr "Salvar arquivos baixados em:"
-
-#: ../midori/midori-websettings.c:616
-msgid "The folder downloaded files are saved to"
-msgstr "A pasta na qual salvar os arquivos baixados"
-
-#: ../midori/midori-websettings.c:624
-msgid "Text Editor"
-msgstr "Editor de texto"
-
-#: ../midori/midori-websettings.c:625
-msgid "An external text editor"
-msgstr "Um editor de texto externo"
-
-#: ../midori/midori-websettings.c:640
-msgid "News Aggregator"
-msgstr "Agregador de notícias"
-
-#: ../midori/midori-websettings.c:641
-msgid "An external news aggregator"
-msgstr "Um agregador de notícias externo"
-
-#: ../midori/midori-websettings.c:649
-msgid "Location entry Search"
-msgstr "Pesquisa no campo de endereço"
-
-#: ../midori/midori-websettings.c:650
-msgid "The search to perform inside the location entry"
-msgstr "A pesquisa a ser executada pelo campo de endereço"
-
-#: ../midori/midori-websettings.c:658
+#: ../midori/midori-websettings.c:297
msgid "Preferred Encoding"
msgstr "Codificação preferida"
-#: ../midori/midori-websettings.c:659
-msgid "The preferred character encoding"
-msgstr "A codificação de caracteres preferida"
-
-#: ../midori/midori-websettings.c:669
-msgid "Always Show Tabbar"
-msgstr "Sempre exibir barra de abas"
-
-#: ../midori/midori-websettings.c:670
-msgid "Always show the tabbar"
-msgstr "Se a barra de abas deve ser exibida mesmo com apenas uma aba aberta"
-
-#: ../midori/midori-websettings.c:683
-msgid "Close Buttons on Tabs"
-msgstr "Botão fechar nas abas"
-
-#: ../midori/midori-websettings.c:684
-msgid "Whether tabs have close buttons"
-msgstr "Se as abas devem ter um botão para fechar"
-
-#: ../midori/midori-websettings.c:709
+#: ../midori/midori-websettings.c:324
msgid "Open new pages in:"
msgstr "Abrir novas páginas em:"
-#: ../midori/midori-websettings.c:710
-msgid "Where to open new pages"
-msgstr "Onde abrir novas páginas"
-
-#: ../midori/midori-websettings.c:719
-msgid "Middle click opens Selection"
-msgstr "Clicar o botão do meio do mouse abre seleção"
-
-#: ../midori/midori-websettings.c:720
-msgid "Load an address from the selection via middle click"
-msgstr "Carregar o endereço selecionado clicando o botão do meio do mouse"
-
-#: ../midori/midori-websettings.c:728
-msgid "Open tabs in the background"
-msgstr "Abrir abas em segundo plano"
-
-#: ../midori/midori-websettings.c:729
-msgid "Whether to open new tabs in the background"
-msgstr "Se as novas abas devem ser abertas em segundo plano"
-
-#: ../midori/midori-websettings.c:737
-msgid "Open Tabs next to Current"
-msgstr "Abrir abas ao lado da atual"
-
-#: ../midori/midori-websettings.c:738
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr ""
-"Se as novas abas devem ser abertas ao lado da atual em vez de após a última"
-
-#: ../midori/midori-websettings.c:746
-msgid "Open popups in tabs"
-msgstr "Abrir popups em abas"
-
-#: ../midori/midori-websettings.c:747
-msgid "Whether to open popup windows in tabs"
-msgstr "Se janelas popup devem ser abertas em abas"
-
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Carregar imagens automaticamente"
-
-#: ../midori/midori-websettings.c:758
-msgid "Load and display images automatically"
-msgstr "Carregar e exibir as imagens automaticamente"
-
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Habilitar scripts"
-
-#: ../midori/midori-websettings.c:766
-msgid "Enable embedded scripting languages"
-msgstr "Habilitar linguagem de scripts incorporadas"
-
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Habilitar plugins Netscape"
-
-#: ../midori/midori-websettings.c:774
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Habilitar plugins Netscape incorporados"
-
-#: ../midori/midori-websettings.c:789
-msgid "Enable Spell Checking"
-msgstr "Habilitar verificação ortográfica"
-
-#: ../midori/midori-websettings.c:790
-msgid "Enable spell checking while typing"
-msgstr "Habilitar verificação ortográfica ao digitar"
-
-#: ../midori/midori-websettings.c:796
-msgid "Enable HTML5 database support"
-msgstr "Habilitar suporte a bases de dados HTML5"
-
-#: ../midori/midori-websettings.c:797
-msgid "Whether to enable HTML5 database support"
-msgstr "Se o suporte a bases de dados HTML5 deve ser habilitado"
-
-#: ../midori/midori-websettings.c:803
-msgid "Enable HTML5 local storage support"
-msgstr "Habilitar suporte a armazenagem local HTML5"
-
-#: ../midori/midori-websettings.c:804
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Se o suporte a armazenagem local HTML5 deve ser habilitado"
-
-#: ../midori/midori-websettings.c:810
-msgid "Enable offline web application cache"
-msgstr "Habilitar cache de aplicativos web offline"
-
-#: ../midori/midori-websettings.c:811
-msgid "Whether to enable offline web application cache"
-msgstr "Se o cache de aplicativos web offline deve ser habilitado"
-
-#: ../midori/midori-websettings.c:827
-msgid "Flash window on background tabs"
-msgstr "Piscar janela em abas de segundo plano"
-
-#: ../midori/midori-websettings.c:828
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr ""
-"Pisca a janela do navegador se uma nova aba for aberta em segundo plano"
-
-#: ../midori/midori-websettings.c:836
-msgid "Enable WebGL support"
-msgstr "Habilitar suporte a WebGL"
-
-#: ../midori/midori-websettings.c:837
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Permitir que sites usem renderização OpenGL"
-
-#: ../midori/midori-websettings.c:863
-msgid "Zoom Text and Images"
-msgstr "Zoom de texto e imagens"
-
-#: ../midori/midori-websettings.c:864
-msgid "Whether to zoom text and images"
-msgstr "Se o zoom de texto e imagens pode ser ajustado"
-
-#: ../midori/midori-websettings.c:879
-msgid "Find inline while typing"
-msgstr "Localizar na página ao digitar"
-
-#: ../midori/midori-websettings.c:880
-msgid "Whether to automatically find inline while typing"
-msgstr "Se a localização na página deve se dar automaticamente ao digitar"
-
-#: ../midori/midori-websettings.c:895
-msgid "Kinetic scrolling"
-msgstr "Rolagem cinética"
-
-#: ../midori/midori-websettings.c:896
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Se a rolagem deve se mover cineticamente conforme a velocidade"
-
-#: ../midori/midori-websettings.c:904
-msgid "Delete old Cookies after:"
-msgstr "Excluir cookies antigos após:"
-
-#: ../midori/midori-websettings.c:905
-msgid "The maximum number of days to save cookies for"
-msgstr "O número máximo de dias para manter cookies salvos"
-
-#: ../midori/midori-websettings.c:921
-msgid "Only accept Cookies from sites you visit"
-msgstr "Aceitar coockies apenas de sites visitados"
-
-#: ../midori/midori-websettings.c:922
-msgid "Block cookies sent by third-party websites"
-msgstr "Bloquear coockies enviados por outros sites"
-
-#: ../midori/midori-websettings.c:936
-msgid "Delete pages from history after:"
-msgstr "Excluir páginas do histórico após:"
-
-#: ../midori/midori-websettings.c:937
-msgid "The maximum number of days to save the history for"
-msgstr "O número máximo de dias para os quais manter um histórico"
-
-#: ../midori/midori-websettings.c:952
-msgid "Proxy server"
-msgstr "Servidor proxy"
-
-#: ../midori/midori-websettings.c:953
-msgid "The type of proxy server to use"
-msgstr "O tipo de servidor a utilizar"
-
-#: ../midori/midori-websettings.c:962
-msgid "HTTP Proxy Server"
-msgstr "Servidor proxy HTTP"
-
-#: ../midori/midori-websettings.c:963
-msgid "The proxy server used for HTTP connections"
-msgstr "Servidor proxy para conexões HTTP"
-
-#: ../midori/midori-websettings.c:978
-msgid "Port"
-msgstr "Porta"
-
-#: ../midori/midori-websettings.c:979
-msgid "The proxy server port used for HTTP connections"
-msgstr "Porta do servidor proxy usado para conexões HTTPS"
-
-#: ../midori/midori-websettings.c:997
-msgid "The maximum size of cached pages on disk"
-msgstr "O tamanho máximo no disco das páginas em cache"
-
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
+#: ../midori/midori-websettings.c:387
msgid "Identify as"
msgstr "Identificar-se como"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:388
msgid "What to identify as to web pages"
msgstr "Identificar-se para as páginas web como"
-#: ../midori/midori-websettings.c:1031
-msgid "Identification string"
-msgstr "Cadeia de identificação"
-
-#: ../midori/midori-websettings.c:1032
-msgid "The application identification string"
-msgstr "A cadeia de identificação do aplicativo"
-
-#: ../midori/midori-websettings.c:1048
+#: ../midori/midori-websettings.c:421
msgid "Preferred languages"
msgstr "Idiomas preferidos"
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:422
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1603,438 +1350,530 @@ msgstr ""
"páginas web multilíngues, por exemplo \"pt\", \"ru,es\" ou \"en-us;q=1.0, fr-"
"fr;q=0.667\""
-#: ../midori/midori-websettings.c:1064
-msgid "Clear private data"
-msgstr "Limpar dados privados"
-
-#: ../midori/midori-websettings.c:1065
-msgid "The private data selected for deletion"
-msgstr "Os dados privados selecionados para exclusão"
-
-#: ../midori/midori-websettings.c:1080
-msgid "Clear data"
-msgstr "Limpar dados"
-
-#: ../midori/midori-websettings.c:1081
-msgid "The data selected for deletion"
-msgstr "Os dados selecionados para exclusão"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
-msgid "Strip referrer details sent to websites"
-msgstr "Eliminar detalhes do referrer enviados a sites externos"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Se o cabeçalho \"Referer\" deve limitar-se ao nome do host"
-
-#: ../midori/midori-websettings.c:1146
+#: ../midori/midori-websettings.c:471
msgid "Always use my font choices"
msgstr "Sempre usar minhas escolhas de fonte"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:472
msgid "Override fonts picked by websites with user preferences"
msgstr "Substituir fontes escolhidas por sites com as preferencias do usuário"
-#: ../midori/midori-view.c:1353
+#: ../midori/midori-view.c:997 ../midori/midori-view.c:1136
+msgid "Trust this website"
+msgstr "Confiar neste site"
+
+#: ../midori/midori-view.c:1134
+msgid "Security unknown"
+msgstr "Segurança desconhecida"
+
+#: ../midori/midori-view.c:1432
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s quer salvar uma base de dados HTML5."
-#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389
+#: ../midori/midori-view.c:1436 ../midori/midori-view.c:1470
msgid "_Deny"
msgstr "_Negar"
-#: ../midori/midori-view.c:1357 ../midori/midori-view.c:1389
+#: ../midori/midori-view.c:1436 ../midori/midori-view.c:1470
msgid "_Allow"
msgstr "_Permitir"
-#: ../midori/midori-view.c:1385
+#: ../midori/midori-view.c:1465
#, c-format
msgid "%s wants to know your location."
msgstr "%s quer saber a sua localização."
-#: ../midori/midori-view.c:1476
+#: ../midori/midori-view.c:1561
#, c-format
msgid "Error - %s"
msgstr "Erro - %s"
-#: ../midori/midori-view.c:1477
+#: ../midori/midori-view.c:1562
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "A página '%s' não pôde ser carregada."
-#: ../midori/midori-view.c:1479
+#: ../midori/midori-view.c:1564
msgid "Try again"
msgstr "Tentar novamente"
-#: ../midori/midori-view.c:1676 ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:1760 ../midori/midori-view.c:2873
#, c-format
msgid "Send a message to %s"
msgstr "Enviar uma mensagem para %s"
-#: ../midori/midori-view.c:2419 ../midori/midori-view.c:2738
+#: ../midori/midori-view.c:2659
+msgid "Add _search engine..."
+msgstr "Adicionar mecanismo de _pesquisa..."
+
+#: ../midori/midori-view.c:2703 ../midori/midori-view.c:3029
msgid "Inspect _Element"
msgstr "Inspecionar _elemento"
-#: ../midori/midori-view.c:2471
+#: ../midori/midori-view.c:2755
msgid "Open Link in New _Tab"
msgstr "Abrir link em nova a_ba"
-#: ../midori/midori-view.c:2475
+#: ../midori/midori-view.c:2759
msgid "Open Link in _Foreground Tab"
msgstr "Abrir link na aba em _primeiro plano"
-#: ../midori/midori-view.c:2476
+#: ../midori/midori-view.c:2760
msgid "Open Link in _Background Tab"
msgstr "Abrir link na aba em _segundo plano"
-#: ../midori/midori-view.c:2479
+#: ../midori/midori-view.c:2763
msgid "Open Link in New _Window"
msgstr "Abrir link em nova _janela"
-#: ../midori/midori-view.c:2482
+#: ../midori/midori-view.c:2766
msgid "Open Link as Web A_pplication"
msgstr "Abrir link como aplicativo _web"
-#: ../midori/midori-view.c:2487
+#: ../midori/midori-view.c:2771
msgid "Copy Link de_stination"
msgstr "Copiar _destino do link"
-#: ../midori/midori-view.c:2503
+#: ../midori/midori-view.c:2787
msgid "Open _Image in New Tab"
msgstr "Abrir _imagem em nova aba"
-#: ../midori/midori-view.c:2506
+#: ../midori/midori-view.c:2790
msgid "Copy Image _Address"
msgstr "Copiar _endereço da imagem"
-#: ../midori/midori-view.c:2509
+#: ../midori/midori-view.c:2793
msgid "Save I_mage"
msgstr "Salvar i_magem"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2796
msgid "Open in Image _Viewer"
msgstr "Abrir no Visualizador de Imagens"
-#: ../midori/midori-view.c:2519
+#: ../midori/midori-view.c:2803
msgid "Copy Video _Address"
msgstr "Copiar _endereço do vídeo"
-#: ../midori/midori-view.c:2522
+#: ../midori/midori-view.c:2806
msgid "Save _Video"
msgstr "Salvar _vídeo"
-#: ../midori/midori-view.c:2522
+#: ../midori/midori-view.c:2806
msgid "Download _Video"
msgstr "Baixar _vídeo"
-#: ../midori/midori-view.c:2548
+#: ../midori/midori-view.c:2832
msgid "Search _with"
msgstr "Pesquisar _com"
-#: ../midori/midori-view.c:2580
+#: ../midori/midori-view.c:2864
msgid "_Search the Web"
msgstr "_Pesquisar na web"
-#: ../midori/midori-view.c:2597
+#: ../midori/midori-view.c:2881
msgid "Open Address in New _Tab"
msgstr "Abrir endereço em nova a_ba"
-#: ../midori/midori-view.c:2887
-msgid "Open or download file"
-msgstr "Abrir ou baixar arquivo"
+#: ../midori/midori-view.c:2934
+msgid "Open _Frame in New Tab"
+msgstr "Abrir _Frame em nova aba"
-#: ../midori/midori-view.c:2906
+#: ../midori/midori-view.c:3191
#, c-format
-msgid "File Type: '%s'"
-msgstr "Tipo de arquivo: '%s'"
+msgid "Open or download file from %s"
+msgstr "Abrir ou baixar arquivo de %s"
-#: ../midori/midori-view.c:2908
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Tipo de arquivo: %s ('%s')"
-
-#: ../midori/midori-view.c:2913
+#: ../midori/midori-view.c:3215
#, c-format
msgid "File Name: %s"
msgstr "Nome do arquivo: %s"
+#: ../midori/midori-view.c:3220
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Tipo de arquivo: '%s'"
+
+#: ../midori/midori-view.c:3222
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Tipo de arquivo: %s ('%s')"
+
+#: ../midori/midori-view.c:3257
+#, c-format
+msgid "Size: %s"
+msgstr "Tamanho: %s"
+
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2932
+#: ../midori/midori-view.c:3268
#, c-format
msgid "Open %s"
msgstr "Abrir %s"
-#: ../midori/midori-view.c:3578
+#: ../midori/midori-view.c:3900
#, c-format
msgid "Inspect page - %s"
msgstr "Inspecionar página - %s"
-#: ../midori/midori-view.c:3925
-msgid "Speed Dial"
-msgstr "Ligação rápida"
-
-#: ../midori/midori-view.c:3926 ../midori/midori-view.c:4022
-msgid "Click to add a shortcut"
-msgstr "Clique para adicionar um atalho"
-
-#: ../midori/midori-view.c:3927
-msgid "Enter shortcut address"
-msgstr "Informe o endereço do atalho"
-
-#: ../midori/midori-view.c:3928
-msgid "Enter shortcut title"
-msgstr "Informe o título do atalho"
-
-#: ../midori/midori-view.c:3929
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "Tem certeza de que quer excluir esse atalho?"
-
-#: ../midori/midori-view.c:4091
+#: ../midori/midori-view.c:4299
#, c-format
msgid "No documentation installed"
msgstr "Nenhuma documentação instalada"
-#: ../midori/midori-view.c:4167
+#: ../midori/midori-view.c:4376
msgid "Midori doesn't store any personal data:"
msgstr "Midori não armazena quaisquer dados pessoais:"
-#: ../midori/midori-view.c:4168
+#: ../midori/midori-view.c:4377
msgid "No history or web cookies are being saved."
msgstr "O histórico e cookies não estando sendo guardados."
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4378
msgid "Extensions are disabled."
msgstr "As extensões estão desativadas."
-#: ../midori/midori-view.c:4170
+#: ../midori/midori-view.c:4379
msgid "HTML5 storage, local database and application caches are disabled."
-msgstr "O armazenamento local de HTML5, base de dados e cache da aplicação estão desativados."
+msgstr ""
+"O armazenamento local de HTML5, base de dados e cache da aplicação estão "
+"desativados."
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:4380
msgid "Midori prevents websites from tracking the user:"
msgstr "O Midori impede que sites obtenham dados do usuário:"
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:4381
msgid "Referrer URLs are stripped down to the hostname."
msgstr "Os URL são removidos do nome da máquina."
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:4382
msgid "DNS prefetching is disabled."
msgstr "A obtenção prévia de DNS está desativada."
-#: ../midori/midori-view.c:4174
+#: ../midori/midori-view.c:4383
msgid "The language and timezone are not revealed to websites."
msgstr "O idioma e o fuso horário não são revelados aos sites."
-#: ../midori/midori-view.c:4175
+#: ../midori/midori-view.c:4384
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr "Os plugins do Flash e Netscape não podem ser listados pelos sites."
-#: ../midori/midori-view.c:4224
+#: ../midori/midori-view.c:4470
msgid "Version numbers in brackets show the version used at runtime."
msgstr "Os números de versão entre parênteses mostram a versão em execução."
-#: ../midori/midori-view.c:4280
+#: ../midori/midori-view.c:4519
msgid "Page loading delayed"
msgstr "Carregamento da página postergado"
-#: ../midori/midori-view.c:4281
+#: ../midori/midori-view.c:4520
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"Carregamento postergado seja por um encerramento abrupto recente ou pelas "
"preferências de início."
-#: ../midori/midori-view.c:4282
+#: ../midori/midori-view.c:4521
msgid "Load Page"
msgstr "Carregar página"
-#: ../midori/midori-view.c:4448
+#: ../midori/midori-view.c:4688
msgid "Blank page"
msgstr "Página em branco"
-#: ../midori/midori-view.c:4710
+#: ../midori/midori-view.c:4952
msgid "_Duplicate Tab"
msgstr "_Duplicar aba"
-#: ../midori/midori-view.c:4715
+#: ../midori/midori-view.c:4957
msgid "Show Tab _Label"
msgstr "Exibir _título da aba"
-#: ../midori/midori-view.c:4715
+#: ../midori/midori-view.c:4957
msgid "Show Tab _Icon Only"
msgstr "Exibir apenas o _ícone da aba"
-#: ../midori/midori-view.c:4721
-msgid "Close ot_her Tabs"
-msgstr "Fec_har outras abas"
+#: ../midori/midori-view.c:4964
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "_Fechar outra aba"
+msgstr[1] "_Fechar outras abas"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5534
+#: ../midori/midori-view.c:5784
msgid "previous"
msgstr "anterior"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5553
+#: ../midori/midori-view.c:5803
msgid "next"
msgstr "próxima"
-#: ../midori/midori-view.c:5566
+#: ../midori/midori-view.c:5816
msgid "Print background images"
msgstr "Imprimir imagens de fundo"
-#: ../midori/midori-view.c:5567
+#: ../midori/midori-view.c:5817
msgid "Whether background images should be printed"
msgstr "Se as imagens de fundo devem ser impressas"
-#: ../midori/midori-view.c:5599
+#: ../midori/midori-view.c:5849
msgid "Features"
msgstr "Funcionalidades"
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-speeddial.vala:142
+msgid "Speed Dial"
+msgstr "Ligação rápida"
+
+#: ../midori/midori-speeddial.vala:143 ../midori/midori-speeddial.vala:229
+msgid "Click to add a shortcut"
+msgstr "Clique para adicionar um atalho"
+
+#: ../midori/midori-speeddial.vala:144
+msgid "Enter shortcut address"
+msgstr "Informe o endereço do atalho"
+
+#: ../midori/midori-speeddial.vala:145
+msgid "Enter shortcut title"
+msgstr "Informe o título do atalho"
+
+#: ../midori/midori-speeddial.vala:146
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Tem certeza de que quer excluir esse atalho?"
+
+#: ../midori/midori-preferences.c:299
msgid "Startup"
msgstr "Início"
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:305
+msgid "Homepage:"
+msgstr "Página inicial:"
+
+#: ../midori/midori-preferences.c:313
msgid "Use _current page"
msgstr "Usar a _página atual"
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:317
msgid "Use current page as homepage"
msgstr "Usar a página atual como página inicial"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:326
msgid "Fonts"
msgstr "Fontes"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:329
msgid "Proportional Font Family"
msgstr "Família de fontes proporcionais"
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:333
msgid "The default font family used to display text"
msgstr "A família de fontes padrão usada para exibir texto"
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:336
msgid "The default font size used to display text"
msgstr "O tamanho de fonte padrão usado para exibir texto"
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:338
msgid "Fixed-width Font Family"
msgstr "Família de fontes de largura fixa"
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:342
msgid "The font family used to display fixed-width text"
msgstr "A família de fontes usada para exibir texto com largura fixa"
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:345
msgid "The font size used to display fixed-width text"
msgstr "O tamanho de fonte usado para exibir texto com largura fixa"
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:347
msgid "Minimum Font Size"
msgstr "Tamanho mínimo de fonte"
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:351
msgid "The minimum font size used to display text"
msgstr "O tamanho mínimo de fonte usado para exibir texto"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:362
msgid "Behavior"
msgstr "Comportamento"
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Carregar imagens automaticamente"
+
+#: ../midori/midori-preferences.c:369
+msgid "Enable Spell Checking"
+msgstr "Habilitar verificação ortográfica"
+
+#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Habilitar scripts"
+
+#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Habilitar plugins Netscape"
+
+#: ../midori/midori-preferences.c:391
+msgid "Zoom Text and Images"
+msgstr "Zoom de texto e imagens"
+
+#: ../midori/midori-preferences.c:394
msgid "Allow scripts to open popups"
msgstr "Permitir que os scripts abram popups"
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:395
msgid "Whether scripts are allowed to open popup windows automatically"
msgstr ""
"Se os scripts devem ter permissão para abrir janelas popup automaticamente"
+#: ../midori/midori-preferences.c:401
+msgid "Kinetic scrolling"
+msgstr "Rolagem cinética"
+
+#: ../midori/midori-preferences.c:402
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr "Se a rolagem deve se mover cineticamente conforme a velocidade"
+
+#: ../midori/midori-preferences.c:407
+msgid "Middle click opens Selection"
+msgstr "Clicar o botão do meio do mouse abre seleção"
+
+#: ../midori/midori-preferences.c:408
+msgid "Load an address from the selection via middle click"
+msgstr "Carregar o endereço selecionado clicando o botão do meio do mouse"
+
+#: ../midori/midori-preferences.c:414
+msgid "Enable WebGL support"
+msgstr "Habilitar suporte a WebGL"
+
+#: ../midori/midori-preferences.c:419
+msgid "Flash window on background tabs"
+msgstr "Piscar janela em abas de segundo plano"
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Salvar arquivos baixados em:"
+
#. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:435
msgid "Browsing"
msgstr "Navegação"
+#: ../midori/midori-preferences.c:451
+msgid "Close Buttons on Tabs"
+msgstr "Botão fechar nas abas"
+
+#: ../midori/midori-preferences.c:455
+msgid "Always Show Tabbar"
+msgstr "Sempre exibir barra de abas"
+
+#: ../midori/midori-preferences.c:459
+msgid "Open Tabs next to Current"
+msgstr "Abrir abas ao lado da atual"
+
+#: ../midori/midori-preferences.c:460
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Se as novas abas devem ser abertas ao lado da atual em vez de após a última"
+
+#: ../midori/midori-preferences.c:463
+msgid "Open tabs in the background"
+msgstr "Abrir abas em segundo plano"
+
+#: ../midori/midori-preferences.c:467
+msgid "Text Editor"
+msgstr "Editor de texto"
+
+#: ../midori/midori-preferences.c:472
+msgid "News Aggregator"
+msgstr "Agregador de notícias"
+
#. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:479
msgid "Network"
msgstr "Rede"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:481
+msgid "Proxy server"
+msgstr "Servidor proxy"
+
+#: ../midori/midori-preferences.c:486
msgid "Hostname"
msgstr "Nome da máquina"
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:494
+msgid "Port"
+msgstr "Porta"
+
+#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509
+msgid "The maximum size of cached pages on disk"
+msgstr "O tamanho máximo no disco das páginas em cache"
+
+#: ../midori/midori-preferences.c:511
msgid "MB"
msgstr "MB"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Add search engine"
msgstr "Adicionar motor de pesquisa"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Edit search engine"
msgstr "Editar motor de pesquisa"
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:985
msgid "_Name:"
msgstr "_Nome:"
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1000
msgid "_Description:"
msgstr "_Descrição:"
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Ícone:"
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Endereço:"
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1032
msgid "_Token:"
msgstr "_Palavra-chave:"
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1330
msgid "Manage Search Engines"
msgstr "Gerenciar motores de pesquisa"
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1432
msgid "Use as _default"
msgstr "Usar como _padrão"
-#: ../midori/sokoke.c:354
+#: ../midori/sokoke.c:353
msgid "Open with"
msgstr "Abrir com"
-#: ../midori/sokoke.c:362
+#: ../midori/sokoke.c:361
#, c-format
msgid "Choose an application or command to open \"%s\":"
msgstr "Escolha um aplicativo ou um comando para abrir \"%s\":"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
+#: ../midori/sokoke.c:475 ../midori/sokoke.c:489
msgid "Could not run external program."
msgstr "Não foi possível executar o programa externo."
-#: ../midori/sokoke.c:1595
+#: ../midori/sokoke.c:1327
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: ../midori/sokoke.c:1596
+#: ../midori/sokoke.c:1328
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: ../midori/sokoke.c:1597
+#: ../midori/sokoke.c:1329
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2042,67 +1881,67 @@ msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
+#: ../midori/sokoke.c:1337 ../panels/midori-transfers.c:268
#, c-format
msgid "%s of %s"
msgstr "%s de %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
+#: ../midori/sokoke.c:1346
msgid "?B"
msgstr "?B"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
+#: ../midori/sokoke.c:1349
#, c-format
msgid " (%s/s)"
msgstr " (%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/sokoke.c:1366
#, c-format
msgid " - %s remaining"
msgstr " - %s para terminar"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
+#: ../toolbars/midori-findbar.c:265
msgid "_Inline Find:"
msgstr "Local_izar na página:"
-#: ../toolbars/midori-findbar.c:317
+#: ../toolbars/midori-findbar.c:287
msgid "Previous"
msgstr "Anterior"
-#: ../toolbars/midori-findbar.c:323
+#: ../toolbars/midori-findbar.c:293
msgid "Next"
msgstr "Seguinte"
-#: ../toolbars/midori-findbar.c:327
+#: ../toolbars/midori-findbar.c:297
msgid "Match Case"
msgstr "Sensível ao caso"
-#: ../toolbars/midori-findbar.c:336
+#: ../toolbars/midori-findbar.c:306
msgid "Highlight Matches"
msgstr "Realçar correspondências"
-#: ../toolbars/midori-findbar.c:347
+#: ../toolbars/midori-findbar.c:317
msgid "Close Findbar"
msgstr "Fechar barra de localização"
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:124
#, c-format
msgid "The file '%s ' has been downloaded."
msgstr "O arquivo %s foi baixado."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:129
msgid "Transfer completed"
msgstr "Transferência concluída"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:198
msgid "The downloaded file is erroneous."
msgstr "O arquivo baixado é errôneo."
-#: ../toolbars/midori-transferbar.c:194
+#: ../toolbars/midori-transferbar.c:199
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2110,47 +1949,53 @@ msgstr ""
"A soma de verificação fornecida com o link não coincide. Isso significa que "
"o arquivo provavelmente está incompleto ou foi modificado."
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:342 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Limpar tudo"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:379 ../toolbars/midori-transferbar.c:381
msgid "Some files are being downloaded"
msgstr "Alguns arquivos estão sendo baixados"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:385
msgid "_Quit Midori"
msgstr "_Sair do Midori"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:387
msgid "The transfers will be cancelled if Midori quits."
msgstr "As transferências serão canceladas se sair do Midori."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Favoritos"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Falha ao adicionar item aos favoritos: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Falha ao atualizar favoritos: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Editar o favorito selecionado"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Excluir o favorito selecionado"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Adicionar nova pasta"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Aba "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Pesquisar no Favoritos"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Histórico"
@@ -2174,6 +2019,11 @@ msgstr[1] "%d dias atrás"
msgid "A week ago"
msgstr "Uma semana atrás"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Falha ao excluir item do histórico: %s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Tem certeza de que quer excluir todo o histórico?"
@@ -2190,15 +2040,20 @@ msgstr "Excluir o item do histórico selecionado"
msgid "Clear the entire history"
msgstr "Limpar todo o histórico"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Pesquisar no Histórico"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Transferências"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
msgstr "Abrir pas_ta de destino"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
msgstr "Copiar loc_alização do link"
@@ -2240,54 +2095,62 @@ msgstr "O ícone do estoque '%s' não pôde ser carregado"
msgid "Animation frames are broken"
msgstr "Os quadros de animação estão corrompidos"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Propriedade '%s' é inválida para %s"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
-#: ../extensions/addons.c:308
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:309
msgid "Choose file"
msgstr "Escolher arquivo"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Escolher pasta"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Nenhum"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 hora"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 dia"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 semana"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 mês"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 ano"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "%s - Preferências"
-#: ../extensions/adblock.c:467
+#: ../katze/midori-uri.vala:158
+msgid "MD5-Checksum:"
+msgstr "Soma de verificação MD5:"
+
+#: ../katze/midori-uri.vala:165
+msgid "SHA1-Checksum:"
+msgstr "Soma de verificação SHA1:"
+
+#: ../extensions/adblock.c:475
msgid "Configure Advertisement filters"
msgstr "Configurar filtros de publicidade"
-#: ../extensions/adblock.c:498
+#: ../extensions/adblock.c:508
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2297,113 +2160,113 @@ msgstr ""
"\"Adicionar\" para a adicioná-la à lista. Você pode encontrar mais listas em "
"%s."
-#: ../extensions/adblock.c:846
+#: ../extensions/adblock.c:922
msgid "Edit rule"
msgstr "Editar regra"
-#: ../extensions/adblock.c:860
+#: ../extensions/adblock.c:936
msgid "_Rule:"
msgstr "_Regra:"
-#: ../extensions/adblock.c:914
+#: ../extensions/adblock.c:990
msgid "Bl_ock image"
msgstr "Bl_oquear imagem"
-#: ../extensions/adblock.c:919
+#: ../extensions/adblock.c:995
msgid "Bl_ock link"
msgstr "Bl_oquear link"
-#: ../extensions/adblock.c:1620
+#: ../extensions/adblock.c:1799
msgid "Advertisement blocker"
msgstr "Bloqueador de publicidade"
-#: ../extensions/adblock.c:1621
+#: ../extensions/adblock.c:1800
msgid "Block advertisements according to a filter list"
msgstr "Bloquear publicidade de acordo com uma lista de filtros"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
+#: ../extensions/addons.c:222
msgid "This page appears to contain a user script. Do you wish to install it?"
msgstr ""
"Esta página aparentemente contém um script de usuário. Gostaria de instalá-"
"lo?"
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
msgid "_Install user script"
msgstr "_Instalar script de usuário"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
msgid "This page appears to contain a user style. Do you wish to install it?"
msgstr ""
"Esta página aparentemente contém um estilo de usuário. Gostaria de instalá-"
"lo?"
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
msgid "_Install user style"
msgstr "_Instalar estilo de usuário"
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
msgid "Don't install"
msgstr "Não instalar"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:320 ../extensions/addons.c:675
msgid "Userscripts"
msgstr "Scripts de usuário"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:325 ../extensions/addons.c:677
msgid "Userstyles"
msgstr "Estilos de usuário"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:371 ../extensions/addons.c:450
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Erro"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:412
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Você quer excluir '%s'?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:418
msgid "Delete user script"
msgstr "Excluir script de usuário"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:419
msgid "Delete user style"
msgstr "Excluir estilo de usuário"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:422
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "O arquivo %s será permanentemente excluído."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:564 ../extensions/addons.c:641
msgid "Open in Text Editor"
msgstr "Abrir no editor de texto"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:566 ../extensions/addons.c:650
msgid "Open Target Folder"
msgstr "Abrir pasta de destino"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:632
msgid "Add new addon"
msgstr "Adicionar novo complemento"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:658
msgid "Remove selected addon"
msgstr "Excluir o complemento selecionado"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1686 ../extensions/addons.c:1904
msgid "User addons"
msgstr "Extras de usuário"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1816
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Não é possível monitorar a pasta '%s': %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1905
msgid "Support for userscripts and userstyles"
msgstr "Suporte a scripts e estilos de usuário"
@@ -2490,29 +2353,21 @@ msgstr ""
"Domínio : %s\n"
"Cookies : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Nome"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "_Expandir tudo"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "_Ocultar tudo"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filtro:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Informe uma cadeia filtro para apenas exibir cookies cujo nome ou domínio "
-"correspondam ao filtro"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Pesquisar cookies por nome ou domínio"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2774,35 +2629,35 @@ msgstr "Relógio na barra de status"
msgid "Display date and time in the statusbar"
msgstr "Exibir a data e a hora na barra de status"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Imagens"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Scripts"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Plugins Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Funcionalidades na barra de status"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "Habilitar/desabilitar facilmente funcionalidades das páginas web"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Painel de abas"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "P_ainel de abas"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Exibir as abas num painel vertical"
@@ -2814,11 +2669,11 @@ msgstr "Apenas ícones nas abas por padrão"
msgid "New tabs have no label by default"
msgstr "Novas abas sem título por padrão"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Personalizar barra de ferramentas"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2826,34 +2681,272 @@ msgstr ""
"Selecione os itens a serem exibidos na barra de ferramentas. Os itens podem "
"ser reordenados ao arrastar e soltar."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Itens disponíveis"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Itens exibidos"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
msgstr "Personalizar _barra de ferramentas..."
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Personalizar..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Editor da barra de ferramentas"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Editar facilmente a barra de ferramentas"
-#: ../extensions/web-cache.c:463
+#: ../extensions/web-cache.c:462
msgid "Cache HTTP communication on disk"
msgstr "Pôr comunicações HTTP em cache"
+#~ msgid "Remember last window size"
+#~ msgstr "Lembrar último tamanho da janela"
+
+#~ msgid "Whether to save the last window size"
+#~ msgstr "Se o último tamanho da janela deve ser salvo"
+
+#~ msgid "Last window width"
+#~ msgstr "Última largura da janela"
+
+#~ msgid "The last saved window width"
+#~ msgstr "Última largura da janela salva"
+
+#~ msgid "Last window height"
+#~ msgstr "Última altura da janela"
+
+#~ msgid "The last saved window height"
+#~ msgstr "Última altura da janela salva"
+
+#~ msgid "Last panel position"
+#~ msgstr "Última posição do painel"
+
+#~ msgid "The last saved panel position"
+#~ msgstr "Última posição do painel salva"
+
+#~ msgid "Last panel page"
+#~ msgstr "Última página do painel"
+
+#~ msgid "The last saved panel page"
+#~ msgstr "Última página do painel salva"
+
+#~ msgid "Last Web search"
+#~ msgstr "Última pesquisa na web"
+
+#~ msgid "The last saved Web search"
+#~ msgstr "Última pesquisa na web salva"
+
+#~ msgid "Show Menubar"
+#~ msgstr "Exibir barra de menu"
+
+#~ msgid "Whether to show the menubar"
+#~ msgstr "Se a barra de menu deve ser exibida"
+
+#~ msgid "Show Navigationbar"
+#~ msgstr "Exibir barra de navegação"
+
+#~ msgid "Whether to show the navigationbar"
+#~ msgstr "Se a barra de navegação deve ser exibida"
+
+#~ msgid "Show Bookmarkbar"
+#~ msgstr "Exibir barra de favoritos"
+
+#~ msgid "Whether to show the bookmarkbar"
+#~ msgstr "Se a barra de favoritos deve ser exibida"
+
+#~ msgid "Show Panel"
+#~ msgstr "Exibir painel"
+
+#~ msgid "Whether to show the panel"
+#~ msgstr "Se o painel deve ser exibido"
+
+#~ msgid "Show Statusbar"
+#~ msgstr "Exibir barra de status"
+
+#~ msgid "Whether to show the statusbar"
+#~ msgstr "Se a barra de status deve ser exibida"
+
+#~ msgid "Toolbar Items"
+#~ msgstr "Itens da barra de ferramentas"
+
+#~ msgid "The items to show on the toolbar"
+#~ msgstr "Itens a serem exibidos na barra de ferramentas"
+
+#~ msgid "Compact Sidepanel"
+#~ msgstr "Painel lateral compacto"
+
+#~ msgid "Whether to make the sidepanel compact"
+#~ msgstr "Se o painel lateral deve ser compacto"
+
+#~ msgid "Align sidepanel on the right"
+#~ msgstr "Alinhar painel lateral à direita"
+
+#~ msgid "Whether to align the sidepanel on the right"
+#~ msgstr "Se o painel lateral deve ser alinhado à direita"
+
+#~ msgid "Open panels in separate windows"
+#~ msgstr "Abrir painéis em janelas separadas"
+
+#~ msgid "Whether to always open panels in separate windows"
+#~ msgstr "Se os painéis devem ser sempre abertos em janelas separadas"
+
+#~ msgid "What to do when Midori starts"
+#~ msgstr "O que fazer ao iniciar o Midori"
+
+#~ msgid "The homepage"
+#~ msgstr "A página inicial"
+
+#~ msgid "Show crash dialog"
+#~ msgstr "Exibir diálogo de encerramento abrupto"
+
+#~ msgid "The folder downloaded files are saved to"
+#~ msgstr "A pasta na qual salvar os arquivos baixados"
+
+#~ msgid "An external text editor"
+#~ msgstr "Um editor de texto externo"
+
+#~ msgid "An external news aggregator"
+#~ msgstr "Um agregador de notícias externo"
+
+#~ msgid "Location entry Search"
+#~ msgstr "Pesquisa no campo de endereço"
+
+#~ msgid "The search to perform inside the location entry"
+#~ msgstr "A pesquisa a ser executada pelo campo de endereço"
+
+#~ msgid "The preferred character encoding"
+#~ msgstr "A codificação de caracteres preferida"
+
+#~ msgid "Always show the tabbar"
+#~ msgstr "Se a barra de abas deve ser exibida mesmo com apenas uma aba aberta"
+
+#~ msgid "Whether tabs have close buttons"
+#~ msgstr "Se as abas devem ter um botão para fechar"
+
+#~ msgid "Where to open new pages"
+#~ msgstr "Onde abrir novas páginas"
+
+#~ msgid "Whether to open new tabs in the background"
+#~ msgstr "Se as novas abas devem ser abertas em segundo plano"
+
+#~ msgid "Open popups in tabs"
+#~ msgstr "Abrir popups em abas"
+
+#~ msgid "Whether to open popup windows in tabs"
+#~ msgstr "Se janelas popup devem ser abertas em abas"
+
+#~ msgid "Load and display images automatically"
+#~ msgstr "Carregar e exibir as imagens automaticamente"
+
+#~ msgid "Enable embedded scripting languages"
+#~ msgstr "Habilitar linguagem de scripts incorporadas"
+
+#~ msgid "Enable embedded Netscape plugin objects"
+#~ msgstr "Habilitar plugins Netscape incorporados"
+
+#~ msgid "Enable spell checking while typing"
+#~ msgstr "Habilitar verificação ortográfica ao digitar"
+
+#~ msgid "Enable HTML5 database support"
+#~ msgstr "Habilitar suporte a bases de dados HTML5"
+
+#~ msgid "Whether to enable HTML5 database support"
+#~ msgstr "Se o suporte a bases de dados HTML5 deve ser habilitado"
+
+#~ msgid "Whether to enable HTML5 local storage support"
+#~ msgstr "Se o suporte a armazenagem local HTML5 deve ser habilitado"
+
+#~ msgid "Whether to enable offline web application cache"
+#~ msgstr "Se o cache de aplicativos web offline deve ser habilitado"
+
+#~ msgid "Flash the browser window if a new tab was opened in the background"
+#~ msgstr ""
+#~ "Pisca a janela do navegador se uma nova aba for aberta em segundo plano"
+
+#~ msgid "Allow websites to use OpenGL rendering"
+#~ msgstr "Permitir que sites usem renderização OpenGL"
+
+#~ msgid "Whether to zoom text and images"
+#~ msgstr "Se o zoom de texto e imagens pode ser ajustado"
+
+#~ msgid "Find inline while typing"
+#~ msgstr "Localizar na página ao digitar"
+
+#~ msgid "Whether to automatically find inline while typing"
+#~ msgstr "Se a localização na página deve se dar automaticamente ao digitar"
+
+#~ msgid "The type of proxy server to use"
+#~ msgstr "O tipo de servidor a utilizar"
+
+#~ msgid "HTTP Proxy Server"
+#~ msgstr "Servidor proxy HTTP"
+
+#~ msgid "The proxy server used for HTTP connections"
+#~ msgstr "Servidor proxy para conexões HTTP"
+
+#~ msgid "The proxy server port used for HTTP connections"
+#~ msgstr "Porta do servidor proxy usado para conexões HTTPS"
+
+#~ msgid "Identification string"
+#~ msgstr "Cadeia de identificação"
+
+#~ msgid "The application identification string"
+#~ msgstr "A cadeia de identificação do aplicativo"
+
+#~ msgid "Clear private data"
+#~ msgstr "Limpar dados privados"
+
+#~ msgid "The private data selected for deletion"
+#~ msgstr "Os dados privados selecionados para exclusão"
+
+#~ msgid "Clear data"
+#~ msgstr "Limpar dados"
+
+#~ msgid "The data selected for deletion"
+#~ msgstr "Os dados selecionados para exclusão"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Fec_har outras abas"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Ícone:"
+
+#~ msgid "Filter:"
+#~ msgstr "Filtro:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Informe uma cadeia filtro para apenas exibir cookies cujo nome ou domínio "
+#~ "correspondam ao filtro"
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Favorito"
+
+#~ msgid "_Console"
+#~ msgstr "_Console"
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Os favoritos não puderam ser salvos. %s"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Pasta principal"
+
+#~ msgid "_Title:"
+#~ msgstr "_Título:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Pasta:"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Personalizar…"
+
#~ msgid "Lightweight web browser"
#~ msgstr "Navegador web leve"
@@ -2953,15 +3046,15 @@ msgstr "Pôr comunicações HTTP em cache"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Adicionar nova pasta de favoritos"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Adicionar, editar e excluir motores de pesquisa..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Adicionar, editar e excluir motores de pesquisa…"
-#~ msgid "Clear private data..."
-#~ msgstr "Limpar dados privados..."
+#~ msgid "Clear private data…"
+#~ msgstr "Limpar dados privados…"
-#~ msgid "Inspect page details and access developer tools..."
+#~ msgid "Inspect page details and access developer tools…"
#~ msgstr ""
-#~ "Inspecionar detalhes da página e acessar ferramentas de desenvolvimento..."
+#~ "Inspecionar detalhes da página e acessar ferramentas de desenvolvimento…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Mudar para a aba anterior"
@@ -3017,12 +3110,6 @@ msgstr "Pôr comunicações HTTP em cache"
#~ msgid "Show statusbar"
#~ msgstr "Exibir barra de status"
-#~ msgid "MD5-Checksum:"
-#~ msgstr "Soma de verificação MD5:"
-
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "Soma de verificação SHA1:"
-
#~ msgid "No filename specified"
#~ msgstr "Nenhum nome de arquivo especificado"
@@ -3050,8 +3137,8 @@ msgstr "Pôr comunicações HTTP em cache"
#~ msgid "Reset the last _session"
#~ msgstr "Apagar a última _sessão"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Configurar _filtros de publicidade..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Configurar _filtros de publicidade…"
#~ msgid "Not found - %s"
#~ msgstr "Não encontrado - %s"
diff --git a/po/ro.po b/po/ro.po
index 5dcae285..eb11da7f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: midori 0.3.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-09 18:18+0000\n"
+"POT-Creation-Date: 2012-08-06 08:27+0000\n"
"PO-Revision-Date: 2011-07-30 16:21+0300\n"
"Last-Translator: Mișu Moldovan \n"
"Language-Team: Romanian \n"
@@ -18,8 +18,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ro\n"
-"X-Generator: Virtaal 0.6.1\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);;\n"
+"X-Generator: Virtaal 0.6.1\n"
#: ../data/midori.desktop.in.h:1
msgid "Browse the Web"
@@ -29,12 +29,28 @@ msgstr "Navigați pe Internet"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Navigator"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:1989 ../midori/main.c:2009
-#: ../midori/main.c:2023 ../midori/midori-websettings.c:308
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:2025 ../midori/main.c:2049
+#: ../midori/main.c:2063 ../midori/midori-websettings.c:315
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Navigatorul web Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Fereastră nouă de navigare privată"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1478
+msgid "New Tab"
+msgstr "Tab nou"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1475
+msgid "New Window"
+msgstr "Fereastră nouă"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Navigator web"
@@ -46,83 +62,72 @@ msgstr "Navigare privată cu Midori"
msgid "Open a new private browsing window"
msgstr "Deschide o nouă fereastră de navigare privată"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4022
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4494
msgid "Private Browsing"
msgstr "Navigare privată"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Nu s-au putut încărca preferințele: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Valoarea „%s” nu este validă pentru %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Valoare nevalidă „%s” în preferințe"
-#: ../midori/main.c:364
+#: ../midori/main.c:375
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Nu s-au putut încărca motoarele de căutare. %s\n"
-#: ../midori/main.c:418
+#: ../midori/main.c:429
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Nu s-a putut curăța istoricul: %s\n"
-#: ../midori/main.c:438 ../midori/main.c:562
-#: ../extensions/formhistory/formhistory.c:529
+#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Nu s-a putut deschide baza de date: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:505
+#: ../midori/main.c:523
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Nu s-au putut șterge elementele vechi din istoric: %s\n"
-#: ../midori/main.c:545 ../panels/midori-history.c:231
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Nu s-a putut șterge elementul din istoric: %s\n"
-
-#: ../midori/main.c:592
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Nu s-au putut salva favoritele. %s"
-
-#: ../midori/main.c:614
+#: ../midori/main.c:545
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Nu s-au putut salva preferințele. %s"
-#: ../midori/main.c:649
+#: ../midori/main.c:571
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Nu s-au putut salva motoarele de căutare. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:686
+#: ../midori/main.c:608
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Nu s-a putut salva gunoiul. %s"
-#: ../midori/main.c:727 ../panels/midori-extensions.c:91
+#: ../midori/main.c:681 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Extensii"
-#: ../midori/main.c:741
+#: ../midori/main.c:695
msgid "Privacy"
msgstr "Intimitate"
# dumol: Scurtat puțin pentru a nu lăbărța fereastra preferințelor
-#: ../midori/main.c:753
+#: ../midori/main.c:707
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -130,19 +135,19 @@ msgstr ""
"Cookie-urile stochează autentificări, preferințe ori alte date, multe în "
"scopuri publicitare."
-#: ../midori/main.c:809
+#: ../midori/main.c:763
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Nu s-a putut salva sesiunea. %s"
-#: ../midori/main.c:1027
+#: ../midori/main.c:1001
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Niciun fișier cu certificate root nu este disponibil. Certificatele SSL nu "
"vor putea fi verificate."
-#: ../midori/main.c:1096
+#: ../midori/main.c:1093
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -150,234 +155,227 @@ msgstr ""
"Se pare că Midori s-a terminat prematur la ultima pornire. Dacă se repetă "
"problema, încercați una dintre opțiunile de mai jos pentru remediere."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1112
msgid "Modify _preferences"
msgstr "_Editare preferințe"
-#: ../midori/main.c:1119
+#: ../midori/main.c:1116
msgid "Disable all _extensions"
msgstr "_Fără extensii"
-#: ../midori/main.c:1132
+#: ../midori/main.c:1129
msgid "Discard old tabs"
msgstr "Uită taburile vechi"
# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/main.c:1133 ../midori/midori-websettings.c:217
+#: ../midori/main.c:1130 ../midori/midori-websettings.c:223
msgid "Show last tabs without loading"
msgstr "Ultimele taburi fără a le încărca"
# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/main.c:1134 ../midori/midori-websettings.c:216
+#: ../midori/main.c:1131 ../midori/midori-websettings.c:222
msgid "Show last open tabs"
msgstr "Ultimele taburi deschise"
-#: ../midori/main.c:1342 ../midori/main.c:2400
+#: ../midori/main.c:1379 ../midori/main.c:2433
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Nu s-a putut încărca sesiunea: %s\n"
-#: ../midori/main.c:1480
+#: ../midori/main.c:1517
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Captură salvată în: %s\n"
-#: ../midori/main.c:1892
+#: ../midori/main.c:1933
msgid "Run ADDRESS as a web application"
msgstr "Deschide ADRESA ca o aplicație web"
-#: ../midori/main.c:1892
+#: ../midori/main.c:1933
msgid "ADDRESS"
msgstr "ADRESĂ"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1936
msgid "Use FOLDER as configuration folder"
msgstr "Folosește DOSAR ca dosar cu preferințe"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1936
msgid "FOLDER"
msgstr "DOSAR"
-#: ../midori/main.c:1898
+#: ../midori/main.c:1939
msgid "Private browsing, no changes are saved"
msgstr "Navigare privată, nu se salvează modificările"
-#: ../midori/main.c:1900
+#: ../midori/main.c:1941
msgid "Show a diagnostic dialog"
msgstr "Arată o fereastră de depanare"
-#: ../midori/main.c:1902
+#: ../midori/main.c:1943
msgid "Run the specified filename as javascript"
msgstr "Execută ca JavaScript fișierul precizat"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1945
msgid "Take a snapshot of the specified URI"
msgstr "Salvează o captură a URI-ului specificat"
-#: ../midori/main.c:1906
+#: ../midori/main.c:1947
msgid "Execute the specified command"
msgstr "Execută comanda specificată"
-#: ../midori/main.c:1908
+#: ../midori/main.c:1949
msgid "List available commands to execute with -e/ --execute"
msgstr "Arată comenzile ce pot fi executate cu -e / --execute"
-#: ../midori/main.c:1910
+#: ../midori/main.c:1951
msgid "Display program version"
msgstr "Arată versiunea programului"
-#: ../midori/main.c:1912
+#: ../midori/main.c:1953
msgid "Addresses"
msgstr "Adrese"
-#: ../midori/main.c:1914
+#: ../midori/main.c:1955
msgid "Block URIs according to regular expression PATTERN"
msgstr "Blochează URI-uri după modelul regexp MODEL"
-#: ../midori/main.c:1914
+#: ../midori/main.c:1955
msgid "PATTERN"
msgstr "MODEL"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1918
+#: ../midori/main.c:1959
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Repornește Midori după un număr de SECUNDE de inactivitate"
-#: ../midori/main.c:1918
+#: ../midori/main.c:1959
msgid "SECONDS"
msgstr "SECUNDE"
-#: ../midori/main.c:1921
+#: ../midori/main.c:1962
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Redirectează avertizările din consolă în FIȘIER"
-#: ../midori/main.c:1921
+#: ../midori/main.c:1962
msgid "FILENAME"
msgstr "FIȘIER"
-#: ../midori/main.c:1986
-msgid "[Addresses]"
-msgstr "[Adrese]"
-
-#: ../midori/main.c:1996
-msgid "The specified configuration folder is invalid."
-msgstr "Dosarul cu preferințe precizat nu este valid."
-
-#: ../midori/main.c:2024
+#: ../midori/main.c:2064
msgid "Please report comments, suggestions and bugs to:"
msgstr "Trimiteți comentarii, sugestii și raportați problemele la:"
-#: ../midori/main.c:2026
+#: ../midori/main.c:2066
msgid "Check for new versions at:"
msgstr "Versiunile noi sunt disponibile la:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2110
+#: ../midori/main.c:2161
msgid "Saved logins and _passwords"
msgstr "_Parole și autentificări salvate"
-#: ../midori/main.c:2112
+#: ../midori/main.c:2163
msgid "Cookies and Website data"
msgstr "Cookie-uri și date ale site-urilor"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2116 ../midori/midori-websettings.c:971
+#: ../midori/main.c:2167 ../midori/midori-websettings.c:1020
#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
msgstr "Cache web"
-#: ../midori/main.c:2119
+#: ../midori/main.c:2170
msgid "Website icons"
msgstr "Iconițe ale site-urilor web"
-#: ../midori/main.c:2225
+#: ../midori/main.c:2274
msgid "An unknown error occured"
msgstr "A intervenit o eroare necunoscută"
-#: ../midori/main.c:2331
+#: ../midori/main.c:2381
msgid "An instance of Midori is already running but not responding.\n"
msgstr "O instanță a programului Midori este deja pornită, dar nu răspunde.\n"
-#: ../midori/main.c:2367
+#: ../midori/main.c:2415
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Nu s-au putut încărca favoritele: %s\n"
-#: ../midori/main.c:2415
+#: ../midori/main.c:2448
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Nu s-a putut încărca gunoiul: %s\n"
-#: ../midori/main.c:2428
+#: ../midori/main.c:2461
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Nu s-a putut încărca istoricul: %s\n"
-#: ../midori/main.c:2444
+#: ../midori/main.c:2476
msgid "The following errors occured:"
msgstr "Au intervenit următoarele erori:"
-#: ../midori/main.c:2460
+#: ../midori/main.c:2492
msgid "_Ignore"
msgstr "_Ignoră"
-#: ../midori/midori-app.c:1331
-msgid "_Bookmark"
-msgstr "_Favorit"
+#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:545
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Acțiune neașteptată „%s”."
-#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:5933
+#: ../midori/midori-app.c:1457 ../midori/midori-browser.c:6431
msgid "_Bookmarks"
msgstr "Favori_te"
-#: ../midori/midori-app.c:1333
+#: ../midori/midori-app.c:1458
msgid "Add Boo_kmark"
-msgstr "Adau_gă un favorit"
+msgstr "Adaugă un fa_vorit"
-#: ../midori/midori-app.c:1334
-msgid "_Console"
-msgstr "_Consolă"
-
-#: ../midori/midori-app.c:1335
+#: ../midori/midori-app.c:1459
msgid "_Extensions"
msgstr "E_xtensii"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4502
+#: ../midori/midori-app.c:1460 ../midori/midori-browser.c:4887
msgid "_History"
msgstr "_Istoric"
-#: ../midori/midori-app.c:1337
-msgid "_Homepage"
-msgstr "Pagină de _start"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1461
msgid "_Userscripts"
msgstr "Scripturi pr_oprii"
-#: ../midori/midori-app.c:1339
+#: ../midori/midori-app.c:1462
+msgid "User_styles"
+msgstr "_Stiluri de utilizator"
+
+#: ../midori/midori-app.c:1463
msgid "New _Tab"
msgstr "Ta_b nou"
-#: ../midori/midori-app.c:1340
+#: ../midori/midori-app.c:1464
msgid "_Transfers"
msgstr "De_scărcări"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1465
msgid "Netscape p_lugins"
msgstr "Module _Netscape"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1466
msgid "_Closed Tabs"
msgstr "Taburi în_chise"
-#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5088
+#: ../midori/midori-app.c:1467 ../midori/midori-browser.c:5570
msgid "New _Window"
msgstr "_Fereastră nouă"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1468
msgid "New _Folder"
msgstr "_Dosar nou"
+#: ../midori/midori-app.c:1497
+msgid "[Addresses]"
+msgstr "[Adrese]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Nu s-a găsit fișierul."
@@ -395,140 +393,124 @@ msgstr "Format necunoscut de favorite."
msgid "Writing failed."
msgstr "Scrierea a eșuat."
-#: ../midori/midori-browser.c:321 ../midori/midori-browser.c:5170
-#: ../midori/midori-browser.c:5179
+#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5658
+#: ../midori/midori-browser.c:5667
msgid "Reload the current page"
msgstr "Reîncarcă pagina curentă"
-#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:5176
+#: ../midori/midori-browser.c:373 ../midori/midori-browser.c:5664
msgid "Stop loading the current page"
msgstr "Oprește încărcarea paginii curente"
-#: ../midori/midori-browser.c:455
+#: ../midori/midori-browser.c:530
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Nu s-a putut actualiza titlul: %s\n"
-#: ../midori/midori-browser.c:468
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Acțiune neașteptată „%s”."
-
-#: ../midori/midori-browser.c:558
+#: ../midori/midori-browser.c:625
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Navigare privată)"
-#: ../midori/midori-browser.c:668 ../midori/midori-browser.c:701
-msgid "Toplevel folder"
-msgstr "Dosarul rădăcină"
+#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Favorite"
-#: ../midori/midori-browser.c:758
+#: ../midori/midori-browser.c:837
msgid "New folder"
msgstr "Dosar nou"
-#: ../midori/midori-browser.c:758
+#: ../midori/midori-browser.c:837
msgid "Edit folder"
msgstr "Editare dosar"
-#: ../midori/midori-browser.c:760
+#: ../midori/midori-browser.c:839
msgid "New bookmark"
msgstr "Favorit nou"
-#: ../midori/midori-browser.c:760
+#: ../midori/midori-browser.c:839
msgid "Edit bookmark"
msgstr "Editare favorite"
-#: ../midori/midori-browser.c:791
-msgid "_Title:"
-msgstr "_Titlu:"
+#: ../midori/midori-browser.c:873
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Introduceți un nume pentru acest favorit și alegeți unde să-l salvați."
-#: ../midori/midori-browser.c:811 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Adresă:"
-
-#: ../midori/midori-browser.c:834 ../midori/midori-browser.c:4239
-msgid "_Folder:"
-msgstr "D_osar:"
-
-#: ../midori/midori-browser.c:850
+#: ../midori/midori-browser.c:934
msgid "Add to _Speed Dial"
msgstr "Ada_ugă ca apel rapid"
-#: ../midori/midori-browser.c:863
+#: ../midori/midori-browser.c:940
msgid "Show in the tool_bar"
msgstr "Arată în _bara cu unelte"
-#: ../midori/midori-browser.c:878
+#: ../midori/midori-browser.c:948
msgid "Run as _web application"
msgstr "Deschide ca o aplicație _web"
-#: ../midori/midori-browser.c:949
+#: ../midori/midori-browser.c:1019
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "Fișierul „%s” nu poate fi salvat în acest dosar."
-#: ../midori/midori-browser.c:951
+#: ../midori/midori-browser.c:1021
#, c-format
msgid "You don't have permission to write in this location."
msgstr "Nu aveți drepturile necesare pentru a scrie aici."
-#: ../midori/midori-browser.c:958
+#: ../midori/midori-browser.c:1028
#, c-format
msgid "There is not enough free space to download \"%s\"."
msgstr "Nu există îndeajuns spațiu liber pentru a descărca „%s”."
-#: ../midori/midori-browser.c:961
+#: ../midori/midori-browser.c:1031
#, c-format
msgid "The file needs %s but only %s are left."
msgstr "Fișierul necesită %s, dar liberi sunt doar %s."
-#: ../midori/midori-browser.c:999 ../midori/midori-browser.c:4308
+#: ../midori/midori-browser.c:1167 ../midori/midori-browser.c:4691
msgid "Save file as"
msgstr "Salvare fișier ca"
-#: ../midori/midori-browser.c:1293
-msgid "New Window"
-msgstr "Fereastră nouă"
+#: ../midori/midori-browser.c:1173
+msgid "Save associated _resources"
+msgstr "Salvează _resursele asociate"
-#: ../midori/midori-browser.c:1293
+#: ../midori/midori-browser.c:1475
msgid "A new window has been opened"
msgstr "S-a deschis o nouă fereastră"
-#: ../midori/midori-browser.c:1296
-msgid "New Tab"
-msgstr "Tab nou"
-
-#: ../midori/midori-browser.c:1296
+#: ../midori/midori-browser.c:1478
msgid "A new tab has been opened"
msgstr "S-a deschis un nou tab"
-#: ../midori/midori-browser.c:1331
+#: ../midori/midori-browser.c:1495
msgid "Error opening the image!"
msgstr "Eroare la deschiderea imaginii!"
-#: ../midori/midori-browser.c:1332
+#: ../midori/midori-browser.c:1496
msgid "Can not open selected image in a default viewer."
-msgstr "Nu s-a putut deschide imaginea selectată în programul asociat implicit."
+msgstr ""
+"Nu s-a putut deschide imaginea selectată în programul asociat implicit."
-#: ../midori/midori-browser.c:1338
+#: ../midori/midori-browser.c:1502
msgid "Error downloading the image!"
msgstr "Eroare la descărcarea imaginii!"
-#: ../midori/midori-browser.c:1339
+#: ../midori/midori-browser.c:1503
msgid "Can not download selected image."
msgstr "Nu s-a putut descărca imaginea selectată."
-#: ../midori/midori-browser.c:1442
+#: ../midori/midori-browser.c:1624
msgid "Save file"
msgstr "Salvare fișier"
-#: ../midori/midori-browser.c:2293
+#: ../midori/midori-browser.c:2527
msgid "Open file"
msgstr "Deschidere fișier"
-#: ../midori/midori-browser.c:2425
+#: ../midori/midori-browser.c:2659
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -543,140 +525,156 @@ msgstr ""
"preferințelor Midori. Data viitoare când veți mai da clic pe iconița unui "
"flux de știri, acesta va fi adăugat automat."
-#: ../midori/midori-browser.c:2431 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2665 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Flux nou"
-#: ../midori/midori-browser.c:2474 ../midori/midori-browser.c:5239
-#: ../panels/midori-bookmarks.c:426
+#: ../midori/midori-browser.c:2708 ../midori/midori-browser.c:5730
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Adăugare favorit nou"
-#: ../midori/midori-browser.c:2973 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3252 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Gol"
-#: ../midori/midori-browser.c:3393
+#: ../midori/midori-browser.c:3695 ../midori/midori-browser.c:3696
msgid "Toggle text cursor navigation"
msgstr "Navigare cu sau fără cursor"
-#: ../midori/midori-browser.c:3705 ../midori/midori-browser.c:5625
+#: ../midori/midori-browser.c:3698
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Apăsând F7 comutați navigarea cu cursorul. Când aceasta va fi activă, va "
+"apărea un cursor în pagina web."
+
+#: ../midori/midori-browser.c:3701
+msgid "_Enable Caret Browsing"
+msgstr "Activează _navigarea cu cursorul"
+
+#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6124
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Nu s-a putut insera noul element în istoric: %s\n"
-#: ../midori/midori-browser.c:4036 ../panels/midori-bookmarks.c:742
-#: ../panels/midori-history.c:799
+#: ../midori/midori-browser.c:4417 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Deschide tot în _taburi"
-#: ../midori/midori-browser.c:4043 ../panels/midori-bookmarks.c:748
-#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Deschide într-un _tab nou"
-#: ../midori/midori-browser.c:4046 ../midori/midori-view.c:2573
-#: ../midori/midori-view.c:4522 ../panels/midori-bookmarks.c:750
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4427 ../midori/midori-view.c:2940
+#: ../midori/midori-view.c:5071 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Deschide într-o _fereastră nouă"
-#: ../midori/midori-browser.c:4126
+#: ../midori/midori-browser.c:4516
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4127
+#: ../midori/midori-browser.c:4517
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4128
+#: ../midori/midori-browser.c:4518
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4129
+#: ../midori/midori-browser.c:4519
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4130
+#: ../midori/midori-browser.c:4520
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4131
+#: ../midori/midori-browser.c:4521
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4152
-msgid "Import bookmarks..."
-msgstr "Importare de favorite..."
+#: ../midori/midori-browser.c:4522
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4155 ../midori/midori-browser.c:5244
+#: ../midori/midori-browser.c:4543
+msgid "Import bookmarks…"
+msgstr "Importare de favorite…"
+
+#: ../midori/midori-browser.c:4546 ../midori/midori-browser.c:5735
msgid "_Import bookmarks"
msgstr "Importă fa_voritele"
-#: ../midori/midori-browser.c:4166
+#: ../midori/midori-browser.c:4557
msgid "_Application:"
msgstr "_Program:"
-#: ../midori/midori-browser.c:4231
+#: ../midori/midori-browser.c:4622
msgid "Import from XBEL or HTML file"
msgstr "Importă dintr-un fișier XBEL sau HTML"
-#: ../midori/midori-browser.c:4266
+#: ../midori/midori-browser.c:4650
msgid "Import from a file"
msgstr "Importă dintr-un fișier"
-#: ../midori/midori-browser.c:4278
+#: ../midori/midori-browser.c:4662
msgid "Failed to import bookmarks"
msgstr "Nu s-au putut importa favoritele"
-#: ../midori/midori-browser.c:4313
+#: ../midori/midori-browser.c:4696
msgid "XBEL Bookmarks"
msgstr "Favorite XBEL"
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4701
msgid "Netscape Bookmarks"
msgstr "Favorite Netscape"
-#: ../midori/midori-browser.c:4332
+#: ../midori/midori-browser.c:4715
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "Midori exportă doar în formatele XBEL (*.xbel) sau Netscape (*.html)"
-#: ../midori/midori-browser.c:4347
+#: ../midori/midori-browser.c:4730
msgid "Failed to export bookmarks"
msgstr "Nu s-au putut exporta favoritele"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4469
+#: ../midori/midori-browser.c:4852
msgid "Clear Private Data"
msgstr "Ștergere de date private"
-#: ../midori/midori-browser.c:4473
+#: ../midori/midori-browser.c:4856
msgid "_Clear private data"
msgstr "Șt_erge datele private"
-#: ../midori/midori-browser.c:4486
+#: ../midori/midori-browser.c:4871
msgid "Clear the following data:"
msgstr "Șterge următoarele date:"
# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/midori-browser.c:4496
+#: ../midori/midori-browser.c:4881
msgid "Last open _tabs"
msgstr "Ultimele _taburi deschise"
-#: ../midori/midori-browser.c:4522
+#: ../midori/midori-browser.c:4907
msgid "Clear private data when _quitting Midori"
msgstr "Șterge datele pri_vate la ieșirea din Midori"
-#: ../midori/midori-browser.c:4698
+#: ../midori/midori-browser.c:5122
msgid "A lightweight web browser."
msgstr "Un mic navigator web."
-#: ../midori/midori-browser.c:4699
+#: ../midori/midori-browser.c:5123
msgid "See about:version for version info."
msgstr "Consultați adresa about:version pentru detalii despre versiune."
-#: ../midori/midori-browser.c:4701
+#: ../midori/midori-browser.c:5125
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 "
@@ -688,928 +686,1008 @@ msgstr ""
"publicată de Free Software Foundation, fie versiunea 2.1 ori o versiune "
"ulterioară, la alegere."
-#: ../midori/midori-browser.c:4722
+#: ../midori/midori-browser.c:5155
msgid "translator-credits"
msgstr ""
"Igor Știrbu \n"
"Mișu Moldovan \n"
"Andrei Popescu "
-#: ../midori/midori-browser.c:5086
+#: ../midori/midori-browser.c:5568
msgid "_File"
msgstr "_Fișier"
-#: ../midori/midori-browser.c:5089
+#: ../midori/midori-browser.c:5571
msgid "Open a new window"
msgstr "Deschide o fereastră nouă"
-#: ../midori/midori-browser.c:5092
+#: ../midori/midori-browser.c:5574
msgid "Open a new tab"
msgstr "Deschide un tab nou"
-#: ../midori/midori-browser.c:5094
+#: ../midori/midori-browser.c:5576
msgid "New P_rivate Browsing Window"
msgstr "Navigare p_rivată în fereastră nouă"
-#: ../midori/midori-browser.c:5098
+#: ../midori/midori-browser.c:5580
msgid "Open a file"
msgstr "Deschide un fișier"
-#: ../midori/midori-browser.c:5100
-msgid "_Save Page As..."
-msgstr "_Salvează pagina ca..."
+#: ../midori/midori-browser.c:5582
+msgid "_Save Page As…"
+msgstr "_Salvează pagina ca…"
-#: ../midori/midori-browser.c:5101
+#: ../midori/midori-browser.c:5583
msgid "Save to a file"
msgstr "Salvează într-un fișier"
-#: ../midori/midori-browser.c:5103
+#: ../midori/midori-browser.c:5585
msgid "Add to Speed _dial"
-msgstr "Adaugă _ca apel rapid"
+msgstr "Adaugă ca apel rapi_d"
-#: ../midori/midori-browser.c:5107
+#: ../midori/midori-browser.c:5589
msgid "Add Shortcut to the _desktop"
msgstr "Salvează lin_kul pe desktop"
-#: ../midori/midori-browser.c:5109
+#: ../midori/midori-browser.c:5591
msgid "Create _Launcher"
msgstr "Creează _lansator"
-#: ../midori/midori-browser.c:5113
+#: ../midori/midori-browser.c:5595
msgid "Subscribe to News _feed"
msgstr "Abonare la _fluxul de știri"
-#: ../midori/midori-browser.c:5119
+#: ../midori/midori-browser.c:5601
msgid "_Close Tab"
msgstr "În_chide tabul"
-#: ../midori/midori-browser.c:5120
+#: ../midori/midori-browser.c:5602
msgid "Close the current tab"
msgstr "Închide tabul curent"
-#: ../midori/midori-browser.c:5122
+#: ../midori/midori-browser.c:5604
msgid "C_lose Window"
msgstr "Înc_hide fereastra"
-#: ../midori/midori-browser.c:5126
+#: ../midori/midori-browser.c:5608
+msgid "_Share"
+msgstr "Distrib_uire"
+
+#: ../midori/midori-browser.c:5613
msgid "Print the current page"
msgstr "Tipărește pagina curentă"
-#: ../midori/midori-browser.c:5128
+#: ../midori/midori-browser.c:5616
msgid "Close a_ll Windows"
msgstr "Închide to_ate ferestrele"
-#: ../midori/midori-browser.c:5131
+#: ../midori/midori-browser.c:5619
msgid "_Edit"
msgstr "_Editare"
-#: ../midori/midori-browser.c:5154
-msgid "_Find..."
-msgstr "Ca_ută..."
+#: ../midori/midori-browser.c:5642
+msgid "_Find…"
+msgstr "Ca_ută…"
-#: ../midori/midori-browser.c:5155
+#: ../midori/midori-browser.c:5643
msgid "Find a word or phrase in the page"
msgstr "Caută un cuvânt sau o frază în pagină"
-#: ../midori/midori-browser.c:5157
+#: ../midori/midori-browser.c:5645
msgid "Find _Next"
msgstr "Caută înai_nte"
-#: ../midori/midori-browser.c:5160
+#: ../midori/midori-browser.c:5648
msgid "Find _Previous"
msgstr "Caută înap_oi"
-#: ../midori/midori-browser.c:5164
+#: ../midori/midori-browser.c:5652
msgid "Configure the application preferences"
msgstr "Schimbați preferințele programului"
-#: ../midori/midori-browser.c:5166
+#: ../midori/midori-browser.c:5654
msgid "_View"
msgstr "_Vizualizare"
-#: ../midori/midori-browser.c:5167
+#: ../midori/midori-browser.c:5655
msgid "_Toolbars"
msgstr "_Bare cu unelte"
-#: ../midori/midori-browser.c:5172
+#: ../midori/midori-browser.c:5660
msgid "Reload page without caching"
msgstr "Reîncarcă pagina de la sursă"
-#: ../midori/midori-browser.c:5182
+#: ../midori/midori-browser.c:5670
msgid "Increase the zoom level"
msgstr "Zoom mărit"
-#: ../midori/midori-browser.c:5185
+#: ../midori/midori-browser.c:5673
msgid "Decrease the zoom level"
msgstr "Zoom micșorat"
-#: ../midori/midori-browser.c:5189
+#: ../midori/midori-browser.c:5677
msgid "_Encoding"
msgstr "C_odare"
-#: ../midori/midori-browser.c:5191
+#: ../midori/midori-browser.c:5679
msgid "View So_urce"
msgstr "Arată s_ursa"
-#: ../midori/midori-browser.c:5194
+#: ../midori/midori-browser.c:5682
msgid "Ca_ret Browsing"
msgstr "Navigare cu cu_rsor"
-#: ../midori/midori-browser.c:5198
+#: ../midori/midori-browser.c:5686
msgid "Toggle fullscreen view"
msgstr "Comută pe tot ecranul"
-#: ../midori/midori-browser.c:5200
+#: ../midori/midori-browser.c:5688
msgid "Scroll _Left"
msgstr "Derulare în _stânga"
-#: ../midori/midori-browser.c:5203
+#: ../midori/midori-browser.c:5691
msgid "Scroll _Down"
msgstr "Derulare în j_os"
-#: ../midori/midori-browser.c:5206
+#: ../midori/midori-browser.c:5694
msgid "Scroll _Up"
msgstr "Derulare în _sus"
-#: ../midori/midori-browser.c:5209
+#: ../midori/midori-browser.c:5697
msgid "Scroll _Right"
msgstr "Derulare în _dreapta"
-#: ../midori/midori-browser.c:5212
+#: ../midori/midori-browser.c:5700
+msgid "_Readable"
+msgstr "Li_zibil"
+
+#: ../midori/midori-browser.c:5703
msgid "_Go"
msgstr "_Navigare"
-#: ../midori/midori-browser.c:5215
+#: ../midori/midori-browser.c:5706
msgid "Go back to the previous page"
msgstr "Salt la pagina anterioară"
-#: ../midori/midori-browser.c:5218
+#: ../midori/midori-browser.c:5709
msgid "Go forward to the next page"
msgstr "Salt la pagina următoare"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5713
msgid "Go to the previous sub-page"
msgstr "Salt la sub-pagina anterioară"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5717
msgid "Go to the next sub-page"
msgstr "Salt la sub-pagina următoare"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5719
+msgid "_Homepage"
+msgstr "Pagină de _start"
+
+#: ../midori/midori-browser.c:5720
msgid "Go to your homepage"
msgstr "Salt la pagina de start"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5722
msgid "Empty Trash"
msgstr "Golește gunoiul"
-#: ../midori/midori-browser.c:5234
+#: ../midori/midori-browser.c:5725
msgid "Undo _Close Tab"
-msgstr "Re_vocă închiderea tabului"
+msgstr "Revocă închiderea ta_bului"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5732
msgid "Add a new _folder"
msgstr "Adaugă un _dosar nou"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5738
msgid "_Export bookmarks"
msgstr "_Exportă favoritele"
-#: ../midori/midori-browser.c:5250 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5741 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "_Gestionați motoarele de căutare"
-#: ../midori/midori-browser.c:5253
+#: ../midori/midori-browser.c:5744
msgid "_Clear Private Data"
msgstr "Șt_erge datele private"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5747
msgid "_Inspect Page"
msgstr "_Inspectați pagina"
-#: ../midori/midori-browser.c:5260
+#: ../midori/midori-browser.c:5751
msgid "_Previous Tab"
msgstr "Tabul a_nterior"
-#: ../midori/midori-browser.c:5263
+#: ../midori/midori-browser.c:5754
msgid "_Next Tab"
msgstr "Tabul u_rmător"
-#: ../midori/midori-browser.c:5265
+#: ../midori/midori-browser.c:5756
msgid "Move Tab _Backward"
msgstr "M_ută înapoi tabul"
-#: ../midori/midori-browser.c:5267
+#: ../midori/midori-browser.c:5758
msgid "_Move Tab Forward"
msgstr "_Mută înainte tabul"
-#: ../midori/midori-browser.c:5270
+#: ../midori/midori-browser.c:5761
msgid "Focus _Current Tab"
msgstr "Activează focusul tabului _curent"
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5764
msgid "Focus _Next view"
msgstr "Activează focusul _următorului widget"
-#: ../midori/midori-browser.c:5276
+#: ../midori/midori-browser.c:5767
msgid "Only show the Icon of the _Current Tab"
msgstr "Arată doar iconița tabului _curent"
-#: ../midori/midori-browser.c:5279
+#: ../midori/midori-browser.c:5770
msgid "_Duplicate Current Tab"
msgstr "_Duplică tabul curent"
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5773
msgid "Close Ot_her Tabs"
msgstr "Înc_hide celelalte taburi"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5776
msgid "Open last _session"
msgstr "Deschide ultima _sesiune"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5779
msgid "_Help"
msgstr "_Ajutor"
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5781
msgid "_Frequent Questions"
msgstr "Întrebări _frecvente"
-#: ../midori/midori-browser.c:5293
-msgid "_Report a Problem..."
-msgstr "_Raportați o problemă..."
+#: ../midori/midori-browser.c:5784
+msgid "_Report a Problem…"
+msgstr "_Raportați o problemă…"
-#: ../midori/midori-browser.c:5305
-msgid "_Menubar"
-msgstr "Bară de _meniu"
-
-#: ../midori/midori-browser.c:5309
-msgid "_Navigationbar"
-msgstr "Bară de _navigare"
-
-#: ../midori/midori-browser.c:5313
-msgid "Side_panel"
-msgstr "_Panou lateral"
-
-#: ../midori/midori-browser.c:5314
-msgid "Sidepanel"
-msgstr "Panou lateral"
-
-#: ../midori/midori-browser.c:5317
-msgid "_Bookmarkbar"
-msgstr "Bară cu _favorite"
-
-#: ../midori/midori-browser.c:5321
-msgid "_Statusbar"
-msgstr "Bară de _stare"
-
-#: ../midori/midori-browser.c:5330 ../midori/midori-websettings.c:307
-msgid "_Automatic"
-msgstr "_Automată"
-
-#: ../midori/midori-browser.c:5333 ../midori/midori-websettings.c:232
-msgid "Chinese (BIG5)"
-msgstr "Chineză (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5337
-msgid "Japanese (SHIFT__JIS)"
-msgstr "Japoneză (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:5340 ../midori/midori-websettings.c:234
-msgid "Korean (EUC-KR)"
-msgstr "Coreeană (EUC-KR)"
-
-#: ../midori/midori-browser.c:5343 ../midori/midori-websettings.c:235
-msgid "Russian (KOI8-R)"
-msgstr "Rusă (KOI8-R)"
-
-#: ../midori/midori-browser.c:5346 ../midori/midori-websettings.c:236
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-browser.c:5349 ../midori/midori-websettings.c:237
-msgid "Western (ISO-8859-1)"
-msgstr "Vestică (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5352 ../midori/midori-websettings.c:238
-#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635
-msgid "Custom..."
-msgstr "Personalizat"
-
-#: ../midori/midori-browser.c:5858
-msgid "_Separator"
-msgstr "_Separator"
-
-#: ../midori/midori-browser.c:5865
-msgid "_Location..."
-msgstr "A_dresă..."
-
-#: ../midori/midori-browser.c:5867
-msgid "Open a particular location"
-msgstr "Deschideți o anumită adresă"
-
-#: ../midori/midori-browser.c:5889
-msgid "_Web Search..."
-msgstr "C_aută pe net..."
-
-#: ../midori/midori-browser.c:5891
-msgid "Run a web search"
-msgstr "Porniți o căutare pe net"
-
-#: ../midori/midori-browser.c:5918
-msgid "Reopen a previously closed tab or window"
-msgstr "Redeschideți taburi ori ferestre închise recent"
-
-#: ../midori/midori-browser.c:5935
-msgid "Show the saved bookmarks"
-msgstr "Arată favoritele salvate"
-
-#: ../midori/midori-browser.c:5952
+#: ../midori/midori-browser.c:5789 ../midori/midori-browser.c:6450
msgid "_Tools"
msgstr "_Unelte"
-#: ../midori/midori-browser.c:5968
+#: ../midori/midori-browser.c:5796
+msgid "_Menubar"
+msgstr "Bară de _meniu"
+
+#: ../midori/midori-browser.c:5800
+msgid "_Navigationbar"
+msgstr "Bară de _navigare"
+
+#: ../midori/midori-browser.c:5804
+msgid "Side_panel"
+msgstr "_Panou lateral"
+
+#: ../midori/midori-browser.c:5805
+msgid "Sidepanel"
+msgstr "Panou lateral"
+
+#: ../midori/midori-browser.c:5808
+msgid "_Bookmarkbar"
+msgstr "Bară cu _favorite"
+
+#: ../midori/midori-browser.c:5812
+msgid "_Statusbar"
+msgstr "Bară de _stare"
+
+#: ../midori/midori-browser.c:5821 ../midori/midori-websettings.c:314
+msgid "_Automatic"
+msgstr "_Automată"
+
+#: ../midori/midori-browser.c:5824 ../midori/midori-websettings.c:238
+msgid "Chinese Traditional (BIG5)"
+msgstr "Chineză tradițională (BIG5)"
+
+#: ../midori/midori-browser.c:5827 ../midori/midori-websettings.c:239
+msgid "Chinese Simplified (GB18030)"
+msgstr "Chineză simplificată (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5831
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japoneză (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5834 ../midori/midori-websettings.c:241
+msgid "Korean (EUC-KR)"
+msgstr "Coreeană (EUC-KR)"
+
+#: ../midori/midori-browser.c:5837 ../midori/midori-websettings.c:242
+msgid "Russian (KOI8-R)"
+msgstr "Rusă (KOI8-R)"
+
+#: ../midori/midori-browser.c:5840 ../midori/midori-websettings.c:243
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:5843 ../midori/midori-websettings.c:244
+msgid "Western (ISO-8859-1)"
+msgstr "Vestică (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5846
+msgid "Custom…"
+msgstr "Personalizat"
+
+#: ../midori/midori-browser.c:6356
+msgid "_Separator"
+msgstr "_Separator"
+
+#: ../midori/midori-browser.c:6363
+msgid "_Location…"
+msgstr "A_dresă…"
+
+#: ../midori/midori-browser.c:6365
+msgid "Open a particular location"
+msgstr "Deschideți o anumită adresă"
+
+#: ../midori/midori-browser.c:6387
+msgid "_Web Search…"
+msgstr "C_aută pe net…"
+
+#: ../midori/midori-browser.c:6389
+msgid "Run a web search"
+msgstr "Porniți o căutare pe net"
+
+#: ../midori/midori-browser.c:6416
+msgid "Reopen a previously closed tab or window"
+msgstr "Redeschideți taburi ori ferestre închise recent"
+
+#: ../midori/midori-browser.c:6433
+msgid "Show the saved bookmarks"
+msgstr "Arată favoritele salvate"
+
+#: ../midori/midori-browser.c:6466
msgid "_Window"
msgstr "Fe_reastră"
-#: ../midori/midori-browser.c:5970
+#: ../midori/midori-browser.c:6468
msgid "Show a list of all open tabs"
msgstr "Arată lista tuturor taburilor deschise"
-#: ../midori/midori-browser.c:5984
+#: ../midori/midori-browser.c:6482
msgid "_Menu"
msgstr "_Meniu"
-#: ../midori/midori-browser.c:5986
+#: ../midori/midori-browser.c:6484
msgid "Menu"
msgstr "Meniu"
-#: ../midori/midori-browser.c:6664
+#: ../midori/midori-browser.c:7309
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Opțiune neașteptată „%s”"
-#: ../midori/midori-extension.c:310
+#: ../midori/midori-extension.c:329
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "Opțiunile extensiei „%s” nu au putut fi încărcate: %s\n"
-#: ../midori/midori-extension.c:721 ../midori/midori-extension.c:818
-#: ../midori/midori-extension.c:915 ../midori/midori-extension.c:1027
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
+#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
+#: ../extensions/addons.c:1688
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "Opțiunile extensiei „%s” nu au putut fi salvate: %s\n"
-#: ../midori/midori-locationaction.c:471
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "Nu s-a putut selecta din istoric\n"
-
-#: ../midori/midori-locationaction.c:558
-#, c-format
-msgid "Search for %s"
-msgstr "Caută %s"
-
-#: ../midori/midori-locationaction.c:592
+#: ../midori/midori-locationaction.c:394
#, c-format
msgid "Search with %s"
msgstr "Caută cu %s"
+#: ../midori/midori-locationaction.c:414
+msgid "Search with…"
+msgstr "Caută cu…"
+
+#: ../midori/midori-locationaction.c:541
+#, c-format
+msgid "Failed to select from history\n"
+msgstr "Nu s-a putut selecta din istoric\n"
+
+#: ../midori/midori-locationaction.c:628
+#, c-format
+msgid "Search for %s"
+msgstr "Caută %s"
+
+#: ../midori/midori-locationaction.c:1195
+msgid "Export certificate"
+msgstr "Exportare certificat"
+
+#: ../midori/midori-locationaction.c:1227
+msgid "The signing certificate authority is not known."
+msgstr "Autoritatea de semnare a certificatului nu este cunoscută."
+
+#: ../midori/midori-locationaction.c:1229
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "Certificatul nu este potrivit domeniului din care a fost descărcat."
+
+#: ../midori/midori-locationaction.c:1231
+msgid "The certificate's activation time is still in the future."
+msgstr "Data de activare a certificatului este în viitor."
+
+#: ../midori/midori-locationaction.c:1233
+msgid "The certificate has expired"
+msgstr "Certificatul a expirat."
+
+#: ../midori/midori-locationaction.c:1235
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr "Conform listei de certificate revocate GTlsConnection, certificatul a fost revocat."
+
+#: ../midori/midori-locationaction.c:1237
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Algoritmul certificatului este considerat nesigur."
+
+#: ../midori/midori-locationaction.c:1239
+msgid "Some other error occurred validating the certificate."
+msgstr "A intervenit o altă eroare la validarea certificatului."
+
+#: ../midori/midori-locationaction.c:1286
+msgid "_Export certificate"
+msgstr "_Exportare certificat"
+
+#: ../midori/midori-locationaction.c:1301
+msgid "Self-signed"
+msgstr "Cu semnătură proprie"
+
+#: ../midori/midori-locationaction.c:1335
+msgid "Security details"
+msgstr "Detalii de securitate"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1359
+#: ../midori/midori-locationaction.c:1618
msgid "Paste and p_roceed"
msgstr "Lipește și co_ntinuă"
-#: ../midori/midori-locationaction.c:1727
+#: ../midori/midori-locationaction.c:1942
msgid "Not verified"
msgstr "Neverificată"
-#: ../midori/midori-locationaction.c:1747
+#: ../midori/midori-locationaction.c:1950
msgid "Verified and encrypted connection"
msgstr "Conexiune verificată și criptată"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-locationaction.c:1957
+msgid "Open, unencrypted connection"
+msgstr "Conexiune deschisă, necriptată"
+
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Aliniază la dreapta panoul lateral"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Închide panoul"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Aliniază la stânga panoul lateral"
-#: ../midori/midori-websettings.c:214
+#: ../midori/midori-websettings.c:220
msgid "Show Speed Dial"
msgstr "Arată apelurile rapide"
# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/midori-websettings.c:215
+#: ../midori/midori-websettings.c:221
msgid "Show Homepage"
msgstr "Pagina de start"
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:240
msgid "Japanese (SHIFT_JIS)"
msgstr "Japoneză (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:253
+#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Personalizare..."
+
+#: ../midori/midori-websettings.c:260
msgid "New tab"
msgstr "Tab nou"
-#: ../midori/midori-websettings.c:254
+#: ../midori/midori-websettings.c:261
msgid "New window"
msgstr "Fereastră nouă"
-#: ../midori/midori-websettings.c:255
+#: ../midori/midori-websettings.c:262
msgid "Current tab"
msgstr "Tab curent"
-#: ../midori/midori-websettings.c:270
+#: ../midori/midori-websettings.c:277
msgid "Default"
msgstr "Implicit"
-#: ../midori/midori-websettings.c:271
+#: ../midori/midori-websettings.c:278
msgid "Icons"
msgstr "Iconițe"
-#: ../midori/midori-websettings.c:272
+#: ../midori/midori-websettings.c:279
msgid "Small icons"
msgstr "Iconițe mici"
-#: ../midori/midori-websettings.c:273
+#: ../midori/midori-websettings.c:280
msgid "Text"
msgstr "Text"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:281
msgid "Icons and text"
msgstr "Iconițe și text"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:282
msgid "Text beside icons"
msgstr "Text lângă iconițe"
-#: ../midori/midori-websettings.c:290
+#: ../midori/midori-websettings.c:297
msgid "Automatic (GNOME or environment)"
msgstr "Automat (din mediu ori GNOME)"
-#: ../midori/midori-websettings.c:291
+#: ../midori/midori-websettings.c:298
msgid "HTTP proxy server"
msgstr "Server proxy HTTP"
-#: ../midori/midori-websettings.c:292
+#: ../midori/midori-websettings.c:299
msgid "No proxy server"
msgstr "Fără server proxy"
-#: ../midori/midori-websettings.c:309
+#: ../midori/midori-websettings.c:316
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:317
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:310
+#: ../midori/midori-websettings.c:318
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:311
+#: ../midori/midori-websettings.c:319
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:312
+#: ../midori/midori-websettings.c:320
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:380
+#: ../midori/midori-websettings.c:404
msgid "Remember last window size"
msgstr "Reține dimensiunea ultimei ferestre"
-#: ../midori/midori-websettings.c:381
+#: ../midori/midori-websettings.c:405
msgid "Whether to save the last window size"
msgstr "Specifică dacă se salvează dimensiunea ultimei ferestre"
-#: ../midori/midori-websettings.c:389
+#: ../midori/midori-websettings.c:413
msgid "Last window width"
msgstr "Lățimea ultimei ferestre"
-#: ../midori/midori-websettings.c:390
+#: ../midori/midori-websettings.c:414
msgid "The last saved window width"
msgstr "Ultima lățime salvată a ferestrei"
-#: ../midori/midori-websettings.c:398
+#: ../midori/midori-websettings.c:422
msgid "Last window height"
msgstr "Înălțimea ultimei ferestre"
-#: ../midori/midori-websettings.c:399
+#: ../midori/midori-websettings.c:423
msgid "The last saved window height"
msgstr "Ultima înălțime salvată a ferestrei"
-#: ../midori/midori-websettings.c:424
+#: ../midori/midori-websettings.c:448
msgid "Last panel position"
msgstr "Ultima poziție a panoului"
-#: ../midori/midori-websettings.c:425
+#: ../midori/midori-websettings.c:449
msgid "The last saved panel position"
msgstr "Ultima poziție salvată a panoului"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:434
+#: ../midori/midori-websettings.c:458
msgid "Last panel page"
msgstr "Ultima pagină a panoului"
-#: ../midori/midori-websettings.c:435
+#: ../midori/midori-websettings.c:459
msgid "The last saved panel page"
msgstr "Ultima pagină salvată a panoului"
-#: ../midori/midori-websettings.c:443
+#: ../midori/midori-websettings.c:467
msgid "Last Web search"
msgstr "Ultima căutare pe net"
-#: ../midori/midori-websettings.c:444
+#: ../midori/midori-websettings.c:468
msgid "The last saved Web search"
msgstr "Ultima căutare pe net salvată"
-#: ../midori/midori-websettings.c:453
+#: ../midori/midori-websettings.c:492
msgid "Show Menubar"
msgstr "Arată bara de meniu"
-#: ../midori/midori-websettings.c:454
+#: ../midori/midori-websettings.c:493
msgid "Whether to show the menubar"
msgstr "Specifică dacă să fie vizibilă bara de meniu"
-#: ../midori/midori-websettings.c:462
+#: ../midori/midori-websettings.c:501
msgid "Show Navigationbar"
msgstr "Arată bara de navigare"
-#: ../midori/midori-websettings.c:463
+#: ../midori/midori-websettings.c:502
msgid "Whether to show the navigationbar"
msgstr "Specifică dacă să fie vizibilă bara de navigare"
-#: ../midori/midori-websettings.c:471
+#: ../midori/midori-websettings.c:510
msgid "Show Bookmarkbar"
msgstr "Arată bara cu favorite"
-#: ../midori/midori-websettings.c:472
+#: ../midori/midori-websettings.c:511
msgid "Whether to show the bookmarkbar"
msgstr "Specifică dacă să fie vizibilă bara cu favorite"
-#: ../midori/midori-websettings.c:480
+#: ../midori/midori-websettings.c:519
msgid "Show Panel"
msgstr "Arată panoul"
-#: ../midori/midori-websettings.c:481
+#: ../midori/midori-websettings.c:520
msgid "Whether to show the panel"
msgstr "Specifică dacă să fie vizibil panoul"
-#: ../midori/midori-websettings.c:489
+#: ../midori/midori-websettings.c:528
msgid "Show Statusbar"
msgstr "Arată bara de stare"
-#: ../midori/midori-websettings.c:490
+#: ../midori/midori-websettings.c:529
msgid "Whether to show the statusbar"
msgstr "Specifică dacă să fie vizibilă bara de stare"
-#: ../midori/midori-websettings.c:499
+#: ../midori/midori-websettings.c:538
msgid "Toolbar Style:"
msgstr "Stil pentru bara cu unelte:"
-#: ../midori/midori-websettings.c:500
+#: ../midori/midori-websettings.c:539
msgid "The style of the toolbar"
msgstr "Stilul barei cu unelte"
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:548
msgid "Toolbar Items"
msgstr "Elementele barei cu unelte"
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:549
msgid "The items to show on the toolbar"
msgstr "Elementele de arătat în bara cu unelte"
-#: ../midori/midori-websettings.c:518
+#: ../midori/midori-websettings.c:557
msgid "Compact Sidepanel"
msgstr "Panou lateral compact"
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:558
msgid "Whether to make the sidepanel compact"
msgstr "Specifică dacă panoul lateral e compact"
-#: ../midori/midori-websettings.c:534
+#: ../midori/midori-websettings.c:573
msgid "Align sidepanel on the right"
msgstr "Aliniază la dreapta panoul lateral"
-#: ../midori/midori-websettings.c:535
+#: ../midori/midori-websettings.c:574
msgid "Whether to align the sidepanel on the right"
msgstr "Specifică dacă panoul lateral se aliniază la dreapta"
-#: ../midori/midori-websettings.c:550
+#: ../midori/midori-websettings.c:589
msgid "Open panels in separate windows"
msgstr "Deschide panourile în ferestre separate"
-#: ../midori/midori-websettings.c:551
+#: ../midori/midori-websettings.c:590
msgid "Whether to always open panels in separate windows"
msgstr "Specifică dacă panourile noi se deschid în ferestre separate"
# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/midori-websettings.c:560
+#: ../midori/midori-websettings.c:599
msgid "When Midori starts:"
msgstr "La pornirea Midori arată:"
-#: ../midori/midori-websettings.c:561
+#: ../midori/midori-websettings.c:600
msgid "What to do when Midori starts"
msgstr "Specificați cum să pornească Midori"
-#: ../midori/midori-websettings.c:570
+#: ../midori/midori-websettings.c:609
msgid "Homepage:"
msgstr "Pagină de start:"
-#: ../midori/midori-websettings.c:571
+#: ../midori/midori-websettings.c:610
msgid "The homepage"
msgstr "Pagina de start"
-#: ../midori/midori-websettings.c:586
+#: ../midori/midori-websettings.c:625
msgid "Show crash dialog"
msgstr "Depanare după terminări premature"
-#: ../midori/midori-websettings.c:587
+#: ../midori/midori-websettings.c:626
msgid "Show a dialog after Midori crashed"
msgstr "Arată o fereastră de depanare la pornirea după o terminare prematură"
-#: ../midori/midori-websettings.c:595
+#: ../midori/midori-websettings.c:634
msgid "Save downloaded files to:"
msgstr "Salvează fișierele descărcate în:"
-#: ../midori/midori-websettings.c:596
+#: ../midori/midori-websettings.c:635
msgid "The folder downloaded files are saved to"
msgstr "Calea către dosarul pentru salvarea fișierelor descărcate"
-#: ../midori/midori-websettings.c:604
+#: ../midori/midori-websettings.c:643
msgid "Text Editor"
msgstr "Editor de text"
-#: ../midori/midori-websettings.c:605
+#: ../midori/midori-websettings.c:644
msgid "An external text editor"
msgstr "Editor extern de text"
-#: ../midori/midori-websettings.c:620
+#: ../midori/midori-websettings.c:659
msgid "News Aggregator"
msgstr "Agregator de știri"
-#: ../midori/midori-websettings.c:621
+#: ../midori/midori-websettings.c:660
msgid "An external news aggregator"
msgstr "Agregator extern de știri"
-#: ../midori/midori-websettings.c:629
+#: ../midori/midori-websettings.c:668
msgid "Location entry Search"
msgstr "Căutarea în bara de adrese"
-#: ../midori/midori-websettings.c:630
+#: ../midori/midori-websettings.c:669
msgid "The search to perform inside the location entry"
msgstr "Căutarea de efectuat în bara de adrese"
-#: ../midori/midori-websettings.c:638
+#: ../midori/midori-websettings.c:677
msgid "Preferred Encoding"
msgstr "Codare preferată"
-#: ../midori/midori-websettings.c:639
+#: ../midori/midori-websettings.c:678
msgid "The preferred character encoding"
msgstr "Codarea de caractere preferată"
-#: ../midori/midori-websettings.c:649
+#: ../midori/midori-websettings.c:688
msgid "Always Show Tabbar"
msgstr "Arată întotdeauna bara cu taburi"
-#: ../midori/midori-websettings.c:650
+#: ../midori/midori-websettings.c:689
msgid "Always show the tabbar"
msgstr "Arată întotdeauna bara cu taburi"
-#: ../midori/midori-websettings.c:658
+#: ../midori/midori-websettings.c:702
msgid "Close Buttons on Tabs"
msgstr "Butoane de închidere a taburilor"
-#: ../midori/midori-websettings.c:659
+#: ../midori/midori-websettings.c:703
msgid "Whether tabs have close buttons"
msgstr "Specifică dacă se adaugă butoane de închidere pe taburi"
-#: ../midori/midori-websettings.c:684
+#: ../midori/midori-websettings.c:728
msgid "Open new pages in:"
msgstr "Paginile noi se vor deschide în:"
-#: ../midori/midori-websettings.c:685
+#: ../midori/midori-websettings.c:729
msgid "Where to open new pages"
msgstr "Alegeți unde să se deschidă paginile noi"
-#: ../midori/midori-websettings.c:694
+#: ../midori/midori-websettings.c:738
msgid "Middle click opens Selection"
msgstr "Butonul din mijloc deschide selecția"
-#: ../midori/midori-websettings.c:695
+#: ../midori/midori-websettings.c:739
msgid "Load an address from the selection via middle click"
msgstr ""
"Încarcă adresa din clipboard prin clic pe butonul din mijloc al mausului"
-#: ../midori/midori-websettings.c:703
+#: ../midori/midori-websettings.c:747
msgid "Open tabs in the background"
msgstr "Deschide taburile în fundal"
-#: ../midori/midori-websettings.c:704
+#: ../midori/midori-websettings.c:748
msgid "Whether to open new tabs in the background"
msgstr "Specifică dacă taburile noi se deschid în fundal"
-#: ../midori/midori-websettings.c:712
+#: ../midori/midori-websettings.c:756
msgid "Open Tabs next to Current"
msgstr "Deschide taburile lângă cel curent"
-#: ../midori/midori-websettings.c:713
+#: ../midori/midori-websettings.c:757
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr ""
"Specifică dacă taburile noi se deschid lângă cel curent sau după ultimul tab"
-#: ../midori/midori-websettings.c:721
+#: ../midori/midori-websettings.c:765
msgid "Open popups in tabs"
msgstr "Deschide popup-urile în taburi"
-#: ../midori/midori-websettings.c:722
+#: ../midori/midori-websettings.c:766
msgid "Whether to open popup windows in tabs"
msgstr "Specifică dacă ferestrele popup se deschid în taburi"
-#: ../midori/midori-websettings.c:732 ../extensions/statusbar-features.c:134
+#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155
msgid "Load images automatically"
msgstr "Încarcă automat imaginile"
-#: ../midori/midori-websettings.c:733
+#: ../midori/midori-websettings.c:777
msgid "Load and display images automatically"
msgstr "Încarcă și afișează automat imaginile"
-#: ../midori/midori-websettings.c:740 ../extensions/statusbar-features.c:143
+#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165
msgid "Enable scripts"
msgstr "Execută scripturile"
-#: ../midori/midori-websettings.c:741
+#: ../midori/midori-websettings.c:785
msgid "Enable embedded scripting languages"
msgstr "Activează limbajele de scripting incluse"
-#: ../midori/midori-websettings.c:748 ../extensions/statusbar-features.c:154
+#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177
msgid "Enable Netscape plugins"
msgstr "Activează modulele Netscape"
-#: ../midori/midori-websettings.c:749
+#: ../midori/midori-websettings.c:793
msgid "Enable embedded Netscape plugin objects"
msgstr "Activează modulele Netscape incluse"
-#: ../midori/midori-websettings.c:764
+#: ../midori/midori-websettings.c:808
msgid "Enable Spell Checking"
msgstr "Activează verificarea ortografică"
-#: ../midori/midori-websettings.c:765
+#: ../midori/midori-websettings.c:809
msgid "Enable spell checking while typing"
msgstr "Verifică ortografia în timpul tastării"
-#: ../midori/midori-websettings.c:771
+#: ../midori/midori-websettings.c:815
msgid "Enable HTML5 database support"
msgstr "Suport pentru baze de date HTML5"
-#: ../midori/midori-websettings.c:772
+#: ../midori/midori-websettings.c:816
msgid "Whether to enable HTML5 database support"
msgstr "Specifică dacă să se activeze suportul pentru baze de date HTML5"
-#: ../midori/midori-websettings.c:778
+#: ../midori/midori-websettings.c:822
msgid "Enable HTML5 local storage support"
msgstr "Suport pentru stocare locală HTML5"
-#: ../midori/midori-websettings.c:779
+#: ../midori/midori-websettings.c:823
msgid "Whether to enable HTML5 local storage support"
msgstr "Specifică dacă să se activeze suportul pentru stocare locală HTML5"
-#: ../midori/midori-websettings.c:785
+#: ../midori/midori-websettings.c:829
msgid "Enable offline web application cache"
msgstr "Cache offline pentru aplicații web"
-#: ../midori/midori-websettings.c:786
+#: ../midori/midori-websettings.c:830
msgid "Whether to enable offline web application cache"
msgstr ""
"Specifică dacă să se activeze suportul pentru cache offline de aplicații web"
-#: ../midori/midori-websettings.c:802
+#: ../midori/midori-websettings.c:851
msgid "Flash window on background tabs"
msgstr "Evidențiere pentru taburile noi în fundal"
-#: ../midori/midori-websettings.c:803
+#: ../midori/midori-websettings.c:852
msgid "Flash the browser window if a new tab was opened in the background"
msgstr "Evidențiază pe moment fereastra la deschiderea unui tab nou în fundal"
-#: ../midori/midori-websettings.c:811
+#: ../midori/midori-websettings.c:860
msgid "Enable WebGL support"
msgstr "Suport pentru standardul WebGL"
-#: ../midori/midori-websettings.c:812
+#: ../midori/midori-websettings.c:861
msgid "Allow websites to use OpenGL rendering"
msgstr "Permite randarea WebGL în paginile web"
-#: ../midori/midori-websettings.c:838
+#: ../midori/midori-websettings.c:887
msgid "Zoom Text and Images"
msgstr "Scalează imaginile odată cu textul"
-#: ../midori/midori-websettings.c:839
+#: ../midori/midori-websettings.c:888
msgid "Whether to zoom text and images"
msgstr "Specifică dacă se scalează concomitent textul și imaginile"
-#: ../midori/midori-websettings.c:854
+#: ../midori/midori-websettings.c:903
msgid "Find inline while typing"
msgstr "Caută în pagină pe măsură ce se tastează"
-#: ../midori/midori-websettings.c:855
+#: ../midori/midori-websettings.c:904
msgid "Whether to automatically find inline while typing"
msgstr "Specifică dacă se caută automat pe măsură ce se tastează"
-#: ../midori/midori-websettings.c:870
+#: ../midori/midori-websettings.c:919
msgid "Kinetic scrolling"
msgstr "Derulare cinetică"
-#: ../midori/midori-websettings.c:871
+#: ../midori/midori-websettings.c:920
msgid "Whether scrolling should kinetically move according to speed"
msgstr ""
"Specifică dacă derularea ar trebui să se facă cinetic, în acord cu viteza "
"derulării"
# dumol: Truc pentru a micșora lățimea ferestrei cu preferințe
-#: ../midori/midori-websettings.c:879
+#: ../midori/midori-websettings.c:928
msgid "Delete old Cookies after:"
msgstr "Șterge cookie-urile vechi după:"
-#: ../midori/midori-websettings.c:880
+#: ../midori/midori-websettings.c:929
msgid "The maximum number of days to save cookies for"
msgstr "Numărul maxim de zile pentru păstrarea cookie-urilor"
-#: ../midori/midori-websettings.c:896
+#: ../midori/midori-websettings.c:945
msgid "Only accept Cookies from sites you visit"
msgstr "Nu accepta cookie-uri third-party"
-#: ../midori/midori-websettings.c:897
+#: ../midori/midori-websettings.c:946
msgid "Block cookies sent by third-party websites"
msgstr ""
"Blochează cookie-urile de la alte servere decât cel ce găzduiește pagina "
"curentă"
-#: ../midori/midori-websettings.c:911
+#: ../midori/midori-websettings.c:960
msgid "Delete pages from history after:"
msgstr "Șterge paginile din istoric după:"
-#: ../midori/midori-websettings.c:912
+#: ../midori/midori-websettings.c:961
msgid "The maximum number of days to save the history for"
msgstr "Numărul maxim de zile pentru păstrarea istoricului"
-#: ../midori/midori-websettings.c:927
+#: ../midori/midori-websettings.c:976
msgid "Proxy server"
msgstr "Server proxy"
-#: ../midori/midori-websettings.c:928
+#: ../midori/midori-websettings.c:977
msgid "The type of proxy server to use"
msgstr "Tipul serverului proxy de utilizat"
-#: ../midori/midori-websettings.c:937
+#: ../midori/midori-websettings.c:986
msgid "HTTP Proxy Server"
msgstr "Server proxy HTTP"
-#: ../midori/midori-websettings.c:938
+#: ../midori/midori-websettings.c:987
msgid "The proxy server used for HTTP connections"
msgstr "Serverul proxy pentru conexiuni HTTP"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:1002
msgid "Port"
msgstr "Port"
-#: ../midori/midori-websettings.c:954
+#: ../midori/midori-websettings.c:1003
msgid "The proxy server port used for HTTP connections"
msgstr "Portul serverului proxy pentru conexiuni HTTP"
-#: ../midori/midori-websettings.c:972
+#: ../midori/midori-websettings.c:1021
msgid "The maximum size of cached pages on disk"
msgstr "Mărimea maximă a paginilor din cache-ul pe disc"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:989
+#: ../midori/midori-websettings.c:1038
msgid "Identify as"
msgstr "Identificare"
-#: ../midori/midori-websettings.c:990
+#: ../midori/midori-websettings.c:1039
msgid "What to identify as to web pages"
msgstr "Alegeți identitatea de prezentat serverelor web"
-#: ../midori/midori-websettings.c:1006
+#: ../midori/midori-websettings.c:1055
msgid "Identification string"
msgstr "Șir de identificare"
-#: ../midori/midori-websettings.c:1007
+#: ../midori/midori-websettings.c:1056
msgid "The application identification string"
msgstr "Șirul de identificare al navigatorului"
-#: ../midori/midori-websettings.c:1023
+#: ../midori/midori-websettings.c:1072
msgid "Preferred languages"
msgstr "Limbă preferată"
-#: ../midori/midori-websettings.c:1024
+#: ../midori/midori-websettings.c:1073
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1617,424 +1695,449 @@ msgstr ""
"O listă de limbi preferate pentru afișarea paginilor multilingve, de "
"exemplu: „ro”, „ro,en” ori „en-us;q=1.0, fr-fr;q=0.667”"
-#: ../midori/midori-websettings.c:1039
+#: ../midori/midori-websettings.c:1088
msgid "Clear private data"
msgstr "Șterge datele private"
-#: ../midori/midori-websettings.c:1040
+#: ../midori/midori-websettings.c:1089
msgid "The private data selected for deletion"
msgstr "Datele private selectate pentru ștergere"
-#: ../midori/midori-websettings.c:1055
+#: ../midori/midori-websettings.c:1104
msgid "Clear data"
msgstr "Șterge datele"
-#: ../midori/midori-websettings.c:1056
+#: ../midori/midori-websettings.c:1105
msgid "The data selected for deletion"
msgstr "Datele selectate pentru ștergere"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1105
+#: ../midori/midori-websettings.c:1154
msgid "Strip referrer details sent to websites"
msgstr "Nu trimite serverelor detalii Referrer"
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1107
+#: ../midori/midori-websettings.c:1156
msgid "Whether the \"Referer\" header should be shortened to the hostname"
msgstr "Specifică dacă antetul Referrer va fi scurtat la numele serverului"
-#: ../midori/midori-websettings.c:1121
+#: ../midori/midori-websettings.c:1170
msgid "Always use my font choices"
msgstr "Folosește întotdeauna fonturile mele"
-#: ../midori/midori-websettings.c:1122
+#: ../midori/midori-websettings.c:1171
msgid "Override fonts picked by websites with user preferences"
msgstr "Înlocuiește fonturile precizate în paginile web cu cele alese mai sus"
-#: ../midori/midori-view.c:1307
+#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140
+msgid "Trust this website"
+msgstr "Site de încredere"
+
+#: ../midori/midori-view.c:1138
+msgid "Security unknown"
+msgstr "Nivel necunoscut de securitate"
+
+#: ../midori/midori-view.c:1436
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s dorește să salveze o bază de date HTML5."
-#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Deny"
msgstr "_Refuză"
-#: ../midori/midori-view.c:1311 ../midori/midori-view.c:1343
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Allow"
msgstr "_Acceptă"
-#: ../midori/midori-view.c:1339
+#: ../midori/midori-view.c:1469
#, c-format
msgid "%s wants to know your location."
msgstr "%s dorește să vă identifice locația."
-#: ../midori/midori-view.c:1430
+#: ../midori/midori-view.c:1565
#, c-format
msgid "Error - %s"
msgstr "Eroare - %s"
-#: ../midori/midori-view.c:1431
+#: ../midori/midori-view.c:1566
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Nu s-a putut încărca pagina „%s”."
-#: ../midori/midori-view.c:1433
+#: ../midori/midori-view.c:1568
msgid "Try again"
msgstr "Reîncearcă"
-#: ../midori/midori-view.c:1610 ../midori/midori-view.c:2514
+#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875
#, c-format
msgid "Send a message to %s"
msgstr "Scrieți un mail către %s"
-#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2663
+#: ../midori/midori-view.c:2661
+msgid "Add _search engine..."
+msgstr "Adaugă ca _motor de căutare..."
+
+#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031
msgid "Inspect _Element"
msgstr "_Inspectați elementul"
-#: ../midori/midori-view.c:2397
+#: ../midori/midori-view.c:2757
msgid "Open Link in New _Tab"
msgstr "Deschide linkul într-un _tab nou"
-#: ../midori/midori-view.c:2401
+#: ../midori/midori-view.c:2761
msgid "Open Link in _Foreground Tab"
msgstr "Deschide lin_kul într-un tab nou în prim plan"
-#: ../midori/midori-view.c:2402
+#: ../midori/midori-view.c:2762
msgid "Open Link in _Background Tab"
msgstr "Deschide linkul într-un tab nou în _fundal"
-#: ../midori/midori-view.c:2405
+#: ../midori/midori-view.c:2765
msgid "Open Link in New _Window"
msgstr "Deschide linkul într-o _fereastră nouă"
-#: ../midori/midori-view.c:2408
+#: ../midori/midori-view.c:2768
msgid "Open Link as Web A_pplication"
msgstr "Deschide linkul ca o aplicație _web"
-#: ../midori/midori-view.c:2413
+#: ../midori/midori-view.c:2773
msgid "Copy Link de_stination"
msgstr "Copiază de_stinația linkului"
-#: ../midori/midori-view.c:2429
+#: ../midori/midori-view.c:2789
msgid "Open _Image in New Tab"
msgstr "Deschide _imaginea într-un tab nou"
-#: ../midori/midori-view.c:2432
+#: ../midori/midori-view.c:2792
msgid "Copy Image _Address"
msgstr "Copiază _adresa imaginii"
-#: ../midori/midori-view.c:2435
+#: ../midori/midori-view.c:2795
msgid "Save I_mage"
msgstr "Salvează i_maginea"
-#: ../midori/midori-view.c:2438
+#: ../midori/midori-view.c:2798
msgid "Open in Image _Viewer"
msgstr "D_eschide imaginea în programul asociat"
-#: ../midori/midori-view.c:2445
+#: ../midori/midori-view.c:2805
msgid "Copy Video _Address"
msgstr "Copiază _adresa materialului video"
-#: ../midori/midori-view.c:2448
+#: ../midori/midori-view.c:2808
msgid "Save _Video"
msgstr "Salvează materialul _video"
-#: ../midori/midori-view.c:2448
+#: ../midori/midori-view.c:2808
msgid "Download _Video"
msgstr "Descarcă _materialul video"
-#: ../midori/midori-view.c:2474
+#: ../midori/midori-view.c:2834
msgid "Search _with"
msgstr "Caută c_u"
-#: ../midori/midori-view.c:2506
+#: ../midori/midori-view.c:2866
msgid "_Search the Web"
msgstr "C_aută pe net"
-#: ../midori/midori-view.c:2522
+#: ../midori/midori-view.c:2883
msgid "Open Address in New _Tab"
msgstr "Deschide adresa într-un _tab nou"
-#: ../midori/midori-view.c:2811
+#: ../midori/midori-view.c:2936
+msgid "Open _Frame in New Tab"
+msgstr "Desc_hide cadrul într-un tab nou"
+
+#: ../midori/midori-view.c:3190
msgid "Open or download file"
msgstr "Deschide sau descarcă fișierul"
-#: ../midori/midori-view.c:2830
-#, c-format
-msgid "File Type: '%s'"
-msgstr "Tip de fișier: „%s”"
-
-#: ../midori/midori-view.c:2832
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Tip de fișier: %s („%s”)"
-
-#: ../midori/midori-view.c:2836
+#: ../midori/midori-view.c:3214
#, c-format
msgid "File Name: %s"
msgstr "Nume fișier: %s"
+#: ../midori/midori-view.c:3219
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Tip de fișier: „%s”"
+
+#: ../midori/midori-view.c:3221
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Tip de fișier: %s („%s”)"
+
+#: ../midori/midori-view.c:3256
+#, c-format
+msgid "Size: %s"
+msgstr "Mărime: %s"
+
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2855
+#: ../midori/midori-view.c:3267
#, c-format
msgid "Open %s"
msgstr "Deschide %s"
-#: ../midori/midori-view.c:3480
+#: ../midori/midori-view.c:3886
#, c-format
msgid "Inspect page - %s"
msgstr "Inspectare pagină - %s"
-#: ../midori/midori-view.c:3781
+#: ../midori/midori-view.c:4241
msgid "Speed Dial"
msgstr "Apeluri rapide"
-# dumol: E ok dacă e mai lung...
-#: ../midori/midori-view.c:3782 ../midori/midori-view.c:3878
+# dumol: E ok dacă e mai lung…
+#: ../midori/midori-view.c:4242 ../midori/midori-view.c:4348
msgid "Click to add a shortcut"
msgstr "Dați clic aici pentru a adăuga un apel rapid"
-#: ../midori/midori-view.c:3783
+#: ../midori/midori-view.c:4243
msgid "Enter shortcut address"
msgstr "Introduceți adresa apelului rapid"
-#: ../midori/midori-view.c:3784
+#: ../midori/midori-view.c:4244
msgid "Enter shortcut title"
msgstr "Introduceți titlul apelului rapid"
-#: ../midori/midori-view.c:3785
+#: ../midori/midori-view.c:4245
msgid "Are you sure you want to delete this shortcut?"
msgstr "Sigur doriți să ștergeți acest apel rapid?"
-#: ../midori/midori-view.c:3947
+#: ../midori/midori-view.c:4418
#, c-format
msgid "No documentation installed"
msgstr "Documentația nu este instalată"
-#: ../midori/midori-view.c:4023
+#: ../midori/midori-view.c:4495
msgid "Midori doesn't store any personal data:"
msgstr "Midori nu stochează niciun fel de date personale:"
-#: ../midori/midori-view.c:4024
+#: ../midori/midori-view.c:4496
msgid "No history or web cookies are being saved."
msgstr "Nu se salvează istoricul ori cookie-urile."
-#: ../midori/midori-view.c:4025
+#: ../midori/midori-view.c:4497
msgid "Extensions are disabled."
msgstr "Extensiile sunt dezactivate."
-#: ../midori/midori-view.c:4026
+#: ../midori/midori-view.c:4498
msgid "HTML5 storage, local database and application caches are disabled."
-msgstr "Stocarea HTML5, bazele de date locale și cache-ul aplicațiilor web sunt dezactivate."
+msgstr ""
+"Stocarea HTML5, bazele de date locale și cache-ul aplicațiilor web sunt "
+"dezactivate."
-#: ../midori/midori-view.c:4027
+#: ../midori/midori-view.c:4499
msgid "Midori prevents websites from tracking the user:"
msgstr "Midori previne urmărirea utilizatorilor pe Internet:"
-#: ../midori/midori-view.c:4028
+#: ../midori/midori-view.c:4500
msgid "Referrer URLs are stripped down to the hostname."
msgstr "Antetele referrer sunt trunchiate la numele serverului."
-#: ../midori/midori-view.c:4029
+#: ../midori/midori-view.c:4501
msgid "DNS prefetching is disabled."
msgstr "Cererile DNS nu se fac anticipat."
-#: ../midori/midori-view.c:4030
+#: ../midori/midori-view.c:4502
msgid "The language and timezone are not revealed to websites."
msgstr "Limba și fusul orar nu sunt accesibile site-urilor web."
-#: ../midori/midori-view.c:4031
+#: ../midori/midori-view.c:4503
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr "Modulele Netscape (Flash și altele) nu pot fi listate de site-uri."
-#: ../midori/midori-view.c:4068
+#: ../midori/midori-view.c:4592
msgid "Version numbers in brackets show the version used at runtime."
msgstr "Cifrele dintre paranteze arată versiunile utilizate curent."
-#: ../midori/midori-view.c:4123
+#: ../midori/midori-view.c:4642
msgid "Page loading delayed"
msgstr "Încărcarea paginii a fost întârziată."
-#: ../midori/midori-view.c:4124
+#: ../midori/midori-view.c:4643
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"Încărcarea a fost întârziată din cauza unei terminări premature ori pentru "
"că așa ați optat în preferințele Midori."
-#: ../midori/midori-view.c:4125
+#: ../midori/midori-view.c:4644
msgid "Load Page"
msgstr "Încarcă pagina"
-#: ../midori/midori-view.c:4264
+#: ../midori/midori-view.c:4811
msgid "Blank page"
msgstr "O pagină goală"
-#: ../midori/midori-view.c:4526
+#: ../midori/midori-view.c:5075
msgid "_Duplicate Tab"
msgstr "D_uplică tabul"
-#: ../midori/midori-view.c:4531
+#: ../midori/midori-view.c:5080
msgid "Show Tab _Label"
msgstr "_Arată eticheta tabului"
-#: ../midori/midori-view.c:4531
+#: ../midori/midori-view.c:5080
msgid "Show Tab _Icon Only"
msgstr "_Arată doar iconița tabului"
-#: ../midori/midori-view.c:4537
-msgid "Close ot_her Tabs"
-msgstr "Înc_hide celelalte taburi"
+#: ../midori/midori-view.c:5087
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Înc_hide celălalt tab"
+msgstr[1] "Înc_hide celelalte taburi"
+msgstr[2] "Înc_hide celelalte taburi"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5308
+#: ../midori/midori-view.c:5923
msgid "previous"
msgstr "înapoi"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5327
+#: ../midori/midori-view.c:5942
msgid "next"
msgstr "înainte"
-#: ../midori/midori-view.c:5340
+#: ../midori/midori-view.c:5955
msgid "Print background images"
msgstr "Tipărește imaginile de fundal"
-#: ../midori/midori-view.c:5341
+#: ../midori/midori-view.c:5956
msgid "Whether background images should be printed"
msgstr "Specifică dacă se tipăresc și imaginile de fundal"
-#: ../midori/midori-view.c:5373
+#: ../midori/midori-view.c:5988
msgid "Features"
msgstr "Facilități"
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:298
msgid "Startup"
msgstr "Pornire"
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:311
msgid "Use _current page"
msgstr "Tipărește pagina _curentă"
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:315
msgid "Use current page as homepage"
msgstr "Utilizează pagina curentă ca pagină de start"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:324
msgid "Fonts"
msgstr "Fonturi"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:327
msgid "Proportional Font Family"
msgstr "Familie de fonturi proporționale"
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:331
msgid "The default font family used to display text"
msgstr "Familie implicită de fonturi pentru afișarea textului"
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:334
msgid "The default font size used to display text"
msgstr "Mărime implicită a fontului pentru afișarea textului"
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:336
msgid "Fixed-width Font Family"
msgstr "Familie de fonturi cu lățime fixă"
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:340
msgid "The font family used to display fixed-width text"
msgstr "Familie de fonturi utilizată pentru afișarea textului de lățime fixă"
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:343
msgid "The font size used to display fixed-width text"
msgstr "Mărimea fontului utilizat pentru afișarea textului de lățime fixă"
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:345
msgid "Minimum Font Size"
msgstr "Mărime minimă a fontului"
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:349
msgid "The minimum font size used to display text"
msgstr "Mărime minimă a fontului pentru afișarea textului"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:360
msgid "Behavior"
msgstr "Comportament"
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:386
msgid "Allow scripts to open popups"
msgstr "Permite popup-uri deschise de scripturi"
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:387
msgid "Whether scripts are allowed to open popup windows automatically"
msgstr "Specifică dacă se permite scripturilor deschiderea de ferestre popup"
#. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:418
msgid "Browsing"
msgstr "Navigare"
#. Page "Network"
-#: ../midori/midori-preferences.c:454
+#: ../midori/midori-preferences.c:458
msgid "Network"
msgstr "Rețea"
-#: ../midori/midori-preferences.c:461
+#: ../midori/midori-preferences.c:465
msgid "Hostname"
msgstr "Nume ori IP"
-#: ../midori/midori-preferences.c:485
+#: ../midori/midori-preferences.c:489
msgid "MB"
msgstr "MB"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Add search engine"
msgstr "Adăugați un motor de căutare"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Edit search engine"
msgstr "Editare motor de căutare"
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:985
msgid "_Name:"
msgstr "_Nume:"
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1000
msgid "_Description:"
msgstr "_Descriere:"
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "_Iconiță:"
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Adresă:"
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1032
msgid "_Token:"
msgstr "_Etichetă:"
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1330
msgid "Manage Search Engines"
msgstr "Gestionare a motoarelor de căutare"
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1432
msgid "Use as _default"
msgstr "I_mplicit"
-#: ../midori/sokoke.c:412
+#: ../midori/sokoke.c:346
msgid "Open with"
msgstr "Deschide cu"
-#: ../midori/sokoke.c:420
+#: ../midori/sokoke.c:354
#, c-format
msgid "Choose an application or command to open \"%s\":"
msgstr "Alegeți o asociere pentru a deschide „%s”:"
-#: ../midori/sokoke.c:461 ../midori/sokoke.c:471 ../midori/sokoke.c:499
-#: ../midori/sokoke.c:528 ../midori/sokoke.c:542
+#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
msgid "Could not run external program."
msgstr "Nu s-a putut porni programul extern."
-#: ../midori/sokoke.c:1653
+#: ../midori/sokoke.c:1529
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -2042,7 +2145,7 @@ msgstr[0] "o oră"
msgstr[1] "%d ore"
msgstr[2] "%d de ore"
-#: ../midori/sokoke.c:1654
+#: ../midori/sokoke.c:1530
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -2050,7 +2153,7 @@ msgstr[0] "un minut"
msgstr[1] "%d minute"
msgstr[2] "%d de minute"
-#: ../midori/sokoke.c:1655
+#: ../midori/sokoke.c:1531
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2059,67 +2162,67 @@ msgstr[1] "%d secunde"
msgstr[2] "%d de secunde"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1663 ../panels/midori-transfers.c:267
+#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269
#, c-format
msgid "%s of %s"
msgstr "%s din %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1672
+#: ../midori/sokoke.c:1548
msgid "?B"
msgstr "?B"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1675
+#: ../midori/sokoke.c:1551
#, c-format
msgid " (%s/s)"
msgstr " (%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1692
+#: ../midori/sokoke.c:1568
#, c-format
msgid " - %s remaining"
msgstr " - încă %s"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:263
+#: ../toolbars/midori-findbar.c:265
msgid "_Inline Find:"
msgstr "_Căutare în pagină:"
-#: ../toolbars/midori-findbar.c:289
+#: ../toolbars/midori-findbar.c:287
msgid "Previous"
msgstr "Anterioară"
-#: ../toolbars/midori-findbar.c:295
+#: ../toolbars/midori-findbar.c:293
msgid "Next"
msgstr "Următoare"
-#: ../toolbars/midori-findbar.c:299
+#: ../toolbars/midori-findbar.c:297
msgid "Match Case"
msgstr "Majuscule semnificative"
-#: ../toolbars/midori-findbar.c:308
+#: ../toolbars/midori-findbar.c:306
msgid "Highlight Matches"
msgstr "Evidențiază potrivirile"
-#: ../toolbars/midori-findbar.c:319
+#: ../toolbars/midori-findbar.c:317
msgid "Close Findbar"
msgstr "Închide bara de căutare"
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:124
#, c-format
msgid "The file '%s ' has been downloaded."
msgstr "S-a descărcat fișierul „%s ”."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:129
msgid "Transfer completed"
msgstr "Descărcare finalizată"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:201
msgid "The downloaded file is erroneous."
msgstr "Fișierul descărcat este corupt."
-#: ../toolbars/midori-transferbar.c:194
+#: ../toolbars/midori-transferbar.c:202
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2127,60 +2230,66 @@ msgstr ""
"Suma de control asociată linkului nu s-a potrivit. Probabil că fișierul este "
"incomplet sau a fost modificat ulterior."
-#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:345 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Șterge tot"
-#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370
+#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384
msgid "Some files are being downloaded"
msgstr "Unele fișiere sunt în curs de descărcare"
-#: ../toolbars/midori-transferbar.c:374
+#: ../toolbars/midori-transferbar.c:388
msgid "_Quit Midori"
msgstr "În_chidere Midori"
-#: ../toolbars/midori-transferbar.c:376
+#: ../toolbars/midori-transferbar.c:390
msgid "The transfers will be cancelled if Midori quits."
msgstr "Dacă închideți Midori, se vor pierde descărcările curente."
-#: ../panels/midori-bookmarks.c:113
-msgid "Bookmarks"
-msgstr "Favorite"
-
-#: ../panels/midori-bookmarks.c:256
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Nu s-a putut adăuga favoritul: %s\n"
-#: ../panels/midori-bookmarks.c:434
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Nu s-a putut actualiza favoritul: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Editați favoritul selectat"
-#: ../panels/midori-bookmarks.c:442
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Ștergeți favoritul selectat"
-#: ../panels/midori-bookmarks.c:457
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Adăugați un dosar nou"
-#: ../panels/midori-bookmarks.c:591 ../panels/midori-history.c:631
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Separator "
-#: ../panels/midori-history.c:110
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Căutare în favorite"
+
+#: ../panels/midori-history.c:111
msgid "History"
msgstr "Istoric"
-#: ../panels/midori-history.c:157 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
msgid "Today"
msgstr "Azi"
-#: ../panels/midori-history.c:159 ../panels/midori-history.c:190
+#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
msgid "Yesterday"
msgstr "Ieri"
-#: ../panels/midori-history.c:161 ../panels/midori-history.c:185
+#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
@@ -2188,35 +2297,45 @@ msgstr[0] "Ieri"
msgstr[1] "Acum %d zile"
msgstr[2] "Acum %d de zile"
-#: ../panels/midori-history.c:164 ../panels/midori-history.c:183
+#: ../panels/midori-history.c:165 ../panels/midori-history.c:184
msgid "A week ago"
msgstr "Acum o săptămână"
-#: ../panels/midori-history.c:359
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Nu s-a putut șterge elementul din istoric: %s\n"
+
+#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Sigur doriți să ștergeți toate elementele din istoric?"
-#: ../panels/midori-history.c:405
+#: ../panels/midori-history.c:407
msgid "Bookmark the selected history item"
msgstr "Adaugă ca favorit elementul selectat din istoric"
-#: ../panels/midori-history.c:414
+#: ../panels/midori-history.c:416
msgid "Delete the selected history item"
msgstr "Șterge elementul selectat din istoric"
-#: ../panels/midori-history.c:422
+#: ../panels/midori-history.c:424
msgid "Clear the entire history"
msgstr "Șterge întregul istoric"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Căutare în istoric"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Descărcări"
-#: ../panels/midori-transfers.c:467
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
msgstr "Deschide _dosarul de destinație"
-#: ../panels/midori-transfers.c:470
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
msgstr "Copiază _adresa linkului"
@@ -2258,54 +2377,54 @@ msgstr "Nu s-a putut încărca iconița implicită „%s”"
msgid "Animation frames are broken"
msgstr "Cadrele animației sunt nevalide"
-#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Proprietatea „%s” nu este validă pentru %s"
-#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
#: ../extensions/addons.c:308
msgid "Choose file"
msgstr "Selectați un fișier"
-#: ../katze/katze-utils.c:500
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Selectați un dosar"
-#: ../katze/katze-utils.c:604
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Fără"
-#: ../katze/katze-utils.c:719
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "o oră"
-#: ../katze/katze-utils.c:720
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "o zi"
-#: ../katze/katze-utils.c:721
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "o săptămână"
-#: ../katze/katze-utils.c:722
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "o lună"
-#: ../katze/katze-utils.c:723
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "un an"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Preferințe pentru %s"
-#: ../extensions/adblock.c:467
+#: ../extensions/adblock.c:470
msgid "Configure Advertisement filters"
msgstr "Opțiuni pentru filtrarea reclamelor"
-#: ../extensions/adblock.c:498
+#: ../extensions/adblock.c:503
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2315,27 +2434,27 @@ msgstr ""
"faceți clic pe „Adaugă” pentru a o adăuga în listă. Puteți găsi mai multe "
"liste la %s."
-#: ../extensions/adblock.c:846
+#: ../extensions/adblock.c:917
msgid "Edit rule"
msgstr "Editare regulă"
-#: ../extensions/adblock.c:860
+#: ../extensions/adblock.c:931
msgid "_Rule:"
msgstr "_Regulă:"
-#: ../extensions/adblock.c:914
+#: ../extensions/adblock.c:985
msgid "Bl_ock image"
msgstr "Bl_ochează imaginea"
-#: ../extensions/adblock.c:919
+#: ../extensions/adblock.c:990
msgid "Bl_ock link"
msgstr "Bl_ochează linkul"
-#: ../extensions/adblock.c:1538
+#: ../extensions/adblock.c:1689
msgid "Advertisement blocker"
msgstr "Filtrare de reclame"
-#: ../extensions/adblock.c:1539
+#: ../extensions/adblock.c:1690
msgid "Block advertisements according to a filter list"
msgstr "Blochează reclamele conform unei liste de filtre"
@@ -2365,65 +2484,65 @@ msgstr "_Instalează stilul"
msgid "Don't install"
msgstr "Nu instala"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:677
msgid "Userscripts"
-msgstr "Scripturi proprii"
+msgstr "Scripturi de utilizator"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:679
msgid "Userstyles"
-msgstr "Stiluri proprii"
+msgstr "Stiluri de utilizator"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Eroare"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Doriți să ștergeți „%s”?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
msgid "Delete user script"
-msgstr "Ștergere script propriu"
+msgstr "Ștergere script de utilizator"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
msgid "Delete user style"
-msgstr "Ștergere stil propriu"
+msgstr "Ștergere stil de utilizator"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Fișierul %s va fi șters definitiv."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:566 ../extensions/addons.c:643
msgid "Open in Text Editor"
msgstr "Deschide în editorul de text"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:568 ../extensions/addons.c:652
msgid "Open Target Folder"
msgstr "Deschide dosarul țintă"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:634
msgid "Add new addon"
msgstr "Adăugare de noi elemente"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:660
msgid "Remove selected addon"
msgstr "Șterge elementul selectat"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
msgid "User addons"
msgstr "Module proprii"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1819
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Nu se poate monitoriza dosarul „%s”: %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1908
msgid "Support for userscripts and userstyles"
-msgstr "Suport pentru scripturi și stiluri proprii"
+msgstr "Suport pentru scripturi și stiluri de utilizator"
#: ../extensions/colorful-tabs.c:201
msgid "Colorful Tabs"
@@ -2508,29 +2627,21 @@ msgstr ""
"Domeniu : %s\n"
"Cookie-uri : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Nume"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "_Extinde tot"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "Plia_ză tot"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Filtru:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Introduceți un filtru pentru a afișa doar cookie-urile ale căror nume ori "
-"domenii se potrivesc"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Căutare în numele și domeniile cookie-urilor"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2646,47 +2757,47 @@ msgstr ""
"Pentru a deschide această adresă e nevoie\n"
"de numele unui cont de acces și parola sa:"
-#: ../extensions/formhistory/formhistory.c:292
+#: ../extensions/formhistory/formhistory.c:294
msgid "Remember password on this page?"
msgstr "Să se rețină parola pentru această pagină?"
-#: ../extensions/formhistory/formhistory.c:297
+#: ../extensions/formhistory/formhistory.c:299
msgid "Remember"
msgstr "Reține"
-#: ../extensions/formhistory/formhistory.c:298
+#: ../extensions/formhistory/formhistory.c:300
msgid "Not now"
msgstr "Nu acum"
-#: ../extensions/formhistory/formhistory.c:299
+#: ../extensions/formhistory/formhistory.c:301
msgid "Never for this page"
msgstr "Niciodată pentru pagina asta"
-#: ../extensions/formhistory/formhistory.c:435
+#: ../extensions/formhistory/formhistory.c:437
msgid "Toggle form history state"
msgstr "Comută starea istoricului formularelor"
-#: ../extensions/formhistory/formhistory.c:436
+#: ../extensions/formhistory/formhistory.c:438
msgid "Activate or deactivate form history for the current tab."
msgstr "Activează ori dezactivează istoricul formularelor pentru tabul curent"
-#: ../extensions/formhistory/formhistory.c:547
-#: ../extensions/formhistory/formhistory.c:551
+#: ../extensions/formhistory/formhistory.c:549
+#: ../extensions/formhistory/formhistory.c:553
#, c-format
msgid "Failed to execute database statement: %s\n"
msgstr "Nu s-a putut executa comanda asupra bazei de date: %s\n"
-#: ../extensions/formhistory/formhistory.c:627
+#: ../extensions/formhistory/formhistory.c:629
msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
msgstr ""
"activează per tab istoricul formularelor doar prin combinația de taste (Ctrl"
"+Shift+F)"
-#: ../extensions/formhistory/formhistory.c:666
+#: ../extensions/formhistory/formhistory.c:668
msgid "Form history filler"
msgstr "Istoric pentru formulare"
-#: ../extensions/formhistory/formhistory.c:667
+#: ../extensions/formhistory/formhistory.c:669
msgid "Stores history of entered form data"
msgstr "Salvează istoricul datelor introduse în formulare"
@@ -2771,7 +2882,7 @@ msgstr "Personalizați combinațiile de taste"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "Personalizați c_ombinațiile de taste..."
+msgstr "Personalizați c_ombinațiile de taste…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2789,35 +2900,35 @@ msgstr "Ceas în bara de stare"
msgid "Display date and time in the statusbar"
msgstr "Arată data și ora în bara de stare"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Imagini"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Scripturi"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Module Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Facilități web în bara de stare"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "Activați cu ușurință facilități pentru paginile web"
-#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Panou cu taburi"
-#: ../extensions/tab-panel.c:666
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "Panou cu t_aburi"
-#: ../extensions/tab-panel.c:684
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Arată taburile într-un panou vertical"
@@ -2829,11 +2940,11 @@ msgstr "Doar iconițe în taburi"
msgid "New tabs have no label by default"
msgstr "Taburile noi nu vor avea implicit etichete de text"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Personalizați bara cu unelte"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2841,27 +2952,23 @@ msgstr ""
"Selectați elementele de afișat în bara cu unelte. Ele pot fi reordonate prin "
"tragere și plasare."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Elemente disponibile"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Elemente afișate"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Personalizați bara cu unel_te..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "Personalizați bara cu unel_te…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Personalizare..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Editor pentru bara cu unelte"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Personalizați aspectul barei cu unelte"
@@ -2869,6 +2976,46 @@ msgstr "Personalizați aspectul barei cu unelte"
msgid "Cache HTTP communication on disk"
msgstr "Stochează comunicarea HTTP într-un cache pe disc"
+#~ msgid "_Bookmark"
+#~ msgstr "_Favorit"
+
+#~ msgid "_Console"
+#~ msgstr "_Consolă"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Dosarul rădăcină"
+
+#~ msgid "_Title:"
+#~ msgstr "_Titlu:"
+
+#~ msgid "_Folder:"
+#~ msgstr "D_osar:"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "Înc_hide celelalte taburi"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Iconiță:"
+
+#~ msgid "Filter:"
+#~ msgstr "Filtru:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Introduceți un filtru pentru a afișa doar cookie-urile ale căror nume ori "
+#~ "domenii se potrivesc"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Personalizare…"
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Nu s-au putut salva favoritele. %s"
+
+#~ msgid "The specified configuration folder is invalid."
+#~ msgstr "Dosarul cu preferințe precizat nu este valid."
+
#~ msgid "Lightweight web browser"
#~ msgstr "Mic navigator web"
@@ -2965,14 +3112,14 @@ msgstr "Stochează comunicarea HTTP într-un cache pe disc"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Adaugă un dosar cu favorite"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Adăugați, editați și ștergeți motoare de căutare..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Adăugați, editați și ștergeți motoare de căutare…"
-#~ msgid "Clear private data..."
-#~ msgstr "Ștergere de date private..."
+#~ msgid "Clear private data…"
+#~ msgstr "Ștergere de date private…"
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr "Inspectați detaliile paginii și accesați uneltele de dezvoltare..."
+#~ msgid "Inspect page details and access developer tools…"
+#~ msgstr "Inspectați detaliile paginii și accesați uneltele de dezvoltare…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Comută la tabul anterior"
@@ -3198,8 +3345,8 @@ msgstr "Stochează comunicarea HTTP într-un cache pe disc"
#~ msgid "Delete old cookies after 1 year"
#~ msgstr "Cele mai vechi de un an"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Opțiuni pentru _filtrarea reclamelor..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Opțiuni pentru _filtrarea reclamelor…"
#~ msgid "Open target folder for selected addon"
#~ msgstr "Deschide dosarul țintă pentru elementul selectat"
diff --git a/po/ru.po b/po/ru.po
index 3368c613..d29e3fe8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the midori package.
# Troitskiy Nikita 2008
# Anton Shestakov 2008-2009
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: midori 0.2.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-14 08:30+0000\n"
-"PO-Revision-Date: 2011-10-09 14:28+0800\n"
-"Last-Translator: Anton Shestakov \n"
+"POT-Creation-Date: 2012-08-27 07:21+0000\n"
+"PO-Revision-Date: 2012-08-27 22:45+1000\n"
+"Last-Translator: Alex 'AdUser' Z \n"
"Language-Team: Russian \n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../data/midori.desktop.in.h:1
@@ -26,12 +26,33 @@ msgstr "Работа в Интернете"
msgid "Internet;WWW;Explorer"
msgstr "Internet;Explorer;Интернет;браузер;обозреватель;www"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:1989 ../midori/main.c:2009
-#: ../midori/main.c:2023 ../midori/midori-websettings.c:308
+#: ../data/midori.desktop.in.h:3
+#: ../midori/main.c:2009
+#: ../midori/main.c:2033
+#: ../midori/main.c:2047
+#: ../midori/midori-websettings.c:316
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Интернет-обозреватель Midori"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Новое кон_фиденциальное окно"
+
+#: ../data/midori.desktop.in.h:6
+#: ../midori/midori-browser.c:1491
+msgid "New Tab"
+msgstr "Новая вкладка"
+
+#: ../data/midori.desktop.in.h:7
+#: ../midori/midori-browser.c:1488
+msgid "New Window"
+msgstr "Новое окно"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Интернет-обозреватель"
@@ -43,340 +64,328 @@ msgstr "Midori (конфиденциальный режим)"
msgid "Open a new private browsing window"
msgstr "Открывает новое конфиденциальное окно"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4043
+#: ../data/midori-private.desktop.in.h:3
+#: ../midori/midori-view.c:4505
msgid "Private Browsing"
msgstr "Конфиденциальный режим"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:91
+#: ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Не удалось загрузить настройки: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Значение «%s» недействительно для %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:150
+#: ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Недопустимое значение параметра: «%s»"
-#: ../midori/main.c:364
+#: ../midori/main.c:375
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Не удалось загрузить средства поиска. %s\n"
-#: ../midori/main.c:418
+#: ../midori/main.c:429
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Не удалось очистить журнал: %s\n"
-#: ../midori/main.c:438 ../midori/main.c:562
+#: ../midori/main.c:451
#: ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Не удалось открыть базу данных: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:505
+#: ../midori/main.c:523
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Не удалось удалить устаревшие записи из журнала: %s\n"
-#: ../midori/main.c:545 ../panels/midori-history.c:231
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Не удалось удалить запись из журнала: %s\n"
-
-#: ../midori/main.c:592
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Не удалось сохранить закладки. %s"
-
-#: ../midori/main.c:614
+#: ../midori/main.c:545
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Не удалось сохранить настройки. %s"
-#: ../midori/main.c:649
+#: ../midori/main.c:571
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Не удалось сохранить средства поиска. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:686
+#: ../midori/main.c:608
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Не удалось сохранить содержимое корзины. %s"
-#: ../midori/main.c:727 ../panels/midori-extensions.c:91
+#: ../midori/main.c:681
+#: ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Дополнения"
-#: ../midori/main.c:741
+#: ../midori/main.c:695
msgid "Privacy"
msgstr "Конфиденциальность"
-#: ../midori/main.c:753
-msgid ""
-"Cookies store login data, saved games, or user profiles for advertisement "
-"purposes."
-msgstr ""
-"Фрагменты данных хранят текущего пользователя сайта, сохранения игр, а также "
-"могут хранить информацию о пользователе в рекламных целях."
+#: ../midori/main.c:707
+msgid "Cookies store login data, saved games, or user profiles for advertisement purposes."
+msgstr "Фрагменты данных хранят текущего пользователя сайта, сохранения игр, а также могут хранить информацию о пользователе в рекламных целях."
-#: ../midori/main.c:809
+#: ../midori/main.c:763
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Не удалось сохранить сеанс. %s"
-#: ../midori/main.c:1027
-msgid ""
-"No root certificate file is available. SSL certificates cannot be verified."
+#: ../midori/main.c:985
+msgid "No root certificate file is available. SSL certificates cannot be verified."
msgstr "Недоступен корневой сертификат. SSL сертификат не может быть проверен."
-#: ../midori/main.c:1096
-msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
-msgstr ""
-"Возможно, работа Midori была аварийно прекращена. Если это часто "
-"повторяется, можно выбрать действие для решения проблемы ниже."
+#: ../midori/main.c:1077
+msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem."
+msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1096
msgid "Modify _preferences"
msgstr "Изменить _параметры"
-#: ../midori/main.c:1119
+#: ../midori/main.c:1100
msgid "Disable all _extensions"
msgstr "Отключить _все дополнения"
-#: ../midori/main.c:1132
+#: ../midori/main.c:1113
msgid "Discard old tabs"
msgstr "Закрыть все вкладки"
-#: ../midori/main.c:1133 ../midori/midori-websettings.c:217
+#: ../midori/main.c:1114
+#: ../midori/midori-websettings.c:224
msgid "Show last tabs without loading"
msgstr "Открыть последние страницы без загрузки"
-#: ../midori/main.c:1134 ../midori/midori-websettings.c:216
+#: ../midori/main.c:1115
+#: ../midori/midori-websettings.c:223
msgid "Show last open tabs"
msgstr "Открыть последние открытые страницы"
-#: ../midori/main.c:1342 ../midori/main.c:2400
+#: ../midori/main.c:1363
+#: ../midori/main.c:2417
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Не удалось загрузить сеанс: %s\n"
-#: ../midori/main.c:1480
+#: ../midori/main.c:1501
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Снимок сохранён в: %s\n"
-#: ../midori/main.c:1892
+#: ../midori/main.c:1917
msgid "Run ADDRESS as a web application"
msgstr "Запустить АДРЕС как веб-приложение"
-#: ../midori/main.c:1892
+#: ../midori/main.c:1917
msgid "ADDRESS"
msgstr "АДРЕС"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1920
msgid "Use FOLDER as configuration folder"
msgstr "Использовать файлы параметров из ПАПКИ"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1920
msgid "FOLDER"
msgstr "ПАПКА"
-#: ../midori/main.c:1898
+#: ../midori/main.c:1923
msgid "Private browsing, no changes are saved"
msgstr "Конфиденциальный режим, изменения не будут сохранены"
-#: ../midori/main.c:1900
+#: ../midori/main.c:1925
msgid "Show a diagnostic dialog"
msgstr "Показать окно действий"
-#: ../midori/main.c:1902
+#: ../midori/main.c:1927
msgid "Run the specified filename as javascript"
msgstr "Выполнить указанный файл как javascript"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1929
msgid "Take a snapshot of the specified URI"
msgstr "Создать снимок указанной страницы"
-#: ../midori/main.c:1906
+#: ../midori/main.c:1931
msgid "Execute the specified command"
msgstr "Выполнить указанную команду"
-#: ../midori/main.c:1908
+#: ../midori/main.c:1933
msgid "List available commands to execute with -e/ --execute"
msgstr "Вывести список доступных команд для -e/ --execute"
-#: ../midori/main.c:1910
+#: ../midori/main.c:1935
msgid "Display program version"
msgstr "Отобразить версию программы"
-#: ../midori/main.c:1912
+#: ../midori/main.c:1937
msgid "Addresses"
msgstr "Адреса"
-#: ../midori/main.c:1914
+#: ../midori/main.c:1939
msgid "Block URIs according to regular expression PATTERN"
msgstr "Блокировать URI по ШАБЛОНУ (регулярное выражение)"
-#: ../midori/main.c:1914
+#: ../midori/main.c:1939
msgid "PATTERN"
msgstr "ШАБЛОН"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1918
+#: ../midori/main.c:1943
msgid "Reset Midori after SECONDS seconds of inactivity"
-msgstr ""
-"Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия"
+msgstr "Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия"
-#: ../midori/main.c:1918
+#: ../midori/main.c:1943
msgid "SECONDS"
msgstr "СЕКУНД"
-#: ../midori/main.c:1921
+#: ../midori/main.c:1946
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Перенаправить предупреждения из консоли в выбранный ФАЙЛ"
-#: ../midori/main.c:1921
+#: ../midori/main.c:1946
msgid "FILENAME"
msgstr "ФАЙЛ"
-#: ../midori/main.c:1986
-msgid "[Addresses]"
-msgstr "[Адреса]"
-
-#: ../midori/main.c:1996
-msgid "The specified configuration folder is invalid."
-msgstr "Указана некорректная папка файлов параметров."
-
-#: ../midori/main.c:2024
+#: ../midori/main.c:2048
msgid "Please report comments, suggestions and bugs to:"
msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:"
-#: ../midori/main.c:2026
+#: ../midori/main.c:2050
msgid "Check for new versions at:"
msgstr "Искать обновления на:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2110
+#: ../midori/main.c:2145
msgid "Saved logins and _passwords"
msgstr "Сохранённые логины и _пароли"
-#: ../midori/main.c:2112
+#: ../midori/main.c:2147
msgid "Cookies and Website data"
msgstr "Cookies и данные веб-сайта"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2116 ../midori/midori-websettings.c:979
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
+#: ../midori/main.c:2151
+#: ../midori/midori-websettings.c:1021
+#: ../extensions/web-cache.c:462
+#: ../extensions/web-cache.c:471
msgid "Web Cache"
msgstr "Сетевой кэш"
-#: ../midori/main.c:2119
+#: ../midori/main.c:2154
msgid "Website icons"
msgstr "Значки веб-сайтов"
-#: ../midori/main.c:2225
+#: ../midori/main.c:2258
msgid "An unknown error occured"
msgstr "Неизвестная ошибка"
-#: ../midori/main.c:2331
+#: ../midori/main.c:2365
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Midori уже запущена, но не отвечает.\n"
-#: ../midori/main.c:2367
+#: ../midori/main.c:2399
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Не удалось загрузить закладки: %s\n"
-#: ../midori/main.c:2415
+#: ../midori/main.c:2432
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Не удалось загрузить содержимое корзины: %s\n"
-#: ../midori/main.c:2428
+#: ../midori/main.c:2445
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Не удалось загрузить журнал: %s\n"
-#: ../midori/main.c:2444
+#: ../midori/main.c:2460
msgid "The following errors occured:"
msgstr "Обнаружены следующие ошибки:"
-#: ../midori/main.c:2460
+#: ../midori/main.c:2476
msgid "_Ignore"
msgstr "_Игнорировать"
-#: ../midori/midori-app.c:1331
-msgid "_Bookmark"
-msgstr "_Закладка"
+#: ../midori/midori-app.c:1155
+#: ../midori/midori-browser.c:557
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Неожиданное действие «%s»."
-#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:5934
+#: ../midori/midori-app.c:1459
+#: ../midori/midori-browser.c:6452
msgid "_Bookmarks"
msgstr "_Закладки"
-#: ../midori/midori-app.c:1333
+#: ../midori/midori-app.c:1460
msgid "Add Boo_kmark"
msgstr "_Добавить закладку"
-#: ../midori/midori-app.c:1334
-msgid "_Console"
-msgstr "_Консоль"
-
-#: ../midori/midori-app.c:1335
+#: ../midori/midori-app.c:1461
msgid "_Extensions"
msgstr "_Дополнения"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4503
+#: ../midori/midori-app.c:1462
+#: ../midori/midori-browser.c:4905
msgid "_History"
msgstr "_Журнал"
-#: ../midori/midori-app.c:1337
-msgid "_Homepage"
-msgstr "_Домашняя страница"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1463
msgid "_Userscripts"
msgstr "_Пользовательские сценарии"
-#: ../midori/midori-app.c:1339
+#: ../midori/midori-app.c:1464
+msgid "User_styles"
+msgstr "С_тили пользователя"
+
+#: ../midori/midori-app.c:1465
msgid "New _Tab"
msgstr "Но_вая вкладка"
-#: ../midori/midori-app.c:1340
+#: ../midori/midori-app.c:1466
msgid "_Transfers"
msgstr "_Передачи"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1467
msgid "Netscape p_lugins"
msgstr "_Модули Netscape"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1468
msgid "_Closed Tabs"
msgstr "За_крытые вкладки"
-#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5089
+#: ../midori/midori-app.c:1469
+#: ../midori/midori-browser.c:5588
msgid "New _Window"
msgstr "_Новое окно"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1470
msgid "New _Folder"
msgstr "Новая папка"
+#: ../midori/midori-app.c:1499
+msgid "[Addresses]"
+msgstr "[Адреса]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Файл не найден."
-#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
-#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
+#: ../midori/midori-array.c:547
+#: ../midori/midori-array.c:586
+#: ../midori/midori-array.c:609
+#: ../midori/midori-array.c:619
msgid "Malformed document."
msgstr "Плохо сформированный документ."
@@ -388,1648 +397,1754 @@ msgstr "Неизвестный формат закладок."
msgid "Writing failed."
msgstr "Ошибка записи."
-#: ../midori/midori-browser.c:322 ../midori/midori-browser.c:5171
-#: ../midori/midori-browser.c:5180
+#: ../midori/midori-browser.c:359
+#: ../midori/midori-browser.c:5676
+#: ../midori/midori-browser.c:5685
msgid "Reload the current page"
msgstr "Обновить страницу"
-#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5177
+#: ../midori/midori-browser.c:368
+#: ../midori/midori-browser.c:5682
msgid "Stop loading the current page"
msgstr "Прекратить загрузку страницы"
-#: ../midori/midori-browser.c:456
+#: ../midori/midori-browser.c:376
+#: ../midori/midori-browser.c:5727
+msgid "Go forward to the next page"
+msgstr "На следующую страницу"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:383
+#: ../midori/midori-browser.c:5735
+#: ../midori/midori-browser.c:5738
+msgid "Go to the next sub-page"
+msgstr "На следующую подстраницу"
+
+#: ../midori/midori-browser.c:542
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Не удалось обновить заголовок: %s\n"
-#: ../midori/midori-browser.c:469
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Неожиданное действие «%s»."
-
-#: ../midori/midori-browser.c:559
+#: ../midori/midori-browser.c:637
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (конфиденциальный режим)"
-#: ../midori/midori-browser.c:669 ../midori/midori-browser.c:702
-msgid "Toplevel folder"
-msgstr "Корневая папка"
+#: ../midori/midori-browser.c:747
+#: ../midori/midori-browser.c:789
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Закладки"
-#: ../midori/midori-browser.c:759
+#: ../midori/midori-browser.c:849
msgid "New folder"
msgstr "Создание папки"
-#: ../midori/midori-browser.c:759
+#: ../midori/midori-browser.c:849
msgid "Edit folder"
msgstr "Изменить папку"
-#: ../midori/midori-browser.c:761
+#: ../midori/midori-browser.c:851
msgid "New bookmark"
msgstr "Новая закладка"
-#: ../midori/midori-browser.c:761
+#: ../midori/midori-browser.c:851
msgid "Edit bookmark"
msgstr "Изменение закладки"
-#: ../midori/midori-browser.c:792
-msgid "_Title:"
-msgstr "_Заголовок:"
+#: ../midori/midori-browser.c:885
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Выберите имя для закладки и место для её хранения."
-#: ../midori/midori-browser.c:812 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Адрес:"
-
-#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4240
-msgid "_Folder:"
-msgstr "_Папка:"
-
-#: ../midori/midori-browser.c:851
+#: ../midori/midori-browser.c:946
msgid "Add to _Speed Dial"
msgstr "Добавить в _быстрый набор"
-#: ../midori/midori-browser.c:864
+#: ../midori/midori-browser.c:952
msgid "Show in the tool_bar"
msgstr "По_казывать на панели закладок"
-#: ../midori/midori-browser.c:879
+#: ../midori/midori-browser.c:960
msgid "Run as _web application"
msgstr "Запускать как _веб-приложение"
-#: ../midori/midori-browser.c:950
+#: ../midori/midori-browser.c:1031
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "Файл «%s» не может быть сохранён в данную папку."
-#: ../midori/midori-browser.c:952
+#: ../midori/midori-browser.c:1033
#, c-format
msgid "You don't have permission to write in this location."
msgstr "У вас недостаточно прав для записи указанного файла."
-#: ../midori/midori-browser.c:959
+#: ../midori/midori-browser.c:1040
#, c-format
msgid "There is not enough free space to download \"%s\"."
msgstr "Не хватает свободного места для загрузки \"%s\"."
-#: ../midori/midori-browser.c:962
+#: ../midori/midori-browser.c:1043
#, c-format
msgid "The file needs %s but only %s are left."
msgstr "Файл требует %s а %s доступно"
-#: ../midori/midori-browser.c:1000 ../midori/midori-browser.c:4309
+#: ../midori/midori-browser.c:1179
+#: ../midori/midori-browser.c:4709
msgid "Save file as"
msgstr "Сохранить файл как"
-#: ../midori/midori-browser.c:1294
-msgid "New Window"
-msgstr "Новое окно"
+#: ../midori/midori-browser.c:1185
+msgid "Save associated _resources"
+msgstr "Сохранить связаннные ресурсы"
-#: ../midori/midori-browser.c:1294
+#: ../midori/midori-browser.c:1488
msgid "A new window has been opened"
msgstr "Открыто новое окно"
-#: ../midori/midori-browser.c:1297
-msgid "New Tab"
-msgstr "Новая вкладка"
-
-#: ../midori/midori-browser.c:1297
+#: ../midori/midori-browser.c:1491
msgid "A new tab has been opened"
msgstr "Открыта новая вкладка"
-#: ../midori/midori-browser.c:1332
+#: ../midori/midori-browser.c:1508
msgid "Error opening the image!"
msgstr "Ошибка при открытии изображения!"
-#: ../midori/midori-browser.c:1333
+#: ../midori/midori-browser.c:1509
msgid "Can not open selected image in a default viewer."
-msgstr ""
-"Выделенное изображение не удалось открыть в программе просмотра по умолчанию."
+msgstr "Выделенное изображение не удалось открыть в программе просмотра по умолчанию."
-#: ../midori/midori-browser.c:1339
+#: ../midori/midori-browser.c:1515
msgid "Error downloading the image!"
msgstr "Ошибка при загрузке изображения!"
-#: ../midori/midori-browser.c:1340
+#: ../midori/midori-browser.c:1516
msgid "Can not download selected image."
msgstr "Не удалось загрузить выделенное изображение."
-#: ../midori/midori-browser.c:1443
+#: ../midori/midori-browser.c:1637
msgid "Save file"
msgstr "Сохранить файл"
-#: ../midori/midori-browser.c:2294
+#: ../midori/midori-browser.c:2540
msgid "Open file"
msgstr "Открыть файл"
-#: ../midori/midori-browser.c:2426
+#: ../midori/midori-browser.c:2672
msgid ""
-"To use the above URI open a news aggregator. There is usually a menu or "
-"button \"New Subscription\", \"New News Feed\" or similar.\n"
-"Alternatively go to Preferences, Applications in Midori, and select a News "
-"Aggregator. Next time you click the news feed icon, it will be added "
-"automatically."
+"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n"
+"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically."
msgstr ""
-"Чтобы воспользоваться данным URI, откройте программу чтения новостей. Обычно "
-"необходимое действие называется «Добавить ленту» или «Добавить подписку».\n"
-"В настройках Midori также можно установить программу чтения новостей. В "
-"таком случае, в следующий раз при нажатии на ссылку на ленту, она будет "
-"добавлена автоматически."
+"Чтобы воспользоваться данным URI, откройте программу чтения новостей. Обычно необходимое действие называется «Добавить ленту» или «Добавить подписку».\n"
+"В настройках Midori также можно установить программу чтения новостей. В таком случае, в следующий раз при нажатии на ссылку на ленту, она будет добавлена автоматически."
-#: ../midori/midori-browser.c:2432 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2678
+#: ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Новая лента"
-#: ../midori/midori-browser.c:2475 ../midori/midori-browser.c:5240
-#: ../panels/midori-bookmarks.c:426
+#: ../midori/midori-browser.c:2721
+#: ../midori/midori-browser.c:5751
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Новая закладка"
-#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3265
+#: ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Очистить"
-#: ../midori/midori-browser.c:3394
+#: ../midori/midori-browser.c:3711
+#: ../midori/midori-browser.c:3712
msgid "Toggle text cursor navigation"
msgstr "Режим перемещения по странице при помощи текстового курсора"
-#: ../midori/midori-browser.c:3706 ../midori/midori-browser.c:5626
+#: ../midori/midori-browser.c:3714
+msgid "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in all websites."
+msgstr "Нажатие F7 переключает перемещение курсором. Если включен, курсор отображается на всех сайтах."
+
+#: ../midori/midori-browser.c:3717
+msgid "_Enable Caret Browsing"
+msgstr "Перемещение к_урсором"
+
+#: ../midori/midori-browser.c:4109
+#: ../midori/midori-browser.c:6145
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Не удалось добавить запись в журнал: %s\n"
-#: ../midori/midori-browser.c:4037 ../panels/midori-bookmarks.c:742
-#: ../panels/midori-history.c:799
+#: ../midori/midori-browser.c:4435
+#: ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Открыть всё в отдельных _вкладках"
-#: ../midori/midori-browser.c:4044 ../panels/midori-bookmarks.c:748
-#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4442
+#: ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812
+#: ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Открыть в новой _вкладке"
-#: ../midori/midori-browser.c:4047 ../midori/midori-view.c:2594
-#: ../midori/midori-view.c:4543 ../panels/midori-bookmarks.c:750
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4445
+#: ../midori/midori-view.c:2944
+#: ../midori/midori-view.c:5082
+#: ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814
+#: ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Открыть в новом _окне"
-#: ../midori/midori-browser.c:4127
+#: ../midori/midori-browser.c:4534
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4128
+#: ../midori/midori-browser.c:4535
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4129
+#: ../midori/midori-browser.c:4536
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4130
+#: ../midori/midori-browser.c:4537
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4131
+#: ../midori/midori-browser.c:4538
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4132
+#: ../midori/midori-browser.c:4539
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4153
-msgid "Import bookmarks..."
-msgstr "Импорт закладок..."
+#: ../midori/midori-browser.c:4540
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4156 ../midori/midori-browser.c:5245
+#: ../midori/midori-browser.c:4561
+msgid "Import bookmarks…"
+msgstr "Импорт закладок…"
+
+#: ../midori/midori-browser.c:4564
+#: ../midori/midori-browser.c:5756
msgid "_Import bookmarks"
msgstr "_Импортировать закладки"
-#: ../midori/midori-browser.c:4167
+#: ../midori/midori-browser.c:4575
msgid "_Application:"
msgstr "_Приложение:"
-#: ../midori/midori-browser.c:4232
+#: ../midori/midori-browser.c:4640
msgid "Import from XBEL or HTML file"
msgstr "Импортировать из файла XBEL или HTML"
-#: ../midori/midori-browser.c:4267
+#: ../midori/midori-browser.c:4668
msgid "Import from a file"
msgstr "Импортировать из файла"
-#: ../midori/midori-browser.c:4279
+#: ../midori/midori-browser.c:4680
msgid "Failed to import bookmarks"
msgstr "Не удалось импортировать закладки"
-#: ../midori/midori-browser.c:4314
+#: ../midori/midori-browser.c:4714
msgid "XBEL Bookmarks"
msgstr "Закладки XBEL"
-#: ../midori/midori-browser.c:4319
+#: ../midori/midori-browser.c:4719
msgid "Netscape Bookmarks"
msgstr "Закладки Netscape"
-#: ../midori/midori-browser.c:4333
+#: ../midori/midori-browser.c:4733
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
-msgstr ""
-"Midori может сохранять закладки только в форматах XBEL (*.xbel) и Netscape "
-"(*.html)"
+msgstr "Midori может сохранять закладки только в форматах XBEL (*.xbel) и Netscape (*.html)"
-#: ../midori/midori-browser.c:4348
+#: ../midori/midori-browser.c:4748
msgid "Failed to export bookmarks"
msgstr "Не удалось экспортировать закладки"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4470
+#: ../midori/midori-browser.c:4870
msgid "Clear Private Data"
msgstr "Удаление личных данных"
-#: ../midori/midori-browser.c:4474
+#: ../midori/midori-browser.c:4874
msgid "_Clear private data"
msgstr "_Удалить личные данные"
-#: ../midori/midori-browser.c:4487
+#: ../midori/midori-browser.c:4889
msgid "Clear the following data:"
msgstr "Удалить следующие данные:"
-#: ../midori/midori-browser.c:4497
+#: ../midori/midori-browser.c:4899
msgid "Last open _tabs"
msgstr "Открытые _вкладки"
-#: ../midori/midori-browser.c:4523
+#: ../midori/midori-browser.c:4925
msgid "Clear private data when _quitting Midori"
msgstr "Удалять личные данные _при закрытии Midori"
-#: ../midori/midori-browser.c:4699
+#: ../midori/midori-browser.c:5140
msgid "A lightweight web browser."
msgstr "Легковесный Интернет-обозреватель."
-#: ../midori/midori-browser.c:4700
+#: ../midori/midori-browser.c:5141
msgid "See about:version for version info."
-msgstr ""
-"Посетите страницу about:version для получения информации о текущей версии."
+msgstr "Посетите страницу about:version для получения информации о текущей версии."
-#: ../midori/midori-browser.c:4702
-msgid ""
-"This library is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU Lesser General Public License as published by the "
-"Free Software Foundation; either version 2.1 of the License, or (at your "
-"option) any later version."
-msgstr ""
-"Эта библиотека является свободным программным обеспечением. Вы можете "
-"распространять или изменять ее на условиях соответствия GNU Lesser General "
-"Public License опубликованной Free Software Foundation; либо версии 2.1 "
-"лицензии, либо (на ваше усмотрение) любой более поздней версии."
+#: ../midori/midori-browser.c:5143
+msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version."
+msgstr "Эта библиотека является свободным программным обеспечением. Вы можете распространять или изменять ее на условиях соответствия GNU Lesser General Public License опубликованной Free Software Foundation; либо версии 2.1 лицензии, либо (на ваше усмотрение) любой более поздней версии."
-#: ../midori/midori-browser.c:4723
+#: ../midori/midori-browser.c:5173
msgid "translator-credits"
msgstr ""
"Команда переводчиков Xfce\n"
"%s ' has been downloaded."
msgstr "Файл «%s » загружен."
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:129
msgid "Transfer completed"
msgstr "Загрузка завершена"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:201
msgid "The downloaded file is erroneous."
msgstr "Загруженный файл повреждён."
-#: ../toolbars/midori-transferbar.c:194
-msgid ""
-"The checksum provided with the link did not match. This means the file is "
-"probably incomplete or was modified afterwards."
-msgstr ""
-"Контрольная сумма, указанная в ссылке, не совпадает. Возможно, файл был "
-"изменён или загружен не до конца."
+#: ../toolbars/midori-transferbar.c:202
+msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards."
+msgstr "Контрольная сумма, указанная в ссылке, не совпадает. Возможно, файл был изменён или загружен не до конца."
-#: ../toolbars/midori-transferbar.c:331 ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:345
+#: ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "Убрать завершённые"
-#: ../toolbars/midori-transferbar.c:368 ../toolbars/midori-transferbar.c:370
+#: ../toolbars/midori-transferbar.c:382
+#: ../toolbars/midori-transferbar.c:384
msgid "Some files are being downloaded"
msgstr "Некоторые файлы загружаются"
-#: ../toolbars/midori-transferbar.c:374
+#: ../toolbars/midori-transferbar.c:388
msgid "_Quit Midori"
msgstr "В_ыйти из Midori"
-#: ../toolbars/midori-transferbar.c:376
+#: ../toolbars/midori-transferbar.c:390
msgid "The transfers will be cancelled if Midori quits."
msgstr "Загрузки будут отменены при закрытии Midori."
-#: ../panels/midori-bookmarks.c:113
-msgid "Bookmarks"
-msgstr "Закладки"
-
-#: ../panels/midori-bookmarks.c:256
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Не удалось добавить закладку: %s\n"
-#: ../panels/midori-bookmarks.c:434
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Не удалось обновить закладку: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Редактировать закладку"
-#: ../panels/midori-bookmarks.c:442
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Удалить закладку"
-#: ../panels/midori-bookmarks.c:457
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Создать папку"
-#: ../panels/midori-bookmarks.c:591 ../panels/midori-history.c:631
+#: ../panels/midori-bookmarks.c:697
+#: ../panels/midori-history.c:638
msgid "Separator "
msgstr "Разделитель "
-#: ../panels/midori-history.c:110
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Поиск в закладках"
+
+#: ../panels/midori-history.c:111
msgid "History"
msgstr "Журнал"
-#: ../panels/midori-history.c:157 ../panels/midori-history.c:188
+#: ../panels/midori-history.c:158
+#: ../panels/midori-history.c:189
msgid "Today"
msgstr "Сегодня"
-#: ../panels/midori-history.c:159 ../panels/midori-history.c:190
+#: ../panels/midori-history.c:160
+#: ../panels/midori-history.c:191
msgid "Yesterday"
msgstr "Вчера"
-#: ../panels/midori-history.c:161 ../panels/midori-history.c:185
+#: ../panels/midori-history.c:162
+#: ../panels/midori-history.c:186
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
@@ -2183,35 +2307,46 @@ msgstr[0] "%d день назад"
msgstr[1] "%d дня назад"
msgstr[2] "%d дней назад"
-#: ../panels/midori-history.c:164 ../panels/midori-history.c:183
+#: ../panels/midori-history.c:165
+#: ../panels/midori-history.c:184
msgid "A week ago"
msgstr "Неделю назад"
-#: ../panels/midori-history.c:359
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Не удалось удалить запись из журнала: %s\n"
+
+#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Удалить все записи в журнале?"
-#: ../panels/midori-history.c:405
+#: ../panels/midori-history.c:407
msgid "Bookmark the selected history item"
msgstr "Добавить выделенную запись в закладки"
-#: ../panels/midori-history.c:414
+#: ../panels/midori-history.c:416
msgid "Delete the selected history item"
msgstr "Удалить запись из журнала"
-#: ../panels/midori-history.c:422
+#: ../panels/midori-history.c:424
msgid "Clear the entire history"
msgstr "Очистить весь журнал"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Поиск в истории"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Загрузки"
-#: ../panels/midori-transfers.c:467
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
msgstr "Открыть _папку загрузок"
-#: ../panels/midori-transfers.c:470
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
msgstr "Копировать _адрес ссылки"
@@ -2253,83 +2388,82 @@ msgstr "Не удалось загрузить системный значок
msgid "Animation frames are broken"
msgstr "Кадры анимации повреждены"
-#: ../katze/katze-utils.c:439 ../katze/katze-utils.c:873
+#: ../katze/katze-utils.c:443
+#: ../katze/katze-utils.c:867
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Свойство «%s» недействительно для %s"
-#: ../katze/katze-utils.c:485 ../katze/katze-utils.c:514
+#: ../katze/katze-utils.c:489
+#: ../katze/katze-utils.c:518
#: ../extensions/addons.c:308
msgid "Choose file"
msgstr "Выберите файл"
-#: ../katze/katze-utils.c:500
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Выберите папку"
-#: ../katze/katze-utils.c:604
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Нет"
-#: ../katze/katze-utils.c:719
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 час"
-#: ../katze/katze-utils.c:720
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 день"
-#: ../katze/katze-utils.c:721
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 неделю"
-#: ../katze/katze-utils.c:722
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 месяц"
-#: ../katze/katze-utils.c:723
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 год"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98
+#: ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Параметры %s"
-#: ../extensions/adblock.c:467
+#: ../extensions/adblock.c:470
msgid "Configure Advertisement filters"
msgstr "Настройка рекламных фильтров"
-#: ../extensions/adblock.c:498
+#: ../extensions/adblock.c:503
#, c-format
-msgid ""
-"Type the address of a preconfigured filter list in the text entry and click "
-"\"Add\" to add it to the list. You can find more lists at %s."
-msgstr ""
-"Введите адрес списка фильтров в поле ниже и нажмите «Добавить». Подобные "
-"списки можно найти на %s."
+msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s."
+msgstr "Введите адрес списка фильтров в поле ниже и нажмите «Добавить». Подобные списки можно найти на %s."
-#: ../extensions/adblock.c:846
+#: ../extensions/adblock.c:917
msgid "Edit rule"
msgstr "Редактирование правила"
-#: ../extensions/adblock.c:860
+#: ../extensions/adblock.c:931
msgid "_Rule:"
msgstr "_Правило:"
-#: ../extensions/adblock.c:914
+#: ../extensions/adblock.c:985
msgid "Bl_ock image"
msgstr "Бл_окировать изображение"
-#: ../extensions/adblock.c:919
+#: ../extensions/adblock.c:990
msgid "Bl_ock link"
msgstr "Бл_окировать ссылку"
-#: ../extensions/adblock.c:1620
+#: ../extensions/adblock.c:1689
msgid "Advertisement blocker"
msgstr "Блокировка рекламы"
-#: ../extensions/adblock.c:1621
+#: ../extensions/adblock.c:1690
msgid "Block advertisements according to a filter list"
msgstr "Блокирует рекламу по списку фильтров"
@@ -2355,63 +2489,69 @@ msgstr "_Установить пользовательский стиль"
msgid "Don't install"
msgstr "Не устанавливать"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319
+#: ../extensions/addons.c:677
msgid "Userscripts"
msgstr "Пользовательские сценарии"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324
+#: ../extensions/addons.c:679
msgid "Userstyles"
msgstr "Пользовательские стили"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:370
+#: ../extensions/addons.c:449
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Ошибка"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Удалить «%s»?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
msgid "Delete user script"
msgstr "Удаление сценария"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
msgid "Delete user style"
msgstr "Удаление стиля"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Файл «%s » будет удалён безвозвратно."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:566
+#: ../extensions/addons.c:643
msgid "Open in Text Editor"
msgstr "Открыть в текстовом редакторе"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:568
+#: ../extensions/addons.c:652
msgid "Open Target Folder"
msgstr "Открыть папку с файлом"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:634
msgid "Add new addon"
msgstr "Добавить дополнение"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:660
msgid "Remove selected addon"
msgstr "Удалить выбранное дополнение"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1689
+#: ../extensions/addons.c:1907
msgid "User addons"
msgstr "Пользовательские дополнения"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1819
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Отслеживание изменений в «%s» отключено: %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1908
msgid "Support for userscripts and userstyles"
msgstr "Поддержка пользовательских сценариев и стилей"
@@ -2433,12 +2573,8 @@ msgid "Delete All"
msgstr "Удалить всё"
#: ../extensions/cookie-manager/cookie-manager-page.c:105
-msgid ""
-"Deletes all shown cookies. If a filter is set, only those cookies are "
-"deleted which match the filter."
-msgstr ""
-"Будут удалены только видимые фрагменты. Если активен фильтр, будут удалены "
-"только те фрагменты, которые удовлетворяют его условиям."
+msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter."
+msgstr "Будут удалены только видимые фрагменты. Если активен фильтр, будут удалены только те фрагменты, которые удовлетворяют его условиям."
#: ../extensions/cookie-manager/cookie-manager-page.c:120
msgid "Expand All"
@@ -2498,27 +2634,21 @@ msgstr ""
"Домен : %s\n"
"Фрагментов данных : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Имя"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "_Развернуть всё"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "_Свернуть всё"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Фильтр:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr "Строка для фильтрации по имени фрагмента или адресу веб-сайта"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Искать фрагменты данных по имени или домену"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2677,9 +2807,9 @@ msgstr "Хранит данные, введённые ранее в формы
#: ../extensions/formhistory/formhistory-gdom-frontend.c:225
#: ../extensions/formhistory/formhistory-js-frontend.c:106
-#, fuzzy, c-format
+#, c-format
msgid "Failed to select suggestions\n"
-msgstr "Не удалось найти в истории\n"
+msgstr "Не удалось выбрать предложения\n"
#: ../extensions/history-list.vala:197
msgid "There are no unvisited tabs"
@@ -2757,7 +2887,7 @@ msgstr "Настройка комбинаций клавиш"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "_Настроить клавиши..."
+msgstr "Настроить со_четания клавиш…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2775,35 +2905,36 @@ msgstr "Часы в строке состояния"
msgid "Display date and time in the statusbar"
msgstr "Показывать дату и время в строке состояния"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Изображения"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Сценарии"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Модули Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Настройка возможностей"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "Быстрая настройка режимов отображения страниц"
-#: ../extensions/tab-panel.c:596 ../extensions/tab-panel.c:683
+#: ../extensions/tab-panel.c:589
+#: ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Панель вкладок"
-#: ../extensions/tab-panel.c:666
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "П_анель вкладок"
-#: ../extensions/tab-panel.c:684
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Показ вкладок в боковой панели"
@@ -2815,37 +2946,31 @@ msgstr "Только значок на новых вкладках"
msgid "New tabs have no label by default"
msgstr "У новых вкладок скрыт заголовок и виден только значок"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Настройка панели инструментов"
-#: ../extensions/toolbar-editor.c:409
-msgid ""
-"Select items to be displayed on the toolbar. Items can be reordered by drag "
-"and drop."
+#: ../extensions/toolbar-editor.c:411
+msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop."
msgstr "Выбрать и изменить порядок элементов можно с помощью мыши."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Доступные элементы"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Отображаемые элементы"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Настроить панель _инструментов..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "Настроить _панель инструментов…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "Н_астроить..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Редактор панели инструментов"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Простой редактор панели инструментов"
@@ -2853,6 +2978,44 @@ msgstr "Простой редактор панели инструментов"
msgid "Cache HTTP communication on disk"
msgstr "Кэширует принятые данные (HTTP) на диске"
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Не удалось сохранить закладки. %s"
+
+#~ msgid "The specified configuration folder is invalid."
+#~ msgstr "Указана некорректная папка файлов параметров."
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Закладка"
+
+#~ msgid "_Console"
+#~ msgstr "_Консоль"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Корневая папка"
+
+#~ msgid "_Title:"
+#~ msgstr "_Заголовок:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Папка:"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "З_акрыть остальные"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Значок:"
+
+#~ msgid "Filter:"
+#~ msgstr "Фильтр:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr "Строка для фильтрации по имени фрагмента или адресу веб-сайта"
+
+#~ msgid "_Customize…"
+#~ msgstr "Н_астроить…"
+
#~ msgid "Cookies"
#~ msgstr "Фрагменты данных"
@@ -2943,14 +3106,14 @@ msgstr "Кэширует принятые данные (HTTP) на диске"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Создать папку закладок"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Добавление, правка и удаление средства поиска..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Добавление, правка и удаление средства поиска…"
-#~ msgid "Clear private data..."
-#~ msgstr "Удалить личные данные..."
+#~ msgid "Clear private data…"
+#~ msgstr "Удалить личные данные…"
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr "Показать информацию о странице и инструменты разработчика..."
+#~ msgid "Inspect page details and access developer tools…"
+#~ msgstr "Показать информацию о странице и инструменты разработчика…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Переключиться на предыдущую вкладку"
@@ -3165,8 +3328,8 @@ msgstr "Кэширует принятые данные (HTTP) на диске"
#~ msgid "%s of %s, %s/s"
#~ msgstr "%s из %s, %s/s"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "_Настроить рекламные фильтры..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "_Настроить рекламные фильтры…"
#~ msgid "Open target folder for selected addon"
#~ msgstr "Открыть папку с выбранным дополнением"
@@ -3403,9 +3566,6 @@ msgstr "Кэширует принятые данные (HTTP) на диске"
#~ msgid "Whether text areas are resizable"
#~ msgstr "Текстовые поля могут изменять размер"
-#~ msgid "User_styles"
-#~ msgstr "С_тили пользователя"
-
#~ msgid "Both"
#~ msgstr "Значки и текст"
@@ -3415,11 +3575,8 @@ msgstr "Кэширует принятые данные (HTTP) на диске"
#~ msgid "Load on Startup"
#~ msgstr "Загружать при запуске"
-#~ msgid "Configure _Toolbar..."
-#~ msgstr "Настроить панель _инструментов..."
-
-#~ msgid "_Enable"
-#~ msgstr "_Включить"
+#~ msgid "Configure _Toolbar…"
+#~ msgstr "Настроить панель _инструментов…"
#~ msgid "Enable"
#~ msgstr "Включить"
@@ -3506,8 +3663,8 @@ msgstr "Кэширует принятые данные (HTTP) на диске"
#~ msgid "Manage search engines"
#~ msgstr "Управление средствами поиска"
-#~ msgid "Open in Page_holder..."
-#~ msgstr "Открыть в _контейнере..."
+#~ msgid "Open in Page_holder…"
+#~ msgstr "Открыть в _контейнере…"
#~ msgid "Last pageholder URI"
#~ msgstr "Текущий индекс URI"
diff --git a/po/sk.po b/po/sk.po
index 78f9ba40..82ef652a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Midori 0.3.6-1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-23 07:33+0000\n"
-"PO-Revision-Date: 2012-04-23 09:49+0200\n"
+"POT-Creation-Date: 2012-05-15 10:15+0000\n"
+"PO-Revision-Date: 2012-05-15 16:39+0200\n"
"Last-Translator: Tomáš Vadina \n"
"Language-Team: slovenčina \n"
"Language: sk\n"
@@ -28,8 +28,8 @@ msgstr "Prehliadať internet"
msgid "Internet;WWW;Explorer"
msgstr "Internet; WWW; Prehliadač"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996
+#: ../midori/main.c:2010 ../midori/midori-websettings.c:313
msgid "Midori"
msgstr "Midori"
@@ -45,82 +45,71 @@ msgstr "Midori - súkromné prehliadanie"
msgid "Open a new private browsing window"
msgstr "Otvoriť nové okno súkromného prehliadania"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4210
msgid "Private Browsing"
msgstr "Súkromné prehliadanie"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:97 ../midori/main.c:103
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Konfigurácia sa nemôže načítať: %s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:151
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Hodnota '%s' nie je platná pre %s"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:156 ../midori/main.c:260
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Neplatná hodnota '%s' v konfigurácii"
-#: ../midori/main.c:380
+#: ../midori/main.c:381
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Vyhľadávacie nástroje nemôžu byť načítané.%s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:435
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Nepodarilo sa zmazať históriu: %s\n"
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Zlyhalo otvorenie databázy: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:525
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Nepodarilo sa odstrániť staré položky histórie: %s\n"
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Nepodarilo sa odstrániť položku histórie: %s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Záložky sa nepodarilo uložiť. %s"
-
-#: ../midori/main.c:633
+#: ../midori/main.c:547
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Nastavenie sa nepodarilo uložiť. %s"
-#: ../midori/main.c:668
+#: ../midori/main.c:582
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Vyhľadávače sa nepodarilo uložiť. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:619
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Zoznam zavretých kariet sa nepodarilo uložiť %s"
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
+#: ../midori/main.c:660 ../panels/midori-extensions.c:91
msgid "Extensions"
msgstr "Rozšírenia"
-#: ../midori/main.c:760
+#: ../midori/main.c:674
msgid "Privacy"
msgstr "Súkromie"
-#: ../midori/main.c:772
+#: ../midori/main.c:686
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -128,19 +117,19 @@ msgstr ""
"V cookies sa ukladajú prihlasovacie údaje, zostavy hier alebo používateľské "
"dáta pre reklamu."
-#: ../midori/main.c:828
+#: ../midori/main.c:742
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Sedenie sa nepodarilo uložiť. %s"
-#: ../midori/main.c:1046
+#: ../midori/main.c:960
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Nie sú k dispozícií žiadne koreňové certifikáty. SSL certifikáty nemôžu byť "
"overené."
-#: ../midori/main.c:1115
+#: ../midori/main.c:1036
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -148,225 +137,225 @@ msgstr ""
"Zdá sa, že Midori nebolo naposledy riadne ukončené. Ak sa to stáva "
"opakovane, pre odstránenie problému skúste nasledujúce možnosti."
-#: ../midori/main.c:1134
+#: ../midori/main.c:1055
msgid "Modify _preferences"
msgstr "Zmeniť _predvoľby"
-#: ../midori/main.c:1138
+#: ../midori/main.c:1059
msgid "Disable all _extensions"
msgstr "Zakázať všetky _rozšírenia"
-#: ../midori/main.c:1151
+#: ../midori/main.c:1072
msgid "Discard old tabs"
msgstr "Zahodiť staré karty"
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1073 ../midori/midori-websettings.c:221
msgid "Show last tabs without loading"
msgstr "Zobraziť naposledy otvorené karty bez načítania"
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1074 ../midori/midori-websettings.c:220
msgid "Show last open tabs"
msgstr "Zobraziť naposledy otvorené karty"
-#: ../midori/main.c:1400 ../midori/main.c:2464
+#: ../midori/main.c:1321 ../midori/main.c:2399
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Sedenie nie je možné načítať: %s\n"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1459
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Snímok uložený do: %s\n"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1875
msgid "Run ADDRESS as a web application"
msgstr "Spustiť ADDRESS ako webovú aplikáciu"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1875
msgid "ADDRESS"
msgstr "ADRESA"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1878
msgid "Use FOLDER as configuration folder"
msgstr "Použiť PRIEČINOK ako konfiguračný priečinok"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1878
msgid "FOLDER"
msgstr "PRIEČINOK"
-#: ../midori/main.c:1957
+#: ../midori/main.c:1881
msgid "Private browsing, no changes are saved"
msgstr "Súkromné prehliadanie, nič sa neukladá"
-#: ../midori/main.c:1959
+#: ../midori/main.c:1883
msgid "Show a diagnostic dialog"
msgstr "Zobraziť dialóg po spadnutí"
-#: ../midori/main.c:1961
+#: ../midori/main.c:1885
msgid "Run the specified filename as javascript"
msgstr "Spustiť zadaný názov súboru ako javaskript"
-#: ../midori/main.c:1963
+#: ../midori/main.c:1887
msgid "Take a snapshot of the specified URI"
msgstr "Urobiť snímok požadovanej URI"
-#: ../midori/main.c:1965
+#: ../midori/main.c:1889
msgid "Execute the specified command"
msgstr "Spustiť zadaný príkaz"
-#: ../midori/main.c:1967
+#: ../midori/main.c:1891
msgid "List available commands to execute with -e/ --execute"
msgstr "Zoznam možných programov použiteľných s parametrom -e/ --execute"
-#: ../midori/main.c:1969
+#: ../midori/main.c:1893
msgid "Display program version"
msgstr "Zobraziť verziu programu"
-#: ../midori/main.c:1971
+#: ../midori/main.c:1895
msgid "Addresses"
msgstr "Adresy"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1897
msgid "Block URIs according to regular expression PATTERN"
msgstr "Blokovať adresy URI pomocou regulárneho výrazu REGVÝRAZ"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1897
msgid "PATTERN"
msgstr "REGVÝRAZ"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:1901
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Resetovať Midori po SEKUNDY sekundy nečinnosti"
-#: ../midori/main.c:1977
+#: ../midori/main.c:1901
msgid "SECONDS"
msgstr "SEKUNDY"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1904
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Presmeruje varovania konzoly do zadaného MENA_SÚBORU"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1904
msgid "FILENAME"
msgstr "MENO_SÚBORU"
-#: ../midori/main.c:2045
+#: ../midori/main.c:1969
msgid "[Addresses]"
msgstr "[Adresy]"
-#: ../midori/main.c:2087
+#: ../midori/main.c:2011
msgid "Please report comments, suggestions and bugs to:"
msgstr "Vaše komentáre, požiadavky a chyby prosím posielajte na:"
-#: ../midori/main.c:2089
+#: ../midori/main.c:2013
msgid "Check for new versions at:"
msgstr "Skontrolovať nové verzie na:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
+#: ../midori/main.c:2108
msgid "Saved logins and _passwords"
msgstr "Uložené _prihlasovacie mená a heslá"
-#: ../midori/main.c:2175
+#: ../midori/main.c:2110
msgid "Cookies and Website data"
msgstr "Cookies a dáta webstránky"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
+#: ../midori/main.c:2114 ../midori/midori-websettings.c:997
#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
msgstr "Vyrovnávacia pamäť stránok"
-#: ../midori/main.c:2182
+#: ../midori/main.c:2117
msgid "Website icons"
msgstr "Ikony webových stránok"
-#: ../midori/main.c:2288
+#: ../midori/main.c:2223
msgid "An unknown error occured"
msgstr "Vyskytla sa neznáma chyba"
-#: ../midori/main.c:2395
+#: ../midori/main.c:2330
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Midori síce beží, ale neodpovedá.\n"
-#: ../midori/main.c:2431
+#: ../midori/main.c:2366
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Záložky nemôžu byť načítané: %s\n"
-#: ../midori/main.c:2479
+#: ../midori/main.c:2414
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Zatvorené karty nemôžu byť načítane: %s\n"
-#: ../midori/main.c:2492
+#: ../midori/main.c:2427
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Históriu nie je možné načítať: %s\n"
-#: ../midori/main.c:2508
+#: ../midori/main.c:2443
msgid "The following errors occured:"
msgstr "Došlo k nasledujúcim chybám:"
-#: ../midori/main.c:2524
+#: ../midori/main.c:2459
msgid "_Ignore"
msgstr "_Ignorovať"
-#: ../midori/midori-app.c:1334
+#: ../midori/midori-app.c:1339
msgid "_Bookmark"
msgstr "_Záložka"
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060
+#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066
msgid "_Bookmarks"
msgstr "_Záložky"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1341
msgid "Add Boo_kmark"
msgstr "Pridať záložku"
-#: ../midori/midori-app.c:1337
+#: ../midori/midori-app.c:1342
msgid "_Console"
msgstr "_Konzola"
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1343
msgid "_Extensions"
msgstr "_Rozšírenia"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589
+#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591
msgid "_History"
msgstr "_História"
-#: ../midori/midori-app.c:1340
+#: ../midori/midori-app.c:1345
msgid "_Homepage"
msgstr "_Domovská stránka"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1346
msgid "_Userscripts"
msgstr "_Užívateľské skripty"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1347
msgid "New _Tab"
msgstr "Nová _karta"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1348
msgid "_Transfers"
msgstr "_Prenosy"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1349
msgid "Netscape p_lugins"
msgstr "Pluginy _Netscape"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1350
msgid "_Closed Tabs"
msgstr "_Zatvorené karty"
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216
+#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218
msgid "New _Window"
msgstr "Nové _okno"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1352
msgid "New _Folder"
msgstr "Nový _priečinok"
@@ -387,12 +376,12 @@ msgstr "Neznámy formát záložiek"
msgid "Writing failed."
msgstr "Zapisovanie zlyhalo."
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5309
msgid "Reload the current page"
msgstr "Obnoviť aktuálnu stránku"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306
msgid "Stop loading the current page"
msgstr "Zastaviť načítanie aktuálnej stránky"
@@ -440,7 +429,7 @@ msgstr "_Názov:"
msgid "_Address:"
msgstr "_Adresa:"
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326
+#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328
msgid "_Folder:"
msgstr "_Priečinok:"
@@ -476,7 +465,7 @@ msgstr "Nie je dosť miesta pre stiahnutie \"%s\"."
msgid "The file needs %s but only %s are left."
msgstr "Potrebuje %s, ale k dispozícií je iba %s."
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397
msgid "Save file as"
msgstr "Uložiť súbor ako"
@@ -540,7 +529,7 @@ msgstr ""
msgid "New feed"
msgstr "Nový kanál"
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367
+#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369
#: ../panels/midori-bookmarks.c:427
msgid "Add a new bookmark"
msgstr "Pridať novú záložku"
@@ -549,128 +538,128 @@ msgstr "Pridať novú záložku"
msgid "Empty"
msgstr "Prázdne"
-#: ../midori/midori-browser.c:3467
+#: ../midori/midori-browser.c:3469
msgid "Toggle text cursor navigation"
msgstr "Prepína navigáciu pomocou kurzora"
-#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753
+#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Nepodarilo sa vložiť novú položku histórie: %s\n"
-#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745
+#: ../panels/midori-history.c:803
msgid "Open all in _Tabs"
msgstr "Otvoriť všetky na _kartách"
-#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751
+#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Otvoriť na novej _karte"
-#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657
-#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2690
+#: ../midori/midori-view.c:4765 ../panels/midori-bookmarks.c:753
+#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Otvoriť v novom _okne"
-#: ../midori/midori-browser.c:4213
+#: ../midori/midori-browser.c:4215
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4214
+#: ../midori/midori-browser.c:4216
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4217
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4218
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4219
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4220
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4239
-msgid "Import bookmarks..."
-msgstr "Importovať záložky..."
+#: ../midori/midori-browser.c:4241
+msgid "Import bookmarks…"
+msgstr "Importovať záložky…"
-#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374
msgid "_Import bookmarks"
msgstr "_Importovať záložky"
-#: ../midori/midori-browser.c:4253
+#: ../midori/midori-browser.c:4255
msgid "_Application:"
msgstr "_Aplikácia:"
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4320
msgid "Import from XBEL or HTML file"
msgstr "Importovať zo súboru typu XBEL, alebo HTML"
-#: ../midori/midori-browser.c:4353
+#: ../midori/midori-browser.c:4355
msgid "Import from a file"
msgstr "Importovať zo súboru"
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4367
msgid "Failed to import bookmarks"
msgstr "Nepodarilo sa importovať záložky"
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4402
msgid "XBEL Bookmarks"
msgstr "Záložky vo formáte XBEL"
-#: ../midori/midori-browser.c:4405
+#: ../midori/midori-browser.c:4407
msgid "Netscape Bookmarks"
msgstr "Záložky z Netscape"
-#: ../midori/midori-browser.c:4419
+#: ../midori/midori-browser.c:4421
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr ""
"Z Midori je možné exportovať záložky iba vo formáte XBEL (*.xbel) a Netscape "
"(*.html)"
-#: ../midori/midori-browser.c:4434
+#: ../midori/midori-browser.c:4436
msgid "Failed to export bookmarks"
msgstr "Nepodarilo sa exportovať záložky"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4556
+#: ../midori/midori-browser.c:4558
msgid "Clear Private Data"
msgstr "Odstrániť súkromné údaje"
-#: ../midori/midori-browser.c:4560
+#: ../midori/midori-browser.c:4562
msgid "_Clear private data"
msgstr "_Odstrániť súkromné údaje"
-#: ../midori/midori-browser.c:4573
+#: ../midori/midori-browser.c:4575
msgid "Clear the following data:"
msgstr "Odstrániť nasledujúce údaje:"
-#: ../midori/midori-browser.c:4583
+#: ../midori/midori-browser.c:4585
msgid "Last open _tabs"
msgstr "Naposledy otvorené _karty"
-#: ../midori/midori-browser.c:4609
+#: ../midori/midori-browser.c:4611
msgid "Clear private data when _quitting Midori"
msgstr "Odstrániť súkromné údaje pri _ukončení Midori"
-#: ../midori/midori-browser.c:4804
+#: ../midori/midori-browser.c:4806
msgid "A lightweight web browser."
msgstr "Ľahký internetový prehliadač."
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:4807
msgid "See about:version for version info."
msgstr "about:version v adresnom riadku zobrazí informácie o verzii."
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:4809
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -682,365 +671,369 @@ msgstr ""
"Foundation; či už verzie 2.1, alebo alebo (podľa uváženia) akejkoľvek "
"neskoršej verzie."
-#: ../midori/midori-browser.c:4828
+#: ../midori/midori-browser.c:4830
msgid "translator-credits"
msgstr ""
"Robert Hartl , 2009\n"
"Tomáš Vadina , 2011"
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5216
msgid "_File"
msgstr "_Súbor"
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5219
msgid "Open a new window"
msgstr "Otvoriť nové okno"
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5222
msgid "Open a new tab"
msgstr "Otvoriť novú kartu"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5224
msgid "New P_rivate Browsing Window"
msgstr "Nové okno súk_romného prehliadania"
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5228
msgid "Open a file"
msgstr "Otvoriť súbor"
-#: ../midori/midori-browser.c:5228
-msgid "_Save Page As..."
-msgstr "Uložiť _stránku ako..."
+#: ../midori/midori-browser.c:5230
+msgid "_Save Page As…"
+msgstr "Uložiť _stránku ako…"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5231
msgid "Save to a file"
msgstr "Uložiť do súboru"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5233
msgid "Add to Speed _dial"
msgstr "Pridať do _Rýchleho prístupu"
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5237
msgid "Add Shortcut to the _desktop"
msgstr "Pridať záložku na _plochu"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5239
msgid "Create _Launcher"
msgstr "Vytvoriť _spúšťač"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5243
msgid "Subscribe to News _feed"
msgstr "Pridať _kanál"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5249
msgid "_Close Tab"
msgstr "_Zatvoriť kartu"
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5250
msgid "Close the current tab"
msgstr "Zatvoriť aktívnu kartu"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5252
msgid "C_lose Window"
msgstr "_Zatvoriť okno"
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5256
msgid "Print the current page"
msgstr "Vytlačiť aktuálnu stránku"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5258
msgid "Close a_ll Windows"
msgstr "Z_atvoriť všetky okná"
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5261
msgid "_Edit"
msgstr "_Upraviť"
-#: ../midori/midori-browser.c:5282
-msgid "_Find..."
-msgstr "_Nájsť..."
+#: ../midori/midori-browser.c:5284
+msgid "_Find…"
+msgstr "_Nájsť…"
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5285
msgid "Find a word or phrase in the page"
msgstr "Hľadať slovo alebo frázu na stránke"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5287
msgid "Find _Next"
msgstr "Hľadať _ďalšie"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5290
msgid "Find _Previous"
msgstr "Hľadať _predchádzajúce"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5294
msgid "Configure the application preferences"
msgstr "Nastaviť možnosti aplikácie"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5296
msgid "_View"
msgstr "_Zobraziť"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5297
msgid "_Toolbars"
msgstr "_Panely s nástrojmi"
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5302
msgid "Reload page without caching"
msgstr "Obnoviť stránku bez použitia vyrovnávacej pamäte"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5312
msgid "Increase the zoom level"
msgstr "Priblížiť"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5315
msgid "Decrease the zoom level"
msgstr "Oddialiť"
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5319
msgid "_Encoding"
msgstr "_Kódovanie"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5321
msgid "View So_urce"
msgstr "Zobraziť _zdrojový kód"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5324
msgid "Ca_ret Browsing"
msgstr "Prehliadanie ku_rzorom"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5328
msgid "Toggle fullscreen view"
msgstr "Prepnúť zobrazenie na celú obrazovku"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5330
msgid "Scroll _Left"
msgstr "Rolovať _vľavo"
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5333
msgid "Scroll _Down"
msgstr "Rolovať _dole"
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5336
msgid "Scroll _Up"
msgstr "Rolovať na_hore"
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5339
msgid "Scroll _Right"
msgstr "Rolovať v_pravo"
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5342
msgid "_Go"
msgstr "P_rejsť"
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5345
msgid "Go back to the previous page"
msgstr "Späť na predchádzajúcu stránku"
-#: ../midori/midori-browser.c:5346
+#: ../midori/midori-browser.c:5348
msgid "Go forward to the next page"
msgstr "Dopredu na nasledujúcu stránku"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5352
msgid "Go to the previous sub-page"
msgstr "Prejsť na predchádzajúcu podstránku"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5354
+#: ../midori/midori-browser.c:5356
msgid "Go to the next sub-page"
msgstr "Prejsť na nasledujúcu podstránku"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5359
msgid "Go to your homepage"
msgstr "Ísť na domovskú stránku"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5361
msgid "Empty Trash"
msgstr "Vysypať kôš"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5364
msgid "Undo _Close Tab"
msgstr "Obnoviť _zatvorenú kartu"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5371
msgid "Add a new _folder"
msgstr "Pridať nový priečinok"
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5377
msgid "_Export bookmarks"
msgstr "_Exportovať záložky"
-#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497
msgid "_Manage Search Engines"
msgstr "_Správca vyhľadávacích modulov"
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5383
msgid "_Clear Private Data"
msgstr "_Odstrániť súkromné údaje"
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5386
msgid "_Inspect Page"
msgstr "_Preskúmať stránku"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5390
msgid "_Previous Tab"
msgstr "_Predchádzajúca karta"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5393
msgid "_Next Tab"
msgstr "_Ďalšia karta"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5395
msgid "Move Tab _Backward"
msgstr "Presunúť kartu do_zadu"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5397
msgid "_Move Tab Forward"
msgstr "Presunúť kartu do_predu"
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5400
msgid "Focus _Current Tab"
msgstr "Zamerať _aktuálnu kartu"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5403
msgid "Focus _Next view"
msgstr "Prepnúť _na ďalšiu"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5406
msgid "Only show the Icon of the _Current Tab"
msgstr "Zobraziť iba ikonu a_ktuálnej karty"
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5409
msgid "_Duplicate Current Tab"
msgstr "Z_dvojiť aktuálnu kartu"
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5412
msgid "Close Ot_her Tabs"
msgstr "_Zatvoriť ostatné karty"
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5415
msgid "Open last _session"
msgstr "Otvoriť posledné _sedenie"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5418
msgid "_Help"
msgstr "_Pomocník"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5420
msgid "_Frequent Questions"
msgstr "_Časté otázky"
-#: ../midori/midori-browser.c:5421
-msgid "_Report a Problem..."
+#: ../midori/midori-browser.c:5423
+msgid "_Report a Problem…"
msgstr "_Ohlásiť chybu"
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5435
msgid "_Menubar"
msgstr "Panel _ponuky"
-#: ../midori/midori-browser.c:5437
+#: ../midori/midori-browser.c:5439
msgid "_Navigationbar"
msgstr "_Navigačný panel"
-#: ../midori/midori-browser.c:5441
+#: ../midori/midori-browser.c:5443
msgid "Side_panel"
msgstr "_Bočný panel"
-#: ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:5444
msgid "Sidepanel"
msgstr "Bočný panel"
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5447
msgid "_Bookmarkbar"
msgstr "Panel _záložiek"
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5451
msgid "_Statusbar"
msgstr "_Stavový riadok"
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311
+#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312
msgid "_Automatic"
msgstr "_Automatické"
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "Čínske (BIG5)"
+#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236
+msgid "Chinese Traditional (BIG5)"
+msgstr "Tradičné čínske (BIG5)"
+
+#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237
+msgid "Chinese Simplified (GB18030)"
+msgstr "Zjednodušené čínske (GB18030)"
#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5465
+#: ../midori/midori-browser.c:5470
msgid "Japanese (SHIFT__JIS)"
msgstr "Japonské (SHIFT_JIS)"
-#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238
+#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239
msgid "Korean (EUC-KR)"
msgstr "Kórejské (EUC-KR)"
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240
msgid "Russian (KOI8-R)"
msgstr "Ruské (KOI8-R)"
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242
msgid "Western (ISO-8859-1)"
msgstr "Západné (ISO-8859-1)"
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242
-#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Vlastné..."
+#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243
+#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641
+msgid "Custom…"
+msgstr "Vlastné…"
-#: ../midori/midori-browser.c:5985
+#: ../midori/midori-browser.c:5991
msgid "_Separator"
msgstr "_Oddeľovač"
-#: ../midori/midori-browser.c:5992
-msgid "_Location..."
-msgstr "_Umiestnenie..."
+#: ../midori/midori-browser.c:5998
+msgid "_Location…"
+msgstr "_Umiestnenie…"
-#: ../midori/midori-browser.c:5994
+#: ../midori/midori-browser.c:6000
msgid "Open a particular location"
msgstr "Otvoriť umiestnenie"
-#: ../midori/midori-browser.c:6016
-msgid "_Web Search..."
-msgstr "_Hľadať na webe..."
+#: ../midori/midori-browser.c:6022
+msgid "_Web Search…"
+msgstr "_Hľadať na webe…"
-#: ../midori/midori-browser.c:6018
+#: ../midori/midori-browser.c:6024
msgid "Run a web search"
msgstr "Spustí vyhľadávanie na webe"
-#: ../midori/midori-browser.c:6045
+#: ../midori/midori-browser.c:6051
msgid "Reopen a previously closed tab or window"
msgstr "Znovu otvoriť zatvorenú kartu alebo okno"
-#: ../midori/midori-browser.c:6062
+#: ../midori/midori-browser.c:6068
msgid "Show the saved bookmarks"
msgstr "Zobrazí uložené záložky"
-#: ../midori/midori-browser.c:6079
+#: ../midori/midori-browser.c:6085
msgid "_Tools"
msgstr "_Nástroje"
-#: ../midori/midori-browser.c:6095
+#: ../midori/midori-browser.c:6101
msgid "_Window"
msgstr "_Okno"
-#: ../midori/midori-browser.c:6097
+#: ../midori/midori-browser.c:6103
msgid "Show a list of all open tabs"
msgstr "Zobraziť zoznam všetkých otvorených kariet"
-#: ../midori/midori-browser.c:6111
+#: ../midori/midori-browser.c:6117
msgid "_Menu"
msgstr "_Ponuka"
-#: ../midori/midori-browser.c:6113
+#: ../midori/midori-browser.c:6119
msgid "Menu"
msgstr "_Ponuka"
-#: ../midori/midori-browser.c:6927
+#: ../midori/midori-browser.c:6933
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Neočakávané nastavenie '%s'"
@@ -1063,8 +1056,8 @@ msgid "Search with %s"
msgstr "Hľadať s %s"
#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Hľadať pomocou..."
+msgid "Search with…"
+msgstr "Hľadať pomocou…"
#: ../midori/midori-locationaction.c:537
#, c-format
@@ -1114,493 +1107,493 @@ msgstr "Zobraziť rýchly prístup"
msgid "Show Homepage"
msgstr "Zobraziť domovskú stránku"
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:238
msgid "Japanese (SHIFT_JIS)"
msgstr "Japonské (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:258
msgid "New tab"
msgstr "novej karte"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:259
msgid "New window"
msgstr "novom okne"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:260
msgid "Current tab"
msgstr "aktuálnej karte"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:275
msgid "Default"
msgstr "Predvolený"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:276
msgid "Icons"
msgstr "Ikony"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:277
msgid "Small icons"
msgstr "Malé ikony"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:278
msgid "Text"
msgstr "Text"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:279
msgid "Icons and text"
msgstr "Ikony a text"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:280
msgid "Text beside icons"
msgstr "Text pod ikonami"
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:295
msgid "Automatic (GNOME or environment)"
msgstr "Automaticky (GNOME alebo iné prostredie)"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:296
msgid "HTTP proxy server"
msgstr "HTTTP proxy server"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:297
msgid "No proxy server"
msgstr "Žiadny"
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:314
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:315
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:316
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:317
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:400
+#: ../midori/midori-websettings.c:401
msgid "Remember last window size"
msgstr "Zapamätať si poslednú veľkosť okna"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:402
msgid "Whether to save the last window size"
msgstr "Či ukladať poslednú veľkosť okna"
-#: ../midori/midori-websettings.c:409
+#: ../midori/midori-websettings.c:410
msgid "Last window width"
msgstr "Posledná šírka okna"
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:411
msgid "The last saved window width"
msgstr "Naposledy uložená šírka okna"
-#: ../midori/midori-websettings.c:418
+#: ../midori/midori-websettings.c:419
msgid "Last window height"
msgstr "Posledná výška okna"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:420
msgid "The last saved window height"
msgstr "Naposledy uložená výška okna"
-#: ../midori/midori-websettings.c:444
+#: ../midori/midori-websettings.c:445
msgid "Last panel position"
msgstr "Posledná pozícia panela"
-#: ../midori/midori-websettings.c:445
+#: ../midori/midori-websettings.c:446
msgid "The last saved panel position"
msgstr "Uložená posledná pozícia panela"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
+#: ../midori/midori-websettings.c:455
msgid "Last panel page"
msgstr "Posledná stránka panelu"
-#: ../midori/midori-websettings.c:455
+#: ../midori/midori-websettings.c:456
msgid "The last saved panel page"
msgstr "Posledná uložená stránka panala"
-#: ../midori/midori-websettings.c:463
+#: ../midori/midori-websettings.c:464
msgid "Last Web search"
msgstr "Rýchle hľadanie na webe"
-#: ../midori/midori-websettings.c:464
+#: ../midori/midori-websettings.c:465
msgid "The last saved Web search"
msgstr "Uložené posledné vyhľadávanie na webe"
-#: ../midori/midori-websettings.c:473
+#: ../midori/midori-websettings.c:474
msgid "Show Menubar"
msgstr "Zobraziť panel pouky"
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:475
msgid "Whether to show the menubar"
msgstr "Či Zobrazovať ponuku"
-#: ../midori/midori-websettings.c:482
+#: ../midori/midori-websettings.c:483
msgid "Show Navigationbar"
msgstr "Zobraziť vyhľadávaciu lištu"
-#: ../midori/midori-websettings.c:483
+#: ../midori/midori-websettings.c:484
msgid "Whether to show the navigationbar"
msgstr "Či zobrazovať vyhľadávaciu lištu"
-#: ../midori/midori-websettings.c:491
+#: ../midori/midori-websettings.c:492
msgid "Show Bookmarkbar"
msgstr "Zobraziť záložky"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:493
msgid "Whether to show the bookmarkbar"
msgstr "Či zobrazovať panel záložiek"
-#: ../midori/midori-websettings.c:500
+#: ../midori/midori-websettings.c:501
msgid "Show Panel"
msgstr "Zobraziť panel"
-#: ../midori/midori-websettings.c:501
+#: ../midori/midori-websettings.c:502
msgid "Whether to show the panel"
msgstr "Či zobrazovať panel"
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:510
msgid "Show Statusbar"
msgstr "Zobraziť stavový riadok"
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:511
msgid "Whether to show the statusbar"
msgstr "Či zobraziť stavový riadok"
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:520
msgid "Toolbar Style:"
msgstr "Štýl panelu s nástrojmi:"
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:521
msgid "The style of the toolbar"
msgstr "Štýl panelu s nástrojmi"
-#: ../midori/midori-websettings.c:529
+#: ../midori/midori-websettings.c:530
msgid "Toolbar Items"
msgstr "Položky panelu nástrojov"
-#: ../midori/midori-websettings.c:530
+#: ../midori/midori-websettings.c:531
msgid "The items to show on the toolbar"
msgstr "Položky, ktoré sa budú zobrazovať na paneli nástrojov"
-#: ../midori/midori-websettings.c:538
+#: ../midori/midori-websettings.c:539
msgid "Compact Sidepanel"
msgstr "Kompaktný bočný panel"
-#: ../midori/midori-websettings.c:539
+#: ../midori/midori-websettings.c:540
msgid "Whether to make the sidepanel compact"
msgstr "Či zobrazovať bočný panel kompaktne"
-#: ../midori/midori-websettings.c:554
+#: ../midori/midori-websettings.c:555
msgid "Align sidepanel on the right"
msgstr "Umiestniť bočný panel vpravo"
-#: ../midori/midori-websettings.c:555
+#: ../midori/midori-websettings.c:556
msgid "Whether to align the sidepanel on the right"
msgstr "Či presunúť bočný panel na opačnú stranu"
-#: ../midori/midori-websettings.c:570
+#: ../midori/midori-websettings.c:571
msgid "Open panels in separate windows"
msgstr "Otvoriť panely v samostatných oknách"
-#: ../midori/midori-websettings.c:571
+#: ../midori/midori-websettings.c:572
msgid "Whether to always open panels in separate windows"
msgstr "Či otvoriť panel v samostatnom okne"
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:581
msgid "When Midori starts:"
msgstr "Pri spustení Midori:"
-#: ../midori/midori-websettings.c:581
+#: ../midori/midori-websettings.c:582
msgid "What to do when Midori starts"
msgstr "Čo robiť pri spustení Midori?"
-#: ../midori/midori-websettings.c:590
+#: ../midori/midori-websettings.c:591
msgid "Homepage:"
msgstr "Domovská stránka:"
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:592
msgid "The homepage"
msgstr "Domovská stránka"
-#: ../midori/midori-websettings.c:606
+#: ../midori/midori-websettings.c:607
msgid "Show crash dialog"
msgstr "Zobraziť dialóg po spadnutí"
-#: ../midori/midori-websettings.c:607
+#: ../midori/midori-websettings.c:608
msgid "Show a dialog after Midori crashed"
msgstr "Zobrazí dialóg po spadnutí Midori"
-#: ../midori/midori-websettings.c:615
+#: ../midori/midori-websettings.c:616
msgid "Save downloaded files to:"
msgstr "Uložiť stiahnuté súbory do:"
-#: ../midori/midori-websettings.c:616
+#: ../midori/midori-websettings.c:617
msgid "The folder downloaded files are saved to"
msgstr "Priečinok, do ktorého sa búdu ukladať stiahnuté súbory"
-#: ../midori/midori-websettings.c:624
+#: ../midori/midori-websettings.c:625
msgid "Text Editor"
msgstr "Textový editor"
-#: ../midori/midori-websettings.c:625
+#: ../midori/midori-websettings.c:626
msgid "An external text editor"
msgstr "Externý textový editor"
-#: ../midori/midori-websettings.c:640
+#: ../midori/midori-websettings.c:641
msgid "News Aggregator"
msgstr "Čítačka RSS"
-#: ../midori/midori-websettings.c:641
+#: ../midori/midori-websettings.c:642
msgid "An external news aggregator"
msgstr "Externá čítačka správ RSS"
-#: ../midori/midori-websettings.c:649
+#: ../midori/midori-websettings.c:650
msgid "Location entry Search"
msgstr "Vyhľadávanie v adresnom riadku"
-#: ../midori/midori-websettings.c:650
+#: ../midori/midori-websettings.c:651
msgid "The search to perform inside the location entry"
msgstr "Vyhľadávanie použité v riadku s adresou"
-#: ../midori/midori-websettings.c:658
+#: ../midori/midori-websettings.c:659
msgid "Preferred Encoding"
msgstr "Preferované kódovanie"
-#: ../midori/midori-websettings.c:659
+#: ../midori/midori-websettings.c:660
msgid "The preferred character encoding"
msgstr "Preferované kódovanie znakov"
-#: ../midori/midori-websettings.c:669
+#: ../midori/midori-websettings.c:670
msgid "Always Show Tabbar"
msgstr "Vždy zobrazovať karty"
-#: ../midori/midori-websettings.c:670
+#: ../midori/midori-websettings.c:671
msgid "Always show the tabbar"
msgstr "Vždy zobrazí panel kariet"
-#: ../midori/midori-websettings.c:683
+#: ../midori/midori-websettings.c:684
msgid "Close Buttons on Tabs"
msgstr "Zatváracie tlačidlá na kartách"
-#: ../midori/midori-websettings.c:684
+#: ../midori/midori-websettings.c:685
msgid "Whether tabs have close buttons"
msgstr "Či zobraziť zatváracie tlačidlá na kartách"
-#: ../midori/midori-websettings.c:709
+#: ../midori/midori-websettings.c:710
msgid "Open new pages in:"
msgstr "Otvárať nové stránky v:"
-#: ../midori/midori-websettings.c:710
+#: ../midori/midori-websettings.c:711
msgid "Where to open new pages"
msgstr "Kde sa budú otvárať nové stránky"
-#: ../midori/midori-websettings.c:719
+#: ../midori/midori-websettings.c:720
msgid "Middle click opens Selection"
msgstr "Kliknutím prostredného. tlačítka otvoriť vybraný text"
-#: ../midori/midori-websettings.c:720
+#: ../midori/midori-websettings.c:721
msgid "Load an address from the selection via middle click"
msgstr "Prostredné tlačítko myši otvorí adresu, ktorá je vo vybranom texte"
-#: ../midori/midori-websettings.c:728
+#: ../midori/midori-websettings.c:729
msgid "Open tabs in the background"
msgstr "Otvárať karty na pozadí"
-#: ../midori/midori-websettings.c:729
+#: ../midori/midori-websettings.c:730
msgid "Whether to open new tabs in the background"
msgstr "Či otvorené karty otvárať na pozadí"
-#: ../midori/midori-websettings.c:737
+#: ../midori/midori-websettings.c:738
msgid "Open Tabs next to Current"
msgstr "Otvoriť karty vedľa aktívnej"
-#: ../midori/midori-websettings.c:738
+#: ../midori/midori-websettings.c:739
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr "Či novú kartu otvárať vedľa aktívnej"
-#: ../midori/midori-websettings.c:746
+#: ../midori/midori-websettings.c:747
msgid "Open popups in tabs"
msgstr "Otvárať vyskakujúce okná na kartách"
-#: ../midori/midori-websettings.c:747
+#: ../midori/midori-websettings.c:748
msgid "Whether to open popup windows in tabs"
msgstr "Či vyskakovacie okno otvárať v novej karte"
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
+#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134
msgid "Load images automatically"
msgstr "Automaticky načítať obrázky"
-#: ../midori/midori-websettings.c:758
+#: ../midori/midori-websettings.c:759
msgid "Load and display images automatically"
msgstr "Načíta a zobrazí obrázky automaticky"
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
+#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143
msgid "Enable scripts"
msgstr "Povoliť skripty"
-#: ../midori/midori-websettings.c:766
+#: ../midori/midori-websettings.c:767
msgid "Enable embedded scripting languages"
msgstr "Povolí vložené skriptové jazyky"
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
+#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154
msgid "Enable Netscape plugins"
msgstr "Povoliť pluginy z Netscape (Mozilly)"
-#: ../midori/midori-websettings.c:774
+#: ../midori/midori-websettings.c:775
msgid "Enable embedded Netscape plugin objects"
msgstr "Povolí pluginové objekty prehliadača Netscape (Mozilla)"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:790
msgid "Enable Spell Checking"
msgstr "Povoliť kontrolu pravopisu"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:791
msgid "Enable spell checking while typing"
msgstr "Povolí kontrolu pravopisu pri písaní"
-#: ../midori/midori-websettings.c:796
+#: ../midori/midori-websettings.c:797
msgid "Enable HTML5 database support"
msgstr "Povoliť podporu databázy HTML5"
-#: ../midori/midori-websettings.c:797
+#: ../midori/midori-websettings.c:798
msgid "Whether to enable HTML5 database support"
msgstr "Či povoliť podporu databázy HTML5"
-#: ../midori/midori-websettings.c:803
+#: ../midori/midori-websettings.c:804
msgid "Enable HTML5 local storage support"
msgstr "Povoliť miestne úložisko pre HTML5"
-#: ../midori/midori-websettings.c:804
+#: ../midori/midori-websettings.c:805
msgid "Whether to enable HTML5 local storage support"
msgstr "Či povoliť miestne úložisko dát pre HTML5"
-#: ../midori/midori-websettings.c:810
+#: ../midori/midori-websettings.c:811
msgid "Enable offline web application cache"
msgstr "Povoliť cache pre offline aplikácie"
-#: ../midori/midori-websettings.c:811
+#: ../midori/midori-websettings.c:812
msgid "Whether to enable offline web application cache"
msgstr "Či povoliť používanie vyrovnávacej pamäte pre offline aplikácie"
-#: ../midori/midori-websettings.c:827
+#: ../midori/midori-websettings.c:828
msgid "Flash window on background tabs"
msgstr "Zablysnúť oknom prehliadača pri kartách na pozadí"
-#: ../midori/midori-websettings.c:828
+#: ../midori/midori-websettings.c:829
msgid "Flash the browser window if a new tab was opened in the background"
msgstr "Zablysnúť oknom prehliadača, ak je na pozadí otvorená nová karta"
-#: ../midori/midori-websettings.c:836
+#: ../midori/midori-websettings.c:837
msgid "Enable WebGL support"
msgstr "Povoliť podporu WebGL"
-#: ../midori/midori-websettings.c:837
+#: ../midori/midori-websettings.c:838
msgid "Allow websites to use OpenGL rendering"
msgstr "Povoliť webovým stránkam používať vykresľovanie pomocou OpenGL"
-#: ../midori/midori-websettings.c:863
+#: ../midori/midori-websettings.c:864
msgid "Zoom Text and Images"
msgstr "Zväčšovať text aj obrázky"
-#: ../midori/midori-websettings.c:864
+#: ../midori/midori-websettings.c:865
msgid "Whether to zoom text and images"
msgstr "Či upravovať text aj obrázky pri menení veľkosti"
-#: ../midori/midori-websettings.c:879
+#: ../midori/midori-websettings.c:880
msgid "Find inline while typing"
msgstr "Hľadať pri písaní"
-#: ../midori/midori-websettings.c:880
+#: ../midori/midori-websettings.c:881
msgid "Whether to automatically find inline while typing"
msgstr "Či hľadať text pri písaní"
-#: ../midori/midori-websettings.c:895
+#: ../midori/midori-websettings.c:896
msgid "Kinetic scrolling"
msgstr "Kinetické rolovanie"
-#: ../midori/midori-websettings.c:896
+#: ../midori/midori-websettings.c:897
msgid "Whether scrolling should kinetically move according to speed"
msgstr "Či naklonením zariadenia rolovať"
-#: ../midori/midori-websettings.c:904
+#: ../midori/midori-websettings.c:905
msgid "Delete old Cookies after:"
msgstr "Zmazať staré cookies po:"
-#: ../midori/midori-websettings.c:905
+#: ../midori/midori-websettings.c:906
msgid "The maximum number of days to save cookies for"
msgstr "Maximálny počet dní, pre ktoré sú cookies platné"
-#: ../midori/midori-websettings.c:921
+#: ../midori/midori-websettings.c:922
msgid "Only accept Cookies from sites you visit"
msgstr "Prijať cookies len z navštívených stránok"
-#: ../midori/midori-websettings.c:922
+#: ../midori/midori-websettings.c:923
msgid "Block cookies sent by third-party websites"
msgstr "Zablokovať cookies odoslané stránkami tretích strán"
-#: ../midori/midori-websettings.c:936
+#: ../midori/midori-websettings.c:937
msgid "Delete pages from history after:"
msgstr "Zmazať stránky z histórie po:"
-#: ../midori/midori-websettings.c:937
+#: ../midori/midori-websettings.c:938
msgid "The maximum number of days to save the history for"
msgstr "Maximálny počet dní, do ktorých sú cookies platné"
-#: ../midori/midori-websettings.c:952
+#: ../midori/midori-websettings.c:953
msgid "Proxy server"
msgstr "Proxy server"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:954
msgid "The type of proxy server to use"
msgstr "Typ proxy servera"
-#: ../midori/midori-websettings.c:962
+#: ../midori/midori-websettings.c:963
msgid "HTTP Proxy Server"
msgstr "HTTP proxy server"
-#: ../midori/midori-websettings.c:963
+#: ../midori/midori-websettings.c:964
msgid "The proxy server used for HTTP connections"
msgstr "Nastavenie proxy serveru pre HTTP spojenie"
-#: ../midori/midori-websettings.c:978
+#: ../midori/midori-websettings.c:979
msgid "Port"
msgstr "Port"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:980
msgid "The proxy server port used for HTTP connections"
msgstr "Nastavenie portu proxy servera pre HTTP spojenie"
-#: ../midori/midori-websettings.c:997
+#: ../midori/midori-websettings.c:998
msgid "The maximum size of cached pages on disk"
msgstr "Maximálna veľkosť vyrovnávacej pamäte stránok na disku"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
+#: ../midori/midori-websettings.c:1015
msgid "Identify as"
msgstr "Identifikovať sa ako"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1016
msgid "What to identify as to web pages"
msgstr "Ako sa hlási webovým stránkam"
-#: ../midori/midori-websettings.c:1031
+#: ../midori/midori-websettings.c:1032
msgid "Identification string"
msgstr "Identifikačný reťazec"
-#: ../midori/midori-websettings.c:1032
+#: ../midori/midori-websettings.c:1033
msgid "The application identification string"
msgstr "Identifikačný reťazec aplikácie"
-#: ../midori/midori-websettings.c:1048
+#: ../midori/midori-websettings.c:1049
msgid "Preferred languages"
msgstr "Uprednostňované jazyky"
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:1050
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1608,294 +1601,298 @@ msgstr ""
"Čiarkou oddelený zoznam jazykov pre viacjazyčné weby, napríklad \"de\", \"ru,"
"nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-#: ../midori/midori-websettings.c:1064
+#: ../midori/midori-websettings.c:1065
msgid "Clear private data"
msgstr "Odstrániť súkromné údaje"
-#: ../midori/midori-websettings.c:1065
+#: ../midori/midori-websettings.c:1066
msgid "The private data selected for deletion"
msgstr "Osobné dáta boli označené k vymazaniu"
-#: ../midori/midori-websettings.c:1080
+#: ../midori/midori-websettings.c:1081
msgid "Clear data"
msgstr "Vymazať dáta"
-#: ../midori/midori-websettings.c:1081
+#: ../midori/midori-websettings.c:1082
msgid "The data selected for deletion"
msgstr "Dáta, ktoré budú vymazané"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
+#: ../midori/midori-websettings.c:1131
msgid "Strip referrer details sent to websites"
msgstr "Odstrániť detaily z referrer pri odosielaní"
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
+#: ../midori/midori-websettings.c:1133
msgid "Whether the \"Referer\" header should be shortened to the hostname"
msgstr "Či skrátiť položku \"Referer\" v hlavičke len na názov webu"
-#: ../midori/midori-websettings.c:1146
+#: ../midori/midori-websettings.c:1147
msgid "Always use my font choices"
msgstr "Vždy použiť môj výber písma"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:1148
msgid "Override fonts picked by websites with user preferences"
msgstr ""
"Prepísať písma vybrané webovými stránkami s písmom predvoleným používateľom"
-#: ../midori/midori-view.c:1360
+#: ../midori/midori-view.c:1375
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s požaduje uloženie dát do HTML5 databázy."
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413
msgid "_Deny"
msgstr "_Zakázať"
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413
msgid "_Allow"
msgstr "_Povoliť"
-#: ../midori/midori-view.c:1392
+#: ../midori/midori-view.c:1408
#, c-format
msgid "%s wants to know your location."
msgstr "%s požaduje zistenie Vašej polohy."
-#: ../midori/midori-view.c:1485
+#: ../midori/midori-view.c:1502
#, c-format
msgid "Error - %s"
msgstr "Chyba - %s"
-#: ../midori/midori-view.c:1486
+#: ../midori/midori-view.c:1503
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Stránka '%s' sa nedá načítať."
-#: ../midori/midori-view.c:1488
+#: ../midori/midori-view.c:1505
msgid "Try again"
msgstr "Skúsiť znovu"
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
+#: ../midori/midori-view.c:1703 ../midori/midori-view.c:2625
#, c-format
msgid "Send a message to %s"
msgstr "Poslať %s správu"
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
+#: ../midori/midori-view.c:2455 ../midori/midori-view.c:2781
msgid "Inspect _Element"
msgstr "Preskúmať _prvok"
-#: ../midori/midori-view.c:2480
+#: ../midori/midori-view.c:2507
msgid "Open Link in New _Tab"
msgstr "Otvoriť odkaz na novej _karte"
-#: ../midori/midori-view.c:2484
+#: ../midori/midori-view.c:2511
msgid "Open Link in _Foreground Tab"
msgstr "Otvoriť odkaz v novej _karte"
-#: ../midori/midori-view.c:2485
+#: ../midori/midori-view.c:2512
msgid "Open Link in _Background Tab"
msgstr "Otvoriť odkaz v novej karte na pozadí"
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2515
msgid "Open Link in New _Window"
msgstr "Otvoriť odkaz v novom _okne"
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2518
msgid "Open Link as Web A_pplication"
msgstr "Otvoriť odkaz ako _webovú aplikáciu"
-#: ../midori/midori-view.c:2496
+#: ../midori/midori-view.c:2523
msgid "Copy Link de_stination"
msgstr "Kopírovať _cieľ odkazu"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2539
msgid "Open _Image in New Tab"
msgstr "Otvoriť _obrázok na novej karte"
-#: ../midori/midori-view.c:2515
+#: ../midori/midori-view.c:2542
msgid "Copy Image _Address"
msgstr "Kopírovať _adresu obrázka"
-#: ../midori/midori-view.c:2518
+#: ../midori/midori-view.c:2545
msgid "Save I_mage"
msgstr "Uložiť _obrázok"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2548
msgid "Open in Image _Viewer"
msgstr "Otvoriť obrázok v prehliadači _obrázkov"
-#: ../midori/midori-view.c:2528
+#: ../midori/midori-view.c:2555
msgid "Copy Video _Address"
msgstr "Kopírovať _adresu videa"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2558
msgid "Save _Video"
msgstr "Uložiť _video"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2558
msgid "Download _Video"
msgstr "Stiahnuť v_ideo"
-#: ../midori/midori-view.c:2557
+#: ../midori/midori-view.c:2584
msgid "Search _with"
msgstr "Hľadať _pomocou"
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:2616
msgid "_Search the Web"
msgstr "_Hľadať na webe"
-#: ../midori/midori-view.c:2606
+#: ../midori/midori-view.c:2633
msgid "Open Address in New _Tab"
msgstr "Otvoriť adresu v novej karte"
-#: ../midori/midori-view.c:2909
+#: ../midori/midori-view.c:2686
+msgid "Open _Frame in New Tab"
+msgstr "Otvoriť _rám na novej karte"
+
+#: ../midori/midori-view.c:2946
msgid "Open or download file"
msgstr "Otvoriť alebo stiahnuť súbor"
-#: ../midori/midori-view.c:2929
+#: ../midori/midori-view.c:2966
#, c-format
msgid "File Type: '%s'"
msgstr "Typ súboru: '%s'"
-#: ../midori/midori-view.c:2931
+#: ../midori/midori-view.c:2968
#, c-format
msgid "File Type: %s ('%s')"
msgstr "Typ súboru: %s ('%s')"
-#: ../midori/midori-view.c:2935
+#: ../midori/midori-view.c:2972
#, c-format
msgid "File Name: %s"
msgstr "Typ súboru: %s"
-#: ../midori/midori-view.c:2955
+#: ../midori/midori-view.c:2999
#, c-format
msgid "Open %s"
msgstr "Otvoriť %s"
-#: ../midori/midori-view.c:3576
+#: ../midori/midori-view.c:3622
#, c-format
msgid "Inspect page - %s"
msgstr "Inšpekcia stránky - %s"
-#: ../midori/midori-view.c:3923
+#: ../midori/midori-view.c:3969
msgid "Speed Dial"
msgstr "Rýchly prístup"
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
+#: ../midori/midori-view.c:3970 ../midori/midori-view.c:4066
msgid "Click to add a shortcut"
msgstr "Kliknite pre pridanie odkazu"
-#: ../midori/midori-view.c:3925
+#: ../midori/midori-view.c:3971
msgid "Enter shortcut address"
msgstr "Zadajte adresu skratky"
-#: ../midori/midori-view.c:3926
+#: ../midori/midori-view.c:3972
msgid "Enter shortcut title"
msgstr "Zadajte titulok skratky"
-#: ../midori/midori-view.c:3927
+#: ../midori/midori-view.c:3973
msgid "Are you sure you want to delete this shortcut?"
msgstr "Naozaj chcete zmazať túto záložku?"
-#: ../midori/midori-view.c:4089
+#: ../midori/midori-view.c:4135
#, c-format
msgid "No documentation installed"
msgstr "Dokumentácia nie je nainštalovaná"
-#: ../midori/midori-view.c:4165
+#: ../midori/midori-view.c:4211
msgid "Midori doesn't store any personal data:"
msgstr "Midori neukladá žiadne osobné dáta:"
-#: ../midori/midori-view.c:4166
+#: ../midori/midori-view.c:4212
msgid "No history or web cookies are being saved."
msgstr "Neukladá sa história ani cookies."
-#: ../midori/midori-view.c:4167
+#: ../midori/midori-view.c:4213
msgid "Extensions are disabled."
msgstr "Rozšírenia sú vypnuté."
-#: ../midori/midori-view.c:4168
+#: ../midori/midori-view.c:4214
msgid "HTML5 storage, local database and application caches are disabled."
msgstr ""
"Úložisko HTML5, miestna databáza a dočasná pamäť aplikácie sú zakázané."
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4215
msgid "Midori prevents websites from tracking the user:"
msgstr "Midori odmieta sledovanie používateľa zo stránok:"
-#: ../midori/midori-view.c:4170
+#: ../midori/midori-view.c:4216
msgid "Referrer URLs are stripped down to the hostname."
msgstr "Z URL sú odstránené údaje o odkazoch."
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:4217
msgid "DNS prefetching is disabled."
msgstr "Prednačítanie DNS záznamov je zakázané."
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:4218
msgid "The language and timezone are not revealed to websites."
msgstr "Stránkam nie sú poskytované údaje o jazyku a časovom pásme."
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:4219
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr "Stránky nemôžu získať zoznam zásuvných modulov."
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:4289
msgid "Version numbers in brackets show the version used at runtime."
msgstr "Čísla verzií v zátvorke sú verzie použité pri behu programu."
-#: ../midori/midori-view.c:4278
+#: ../midori/midori-view.c:4339
msgid "Page loading delayed"
msgstr "Načítanie stránky oneskorené"
-#: ../midori/midori-view.c:4279
+#: ../midori/midori-view.c:4340
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"Načítanie stránky bolo oneskorené kvôli pádu aplikácie, alebo preto, že je "
"to tak nastavené-"
-#: ../midori/midori-view.c:4280
+#: ../midori/midori-view.c:4341
msgid "Load Page"
msgstr "Načítať stránku"
-#: ../midori/midori-view.c:4446
+#: ../midori/midori-view.c:4507
msgid "Blank page"
msgstr "Prázdnu stránku"
-#: ../midori/midori-view.c:4708
+#: ../midori/midori-view.c:4769
msgid "_Duplicate Tab"
msgstr "Z_dvojiť kartu"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4774
msgid "Show Tab _Label"
msgstr "Zobraziť _popisok karty"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4774
msgid "Show Tab _Icon Only"
msgstr "Zobraziť len _ikonu karty"
-#: ../midori/midori-view.c:4719
+#: ../midori/midori-view.c:4780
msgid "Close ot_her Tabs"
msgstr "_Zatvorí ostatné karty"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5532
+#: ../midori/midori-view.c:5593
msgid "previous"
msgstr "predchádzajúce"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5551
+#: ../midori/midori-view.c:5612
msgid "next"
msgstr "nasledujúce"
-#: ../midori/midori-view.c:5564
+#: ../midori/midori-view.c:5625
msgid "Print background images"
msgstr "Tlačiť obrázky na pozadí"
-#: ../midori/midori-view.c:5565
+#: ../midori/midori-view.c:5626
msgid "Whether background images should be printed"
msgstr "Či tlačiť obrázky na pozadí"
-#: ../midori/midori-view.c:5597
+#: ../midori/midori-view.c:5658
msgid "Features"
msgstr "Funkcie"
@@ -2156,7 +2153,7 @@ msgstr "Vymazať označenú záložku"
msgid "Add a new folder"
msgstr "Pridať nový priečinok"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635
msgid "Separator "
msgstr "Oddeľovač "
@@ -2184,6 +2181,11 @@ msgstr[2] "Pred %d dňami"
msgid "A week ago"
msgstr "Pred týždňom"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Nepodarilo sa odstrániť položku histórie: %s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Naozaj si želáte vymazať celú históriu?"
@@ -2758,8 +2760,8 @@ msgid "Customize Keyboard shortcuts"
msgstr "Nastavenie klávesových skratiek"
#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
-msgstr "Nastavenie skratky..."
+msgid "Customize Sh_ortcuts…"
+msgstr "Nastavenie skratky…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2838,12 +2840,12 @@ msgid "Displayed Items"
msgstr "Zobrazené položky"
#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Upraviť _panel..."
+msgid "Customize _Toolbar…"
+msgstr "Upraviť _panel…"
#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Vlastný..."
+msgid "_Customize…"
+msgstr "_Vlastný…"
#: ../extensions/toolbar-editor.c:627
msgid "Toolbar Editor"
@@ -2857,6 +2859,9 @@ msgstr "Umožňuje jednoducho zmeniť panel"
msgid "Cache HTTP communication on disk"
msgstr "Kešuje (ukladá) HTTP komunikáciu na disk"
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Záložky sa nepodarilo uložiť. %s"
+
#~ msgid "The specified configuration folder is invalid."
#~ msgstr "Vybraný konfiguračný priečinok nie je platný."
@@ -2956,14 +2961,14 @@ msgstr "Kešuje (ukladá) HTTP komunikáciu na disk"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Pridať nový priečinok do záložiek"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Pridáva, upravuje a maže vyhľadávacie moduly..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Pridáva, upravuje a maže vyhľadávacie moduly…"
-#~ msgid "Clear private data..."
-#~ msgstr "Odstráni súkromné údaje..."
+#~ msgid "Clear private data…"
+#~ msgstr "Odstráni súkromné údaje…"
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr "Zobrazí stránku vo vývojárskom nástroji..."
+#~ msgid "Inspect page details and access developer tools…"
+#~ msgstr "Zobrazí stránku vo vývojárskom nástroji…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Prepnúť na predchádzajúcu kartu"
@@ -3064,7 +3069,7 @@ msgstr "Kešuje (ukladá) HTTP komunikáciu na disk"
#~ msgid "Enforce a video dot density of 96 DPI"
#~ msgstr "Vnúti rozlíšenie obrazu 96 bodov na palec"
-#~ msgid "Configure _Advertisement filters..."
+#~ msgid "Configure _Advertisement filters…"
#~ msgstr "_Blokovanie reklamy"
#~ msgid "Switch tabs with Ctrl+Tab sorted by last usage"
diff --git a/po/sr.po b/po/sr.po
index c3431ce0..3883b247 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,315 +2,361 @@
# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER
# This file is distributed under the same license as the midori package.
# Милош Поповић 2009
-#
+# Мирослав Николић , 2012.
msgid ""
msgstr ""
"Project-Id-Version: midori 0.1.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-11 16:16+0000\n"
-"PO-Revision-Date: 2009-06-30 00:00+100\n"
-"Last-Translator: Милош Поповић \n"
-"Language-Team: Serbian (sr) \n"
+"POT-Creation-Date: 2012-06-04 17:06+0000\n"
+"PO-Revision-Date: 2012-06-08 05:37+0200\n"
+"Last-Translator: Мирослав Николић \n"
+"Language-Team: Serbian \n"
+"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1\n"
#: ../data/midori.desktop.in.h:1
-msgid "Lightweight web browser"
-msgstr "Једноставан Интернет прегледник"
+msgid "Browse the Web"
+msgstr "Прегледајте веб"
-#: ../data/midori.desktop.in.h:2 ../midori/main.c:1510 ../midori/main.c:2020
-#: ../midori/main.c:2045 ../midori/main.c:2061
-#: ../midori/midori-websettings.c:326
+#: ../data/midori.desktop.in.h:2
+msgid "Internet;WWW;Explorer"
+msgstr "Интернет;ВВВ;Истраживач"
+
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1970 ../midori/main.c:1994
+#: ../midori/main.c:2008 ../midori/midori-websettings.c:313
msgid "Midori"
msgstr "Мидори"
-#: ../data/midori.desktop.in.h:3
+#: ../data/midori.desktop.in.h:4
msgid "Web Browser"
msgstr "Интернет прегледник"
-#: ../midori/main.c:100 ../midori/main.c:106
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "Мидоријево приватно прегледање"
+
+#: ../data/midori-private.desktop.in.h:2
+msgid "Open a new private browsing window"
+msgstr "Отворите нови прозор приватног прегледања"
+
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4228
+msgid "Private Browsing"
+msgstr "Приватно прегледање"
+
+#: ../midori/main.c:97 ../midori/main.c:103
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Не могу да учитам подешавања: %s\n"
-#: ../midori/main.c:154
+#: ../midori/main.c:151
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Вредност „%s“ је неисправна за %s"
-#: ../midori/main.c:159 ../midori/main.c:252
+#: ../midori/main.c:156 ../midori/main.c:260
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Неисправна је вредност „%s“ у подешавањима"
-#: ../midori/main.c:357
+#: ../midori/main.c:381
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Не могу да учитам претраживаче. %s\n"
-#: ../midori/main.c:411
+#: ../midori/main.c:435
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Не могу да очистим историјат: %s\n"
-#: ../midori/main.c:433 ../midori/main.c:554 ../extensions/formhistory.c:443
+#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Не могу да отворим базу података: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:497
+#: ../midori/main.c:525
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Не могу да уклоним старе ставке из историјата: %s\n"
-#: ../midori/main.c:537 ../panels/midori-history.c:190
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "Не могу да уклоним ставку из историјата: %s\n"
-
-#: ../midori/main.c:584
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "Не могу да сачувам обележиваче. %s"
-
-#: ../midori/main.c:615
+#: ../midori/main.c:547
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Не могу да сачувам подешавања. %s"
-#: ../midori/main.c:650
+#: ../midori/main.c:582
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Не могу да сачувам претраживаче. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:676 ../midori/main.c:696
+#: ../midori/main.c:619
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Не могу да сачувам документ. %s"
-#: ../midori/main.c:716 ../panels/midori-extensions.c:91
+#: ../midori/main.c:660 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Проширења"
-#: ../midori/main.c:751
+#: ../midori/main.c:674
msgid "Privacy"
msgstr "Приватност"
-#: ../midori/main.c:756
-msgid "Delete old cookies after 1 hour"
+#: ../midori/main.c:686
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
msgstr ""
+"Колачићи чувају податке пријављивања, сачуване игре, или корисничке профиле "
+"за сврхе оглашавања."
-#: ../midori/main.c:757
-msgid "Delete old cookies after 1 day"
-msgstr ""
-
-#: ../midori/main.c:758
-msgid "Delete old cookies after 1 week"
-msgstr ""
-
-#: ../midori/main.c:759
-msgid "Delete old cookies after 1 month"
-msgstr ""
-
-#: ../midori/main.c:760
-msgid "Delete old cookies after 1 year"
-msgstr ""
-
-#: ../midori/main.c:778
-msgid "Cookies store login data, saved games, or user profiles for advertisement purposes."
-msgstr ""
-
-#: ../midori/main.c:804
-msgid "days"
-msgstr "дана"
-
-#: ../midori/main.c:853 ../midori/main.c:1108
+#: ../midori/main.c:742
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Не могу да сачувам сесију. %s"
-#: ../midori/main.c:1059
-msgid "No root certificate file is available. SSL certificates cannot be verified."
+#: ../midori/main.c:960
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
+"Није доступна корена датотека уверења. ССЛ уверења не могу бити проверена."
-#: ../midori/main.c:1143
-msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem."
-msgstr "Изгледа да је Мидори неисправно завршио рад приликом последњег покретања. Уколико се ово често понавља покушајте неки од понуђених предлога."
+#: ../midori/main.c:1036
+msgid ""
+"Midori seems to have crashed the last time it was opened. If this happened "
+"repeatedly, try one of the following options to solve the problem."
+msgstr ""
+"Изгледа да је Мидори неисправно завршио рад приликом последњег покретања. "
+"Уколико се ово често понавља покушајте неки од понуђених предлога."
-#: ../midori/main.c:1159
+#: ../midori/main.c:1055
msgid "Modify _preferences"
msgstr "Измени пос_тавке"
-#: ../midori/main.c:1163
-msgid "Reset the last _session"
-msgstr "Врати последњу сесију"
-
-#: ../midori/main.c:1168
+#: ../midori/main.c:1059
msgid "Disable all _extensions"
msgstr "Искључи сва п_роширења"
-#: ../midori/main.c:1388 ../midori/main.c:2379
+#: ../midori/main.c:1072
+msgid "Discard old tabs"
+msgstr "Одбаци старе језичке"
+
+#: ../midori/main.c:1073 ../midori/midori-websettings.c:221
+msgid "Show last tabs without loading"
+msgstr "Прикажи последње језичке без учитавања"
+
+#: ../midori/main.c:1074 ../midori/midori-websettings.c:220
+msgid "Show last open tabs"
+msgstr "Прикажи последње отворене језичке"
+
+#: ../midori/main.c:1319 ../midori/main.c:2395
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Не могу да учитам сесију: %s\n"
-#: ../midori/main.c:1510
-msgid "No filename specified"
-msgstr "Није изабрано име датотеке"
-
-#: ../midori/main.c:1529
-msgid "An unknown error occured."
-msgstr "Непозната грешка."
-
-#: ../midori/main.c:1559
+#: ../midori/main.c:1457
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Снимак је сачуван у: %s\n"
-#: ../midori/main.c:1905
+#: ../midori/main.c:1873
msgid "Run ADDRESS as a web application"
msgstr "Покреће АДРЕСУ као веб програм"
-#: ../midori/main.c:1905
+#: ../midori/main.c:1873
msgid "ADDRESS"
msgstr "АДРЕСА"
-#: ../midori/main.c:1908
+#: ../midori/main.c:1876
msgid "Use FOLDER as configuration folder"
msgstr "Користи ФАСЦИКЛУ за чување подешавања"
-#: ../midori/main.c:1908
+#: ../midori/main.c:1876
msgid "FOLDER"
msgstr "ФАСЦИКЛА"
-#: ../midori/main.c:1911
+#: ../midori/main.c:1879
msgid "Private browsing, no changes are saved"
-msgstr ""
+msgstr "Приватно разгледање, никакве измене се не чувају"
-#: ../midori/main.c:1913
-#, fuzzy
+#: ../midori/main.c:1881
msgid "Show a diagnostic dialog"
-msgstr "Прикажи прозорче приликом пада програма"
+msgstr "Приказује прозорче за дијагнозу"
-#: ../midori/main.c:1915
+#: ../midori/main.c:1883
msgid "Run the specified filename as javascript"
msgstr "Покреће изабрану датотеку као јава скрипту"
-#: ../midori/main.c:1918
+#: ../midori/main.c:1885
msgid "Take a snapshot of the specified URI"
msgstr "Прави снимак изабране адресе"
-#: ../midori/main.c:1921
+#: ../midori/main.c:1887
msgid "Execute the specified command"
-msgstr ""
+msgstr "Извршава наведену наредбу"
-#: ../midori/main.c:1923
+#: ../midori/main.c:1889
msgid "List available commands to execute with -e/ --execute"
-msgstr ""
+msgstr "Исписује доступне наредбе за извршавање са -e/ --execute"
-#: ../midori/main.c:1925
+#: ../midori/main.c:1891
msgid "Display program version"
msgstr "Исписује издање програма"
-#: ../midori/main.c:1927
+#: ../midori/main.c:1893
msgid "Addresses"
msgstr "Адресе"
-#: ../midori/main.c:1929
+#: ../midori/main.c:1895
msgid "Block URIs according to regular expression PATTERN"
-msgstr ""
+msgstr "Блокира адресе сходно ОБРАСЦУ регуларног израза"
-#: ../midori/main.c:1929
+#: ../midori/main.c:1895
msgid "PATTERN"
-msgstr ""
+msgstr "ОБРАЗАЦ"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1933
+#: ../midori/main.c:1899
msgid "Reset Midori after SECONDS seconds of inactivity"
-msgstr ""
+msgstr "Поново поставља Мидори нако"
-#: ../midori/main.c:1933
+#: ../midori/main.c:1899
msgid "SECONDS"
-msgstr ""
+msgstr "СЕКУНДЕ"
-#: ../midori/main.c:2017
+#: ../midori/main.c:1902
+msgid "Redirects console warnings to the specified FILENAME"
+msgstr "Преусмерава упозорења конзоле на наведену ДАТОТЕКУ НАЗИВА"
+
+#: ../midori/main.c:1902
+msgid "FILENAME"
+msgstr "НАЗИВ ДАТОТЕКЕ"
+
+#: ../midori/main.c:1967
msgid "[Addresses]"
msgstr "[Адресе]"
-#: ../midori/main.c:2031
-msgid "The specified configuration folder is invalid."
-msgstr "Изабрана фасцикла са подешавањима је неисправна."
-
-#: ../midori/main.c:2038
-#, fuzzy
-msgid "Midori (Private Browsing)"
-msgstr "Чување прива_тности"
-
-#: ../midori/main.c:2062
+#: ../midori/main.c:2009
msgid "Please report comments, suggestions and bugs to:"
-msgstr "Пошаљите коментар, преглог и извештај грешке на:"
+msgstr "Пошаљите примедбе, предлоге и грешке на:"
-#: ../midori/main.c:2064
+#: ../midori/main.c:2011
msgid "Check for new versions at:"
msgstr "Преузмите новије издање са:"
-#: ../midori/main.c:2128
-msgid "Website icons"
-msgstr "Иконице веб страница"
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/main.c:2106
+msgid "Saved logins and _passwords"
+msgstr "Сачувана пријављивања и _лозинке"
-#: ../midori/main.c:2130
-msgid "Cookies"
-msgstr "Колачићи"
+#: ../midori/main.c:2108
+msgid "Cookies and Website data"
+msgstr "Колачићи и подаци веб сајта"
-#: ../midori/main.c:2133
-msgid "'Flash' Cookies"
-msgstr "Флеш колачићи"
-
-#: ../midori/main.c:2137
-msgid "HTML5 _Databases"
-msgstr ""
-
-#: ../midori/main.c:2141 ../midori/midori-websettings.c:1058
-#: ../extensions/web-cache.c:478 ../extensions/web-cache.c:487
-#, fuzzy
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/main.c:2112 ../midori/midori-websettings.c:997
+#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
-msgstr "П_ретражи Интернет..."
+msgstr "Веб кеш"
-#: ../midori/main.c:2145
-msgid "Offline Application Cache"
-msgstr ""
+#: ../midori/main.c:2115
+msgid "Website icons"
+msgstr "Иконице веб сајта"
-#: ../midori/main.c:2308
+#: ../midori/main.c:2219
+msgid "An unknown error occured"
+msgstr "Догодила се непозната грешка"
+
+#: ../midori/main.c:2326
msgid "An instance of Midori is already running but not responding.\n"
-msgstr "Већ је покренут један Мидори прозор, али не даје одзив.\n"
+msgstr "Један примерак Мидорија је већ покренут али не даје одзив.\n"
-#: ../midori/main.c:2346
-#, fuzzy, c-format
+#: ../midori/main.c:2362
+#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
-msgstr "Не могу да учитам обележиваче: %s\n"
+msgstr "Не могу да учитам обележивач: %s\n"
-#: ../midori/main.c:2394
+#: ../midori/main.c:2410
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Не могу да учитам смеће: %s\n"
-#: ../midori/main.c:2407
+#: ../midori/main.c:2423
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Не могу да учитам историјат: %s\n"
-#: ../midori/main.c:2422
+#: ../midori/main.c:2439
msgid "The following errors occured:"
msgstr "Јавиле су се следеће грешке:"
-#: ../midori/main.c:2438
+#: ../midori/main.c:2455
msgid "_Ignore"
msgstr "_Занемари"
+#: ../midori/midori-app.c:1424
+msgid "_Bookmark"
+msgstr "_Обележивач"
+
+#: ../midori/midori-app.c:1425 ../midori/midori-browser.c:6102
+msgid "_Bookmarks"
+msgstr "_Обележивачи"
+
+#: ../midori/midori-app.c:1426
+msgid "Add Boo_kmark"
+msgstr "_Додај обележивач"
+
+#: ../midori/midori-app.c:1427
+msgid "_Console"
+msgstr "_Конзола"
+
+#: ../midori/midori-app.c:1428
+msgid "_Extensions"
+msgstr "П_роширења"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1429 ../midori/midori-browser.c:4626
+msgid "_History"
+msgstr "_Историјат"
+
+#: ../midori/midori-app.c:1430
+msgid "_Homepage"
+msgstr "По_четна страница"
+
+#: ../midori/midori-app.c:1431
+msgid "_Userscripts"
+msgstr "Личне _скрипте"
+
+#: ../midori/midori-app.c:1432
+msgid "New _Tab"
+msgstr "Нови _лист"
+
+#: ../midori/midori-app.c:1433
+msgid "_Transfers"
+msgstr "Пр_еноси"
+
+#: ../midori/midori-app.c:1434
+msgid "Netscape p_lugins"
+msgstr "Нетскејп _додаци"
+
+#: ../midori/midori-app.c:1435
+msgid "_Closed Tabs"
+msgstr "_Затворени листови"
+
+#: ../midori/midori-app.c:1436 ../midori/midori-browser.c:5253
+msgid "New _Window"
+msgstr "_Нови прозор"
+
+#: ../midori/midori-app.c:1437
+msgid "New _Folder"
+msgstr "Нова _фасцикла"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Није нађена датотека."
@@ -318,1900 +364,1661 @@ msgstr "Није нађена датотека."
#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
msgid "Malformed document."
-msgstr "Документ је лошег форматиран."
+msgstr "Документ је лоше форматиран."
#: ../midori/midori-array.c:628
msgid "Unrecognized bookmark format."
-msgstr ""
+msgstr "Непознат формат обележивача."
-#: ../midori/midori-array.c:916
+#: ../midori/midori-array.c:915
msgid "Writing failed."
-msgstr "Неуспешан упис."
+msgstr "Није успело уписивање."
-#: ../midori/midori-browser.c:328 ../midori/midori-browser.c:5122
-#: ../midori/midori-browser.c:5131
+#: ../midori/midori-browser.c:349 ../midori/midori-browser.c:5335
+#: ../midori/midori-browser.c:5344
msgid "Reload the current page"
-msgstr "Освежава страницу коју сте отворили"
+msgstr "Поново учитајте тренутну страницу"
-#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5128
+#: ../midori/midori-browser.c:358 ../midori/midori-browser.c:5341
msgid "Stop loading the current page"
-msgstr "Прекида странице на којој се налазите"
+msgstr "Зауставите учитавање тренутне странице"
-#: ../midori/midori-browser.c:466
-#, fuzzy, c-format
+#: ../midori/midori-browser.c:475
+#, c-format
msgid "Failed to update title: %s\n"
-msgstr "Не могу да отворим базу података: %s\n"
+msgstr "Нисам успео да ажурирам наслов: %s\n"
-#: ../midori/midori-browser.c:479
+#: ../midori/midori-browser.c:488
#, c-format
msgid "Unexpected action '%s'."
msgstr "Неочекивана радња „%s“."
-#: ../midori/midori-browser.c:734
+#: ../midori/midori-browser.c:568
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (Приватно прегледање)"
+
+#: ../midori/midori-browser.c:682 ../midori/midori-browser.c:715
+msgid "Toplevel folder"
+msgstr "Највиша фасцикла"
+
+#: ../midori/midori-browser.c:773
msgid "New folder"
msgstr "Нова фасцикла"
-#: ../midori/midori-browser.c:734
+#: ../midori/midori-browser.c:773
msgid "Edit folder"
msgstr "Уреди фасциклу"
-#: ../midori/midori-browser.c:736
+#: ../midori/midori-browser.c:775
msgid "New bookmark"
msgstr "Нови обележивач"
-#: ../midori/midori-browser.c:736
+#: ../midori/midori-browser.c:775
msgid "Edit bookmark"
msgstr "Уреди обележивач"
-#: ../midori/midori-browser.c:767
+#: ../midori/midori-browser.c:817
msgid "_Title:"
msgstr "_Наслов:"
-#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:953
-msgid "_Description:"
-msgstr "_Опис:"
-
-#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:967
+#: ../midori/midori-browser.c:837 ../midori/midori-searchaction.c:961
#: ../extensions/feed-panel/main.c:377
msgid "_Address:"
msgstr "_Адреса:"
-#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4184
+#: ../midori/midori-browser.c:860 ../midori/midori-browser.c:4363
msgid "_Folder:"
msgstr "_Фасцикла:"
-#: ../midori/midori-browser.c:845 ../midori/midori-browser.c:935
-#: ../midori/midori-browser.c:4189 ../midori/midori-browser.c:4217
-msgid "Toplevel folder"
-msgstr "Највиша фасцикла"
-
#: ../midori/midori-browser.c:876
-#, fuzzy
msgid "Add to _Speed Dial"
msgstr "Додај у _брзе посете"
#: ../midori/midori-browser.c:889
-#, fuzzy
msgid "Show in the tool_bar"
-msgstr "Ставке приказане у траци са алаткама"
+msgstr "Прикажи у траци _алата"
#: ../midori/midori-browser.c:904
-#, fuzzy
msgid "Run as _web application"
-msgstr "Покреће АДРЕСУ као веб програм"
+msgstr "Покрени као _веб програм"
-#: ../midori/midori-browser.c:980
+#: ../midori/midori-browser.c:975
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
-msgstr ""
+msgstr "Датотека „%s“ не може бити сачувана у овој фасцикли."
-#: ../midori/midori-browser.c:982
+#: ../midori/midori-browser.c:977
#, c-format
msgid "You don't have permission to write in this location."
-msgstr ""
+msgstr "Немате дозволу да пишете овде."
-#: ../midori/midori-browser.c:989
+#: ../midori/midori-browser.c:984
#, c-format
msgid "There is not enough free space to download \"%s\"."
-msgstr ""
+msgstr "Нема довољно слободног места за преузимање „%s“."
-#: ../midori/midori-browser.c:992
+#: ../midori/midori-browser.c:987
#, c-format
msgid "The file needs %s but only %s are left."
-msgstr ""
+msgstr "Датотека захтева %s али је преостало само %s."
-#: ../midori/midori-browser.c:1054 ../midori/midori-browser.c:4268
+#: ../midori/midori-browser.c:1024 ../midori/midori-browser.c:4432
msgid "Save file as"
msgstr "Сачувај датотеку као"
-#: ../midori/midori-browser.c:1357
-#, fuzzy
+#: ../midori/midori-browser.c:1336
msgid "New Window"
-msgstr "_Нови прозор"
+msgstr "Нови прозор"
+
+#: ../midori/midori-browser.c:1336
+msgid "A new window has been opened"
+msgstr "Нови прозор је отворен"
+
+#: ../midori/midori-browser.c:1339
+msgid "New Tab"
+msgstr "Нови лист"
+
+#: ../midori/midori-browser.c:1339
+msgid "A new tab has been opened"
+msgstr "Нови лист је отворен"
+
+#: ../midori/midori-browser.c:1356
+msgid "Error opening the image!"
+msgstr "Грешка приликом отварања слике!"
#: ../midori/midori-browser.c:1357
-msgid "A new window has been opened"
-msgstr ""
+msgid "Can not open selected image in a default viewer."
+msgstr "Не могу да отворим изабрану слику у основном прегледачу."
-#: ../midori/midori-browser.c:1360
-#, fuzzy
-msgid "New Tab"
-msgstr "Нови _лист"
+#: ../midori/midori-browser.c:1363
+msgid "Error downloading the image!"
+msgstr "Грешка у преузимању слике!"
-#: ../midori/midori-browser.c:1360
-#, fuzzy
-msgid "A new tab has been opened"
-msgstr "Обавести ме по завршеном преносу"
+#: ../midori/midori-browser.c:1364
+msgid "Can not download selected image."
+msgstr "Не могу да преузмем изабрану слику."
-#: ../midori/midori-browser.c:1399
-#, fuzzy
+#: ../midori/midori-browser.c:1490
msgid "Save file"
-msgstr "Сачувај датотеку као"
+msgstr "Сачувај датотеку"
-#: ../midori/midori-browser.c:2233
+#: ../midori/midori-browser.c:2379
msgid "Open file"
-msgstr "Отвори датотеку"
+msgstr "Отворите датотеку"
-#: ../midori/midori-browser.c:2350
+#: ../midori/midori-browser.c:2511
msgid ""
-"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n"
-"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically."
+"To use the above URI open a news aggregator. There is usually a menu or "
+"button \"New Subscription\", \"New News Feed\" or similar.\n"
+"Alternatively go to Preferences, Applications in Midori, and select a News "
+"Aggregator. Next time you click the news feed icon, it will be added "
+"automatically."
msgstr ""
+"Да користите горњу адресу отворите придруживача вести. Постоји обично "
+"изборник или дугме „New Subscription“ (Нова претплата), „New News Feed“ "
+"(Нови довод вести) или слично.\n"
+"Или идите на „Поставке, Разгледање“ у Мидорију, и изаберите „Читач вести“. "
+"Следећи пут када кликнете на иконицу довода вести, биће аутоматски додат."
-#: ../midori/midori-browser.c:2356 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2517 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Нови довод"
-#: ../midori/midori-browser.c:2399 ../midori/midori-browser.c:5195
-#: ../panels/midori-bookmarks.c:454
+#: ../midori/midori-browser.c:2560 ../midori/midori-browser.c:5404
+#: ../panels/midori-bookmarks.c:427
msgid "Add a new bookmark"
-msgstr "Додај обележивач"
+msgstr "Додајте обележивач"
-#: ../midori/midori-browser.c:2963 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3059 ../midori/midori-searchaction.c:488
msgid "Empty"
msgstr "Празно"
-#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:501
-#: ../midori/sokoke.c:511 ../midori/sokoke.c:539 ../midori/sokoke.c:568
-#: ../midori/sokoke.c:582
-msgid "Could not run external program."
-msgstr "Не могу да покренем спољни програм."
+#: ../midori/midori-browser.c:3489 ../midori/midori-browser.c:3490
+msgid "Toggle text cursor navigation"
+msgstr "Искључује навигацију текста курсором"
-#: ../midori/midori-browser.c:3686 ../midori/midori-browser.c:5611
-#, fuzzy, c-format
+#: ../midori/midori-browser.c:3492
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Притисак на Ф7 пребацује прегледање курсорим. Када је активан, текстуални "
+"курсор се појављује на свим вебсајтовима."
+
+#: ../midori/midori-browser.c:3495
+msgid "_Enable Caret Browsing"
+msgstr "_Укључи прегледање курсором"
+
+#: ../midori/midori-browser.c:3819 ../midori/midori-browser.c:5795
+#, c-format
msgid "Failed to insert new history item: %s\n"
-msgstr "Не могу да уклоним ставку из историјата: %s\n"
+msgstr "Не могу да уметнем нову ставку историјата: %s\n"
-#: ../midori/midori-browser.c:4017 ../panels/midori-bookmarks.c:770
-#: ../panels/midori-history.c:740
+#: ../midori/midori-browser.c:4151 ../panels/midori-bookmarks.c:745
+#: ../panels/midori-history.c:803
msgid "Open all in _Tabs"
msgstr "Отвори с_ве у листовима"
# bug: no plural-forms
-#: ../midori/midori-browser.c:4024 ../panels/midori-bookmarks.c:776
-#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:533
+#: ../midori/midori-browser.c:4158 ../panels/midori-bookmarks.c:751
+#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
-msgstr "Отвору у новом _листу"
+msgstr "Отвори у новом _листу"
-#: ../midori/midori-browser.c:4027 ../midori/midori-view.c:2733
-#: ../midori/midori-view.c:4698 ../panels/midori-bookmarks.c:778
-#: ../panels/midori-history.c:748 ../extensions/feed-panel/feed-panel.c:535
+#: ../midori/midori-browser.c:4161 ../midori/midori-view.c:2690
+#: ../midori/midori-view.c:4783 ../panels/midori-bookmarks.c:753
+#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Отвори у _новом прозору"
-#: ../midori/midori-browser.c:4106
-#, fuzzy
+#: ../midori/midori-browser.c:4250
msgid "Arora"
-msgstr "Грешка"
+msgstr "Арора"
-#: ../midori/midori-browser.c:4107
+#: ../midori/midori-browser.c:4251
msgid "Kazehakase"
-msgstr ""
+msgstr "Кејзхакејз"
-#: ../midori/midori-browser.c:4108
+#: ../midori/midori-browser.c:4252
msgid "Opera"
-msgstr ""
+msgstr "Опера"
-#: ../midori/midori-browser.c:4109
+#: ../midori/midori-browser.c:4253
msgid "Konqueror"
-msgstr ""
+msgstr "К‑освајач"
-#: ../midori/midori-browser.c:4110
+#: ../midori/midori-browser.c:4254
msgid "Epiphany"
-msgstr ""
+msgstr "Спознаја"
-#: ../midori/midori-browser.c:4135
-#, fuzzy
-msgid "Import bookmarks..."
-msgstr "Уреди обележивач"
+#: ../midori/midori-browser.c:4255
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Фајерфокс (%s)"
-#: ../midori/midori-browser.c:4138 ../midori/midori-browser.c:5200
-#, fuzzy
+#: ../midori/midori-browser.c:4276
+msgid "Import bookmarks…"
+msgstr "Увези обележиваче…"
+
+#: ../midori/midori-browser.c:4279 ../midori/midori-browser.c:5409
msgid "_Import bookmarks"
-msgstr "Уреди обележивач"
+msgstr "Увези _обележиваче"
-#: ../midori/midori-browser.c:4149
-#, fuzzy
+#: ../midori/midori-browser.c:4290
msgid "_Application:"
-msgstr "Програми"
+msgstr "_Програм:"
-#: ../midori/midori-browser.c:4176
+#: ../midori/midori-browser.c:4355
msgid "Import from XBEL or HTML file"
-msgstr ""
+msgstr "Увези из ИксБЕЛ или ХТМЛ датотеке"
-#: ../midori/midori-browser.c:4225
+#: ../midori/midori-browser.c:4390
msgid "Import from a file"
-msgstr ""
+msgstr "Увези из датотеке"
-#: ../midori/midori-browser.c:4237
-#, fuzzy
+#: ../midori/midori-browser.c:4402
msgid "Failed to import bookmarks"
-msgstr "Уреди обележивач"
+msgstr "Нисам успео да увезем обележиваче"
-#: ../midori/midori-browser.c:4273
-#, fuzzy
+#: ../midori/midori-browser.c:4437
msgid "XBEL Bookmarks"
-msgstr "Обележивачи"
+msgstr "ИксБЕЛ обележивачи"
-#: ../midori/midori-browser.c:4278
-#, fuzzy
+#: ../midori/midori-browser.c:4442
msgid "Netscape Bookmarks"
-msgstr "Нови обележивач"
+msgstr "Нетскејп обележивачи"
-#: ../midori/midori-browser.c:4292
+#: ../midori/midori-browser.c:4456
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
-msgstr ""
+msgstr "Мидори може само да извезе у ИксБЕЛ (*.xbel) и Нетскејп (*.html)"
-#: ../midori/midori-browser.c:4308
+#: ../midori/midori-browser.c:4471
msgid "Failed to export bookmarks"
-msgstr ""
+msgstr "Нисам успео да извезем обележиваче"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4425
+#: ../midori/midori-browser.c:4593
msgid "Clear Private Data"
-msgstr "Очисти личне податке"
+msgstr "Очистите личне податке"
-#: ../midori/midori-browser.c:4429
+#: ../midori/midori-browser.c:4597
msgid "_Clear private data"
msgstr "О_чисти личне податке"
-#: ../midori/midori-browser.c:4442
+#: ../midori/midori-browser.c:4610
msgid "Clear the following data:"
-msgstr "Чишћење следећих података:"
+msgstr "Очисти следеће податке:"
-#. i18n: Browsing history, visited web pages
-#: ../midori/midori-browser.c:4453 ../midori/sokoke.c:1514
-msgid "_History"
-msgstr "_Историјат"
+#: ../midori/midori-browser.c:4620
+msgid "Last open _tabs"
+msgstr "Последњи отворени _листови"
-#: ../midori/midori-browser.c:4458 ../midori/sokoke.c:1520
-#, fuzzy
-msgid "_Closed Tabs"
-msgstr "З_атвори лист"
-
-#: ../midori/midori-browser.c:4478
-#, fuzzy
+#: ../midori/midori-browser.c:4646
msgid "Clear private data when _quitting Midori"
-msgstr "О_чисти личне податке"
+msgstr "Очисти приватне податке приликом _напуштања Мидорија"
-#: ../midori/midori-browser.c:4654
+#: ../midori/midori-browser.c:4841
msgid "A lightweight web browser."
msgstr "Једноставан Интернет прегледник."
-#: ../midori/midori-browser.c:4655
+#: ../midori/midori-browser.c:4842
msgid "See about:version for version info."
-msgstr ""
+msgstr "Погледајте „about:version“ за податке о издању."
-#: ../midori/midori-browser.c:4657
-msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version."
+#: ../midori/midori-browser.c:4844
+msgid ""
+"This library is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU Lesser General Public License as published by the "
+"Free Software Foundation; either version 2.1 of the License, or (at your "
+"option) any later version."
msgstr ""
+"Ова библиотека је слободан софтвер; можете је расподељивати и/или мењати под "
+"условима Гнуове мање опште јавне лиценце како је објављује Задужбина "
+"слободног софтвера; било верзије 2.1 те лиценце, или (према вашем мишљењу) "
+"било које новије верзије."
-#: ../midori/midori-browser.c:4676
+#: ../midori/midori-browser.c:4865
msgid "translator-credits"
msgstr ""
"Милош Поповић \n"
"\n"
"http://prevod.org — превод на српски језик."
-#: ../midori/midori-browser.c:5033
+#: ../midori/midori-browser.c:5251
msgid "_File"
msgstr "_Датотека"
-#: ../midori/midori-browser.c:5035 ../midori/sokoke.c:1521
-msgid "New _Window"
-msgstr "_Нови прозор"
-
-#: ../midori/midori-browser.c:5036
+#: ../midori/midori-browser.c:5254
msgid "Open a new window"
-msgstr "Отвори нови прозор"
+msgstr "Отворите нови прозор"
-#: ../midori/midori-browser.c:5039
+#: ../midori/midori-browser.c:5257
msgid "Open a new tab"
-msgstr "Отвара нови лист"
+msgstr "Отворите нови лист"
-#: ../midori/midori-browser.c:5041
-msgid "P_rivate Browsing"
-msgstr "Чување прива_тности"
+#: ../midori/midori-browser.c:5259
+msgid "New P_rivate Browsing Window"
+msgstr "Нови прозор _приватног прегледања"
-#: ../midori/midori-browser.c:5042
-msgid "Don't save any private data while browsing"
-msgstr "Не чува никакве личне податке током разгледања Интернета"
-
-#: ../midori/midori-browser.c:5046
+#: ../midori/midori-browser.c:5263
msgid "Open a file"
-msgstr "Отвори датотеку"
+msgstr "Отворите датотеку"
-#: ../midori/midori-browser.c:5049
+#: ../midori/midori-browser.c:5265
+msgid "_Save Page As…"
+msgstr "_Сачувај страницу као…"
+
+#: ../midori/midori-browser.c:5266
msgid "Save to a file"
-msgstr "Сачувај у датотеку"
+msgstr "Сачувајте у датотеку"
-#: ../midori/midori-browser.c:5051
+#: ../midori/midori-browser.c:5268
msgid "Add to Speed _dial"
msgstr "Додај у _брзе посете"
-#: ../midori/midori-browser.c:5052
-msgid "Add shortcut to speed dial"
-msgstr "Додаје ову адресу у брзе посете"
-
-#: ../midori/midori-browser.c:5055
-#, fuzzy
+#: ../midori/midori-browser.c:5272
msgid "Add Shortcut to the _desktop"
-msgstr "Додаје ову адресу у брзе посете"
+msgstr "Додај пречицу на _радну површ"
-#: ../midori/midori-browser.c:5056
-#, fuzzy
-msgid "Add shortcut to the desktop"
-msgstr "Додаје ову адресу у брзе посете"
-
-#: ../midori/midori-browser.c:5058
+#: ../midori/midori-browser.c:5274
msgid "Create _Launcher"
-msgstr ""
+msgstr "Направи _покретач"
-#: ../midori/midori-browser.c:5059
-msgid "Create a launcher"
-msgstr ""
-
-#: ../midori/midori-browser.c:5062
+#: ../midori/midori-browser.c:5278
msgid "Subscribe to News _feed"
-msgstr ""
+msgstr "Претплати се на _довод вести"
-#: ../midori/midori-browser.c:5063
-msgid "Subscribe to this news feed"
-msgstr ""
-
-#: ../midori/midori-browser.c:5068
+#: ../midori/midori-browser.c:5284
msgid "_Close Tab"
msgstr "З_атвори лист"
-#: ../midori/midori-browser.c:5069
+#: ../midori/midori-browser.c:5285
msgid "Close the current tab"
-msgstr "Затвара овај лист"
+msgstr "Затворите тренутни лист"
-#: ../midori/midori-browser.c:5071
+#: ../midori/midori-browser.c:5287
msgid "C_lose Window"
msgstr "_Затвори прозор"
-#: ../midori/midori-browser.c:5072
-msgid "Close this window"
-msgstr "Затвара овај прозор"
-
-#: ../midori/midori-browser.c:5075
+#: ../midori/midori-browser.c:5291
msgid "Print the current page"
-msgstr "Штампај текућу страницу"
+msgstr "Штампајте тренутну страницу"
-#: ../midori/midori-browser.c:5077
-#, fuzzy
+#: ../midori/midori-browser.c:5293
msgid "Close a_ll Windows"
-msgstr "_Затвори прозор"
+msgstr "Затвори _све прозоре"
-#: ../midori/midori-browser.c:5078
-#, fuzzy
-msgid "Close all open windows"
-msgstr "_Затворени листови и прозори"
-
-#: ../midori/midori-browser.c:5080
+#: ../midori/midori-browser.c:5296
msgid "_Edit"
msgstr "_Уређивање"
-#: ../midori/midori-browser.c:5084
-msgid "Undo the last modification"
-msgstr ""
+#: ../midori/midori-browser.c:5319
+msgid "_Find…"
+msgstr "_Пронађи…"
-#: ../midori/midori-browser.c:5087
-#, fuzzy
-msgid "Redo the last modification"
-msgstr "Врати последњу сесију"
-
-#: ../midori/midori-browser.c:5091
-msgid "Cut the selected text"
-msgstr "Исеца изабрани текст и смешта га списак исечака"
-
-#: ../midori/midori-browser.c:5094
-msgid "Copy the selected text"
-msgstr "Умножава изабрани текст у списак исечака"
-
-#: ../midori/midori-browser.c:5097
-msgid "Paste text from the clipboard"
-msgstr "Убацује текст из списка исечака"
-
-#: ../midori/midori-browser.c:5100
-msgid "Delete the selected text"
-msgstr "Брише изабрани текст"
-
-#: ../midori/midori-browser.c:5103
-msgid "Select all text"
-msgstr "Изабире сав текст"
-
-#: ../midori/midori-browser.c:5106
+#: ../midori/midori-browser.c:5320
msgid "Find a word or phrase in the page"
-msgstr "Тражи жељену реч или израз унутар страници"
+msgstr "Пронађите жељену реч или израз унутар странице"
-#: ../midori/midori-browser.c:5108
+#: ../midori/midori-browser.c:5322
msgid "Find _Next"
-msgstr "Тражи _следеће"
+msgstr "Нађи _следеће"
-#: ../midori/midori-browser.c:5109
-msgid "Find the next occurrence of a word or phrase"
-msgstr "Проналази следећу појаву речи или израза"
-
-#: ../midori/midori-browser.c:5111
+#: ../midori/midori-browser.c:5325
msgid "Find _Previous"
-msgstr "Тражи _претходно"
+msgstr "Нађи _претходно"
-#: ../midori/midori-browser.c:5112
-msgid "Find the previous occurrence of a word or phrase"
-msgstr "Проналази претходну појаву речи или израза"
-
-#: ../midori/midori-browser.c:5116
+#: ../midori/midori-browser.c:5329
msgid "Configure the application preferences"
msgstr "Подесите поставке програма"
-#: ../midori/midori-browser.c:5118
+#: ../midori/midori-browser.c:5331
msgid "_View"
msgstr "П_реглед"
-#: ../midori/midori-browser.c:5119
+#: ../midori/midori-browser.c:5332
msgid "_Toolbars"
-msgstr "Палете а_лата"
+msgstr "Траке _алата"
-#: ../midori/midori-browser.c:5124 ../midori/midori-browser.c:5125
+#: ../midori/midori-browser.c:5337
msgid "Reload page without caching"
-msgstr ""
+msgstr "Учитај страницу без причувавања"
-#: ../midori/midori-browser.c:5134
+#: ../midori/midori-browser.c:5347
msgid "Increase the zoom level"
-msgstr "Увећај приказ"
+msgstr "Увећајте ниво приказа"
-#: ../midori/midori-browser.c:5137
+#: ../midori/midori-browser.c:5350
msgid "Decrease the zoom level"
-msgstr "Умањи приказ"
+msgstr "Умањите ниво приказа"
-#: ../midori/midori-browser.c:5140
-msgid "Reset the zoom level"
-msgstr "Врати величину приказа"
-
-#: ../midori/midori-browser.c:5141
+#: ../midori/midori-browser.c:5354
msgid "_Encoding"
msgstr "_Кодирање"
-#: ../midori/midori-browser.c:5143
-#, fuzzy
+#: ../midori/midori-browser.c:5356
msgid "View So_urce"
-msgstr "_Изворно издање странице"
+msgstr "Прикажи _извор"
-#: ../midori/midori-browser.c:5144
-msgid "View the source code of the page"
-msgstr "Приказује изворни код странице"
-
-#: ../midori/midori-browser.c:5147
-#, fuzzy
+#: ../midori/midori-browser.c:5359
msgid "Ca_ret Browsing"
-msgstr "Чување прива_тности"
+msgstr "Прегледање _курсором"
-#: ../midori/midori-browser.c:5148
-msgid "Toggle text cursor navigation"
-msgstr ""
-
-#: ../midori/midori-browser.c:5152
+#: ../midori/midori-browser.c:5363
msgid "Toggle fullscreen view"
-msgstr "Приказује програм преко целог екрана"
+msgstr "Пребаците приказ преко целог екрана"
-#: ../midori/midori-browser.c:5155
+#: ../midori/midori-browser.c:5365
msgid "Scroll _Left"
-msgstr ""
+msgstr "Клизај ле_во"
-#: ../midori/midori-browser.c:5156
-#, fuzzy
-msgid "Scroll to the left"
-msgstr "Иде на наредни лист"
-
-#: ../midori/midori-browser.c:5158
+#: ../midori/midori-browser.c:5368
msgid "Scroll _Down"
-msgstr ""
+msgstr "Клизај до_ле"
-#: ../midori/midori-browser.c:5159
-msgid "Scroll down"
-msgstr ""
-
-#: ../midori/midori-browser.c:5161
+#: ../midori/midori-browser.c:5371
msgid "Scroll _Up"
-msgstr ""
+msgstr "Клизај го_ре"
-#: ../midori/midori-browser.c:5162
-msgid "Scroll up"
-msgstr ""
-
-#: ../midori/midori-browser.c:5164
+#: ../midori/midori-browser.c:5374
msgid "Scroll _Right"
-msgstr ""
+msgstr "Клизај де_сно"
-#: ../midori/midori-browser.c:5165
-msgid "Scroll to the right"
-msgstr ""
-
-#: ../midori/midori-browser.c:5168
+#: ../midori/midori-browser.c:5377
msgid "_Go"
msgstr "_Иди"
-#: ../midori/midori-browser.c:5171
+#: ../midori/midori-browser.c:5380
msgid "Go back to the previous page"
-msgstr "Иде на претходну страницу"
+msgstr "Идите на претходну страницу"
-#: ../midori/midori-browser.c:5174
+#: ../midori/midori-browser.c:5383
msgid "Go forward to the next page"
-msgstr "Иде на следећу страницу"
+msgstr "Идите на следећу страницу"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5178
-#, fuzzy
+#: ../midori/midori-browser.c:5387
msgid "Go to the previous sub-page"
-msgstr "Иде на претходну страницу"
+msgstr "Идите на претходну садржану страницу"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5182
-#, fuzzy
+#: ../midori/midori-browser.c:5391
msgid "Go to the next sub-page"
-msgstr "Иде на следећу страницу"
+msgstr "Идите на следећу садржану страницу"
-#: ../midori/midori-browser.c:5185
+#: ../midori/midori-browser.c:5394
msgid "Go to your homepage"
-msgstr "Иде на почетну страну"
+msgstr "Идите на почетну страницу"
-#: ../midori/midori-browser.c:5187
+#: ../midori/midori-browser.c:5396
msgid "Empty Trash"
msgstr "Испразни смеће"
-#: ../midori/midori-browser.c:5188
-msgid "Delete the contents of the trash"
-msgstr "Брише сав садржај из смећа"
-
-#: ../midori/midori-browser.c:5190
-#, fuzzy
+#: ../midori/midori-browser.c:5399
msgid "Undo _Close Tab"
-msgstr "Врати лист"
+msgstr "_Опозови затварање листа"
-#: ../midori/midori-browser.c:5191
-msgid "Open the last closed tab"
-msgstr "Отвара лист који сте последњи затворили"
-
-#: ../midori/midori-browser.c:5197
-#, fuzzy
+#: ../midori/midori-browser.c:5406
msgid "Add a new _folder"
-msgstr "Додај нову фасциклу"
+msgstr "Додај нову _фасциклу"
-#: ../midori/midori-browser.c:5198
-msgid "Add a new bookmark folder"
-msgstr "Додаје нову фасциклу за обележиваче"
-
-#: ../midori/midori-browser.c:5203
-#, fuzzy
+#: ../midori/midori-browser.c:5412
msgid "_Export bookmarks"
-msgstr "Уреди обележивач"
+msgstr "_Извези обележиваче"
-#: ../midori/midori-browser.c:5206 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5415 ../midori/midori-searchaction.c:497
msgid "_Manage Search Engines"
msgstr "По_деси претраживаче"
-#: ../midori/midori-browser.c:5207
-msgid "Add, edit and remove search engines..."
-msgstr "Отвара прозорче за додавање, уређивање или уклањање претраживача."
-
-#: ../midori/midori-browser.c:5210
+#: ../midori/midori-browser.c:5418
msgid "_Clear Private Data"
msgstr "Очисти _личне податке"
-#: ../midori/midori-browser.c:5211
-msgid "Clear private data..."
-msgstr "Брише све личне податке."
-
-#: ../midori/midori-browser.c:5215
-#, fuzzy
+#: ../midori/midori-browser.c:5421
msgid "_Inspect Page"
-msgstr "Инспекција странице — %s"
+msgstr "_Прегледај страницу"
-#: ../midori/midori-browser.c:5216
-msgid "Inspect page details and access developer tools..."
-msgstr ""
-
-#: ../midori/midori-browser.c:5221
+#: ../midori/midori-browser.c:5425
msgid "_Previous Tab"
msgstr "_Претходни лист"
-#: ../midori/midori-browser.c:5222
-msgid "Switch to the previous tab"
-msgstr "Иде на претходни лист"
-
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5428
msgid "_Next Tab"
msgstr "_Следећи лист"
-#: ../midori/midori-browser.c:5225
-msgid "Switch to the next tab"
-msgstr "Иде на наредни лист"
-
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5430
msgid "Move Tab _Backward"
-msgstr ""
+msgstr "Премести лист уна_зад"
-#: ../midori/midori-browser.c:5227
-#, fuzzy
-msgid "Move tab behind the previous tab"
-msgstr "Иде на претходни лист"
-
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5432
msgid "_Move Tab Forward"
-msgstr ""
+msgstr "Премести лист уна_пред"
-#: ../midori/midori-browser.c:5229
-#, fuzzy
-msgid "Move tab in front of the next tab"
-msgstr "Иде на наредни лист"
-
-#: ../midori/midori-browser.c:5231
-#, fuzzy
+#: ../midori/midori-browser.c:5435
msgid "Focus _Current Tab"
-msgstr "тренутном листу"
+msgstr "Приближи _тренутни лист"
-#: ../midori/midori-browser.c:5232
-#, fuzzy
-msgid "Focus the current tab"
-msgstr "Затвара овај лист"
-
-#: ../midori/midori-browser.c:5234
+#: ../midori/midori-browser.c:5438
msgid "Focus _Next view"
-msgstr ""
+msgstr "Приближи _следећи преглед"
-#: ../midori/midori-browser.c:5235
-msgid "Cycle focus between views"
-msgstr ""
-
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5441
msgid "Only show the Icon of the _Current Tab"
-msgstr ""
+msgstr "Прикажи само иконицу _тренутног листа"
-#: ../midori/midori-browser.c:5238
-#, fuzzy
-msgid "Only show the icon of the current tab"
-msgstr "Затвара овај лист"
-
-#: ../midori/midori-browser.c:5240
-#, fuzzy
+#: ../midori/midori-browser.c:5444
msgid "_Duplicate Current Tab"
-msgstr "тренутном листу"
+msgstr "_Удвостручи тренутни лист"
-#: ../midori/midori-browser.c:5241
-#, fuzzy
-msgid "Duplicate the current tab"
-msgstr "Затвара овај лист"
-
-#: ../midori/midori-browser.c:5243
-#, fuzzy
+#: ../midori/midori-browser.c:5447
msgid "Close Ot_her Tabs"
-msgstr "Затвара овај лист"
+msgstr "Затвори _друге листове"
-#: ../midori/midori-browser.c:5244
-#, fuzzy
-msgid "Close all tabs except the current tab"
-msgstr "Затвара овај лист"
-
-#: ../midori/midori-browser.c:5246
-#, fuzzy
+#: ../midori/midori-browser.c:5450
msgid "Open last _session"
-msgstr "Врати последњу сесију"
+msgstr "Отвори последњу _сесију"
-#: ../midori/midori-browser.c:5247
-#, fuzzy
-msgid "Open the tabs saved in the last session"
-msgstr "Врати последњу сесију"
-
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5453
msgid "_Help"
msgstr "_Помоћ"
-#: ../midori/midori-browser.c:5251
+#: ../midori/midori-browser.c:5455
msgid "_Frequent Questions"
msgstr "_Честа питања"
-#: ../midori/midori-browser.c:5252
-msgid "Show the Frequently Asked Questions"
-msgstr "Приказује често постављена питања"
+#: ../midori/midori-browser.c:5458
+msgid "_Report a Problem…"
+msgstr "Пријавите _проблем…"
-#: ../midori/midori-browser.c:5254
-#, fuzzy
-msgid "_Report a Problem..."
-msgstr "Пријави _грешку"
-
-#: ../midori/midori-browser.c:5255
-msgid "Open Midori's bug tracker"
-msgstr "Отвара Мидоријеву страницу за пријаву грешки"
-
-#: ../midori/midori-browser.c:5258
-msgid "Show information about the program"
-msgstr "Приказује податке о програму"
-
-#: ../midori/midori-browser.c:5266
-msgid "_Menubar"
-msgstr "Трака са _менијем"
-
-#: ../midori/midori-browser.c:5267
-msgid "Show menubar"
-msgstr "Приказује мени програма"
-
-#: ../midori/midori-browser.c:5270
-msgid "_Navigationbar"
-msgstr "_Главна трака"
-
-#: ../midori/midori-browser.c:5271
-msgid "Show navigationbar"
-msgstr "Приказује површ за кретање кроз веб странице"
-
-#: ../midori/midori-browser.c:5274
-msgid "Side_panel"
-msgstr "Бочна _површ"
-
-#: ../midori/midori-browser.c:5275
-msgid "Show sidepanel"
-msgstr "Приказује бочну површ"
-
-#: ../midori/midori-browser.c:5278
-msgid "_Bookmarkbar"
-msgstr "_Обележивачи"
-
-#: ../midori/midori-browser.c:5279
-msgid "Show bookmarkbar"
-msgstr "Приказује површ са обележивачима"
-
-#: ../midori/midori-browser.c:5282
-msgid "_Statusbar"
-msgstr "Трака са ста_њем"
-
-#: ../midori/midori-browser.c:5283
-msgid "Show statusbar"
-msgstr "Приказује или сакрива траку са стањем"
-
-#: ../midori/midori-browser.c:5291
-msgid "_Automatic"
-msgstr "_Сам одреди"
-
-#: ../midori/midori-browser.c:5294 ../midori/midori-websettings.c:234
-msgid "Chinese (BIG5)"
-msgstr "Кинески (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5298
-#, fuzzy
-msgid "Japanese (SHIFT__JIS)"
-msgstr "Јапански (_Shift_JIS)"
-
-#: ../midori/midori-browser.c:5301 ../midori/midori-websettings.c:236
-msgid "Korean (EUC-KR)"
-msgstr ""
-
-#: ../midori/midori-browser.c:5304 ../midori/midori-websettings.c:237
-msgid "Russian (KOI8-R)"
-msgstr "Руски (KOI8-R)"
-
-#: ../midori/midori-browser.c:5307 ../midori/midori-websettings.c:238
-msgid "Unicode (UTF-8)"
-msgstr "Уникод (UTF-_8)"
-
-#: ../midori/midori-browser.c:5310 ../midori/midori-websettings.c:239
-msgid "Western (ISO-8859-1)"
-msgstr "Западни (I_SO-8859-1)"
-
-#: ../midori/midori-browser.c:5313 ../midori/midori-websettings.c:240
-#: ../midori/midori-websettings.c:331 ../katze/katze-utils.c:706
-msgid "Custom..."
-msgstr "Произвољно..."
-
-#: ../midori/midori-browser.c:5848
-msgid "_Separator"
-msgstr "_Раздвајач"
-
-#: ../midori/midori-browser.c:5855
-msgid "_Location..."
-msgstr "На _адресу..."
-
-#: ../midori/midori-browser.c:5857
-msgid "Open a particular location"
-msgstr "Отвара изабрану адресу"
-
-#: ../midori/midori-browser.c:5879
-msgid "_Web Search..."
-msgstr "П_ретражи Интернет..."
-
-#: ../midori/midori-browser.c:5881
-msgid "Run a web search"
-msgstr "Иде на страницу за претрагу Интернета"
-
-#: ../midori/midori-browser.c:5902
-msgid "Reopen a previously closed tab or window"
-msgstr "Врати претходне прозоре и листове читача"
-
-#: ../midori/midori-browser.c:5915 ../midori/sokoke.c:1510
-msgid "_Bookmarks"
-msgstr "_Обележивачи"
-
-#: ../midori/midori-browser.c:5917
-msgid "Show the saved bookmarks"
-msgstr "Приказује сачуване обележиваче"
-
-#: ../midori/midori-browser.c:5931
+#: ../midori/midori-browser.c:5463 ../midori/midori-browser.c:6121
msgid "_Tools"
msgstr "_Алати"
-#: ../midori/midori-browser.c:5946
+#: ../midori/midori-browser.c:5470
+msgid "_Menubar"
+msgstr "Трака _избора"
+
+#: ../midori/midori-browser.c:5474
+msgid "_Navigationbar"
+msgstr "Трака _кретања"
+
+#: ../midori/midori-browser.c:5478
+msgid "Side_panel"
+msgstr "Бочна _површ"
+
+#: ../midori/midori-browser.c:5479
+msgid "Sidepanel"
+msgstr "Бочна површ"
+
+#: ../midori/midori-browser.c:5482
+msgid "_Bookmarkbar"
+msgstr "Трака _обележивача"
+
+#: ../midori/midori-browser.c:5486
+msgid "_Statusbar"
+msgstr "Трака _стања"
+
+#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:312
+msgid "_Automatic"
+msgstr "_Самостално"
+
+#: ../midori/midori-browser.c:5498 ../midori/midori-websettings.c:236
+msgid "Chinese Traditional (BIG5)"
+msgstr "Кинески Традиционални (BIG5)"
+
+#: ../midori/midori-browser.c:5501 ../midori/midori-websettings.c:237
+msgid "Chinese Simplified (GB18030)"
+msgstr "Кинески поједностављени (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5505
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Јапански (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:239
+msgid "Korean (EUC-KR)"
+msgstr "Корејски (EUC-KR)"
+
+#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:240
+msgid "Russian (KOI8-R)"
+msgstr "Руски (KOI8-R)"
+
+#: ../midori/midori-browser.c:5514 ../midori/midori-websettings.c:241
+msgid "Unicode (UTF-8)"
+msgstr "Уникод (UTF-_8)"
+
+#: ../midori/midori-browser.c:5517 ../midori/midori-websettings.c:242
+msgid "Western (ISO-8859-1)"
+msgstr "Западни (I_SO-8859-1)"
+
+#: ../midori/midori-browser.c:5520 ../midori/midori-websettings.c:243
+#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641
+msgid "Custom…"
+msgstr "Произвољно…"
+
+#: ../midori/midori-browser.c:6027
+msgid "_Separator"
+msgstr "_Раздвајач"
+
+#: ../midori/midori-browser.c:6034
+msgid "_Location…"
+msgstr "На _адресу…"
+
+#: ../midori/midori-browser.c:6036
+msgid "Open a particular location"
+msgstr "Отворите нарочиту адресу"
+
+#: ../midori/midori-browser.c:6058
+msgid "_Web Search…"
+msgstr "П_ретражи Интернет…"
+
+#: ../midori/midori-browser.c:6060
+msgid "Run a web search"
+msgstr "Покрените претрагу веба"
+
+#: ../midori/midori-browser.c:6087
+msgid "Reopen a previously closed tab or window"
+msgstr "Вратите претходно затворене прозоре и листове"
+
+#: ../midori/midori-browser.c:6104
+msgid "Show the saved bookmarks"
+msgstr "Прикажите сачуване обележиваче"
+
+#: ../midori/midori-browser.c:6137
msgid "_Window"
msgstr "_Прозор"
-#: ../midori/midori-browser.c:5948
+#: ../midori/midori-browser.c:6139
msgid "Show a list of all open tabs"
-msgstr "Приказује списак свих отворених листова"
+msgstr "Прикажите списак свих отворених листова"
-#: ../midori/midori-browser.c:5962
-#, fuzzy
+#: ../midori/midori-browser.c:6153
msgid "_Menu"
-msgstr "Трака са _менијем"
+msgstr "_Изборник"
-#: ../midori/midori-browser.c:5964
-#, fuzzy
+#: ../midori/midori-browser.c:6155
msgid "Menu"
-msgstr "Трака са _менијем"
+msgstr "Изборник"
-#: ../midori/midori-browser.c:6537
+#: ../midori/midori-browser.c:6969
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Неочекивана поставка „%s“"
-#: ../midori/midori-extension.c:286
-#, fuzzy, c-format
+#: ../midori/midori-extension.c:329
+#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
-msgstr "Не могу да учитам подешавања: %s\n"
+msgstr "Подешавање проширења „%s“ не може бити учитано: %s\n"
-#: ../midori/midori-extension.c:668 ../midori/midori-extension.c:765
-#: ../midori/midori-extension.c:862 ../midori/midori-extension.c:974
-#: ../extensions/addons.c:1636
-#, fuzzy, c-format
+#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
+#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
+#: ../extensions/addons.c:1698
+#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
-msgstr "Не могу да сачувам подешавања. %s"
+msgstr "Подешавање проширења „%s“ не може бити сачувано: %s\n"
-#: ../midori/midori-locationaction.c:396
-#, fuzzy, c-format
-msgid "Failed to select from history\n"
-msgstr "Не могу да очистим историјат: %s\n"
-
-#: ../midori/midori-locationaction.c:480
-#, fuzzy, c-format
-msgid "Search for %s"
-msgstr "Поставке за %s"
-
-#: ../midori/midori-locationaction.c:506
-#, fuzzy, c-format
+#: ../midori/midori-locationaction.c:394
+#, c-format
msgid "Search with %s"
-msgstr "Пре_тражи са"
+msgstr "Претражи помоћу %s"
+
+#: ../midori/midori-locationaction.c:412
+msgid "Search with…"
+msgstr "Претражи помоћу…"
+
+#: ../midori/midori-locationaction.c:537
+#, c-format
+msgid "Failed to select from history\n"
+msgstr "Нисам успео да изаберем из историјата\n"
+
+#: ../midori/midori-locationaction.c:624
+#, c-format
+msgid "Search for %s"
+msgstr "Потражи %s"
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1254
+#: ../midori/midori-locationaction.c:1398
msgid "Paste and p_roceed"
-msgstr ""
+msgstr "Налепи и _настави"
-#: ../midori/midori-locationaction.c:1649
+#: ../midori/midori-locationaction.c:1739
msgid "Not verified"
-msgstr ""
+msgstr "Непроверено"
-#: ../midori/midori-locationaction.c:1664
+#: ../midori/midori-locationaction.c:1759
msgid "Verified and encrypted connection"
-msgstr ""
+msgstr "Проверена и шифрована веза"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
-#, fuzzy
+#: ../midori/midori-locationaction.c:1771
+msgid "Open, unencrypted connection"
+msgstr "Отворена, нешифрована веза"
+
+#: ../midori/midori-panel.c:316 ../midori/midori-panel.c:318
+#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484
msgid "Align sidepanel to the right"
-msgstr "Постави бочну површ десно"
+msgstr "Поставите бочну површ на десну страну"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:328 ../midori/midori-panel.c:329
msgid "Close panel"
-msgstr "Затвори површ"
+msgstr "Затворите површ"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
-#, fuzzy
+#: ../midori/midori-panel.c:482 ../midori/midori-panel.c:485
msgid "Align sidepanel to the left"
-msgstr "Постави бочну површ десно"
-
-#: ../midori/midori-websettings.c:214
-#, fuzzy
-msgid "Show Speed Dial"
-msgstr "Додај у _брзе посете"
-
-#: ../midori/midori-websettings.c:215
-#, fuzzy
-msgid "Show Homepage"
-msgstr "Почетна страница"
-
-#: ../midori/midori-websettings.c:216
-#, fuzzy
-msgid "Show last open tabs"
-msgstr "Приказује списак свих отворених листова"
+msgstr "Поставите бочну површ на леву страну"
#: ../midori/midori-websettings.c:218
-msgid "Show last tabs without loading"
-msgstr ""
+msgid "Show Speed Dial"
+msgstr "Прикажи брзе посете"
-#: ../midori/midori-websettings.c:235
+#: ../midori/midori-websettings.c:219
+msgid "Show Homepage"
+msgstr "Прикажи почетну страницу"
+
+#: ../midori/midori-websettings.c:238
msgid "Japanese (SHIFT_JIS)"
-msgstr "Јапански (_Shift_JIS)"
+msgstr "Јапански (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:255
+#: ../midori/midori-websettings.c:258
msgid "New tab"
msgstr "новом листу"
-#: ../midori/midori-websettings.c:256
+#: ../midori/midori-websettings.c:259
msgid "New window"
msgstr "новом прозору"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:260
msgid "Current tab"
msgstr "тренутном листу"
-#: ../midori/midori-websettings.c:272
+#: ../midori/midori-websettings.c:275
msgid "Default"
msgstr "Уобичајено"
-#: ../midori/midori-websettings.c:273
+#: ../midori/midori-websettings.c:276
msgid "Icons"
msgstr "Иконице"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:277
msgid "Small icons"
-msgstr ""
+msgstr "Мале иконице"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:278
msgid "Text"
msgstr "Текст"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:279
msgid "Icons and text"
-msgstr ""
+msgstr "Иконице и текст"
-#: ../midori/midori-websettings.c:277
-#, fuzzy
+#: ../midori/midori-websettings.c:280
msgid "Text beside icons"
-msgstr "Иконице веб страница"
+msgstr "Текст поред иконица"
-#: ../midori/midori-websettings.c:292
+#: ../midori/midori-websettings.c:295
msgid "Automatic (GNOME or environment)"
-msgstr ""
+msgstr "Самостално (Гном или окружење)"
-#: ../midori/midori-websettings.c:293
-#, fuzzy
+#: ../midori/midori-websettings.c:296
msgid "HTTP proxy server"
-msgstr "Прокси сервер"
+msgstr "ХТТП сервер посредник"
-#: ../midori/midori-websettings.c:294
-#, fuzzy
+#: ../midori/midori-websettings.c:297
msgid "No proxy server"
-msgstr "Прокси сервер"
+msgstr "Без посредничког сервера"
-#: ../midori/midori-websettings.c:309
-msgid "All cookies"
-msgstr "Све колачиће"
-
-#: ../midori/midori-websettings.c:310
-msgid "Session cookies"
-msgstr "Колачиће сесије"
-
-#: ../midori/midori-websettings.c:311 ../katze/katze-utils.c:675
-msgid "None"
-msgstr "Ништа"
-
-#: ../midori/midori-websettings.c:327
+#: ../midori/midori-websettings.c:314
msgid "Safari"
msgstr "Сафари"
-#: ../midori/midori-websettings.c:328
-#, fuzzy
+#: ../midori/midori-websettings.c:315
msgid "iPhone"
-msgstr "Ништа"
+msgstr "иФон"
-#: ../midori/midori-websettings.c:329
+#: ../midori/midori-websettings.c:316
msgid "Firefox"
-msgstr "Firefox"
+msgstr "Фајерфокс"
-#: ../midori/midori-websettings.c:330
+#: ../midori/midori-websettings.c:317
msgid "Internet Explorer"
-msgstr "Internet Explorer"
-
-#: ../midori/midori-websettings.c:383
-msgid "Remember last window size"
-msgstr "Запамти величину прозора"
-
-#: ../midori/midori-websettings.c:384
-msgid "Whether to save the last window size"
-msgstr "Да ли да сачувам последњу величину прозора"
-
-#: ../midori/midori-websettings.c:392
-msgid "Last window width"
-msgstr "Ширина прозора"
-
-#: ../midori/midori-websettings.c:393
-msgid "The last saved window width"
-msgstr "Последња сачувана ширина прозора"
+msgstr "Интернет експлорер"
#: ../midori/midori-websettings.c:401
-msgid "Last window height"
-msgstr "Висина прозора"
+msgid "Remember last window size"
+msgstr "Запамти последњу величину прозора"
#: ../midori/midori-websettings.c:402
+msgid "Whether to save the last window size"
+msgstr "Да ли ће бити сачувана последња величина прозора"
+
+#: ../midori/midori-websettings.c:410
+msgid "Last window width"
+msgstr "Последња ширина прозора"
+
+#: ../midori/midori-websettings.c:411
+msgid "The last saved window width"
+msgstr "Последња ширина сачуваног прозора"
+
+#: ../midori/midori-websettings.c:419
+msgid "Last window height"
+msgstr "Последњег висина прозора"
+
+#: ../midori/midori-websettings.c:420
msgid "The last saved window height"
-msgstr "Последња сачувана висина прозора"
+msgstr "Последња висина сачуваног прозора"
-#: ../midori/midori-websettings.c:427
+#: ../midori/midori-websettings.c:445
msgid "Last panel position"
-msgstr "Место панела"
+msgstr "Последњи положај панела"
-#: ../midori/midori-websettings.c:428
+#: ../midori/midori-websettings.c:446
msgid "The last saved panel position"
-msgstr "Последње сачувано место панела"
+msgstr "Последњи сачувани положај панела"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:437
+#: ../midori/midori-websettings.c:455
msgid "Last panel page"
msgstr "Последња станица панела"
-#: ../midori/midori-websettings.c:438
+#: ../midori/midori-websettings.c:456
msgid "The last saved panel page"
-msgstr "Последња сачувана страница у панелу"
+msgstr "Последња сачувана страница панела"
-#: ../midori/midori-websettings.c:446
+#: ../midori/midori-websettings.c:464
msgid "Last Web search"
msgstr "Последња претрага"
-#: ../midori/midori-websettings.c:447
-msgid "The last saved Web search"
-msgstr "Последња сачувана Интернет претрага"
-
-#: ../midori/midori-websettings.c:456
-msgid "Show Menubar"
-msgstr "Прикажи мени"
-
-#: ../midori/midori-websettings.c:457
-msgid "Whether to show the menubar"
-msgstr "Одређује да ли је приказана трака са менијем"
-
#: ../midori/midori-websettings.c:465
-msgid "Show Navigationbar"
-msgstr "Прикажи главну траку"
-
-#: ../midori/midori-websettings.c:466
-msgid "Whether to show the navigationbar"
-msgstr "Одређује да ли је приказана главна трака"
+msgid "The last saved Web search"
+msgstr "Последња сачувана претрага веба"
#: ../midori/midori-websettings.c:474
-msgid "Show Bookmarkbar"
-msgstr "Прикажи обележиваче"
+msgid "Show Menubar"
+msgstr "Приказивање траке изборника"
#: ../midori/midori-websettings.c:475
-msgid "Whether to show the bookmarkbar"
-msgstr "Одређује да ли су приказани обележивачи"
+msgid "Whether to show the menubar"
+msgstr "Да ли ће бити приказана трака изборника"
#: ../midori/midori-websettings.c:483
-msgid "Show Panel"
-msgstr "Прикажи бочну површ"
+msgid "Show Navigationbar"
+msgstr "Приказивање траке навигације"
#: ../midori/midori-websettings.c:484
-msgid "Whether to show the panel"
-msgstr "Одређује да ли је приказана бочна површ"
+msgid "Whether to show the navigationbar"
+msgstr "Да ли ће бити приказана трака навигације"
+
+#: ../midori/midori-websettings.c:492
+msgid "Show Bookmarkbar"
+msgstr "Приказивање обележивача"
+
+#: ../midori/midori-websettings.c:493
+msgid "Whether to show the bookmarkbar"
+msgstr "Да ли ће бити приказани обележивачи"
#: ../midori/midori-websettings.c:501
-msgid "Show Transferbar"
-msgstr "Прикажи преносе"
+msgid "Show Panel"
+msgstr "Приказивање бочне површи"
#: ../midori/midori-websettings.c:502
-msgid "Whether to show the transferbar"
-msgstr "Одређује да ли је приказана трака са преносима"
+msgid "Whether to show the panel"
+msgstr "Да ли ће бити приказана бочна површ"
#: ../midori/midori-websettings.c:510
msgid "Show Statusbar"
-msgstr "Прикажи траку са стањем"
+msgstr "Приказивање траке стања"
#: ../midori/midori-websettings.c:511
msgid "Whether to show the statusbar"
-msgstr "Одређује да ли је приказана трака са стањем"
+msgstr "Да ли ће бити приказана трака стања"
#: ../midori/midori-websettings.c:520
-#, fuzzy
msgid "Toolbar Style:"
-msgstr "Изглед траке са алаткама"
+msgstr "Стил траке алата:"
#: ../midori/midori-websettings.c:521
msgid "The style of the toolbar"
-msgstr "Одређује изглед траке са алаткама"
+msgstr "Одређује изглед траке алата"
+
+#: ../midori/midori-websettings.c:530
+msgid "Toolbar Items"
+msgstr "Ставке траке алата"
+
+#: ../midori/midori-websettings.c:531
+msgid "The items to show on the toolbar"
+msgstr "Ставке које ће бити приказане у траци алата"
#: ../midori/midori-websettings.c:539
-msgid "Search engines in location completion"
-msgstr "Прикажи претраживаче у поље за адресу"
+msgid "Compact Sidepanel"
+msgstr "Збијена бочна површ"
#: ../midori/midori-websettings.c:540
-msgid "Whether to show search engines in the location completion"
-msgstr "Приказује претраживаче у поље за унос адреса"
-
-#: ../midori/midori-websettings.c:548
-msgid "Toolbar Items"
-msgstr "Ставке у траци са алаткама"
-
-#: ../midori/midori-websettings.c:549
-msgid "The items to show on the toolbar"
-msgstr "Ставке приказане у траци са алаткама"
-
-#: ../midori/midori-websettings.c:557
-msgid "Compact Sidepanel"
-msgstr "Сабиј бочну површ"
-
-#: ../midori/midori-websettings.c:558
msgid "Whether to make the sidepanel compact"
-msgstr "Збија неке ставке у бочној површи"
+msgstr "Да ли ће бочну површ учинити збијеном"
-#: ../midori/midori-websettings.c:575
-#, fuzzy
-msgid "Show operating controls of the panel"
-msgstr "Приказује податке о програму"
+#: ../midori/midori-websettings.c:555
+msgid "Align sidepanel on the right"
+msgstr "Постављање бочне површи на десно"
-#: ../midori/midori-websettings.c:576
-#, fuzzy
-msgid "Whether to show the operating controls of the panel"
-msgstr "Одређује да ли је приказана трака са преносима"
+#: ../midori/midori-websettings.c:556
+msgid "Whether to align the sidepanel on the right"
+msgstr "Да ли ће бочна површ бити поравната на десно"
+
+#: ../midori/midori-websettings.c:571
+msgid "Open panels in separate windows"
+msgstr "Површи у засебним прозорима"
+
+#: ../midori/midori-websettings.c:572
+msgid "Whether to always open panels in separate windows"
+msgstr "Да ли ће увек отварати површи у засебним прозорима"
+
+#: ../midori/midori-websettings.c:581
+msgid "When Midori starts:"
+msgstr "Када се Мидори покрене:"
+
+#: ../midori/midori-websettings.c:582
+msgid "What to do when Midori starts"
+msgstr "Шта да се ради када се покрене Мидори"
#: ../midori/midori-websettings.c:591
-msgid "Align sidepanel on the right"
-msgstr "Постави бочну површ десно"
+msgid "Homepage:"
+msgstr "Матична страница:"
#: ../midori/midori-websettings.c:592
-msgid "Whether to align the sidepanel on the right"
-msgstr "Одређује да ли да се бочна површ равна са десном страном"
-
-#: ../midori/midori-websettings.c:607
-#, fuzzy
-msgid "Open panels in separate windows"
-msgstr "Отвори нови прозор"
-
-#: ../midori/midori-websettings.c:608
-#, fuzzy
-msgid "Whether to always open panels in separate windows"
-msgstr "Откачује изабрану површ из прозора"
-
-#: ../midori/midori-websettings.c:617
-msgid "When Midori starts:"
-msgstr ""
-
-#: ../midori/midori-websettings.c:618
-#, fuzzy
-msgid "What to do when Midori starts"
-msgstr "Одређује шта се учитава по покретању"
-
-#: ../midori/midori-websettings.c:627
-#, fuzzy
-msgid "Homepage:"
-msgstr "Почетна страница"
-
-#: ../midori/midori-websettings.c:628
msgid "The homepage"
msgstr "Почетна страница"
-#: ../midori/midori-websettings.c:643
+#: ../midori/midori-websettings.c:607
msgid "Show crash dialog"
-msgstr "Прикажи прозорче приликом пада програма"
+msgstr "Прикажи прозорче падова програма"
-#: ../midori/midori-websettings.c:644
+#: ../midori/midori-websettings.c:608
msgid "Show a dialog after Midori crashed"
-msgstr "Прикажи прозорче при паду Мидорија"
+msgstr "Приказује прозорче након пада Мидорија"
-#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:662
-msgid "Show speed dial in new tabs"
-msgstr "Прикажи брзе посете у новим листовима"
-
-#: ../midori/midori-websettings.c:663
-msgid "Show speed dial in newly opened tabs"
-msgstr "Укључује приказ брзих адреса у новим листовима"
-
-#: ../midori/midori-websettings.c:671
-#, fuzzy
+#: ../midori/midori-websettings.c:616
msgid "Save downloaded files to:"
-msgstr "Запамти последње преузете датотеке"
+msgstr "Сачувај преузете датотеке у:"
-#: ../midori/midori-websettings.c:672
+#: ../midori/midori-websettings.c:617
msgid "The folder downloaded files are saved to"
-msgstr "Фасцикле у коју се смештају преузете датотеке"
+msgstr "Фасцикла у којој ће бити сачуване преузете датотеке"
-#: ../midori/midori-websettings.c:691
-msgid "Download Manager"
-msgstr "Преузимач датотека"
-
-#: ../midori/midori-websettings.c:692
-msgid "An external download manager"
-msgstr "Спољни програм за преузимање датотека"
-
-#: ../midori/midori-websettings.c:700
+#: ../midori/midori-websettings.c:625
msgid "Text Editor"
msgstr "Уређивач текста"
-#: ../midori/midori-websettings.c:701
+#: ../midori/midori-websettings.c:626
msgid "An external text editor"
msgstr "Спољни програм за уређивање текста"
-#: ../midori/midori-websettings.c:716
+#: ../midori/midori-websettings.c:641
msgid "News Aggregator"
msgstr "Читач вести"
-#: ../midori/midori-websettings.c:717
+#: ../midori/midori-websettings.c:642
msgid "An external news aggregator"
msgstr "Спољни програм за читање вести"
-#: ../midori/midori-websettings.c:725
+#: ../midori/midori-websettings.c:650
msgid "Location entry Search"
-msgstr "Претрага у поље за адресе"
+msgstr "Претрага поља за адресе"
-#: ../midori/midori-websettings.c:726
+#: ../midori/midori-websettings.c:651
msgid "The search to perform inside the location entry"
-msgstr "Додаје могућност претраге из поља за унос адреса"
+msgstr "Претрага која ће бити обављена из поља за унос адреса"
-#: ../midori/midori-websettings.c:734
+#: ../midori/midori-websettings.c:659
msgid "Preferred Encoding"
-msgstr "Предност кодирању"
+msgstr "Омиљено кодирање"
-#: ../midori/midori-websettings.c:735
+#: ../midori/midori-websettings.c:660
msgid "The preferred character encoding"
msgstr "Кодирање знакова које ће бити у предности"
-#: ../midori/midori-websettings.c:745
+#: ../midori/midori-websettings.c:670
msgid "Always Show Tabbar"
-msgstr "Увек прикажи језичке"
+msgstr "Увек прикажи листове"
-#: ../midori/midori-websettings.c:746
+#: ../midori/midori-websettings.c:671
msgid "Always show the tabbar"
-msgstr "Увек приказује траку са језичцима"
+msgstr "Увек приказује траку листова"
-#: ../midori/midori-websettings.c:754
+#: ../midori/midori-websettings.c:684
msgid "Close Buttons on Tabs"
-msgstr "Прикажи дугме за затварање листова"
+msgstr "Дугме за затварање листова"
-#: ../midori/midori-websettings.c:755
+#: ../midori/midori-websettings.c:685
msgid "Whether tabs have close buttons"
-msgstr "Приказује дугме за затварање на сваком листу"
+msgstr "Да ли ће листови имати дугмад за затварање"
# bug(slobo): једноставно разлистај?
-#: ../midori/midori-websettings.c:780
-#, fuzzy
+#: ../midori/midori-websettings.c:710
msgid "Open new pages in:"
-msgstr "Отвори нове странице у"
+msgstr "Отвори нове странице у:"
-#: ../midori/midori-websettings.c:781
+#: ../midori/midori-websettings.c:711
msgid "Where to open new pages"
-msgstr "Одређује где да се отварају нове странице"
+msgstr "Где ће бити отворене нове странице"
-#: ../midori/midori-websettings.c:797
-#, fuzzy
-msgid "Open external pages in:"
-msgstr "Отвори спољне странице у"
-
-#: ../midori/midori-websettings.c:798
-msgid "Where to open externally opened pages"
-msgstr "Одређује где се отварају спољне странице"
-
-#: ../midori/midori-websettings.c:807
+#: ../midori/midori-websettings.c:720
msgid "Middle click opens Selection"
-msgstr "Отвори изабрано на средњи клик"
+msgstr "Средњи клик отвара избор"
-#: ../midori/midori-websettings.c:808
+#: ../midori/midori-websettings.c:721
msgid "Load an address from the selection via middle click"
-msgstr "Учитава адресу из изабраног на средњи клик мишем"
+msgstr "Учитава адресу из избора на средњи клик мишем"
-#: ../midori/midori-websettings.c:816
+#: ../midori/midori-websettings.c:729
msgid "Open tabs in the background"
-msgstr "Отвори листове у позадини"
+msgstr "Отворите листове у позадини"
-#: ../midori/midori-websettings.c:817
+#: ../midori/midori-websettings.c:730
msgid "Whether to open new tabs in the background"
-msgstr "Не прелази на нови лист већ га отвара у позадини"
+msgstr "Да ли ће нови листови бити отворени у позадини"
-#: ../midori/midori-websettings.c:825
+#: ../midori/midori-websettings.c:738
msgid "Open Tabs next to Current"
-msgstr "Отвори лист поред тренутног"
+msgstr "Отворите листове поред тренутног"
-#: ../midori/midori-websettings.c:826
+#: ../midori/midori-websettings.c:739
msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "Одређује да ли се нови лист отвара поред текућег или поред последњег листа"
+msgstr "Да ли да отвори нове листове поред текућег или након последњег листа"
-#: ../midori/midori-websettings.c:834
+#: ../midori/midori-websettings.c:747
msgid "Open popups in tabs"
-msgstr "Смести искачуће прозоре у лист"
+msgstr "Отворите искачуће прозоре у листовима"
-#: ../midori/midori-websettings.c:835
+#: ../midori/midori-websettings.c:748
msgid "Whether to open popup windows in tabs"
-msgstr "Отвара искачуће прозоре у новим листовима"
+msgstr "Да ли да отвори искачуће прозоре у листовима"
-#: ../midori/midori-websettings.c:845 ../extensions/statusbar-features.c:132
+#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134
msgid "Load images automatically"
msgstr "Сам учитај слике"
-#: ../midori/midori-websettings.c:846
+#: ../midori/midori-websettings.c:759
msgid "Load and display images automatically"
-msgstr "Учитава и аутоматски приказује слике"
+msgstr "Учитава и самостално приказује слике"
-#: ../midori/midori-websettings.c:853 ../extensions/statusbar-features.c:141
+#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143
msgid "Enable scripts"
msgstr "Укључи скрипте"
-#: ../midori/midori-websettings.c:854
+#: ../midori/midori-websettings.c:767
msgid "Enable embedded scripting languages"
-msgstr "укључује уметнуте језике за скрипте"
+msgstr "Укључује уметнуте језике за скрипте"
-#: ../midori/midori-websettings.c:861 ../extensions/statusbar-features.c:150
+#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154
msgid "Enable Netscape plugins"
-msgstr "Укључи Netscape додатке"
+msgstr "Укључи прикључке Нетскејпа"
-#: ../midori/midori-websettings.c:862
+#: ../midori/midori-websettings.c:775
msgid "Enable embedded Netscape plugin objects"
-msgstr "Омогућава објекте са угнежђеним Netscape додацима"
+msgstr "Укључује угнежђене објекте прикључака Нетскејпа"
-#: ../midori/midori-websettings.c:878
+#: ../midori/midori-websettings.c:790
msgid "Enable Spell Checking"
msgstr "Укључи проверу писања"
-#: ../midori/midori-websettings.c:879
+#: ../midori/midori-websettings.c:791
msgid "Enable spell checking while typing"
-msgstr "Укључи проверу писања док куцам"
+msgstr "Укључује проверу писања за време куцања"
-#: ../midori/midori-websettings.c:887
+#: ../midori/midori-websettings.c:797
msgid "Enable HTML5 database support"
-msgstr ""
+msgstr "Укључи подршку ХТМЛ5 базе података"
-#: ../midori/midori-websettings.c:888
+#: ../midori/midori-websettings.c:798
msgid "Whether to enable HTML5 database support"
-msgstr ""
+msgstr "Да ли да укључи подршку ХТМЛ5 базе података"
-#: ../midori/midori-websettings.c:894
+#: ../midori/midori-websettings.c:804
msgid "Enable HTML5 local storage support"
-msgstr ""
+msgstr "Укључи подршку ХТМЛ5 месног скалдиштења"
-#: ../midori/midori-websettings.c:895
+#: ../midori/midori-websettings.c:805
msgid "Whether to enable HTML5 local storage support"
-msgstr ""
+msgstr "Да ли да укључи подршку ХТМЛ5 месног скалдиштења"
-#: ../midori/midori-websettings.c:903
+#: ../midori/midori-websettings.c:811
msgid "Enable offline web application cache"
-msgstr ""
+msgstr "Укључи тренутну меморију веб програма ван мреже"
-#: ../midori/midori-websettings.c:904
+#: ../midori/midori-websettings.c:812
msgid "Whether to enable offline web application cache"
-msgstr ""
+msgstr "Да ли да укључи тренутну меморију веб програма ван мреже"
-#: ../midori/midori-websettings.c:929
+#: ../midori/midori-websettings.c:828
+msgid "Flash window on background tabs"
+msgstr "Трепни прозором на позадинским листовима"
+
+#: ../midori/midori-websettings.c:829
+msgid "Flash the browser window if a new tab was opened in the background"
+msgstr "Трепнуће прозором прегледника ако буде отворен нови лист у позадини"
+
+#: ../midori/midori-websettings.c:837
+msgid "Enable WebGL support"
+msgstr "Укључи ВебГЛ подршку"
+
+#: ../midori/midori-websettings.c:838
+msgid "Allow websites to use OpenGL rendering"
+msgstr "Омогућава веб сајтовима да користе ОпенГЛ исцртавање"
+
+#: ../midori/midori-websettings.c:864
msgid "Zoom Text and Images"
msgstr "Увећај текст и слике"
-#: ../midori/midori-websettings.c:930
+#: ../midori/midori-websettings.c:865
msgid "Whether to zoom text and images"
-msgstr "Повећај текст и слике"
+msgstr "Да ли да повећа текст и слике"
-#: ../midori/midori-websettings.c:945
+#: ../midori/midori-websettings.c:880
msgid "Find inline while typing"
-msgstr "Нађи док куцам"
+msgstr "Налази унутр за време куцања"
-#: ../midori/midori-websettings.c:946
+#: ../midori/midori-websettings.c:881
msgid "Whether to automatically find inline while typing"
-msgstr "Аутоматски проверава писање док куцате текст"
+msgstr "Да ли да самостално проналази унутар за време куцања"
-#: ../midori/midori-websettings.c:961
+#: ../midori/midori-websettings.c:896
msgid "Kinetic scrolling"
-msgstr ""
+msgstr "Кинетичко клизање"
-#: ../midori/midori-websettings.c:962
+#: ../midori/midori-websettings.c:897
msgid "Whether scrolling should kinetically move according to speed"
-msgstr ""
+msgstr "Да ли клизање треба кинетички да се помера у складу са брзином"
-#: ../midori/midori-websettings.c:977
-msgid "Accept cookies"
-msgstr "Прихвати колачиће"
+#: ../midori/midori-websettings.c:905
+msgid "Delete old Cookies after:"
+msgstr "Обриши старе колачиће након:"
-#: ../midori/midori-websettings.c:978
-msgid "What type of cookies to accept"
-msgstr "Које колачиће да прихватим"
-
-#: ../midori/midori-websettings.c:987
-msgid "Maximum cookie age"
-msgstr "Старост колачића"
-
-#: ../midori/midori-websettings.c:988
+#: ../midori/midori-websettings.c:906
msgid "The maximum number of days to save cookies for"
-msgstr "Број дана након чега се уклањају колачићи са рачунара"
+msgstr "Највећи број дана за које ће бити причувани колачићи"
-#: ../midori/midori-websettings.c:997
-msgid "Maximum history age"
-msgstr "Старост историјата"
+#: ../midori/midori-websettings.c:922
+msgid "Only accept Cookies from sites you visit"
+msgstr "Прихвати колачиће само са сајтова које посетим"
+
+#: ../midori/midori-websettings.c:923
+msgid "Block cookies sent by third-party websites"
+msgstr "Блокира колачиће које пошаљу веб сајтови трећих страна"
+
+#: ../midori/midori-websettings.c:937
+msgid "Delete pages from history after:"
+msgstr "Обриши странице из историјата након:"
+
+#: ../midori/midori-websettings.c:938
+msgid "The maximum number of days to save the history for"
+msgstr "Највећи број дана за које ће бити причуван историјат"
+
+#: ../midori/midori-websettings.c:953
+msgid "Proxy server"
+msgstr "Сервер посредник"
+
+#: ../midori/midori-websettings.c:954
+msgid "The type of proxy server to use"
+msgstr "Врста посредника сервера за коришћење"
+
+#: ../midori/midori-websettings.c:963
+msgid "HTTP Proxy Server"
+msgstr "ХТТП сервер посредник"
+
+#: ../midori/midori-websettings.c:964
+msgid "The proxy server used for HTTP connections"
+msgstr "Сервер посредник коришћен за ХТТП везе"
+
+#: ../midori/midori-websettings.c:979
+msgid "Port"
+msgstr "Прикључак"
+
+#: ../midori/midori-websettings.c:980
+msgid "The proxy server port used for HTTP connections"
+msgstr "Прикључак сервера посредника коришћеног за ХТТП везе"
#: ../midori/midori-websettings.c:998
-msgid "The maximum number of days to save the history for"
-msgstr "Број дана након којих се уклања историјат посета страница"
-
-#: ../midori/midori-websettings.c:1013
-msgid "Remember last downloaded files"
-msgstr "Запамти последње преузете датотеке"
-
-#: ../midori/midori-websettings.c:1014
-msgid "Whether the last downloaded files are saved"
-msgstr "Чува датотеке које сте последње преузели"
-
-#: ../midori/midori-websettings.c:1031
-#, fuzzy
-msgid "Proxy server"
-msgstr "Прокси сервер"
-
-#: ../midori/midori-websettings.c:1032
-msgid "The type of proxy server to use"
-msgstr ""
-
-#: ../midori/midori-websettings.c:1041
-#, fuzzy
-msgid "HTTP Proxy Server"
-msgstr "Прокси сервер"
-
-#: ../midori/midori-websettings.c:1042
-msgid "The proxy server used for HTTP connections"
-msgstr "Прокси сервер за ХТТП везе"
-
-#: ../midori/midori-websettings.c:1059
msgid "The maximum size of cached pages on disk"
-msgstr ""
+msgstr "Највећа величина причуваних страница на диску"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1076
+#: ../midori/midori-websettings.c:1015
msgid "Identify as"
msgstr "Представи се као"
-#: ../midori/midori-websettings.c:1077
+#: ../midori/midori-websettings.c:1016
msgid "What to identify as to web pages"
-msgstr "Одређује како се програм представља веб страницама"
+msgstr "Одређује како ће се програм представити веб страницама"
-#: ../midori/midori-websettings.c:1093
+#: ../midori/midori-websettings.c:1032
msgid "Identification string"
msgstr "Реченица за представање"
-#: ../midori/midori-websettings.c:1094
+#: ../midori/midori-websettings.c:1033
msgid "The application identification string"
msgstr "Реченица која одређује како веб странице препознају програм"
-#: ../midori/midori-websettings.c:1110
-#, fuzzy
+#: ../midori/midori-websettings.c:1049
msgid "Preferred languages"
-msgstr "Предност кодирању"
+msgstr "Пожељни језици"
-#: ../midori/midori-websettings.c:1111
-msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+#: ../midori/midori-websettings.c:1050
+msgid ""
+"A comma separated list of languages preferred for rendering multilingual "
+"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
msgstr ""
+"Зарезом одвојен списак пожељних језика за исцртавање вишејезичних веб "
+"страница, на пример „de“, „ru,nl“ или „en-us;q=1.0, fr-fr;q=0.667“"
-#: ../midori/midori-websettings.c:1126
-#, fuzzy
+#: ../midori/midori-websettings.c:1065
msgid "Clear private data"
-msgstr "О_чисти личне податке"
+msgstr "Брисање личних података"
-#: ../midori/midori-websettings.c:1127
+#: ../midori/midori-websettings.c:1066
msgid "The private data selected for deletion"
-msgstr ""
+msgstr "Лични подаци изабрани за брисање"
-#: ../midori/midori-websettings.c:1142
-#, fuzzy
+#: ../midori/midori-websettings.c:1081
msgid "Clear data"
-msgstr "О_чисти личне податке"
+msgstr "Брисање података"
-#: ../midori/midori-websettings.c:1143
+#: ../midori/midori-websettings.c:1082
msgid "The data selected for deletion"
-msgstr ""
+msgstr "Подаци изабрани за брисање"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1176
-msgid "Strip referrer details sent to external sites"
-msgstr ""
+#: ../midori/midori-websettings.c:1131
+msgid "Strip referrer details sent to websites"
+msgstr "Отцепи податке преусмеривача послате веб сајтовима"
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1178
+#: ../midori/midori-websettings.c:1133
msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr ""
+msgstr "Да ли заглавље преусмеривача треба да буде скраћено на назив домаћина"
-#: ../midori/midori-view.c:1374
+#: ../midori/midori-websettings.c:1147
+msgid "Always use my font choices"
+msgstr "Увек користи моје изборе слова"
+
+#: ../midori/midori-websettings.c:1148
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+"Преписује словне ликове изабране веб сајтовима оним које изабере корисник"
+
+#: ../midori/midori-view.c:1375
#, c-format
msgid "%s wants to save an HTML5 database."
-msgstr ""
+msgstr "%s жели да сачува ХТМЛ5 базу податдака."
-#: ../midori/midori-view.c:1378 ../midori/midori-view.c:1408
+#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413
msgid "_Deny"
-msgstr ""
+msgstr "_Одбиј"
-#: ../midori/midori-view.c:1378 ../midori/midori-view.c:1408
+#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413
msgid "_Allow"
-msgstr ""
+msgstr "_Допусти"
-#: ../midori/midori-view.c:1404
+#: ../midori/midori-view.c:1408
#, c-format
msgid "%s wants to know your location."
-msgstr ""
+msgstr "%s жели да зна ваше место."
-#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly,
-#. so reloading via Javascript works but not via API calls.
-#. Error pages are special, we want to try loading the destination
-#. again, not the error page which isn't even a proper page
-#: ../midori/midori-view.c:1519 ../midori/midori-view.c:5161
-#: ../midori/midori-view.c:5165
-#, fuzzy, c-format
+#: ../midori/midori-view.c:1502
+#, c-format
msgid "Error - %s"
-msgstr "Грешка"
+msgstr "Грешка — %s"
-#: ../midori/midori-view.c:1520
+#: ../midori/midori-view.c:1503
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Не могу да учитам страницу „%s“."
-#: ../midori/midori-view.c:1522
+#: ../midori/midori-view.c:1505
msgid "Try again"
msgstr "Покушај поново"
-#. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:1540
+#: ../midori/midori-view.c:1703 ../midori/midori-view.c:2625
#, c-format
-msgid "Not found - %s"
-msgstr "Није пронађено - %s"
-
-#: ../midori/midori-view.c:1730 ../midori/midori-view.c:2674
-#, fuzzy, c-format
msgid "Send a message to %s"
-msgstr "Снимак је сачуван у: %s\n"
+msgstr "Пошаљи поруку %s"
-#: ../midori/midori-view.c:2465 ../midori/midori-view.c:2841
+#: ../midori/midori-view.c:2455 ../midori/midori-view.c:2781
msgid "Inspect _Element"
-msgstr ""
+msgstr "Провери _елемент"
-#: ../midori/midori-view.c:2517 ../midori/midori-view.c:2577
+#: ../midori/midori-view.c:2507
msgid "Open Link in New _Tab"
msgstr "Отвори везу у новом _листу"
-#: ../midori/midori-view.c:2521
-#, fuzzy
+#: ../midori/midori-view.c:2511
msgid "Open Link in _Foreground Tab"
-msgstr "Отвори везу у новом _листу"
+msgstr "Отвори везу у про_челном листу"
-#: ../midori/midori-view.c:2522
-#, fuzzy
+#: ../midori/midori-view.c:2512
msgid "Open Link in _Background Tab"
-msgstr "Отвори везу у новом _листу"
+msgstr "Отвори везу у по_задинском листу"
-#: ../midori/midori-view.c:2525 ../midori/midori-view.c:2584
+#: ../midori/midori-view.c:2515
msgid "Open Link in New _Window"
msgstr "Отвори везу у _новом прозору"
-#: ../midori/midori-view.c:2528
-#, fuzzy
+#: ../midori/midori-view.c:2518
msgid "Open Link as Web A_pplication"
-msgstr "Покреће АДРЕСУ као веб програм"
+msgstr "Отвори везу као веб _програм"
-#: ../midori/midori-view.c:2531
-#, fuzzy
+#: ../midori/midori-view.c:2523
msgid "Copy Link de_stination"
-msgstr "Сачувај ци_љну датотеку"
+msgstr "Умножи _одредиште везе"
# bug: no plural-forms
-#: ../midori/midori-view.c:2543
-#, fuzzy
+#: ../midori/midori-view.c:2539
msgid "Open _Image in New Tab"
-msgstr "Отвору у новом _листу"
+msgstr "Отвори слику у _новом листу"
-#: ../midori/midori-view.c:2546
+#: ../midori/midori-view.c:2542
msgid "Copy Image _Address"
-msgstr ""
+msgstr "Умножи _адресу слике"
-#: ../midori/midori-view.c:2549
+#: ../midori/midori-view.c:2545
msgid "Save I_mage"
-msgstr ""
+msgstr "Сачувај _слику"
-#: ../midori/midori-view.c:2556
+# bug: no plural-forms
+#: ../midori/midori-view.c:2548
+msgid "Open in Image _Viewer"
+msgstr "Отвори у _прегледнику слика"
+
+#: ../midori/midori-view.c:2555
msgid "Copy Video _Address"
-msgstr ""
+msgstr "Умножи _адресу снимка"
-#: ../midori/midori-view.c:2559
-#, fuzzy
+#: ../midori/midori-view.c:2558
msgid "Save _Video"
-msgstr "Сачувај датотеку као"
+msgstr "Сачувај _снимак"
-#: ../midori/midori-view.c:2559
-#, fuzzy
+#: ../midori/midori-view.c:2558
msgid "Download _Video"
-msgstr "Фасцикла за преузето"
+msgstr "Преузми _снимак"
-#: ../midori/midori-view.c:2619
+#: ../midori/midori-view.c:2584
msgid "Search _with"
msgstr "Пре_тражи са"
-#: ../midori/midori-view.c:2654 ../midori/midori-view.c:2661
+#: ../midori/midori-view.c:2616
msgid "_Search the Web"
msgstr "П_ретражи Интернет"
# bug: no plural-forms
-#: ../midori/midori-view.c:2682
+#: ../midori/midori-view.c:2633
msgid "Open Address in New _Tab"
msgstr "Отвору адресу у новом _листу"
-#: ../midori/midori-view.c:2990
-msgid "Open or download file"
-msgstr "Отвори или преузми датотеку"
+# bug: no plural-forms
+#: ../midori/midori-view.c:2686
+msgid "Open _Frame in New Tab"
+msgstr "Отвори кадар у новом _листу"
-#: ../midori/midori-view.c:3009
+#: ../midori/midori-view.c:2943
+msgid "Open or download file"
+msgstr "Отворите или преузмите датотеку"
+
+#: ../midori/midori-view.c:2968
+#, c-format
+msgid "File Name: %s"
+msgstr "Назив датотеке: „%s“"
+
+#: ../midori/midori-view.c:2973
#, c-format
msgid "File Type: '%s'"
msgstr "Врста датотеке: „%s“"
-#: ../midori/midori-view.c:3011
+#: ../midori/midori-view.c:2975
#, c-format
msgid "File Type: %s ('%s')"
msgstr "Врста датотеке: %s („%s“)"
-#: ../midori/midori-view.c:3026
-msgid "MD5-Checksum:"
-msgstr ""
+#: ../midori/midori-view.c:3005
+#, c-format
+msgid "Size: %s"
+msgstr "Величина: %s"
-#: ../midori/midori-view.c:3033
-msgid "SHA1-Checksum:"
-msgstr ""
-
-#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:3043
+#: ../midori/midori-view.c:3017
#, c-format
msgid "Open %s"
-msgstr "Отвори %s"
+msgstr "Отворите %s"
-#: ../midori/midori-view.c:3646
+#: ../midori/midori-view.c:3640
#, c-format
msgid "Inspect page - %s"
-msgstr "Инспекција странице — %s"
+msgstr "Провера странице — %s"
-#: ../midori/midori-view.c:4130
-#, fuzzy
+#: ../midori/midori-view.c:3987
msgid "Speed Dial"
-msgstr "Додај у _брзе посете"
+msgstr "Брза посета"
-#: ../midori/midori-view.c:4131
+#: ../midori/midori-view.c:3988 ../midori/midori-view.c:4084
msgid "Click to add a shortcut"
-msgstr "Кликните за додавање пречице"
+msgstr "Кликните да додате пречицу"
-#: ../midori/midori-view.c:4132
+#: ../midori/midori-view.c:3989
msgid "Enter shortcut address"
msgstr "Унесите адресу за пречицу"
-#: ../midori/midori-view.c:4133
+#: ../midori/midori-view.c:3990
msgid "Enter shortcut title"
msgstr "Унесите наслов за пречицу"
-#: ../midori/midori-view.c:4134
+#: ../midori/midori-view.c:3991
msgid "Are you sure you want to delete this shortcut?"
msgstr "Да ли заиста желите да обришете ову пречицу?"
-#: ../midori/midori-view.c:4135
-msgid "Set number of columns and rows"
-msgstr ""
-
-#: ../midori/midori-view.c:4136
-msgid "Enter number of columns and rows:"
-msgstr ""
-
-#: ../midori/midori-view.c:4137
-msgid "Invalid input for the size of the speed dial"
-msgstr ""
-
-#: ../midori/midori-view.c:4138
-msgid "Thumb size:"
-msgstr ""
-
-#: ../midori/midori-view.c:4139
-msgid "Small"
-msgstr ""
-
-#: ../midori/midori-view.c:4140
-msgid "Medium"
-msgstr ""
-
-#: ../midori/midori-view.c:4141
-msgid "Big"
-msgstr ""
-
-#: ../midori/midori-view.c:4177
-#, c-format
-msgid "Document cannot be displayed"
-msgstr "Не могу да прикажем докумант"
-
-#: ../midori/midori-view.c:4200
+#: ../midori/midori-view.c:4153
#, c-format
msgid "No documentation installed"
msgstr "Није инсталирана помоћ"
-#: ../midori/midori-view.c:4269
+#: ../midori/midori-view.c:4229
+msgid "Midori doesn't store any personal data:"
+msgstr "Мидори не чува никакве личне податке:"
+
+#: ../midori/midori-view.c:4230
+msgid "No history or web cookies are being saved."
+msgstr "Нису сачувани ни историјат ни веб колачићи."
+
+#: ../midori/midori-view.c:4231
+msgid "Extensions are disabled."
+msgstr "Проширења су искључена."
+
+#: ../midori/midori-view.c:4232
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr ""
+"ХТМЛ5 скалдиштење, месна база података и причувавања програма су искључена."
+
+#: ../midori/midori-view.c:4233
+msgid "Midori prevents websites from tracking the user:"
+msgstr "Мидори спречава веб сајтове да прате корисника:"
+
+#: ../midori/midori-view.c:4234
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr "Адресе преусмеривача су отцепљене на назив домаћина."
+
+#: ../midori/midori-view.c:4235
+msgid "DNS prefetching is disabled."
+msgstr "ДНС довлачење је искључено."
+
+#: ../midori/midori-view.c:4236
+msgid "The language and timezone are not revealed to websites."
+msgstr "Језик и временска зона нису откривени веб сајтовима."
+
+#: ../midori/midori-view.c:4237
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr "Веб сајтови не могу да ислистају Флеш или друге Нетскејп прикључке."
+
+#: ../midori/midori-view.c:4307
msgid "Version numbers in brackets show the version used at runtime."
msgstr ""
+"Бројеви издања у заградама приказују издање коришћено за време покретања."
-#: ../midori/midori-view.c:4319
+#: ../midori/midori-view.c:4357
msgid "Page loading delayed"
-msgstr ""
+msgstr "Учитавање странице је одложено"
-#: ../midori/midori-view.c:4320
+#: ../midori/midori-view.c:4358
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
+"Учитавање је одложено или због недавног пада програма или због поставки "
+"покретања."
-#: ../midori/midori-view.c:4321
+#: ../midori/midori-view.c:4359
msgid "Load Page"
-msgstr ""
+msgstr "Учитај страницу"
-#: ../midori/midori-view.c:4462
+#: ../midori/midori-view.c:4525
msgid "Blank page"
-msgstr "Празна страна"
+msgstr "Празна страница"
-#: ../midori/midori-view.c:4702
+#: ../midori/midori-view.c:4787
msgid "_Duplicate Tab"
-msgstr ""
+msgstr "_Удвостручи лист"
-#: ../midori/midori-view.c:4707
-#, fuzzy
+#: ../midori/midori-view.c:4792
msgid "Show Tab _Label"
-msgstr "Прикажи бочну површ"
+msgstr "Прикажи _натпис листа"
-#: ../midori/midori-view.c:4707
+#: ../midori/midori-view.c:4792
msgid "Show Tab _Icon Only"
-msgstr ""
+msgstr "Прикажи само _иконицу листа"
-#: ../midori/midori-view.c:4713
-#, fuzzy
+#: ../midori/midori-view.c:4798
msgid "Close ot_her Tabs"
-msgstr "Затвара овај лист"
+msgstr "Затвори _друге листове"
-#: ../midori/midori-view.c:5348
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:5613
+msgid "previous"
+msgstr "Претходно"
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:5632
+msgid "next"
+msgstr "Следеће"
+
+#: ../midori/midori-view.c:5645
msgid "Print background images"
msgstr "Прикажи позадинске слике"
-#: ../midori/midori-view.c:5349
+#: ../midori/midori-view.c:5646
msgid "Whether background images should be printed"
msgstr "Одређује да ли треба приказати слике за позадину"
-#: ../midori/midori-view.c:5385
+#: ../midori/midori-view.c:5678
msgid "Features"
msgstr "Могућности"
-#. Page "General"
-#: ../midori/midori-preferences.c:302
+#: ../midori/midori-preferences.c:298
msgid "Startup"
msgstr "Покретање"
-#: ../midori/midori-preferences.c:318 ../midori/midori-preferences.c:325
+#: ../midori/midori-preferences.c:311
+msgid "Use _current page"
+msgstr "Користи _тренутну страницу"
+
+#: ../midori/midori-preferences.c:315
msgid "Use current page as homepage"
-msgstr "Искористи тренутну страницу"
+msgstr "Искористи тренутну страницу као почетну"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:333
-msgid "Appearance"
-msgstr "Изглед"
+#: ../midori/midori-preferences.c:324
+msgid "Fonts"
+msgstr "Писма"
+
+#: ../midori/midori-preferences.c:327
+msgid "Proportional Font Family"
+msgstr "Породица сразмерног писма"
+
+#: ../midori/midori-preferences.c:331
+msgid "The default font family used to display text"
+msgstr "Основна породица писма за приказ текста"
+
+#: ../midori/midori-preferences.c:334
+msgid "The default font size used to display text"
+msgstr "Основна величина писма за приказ текста"
#: ../midori/midori-preferences.c:336
-msgid "Default Font Family"
-msgstr "Уобичајени фонтови"
-
-#: ../midori/midori-preferences.c:339
-msgid "The default font family used to display text"
-msgstr "Подразумевани фонтови за приказ текста"
-
-#: ../midori/midori-preferences.c:342
-msgid "The default font size used to display text"
-msgstr "Подразумевани величина фонтова за приказ текста"
-
-#: ../midori/midori-preferences.c:344
msgid "Fixed-width Font Family"
-msgstr "Фонтови задате ширине"
+msgstr "Породица писма сталне ширине"
-#: ../midori/midori-preferences.c:347
+#: ../midori/midori-preferences.c:340
msgid "The font family used to display fixed-width text"
-msgstr "Подразумевани фонтови задате ширине за приказ текста"
+msgstr "Породица писма за приказ текста сталне ширине"
-#: ../midori/midori-preferences.c:350
-#, fuzzy
+#: ../midori/midori-preferences.c:343
msgid "The font size used to display fixed-width text"
-msgstr "Подразумевани фонтови задате ширине за приказ текста"
+msgstr "Величина писма за приказ текста сталне ширине"
-#: ../midori/midori-preferences.c:352
+#: ../midori/midori-preferences.c:345
msgid "Minimum Font Size"
-msgstr "Најмања величина фонта"
+msgstr "Најмања величина писма"
-#: ../midori/midori-preferences.c:355
+#: ../midori/midori-preferences.c:349
msgid "The minimum font size used to display text"
-msgstr "најмања величина фонтова за приказ текста"
+msgstr "Најмања величина писма за приказ текста"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:364
+#: ../midori/midori-preferences.c:360
msgid "Behavior"
msgstr "Понашање"
-#: ../midori/midori-preferences.c:373
-msgid "Enforce 96 dots per inch"
-msgstr "Приморај 96 тачака по инчу"
-
-#: ../midori/midori-preferences.c:374
-msgid "Enforce a video dot density of 96 DPI"
-msgstr "Приморава густину тачака екрана од 96 ТПИ"
-
#: ../midori/midori-preferences.c:386
msgid "Allow scripts to open popups"
-msgstr ""
+msgstr "Омогући скриптама да отворе облачиће"
#: ../midori/midori-preferences.c:387
-#, fuzzy
msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr "Отвара искачуће прозоре у новим листовима"
+msgstr ""
+"Да ли ће скриптама бити допуштено да самостално отварају искачуће прозоре"
#. Page "Interface"
-#: ../midori/midori-preferences.c:412
+#: ../midori/midori-preferences.c:417
msgid "Browsing"
msgstr "Разгледање"
-#: ../midori/midori-preferences.c:440
-msgid "Applications"
-msgstr "Програми"
-
#. Page "Network"
-#: ../midori/midori-preferences.c:453
+#: ../midori/midori-preferences.c:457
msgid "Network"
msgstr "Мрежа"
-#: ../midori/midori-preferences.c:460
-#, fuzzy
+#: ../midori/midori-preferences.c:464
msgid "Hostname"
-msgstr "Корисничко име"
+msgstr "Домаћин"
-#: ../midori/midori-preferences.c:473
+#: ../midori/midori-preferences.c:488
msgid "MB"
-msgstr "МБ"
+msgstr "MB"
-#: ../midori/midori-searchaction.c:908
+#: ../midori/midori-searchaction.c:902
msgid "Add search engine"
-msgstr "Додај претраживач"
+msgstr "Додајте претраживач"
-#: ../midori/midori-searchaction.c:908
+#: ../midori/midori-searchaction.c:902
msgid "Edit search engine"
-msgstr "Уреди претрачивач"
+msgstr "Уреди претраживач"
-#: ../midori/midori-searchaction.c:937
+#: ../midori/midori-searchaction.c:931
msgid "_Name:"
-msgstr "_Име:"
+msgstr "_Назив:"
+
+#: ../midori/midori-searchaction.c:947
+msgid "_Description:"
+msgstr "_Опис:"
#: ../midori/midori-searchaction.c:981
msgid "_Icon:"
-msgstr "И_коница:"
+msgstr "_Иконица:"
#: ../midori/midori-searchaction.c:995
msgid "_Token:"
-msgstr "_Фраза:"
+msgstr "_Израз:"
#: ../midori/midori-searchaction.c:1295
msgid "Manage Search Engines"
@@ -2219,373 +2026,362 @@ msgstr "Подеси претраживаче"
#: ../midori/midori-searchaction.c:1395
msgid "Use as _default"
-msgstr "_Постави као подразумевани"
+msgstr "_Постави за основни"
-#: ../midori/sokoke.c:452
-#, fuzzy
+#: ../midori/sokoke.c:355
msgid "Open with"
-msgstr "Отвори датотеку"
+msgstr "Отвори програмом"
-#: ../midori/sokoke.c:460
+#: ../midori/sokoke.c:363
#, c-format
msgid "Choose an application or command to open \"%s\":"
-msgstr ""
+msgstr "Изаберите програм или наредбу којом ће бити отворено „%s“:"
-#: ../midori/sokoke.c:1509
-msgid "_Bookmark"
-msgstr "_Обележивач"
+#: ../midori/sokoke.c:404 ../midori/sokoke.c:414 ../midori/sokoke.c:442
+#: ../midori/sokoke.c:471 ../midori/sokoke.c:485
+msgid "Could not run external program."
+msgstr "Не могу да покренем спољни програм."
-#: ../midori/sokoke.c:1511
-#, fuzzy
-msgid "Add Boo_kmark"
-msgstr "_Додај обележивач"
-
-#: ../midori/sokoke.c:1512
-msgid "_Console"
-msgstr "_Конзола"
-
-#: ../midori/sokoke.c:1513
-msgid "_Extensions"
-msgstr "П_роширења"
-
-#: ../midori/sokoke.c:1515
-msgid "_Homepage"
-msgstr "На по_четну страницу"
-
-#: ../midori/sokoke.c:1516
-msgid "_Userscripts"
-msgstr "Личне _скрипте"
-
-#: ../midori/sokoke.c:1517
-msgid "New _Tab"
-msgstr "Нови _лист"
-
-#: ../midori/sokoke.c:1518
-msgid "_Transfers"
-msgstr "Пр_еноиси"
-
-#: ../midori/sokoke.c:1519
-msgid "Netscape p_lugins"
-msgstr "Netscape _додаци"
-
-#: ../midori/sokoke.c:1522
-#, fuzzy
-msgid "New _Folder"
-msgstr "Нова фасцикла"
-
-#: ../midori/sokoke.c:2262
+#: ../midori/sokoke.c:1538
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d сат"
+msgstr[1] "%d сата"
+msgstr[2] "%d сати"
-#: ../midori/sokoke.c:2263
+#: ../midori/sokoke.c:1539
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d минут"
+msgstr[1] "%d минута"
+msgstr[2] "%d минута"
-#: ../midori/sokoke.c:2264
+#: ../midori/sokoke.c:1540
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d секунда"
+msgstr[1] "%d секунде"
+msgstr[2] "%d секунди"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:2272 ../panels/midori-transfers.c:273
+#: ../midori/sokoke.c:1548 ../panels/midori-transfers.c:269
#, c-format
msgid "%s of %s"
msgstr "%s од %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:2281
+#: ../midori/sokoke.c:1557
msgid "?B"
-msgstr ""
+msgstr "?B"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:2284
+#: ../midori/sokoke.c:1560
#, c-format
msgid " (%s/s)"
-msgstr ""
+msgstr " (%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:2301
+#: ../midori/sokoke.c:1577
#, c-format
msgid " - %s remaining"
-msgstr ""
+msgstr " — преостало време: %s"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:231
+#: ../toolbars/midori-findbar.c:291
msgid "_Inline Find:"
-msgstr "_Тражи израз:"
+msgstr "_Потражите израз:"
-#: ../toolbars/midori-findbar.c:265
+#: ../toolbars/midori-findbar.c:317
msgid "Previous"
msgstr "Претходно"
-#: ../toolbars/midori-findbar.c:271
+#: ../toolbars/midori-findbar.c:323
msgid "Next"
msgstr "Следеће"
-#: ../toolbars/midori-findbar.c:275
+#: ../toolbars/midori-findbar.c:327
msgid "Match Case"
msgstr "Упореди велчину слова"
-#: ../toolbars/midori-findbar.c:284
+#: ../toolbars/midori-findbar.c:336
msgid "Highlight Matches"
-msgstr "Истакни нађено"
+msgstr "Истакни пронађено"
-#: ../toolbars/midori-findbar.c:295
+#: ../toolbars/midori-findbar.c:347
msgid "Close Findbar"
-msgstr "Затвара траку за претрагу странице"
+msgstr "Затворите траку за претрагу"
-#: ../toolbars/midori-transferbar.c:132
-#, fuzzy, c-format
+#: ../toolbars/midori-transferbar.c:122
+#, c-format
msgid "The file '%s ' has been downloaded."
-msgstr "Датотека %s је преузета."
+msgstr "Датотека „%s “ је преузета."
-#: ../toolbars/midori-transferbar.c:135
+#: ../toolbars/midori-transferbar.c:125
msgid "Transfer completed"
-msgstr "Преузимање је завршено"
+msgstr "Пренос је завршен"
-#: ../toolbars/midori-transferbar.c:217
-#, fuzzy
+#: ../toolbars/midori-transferbar.c:193
msgid "The downloaded file is erroneous."
-msgstr "Фасцикле у коју се смештају преузете датотеке"
+msgstr "Преузета датотека је погрешна."
-#: ../toolbars/midori-transferbar.c:218
-msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards."
+#: ../toolbars/midori-transferbar.c:194
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
msgstr ""
+"Сума за проверу обезбеђена везом не одговара. Ово значи да је датотека "
+"вероватно непотпуна или да је касније измењена."
-#: ../toolbars/midori-transferbar.c:327 ../panels/midori-transfers.c:144
-#, fuzzy
+#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:142
msgid "Clear All"
-msgstr "Сакупи све"
+msgstr "Очисти све"
-#: ../toolbars/midori-transferbar.c:370 ../toolbars/midori-transferbar.c:372
-#, fuzzy
+#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
msgid "Some files are being downloaded"
-msgstr "Датотека %s је преузета."
+msgstr "Неке датотеке су преузете"
-#: ../toolbars/midori-transferbar.c:376
-#, fuzzy
+#: ../toolbars/midori-transferbar.c:377
msgid "_Quit Midori"
-msgstr "Мидори"
+msgstr "_Напусти Мидори"
-#: ../toolbars/midori-transferbar.c:378
+#: ../toolbars/midori-transferbar.c:379
msgid "The transfers will be cancelled if Midori quits."
-msgstr ""
+msgstr "Преноси ће бити отказани ако затворите Мидори."
-#: ../panels/midori-bookmarks.c:116
+#: ../panels/midori-bookmarks.c:114
msgid "Bookmarks"
msgstr "Обележивачи"
-#: ../panels/midori-bookmarks.c:282
-#, fuzzy, c-format
+#: ../panels/midori-bookmarks.c:257
+#, c-format
msgid "Failed to add bookmark item: %s\n"
-msgstr "Не могу да додам ставку у историјат: %s\n"
+msgstr "Нисам успео да додам ставку обележивача: %s\n"
-#: ../panels/midori-bookmarks.c:462
+#: ../panels/midori-bookmarks.c:435
msgid "Edit the selected bookmark"
-msgstr "Уреди изабрани обележивач"
+msgstr "Уредите изабрани обележивач"
-#: ../panels/midori-bookmarks.c:470
+#: ../panels/midori-bookmarks.c:443
msgid "Delete the selected bookmark"
-msgstr "Уклони изабрани обележивач"
+msgstr "Уклоните изабрани обележивач"
-#: ../panels/midori-bookmarks.c:485
+#: ../panels/midori-bookmarks.c:458
msgid "Add a new folder"
-msgstr "Додај нову фасциклу"
+msgstr "Додајте нову фасциклу"
-#: ../panels/midori-bookmarks.c:619 ../panels/midori-history.c:576
+#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635
msgid "Separator "
msgstr "Раздвајач "
-#: ../panels/midori-history.c:114
+#: ../panels/midori-history.c:111
msgid "History"
msgstr "Историјат"
-#: ../panels/midori-history.c:146
-msgid "A week ago"
-msgstr "Пре недељу дана"
-
-#: ../panels/midori-history.c:148
-#, fuzzy, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Пре %d дан"
-msgstr[1] "Пре %d дан"
-msgstr[2] "Пре %d дан"
-
-#: ../panels/midori-history.c:151
+#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
msgid "Today"
msgstr "Данас"
-#: ../panels/midori-history.c:153
+#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
msgid "Yesterday"
msgstr "Јуче"
-#: ../panels/midori-history.c:315
+#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Пре %d дан"
+msgstr[1] "Пре %d дана"
+msgstr[2] "Пре %d дана"
+
+#: ../panels/midori-history.c:165 ../panels/midori-history.c:184
+msgid "A week ago"
+msgstr "Пре недељу дана"
+
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "Не могу да уклоним ставку историјата: %s\n"
+
+#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "Да ли заиста желите да уклоните све ставке из историјата?"
-#: ../panels/midori-history.c:360
+#: ../panels/midori-history.c:407
msgid "Bookmark the selected history item"
-msgstr "Постави изабрани из историјата у обележиваче"
+msgstr "Обележите изабрану ставку историјата"
-#: ../panels/midori-history.c:369
+#: ../panels/midori-history.c:416
msgid "Delete the selected history item"
-msgstr "Уклони изабрану ставку из историјата"
+msgstr "Уклоните изабрану ставку из историјата"
-#: ../panels/midori-history.c:377
+#: ../panels/midori-history.c:424
msgid "Clear the entire history"
-msgstr "Очисти историјат"
+msgstr "Очистите сав историјат"
#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Преноси"
-#: ../panels/midori-transfers.c:481
-#, fuzzy
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
-msgstr "Питај за одредишну фасциклу"
+msgstr "Отвори одредишну _фасциклу"
-#: ../panels/midori-transfers.c:484
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
-msgstr ""
+msgstr "_Умножи место везе"
-#: ../katze/katze-http-auth.c:213
+#: ../katze/katze-http-auth.c:210
msgid "Authentication Required"
msgstr "Потребна је пријава"
-#: ../katze/katze-http-auth.c:229
+#: ../katze/katze-http-auth.c:226
msgid ""
"A username and a password are required\n"
"to open this location:"
msgstr ""
-"Потребно су корисничко име и лозинка за\n"
+"Потребно је корисничко име и лозинка за\n"
"отварање ове странице:"
-#: ../katze/katze-http-auth.c:243
+#: ../katze/katze-http-auth.c:240
msgid "Username"
msgstr "Корисничко име"
-#: ../katze/katze-http-auth.c:256
+#: ../katze/katze-http-auth.c:253
msgid "Password"
msgstr "Лозинка"
-#: ../katze/katze-http-auth.c:270
-#, fuzzy
+#: ../katze/katze-http-auth.c:267
msgid "_Remember password"
-msgstr "Запамти величину прозора"
+msgstr "_Запамти лозинку"
-#: ../katze/katze-throbber.c:879
-#, fuzzy, c-format
+#: ../katze/katze-throbber.c:949
+#, c-format
msgid "Named icon '%s' couldn't be loaded"
-msgstr "Не могу да именовану учитам иконицу „%s“"
+msgstr "Именована иконица „%s“ не може бити учитана"
-#: ../katze/katze-throbber.c:892
-#, fuzzy, c-format
+#: ../katze/katze-throbber.c:962
+#, c-format
msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Не могу да учитам сток иконицу „%s“"
+msgstr "Стек иконица „%s“ не може бити учитана"
-#: ../katze/katze-throbber.c:964
+#: ../katze/katze-throbber.c:1042
msgid "Animation frames are broken"
msgstr "Оквири са анимацијама су неисправни"
-#: ../katze/katze-utils.c:510 ../katze/katze-utils.c:918
+#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
#, c-format
msgid "Property '%s' is invalid for %s"
-msgstr "Вредност „%s“ није исправна за %s"
+msgstr "Вредност „%s“ није исправна за %s"
-#: ../katze/katze-utils.c:556 ../katze/katze-utils.c:585
+#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
#: ../extensions/addons.c:308
msgid "Choose file"
msgstr "Изаберите датотеку"
-#: ../katze/katze-utils.c:571
+#: ../katze/katze-utils.c:506
msgid "Choose folder"
msgstr "Изаберите фасциклу"
-#: ../katze/katze-preferences.c:95
+#: ../katze/katze-utils.c:610
+msgid "None"
+msgstr "Ништа"
+
+#: ../katze/katze-utils.c:725
+msgid "1 hour"
+msgstr "1 сата"
+
+#: ../katze/katze-utils.c:726
+msgid "1 day"
+msgstr "1 дана"
+
+#: ../katze/katze-utils.c:727
+msgid "1 week"
+msgstr "1 недеље"
+
+#: ../katze/katze-utils.c:728
+msgid "1 month"
+msgstr "1 месеца"
+
+#: ../katze/katze-utils.c:729
+msgid "1 year"
+msgstr "1 године"
+
+#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Поставке за %s"
-#: ../extensions/adblock.c:415
+#: ../extensions/adblock.c:473
msgid "Configure Advertisement filters"
-msgstr ""
+msgstr "Подесите пропуснике реклама"
-#: ../extensions/adblock.c:447
+#: ../extensions/adblock.c:504
#, c-format
-msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s."
+msgid ""
+"Type the address of a preconfigured filter list in the text entry and click "
+"\"Add\" to add it to the list. You can find more lists at %s."
msgstr ""
+"Упишите адресу претподешеног списка филтера у поље за унос текста и кликните "
+"„Додај“ да га додате на списак. Више спискова можете да пронађете на %s."
-#: ../extensions/adblock.c:587
-msgid "Configure _Advertisement filters..."
-msgstr ""
-
-#: ../extensions/adblock.c:847
-#, fuzzy
+#: ../extensions/adblock.c:882
msgid "Edit rule"
-msgstr "Уреди фасциклу"
+msgstr "Измени правило"
-#: ../extensions/adblock.c:860
-#, fuzzy
+#: ../extensions/adblock.c:896
msgid "_Rule:"
-msgstr "_Наслов:"
+msgstr "_Правило:"
-#: ../extensions/adblock.c:914
-#, fuzzy
+#: ../extensions/adblock.c:950
msgid "Bl_ock image"
-msgstr "Празна страна"
+msgstr "Блокирај _слику"
-#: ../extensions/adblock.c:919
+#: ../extensions/adblock.c:955
msgid "Bl_ock link"
-msgstr ""
+msgstr "Блокирај _везу"
-#: ../extensions/adblock.c:1498
+#: ../extensions/adblock.c:1670
msgid "Advertisement blocker"
-msgstr ""
+msgstr "Зауставник реклама"
-#: ../extensions/adblock.c:1499
+#: ../extensions/adblock.c:1671
msgid "Block advertisements according to a filter list"
-msgstr ""
+msgstr "Блокира рекламе у складу са списком пропусника"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:218
+#: ../extensions/addons.c:221
msgid "This page appears to contain a user script. Do you wish to install it?"
msgstr ""
+"Ова страница изгледа да садржи корисничку скрипту. Да ли желите да је "
+"инсталирате?"
-#: ../extensions/addons.c:219
-#, fuzzy
+#: ../extensions/addons.c:222
msgid "_Install user script"
-msgstr "Укључи скрипте"
+msgstr "_Инсталирај корисничку скрипту"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:224
+#: ../extensions/addons.c:227
msgid "This page appears to contain a user style. Do you wish to install it?"
msgstr ""
+"Ова страница изгледа да садржи кориснички стил. Да ли желите да га "
+"инсталирате?"
-#: ../extensions/addons.c:225
+#: ../extensions/addons.c:228
msgid "_Install user style"
-msgstr ""
+msgstr "_Инсталирај кориснички стил"
-#: ../extensions/addons.c:233
+#: ../extensions/addons.c:236
msgid "Don't install"
-msgstr ""
+msgstr "Немој инсталирати"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:687
msgid "Userscripts"
msgstr "Личне скрипте"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:689
msgid "Userstyles"
msgstr "Лични стилови"
@@ -2595,56 +2391,51 @@ msgid "Error"
msgstr "Грешка"
#: ../extensions/addons.c:421
-#, fuzzy, c-format
+#, c-format
msgid "Do you want to delete '%s'?"
-msgstr "Да ли желите да обришете све колачиће"
+msgstr "Да ли желите да обришете „%s“?"
#: ../extensions/addons.c:427
-#, fuzzy
msgid "Delete user script"
-msgstr "Личне скрипте"
+msgstr "Обриши корисничку скрипту"
#: ../extensions/addons.c:428
-#, fuzzy
msgid "Delete user style"
-msgstr "Обричи довод"
+msgstr "Обриши кориснички стил"
#: ../extensions/addons.c:431
-#, fuzzy, c-format
+#, c-format
msgid "The file %s will be permanently deleted."
-msgstr "Датотека %s је преузета."
+msgstr "Датотека %s ће бити неповратно обрисана."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
-#, fuzzy
+#: ../extensions/addons.c:576 ../extensions/addons.c:653
msgid "Open in Text Editor"
-msgstr "Уређивач текста"
+msgstr "Отворите у уређивачу текста"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
-#, fuzzy
+#: ../extensions/addons.c:578 ../extensions/addons.c:662
msgid "Open Target Folder"
-msgstr "Отвори датотеку"
+msgstr "Отворите циљну фасциклу"
-#: ../extensions/addons.c:638
-#, fuzzy
+#: ../extensions/addons.c:644
msgid "Add new addon"
-msgstr "Додај нови довод"
+msgstr "Додајте нови додатак"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:670
msgid "Remove selected addon"
-msgstr ""
+msgstr "Уклоните изабрани додатак"
-#: ../extensions/addons.c:1637 ../extensions/addons.c:1799
+#: ../extensions/addons.c:1699 ../extensions/addons.c:1917
msgid "User addons"
-msgstr ""
+msgstr "Кориснички додаци"
-#: ../extensions/addons.c:1758
+#: ../extensions/addons.c:1829
#, c-format
msgid "Can't monitor folder '%s': %s"
-msgstr ""
+msgstr "Не могу да надгледам фасциклу „%s“: %s"
-#: ../extensions/addons.c:1800
+#: ../extensions/addons.c:1918
msgid "Support for userscripts and userstyles"
-msgstr ""
+msgstr "Подршка за корисничке скрипте и корисничке стилове"
#: ../extensions/colorful-tabs.c:201
msgid "Colorful Tabs"
@@ -2652,46 +2443,50 @@ msgstr "Листови у боји"
#: ../extensions/colorful-tabs.c:202
msgid "Tint each tab distinctly"
-msgstr "Боји сваку картицу другачије"
+msgstr "Обојите сваки лист другачије"
-#: ../extensions/cookie-manager/cookie-manager-page.c:82
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
#: ../extensions/cookie-manager/main.c:35
msgid "Cookie Manager"
msgstr "Управник колачићима"
-#: ../extensions/cookie-manager/cookie-manager-page.c:112
+#: ../extensions/cookie-manager/cookie-manager-page.c:103
msgid "Delete All"
-msgstr "Обриши _све"
+msgstr "Обриши све"
-#: ../extensions/cookie-manager/cookie-manager-page.c:114
-msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter."
-msgstr "Брише све приказане колачиће. Уколико је постављен филтер обрисаће само колачиће који се поклапају са филтером."
+#: ../extensions/cookie-manager/cookie-manager-page.c:105
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"Обришите све приказане колачиће. Уколико је постављен филтер, биће обрисани "
+"само колачићи који се поклапају са филтером."
-#: ../extensions/cookie-manager/cookie-manager-page.c:129
+#: ../extensions/cookie-manager/cookie-manager-page.c:120
msgid "Expand All"
msgstr "Прошири све"
-#: ../extensions/cookie-manager/cookie-manager-page.c:136
+#: ../extensions/cookie-manager/cookie-manager-page.c:127
msgid "Collapse All"
msgstr "Сакупи све"
-#: ../extensions/cookie-manager/cookie-manager-page.c:578
+#: ../extensions/cookie-manager/cookie-manager-page.c:572
msgid "Do you really want to delete all cookies?"
-msgstr "Да ли желите да обришете све колачиће"
+msgstr "Да ли желите да обришете све колачиће?"
-#: ../extensions/cookie-manager/cookie-manager-page.c:580
+#: ../extensions/cookie-manager/cookie-manager-page.c:574
msgid "Question"
msgstr "Питање"
-#: ../extensions/cookie-manager/cookie-manager-page.c:589
+#: ../extensions/cookie-manager/cookie-manager-page.c:583
msgid "Only cookies which match the filter will be deleted."
msgstr "Биће обрисани само колачићи који се поклапају са задатим филтером."
-#: ../extensions/cookie-manager/cookie-manager-page.c:677
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
msgid "At the end of the session"
msgstr "На крају сесије"
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
+#: ../extensions/cookie-manager/cookie-manager-page.c:674
#, c-format
msgid ""
"Host : %s\n"
@@ -2702,101 +2497,106 @@ msgid ""
"Expires : %s"
msgstr ""
"Домаћин : %s\n"
-"Име : %s\n"
+"Назив : %s\n"
"Вредност : %s\n"
"Путања : %s\n"
"Сигурност : %s\n"
"Истиче : %s"
-#: ../extensions/cookie-manager/cookie-manager-page.c:686
+#: ../extensions/cookie-manager/cookie-manager-page.c:680
msgid "Yes"
msgstr "Да"
-#: ../extensions/cookie-manager/cookie-manager-page.c:686
+#: ../extensions/cookie-manager/cookie-manager-page.c:680
msgid "No"
msgstr "Не"
-#: ../extensions/cookie-manager/cookie-manager-page.c:700
+#: ../extensions/cookie-manager/cookie-manager-page.c:694
#, c-format
msgid ""
"Domain : %s\n"
"Cookies : %d"
msgstr ""
+"Домен : %s\n"
+"Колачићи : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1030
+#: ../extensions/cookie-manager/cookie-manager-page.c:1024
msgid "Name"
-msgstr "Име"
+msgstr "Назив"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1083
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Expand All"
msgstr "_Прошири све"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1091
+#: ../extensions/cookie-manager/cookie-manager-page.c:1085
msgid "_Collapse All"
msgstr "_Сакупи све"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
+#: ../extensions/cookie-manager/cookie-manager-page.c:1139
msgid "Filter:"
msgstr "Филтер:"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1149
-msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter"
-msgstr "Унесите реч за филтрирање колачића чији се називи или адресе поклапају са филтером"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1144
+msgid ""
+"Enter a filter string to show only cookies whose name or domain field match "
+"the entered filter"
+msgstr ""
+"Унесите реч за филтрирање колачића чији се називи или адресе поклапају са "
+"филтером"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
msgstr "Исписује, уређује и уклања колачиће"
-#: ../extensions/copy-tabs.c:39
-#, fuzzy
+#: ../extensions/copy-tabs.c:38
msgid "Copy Tab _Addresses"
-msgstr "Адресе"
+msgstr "Умножи _адресе листова"
# bug: no plural-forms
-#: ../extensions/copy-tabs.c:96
-#, fuzzy
+#: ../extensions/copy-tabs.c:95
msgid "Copy Addresses of Tabs"
-msgstr "Отвору адресу у новом _листу"
+msgstr "Умножте адресе листова"
-#: ../extensions/copy-tabs.c:97
+#: ../extensions/copy-tabs.c:96
msgid "Copy the addresses of all tabs to the clipboard"
-msgstr ""
+msgstr "Умножите адресе свих листова у оставу"
#: ../extensions/feed-panel/feed-atom.c:209
msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr "Не могу да нађем потребни Атом „entry“ међу XML подацима."
+msgstr ""
+"Нисам успео да пронађем потребне Атом „entry“ елементе у ИксМЛ подацима."
#: ../extensions/feed-panel/feed-atom.c:315
msgid "Failed to find required Atom \"feed\" elements in XML data."
-msgstr "Не могу да нађем потребни Атом „fees“ међу XML подацима."
+msgstr "Нисам успео да пронађем потребне Атом „feed“ елементе у ИксМЛ подацима."
#. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:392
+#: ../extensions/feed-panel/feed-panel.c:387
#, c-format
msgctxt "Feed"
msgid "Last updated: %s."
-msgstr "Задњи пит ажуриран: %s."
+msgstr "Последње ажурирање: %s."
-#: ../extensions/feed-panel/feed-panel.c:658
+#: ../extensions/feed-panel/feed-panel.c:653
msgid "Feeds"
msgstr "Доводи"
-#: ../extensions/feed-panel/feed-panel.c:711
+#: ../extensions/feed-panel/feed-panel.c:706
msgid "Add new feed"
-msgstr "Додај нови довод"
+msgstr "Додајте нови довод"
-#: ../extensions/feed-panel/feed-panel.c:718
+#: ../extensions/feed-panel/feed-panel.c:713
msgid "Delete feed"
-msgstr "Обричи довод"
+msgstr "Обриши довод"
-#: ../extensions/feed-panel/feed-panel.c:800
+#: ../extensions/feed-panel/feed-panel.c:795
msgid "_Feeds"
msgstr "_Доводи"
#: ../extensions/feed-panel/feed-parse.c:195
#, c-format
msgid "Failed to find root element in feed XML data."
-msgstr "Не могу да нађем изворне податке међу XML подацима."
+msgstr "Не могу да нађем изворне податке међу ИксМЛ подацима."
#: ../extensions/feed-panel/feed-parse.c:235
#, c-format
@@ -2806,11 +2606,11 @@ msgstr "Није подржан формат довода."
#: ../extensions/feed-panel/feed-parse.c:265
#, c-format
msgid "Failed to parse XML feed: %s"
-msgstr "Не могу да обрадим XML довод: %s"
+msgstr "Не могу да обрадим ИксМЛ довод: %s"
#: ../extensions/feed-panel/feed-rss.c:46
msgid "Failed to find \"channel\" element in RSS XML data."
-msgstr "Не могу да нађем елемент „channel“ међу XML подацима."
+msgstr "Не могу да нађем елемент „channel“ међу РСС ИксМЛ подацима."
#: ../extensions/feed-panel/feed-rss.c:51
msgid "Unsupported RSS version found."
@@ -2818,11 +2618,11 @@ msgstr "Пронађено је неподржано издање вести."
#: ../extensions/feed-panel/feed-rss.c:148
msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr "Не могу да нађем потребни „item“ елемент вести међу XML подацима."
+msgstr "Не могу да нађем потребни „item“ елемент вести међу ИксМЛ подацима."
#: ../extensions/feed-panel/feed-rss.c:248
msgid "Failed to find required RSS \"channel\" elements in XML data."
-msgstr "Не могу да нађем потребни „channel“ елемент вести међу XML подацима."
+msgstr "Не могу да нађем потребни „channel“ елемент вести међу ИксМЛ подацима."
#: ../extensions/feed-panel/main.c:131
#, c-format
@@ -2832,7 +2632,7 @@ msgstr "Довод „%s“ већ постоји"
#: ../extensions/feed-panel/main.c:208
#, c-format
msgid "Error loading feed '%s'"
-msgstr "Грешка при учитавању додова „%s“"
+msgstr "Грешка учитавања додова „%s“"
#: ../extensions/feed-panel/main.c:518
msgid "Feed Panel"
@@ -2842,67 +2642,129 @@ msgstr "Површ са доводима"
msgid "Read Atom/ RSS feeds"
msgstr "Чита Атоме / доводе са вестима"
-#: ../extensions/formhistory.c:146
-#, fuzzy, c-format
+#: ../extensions/formhistory/formhistory.c:39
+#, c-format
msgid "Failed to add form value: %s\n"
-msgstr "Не могу да додам ставку у историјат: %s\n"
+msgstr "Нисам успео да додам вредност обрасца: %s\n"
-#: ../extensions/formhistory.c:458 ../extensions/formhistory.c:462
+#: ../extensions/formhistory/formhistory.c:95
+msgid "Form history"
+msgstr "Историјат образаца"
+
+#: ../extensions/formhistory/formhistory.c:112
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+"Потребна је главна лозинка\n"
+"за отварање базе лозинки"
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember password on this page?"
+msgstr "Да запамтим лозинку на овој страници?"
+
+#: ../extensions/formhistory/formhistory.c:299
+msgid "Remember"
+msgstr "Запамти"
+
+#: ../extensions/formhistory/formhistory.c:300
+msgid "Not now"
+msgstr "Не сада"
+
+#: ../extensions/formhistory/formhistory.c:301
+msgid "Never for this page"
+msgstr "Никада за ову страницу"
+
+#: ../extensions/formhistory/formhistory.c:437
+msgid "Toggle form history state"
+msgstr "Пребаци стање историјата обрасца"
+
+#: ../extensions/formhistory/formhistory.c:438
+msgid "Activate or deactivate form history for the current tab."
+msgstr "Укључите или искључите историјат обрасца за текући лист."
+
+#: ../extensions/formhistory/formhistory.c:549
+#: ../extensions/formhistory/formhistory.c:553
#, c-format
msgid "Failed to execute database statement: %s\n"
msgstr "Не могу да покренем тврдњу из базе података: %s\n"
-#: ../extensions/formhistory.c:520
-msgid "Stores history of entered form data"
-msgstr ""
+#: ../extensions/formhistory/formhistory.c:629
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr "Укључи историјат обрасца само путем пречице (Ктрл+Шифт+Ф) по листу"
-#: ../extensions/formhistory.c:524
-#, c-format
-msgid "Not available: %s"
-msgstr ""
-
-#: ../extensions/formhistory.c:525
-msgid "Resource files not installed"
-msgstr ""
-
-#: ../extensions/formhistory.c:531
+#: ../extensions/formhistory/formhistory.c:668
msgid "Form history filler"
-msgstr ""
+msgstr "Пропусник историјата обрасца"
-#. i18n: Data entered into web forms by the user
-#: ../extensions/formhistory.c:543
-#, fuzzy
-msgid "_Form History"
-msgstr "_Историјат"
+#: ../extensions/formhistory/formhistory.c:669
+msgid "Stores history of entered form data"
+msgstr "Складишти историјат унесених података обрасца"
-#: ../extensions/history-list.vala:149
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:225
+#: ../extensions/formhistory/formhistory-js-frontend.c:106
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr "Нисам успео да изаберем предлоге\n"
+
+#: ../extensions/history-list.vala:197
msgid "There are no unvisited tabs"
-msgstr ""
+msgstr "Нема непосећених листова"
-#: ../extensions/history-list.vala:249
+#: ../extensions/history-list.vala:235
+#, c-format
+msgid "History-List"
+msgstr "Списак историјата"
+
+#: ../extensions/history-list.vala:275
+msgid "Tab closing behavior"
+msgstr "Понашање затварања листа"
+
+#: ../extensions/history-list.vala:283
+msgid "Do nothing"
+msgstr "Не ради ништа"
+
+#: ../extensions/history-list.vala:289
+msgid "Switch to last viewed tab"
+msgstr "Пребаци на последњи виђени лист"
+
+#: ../extensions/history-list.vala:295
+msgid "Switch to newest tab"
+msgstr "Пребаци на најновији лист"
+
+#: ../extensions/history-list.vala:423
msgid "Next new Tab (History List)"
-msgstr ""
+msgstr "Следећи нови лист (списак историјата)"
-#: ../extensions/history-list.vala:250
+#: ../extensions/history-list.vala:424
msgid "Next new tab from history"
-msgstr ""
+msgstr "Следећи нови лист из историјата"
-#: ../extensions/history-list.vala:259
+#: ../extensions/history-list.vala:433
msgid "Previous new Tab (History List)"
-msgstr ""
+msgstr "Претходни нови лист (списак историјата)"
-#: ../extensions/history-list.vala:260
+#: ../extensions/history-list.vala:434
msgid "Previous new tab from history"
-msgstr ""
+msgstr "Претходни нови лист из историјата"
-#: ../extensions/history-list.vala:359
-#, fuzzy
+#: ../extensions/history-list.vala:443
+msgid "Display tab in background (History List)"
+msgstr "Прикажи лист у позадини (списак историјата)"
+
+#: ../extensions/history-list.vala:444
+msgid "Display the current selected tab in background"
+msgstr "Прикажи текући изабрани лист у позадини"
+
+#: ../extensions/history-list.vala:569
msgid "History List"
-msgstr "Историјат"
+msgstr "Списак историјата"
-#: ../extensions/history-list.vala:360
-msgid "Switch tabs with Ctrl+Tab sorted by last usage"
+#: ../extensions/history-list.vala:570
+msgid "Move to the last used tab when switching or closing tabs"
msgstr ""
+"Прелази на последње коришћени лист приликом пребацивања или затварања "
+"листова"
#: ../extensions/mouse-gestures.c:301
msgid "Mouse Gestures"
@@ -2912,119 +2774,340 @@ msgstr "Гестови миша"
msgid "Control Midori by moving the mouse"
msgstr "Управља Мидоријем помоћу миша"
-#: ../extensions/shortcuts.c:110
+#: ../extensions/shortcuts.c:109
msgid "Reload page or stop loading"
-msgstr ""
+msgstr "Поново учитај стараницу или заустави учитавање"
#: ../extensions/shortcuts.c:176
msgid "Customize Keyboard shortcuts"
-msgstr ""
+msgstr "Подеси пречице са тастатуре"
-#: ../extensions/shortcuts.c:282
-msgid "Customize Sh_ortcuts..."
-msgstr ""
-
-#: ../extensions/shortcuts.c:319
-msgid "Shortcuts"
-msgstr ""
+#: ../extensions/shortcuts.c:283
+msgid "Customize Sh_ortcuts…"
+msgstr "Подеси _пречице…"
#: ../extensions/shortcuts.c:320
+msgid "Shortcuts"
+msgstr "Пречице"
+
+#: ../extensions/shortcuts.c:321
msgid "View and edit keyboard shortcuts"
-msgstr ""
+msgstr "Приказује и уређује пречице тастатуре"
#: ../extensions/status-clock.c:174
-#, fuzzy
msgid "Statusbar Clock"
-msgstr "Трака са ста_њем"
+msgstr "Сат у траци стања"
#: ../extensions/status-clock.c:175
msgid "Display date and time in the statusbar"
-msgstr ""
+msgstr "Приказује датум и време у траци стања"
-#: ../extensions/statusbar-features.c:129
+#: ../extensions/statusbar-features.c:131
msgid "Images"
-msgstr ""
+msgstr "Слике"
-#: ../extensions/statusbar-features.c:138
-#, fuzzy
+#: ../extensions/statusbar-features.c:140
msgid "Scripts"
-msgstr "Личне скрипте"
+msgstr "Скрипте"
-#: ../extensions/statusbar-features.c:147
+#: ../extensions/statusbar-features.c:151
msgid "Netscape plugins"
-msgstr "Netscape додаци"
+msgstr "Нетскејп прикључци"
-#: ../extensions/statusbar-features.c:193
+#: ../extensions/statusbar-features.c:199
msgid "Statusbar Features"
-msgstr "Могућности линије са стањем"
+msgstr "Могућности траке стања"
-#: ../extensions/statusbar-features.c:194
+#: ../extensions/statusbar-features.c:200
msgid "Easily toggle features on web pages on and off"
msgstr "Једноставно укључује и искључује опције на веб страницама"
-#: ../extensions/tab-panel.c:597 ../extensions/tab-panel.c:684
-#, fuzzy
+#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
msgid "Tab Panel"
-msgstr "Прикажи бочну површ"
+msgstr "Бочна површ"
-#: ../extensions/tab-panel.c:667
-#, fuzzy
+#: ../extensions/tab-panel.c:663
msgid "T_ab Panel"
-msgstr "Прикажи бочну површ"
+msgstr "Бочна _површ"
-#: ../extensions/tab-panel.c:685
-#, fuzzy
+#: ../extensions/tab-panel.c:681
msgid "Show tabs in a vertical panel"
-msgstr "Приказује бочну површ"
+msgstr "Приказује листове у усправној површи"
+
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr "Само иконице на листовима по основи"
#: ../extensions/tabs-minimized.c:77
-msgid "Only Icons on Tabs by default"
-msgstr ""
-
-#: ../extensions/tabs-minimized.c:78
msgid "New tabs have no label by default"
-msgstr "Нове картице првобитно немају ознаку"
+msgstr "Нови листови немају ознаку по основи"
-#: ../extensions/toolbar-editor.c:391
-#, fuzzy
+#: ../extensions/toolbar-editor.c:393
msgid "Customize Toolbar"
-msgstr "Прилагођавање траке са алаткама"
+msgstr "Подеси траку алата"
-#: ../extensions/toolbar-editor.c:407
-msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop."
-msgstr "Изаберите ставке да буду приказане на траци са алаткама. Ставке могу бити аранжиране превлачењем и увацивањем."
+#: ../extensions/toolbar-editor.c:409
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"Изаберите ставке које ће бити приказане на траци алата. Ставкама може бити "
+"промењено место превлачењем и увацивањем."
-#: ../extensions/toolbar-editor.c:423
-#, fuzzy
+#: ../extensions/toolbar-editor.c:425
msgid "Available Items"
-msgstr "Доступно ставке"
+msgstr "Доступне ставке"
-#: ../extensions/toolbar-editor.c:444
-#, fuzzy
+#: ../extensions/toolbar-editor.c:446
msgid "Displayed Items"
msgstr "Приказане ставке"
-#: ../extensions/toolbar-editor.c:579
-#, fuzzy
-msgid "Customize _Toolbar..."
-msgstr "Произвољно..."
+#: ../extensions/toolbar-editor.c:581
+msgid "Customize _Toolbar…"
+msgstr "Подеси траку алата…"
-#: ../extensions/toolbar-editor.c:595
-#, fuzzy
-msgid "_Customize..."
-msgstr "Произвољно..."
+#: ../extensions/toolbar-editor.c:597
+msgid "_Customize…"
+msgstr "_Прилагоди…"
-#: ../extensions/toolbar-editor.c:625
+#: ../extensions/toolbar-editor.c:627
msgid "Toolbar Editor"
-msgstr ""
+msgstr "Уређивач траке алата"
-#: ../extensions/toolbar-editor.c:626
+#: ../extensions/toolbar-editor.c:628
msgid "Easily edit the toolbar layout"
-msgstr "Лако мењајте распоред траке са алаткама"
+msgstr "Лако мењајте распоред траке алата"
-#: ../extensions/web-cache.c:479
+#: ../extensions/web-cache.c:463
msgid "Cache HTTP communication on disk"
-msgstr ""
+msgstr "Причувај ХТТП објављивања на диск"
+
+#~ msgid "Lightweight web browser"
+#~ msgstr "Једноставан Интернет прегледник"
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "Не могу да сачувам обележиваче. %s"
+
+#~ msgid "days"
+#~ msgstr "дана"
+
+#~ msgid "Reset the last _session"
+#~ msgstr "Врати последњу сесију"
+
+#~ msgid "No filename specified"
+#~ msgstr "Није изабрано име датотеке"
+
+#~ msgid "The specified configuration folder is invalid."
+#~ msgstr "Изабрана фасцикла са подешавањима је неисправна."
+
+#~ msgid "Cookies"
+#~ msgstr "Колачићи"
+
+#~ msgid "'Flash' Cookies"
+#~ msgstr "Флеш колачићи"
+
+#~ msgid "Don't save any private data while browsing"
+#~ msgstr "Не чува никакве личне податке током разгледања Интернета"
+
+#~ msgid "Add shortcut to speed dial"
+#~ msgstr "Додаје ову адресу у брзе посете"
+
+#, fuzzy
+#~ msgid "Add shortcut to the desktop"
+#~ msgstr "Додаје ову адресу у брзе посете"
+
+#~ msgid "Close this window"
+#~ msgstr "Затвара овај прозор"
+
+#, fuzzy
+#~ msgid "Close all open windows"
+#~ msgstr "_Затворени листови и прозори"
+
+#, fuzzy
+#~ msgid "Redo the last modification"
+#~ msgstr "Врати последњу сесију"
+
+#~ msgid "Cut the selected text"
+#~ msgstr "Исеца изабрани текст и смешта га списак исечака"
+
+#~ msgid "Copy the selected text"
+#~ msgstr "Умножава изабрани текст у списак исечака"
+
+#~ msgid "Paste text from the clipboard"
+#~ msgstr "Убацује текст из списка исечака"
+
+#~ msgid "Delete the selected text"
+#~ msgstr "Брише изабрани текст"
+
+#~ msgid "Select all text"
+#~ msgstr "Изабире сав текст"
+
+#~ msgid "Find the next occurrence of a word or phrase"
+#~ msgstr "Проналази следећу појаву речи или израза"
+
+#~ msgid "Find the previous occurrence of a word or phrase"
+#~ msgstr "Проналази претходну појаву речи или израза"
+
+#~ msgid "Reset the zoom level"
+#~ msgstr "Врати величину приказа"
+
+#~ msgid "View the source code of the page"
+#~ msgstr "Приказује изворни код странице"
+
+#, fuzzy
+#~ msgid "Scroll to the left"
+#~ msgstr "Иде на наредни лист"
+
+#~ msgid "Delete the contents of the trash"
+#~ msgstr "Брише сав садржај из смећа"
+
+#~ msgid "Open the last closed tab"
+#~ msgstr "Отвара лист који сте последњи затворили"
+
+#~ msgid "Add a new bookmark folder"
+#~ msgstr "Додаје нову фасциклу за обележиваче"
+
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Отвара прозорче за додавање, уређивање или уклањање претраживача."
+
+#~ msgid "Clear private data…"
+#~ msgstr "Брише све личне податке."
+
+#~ msgid "Switch to the previous tab"
+#~ msgstr "Иде на претходни лист"
+
+#, fuzzy
+#~ msgid "Move tab behind the previous tab"
+#~ msgstr "Иде на претходни лист"
+
+#, fuzzy
+#~ msgid "Move tab in front of the next tab"
+#~ msgstr "Иде на наредни лист"
+
+#, fuzzy
+#~ msgid "Focus the current tab"
+#~ msgstr "Затвара овај лист"
+
+#, fuzzy
+#~ msgid "Only show the icon of the current tab"
+#~ msgstr "Затвара овај лист"
+
+#, fuzzy
+#~ msgid "Duplicate the current tab"
+#~ msgstr "Затвара овај лист"
+
+#, fuzzy
+#~ msgid "Close all tabs except the current tab"
+#~ msgstr "Затвара овај лист"
+
+#, fuzzy
+#~ msgid "Open the tabs saved in the last session"
+#~ msgstr "Врати последњу сесију"
+
+#~ msgid "Show the Frequently Asked Questions"
+#~ msgstr "Приказује често постављена питања"
+
+#~ msgid "Open Midori's bug tracker"
+#~ msgstr "Отвара Мидоријеву страницу за пријаву грешки"
+
+#~ msgid "Show information about the program"
+#~ msgstr "Приказује податке о програму"
+
+#~ msgid "Show menubar"
+#~ msgstr "Приказује мени програма"
+
+#~ msgid "Show navigationbar"
+#~ msgstr "Приказује површ за кретање кроз веб странице"
+
+#~ msgid "Show sidepanel"
+#~ msgstr "Приказује бочну површ"
+
+#~ msgid "Show bookmarkbar"
+#~ msgstr "Приказује површ са обележивачима"
+
+#~ msgid "Show statusbar"
+#~ msgstr "Приказује или сакрива траку са стањем"
+
+#~ msgid "All cookies"
+#~ msgstr "Све колачиће"
+
+#~ msgid "Session cookies"
+#~ msgstr "Колачиће сесије"
+
+#~ msgid "Show Transferbar"
+#~ msgstr "Прикажи преносе"
+
+#~ msgid "Whether to show the transferbar"
+#~ msgstr "Одређује да ли је приказана трака са преносима"
+
+#~ msgid "Search engines in location completion"
+#~ msgstr "Прикажи претраживаче у поље за адресу"
+
+#~ msgid "Whether to show search engines in the location completion"
+#~ msgstr "Приказује претраживаче у поље за унос адреса"
+
+#, fuzzy
+#~ msgid "Show operating controls of the panel"
+#~ msgstr "Приказује податке о програму"
+
+#, fuzzy
+#~ msgid "Whether to show the operating controls of the panel"
+#~ msgstr "Одређује да ли је приказана трака са преносима"
+
+#~ msgid "Show speed dial in new tabs"
+#~ msgstr "Прикажи брзе посете у новим листовима"
+
+#~ msgid "Show speed dial in newly opened tabs"
+#~ msgstr "Укључује приказ брзих адреса у новим листовима"
+
+#~ msgid "Download Manager"
+#~ msgstr "Преузимач датотека"
+
+#~ msgid "An external download manager"
+#~ msgstr "Спољни програм за преузимање датотека"
+
+#, fuzzy
+#~ msgid "Open external pages in:"
+#~ msgstr "Отвори спољне странице у"
+
+#~ msgid "Where to open externally opened pages"
+#~ msgstr "Одређује где се отварају спољне странице"
+
+#~ msgid "Accept cookies"
+#~ msgstr "Прихвати колачиће"
+
+#~ msgid "What type of cookies to accept"
+#~ msgstr "Које колачиће да прихватим"
+
+#~ msgid "Maximum cookie age"
+#~ msgstr "Старост колачића"
+
+#~ msgid "Maximum history age"
+#~ msgstr "Старост историјата"
+
+#~ msgid "Remember last downloaded files"
+#~ msgstr "Запамти последње преузете датотеке"
+
+#~ msgid "Whether the last downloaded files are saved"
+#~ msgstr "Чува датотеке које сте последње преузели"
+
+#~ msgid "Not found - %s"
+#~ msgstr "Није пронађено - %s"
+
+#~ msgid "Document cannot be displayed"
+#~ msgstr "Не могу да прикажем докумант"
+
+#~ msgid "Appearance"
+#~ msgstr "Изглед"
+
+#~ msgid "Enforce 96 dots per inch"
+#~ msgstr "Приморај 96 тачака по инчу"
+
+#~ msgid "Enforce a video dot density of 96 DPI"
+#~ msgstr "Приморава густину тачака екрана од 96 ТПИ"
+
+#~ msgid "Applications"
+#~ msgstr "Програми"
#~ msgid "%d%% loaded"
#~ msgstr "%d%% учитано"
@@ -3065,9 +3148,6 @@ msgstr ""
#~ msgid "Detach chosen panel from the window"
#~ msgstr "Откачи површ из прозора"
-#~ msgid "Last open pages"
-#~ msgstr "Последње странице"
-
#~ msgid "Both"
#~ msgstr "Текст испод иконица"
@@ -3092,9 +3172,6 @@ msgstr ""
#~ msgid "Original cookies only"
#~ msgstr "Само оригиналне колачиће"
-#~ msgid "Accept cookies from the original website only"
-#~ msgstr "Прихвата колачиће само са оригиналних веб страница"
-
#~ msgid "Remember last visited pages"
#~ msgstr "Запамти последње посећене странице"
@@ -3110,7 +3187,8 @@ msgstr ""
#~ msgid "Detect proxy server automatically"
#~ msgstr "Сам одреди прокси сервер"
-#~ msgid "Whether to detect the proxy server automatically from the environment"
+#~ msgid ""
+#~ "Whether to detect the proxy server automatically from the environment"
#~ msgstr "Покушава да сам одреди прокси сервер на основу окружења"
#~ msgid "Cache size"
@@ -3164,8 +3242,12 @@ msgstr ""
#~ msgid "Spell Checking"
#~ msgstr "Провера писања"
-#~ msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\""
-#~ msgstr "Списак језика језика за проверу писања раздвојени зарезом (нpr. en_GB,sh_YU,sr_YU)"
+#~ msgid ""
+#~ "A comma separated list of languages to be used for spell checking, for "
+#~ "example \"en_GB,de_DE\""
+#~ msgstr ""
+#~ "Списак језика језика за проверу писања раздвојени зарезом (нpr. en_GB,"
+#~ "sh_YU,sr_YU)"
#~ msgid "Interface"
#~ msgstr "Сучеље"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index ee5550b0..1b5af042 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -521,8 +521,8 @@ msgstr "Zapadni (I_SO-8859-1)"
#: ../midori/midori-browser.c:3855 ../midori/midori-websettings.c:209
#: ../midori/midori-websettings.c:281
-msgid "Custom..."
-msgstr "Proizvoljno..."
+msgid "Custom…"
+msgstr "Proizvoljno…"
#: ../midori/midori-browser.c:3858 ../midori/midori-view.c:1275
msgid "View _Source"
@@ -597,7 +597,7 @@ msgid "_Manage Search Engines"
msgstr "Po_desi pretraživače"
#: ../midori/midori-browser.c:3894
-msgid "Add, edit and remove search engines..."
+msgid "Add, edit and remove search engines…"
msgstr "Otvara prozorče za dodavanje, uređivanje ili uklanjanje pretraživača."
#: ../midori/midori-browser.c:3897
@@ -605,7 +605,7 @@ msgid "_Clear Private Data"
msgstr "Očisti _lične podatke"
#: ../midori/midori-browser.c:3898
-msgid "Clear private data..."
+msgid "Clear private data…"
msgstr "Briše sve lične podatke."
#: ../midori/midori-browser.c:3902
@@ -717,16 +717,16 @@ msgid "_Separator"
msgstr "_Razdvajač"
#: ../midori/midori-browser.c:4396
-msgid "_Location..."
-msgstr "Na _adresu..."
+msgid "_Location…"
+msgstr "Na _adresu…"
#: ../midori/midori-browser.c:4398
msgid "Open a particular location"
msgstr "Otvara izabranu adresu"
#: ../midori/midori-browser.c:4420
-msgid "_Web Search..."
-msgstr "P_retraži Internet..."
+msgid "_Web Search…"
+msgstr "P_retraži Internet…"
#: ../midori/midori-browser.c:4422
msgid "Run a web search"
diff --git a/po/sv.po b/po/sv.po
index cd54d66a..3ba52caa 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -598,16 +598,16 @@ msgid "_Manage Search Engines"
msgstr "_Hantera sökmotorer"
#: ../midori/midori-browser.c:4282
-msgid "Add, edit and remove search engines..."
-msgstr "Lägg till, ändra och ta bort sökmotorer..."
+msgid "Add, edit and remove search engines…"
+msgstr "Lägg till, ändra och ta bort sökmotorer…"
#: ../midori/midori-browser.c:4285
msgid "_Clear Private Data"
msgstr "_Rensa privat data"
#: ../midori/midori-browser.c:4286
-msgid "Clear private data..."
-msgstr "Rensa privat data..."
+msgid "Clear private data…"
+msgstr "Rensa privat data…"
#: ../midori/midori-browser.c:4290
msgid "_Previous Tab"
@@ -745,24 +745,24 @@ msgstr "Västerländsk (ISO-8859-1)"
#: ../midori/midori-browser.c:4368
#: ../midori/midori-websettings.c:219
#: ../midori/midori-websettings.c:291
-msgid "Custom..."
-msgstr "Anpassad..."
+msgid "Custom…"
+msgstr "Anpassad…"
#: ../midori/midori-browser.c:4806
msgid "_Separator"
msgstr "_Avskiljare"
#: ../midori/midori-browser.c:4813
-msgid "_Location..."
-msgstr "_Plats..."
+msgid "_Location…"
+msgstr "_Plats…"
#: ../midori/midori-browser.c:4815
msgid "Open a particular location"
msgstr "Öppna en plats"
#: ../midori/midori-browser.c:4839
-msgid "_Web Search..."
-msgstr "_Webbsökning..."
+msgid "_Web Search…"
+msgstr "_Webbsökning…"
#: ../midori/midori-browser.c:4841
msgid "Run a web search"
@@ -1963,8 +1963,8 @@ msgid "Configure Advertisement filters"
msgstr "Redigera reklamblockeringsfilter"
#: ../extensions/adblock.c:304
-msgid "Configure _Advertisement filters..."
-msgstr "Redigera _reklamblockeringsfilter..."
+msgid "Configure _Advertisement filters…"
+msgstr "Redigera _reklamblockeringsfilter…"
#: ../extensions/adblock.c:562
msgid "Advertisement blocker"
@@ -2179,8 +2179,8 @@ msgid "Customize Keyboard shortcuts"
msgstr "Ställ in tangentbordsgenvägar"
#: ../extensions/shortcuts.c:264
-msgid "Customize Sh_ortcuts..."
-msgstr "Ställ in gen_vägar..."
+msgid "Customize Sh_ortcuts…"
+msgstr "Ställ in gen_vägar…"
#: ../extensions/shortcuts.c:303
msgid "Shortcuts"
@@ -2236,8 +2236,8 @@ msgid "Displayed Items"
msgstr "Visade föremål"
#: ../extensions/toolbar-editor.c:579
-msgid "Customize _Toolbar..."
-msgstr "Redigera _verktygsrad..."
+msgid "Customize _Toolbar…"
+msgstr "Redigera _verktygsrad…"
#: ../extensions/toolbar-editor.c:611
msgid "Toolbar Editor"
@@ -2299,8 +2299,8 @@ msgstr "_Stängda tabbar och fönster"
#~ msgstr "Ångra senaste ändringen"
#~ msgid "_Manage Bookmarks"
#~ msgstr "_Hantera bokmärken"
-#~ msgid "Add, edit and remove bookmarks..."
-#~ msgstr "Lägg till, ändra och ta bort bokmärken..."
+#~ msgid "Add, edit and remove bookmarks…"
+#~ msgstr "Lägg till, ändra och ta bort bokmärken…"
#~ msgid "Tab _Overview"
#~ msgstr "Flikö_versikt"
#~ msgid "_Work Offline"
diff --git a/po/tr.po b/po/tr.po
index 76727133..eaebbb39 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -613,8 +613,8 @@ msgid "Firefox (%s)"
msgstr "Firefox"
#: ../midori/midori-browser.c:4216
-msgid "Import bookmarks..."
-msgstr "Yerimleri içe aktarılıyor..."
+msgid "Import bookmarks…"
+msgstr "Yerimleri içe aktarılıyor…"
#: ../midori/midori-browser.c:4219 ../midori/midori-browser.c:5351
msgid "_Import bookmarks"
@@ -720,8 +720,8 @@ msgid "Open a file"
msgstr "Bir dosya aç"
#: ../midori/midori-browser.c:5207
-msgid "_Save Page As..."
-msgstr "Sayfayı Farklı _Kaydet..."
+msgid "_Save Page As…"
+msgstr "Sayfayı Farklı _Kaydet…"
#: ../midori/midori-browser.c:5208
msgid "Save to a file"
@@ -768,7 +768,7 @@ msgid "_Edit"
msgstr "_Düzenle"
#: ../midori/midori-browser.c:5261
-msgid "_Find..."
+msgid "_Find…"
msgstr "_Bul,.."
#: ../midori/midori-browser.c:5262
@@ -942,8 +942,8 @@ msgid "_Frequent Questions"
msgstr "_Sık Sorulan Sorular"
#: ../midori/midori-browser.c:5400
-msgid "_Report a Problem..."
-msgstr "Bir Hata _Raporla..."
+msgid "_Report a Problem…"
+msgstr "Bir Hata _Raporla…"
#: ../midori/midori-browser.c:5412
msgid "_Menubar"
@@ -1001,24 +1001,24 @@ msgstr "Batı Avrupa (ISO-8859-1)"
#: ../midori/midori-browser.c:5459 ../midori/midori-websettings.c:238
#: ../midori/midori-websettings.c:313 ../katze/katze-utils.c:635
-msgid "Custom..."
-msgstr "Özel..."
+msgid "Custom…"
+msgstr "Özel…"
#: ../midori/midori-browser.c:5964
msgid "_Separator"
msgstr "Ayraç"
#: ../midori/midori-browser.c:5971
-msgid "_Location..."
-msgstr "Kon_um..."
+msgid "_Location…"
+msgstr "Kon_um…"
#: ../midori/midori-browser.c:5973
msgid "Open a particular location"
msgstr "Belirli bir konumu aç"
#: ../midori/midori-browser.c:5995
-msgid "_Web Search..."
-msgstr "_Web Arama..."
+msgid "_Web Search…"
+msgstr "_Web Arama…"
#: ../midori/midori-browser.c:5997
msgid "Run a web search"
@@ -1076,7 +1076,7 @@ msgstr "%s ile ara"
#: ../midori/midori-locationaction.c:412
#, fuzzy
-msgid "Search with..."
+msgid "Search with…"
msgstr "_ile ara"
#: ../midori/midori-locationaction.c:537
@@ -2780,8 +2780,8 @@ msgid "Customize Keyboard shortcuts"
msgstr "Klavye kısayolunu özelleştir"
#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
-msgstr "Kısayollar özelleştiriliyor..."
+msgid "Customize Sh_ortcuts…"
+msgstr "Kısayollar özelleştiriliyor…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2861,12 +2861,12 @@ msgid "Displayed Items"
msgstr "Görüntülenen Ögeler"
#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "_Araç Çubuğu Özelleştiriliyor..."
+msgid "Customize _Toolbar…"
+msgstr "_Araç Çubuğu Özelleştiriliyor…"
#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Düzenle..."
+msgid "_Customize…"
+msgstr "_Düzenle…"
#: ../extensions/toolbar-editor.c:627
msgid "Toolbar Editor"
@@ -2973,14 +2973,14 @@ msgstr "Diskteki HTTP iletişimi önbelleği"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Yeni bir yerimi dizini ekle"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Arama motorlarını ekle, sil ve düzenle..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Arama motorlarını ekle, sil ve düzenle…"
-#~ msgid "Clear private data..."
-#~ msgstr "Kişisel verileri temizle..."
+#~ msgid "Clear private data…"
+#~ msgstr "Kişisel verileri temizle…"
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr "Sayfa detaylarını kontrol et ve geliştirici araçlarına bağlan..."
+#~ msgid "Inspect page details and access developer tools…"
+#~ msgstr "Sayfa detaylarını kontrol et ve geliştirici araçlarına bağlan…"
#~ msgid "Switch to the previous tab"
#~ msgstr "Önceki sekmeye geç"
@@ -3234,8 +3234,8 @@ msgstr "Diskteki HTTP iletişimi önbelleği"
#~ msgid "Delete old cookies after 1 year"
#~ msgstr "1 yıldan daha eski çerezleri sil"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Rekl_am filtresini yapılandır..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Rekl_am filtresini yapılandır…"
#~ msgid "Open target folder for selected addon"
#~ msgstr "Seçilmiş eklenti için hedef dizini aç"
diff --git a/po/ug.po b/po/ug.po
index c8616668..87a70bcf 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -1,2844 +1,2941 @@
-# Uyghur translations for midori package.
-# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the midori package.
-# Gheyret T.Kenji , 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Midori 0.1.9\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-21 04:08+0000\n"
-"PO-Revision-Date: 2010-05-04 16:34+0900\n"
-"Last-Translator: Gheyret T.Kenji \n"
-"Language-Team: Uyghur Computer Science Association \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: ../data/midori.desktop.in.h:1
-msgid "Lightweight web browser"
-msgstr "يېنىك توركۆرگۈ"
-
-#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628
-#: ../midori/main.c:1636 ../midori/main.c:1652
-#: ../midori/midori-websettings.c:314
-msgid "Midori"
-msgstr "Midori"
-
-#: ../data/midori.desktop.in.h:3
-msgid "Web Browser"
-msgstr "توركۆرگۈ"
-
-#: ../midori/main.c:102
-#, c-format
-msgid "The configuration couldn't be loaded: %s\n"
-msgstr "تەڭشەكنى ئوقۇغىلى بولمىدى: %s\n"
-
-#: ../midori/main.c:151
-#, c-format
-msgid "Value '%s' is invalid for %s"
-msgstr "'%s' نى %s نىڭ قىممىتى قىلىپ ئىشلەتكىلى بولمايدۇ"
-
-#: ../midori/main.c:158 ../midori/main.c:244
-#, c-format
-msgid "Invalid configuration value '%s'"
-msgstr "تەڭشەك قىممىتى '%s' خاتا"
-
-#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446
-#, c-format
-msgid "Failed to open database: %s\n"
-msgstr "سانداننى ئېچىش مەغلۇپ بولدى: %s\n"
-
-#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:425
-#, c-format
-msgid "Failed to remove old history items: %s\n"
-msgstr "كونا ئىزلارنى ئېچىش مەغلۇپ بولدى: %s\n"
-
-#: ../midori/main.c:468
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "خەتكۈچنى ساقلىغىلى بولمىدى. %s"
-
-#: ../midori/main.c:500
-#, c-format
-msgid "The configuration couldn't be saved. %s"
-msgstr "تەڭشەكنى ساقلىغىلى بولمىدى. %s"
-
-#: ../midori/main.c:538
-#, c-format
-msgid "The search engines couldn't be saved. %s"
-msgstr "ئىزدەش ماتورىنى ساقلىغىنى بولمىدى. %s "
-
-#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:558 ../midori/main.c:581
-#, c-format
-msgid "The trash couldn't be saved. %s"
-msgstr "ئەخلەتنى ساقلىغىلى بولمىدى. %s"
-
-#: ../midori/main.c:640 ../midori/main.c:880
-#, c-format
-msgid "The session couldn't be saved. %s"
-msgstr "ئەڭگىمەنى ساقلىغىلى بولمىدى. %s"
-
-#: ../midori/main.c:824
-msgid ""
-"No root certificate file is available. SSL certificates cannot be verified."
-msgstr " "
-
-#: ../midori/main.c:914
-msgid ""
-"Midori seems to have crashed the last time it was opened. If this happened "
-"repeatedly, try one of the following options to solve the problem."
-msgstr "Midori ئالدىنقى قېتىم قوزغىتىلغاندا غۇلاپ كەتكەندەك قىلىدۇ. بۇ يەنە تەكرارلانسا "
-"تۆۋەندىكى تاللانمىلارنى تاللاپ كۆرۈپ بېقىڭ."
-
-#: ../midori/main.c:929
-msgid "Modify _preferences"
-msgstr "تەڭشەكنى ئۆزگەرت(_P)"
-
-#: ../midori/main.c:933
-msgid "Reset the last _session"
-msgstr "ئەڭ ئاخىرقى ئەڭگىمەنى ئەسلىگە قايتۇر(_S)"
-
-#: ../midori/main.c:938
-msgid "Disable all _extensions"
-msgstr "بارلىق كېڭەيتمىنى چەكلە(_E)"
-
-#: ../midori/main.c:1174 ../midori/main.c:1905
-#, c-format
-msgid "The session couldn't be loaded: %s\n"
-msgstr "ئەڭگىمەنى ئوقۇغىلى بولمىدى: %s\n"
-
-#: ../midori/main.c:1298
-msgid "No filename specified"
-msgstr "ھۆججەت ئاتى بەلگىلەنمىگەن"
-
-#: ../midori/main.c:1317
-msgid "An unknown error occured."
-msgstr "نامەلۇم خاتالىق كۆرۈلدى."
-
-#: ../midori/main.c:1348
-#, c-format
-msgid "Snapshot saved to: %s\n"
-msgstr "Snapshot بۇ يەرگە ساقلاندى :%s\n"
-
-# CLI --help
-#: ../midori/main.c:1520
-msgid "Run ADDRESS as a web application"
-msgstr "ADDRESS نى تور پروگراممىسى قاتارىدا ئىجرا قىل"
-
-#: ../midori/main.c:1520
-msgid "ADDRESS"
-msgstr "ADDRESS"
-
-# CLI --help
-#: ../midori/main.c:1523
-msgid "Use FOLDER as configuration folder"
-msgstr "FOLDER نى تەڭشەك مۇندەرىجىسى قىلىپ ئىشلەت"
-
-#: ../midori/main.c:1523
-msgid "FOLDER"
-msgstr "FOLDER"
-
-#: ../midori/main.c:1526
-msgid "Show a diagnostic dialog"
-msgstr "دىئاگنوز كۆزنىكىنى كۆرسىتىدۇ"
-
-# CLI --help
-#: ../midori/main.c:1528
-msgid "Run the specified filename as javascript"
-msgstr "كۆرسىتىلگەن ھۆججەت نامىنى javascript دەپ قاراپ ئىجرا قىل"
-
-# CLI --help
-#: ../midori/main.c:1531
-msgid "Take a snapshot of the specified URI"
-msgstr "كۆرسىتىلگەن URI نىڭ snapshot نى ئال"
-
-# CLI --help
-#: ../midori/main.c:1534
-msgid "Execute the specified command"
-msgstr "كۆرسىتىلگەن بۇيرۇقنى ئىجرا قىل"
-
-# CLI --help
-#: ../midori/main.c:1536
-msgid "Display program version"
-msgstr "پروگرامما نەشرى كۆرسەت"
-
-#: ../midori/main.c:1538
-msgid "Addresses"
-msgstr "ئادرېس"
-
-#: ../midori/main.c:1540
-msgid "Block URIs according to regular expression PATTERN"
-msgstr "ئۆلچەملىك ئىپادە PATTERN غا بويسۇنۇپ URI چەكلە"
-
-#: ../midori/main.c:1540
-msgid "PATTERN"
-msgstr "PATTERN"
-
-# CLI --help
-#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1544
-msgid "Reset Midori after SECONDS seconds of inactivity"
-msgstr "Midori ئاكتىپ ئەمەس ھالەتتە SECONDS سېكۇنت تۇرسا، Midori نى ئەسلىگە قايتۇر"
-
-#: ../midori/main.c:1544
-msgid "SECONDS"
-msgstr "SECONDS"
-
-#: ../midori/main.c:1625
-msgid "[Addresses]"
-msgstr "[ئادرېس]"
-
-#: ../midori/main.c:1653
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "پىكىر، تەكلىپ، شۇنداقلا كەمتۈكلەرنى بۇ يەرگە مەلۇم قىلىڭ:"
-
-#: ../midori/main.c:1655
-msgid "Check for new versions at:"
-msgstr "يېڭى نەشرىنى بۇ يەردىن تەكشۈر:"
-
-#: ../midori/main.c:1752
-msgid "The specified configuration folder is invalid."
-msgstr "كۆرسىتىلگەن تەڭشەك مۇندەرىجىسى توغرا ئەمەس."
-
-#: ../midori/main.c:1800
-msgid "An instance of Midori is already running but not responding.\n"
-msgstr "Midori نىڭ instance ئىجرا قىلىنىۋېتىپتۇ بىراق ئىنكاس يوق.\n"
-
-#: ../midori/main.c:1855
-#, c-format
-msgid "The search engines couldn't be loaded. %s\n"
-msgstr "ئىزدەش ماتورىنى ئوقۇغىلى بولمىدى. %s\n"
-
-#: ../midori/main.c:1877
-#, c-format
-msgid "Bookmarks couldn't be loaded: %s\n"
-msgstr "خەتكۈچنى ئوقۇغىلى بولمىدى: %s\n"
-
-#: ../midori/main.c:1920
-#, c-format
-msgid "The trash couldn't be loaded: %s\n"
-msgstr "ئەخلەت ساندۇقىنى ئوقۇغىلى بولمىدى: %s\n"
-
-#: ../midori/main.c:1934
-#, c-format
-msgid "The history couldn't be loaded: %s\n"
-msgstr "ئىزلارنى ئوقۇغىلى بولمىدى: %s\n"
-
-#: ../midori/main.c:1948
-msgid "The following errors occured:"
-msgstr "تۆۋەندىكىدەك خاتالىق كۆرۈلدى:"
-
-#: ../midori/main.c:1964
-msgid "_Ignore"
-msgstr "پەرۋا قىلما(_I)"
-
-#: ../midori/midori-array.c:428
-msgid "File not found."
-msgstr "ھۆججەت تېپىلمىدى."
-
-#: ../midori/midori-array.c:462 ../midori/midori-array.c:485
-#: ../midori/midori-array.c:495
-msgid "Malformed document."
-msgstr "فورماتى خاتا بولغان پۈتۈك."
-
-#: ../midori/midori-array.c:504
-msgid "Unrecognized bookmark format."
-msgstr "فورماتى خاتا بولغان خەتكۈش."
-
-#: ../midori/midori-array.c:718
-msgid "Writing failed."
-msgstr "يېزىش مەغلۇپ بولدى."
-
-#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5244
-#: ../midori/midori-browser.c:5250
-msgid "Reload the current page"
-msgstr "ھازىرقى بەتنى قايتا ئوقۇيدۇ"
-
-#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5247
-msgid "Stop loading the current page"
-msgstr "ھازىرقى بېتىنى ئوقۇشنى توختىتىدۇ"
-
-#: ../midori/midori-browser.c:456
-#, c-format
-msgid "%d%% loaded"
-msgstr "%d%% ئوقۇلدى"
-
-#: ../midori/midori-browser.c:494
-#, c-format
-msgid "Failed to update title: %s\n"
-msgstr "ماۋزۇنى يېڭىلاش مەغلۇپ بولدى: %s\n"
-
-#: ../midori/midori-browser.c:508
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "'%s' بولسا كۈتۈلمىگەن مەشغۇلات."
-
-#: ../midori/midori-browser.c:731
-msgid "New folder"
-msgstr "يېڭى مۇندەرىجە"
-
-#: ../midori/midori-browser.c:731
-msgid "Edit folder"
-msgstr "مۇندەرىجە تەھرىرلەيدۇ"
-
-#: ../midori/midori-browser.c:733
-msgid "New bookmark"
-msgstr "يېڭى خەتكۈش"
-
-#: ../midori/midori-browser.c:733
-msgid "Edit bookmark"
-msgstr "خەتكۈش تەھرىرلەش"
-
-#: ../midori/midori-browser.c:764
-msgid "_Title:"
-msgstr "ماۋزۇ (_T):"
-
-#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961
-msgid "_Description:"
-msgstr "چۈشەندۈرۈش(_D):"
-
-#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975
-#: ../extensions/feed-panel/main.c:373
-msgid "_Address:"
-msgstr "ئادرېس(_A):"
-
-#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4400
-msgid "_Folder:"
-msgstr "مۇندەرىجە(_F)"
-
-#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940
-#: ../midori/midori-browser.c:4405 ../midori/midori-browser.c:4437
-msgid "Toplevel folder"
-msgstr "ئۈستىقەۋەت مۇندەرىجە"
-
-#: ../midori/midori-browser.c:874
-msgid "Add to _Speed Dial"
-msgstr ""
-
-#: ../midori/midori-browser.c:887
-msgid "Show in the tool_bar"
-msgstr "قورال بالدىقىدا كۆرسەت(_B)"
-
-#: ../midori/midori-browser.c:902
-msgid "Run as _web application"
-msgstr "تور پروگراممىسى شەكلىدە ئىجرا قىل(_W)"
-
-#: ../midori/midori-browser.c:994
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "\"%s\" نى چۈشۈرۈشكە يېتەرلىك بوشلۇق يوق."
-
-#: ../midori/midori-browser.c:998
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "ھۆججەتكە %s كېرەك ئىدى، بىراق %s چىلىكلا بار ئىكەن."
-
-#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4455
-#: ../midori/midori-browser.c:4487
-msgid "Save file as"
-msgstr "باشقا نامدا ساقلا"
-
-#: ../midori/midori-browser.c:1448
-msgid "Save file"
-msgstr "ھۆججەت ساقلا"
-
-#: ../midori/midori-browser.c:2152
-msgid "Open file"
-msgstr "ھۆججەتنى ئاچ"
-
-#: ../midori/midori-browser.c:2230
-msgid ""
-"To use the above URI open a news aggregator. There is usually a menu or "
-"button \"New Subscription\", \"New News Feed\" or similar.\n"
-"Alternatively go to Preferences, Applications in Midori, and select a News "
-"Aggregator. Next time you click the news feed icon, it will be added "
-"automatically."
-msgstr " \n"
-" "
-
-#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361
-msgid "New feed"
-msgstr "يېڭى feed"
-
-# tooltip
-#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5309
-#: ../panels/midori-bookmarks.c:422
-msgid "Add a new bookmark"
-msgstr "يېڭى خەتكۈش قوش"
-
-#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203
-#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461
-#: ../extensions/formhistory.c:465
-#, c-format
-msgid "Failed to execute database statement: %s\n"
-msgstr "ساندان جۈملىسىنى ئىجرا قىلىش مەغلۇپ بولدى: %s\n"
-
-#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484
-msgid "Empty"
-msgstr "قۇرۇق"
-
-#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398
-#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462
-#: ../midori/sokoke.c:476
-msgid "Could not run external program."
-msgstr "سىرتقى پروگراممىنى ئىجرا قىلغىلى بولمىدى"
-
-#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5693
-#, c-format
-msgid "Failed to insert new history item: %s\n"
-msgstr "يېڭى ئىز قىستۇرۇش مەغلۇپ بولدى: %s\n"
-
-#: ../midori/midori-browser.c:4093 ../panels/midori-bookmarks.c:780
-#: ../panels/midori-history.c:750
-msgid "Open all in _Tabs"
-msgstr "ھەممىنى بەتكۈچتە ئاچ(_T)"
-
-#: ../midori/midori-browser.c:4100 ../panels/midori-bookmarks.c:786
-#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544
-msgid "Open in New _Tab"
-msgstr "يېڭى بەتكۈچتە ئاچ(_T)"
-
-#: ../midori/midori-browser.c:4103 ../panels/midori-bookmarks.c:788
-#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546
-msgid "Open in New _Window"
-msgstr "يېڭى كۆزنەكتە ئاچ(_W)"
-
-#: ../midori/midori-browser.c:4326
-msgid "Arora"
-msgstr "Arora"
-
-#: ../midori/midori-browser.c:4327
-msgid "Kazehakase"
-msgstr "Kazehakase"
-
-#: ../midori/midori-browser.c:4328
-msgid "Opera"
-msgstr "Opera"
-
-#: ../midori/midori-browser.c:4329
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../midori/midori-browser.c:4330
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../midori/midori-browser.c:4351
-msgid "Import bookmarks..."
-msgstr "خەتكۈش ئىمپورت قىل..."
-
-#: ../midori/midori-browser.c:4354 ../midori/midori-browser.c:5314
-msgid "_Import bookmarks"
-msgstr "خەتكۈش ئىمپورت قىل(_I)"
-
-#: ../midori/midori-browser.c:4365
-msgid "_Application:"
-msgstr "پروگرامما(_A):"
-
-#: ../midori/midori-browser.c:4392 ../midori/midori-browser.c:5418
-#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319
-#: ../katze/katze-utils.c:691
-msgid "Custom..."
-msgstr "ئۆزى بەلگىلەش…"
-
-#: ../midori/midori-browser.c:4466
-msgid "Failed to import bookmarks"
-msgstr "خەتكۈش ئىمپورت قىلىش مەغلۇپ بولدى"
-
-#: ../midori/midori-browser.c:4502
-msgid "Failed to export bookmarks"
-msgstr "خەتكۈش ئېكسپورت قىلىش مەغلۇپ بولدى"
-
-#: ../midori/midori-browser.c:4556 ../panels/midori-bookmarks.c:271
-#: ../panels/midori-history.c:141 ../panels/midori-history.c:171
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "ئىز ئۆچۈرۈش مەغلۇپ بولدى: %s\n"
-
-# Dialog title
-#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4663
-msgid "Clear Private Data"
-msgstr "شەخسىي سانلىق ئاساسلارنى تازىلايدۇ"
-
-# Button label
-#: ../midori/midori-browser.c:4667
-msgid "_Clear private data"
-msgstr "شەخسىي سانلىق مەلۇماتلار تازىلا(_C)"
-
-#: ../midori/midori-browser.c:4681
-msgid "Clear the following data:"
-msgstr "تۆۋەندىكى سانلىق ئاساسلارنى تازىلا:"
-
-#: ../midori/midori-browser.c:4692 ../midori/midori-preferences.c:530
-#: ../panels/midori-history.c:119
-msgid "History"
-msgstr "ئىز"
-
-#: ../midori/midori-browser.c:4698
-msgid "Cookies"
-msgstr "Cookies"
-
-#: ../midori/midori-browser.c:4703
-msgid "'Flash' Cookies"
-msgstr "'Flash' Cookie"
-
-#: ../midori/midori-browser.c:4708
-msgid "Website icons"
-msgstr "تورتۇرا سىنبەلگىسى"
-
-#: ../midori/midori-browser.c:4713 ../midori/sokoke.c:1298
-msgid "_Closed Tabs"
-msgstr "تاقالغان بەتكۈچلەر(_C)"
-
-#: ../midori/midori-browser.c:4718 ../extensions/web-cache.c:464
-msgid "Web Cache"
-msgstr "تور غەملىكى"
-
-#: ../midori/midori-browser.c:4726
-msgid "Clear private data when _quitting Midori"
-msgstr "Midori نى ئاخىرلاشتۇرغاندا شەخسىي سانلىق ئاساسلارنى تازىلا(_Q)"
-
-#: ../midori/midori-browser.c:4827
-msgid "A lightweight web browser."
-msgstr "ئەپچىل توركۆرگۈ"
-
-#: ../midori/midori-browser.c:4829
-msgid ""
-"This library is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU Lesser General Public License as published by the "
-"Free Software Foundation; either version 2.1 of the License, or (at your "
-"option) any later version."
-msgstr ""
-
-#: ../midori/midori-browser.c:4848
-msgid "translator-credits"
-msgstr "Gheyret T.Kenji 2010"
-
-#: ../midori/midori-browser.c:5157
-msgid "_File"
-msgstr "ھۆججەت(_F)"
-
-#: ../midori/midori-browser.c:5159 ../midori/sokoke.c:1299
-msgid "New _Window"
-msgstr "يېڭى كۆزنەك(_W)"
-
-# tooltip
-#: ../midori/midori-browser.c:5160
-msgid "Open a new window"
-msgstr "يېڭى كۆزنەكتىن بىرنى ئاچ"
-
-# tooltip
-#: ../midori/midori-browser.c:5163
-msgid "Open a new tab"
-msgstr "يېڭى بەتكۈچتىن بىرنى ئاچ"
-
-#: ../midori/midori-browser.c:5165
-msgid "P_rivate Browsing"
-msgstr "شەخسىي كۆرۈش(_R)"
-
-# tooltip
-#: ../midori/midori-browser.c:5166
-msgid "Don't save any private data while browsing"
-msgstr "كۆرۈۋاتقاندا شەخسىي سانلىق مەلۇماتلارنى ساقلىمىسۇن"
-
-# tooltip
-#: ../midori/midori-browser.c:5170
-msgid "Open a file"
-msgstr "ھۆججەت ئاچ"
-
-# tooltip
-#: ../midori/midori-browser.c:5173
-msgid "Save to a file"
-msgstr "ھۆججەتكە ساقلا"
-
-#: ../midori/midori-browser.c:5175
-msgid "Add to Speed _dial"
-msgstr "Speed dial قوش(_D)"
-
-# tooltip
-#: ../midori/midori-browser.c:5176
-msgid "Add shortcut to speed dial"
-msgstr "Speed dial نىڭ تېزلەتمىسىنى قوش"
-
-#: ../midori/midori-browser.c:5178
-msgid "Add Shortcut to the _desktop"
-msgstr "ئۈستەليۈزىگە تېزلەتمە قوش(_D)"
-
-# tooltip
-#: ../midori/midori-browser.c:5179
-msgid "Add shortcut to the desktop"
-msgstr "ئۈستەليۈزىگە تېزلەتمە قوش"
-
-#: ../midori/midori-browser.c:5181
-msgid "Subscribe to News _feed"
-msgstr "خەۋەر feed غا مۇشتەرى بول(_F)"
-
-#: ../midori/midori-browser.c:5182
-msgid "Subscribe to this news feed"
-msgstr "خەۋەر feed غا مۇشتەرى بولىدۇ"
-
-#: ../midori/midori-browser.c:5187
-msgid "_Close Tab"
-msgstr "بەتكۈچنى تاقا(_C)"
-
-# tooltip
-#: ../midori/midori-browser.c:5188
-msgid "Close the current tab"
-msgstr "ھازىرقى بەتكۈچنى تاقايدۇ"
-
-#: ../midori/midori-browser.c:5190
-msgid "C_lose Window"
-msgstr "كۆزنەك تاقا(_L)"
-
-# tooltip
-#: ../midori/midori-browser.c:5191
-msgid "Close this window"
-msgstr "مەزكۇر كۆزنەكنى تاقايدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5194
-msgid "Print the current page"
-msgstr "ھازىرقى بەتنى باسىدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5197
-msgid "Quit the application"
-msgstr "مەزكۇر پروگراممىنى ئاخىرلاشتۇرىدۇ"
-
-#: ../midori/midori-browser.c:5199
-msgid "_Edit"
-msgstr "تەھرىر(_E)"
-
-#: ../midori/midori-browser.c:5203
-msgid "Undo the last modification"
-msgstr "ئەڭ ئاخىرقى قېتىم تۈزەتكەندىن يېنىۋالىدۇ"
-
-#: ../midori/midori-browser.c:5206
-msgid "Redo the last modification"
-msgstr "ئەڭ ئاخىرقى قېتىم يانغانغا پۇشايمان قىلىدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5210
-msgid "Cut the selected text"
-msgstr "تاللانغان تېكىستنى كېسىدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5213 ../midori/midori-browser.c:5216
-msgid "Copy the selected text"
-msgstr "تاللانغان تېكىستنى كۆچۈرىدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5219
-msgid "Paste text from the clipboard"
-msgstr "clipboard دىكىنى چاپلايدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5222
-msgid "Delete the selected text"
-msgstr "تاللانغان تېكىستنى ئۆچۈرىدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5225
-msgid "Select all text"
-msgstr "ھەممە تېكىستنى تاللايدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5228
-msgid "Find a word or phrase in the page"
-msgstr "بەت ئىچىدىن سوز ياكى سوز بىرىكمىسىنى ئىزدەيدۇ"
-
-#: ../midori/midori-browser.c:5230
-msgid "Find _Next"
-msgstr "كېيىنكىسىنى ئىزدە(_N)"
-
-# tooltip
-#: ../midori/midori-browser.c:5231
-msgid "Find the next occurrence of a word or phrase"
-msgstr "كېيىنكى سوز ياكى سوز بىرىكمىسىنى ئىزدەيدۇ"
-
-#: ../midori/midori-browser.c:5233
-msgid "Find _Previous"
-msgstr "ئالدىنقىنى ئىزدە(_P)"
-
-# tooltip
-#: ../midori/midori-browser.c:5234
-msgid "Find the previous occurrence of a word or phrase"
-msgstr "ئالدىنقى سوز ياكى سوز بىرىكمىسىنى ئىزدەيدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5238
-msgid "Configure the application preferences"
-msgstr "مەزكۇر پروگراممىنىڭ تەڭشىكىنى تەڭشەيدۇ"
-
-#: ../midori/midori-browser.c:5240
-msgid "_View"
-msgstr "كۆرۈنۈش(_V)"
-
-#: ../midori/midori-browser.c:5241
-msgid "_Toolbars"
-msgstr "قورال بالدىقى(_T)"
-
-# tooltip
-#: ../midori/midori-browser.c:5253
-msgid "Increase the zoom level"
-msgstr "zoom دەرىجىسىنى چوڭايتىدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5256
-msgid "Decrease the zoom level"
-msgstr "zoom دەرىجىسىنى كىچىكلىتىدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5259
-msgid "Reset the zoom level"
-msgstr "zoom دەرىجىسىنى ئەسلىگە قايتۇرىدۇ"
-
-#: ../midori/midori-browser.c:5260
-msgid "_Encoding"
-msgstr "كودلىشى(_E)"
-
-#: ../midori/midori-browser.c:5262
-msgid "View So_urce"
-msgstr "مەنبەنى كۆرسەت(_U)"
-
-# tooltip
-#: ../midori/midori-browser.c:5263
-msgid "View the source code of the page"
-msgstr "مەزكۇر بەتنىڭ مەنبە كودىنى كۆرسىتىدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5266
-msgid "Toggle fullscreen view"
-msgstr "تولۇق ئېكران كۆرسەت/كۆرسەتمە نى ئالماشتۇرۇش"
-
-#: ../midori/midori-browser.c:5269
-msgid "Scroll _Left"
-msgstr "سولغا سىيرىل(_L)"
-
-#: ../midori/midori-browser.c:5270
-msgid "Scroll to the left"
-msgstr "سولغا سىيرىلىدۇ"
-
-#: ../midori/midori-browser.c:5272
-msgid "Scroll _Down"
-msgstr "پەسكە سىيرىل(_D)"
-
-#: ../midori/midori-browser.c:5273
-msgid "Scroll down"
-msgstr "پەسكە سىيرىلىدۇ"
-
-#: ../midori/midori-browser.c:5275
-msgid "Scroll _Up"
-msgstr "ئۈستىگە سىيرىلىدۇ(_U)"
-
-#: ../midori/midori-browser.c:5276
-msgid "Scroll up"
-msgstr "ئۈستىگە سىيرىلىدۇ"
-
-#: ../midori/midori-browser.c:5278
-msgid "Scroll _Right"
-msgstr "ئوڭغا سىيرىل(_R)"
-
-#: ../midori/midori-browser.c:5279
-msgid "Scroll to the right"
-msgstr "ئونغا سىيرىلىدۇ"
-
-#: ../midori/midori-browser.c:5282
-msgid "_Go"
-msgstr "يۆتكەل(_G)"
-
-# tooltip
-#: ../midori/midori-browser.c:5285
-msgid "Go back to the previous page"
-msgstr "ئالدىنقى بەتكە قايتىدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5288
-msgid "Go forward to the next page"
-msgstr "كېيىنكى بەتكە ماڭىدۇ"
-
-# tooltip
-#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5292
-msgid "Go to the previous sub-page"
-msgstr "ئالدىنقى بالا بەتكە قايتىدۇ"
-
-# tooltip
-#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5296
-msgid "Go to the next sub-page"
-msgstr "كېيىنكى بالا بەتكە ماڭىدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5299
-msgid "Go to your homepage"
-msgstr "ئانا بەتكە ماڭىدۇ"
-
-#: ../midori/midori-browser.c:5301
-msgid "Empty Trash"
-msgstr "ئەخلەت ساندۇقىنى تازىلاش"
-
-# tooltip
-#: ../midori/midori-browser.c:5302
-msgid "Delete the contents of the trash"
-msgstr "ئەخلەت ساندۇقىنىڭ ئىچىدىكى مەزمۇنلارنى ئۆچۈرىدۇ"
-
-#: ../midori/midori-browser.c:5304
-msgid "Undo _Close Tab"
-msgstr "تاقالغان بەتكۈچنى ئەسلى كەلتۈر(_C)"
-
-# tooltip
-#: ../midori/midori-browser.c:5305
-msgid "Open the last closed tab"
-msgstr "ئەڭ ئاخىرقى قېتىم تاقالغان بەتنى ئاچىدۇ"
-
-#: ../midori/midori-browser.c:5311
-msgid "Add a new _folder"
-msgstr "يېڭى مۇندەرىجە قوش(_F)"
-
-# tooltip
-#: ../midori/midori-browser.c:5312
-msgid "Add a new bookmark folder"
-msgstr "يېڭى خەتكۈش مۇندەرىجىسى قوشىدۇ"
-
-#: ../midori/midori-browser.c:5317
-msgid "_Export bookmarks"
-msgstr "خەتكۈچنى ئېكسپورت قىل(_E)"
-
-#: ../midori/midori-browser.c:5320 ../midori/midori-searchaction.c:493
-msgid "_Manage Search Engines"
-msgstr "ئىزدەش ماتورىنى باشقۇر(_M)"
-
-# tooltip
-#: ../midori/midori-browser.c:5321
-msgid "Add, edit and remove search engines..."
-msgstr "ئىزدەش ماتورىنى قوشىدۇ، تەھرىرلەيدۇ، ئۆچۈرىدۇ..."
-
-#: ../midori/midori-browser.c:5324
-msgid "_Clear Private Data"
-msgstr "شەخسىي سانلىق ئاساسلارنى تازىلا(_C)"
-
-# tooltip
-#: ../midori/midori-browser.c:5325
-msgid "Clear private data..."
-msgstr "شەخسىي سانلىق ئاساسلارنى تازىلايدۇ..."
-
-#: ../midori/midori-browser.c:5329
-msgid "_Inspect Page"
-msgstr "بەتنى تەكشۈر(_I)"
-
-#: ../midori/midori-browser.c:5330
-msgid "Inspect page details and access developer tools..."
-msgstr "بەت تەپسىلاتىنى تەكشۈرىدۇ ۋە ئىجادىيەت قوراللىرىنى زىيارەت قىلىدۇ..."
-
-#: ../midori/midori-browser.c:5335
-msgid "_Previous Tab"
-msgstr "ئالدىنقى بەتكۈچ(_P)"
-
-# tooltip
-#: ../midori/midori-browser.c:5336
-msgid "Switch to the previous tab"
-msgstr "ئالدىنقى بەتكۈچكە ئالمىشىدۇ"
-
-#: ../midori/midori-browser.c:5338
-msgid "_Next Tab"
-msgstr "كېيىنكى بەتكۈچ(_N)"
-
-# tooltip
-#: ../midori/midori-browser.c:5339
-msgid "Switch to the next tab"
-msgstr "كېيىنكى بەتكۈچكە ئالمىشىدۇ"
-
-#: ../midori/midori-browser.c:5341
-msgid "Focus _Current Tab"
-msgstr "ھازىرقى بەتكۈچكە فوكۇسلان(_C)"
-
-# tooltip
-#: ../midori/midori-browser.c:5342
-msgid "Focus the current tab"
-msgstr "فوكۇسنى ھازىرقى بەتكە يۆتكەيدۇ"
-
-#: ../midori/midori-browser.c:5344
-msgid "Open last _session"
-msgstr "ئەڭ ئاخىرقى ئەڭگىمەنى ئاچ(_S)"
-
-#: ../midori/midori-browser.c:5345
-msgid "Open the tabs saved in the last session"
-msgstr "ئەڭ ئاخىرقى ئەڭگىمەدە ساقلانغان بەتنى ئاچىدۇ"
-
-#: ../midori/midori-browser.c:5347
-msgid "_Help"
-msgstr "ياردەم(_H)"
-
-#: ../midori/midori-browser.c:5349
-msgid "_Contents"
-msgstr "مەزمۇن(_C)"
-
-# tooltip
-#: ../midori/midori-browser.c:5350
-msgid "Show the documentation"
-msgstr "پۈتۈكلەرنى كۆرسىتىدۇ"
-
-#: ../midori/midori-browser.c:5352
-msgid "_Frequent Questions"
-msgstr "كوپ سورىلىدىغان سوئاللار(_F)"
-
-# tooltip
-#: ../midori/midori-browser.c:5353
-msgid "Show the Frequently Asked Questions"
-msgstr "كوپ سورىلىدىغان سوئاللارنى كۆرسىتىدۇ"
-
-#: ../midori/midori-browser.c:5355
-msgid "_Report a Bug"
-msgstr "كەمتۈك مەلۇم قىل(_R)"
-
-# tooltip
-#: ../midori/midori-browser.c:5356
-msgid "Open Midori's bug tracker"
-msgstr "Midori نىڭ كەمتۈك tracker سىنى ئاچىدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:5359
-msgid "Show information about the program"
-msgstr "مەزكۇر پروگرامما ھەققىدىكى ئۇچۇرنى كۆرسىتىدۇ"
-
-#: ../midori/midori-browser.c:5367
-msgid "_Menubar"
-msgstr "Menu بالدىقى(_M)"
-
-# tooltip
-#: ../midori/midori-browser.c:5368
-msgid "Show menubar"
-msgstr "Menu بالدىقىنى كۆرسىتىدۇ"
-
-#: ../midori/midori-browser.c:5371
-msgid "_Navigationbar"
-msgstr "يولچى بالدىقى(_N)"
-
-# tooltip
-#: ../midori/midori-browser.c:5372
-msgid "Show navigationbar"
-msgstr "يولچى بالدىقىنى كۆرسىتىدۇ"
-
-#: ../midori/midori-browser.c:5375
-msgid "Side_panel"
-msgstr "يان panel(_P)"
-
-# tooltip
-#: ../midori/midori-browser.c:5376
-msgid "Show sidepanel"
-msgstr "يان panel نى كۆرسىتىدۇ"
-
-#: ../midori/midori-browser.c:5379
-msgid "_Bookmarkbar"
-msgstr "خەتكۈش بالدىقى(_B)"
-
-# tooltip
-#: ../midori/midori-browser.c:5380
-msgid "Show bookmarkbar"
-msgstr "خەتكۈش بالدىقىنى كۆرسىتىدۇ"
-
-#: ../midori/midori-browser.c:5383
-msgid "_Transferbar"
-msgstr "ئۇزىتىش بالدىقى(_T)"
-
-# tooltip
-#: ../midori/midori-browser.c:5384
-msgid "Show transferbar"
-msgstr "ئۇزىتىش بالدىقىنى كۆرسىتىدۇ"
-
-#: ../midori/midori-browser.c:5387
-msgid "_Statusbar"
-msgstr "ھالەت بالدىقى(_S)"
-
-# tooltip
-#: ../midori/midori-browser.c:5388
-msgid "Show statusbar"
-msgstr "ھالەت بالدىقىنى كۆرسىتىدۇ"
-
-#: ../midori/midori-browser.c:5396
-msgid "_Automatic"
-msgstr "ئۆزلۈكىدىن(_A)"
-
-#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:222
-msgid "Chinese (BIG5)"
-msgstr "خەنزۇچە (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5403
-msgid "Japanese (SHIFT__JIS)"
-msgstr "ياپونچە (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:224
-msgid "Korean (EUC-KR)"
-msgstr "كورىيەچە(EUC-KR)"
-
-#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:225
-msgid "Russian (KOI8-R)"
-msgstr "رۇسچە(KOI8-R)"
-
-#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:226
-msgid "Unicode (UTF-8)"
-msgstr "يۇنىكود (UTF-8)"
-
-#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:227
-msgid "Western (ISO-8859-1)"
-msgstr "غەربچە (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5949
-msgid "_Separator"
-msgstr "ئايرىغۇ(_S)"
-
-#: ../midori/midori-browser.c:5956
-msgid "_Location..."
-msgstr "ئورۇن(_L)..."
-
-# tooltip
-#: ../midori/midori-browser.c:5958
-msgid "Open a particular location"
-msgstr "بەلگىلەنگەن ئورۇننى ئاچىدۇ"
-
-#: ../midori/midori-browser.c:5982
-msgid "_Web Search..."
-msgstr "توردىن ئىزدە(_W)..."
-
-# tooltip
-#: ../midori/midori-browser.c:5984
-msgid "Run a web search"
-msgstr "توردىن ئىزدەيدۇ"
-
-# tooltip
-#: ../midori/midori-browser.c:6005
-msgid "Reopen a previously closed tab or window"
-msgstr "بۇرۇن يېپىلغان بەتكۈچ ياكى كۆزنەكنى قايتا ئاچىدۇ"
-
-#: ../midori/midori-browser.c:6020
-msgid "_Recently visited pages"
-msgstr "يېقىندا كۆرگەن بەتلەر"
-
-# tooltip
-#: ../midori/midori-browser.c:6022
-msgid "Reopen pages that you visited earlier"
-msgstr "يېقىندا كۆرگەن بەتلەرنى ئاچىدۇ"
-
-#: ../midori/midori-browser.c:6037 ../midori/sokoke.c:1288
-msgid "_Bookmarks"
-msgstr "خەتكۈش(_B)"
-
-# tooltip
-#: ../midori/midori-browser.c:6039
-msgid "Show the saved bookmarks"
-msgstr "ساقلانغان خەتكۈچلەرنى كۆرسىتىدۇ"
-
-#: ../midori/midori-browser.c:6054
-msgid "_Tools"
-msgstr "قورال(_T)"
-
-#: ../midori/midori-browser.c:6067
-msgid "_Window"
-msgstr "كۆزنەك(_W)"
-
-# tooltip
-#: ../midori/midori-browser.c:6069
-msgid "Show a list of all open tabs"
-msgstr "ئوچۇق بارلىق بەتكۈچلەرنى كۆرسىتىدۇ"
-
-#: ../midori/midori-browser.c:6083
-msgid "_Menu"
-msgstr "Menu(_M)"
-
-#: ../midori/midori-browser.c:6085
-msgid "Menu"
-msgstr "Menu"
-
-#: ../midori/midori-browser.c:6670
-#, c-format
-msgid "Unexpected setting '%s'"
-msgstr "'%s' ئويلاپ باقمىغان تەڭشەكتۇر"
-
-#: ../midori/midori-locationaction.c:377
-#, c-format
-msgid "Failed to select from history\n"
-msgstr "ئىزدىن تاللاش مەغلۇپ بولدى\n"
-
-#: ../midori/midori-locationaction.c:459
-#, c-format
-msgid "Search for %s"
-msgstr "%s نى ئىزدە"
-
-#: ../midori/midori-locationaction.c:482
-#, c-format
-msgid "Search with %s"
-msgstr "%s دا ئىزدە"
-
-#: ../midori/midori-locationaction.c:1197
-#, c-format
-msgid "Failed to execute database statement\n"
-msgstr "ساندان جۈملىسىنى ئىجرا قىلىش مەغلۇپ بولدى\n"
-
-#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1254
-msgid "Paste and p_roceed"
-msgstr "چاپلا ۋە داۋاملاشتۇر(_R)"
-
-#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434
-msgid "Detach chosen panel from the window"
-msgstr "تاللانغان panel نى كۆزنەكتىن ئايرىۋېتىدۇ"
-
-#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446
-#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642
-msgid "Align sidepanel to the right"
-msgstr "يان panel نى ئوڭ تەرەپكە ئورۇنلاشتۇرىدۇ"
-
-#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457
-msgid "Close panel"
-msgstr "panel نى تاقا"
-
-#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643
-msgid "Align sidepanel to the left"
-msgstr "يان panel نى سول تەرەپكە ئورۇنلاشتۇرىدۇ"
-
-#: ../midori/midori-panel.c:797
-msgid "Hide operating controls"
-msgstr "مەشغۇلات تىزگىنەكلىرىنى يوشۇر"
-
-#: ../midori/midori-websettings.c:204
-msgid "Show Blank page"
-msgstr "قۇرۇق بەتنى كۆرسەت"
-
-#: ../midori/midori-websettings.c:205
-msgid "Show Homepage"
-msgstr "ماكان بەتنى كۆرسەت"
-
-#: ../midori/midori-websettings.c:206
-msgid "Show last open tabs"
-msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتكۈچنى كۆرسەت"
-
-#: ../midori/midori-websettings.c:207
-msgid "Show last tabs without loading"
-msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتنى قايتا ئوقۇماي كۆرسەت"
-
-#: ../midori/midori-websettings.c:223
-msgid "Japanese (SHIFT_JIS)"
-msgstr "ياپونچە (SHIFT_JIS)"
-
-#: ../midori/midori-websettings.c:243
-msgid "New tab"
-msgstr "يېڭى بەتكۈچ"
-
-#: ../midori/midori-websettings.c:244
-msgid "New window"
-msgstr "يېڭى كۆزنەك"
-
-#: ../midori/midori-websettings.c:245
-msgid "Current tab"
-msgstr "ھازىرقى بەتكۈچ"
-
-#: ../midori/midori-websettings.c:260
-msgid "Default"
-msgstr "كۆڭۈلدىكى"
-
-#: ../midori/midori-websettings.c:261
-msgid "Icons"
-msgstr "سىنبەلگىلەر"
-
-#: ../midori/midori-websettings.c:262
-msgid "Small icons"
-msgstr "كىچىك سىنبەلگە"
-
-#: ../midori/midori-websettings.c:263
-msgid "Text"
-msgstr "تېكىست"
-
-#: ../midori/midori-websettings.c:264
-msgid "Icons and text"
-msgstr "سىنبەلگە ۋە تېكىست"
-
-#: ../midori/midori-websettings.c:265
-msgid "Text beside icons"
-msgstr "تېكىست سىنبەلگىنىڭ يېنىدا كۆرسىتىلسۇن"
-
-#: ../midori/midori-websettings.c:280
-msgid "Automatic (GNOME or environment)"
-msgstr "ئۆزلۈكىدىن (GNOME ياكى مۇھىت)"
-
-#: ../midori/midori-websettings.c:281
-msgid "HTTP proxy server"
-msgstr "HTTP ۋاكالەتچى مۇلازىمېتىر"
-
-#: ../midori/midori-websettings.c:282
-msgid "No proxy server"
-msgstr "ۋاكالەتچى مۇلازىمېتىر يوق"
-
-#: ../midori/midori-websettings.c:297
-msgid "All cookies"
-msgstr "بارلىق Cookie"
-
-#: ../midori/midori-websettings.c:298
-msgid "Session cookies"
-msgstr "ئەڭگىمە Cookie سى"
-
-#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667
-msgid "None"
-msgstr "يوق"
-
-#: ../midori/midori-websettings.c:315
-msgid "Safari"
-msgstr "Safari"
-
-#: ../midori/midori-websettings.c:316
-msgid "iPhone"
-msgstr "iPhone"
-
-#: ../midori/midori-websettings.c:317
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../midori/midori-websettings.c:318
-msgid "Internet Explorer"
-msgstr "Internet Explorer"
-
-#: ../midori/midori-websettings.c:371
-msgid "Remember last window size"
-msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى چوڭلۇقىنى ئەستە تۇتۇۋال"
-
-# tooltip
-#: ../midori/midori-websettings.c:372
-msgid "Whether to save the last window size"
-msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى چوڭلۇقىنى ئەستە تۇتۇۋالىدۇ"
-
-#: ../midori/midori-websettings.c:380
-msgid "Last window width"
-msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى كەڭلىكى"
-
-#: ../midori/midori-websettings.c:381
-msgid "The last saved window width"
-msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى كەڭلىكى"
-
-#: ../midori/midori-websettings.c:389
-msgid "Last window height"
-msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئېگىزلىكى"
-
-# tooltip
-#: ../midori/midori-websettings.c:390
-msgid "The last saved window height"
-msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئېگىزلىكى"
-
-#: ../midori/midori-websettings.c:415
-msgid "Last panel position"
-msgstr "panel نىڭ ئەڭ ئاخىرقى ئورنى"
-
-# tooltip
-#: ../midori/midori-websettings.c:416
-msgid "The last saved panel position"
-msgstr "panel نىڭ ئەڭ ئاخىرقى ئورنى"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:425
-msgid "Last panel page"
-msgstr "panel دىكى ئەڭ ئاخىرقى بەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:426
-msgid "The last saved panel page"
-msgstr "panel نىڭ ئەڭ ئاخىرى ساقلانغان بەت"
-
-#: ../midori/midori-websettings.c:434
-msgid "Last Web search"
-msgstr "ئەڭ ئاخىرقى ئىزدەلگەنلەر"
-
-#: ../midori/midori-websettings.c:435
-msgid "The last saved Web search"
-msgstr "ساقلانغان ئەڭ ئاخىرقى ئىزدەلگەن"
-
-#: ../midori/midori-websettings.c:444
-msgid "Show Menubar"
-msgstr "Menu بالدىقىنى كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:445
-msgid "Whether to show the menubar"
-msgstr "Menu بالدىقىنى كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:453
-msgid "Show Navigationbar"
-msgstr "يولچى بالدىقىنى كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:454
-msgid "Whether to show the navigationbar"
-msgstr "يولچى بالدىقىنى كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:462
-msgid "Show Bookmarkbar"
-msgstr "خەتكۈش بالدىقىنى كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:463
-msgid "Whether to show the bookmarkbar"
-msgstr "خەتكۈش بالدىقىنى كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:471
-msgid "Show Panel"
-msgstr "Panel نى كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:472
-msgid "Whether to show the panel"
-msgstr "Panel نى كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:487
-msgid "Show Transferbar"
-msgstr "ئۇزىتىش بالدىقىنى كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:488
-msgid "Whether to show the transferbar"
-msgstr "ئۇزىتىش بالدىقىنى كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:496
-msgid "Show Statusbar"
-msgstr "ھالەت بالدىقىنى كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:497
-msgid "Whether to show the statusbar"
-msgstr "ھالەت بالدىقىنى كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:506
-msgid "Toolbar Style:"
-msgstr "قورال بالدىقى ئۇسلۇبى:"
-
-# tooltip
-#: ../midori/midori-websettings.c:507
-msgid "The style of the toolbar"
-msgstr "قورال بالدىقىنىڭ ئۇسلۇبىنى بەلگىلەيدۇ"
-
-#: ../midori/midori-websettings.c:523
-msgid "Show progress in location entry"
-msgstr "ئورۇن كىرگۈزىدىغان يەردە progress نى كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:524
-msgid "Whether to show loading progress in the location entry"
-msgstr "ئورۇن كىرگۈزىدىغان يەردە progress نى كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:539
-msgid "Search engines in location completion"
-msgstr ""
-
-# tooltip
-#: ../midori/midori-websettings.c:540
-msgid "Whether to show search engines in the location completion"
-msgstr ""
-
-#: ../midori/midori-websettings.c:548
-msgid "Toolbar Items"
-msgstr "قورال بالدىقىدىكى تۈرلەر"
-
-# tooltip
-#: ../midori/midori-websettings.c:549
-msgid "The items to show on the toolbar"
-msgstr "قورال بالدىقىدا كۆرسىتىلىدىغان تۈرلەرنى بەلگىلەيدۇ"
-
-#: ../midori/midori-websettings.c:557
-msgid "Compact Sidepanel"
-msgstr "يان panel نى ئىخچام كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:558
-msgid "Whether to make the sidepanel compact"
-msgstr "يان panel نى ئىخچام كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:573
-msgid "Show operating controls of the panel"
-msgstr "panel نىڭ مەشغۇلات تىزگىنەكلىرىنى كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:574
-msgid "Whether to show the operating controls of the panel"
-msgstr "panel نىڭ مەشغۇلات تىزگىنەكلىرىنى كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:589
-msgid "Align sidepanel on the right"
-msgstr "يان panelنى ئوڭ تەرەپكە ئورۇنلاشتۇر"
-
-# tooltip
-#: ../midori/midori-websettings.c:590
-msgid "Whether to align the sidepanel on the right"
-msgstr "يان panelنى ئوڭ تەرەپكە ئورۇنلاشتۇرىدۇ"
-
-#: ../midori/midori-websettings.c:605
-msgid "Open panels in separate windows"
-msgstr "panel نى ئايرىم كۆزنەكتە ئاچ"
-
-# tooltip
-#: ../midori/midori-websettings.c:606
-msgid "Whether to always open panels in separate windows"
-msgstr "panel نى ئايرىم كۆزنەكتە ئاچىدىغان قىلىدۇ"
-
-#: ../midori/midori-websettings.c:615
-msgid "When Midori starts:"
-msgstr "Midori قوزغالغاندا:"
-
-# tooltip
-#: ../midori/midori-websettings.c:616
-msgid "What to do when Midori starts"
-msgstr "Midori قوزغالغاندا نېمە قىلىش كېرەك"
-
-#: ../midori/midori-websettings.c:625
-msgid "Homepage:"
-msgstr "ماكان بەت:"
-
-# tooltip
-#: ../midori/midori-websettings.c:626
-msgid "The homepage"
-msgstr "ماكان بەتنى بېكىتىدۇ"
-
-#: ../midori/midori-websettings.c:641
-msgid "Show crash dialog"
-msgstr "غۇلاش كۆزنىكىنى كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:642
-msgid "Show a dialog after Midori crashed"
-msgstr "Midori غۇلاپ كېتىپ، قايتا قوزغالغاندا كۆزنەك كۆرسىتىدۇ"
-
-#. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:658
-msgid "Show speed dial in new tabs"
-msgstr "يېڭى بەتكۈچتە speed dial نى كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:659
-msgid "Show speed dial in newly opened tabs"
-msgstr "يېڭى ئېچىلغان بەتكۈچتە speed dial نى كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:667
-msgid "Save downloaded files to:"
-msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ئورۇن:"
-
-# tooltip
-#: ../midori/midori-websettings.c:668
-msgid "The folder downloaded files are saved to"
-msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ئورۇننى بەلگىلەيدۇ"
-
-#: ../midori/midori-websettings.c:689
-msgid "Ask for the destination folder"
-msgstr "ساقلايدىغان چاغدا سورا"
-
-# tooltip
-#: ../midori/midori-websettings.c:690
-msgid "Whether to ask for the destination folder when downloading a file"
-msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ۋاقىتتا ، ساقلايدىغان مۇندەرىجىنى سورايدۇ"
-
-#: ../midori/midori-websettings.c:709
-msgid "Notify when a transfer has been completed"
-msgstr "ئۇزىتىش تاماملانغاندا ئۇقتۇرۇش قىل"
-
-# tooltip
-#: ../midori/midori-websettings.c:710
-msgid "Whether to show a notification when a transfer has been completed"
-msgstr "ئۇزىتىش تاماملانغاندا، ئۇنى ئىشلەتكۈچىگە خەۋەر قىلىدۇ"
-
-#: ../midori/midori-websettings.c:722
-msgid "Download Manager"
-msgstr "چۈشۈرۈش باشقۇرغۇسى"
-
-# tooltip
-#: ../midori/midori-websettings.c:723
-msgid "An external download manager"
-msgstr "سىرتتىكى چۈشۈرۈش باشقۇرغۇسىنى بېكىتىدۇ"
-
-#: ../midori/midori-websettings.c:731
-msgid "Text Editor"
-msgstr "تېكىست تەھرىرلىگۈ"
-
-# tooltip
-#: ../midori/midori-websettings.c:732
-msgid "An external text editor"
-msgstr "سىرتقى تېكىست تەھرىرلىگۈنى بېكىتىدۇ"
-
-#: ../midori/midori-websettings.c:747
-msgid "News Aggregator"
-msgstr ""
-
-# tooltip
-#: ../midori/midori-websettings.c:748
-msgid "An external news aggregator"
-msgstr ""
-
-#: ../midori/midori-websettings.c:756
-msgid "Location entry Search"
-msgstr ""
-
-# tooltip
-#: ../midori/midori-websettings.c:757
-msgid "The search to perform inside the location entry"
-msgstr ""
-
-#: ../midori/midori-websettings.c:765
-msgid "Preferred Encoding"
-msgstr "ئامراق كودلاش"
-
-# tooltip
-#: ../midori/midori-websettings.c:766
-msgid "The preferred character encoding"
-msgstr "ھەرپلەرنىڭ ئامراق كودلاش شەكلى"
-
-#: ../midori/midori-websettings.c:776
-msgid "Always Show Tabbar"
-msgstr "بەتكۈچ بالدىقىنى كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:777
-msgid "Always show the tabbar"
-msgstr "بەتكۈچ بالدىقىنى كۆرسىتىپلا تۇرىدۇ"
-
-#: ../midori/midori-websettings.c:785
-msgid "Close Buttons on Tabs"
-msgstr "بەتكۈچتە تاقاش توپچىسىنى كۆرسەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:786
-msgid "Whether tabs have close buttons"
-msgstr "بەتكۈچتە تاقاش توپچىسىنى كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:794
-msgid "Open new pages in:"
-msgstr "يېڭى بەت ئاچقاندا:"
-
-# tooltip
-#: ../midori/midori-websettings.c:795
-msgid "Where to open new pages"
-msgstr "يېڭى بەتنى قەيەردە ئاچىدىغانلىقىنى بەلگىلەيدۇ"
-
-#: ../midori/midori-websettings.c:804
-msgid "Open external pages in:"
-msgstr "سىرتقى بەتنى ئاچقاندا:"
-
-# tooltip
-#: ../midori/midori-websettings.c:805
-msgid "Where to open externally opened pages"
-msgstr "سىرتقى بەتنى قەيەردە ئاچىدىغانلىقىنى بەلگىلەيدۇ"
-
-#: ../midori/midori-websettings.c:814
-msgid "Middle click opens Selection"
-msgstr "چاشقىنەكنىڭ ئوتتۇرىسىنى چېكىپ تاللىغاننى ئاچ"
-
-# tooltip
-#: ../midori/midori-websettings.c:815
-msgid "Load an address from the selection via middle click"
-msgstr "ئادرېسنى تاللاپ بولۇپ، چاشقىنەكنىڭ ئوتتۇرىسىنى چەكسە شۇ ئادرېس ئېچىلىدۇ"
-
-#: ../midori/midori-websettings.c:823
-msgid "Open tabs in the background"
-msgstr "بەتكۈچنى background دا ئاچ"
-
-# tooltip
-#: ../midori/midori-websettings.c:824
-msgid "Whether to open new tabs in the background"
-msgstr "يېڭى بەتكۈچنى background ئاچىدۇ"
-
-#: ../midori/midori-websettings.c:832
-msgid "Open Tabs next to Current"
-msgstr "يېڭى بەتكۈچنى ھازىرقى بەتكۈچنىڭ يېنىدا ئاچ"
-
-# tooltip
-#: ../midori/midori-websettings.c:833
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr "يېڭى بەتكۈچنى ھازىرقىنىڭ يېنىدا ياكى ئەڭ ئاخىرقىنىڭ يېنىدا ئاچىدۇ"
-
-#: ../midori/midori-websettings.c:841
-msgid "Open popups in tabs"
-msgstr "بەتكۈچتە قاڭقىشى ئاچ"
-
-# tooltip
-#: ../midori/midori-websettings.c:842
-msgid "Whether to open popup windows in tabs"
-msgstr "بەتكۈچتە قاڭقىش menusini ئاچىدۇ"
-
-#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88
-msgid "Load images automatically"
-msgstr "سۈرەتنى ئۆزلۈكىدىن يۈكلە"
-
-# tooltip
-#: ../midori/midori-websettings.c:853
-msgid "Load and display images automatically"
-msgstr "سۈرەتنى ئۆزلۈكىدىن ئوقۇپ كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100
-msgid "Enable scripts"
-msgstr "script ئېچىۋەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:861
-msgid "Enable embedded scripting languages"
-msgstr "سىڭدۈرمە script تىلىنى ئىشلەتكىلى بولىدىغان قىلىدۇ"
-
-#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112
-msgid "Enable Netscape plugins"
-msgstr "Netscape قىستۇرمىلىرى ئېچىۋەت"
-
-# tooltip
-#: ../midori/midori-websettings.c:869
-msgid "Enable embedded Netscape plugin objects"
-msgstr "سىڭدۈرمە Netscape قىستۇرمىلىرىنى ئىشلەتكىلى بولىدىغان قىلىدۇ"
-
-#: ../midori/midori-websettings.c:885
-msgid "Enable HTML5 database support"
-msgstr "HTML5 ساندانىنى قوللا"
-
-#: ../midori/midori-websettings.c:886
-msgid "Whether to enable HTML5 database support"
-msgstr "HTML5 ساندانىنى ئىشلەتكىلى بولىدىغان قىلىدۇ"
-
-#: ../midori/midori-websettings.c:892
-msgid "Enable HTML5 local storage support"
-msgstr "HTML5 يەرلىك storage نى قوللا"
-
-#: ../midori/midori-websettings.c:893
-msgid "Whether to enable HTML5 local storage support"
-msgstr "HTML5 يەرلىك storage نى ئىشلەتكىلى بولىدىغان قىلىدۇ"
-
-#: ../midori/midori-websettings.c:901
-msgid "Enable offline web application cache"
-msgstr "تورسىز ھالەتتە تور پروگراممىلىرىنىڭ غەملىكىنى ئېچىۋەت"
-
-#: ../midori/midori-websettings.c:902
-msgid "Whether to enable offline web application cache"
-msgstr "تورسىز ھالەتتە تور پروگراممىلىرىنىڭ غەملىكىنى ئېچىۋېتىدۇ"
-
-#: ../midori/midori-websettings.c:927
-msgid "Zoom Text and Images"
-msgstr "تېكىست ۋە سۈرەتلەرنى چوڭايت تارايت"
-
-# tooltip
-#: ../midori/midori-websettings.c:928
-msgid "Whether to zoom text and images"
-msgstr "تېكىست ۋە سۈرەتلەرنى چوڭايتىدۇ ياكى تارايتىدۇ"
-
-#: ../midori/midori-websettings.c:943
-msgid "Find inline while typing"
-msgstr "كىرگۈزگەن ھامان ئىزدە"
-
-# tooltip
-#: ../midori/midori-websettings.c:944
-msgid "Whether to automatically find inline while typing"
-msgstr "كۇنۇپكا بېسىلغان ھامان ئىزدەش ئېلىپ بارىدۇ"
-
-#: ../midori/midori-websettings.c:959
-msgid "Kinetic scrolling"
-msgstr "Kinetic سىيرىل"
-
-#: ../midori/midori-websettings.c:960
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "تېزلىكىگە ئاساسەن Kinetic سىيرىلىپ يۆتكىلىدۇ"
-
-#: ../midori/midori-websettings.c:968
-msgid "Accept cookies"
-msgstr "cookie لارنى قوبۇل قىل"
-
-# tooltip
-#: ../midori/midori-websettings.c:969
-msgid "What type of cookies to accept"
-msgstr "قوبۇل قىلىدىغان cookie نىڭ تىپى"
-
-#: ../midori/midori-websettings.c:985
-msgid "Original cookies only"
-msgstr "پەقەتلا ئەسلى cookie"
-
-# tooltip
-#: ../midori/midori-websettings.c:986
-msgid "Accept cookies from the original website only"
-msgstr "ئەسلى تورتۇرادىن كەلگەن cookie لارنىلا قوبۇل قىلىدۇ"
-
-#: ../midori/midori-websettings.c:994
-msgid "Maximum cookie age"
-msgstr "Cookie نىڭ ئۆمرى"
-
-# tooltip
-#: ../midori/midori-websettings.c:995
-msgid "The maximum number of days to save cookies for"
-msgstr "Cookie نىڭ ئەڭ ئۇزۇن ساقلىنىش ۋاقتى"
-
-#: ../midori/midori-websettings.c:1012
-msgid "Remember last visited pages"
-msgstr "ئەڭ ئاخىرقى قېتىم كۆرگەن بەتنى ئەستە تۇت"
-
-# tooltip
-#: ../midori/midori-websettings.c:1013
-msgid "Whether the last visited pages are saved"
-msgstr "ئەڭ ئاخىرقى قېتىم كۆرگەن بەتنى ساقلىۋالىدۇ"
-
-#: ../midori/midori-websettings.c:1021
-msgid "Maximum history age"
-msgstr "ئىزنىڭ ئەڭ ئۇزۇن ۋاقتى"
-
-# tooltip
-#: ../midori/midori-websettings.c:1022
-msgid "The maximum number of days to save the history for"
-msgstr "ئىزنىڭ ئەڭ ئۇزۇن ساقلىنىش ۋاقتى"
-
-#: ../midori/midori-websettings.c:1030
-msgid "Remember last downloaded files"
-msgstr "ئەڭ ئاخىرقى قېتىم چۈشۈرگەن ھۆججەتنى ئەستە تۇت"
-
-# tooltip
-#: ../midori/midori-websettings.c:1031
-msgid "Whether the last downloaded files are saved"
-msgstr "ئەڭ ئاخىرقى قېتىم چۈشۈرگەن ھۆججەتنى ئەستە تۇتۇۋالىدۇ"
-
-#: ../midori/midori-websettings.c:1048
-msgid "Proxy server"
-msgstr "ۋاكالەتچى مۇلازىمېتىر"
-
-#: ../midori/midori-websettings.c:1049
-msgid "The type of proxy server to use"
-msgstr "ئىشلىتىدىغان ۋاكالەتچى مۇلازىمېتىرنىڭ تىپى"
-
-#: ../midori/midori-websettings.c:1058
-msgid "HTTP Proxy Server"
-msgstr "HTTP ۋاكالەتچى مۇلازىمېتىر"
-
-# tooltip
-#: ../midori/midori-websettings.c:1059
-msgid "The proxy server used for HTTP connections"
-msgstr "HTTP باغلىنىشىدا ئىشلىتىدىغان ۋاكالەتچى مۇلازىمېتىرنى كۆرسىتىدۇ"
-
-#: ../midori/midori-websettings.c:1074
-msgid "Detect proxy server automatically"
-msgstr "ۋاكالەتچى مۇلازىمېتىرنى ئۆزلۈكىدىن ئۆچۈر"
-
-# tooltip
-#: ../midori/midori-websettings.c:1075
-msgid "Whether to detect the proxy server automatically from the environment"
-msgstr "ۋاكالەتچى مۇلازىمېتىرنى ئۆزلۈكىدىن ئۆچۈرىدۇ"
-
-#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1091
-msgid "Identify as"
-msgstr "تونۇتۇلىدۇ"
-
-# tooltip
-#: ../midori/midori-websettings.c:1092
-msgid "What to identify as to web pages"
-msgstr "قانداقلىرىنى تور بېتى دەپ تونۇتىدىغانلىقىنى بېكىتىدۇ"
-
-#: ../midori/midori-websettings.c:1108
-msgid "Identification string"
-msgstr "تونۇش ھەرپ تىزمىسى"
-
-# tooltip
-#: ../midori/midori-websettings.c:1109
-msgid "The application identification string"
-msgstr "پروگراممىنىڭ تونۇش ھەرپ تىزمىسى"
-
-#: ../midori/midori-websettings.c:1124
-msgid "Preferred languages"
-msgstr "ئامراق تىللار"
-
-#: ../midori/midori-websettings.c:1125
-msgid ""
-"A comma separated list of languages preferred for rendering multilingual "
-"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-msgstr "كوپ تىللىق بەتلەرنى كۆرسەتكەندە ئالدىن ئويلىشىدىغان تىللارنىڭ تىزىملىكى. مەسىلەن \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-
-# Button title
-#: ../midori/midori-websettings.c:1140
-msgid "Clear private data"
-msgstr "شەخسىي سانلىق-ئاساسلارنى تازىلا"
-
-# FIXME:
-#: ../midori/midori-websettings.c:1141
-msgid "The private data selected for deletion"
-msgstr "تالانغان شەخسىي سانلىق-ئاساسلارنى ئۆچۈرىدۇ"
-
-#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly,
-#. so reloading via Javascript works but not via API calls.
-#. Error pages are special, we want to try loading the destination
-#. again, not the error page which isn't even a proper page
-#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560
-#: ../midori/midori-view.c:4564
-#, c-format
-msgid "Error - %s"
-msgstr "خاتالىق - %s"
-
-#: ../midori/midori-view.c:1262
-#, c-format
-msgid "The page '%s' couldn't be loaded."
-msgstr "بەت '%s' نى ئوقۇغىلى بولمىدى."
-
-#: ../midori/midori-view.c:1264
-msgid "Try again"
-msgstr "قايتا سىناپ كور"
-
-#. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:1283
-#, c-format
-msgid "Not found - %s"
-msgstr "بەت تېپىلمىدى - %s"
-
-#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357
-#, c-format
-msgid "Send a message to %s"
-msgstr "%s غا ئۇچۇر ئەۋەتىدۇ"
-
-#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519
-msgid "Inspect _Element"
-msgstr "ئېلېمېنتلارنى تەكشۈر(_E)"
-
-#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261
-msgid "Open Link in New _Tab"
-msgstr "ئۇلانمىنى يېڭى بەتكۈچتە ئاچ(_T)"
-
-#: ../midori/midori-view.c:2195
-msgid "Open Link in _Foreground Tab"
-msgstr "ئۇلانمىنى ئەڭ ئالدىدىكى بەتكۈچتە ئاچ(_T)"
-
-#: ../midori/midori-view.c:2196
-msgid "Open Link in _Background Tab"
-msgstr "ئۇلانمىنى ئەڭ ئاخىرقى بەتكۈچتە ئاچ(_T)"
-
-#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268
-msgid "Open Link in New _Window"
-msgstr "ئۇلانمىنى يېڭى كۆزنەكتە ئاچ(_W)"
-
-#: ../midori/midori-view.c:2202
-msgid "Open Link as Web A_pplication"
-msgstr "ئۇلانمىنى تور پروگراممىسى دەپ قاراپ ئاچ(_P)"
-
-#: ../midori/midori-view.c:2205
-msgid "Copy Link de_stination"
-msgstr "ئۇلانما نىشانىنى كۆچۈر(_S)"
-
-#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280
-msgid "_Save Link destination"
-msgstr "ئۇلانما نىشانىنى ساقلا(_S)"
-
-#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274
-msgid "_Download Link destination"
-msgstr "ئۇلانما نىشانىنى چۈشۈر(_D)"
-
-#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243
-#: ../midori/midori-view.c:2285
-msgid "Download with Download _Manager"
-msgstr "چۈشۈرۈش باشقۇرغۇسىدا چۈشۈر(_M)"
-
-#: ../midori/midori-view.c:2222
-msgid "Open _Image in New Tab"
-msgstr "سۈرەتنى يېڭى بەتكۈچتە ئاچ(_I)"
-
-#: ../midori/midori-view.c:2225
-msgid "Copy Image _Address"
-msgstr "سۈرەت ئادرېسىنى كۆچۈر(_A)"
-
-#: ../midori/midori-view.c:2228
-msgid "Save I_mage"
-msgstr "سۈرەتنى ساقلا(_M)"
-
-#: ../midori/midori-view.c:2229
-msgid "Download I_mage"
-msgstr "سۈرەتنى چۈشۈر(_M)"
-
-#: ../midori/midori-view.c:2236
-msgid "Copy Video _Address"
-msgstr "سىن ئادرېسىنى كۆچۈر(_A)"
-
-#: ../midori/midori-view.c:2239
-msgid "Save _Video"
-msgstr "سىننى ساقلا(_V)"
-
-#: ../midori/midori-view.c:2239
-msgid "Download _Video"
-msgstr "سىننى چۈشۈر(_V)"
-
-#: ../midori/midori-view.c:2302
-msgid "Search _with"
-msgstr "ئىزدە(_W)"
-
-#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344
-msgid "_Search the Web"
-msgstr "توردا ئىزدە(_S)"
-
-#: ../midori/midori-view.c:2365
-msgid "Open Address in New _Tab"
-msgstr "ئادرېسنى يېڭى بەتكۈچتە ئاچ(_T)"
-
-#: ../midori/midori-view.c:2661
-msgid "Open or download file"
-msgstr "ھۆججەتنى ئاچامسىز، چۈشۈرەمسىز؟"
-
-#: ../midori/midori-view.c:2680
-#, c-format
-msgid "File Type: '%s'"
-msgstr "ھۆججەت تىپى: '%s'"
-
-#: ../midori/midori-view.c:2683
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "ھۆججەت تىپى: %s ('%s')"
-
-#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2687
-#, c-format
-msgid "Open %s"
-msgstr "%s نى ئاچ"
-
-#: ../midori/midori-view.c:3231
-#, c-format
-msgid "Inspect page - %s"
-msgstr "بەتنى تەكشۈر - %s"
-
-#: ../midori/midori-view.c:3513
-msgid "Speed Dial"
-msgstr ""
-
-#: ../midori/midori-view.c:3514
-msgid "Click to add a shortcut"
-msgstr "چەكسە تېزلەتمىگە قوشۇلىدۇ"
-
-#: ../midori/midori-view.c:3515
-msgid "Enter shortcut address"
-msgstr "تېزلەتمە ئادرېسىنى كىرگۈز"
-
-#: ../midori/midori-view.c:3516
-msgid "Enter shortcut title"
-msgstr "تېزلەتمە ماۋزۇسىنى كىرگۈز"
-
-#: ../midori/midori-view.c:3517
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "بۇ تېزلەتمىنى راستلا ئۆچۈرەمسىز؟"
-
-#: ../midori/midori-view.c:3518
-msgid "Set number of columns and rows"
-msgstr "قۇر ۋە ئىستون نومۇرى"
-
-#: ../midori/midori-view.c:3519
-msgid "Enter number of columns and rows:"
-msgstr "قۇر ۋە ئىستون نومۇرىنى كىرگۈزۈڭ:"
-
-#: ../midori/midori-view.c:3520
-msgid "Invalid input for the size of the speed dial"
-msgstr "كىرگۈزۈلگەن speed dial نىڭ چوڭلۇقى ئىناۋەتسىز"
-
-#: ../midori/midori-view.c:3521
-msgid "Thumb size:"
-msgstr "Thumb چوڭلۇقى:"
-
-#: ../midori/midori-view.c:3522
-msgid "Small"
-msgstr "كىچىك"
-
-#: ../midori/midori-view.c:3523
-msgid "Medium"
-msgstr "ئوتتۇرا"
-
-#: ../midori/midori-view.c:3524
-msgid "Big"
-msgstr "چوڭ"
-
-#: ../midori/midori-view.c:3550
-#, c-format
-msgid "Document cannot be displayed"
-msgstr "پۈتۈكنى كۆرسەتكىلى بولمىدى"
-
-#: ../midori/midori-view.c:3573
-#, c-format
-msgid "No documentation installed"
-msgstr "پۈتۈك ئورنىتىلمىغان"
-
-#: ../midori/midori-view.c:3694
-msgid "Page loading delayed"
-msgstr "بەتنى ئوقۇش كېچىكتۈرۈلدى"
-
-#: ../midori/midori-view.c:3695
-msgid "Loading delayed either due to a recent crash or startup preferences."
-msgstr "غۇلاش ياكى قوزغىلىش مايىللىقى سەۋەبىدىن ئوقۇش كېچىكتۈرۈلدى."
-
-#: ../midori/midori-view.c:3696
-msgid "Load Page"
-msgstr "بەتنى ئوقۇش"
-
-#: ../midori/midori-view.c:3840
-msgid "Blank page"
-msgstr "بوش بەت"
-
-#: ../midori/midori-view.c:4100
-msgid "_Duplicate Tab"
-msgstr "بەتكۈچنى تۇغدۇر(_D)"
-
-#: ../midori/midori-view.c:4105
-msgid "_Restore Tab"
-msgstr "بەتكۈچنى ئەسلىگە كەلتۈر(_R)"
-
-#: ../midori/midori-view.c:4105
-msgid "_Minimize Tab"
-msgstr "بەتكۈچنى كىچىكلەت(_M)"
-
-#: ../midori/midori-view.c:4111
-msgid "Close ot_her Tabs"
-msgstr "باشقا بەتكۈچلەرنى تاقا(_H)"
-
-#: ../midori/midori-view.c:4797
-msgid "Print background images"
-msgstr "تەگ سۈرىتىنى بېسىپ چىقار"
-
-# tooltip
-#: ../midori/midori-view.c:4798
-msgid "Whether background images should be printed"
-msgstr "تەگ سۈرىتىنى بېسىپ چىقىرىدۇ"
-
-#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381
-msgid "Features"
-msgstr "ئىقتىدار"
-
-#. Page "General"
-#: ../midori/midori-preferences.c:298
-msgid "General"
-msgstr "ئادەتتىكى"
-
-#: ../midori/midori-preferences.c:299
-msgid "Startup"
-msgstr "قوزغات"
-
-# tooltip
-#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321
-msgid "Use current page as homepage"
-msgstr "ھازىرقى بەتنى ماكان بەت قىل"
-
-#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87
-msgid "Transfers"
-msgstr "ئۇزاتقانلىرى"
-
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:349
-msgid "Appearance"
-msgstr "كۆرۈنۈشى"
-
-#: ../midori/midori-preferences.c:350
-msgid "Font settings"
-msgstr "خەت نۇسخا تەڭشەك"
-
-#: ../midori/midori-preferences.c:352
-msgid "Default Font Family"
-msgstr "كۆڭۈلدىكى فونت"
-
-# tooltip
-#: ../midori/midori-preferences.c:355
-msgid "The default font family used to display text"
-msgstr "تېكىستلەرنى كۆرسىتىدىغان كۆڭۈلدىكى فونت"
-
-# tooltip
-#: ../midori/midori-preferences.c:358
-msgid "The default font size used to display text"
-msgstr "تېكىستلەرنى كۆرسىتىدىغان كۆڭۈلدىكى فونتنىڭ چوڭلۇقى"
-
-#: ../midori/midori-preferences.c:360
-msgid "Fixed-width Font Family"
-msgstr "تەڭ كەڭلىكتىكى فونت"
-
-# tooltip
-#: ../midori/midori-preferences.c:363
-msgid "The font family used to display fixed-width text"
-msgstr "تېكىستلەرنى تەڭ كەڭلىكتە كۆرسىتىدىغان فونت"
-
-# tooltip
-#: ../midori/midori-preferences.c:366
-msgid "The font size used to display fixed-width text"
-msgstr "تېكىستلەرنى تەڭ كەڭلىكتە كۆرسىتىدىغان فونتنىڭ چوڭلۇقى"
-
-#: ../midori/midori-preferences.c:368
-msgid "Minimum Font Size"
-msgstr "فونتنىڭ ئەڭ كىچىك چوڭلۇقى"
-
-# tooltip
-#: ../midori/midori-preferences.c:371
-msgid "The minimum font size used to display text"
-msgstr "تېكىستلەرنى كۆرسىتىدىغان فونتنىڭ ئەڭ كىچىك چوڭلۇقى"
-
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:380
-msgid "Behavior"
-msgstr "ھەرىكىتى"
-
-#: ../midori/midori-preferences.c:393
-msgid "Enforce 96 dots per inch"
-msgstr "مەجبۇرىي 96DPI دا كۆرسەت"
-
-# tooltip
-#: ../midori/midori-preferences.c:394
-msgid "Enforce a video dot density of 96 DPI"
-msgstr "سىن زىچلىقىنى 96DPI غا توغرىلايدۇ"
-
-#: ../midori/midori-preferences.c:414
-msgid "Allow scripts to open popups"
-msgstr "script ئىشلىتىپ popup چىقىرىشقا رۇخسەت قىل"
-
-# tooltip
-#: ../midori/midori-preferences.c:415
-msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr "script ئىشلىتىپ popup چىقىرىشقا رۇخسەت قىلىدۇ"
-
-#: ../midori/midori-preferences.c:419
-msgid "Spell Checking"
-msgstr "ئىملا تەكشۈرۈش"
-
-#: ../midori/midori-preferences.c:422
-msgid "Enable Spell Checking"
-msgstr "ئىملا تەكشۈرۈش ئىناۋەتلىك"
-
-# tooltip
-#: ../midori/midori-preferences.c:423
-msgid "Enable spell checking while typing"
-msgstr "كىرگۈزۈۋاتقاندا ئىملا تەكشۈرىدۇ"
-
-#: ../midori/midori-preferences.c:425
-msgid "Spelling dictionaries:"
-msgstr "ئىملا ئامبىرى:"
-
-# tooltip
-#. i18n: The example should be adjusted to contain a good local default
-#: ../midori/midori-preferences.c:429
-msgid ""
-"A comma separated list of languages to be used for spell checking, for "
-"example \"en_GB,de_DE\""
-msgstr "ئىملاسى تەكشۈرۈلىدىغان تىللار(پەش بىلەن ئايرىلىدۇ مەسىلەن: \"en,de_DE\")"
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:435
-msgid "Interface"
-msgstr "كۆرۈنمە يۈز"
-
-#: ../midori/midori-preferences.c:436
-msgid "Navigationbar"
-msgstr "يولچى بالداق"
-
-#: ../midori/midori-preferences.c:446
-msgid "Browsing"
-msgstr "كۆز يۈگۈرت"
-
-#. Page "Applications"
-#: ../midori/midori-preferences.c:468
-msgid "Applications"
-msgstr "پروگرامما"
-
-#: ../midori/midori-preferences.c:469
-msgid "External applications"
-msgstr "سىرتقى پروگرامما"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486
-msgid "Network"
-msgstr "تور"
-
-#: ../midori/midori-preferences.c:492
-msgid "Hostname"
-msgstr "مۇلازىمېتىر نامى"
-
-#. Page "Privacy"
-#: ../midori/midori-preferences.c:511
-msgid "Privacy"
-msgstr "شەخسىيەت"
-
-#: ../midori/midori-preferences.c:512
-msgid "Web Cookies"
-msgstr "تور Cookie"
-
-#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535
-msgid "days"
-msgstr "كۈن"
-
-#: ../midori/midori-searchaction.c:917
-msgid "Add search engine"
-msgstr "ئىزدەش ماتورى قوش"
-
-#: ../midori/midori-searchaction.c:917
-msgid "Edit search engine"
-msgstr "ئىزدەش ماتورى تەھرىرلە"
-
-#: ../midori/midori-searchaction.c:945
-msgid "_Name:"
-msgstr "ئاتى(_N):"
-
-#: ../midori/midori-searchaction.c:989
-msgid "_Icon:"
-msgstr "سىنبەلگە(_I):"
-
-#: ../midori/midori-searchaction.c:1003
-msgid "_Token:"
-msgstr "ماياق(_T):"
-
-#: ../midori/midori-searchaction.c:1234
-msgid "Manage Search Engines"
-msgstr "ئىزدەش ماتورىنى باشقۇرۇش"
-
-#: ../midori/midori-searchaction.c:1335
-msgid "Use as _default"
-msgstr "كۆڭۈلدىكى قىلىپ ئىشلەت(_D)"
-
-#: ../midori/sokoke.c:1287
-msgid "_Bookmark"
-msgstr "خەتكۈش(_B)"
-
-#: ../midori/sokoke.c:1289
-msgid "Add Boo_kmark"
-msgstr "خەتكۈش قوش(_K)"
-
-#: ../midori/sokoke.c:1290
-msgid "_Console"
-msgstr "كۆزنەك(_C)"
-
-#: ../midori/sokoke.c:1291
-msgid "_Extensions"
-msgstr "كېڭەيتمىلەر(_E)"
-
-#: ../midori/sokoke.c:1292
-msgid "_History"
-msgstr "ئىز(_H)"
-
-#: ../midori/sokoke.c:1293
-msgid "_Homepage"
-msgstr "ماكان بەت(_H)"
-
-#: ../midori/sokoke.c:1294
-msgid "_Userscripts"
-msgstr "_Userscripts"
-
-#: ../midori/sokoke.c:1295
-msgid "New _Tab"
-msgstr "يېڭى بەتكۈچ(_T)"
-
-#: ../midori/sokoke.c:1296
-msgid "_Transfers"
-msgstr "ئۇزىتىش(_T)"
-
-#: ../midori/sokoke.c:1297
-msgid "Netscape p_lugins"
-msgstr "Netscape قىستۇرمىلىرى(_L)"
-
-#: ../midori/sokoke.c:1300
-msgid "New _Folder"
-msgstr "يېڭى مۇندەرىجە(_F)"
-
-#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270
-#, c-format
-msgid "%s of %s"
-msgstr "%s / %s"
-
-#: ../toolbars/midori-transferbar.c:123
-#, c-format
-msgid "The file '%s ' has been downloaded."
-msgstr "ھۆججەت '%s ' چۈشۈرۈلدى."
-
-#: ../toolbars/midori-transferbar.c:126
-msgid "Transfer completed"
-msgstr "ئۇزىتىش تاماملاندى"
-
-#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141
-msgid "Clear All"
-msgstr "ھەممىنى تازىلا"
-
-#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280
-msgid "Some files are being downloaded"
-msgstr "بەزى ھۆججەتلەر چۈشۈرۈلىدۇ"
-
-#: ../toolbars/midori-transferbar.c:284
-msgid "_Quit Midori"
-msgstr "Midori نى ئاخىرلاشتۇر(_Q)"
-
-#: ../toolbars/midori-transferbar.c:286
-msgid "The transfers will be cancelled if Midori quits."
-msgstr "Midori ئاخىرلاشتۇرۇلسا ئۇزىتىشلار ئۈزۈلىدۇ."
-
-#: ../panels/midori-bookmarks.c:109
-msgid "Bookmarks"
-msgstr "خەتكۈش"
-
-#: ../panels/midori-bookmarks.c:244
-#, c-format
-msgid "Failed to add bookmark item: %s\n"
-msgstr "خەتكۈش تۇرىنى ئېچىش مەغلۇپ بولدى: %s\n"
-
-# tooltip
-#: ../panels/midori-bookmarks.c:430
-msgid "Edit the selected bookmark"
-msgstr "تاللانغان خەتكۈچنى تەھرىرلەيدۇ"
-
-# tooltip
-#: ../panels/midori-bookmarks.c:438
-msgid "Delete the selected bookmark"
-msgstr "تاللانغان خەتكۈچنى ئۆچۈرىدۇ"
-
-#: ../panels/midori-bookmarks.c:451
-msgid "Add a new folder"
-msgstr "يېڭى مۇندەرىجە قوش"
-
-#: ../panels/midori-bookmarks.c:585
-msgid "Separator "
-msgstr "ئايرىغۇچ "
-
-#: ../panels/midori-console.c:87
-msgid "Console"
-msgstr "كۆزنەك"
-
-# tooltip
-#: ../panels/midori-console.c:361
-msgid "Copy _All"
-msgstr "ھەممىنى كۆچۈر(_A)"
-
-# tooltip
-#: ../panels/midori-console.c:362
-msgid "Copy All"
-msgstr "ھەممىنى كۆچۈر"
-
-#: ../panels/midori-extensions.c:91
-msgid "Extensions"
-msgstr "كېڭەيتىلمە"
-
-#: ../panels/midori-history.c:273
-msgid "Erroneous clock time"
-msgstr "ۋاقىت خاتالىقى"
-
-#: ../panels/midori-history.c:274
-msgid ""
-"The clock time lies in the past. Please check the current date and time."
-msgstr " "
-
-#: ../panels/midori-history.c:286
-msgid "A week ago"
-msgstr "بىر ھەپتە بۇرۇن"
-
-#: ../panels/midori-history.c:288
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d كۈن بۇرۇن"
-
-#: ../panels/midori-history.c:291
-msgid "Today"
-msgstr "بۈگۈن"
-
-#: ../panels/midori-history.c:293
-msgid "Yesterday"
-msgstr "تۈنۈگۈن"
-
-#: ../panels/midori-history.c:378
-msgid "Are you sure you want to remove all history items?"
-msgstr "بارلىق ئىزلارنى ئۆچۈرەمسىز؟"
-
-# tooltip
-#: ../panels/midori-history.c:437
-msgid "Bookmark the selected history item"
-msgstr "تاللانغان ئىزنى خەتكۈچكە قوشىدۇ"
-
-# tooltip
-#: ../panels/midori-history.c:446
-msgid "Delete the selected history item"
-msgstr "تاللانغان ئىزنى ئۆچۈرىدۇ"
-
-# tooltip
-#: ../panels/midori-history.c:454
-msgid "Clear the entire history"
-msgstr "بارلىق ئىزنى تازىلايدۇ"
-
-#: ../panels/midori-history.c:952
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid "Filter:"
-msgstr "سۈزگۈچ:"
-
-#: ../panels/midori-transfers.c:478
-msgid "Open Destination _Folder"
-msgstr "نىشان مۇندەرىجىنى ئاچ(_F)"
-
-#: ../panels/midori-transfers.c:481
-msgid "Copy Link Loc_ation"
-msgstr "ئۇلانما ئورنىنى كۆچۈر(_A)"
-
-#: ../katze/katze-http-auth.c:214
-msgid "Authentication Required"
-msgstr "دەلىللەش زۆرۈر"
-
-#: ../katze/katze-http-auth.c:230
-msgid ""
-"A username and a password are required\n"
-"to open this location:"
-msgstr "بۇ ئورۇننى ئېچىش ئۈچۈن ئىشلەتكۈچى ئاتى ۋە ئىم\n"
-"زۆرۈردۇر:"
-
-#: ../katze/katze-http-auth.c:244
-msgid "Username"
-msgstr "ئىشلەتكۈچى ئاتى"
-
-#: ../katze/katze-http-auth.c:257
-msgid "Password"
-msgstr "ئىم"
-
-#: ../katze/katze-http-auth.c:272
-msgid "_Remember password"
-msgstr "ئىمنى ئەستە تۇتۇۋال(_R)"
-
-#: ../katze/katze-throbber.c:882
-#, c-format
-msgid "Named icon '%s' couldn't be loaded"
-msgstr "'%s' ئاتلىق سىنبەلگىنى ئوقۇيالمىدى"
-
-#: ../katze/katze-throbber.c:895
-#, c-format
-msgid "Stock icon '%s' couldn't be loaded"
-msgstr "Stock سىنبەلگە '%s' نى ئوقۇيالمىدى"
-
-#: ../katze/katze-throbber.c:963
-msgid "Animation frames are broken"
-msgstr ""
-
-#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893
-#, c-format
-msgid "Property '%s' is invalid for %s"
-msgstr "'%s' بولسا %s نىڭ خاسلىقى ئەمەس"
-
-#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573
-msgid "Choose file"
-msgstr "ھۆججەت تاللا"
-
-#: ../katze/katze-utils.c:559
-msgid "Choose folder"
-msgstr "مۇندەرىجە تاللا"
-
-#: ../katze/katze-preferences.c:95
-#, c-format
-msgid "Preferences for %s"
-msgstr "%s نى تەڭشە"
-
-#: ../extensions/adblock.c:415
-msgid "Configure Advertisement filters"
-msgstr "ئېلان سۈزگۈچىنى تەڭشە"
-
-#: ../extensions/adblock.c:447
-#, c-format
-msgid ""
-"Type the address of a preconfigured filter list in the text entry and click "
-"\"Add\" to add it to the list. You can find more lists at %s."
-msgstr ""
-
-#: ../extensions/adblock.c:587
-msgid "Configure _Advertisement filters..."
-msgstr "ئېلان سۈزگۈچىنى تەڭشە(_A)..."
-
-#: ../extensions/adblock.c:841
-msgid "Edit rule"
-msgstr "تۇزۇم تەھرىرلە"
-
-#: ../extensions/adblock.c:854
-msgid "_Rule:"
-msgstr "تۇزۇم(_R):"
-
-#: ../extensions/adblock.c:908
-msgid "Bl_ock image"
-msgstr "سۈرەتنى چەكلە(_O)"
-
-#: ../extensions/adblock.c:913
-msgid "Bl_ock link"
-msgstr "ئۇلانمىنى چەكلە(_O)"
-
-#: ../extensions/adblock.c:1489
-msgid "Advertisement blocker"
-msgstr "ئېلان چەكلىگۈ"
-
-# description
-#: ../extensions/adblock.c:1490
-msgid "Block advertisements according to a filter list"
-msgstr "سۈزگۈچ تىزىملىكىگە ئاساسەن ئېلاننى چەكلەيدۇ"
-
-#: ../extensions/addons.c:122
-#, c-format
-msgid "Copy %s to the folder %s."
-msgstr "%s نى مۇندەرىجە %s غا كۆچۈرىدۇ."
-
-#: ../extensions/addons.c:177
-msgid "Userscripts"
-msgstr "Userscripts"
-
-#: ../extensions/addons.c:179
-msgid "Userstyles"
-msgstr "ئىشلەتكۈچى ئۇسلۇبى"
-
-#: ../extensions/addons.c:1085
-#, c-format
-msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
-msgstr "كېڭەيتىلمە '%s' نىڭ تەڭشىكىنى ساقلىغىلى بولمىدى: %s\n"
-
-#: ../extensions/addons.c:1086 ../extensions/addons.c:1253
-msgid "User addons"
-msgstr "ئىشلەتكۈچى قوشۇلمىسى"
-
-#: ../extensions/addons.c:1210
-#, c-format
-msgid "Can't monitor folder '%s': %s"
-msgstr "مۇندەرىجە '%s' نى كۆزەتكىلى بولمىدى: %s"
-
-#: ../extensions/addons.c:1254
-msgid "Support for userscripts and userstyles"
-msgstr "userscripts ۋە ئىشلەتكۈچى ئۇسلۇبىنى ئىشلەتكىلى بولىدۇ"
-
-#: ../extensions/colorful-tabs.c:204
-msgid "Colorful Tabs"
-msgstr "رەڭلىك بەتكۈچلەر"
-
-# description
-#: ../extensions/colorful-tabs.c:205
-msgid "Tint each tab distinctly"
-msgstr "ھەر بىر بەتكۈچنى ئوخشىمىغان رەڭدە كۆرسەت"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:82
-#: ../extensions/cookie-manager/main.c:56
-msgid "Cookie Manager"
-msgstr "Cookie باشقۇرغۇ"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:112
-msgid "Delete All"
-msgstr "ھەممىنى ئۆچۈر…"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:114
-msgid ""
-"Deletes all shown cookies. If a filter is set, only those cookies are "
-"deleted which match the filter."
-msgstr "كۆرۈنگەن ھەممە cookie نى ئۆچۈرىدۇ. ئەگەر سۈزگۈچ بار بولسا، سۈزۈلگەننىلا ئۆچۈرىدۇ."
-
-# tooltip
-#: ../extensions/cookie-manager/cookie-manager-page.c:129
-msgid "Expand All"
-msgstr "ھەممىنى ياي"
-
-# tooltip
-#: ../extensions/cookie-manager/cookie-manager-page.c:136
-msgid "Collapse All"
-msgstr "ھەممىنى قاتلا"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:578
-msgid "Do you really want to delete all cookies?"
-msgstr "ھەممە cookie راستلا ئۆچۈرەمسىز؟"
-
-# Dialog title
-#: ../extensions/cookie-manager/cookie-manager-page.c:580
-msgid "Question"
-msgstr "سوئال"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:589
-msgid "Only cookies which match the filter will be deleted."
-msgstr "سۈزۈلگەن cookie نىلا ئۆچۈرىدۇ."
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:677
-msgid "At the end of the session"
-msgstr "ئەڭگىمەنىڭ ئاخىرىغىچە"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:680
-#, c-format
-msgid ""
-"Host : %s\n"
-"Name : %s\n"
-"Value : %s\n"
-"Path : %s\n"
-"Secure : %s\n"
-"Expires : %s"
-msgstr "Host : %s\n"
-"ئاتى : %s\n"
-"قىممىتى : %s\n"
-"يولى : %s\n"
-"بىخەتەر : %s\n"
-"مۇددىتى : %s"
-
-# cookie: Secure flag is set.
-#: ../extensions/cookie-manager/cookie-manager-page.c:686
-msgid "Yes"
-msgstr "ھەئە"
-
-# cookie: Secure flag isn't set.
-#: ../extensions/cookie-manager/cookie-manager-page.c:686
-msgid "No"
-msgstr "ياق"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:700
-#, c-format
-msgid ""
-"Domain : %s\n"
-"Cookies : %d"
-msgstr "Domain : %s\n"
-"Cookie سانى : %d"
-
-# Column name of cookie browser
-#: ../extensions/cookie-manager/cookie-manager-page.c:1030
-msgid "Name"
-msgstr "ئاتى"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1083
-msgid "_Expand All"
-msgstr "ھەممىنى ياي(_E)"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1091
-msgid "_Collapse All"
-msgstr "ھەممىنى قاتلا(_C)"
-
-# tooltip
-#: ../extensions/cookie-manager/cookie-manager-page.c:1149
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-
-#: ../extensions/cookie-manager/main.c:40
-msgid "_Cookie Manager"
-msgstr "Cookie باشقۇرغۇ(_C)"
-
-# description
-#: ../extensions/cookie-manager/main.c:57
-msgid "List, view and delete cookies"
-msgstr "Cookie نى تىزىپ كۆرسىتىدۇ، كۆرىدۇ، ئۆچۈرىدۇ"
-
-#: ../extensions/copy-tabs.c:39
-msgid "Copy Tab _Addresses"
-msgstr "بەتكۈچ ئادرېسىنى كۆچۈرىدۇ(_A)"
-
-#: ../extensions/copy-tabs.c:98
-msgid "Copy Addresses of Tabs"
-msgstr "بەتكۈچ ئادرېسىنى كۆچۈرىدۇ"
-
-#: ../extensions/copy-tabs.c:99
-msgid "Copy the addresses of all tabs to the clipboard"
-msgstr "بارلىق بەتكۈچنىڭ ئادرېسىنى clipboard قا كۆچۈرىدۇ"
-
-#: ../extensions/feed-panel/feed-atom.c:209
-msgid "Failed to find required Atom \"entry\" elements in XML data."
-msgstr "XML غا زۆرۈر بولغان Atom \"entry\" ئېلېمېنتى تېپىلمىدى."
-
-#: ../extensions/feed-panel/feed-atom.c:315
-msgid "Failed to find required Atom \"feed\" elements in XML data."
-msgstr "XML غا زۆرۈر بولغان Atom \"feed\" ئېلېمېنتى تېپىلمىدى."
-
-#. i18n: The local date a feed was last updated
-#: ../extensions/feed-panel/feed-panel.c:398
-#, c-format
-msgctxt "Feed"
-msgid "Last updated: %s."
-msgstr "يېڭىلانغان ۋاقتى: %s"
-
-#: ../extensions/feed-panel/feed-panel.c:670
-msgid "Feeds"
-msgstr "Feeds"
-
-#: ../extensions/feed-panel/feed-panel.c:723
-msgid "Add new feed"
-msgstr "يېڭى feed قوش"
-
-#: ../extensions/feed-panel/feed-panel.c:730
-msgid "Delete feed"
-msgstr "feed ئۆچۈر"
-
-#: ../extensions/feed-panel/feed-panel.c:812
-msgid "_Feeds"
-msgstr "feed(_F)"
-
-#: ../extensions/feed-panel/feed-parse.c:192
-#, c-format
-msgid "Failed to find root element in feed XML data."
-msgstr "feed XML ئىچىدىن root ئېلېمېنتىنى تېپىش مەغلۇپ بولدى"
-
-#: ../extensions/feed-panel/feed-parse.c:232
-#, c-format
-msgid "Unsupported feed format."
-msgstr "بۇ خىل feed فورماتىنى تېخى ئىشلەتكىلى بولمايدۇ"
-
-#: ../extensions/feed-panel/feed-parse.c:262
-#, c-format
-msgid "Failed to parse XML feed: %s"
-msgstr "XML feed نى تەھلىل قىلىش مەغلۇپ بولدى: %s"
-
-#: ../extensions/feed-panel/feed-rss.c:46
-msgid "Failed to find \"channel\" element in RSS XML data."
-msgstr "RSS XML ئىچىدىن \"channel\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى"
-
-#: ../extensions/feed-panel/feed-rss.c:51
-msgid "Unsupported RSS version found."
-msgstr "RSS نىڭ بۇ نەشرىنى تېخى ئىشلىتەلمەيمەن"
-
-#: ../extensions/feed-panel/feed-rss.c:148
-msgid "Failed to find required RSS \"item\" elements in XML data."
-msgstr "XML ئىچىدىن زۆرۈر بولغان RSS \"item\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى."
-
-#: ../extensions/feed-panel/feed-rss.c:248
-msgid "Failed to find required RSS \"channel\" elements in XML data."
-msgstr "XML ئىچىدىن زۆرۈر بولغان RSS \"channel\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى."
-
-#: ../extensions/feed-panel/main.c:129
-msgid "Error"
-msgstr "خاتالىق"
-
-#: ../extensions/feed-panel/main.c:131
-#, c-format
-msgid "Feed '%s' already exists"
-msgstr "Feed '%s' ئاللىقاچان بار"
-
-#: ../extensions/feed-panel/main.c:208
-#, c-format
-msgid "Error loading feed '%s'"
-msgstr "Feed '%s' ئوقۇشتا خاتالىق كۆرۈلدى"
-
-#: ../extensions/feed-panel/main.c:516
-msgid "Feed Panel"
-msgstr "Feed Panel"
-
-# description
-#: ../extensions/feed-panel/main.c:517
-msgid "Read Atom/ RSS feeds"
-msgstr "Atom/RSS Feedنى ئوقۇۋاتىدۇ"
-
-#: ../extensions/formhistory.c:144
-#, c-format
-msgid "Failed to add form value: %s\n"
-msgstr "form قىممىتىنى قوشۇش مەغلۇپ بولدى: %s\n"
-
-#: ../extensions/formhistory.c:510
-msgid "Stores history of entered form data"
-msgstr "form كىرگۈزۈلگەن ئۇچۇرلارنى ئەستە ساقلىۋالىدۇ"
-
-#: ../extensions/formhistory.c:514
-#, c-format
-msgid "Not available: %s"
-msgstr "ئىشلەتكىلى بولمايدۇ: %s"
-
-#: ../extensions/formhistory.c:515
-msgid "Resource files not installed"
-msgstr "Resource ھۆججىتى ئورنىتىلمىغان"
-
-#: ../extensions/formhistory.c:521
-msgid "Form history filler"
-msgstr "ئىز تولدۇرغۇدىن"
-
-#: ../extensions/mouse-gestures.c:303
-msgid "Mouse Gestures"
-msgstr "چاشقىنەك ئىشارىتى"
-
-# description
-#: ../extensions/mouse-gestures.c:304
-msgid "Control Midori by moving the mouse"
-msgstr "چاشقىنەك ھەرىكىتىدە Midori نى باشقۇرىدۇ"
-
-#. i18n: A panel showing a user specified web page
-#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177
-msgid "Pageholder"
-msgstr "Pageholder"
-
-#: ../extensions/page-holder.c:161
-msgid "_Pageholder"
-msgstr "Pageholder(P)"
-
-#: ../extensions/page-holder.c:178
-msgid "Keep one or multiple pages open in parallel to your tabs"
-msgstr "بەتكۈچلەردە بىر ياكى كوپ بەتلەرنى پاراللېل ئاچسۇن"
-
-#: ../extensions/shortcuts.c:170
-msgid "Customize Keyboard shortcuts"
-msgstr "كۇنۇپكا تېزلەتمىسىنى ئۆزلەشتۈر"
-
-#: ../extensions/shortcuts.c:276
-msgid "Customize Sh_ortcuts..."
-msgstr "تېزلەتمىنى ئۆزلەشتۈر(_O)..."
-
-#: ../extensions/shortcuts.c:315
-msgid "Shortcuts"
-msgstr "تېزلەتمە"
-
-# description
-#: ../extensions/shortcuts.c:316
-msgid "View and edit keyboard shortcuts"
-msgstr "كۇنۇپكا تېزلەتمىسىنى كۆرىدۇ ۋە تەھرىرلەيدۇ"
-
-#: ../extensions/statusbar-features.c:84
-msgid "Images"
-msgstr "سۈرەتلەر"
-
-#: ../extensions/statusbar-features.c:96
-msgid "Scripts"
-msgstr "Scripts"
-
-#: ../extensions/statusbar-features.c:108
-msgid "Netscape plugins"
-msgstr "Netscape قىستۇرمىلىرى"
-
-#: ../extensions/statusbar-features.c:149
-msgid "Statusbar Features"
-msgstr "ھالەت بالدىقى ئالاھىدىلىكلىرى"
-
-# description
-#: ../extensions/statusbar-features.c:150
-msgid "Easily toggle features on web pages on and off"
-msgstr ""
-
-#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625
-msgid "Tab Panel"
-msgstr "بەتكۈچ Panel"
-
-#: ../extensions/tab-panel.c:609
-msgid "T_ab Panel"
-msgstr "بەتكۈچ Panel(_A)"
-
-# description
-#: ../extensions/tab-panel.c:626
-msgid "Show tabs in a vertical panel"
-msgstr "بەتكۈچلەرنى تىك panel دا كۆرسىتىدۇ"
-
-#: ../extensions/tab-switcher.c:402
-msgid "Tab History List"
-msgstr "بەتكۈچ ئىزى تىزىملىكى"
-
-#: ../extensions/tab-switcher.c:403
-msgid "Allows to switch tabs by choosing from a list sorted by last usage"
-msgstr ""
-
-#: ../extensions/tabs-minimized.c:79
-msgid "Minimize new Tabs"
-msgstr "يېڭى بەتكۈچنى ئەڭ كىچىك قىل"
-
-#: ../extensions/tabs-minimized.c:80
-msgid "New tabs open minimized"
-msgstr "يېڭى بەتكۈچنى ئەڭ كىچىك ھالەتتە ئاچىدۇ"
-
-#: ../extensions/toolbar-editor.c:389
-msgid "Customize Toolbar"
-msgstr "قورال ئىستونىنى ئۆزى بەلگىلەش"
-
-#: ../extensions/toolbar-editor.c:405
-msgid ""
-"Select items to be displayed on the toolbar. Items can be reordered by drag "
-"and drop."
-msgstr "قورال بالدىقىدا كۆرسىتىلىدىغان تۈرلەرنى تاللا. ئۇلارنى ئۇنىڭ تەرتىپىنى تۇتۇپ تاشلاپ ئۆزگەرتىشكە بولىدۇ"
-
-#: ../extensions/toolbar-editor.c:421
-msgid "Available Items"
-msgstr "بار تۈرلەر"
-
-#: ../extensions/toolbar-editor.c:442
-msgid "Displayed Items"
-msgstr "كۆرسىتىدىغان تۈرلەر"
-
-#: ../extensions/toolbar-editor.c:577
-msgid "Customize _Toolbar..."
-msgstr "قورال بالدىقىنى ئۆزلەشتۈر(_T)..."
-
-#: ../extensions/toolbar-editor.c:608
-msgid "Toolbar Editor"
-msgstr "قورال بالدىقى تەھرىرلىگۈ"
-
-# description
-#: ../extensions/toolbar-editor.c:609
-msgid "Easily edit the toolbar layout"
-msgstr "قورال بالدىقىنىڭ ئورۇنلاشتۇرۇلۇشىنى ئاسانلا تەھرىرلىگىلى بولىدۇ"
-
-#: ../extensions/web-cache.c:465
-msgid "Cache HTTP communication on disk"
-msgstr "HTTP ئالاقىسىنى دىسكىغا غەملەيدۇ"
+# Uyghur translation for midori.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Gheyret Kenji , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: midori\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-24 04:27+0000\n"
+"PO-Revision-Date: 2011-11-09 16:10+0900\n"
+"Last-Translator: Gheyret Kenji \n"
+"Language-Team: Uyghur Computer Science Association \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../data/midori.desktop.in.h:1
+msgid "Browse the Web"
+msgstr "تور كۆرۈش"
+
+#: ../data/midori.desktop.in.h:2
+msgid "Internet;WWW;Explorer"
+msgstr "ئىنتېرنېت؛WWW؛Explorer"
+
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:2009 ../midori/main.c:2033
+#: ../midori/main.c:2047 ../midori/midori-websettings.c:316
+msgid "Midori"
+msgstr "مىدورى(Midori)"
+
+#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "مىدورى(Midori) توركۆرگۈ"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "يېڭى شەخسىي كۆرۈش كۆزنىكى"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1491
+msgid "New Tab"
+msgstr "يېڭى بەتكۈچ"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1488
+msgid "New Window"
+msgstr "يېڭى كۆزنەك"
+
+#: ../data/midori.desktop.in.h:8
+msgid "Web Browser"
+msgstr "توركۆرگۈ"
+
+#: ../data/midori-private.desktop.in.h:1
+msgid "Midori Private Browsing"
+msgstr "مىدورى(Midori) شەخسىي كۆرۈش"
+
+#: ../data/midori-private.desktop.in.h:2
+msgid "Open a new private browsing window"
+msgstr "يېڭى شەخسىي كۆرۈش كۆزنىكىدىن بىرنى ئاچىدۇ"
+
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4505
+msgid "Private Browsing"
+msgstr "شەخسىي كۆرۈش"
+
+#: ../midori/main.c:91 ../midori/main.c:97
+#, c-format
+msgid "The configuration couldn't be loaded: %s\n"
+msgstr "تەڭشەكنى ئوقۇغىلى بولمىدى: %s\n"
+
+#: ../midori/main.c:145
+#, c-format
+msgid "Value '%s' is invalid for %s"
+msgstr "قىممەت ‹%s› ئىناۋەتسىز (%s نىڭ قىممىتى)"
+
+#: ../midori/main.c:150 ../midori/main.c:254
+#, c-format
+msgid "Invalid configuration value '%s'"
+msgstr "سەپلىمە قىممەت ‹%s› ئىناۋەتسىز"
+
+#: ../midori/main.c:375
+#, c-format
+msgid "The search engines couldn't be loaded. %s\n"
+msgstr "ئىزدەش ماتورىنى ئوقۇغىلى بولمىدى. %s\n"
+
+#: ../midori/main.c:429
+#, c-format
+msgid "Failed to clear history: %s\n"
+msgstr "ئىزنى تازىلاش مەغلۇپ بولدى: %s\n"
+
+#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531
+#, c-format
+msgid "Failed to open database: %s\n"
+msgstr "سانداننى ئېچىش مەغلۇپ بولدى: %s\n"
+
+#. i18n: Couldn't remove items that are older than n days
+#: ../midori/main.c:523
+#, c-format
+msgid "Failed to remove old history items: %s\n"
+msgstr "كونا ئىزلارنى ئۆچۈرۈش مەغلۇپ بولدى: %s\n"
+
+#: ../midori/main.c:545
+#, c-format
+msgid "The configuration couldn't be saved. %s"
+msgstr "تەڭشەكنى ساقلىغىلى بولمىدى. %s"
+
+#: ../midori/main.c:571
+#, c-format
+msgid "The search engines couldn't be saved. %s"
+msgstr "ئىزدەش ماتورىنى ساقلىغىنى بولمىدى. %s"
+
+#. i18n: Trash, or wastebin, containing closed tabs
+#: ../midori/main.c:608
+#, c-format
+msgid "The trash couldn't be saved. %s"
+msgstr "ئەخلەتنى ساقلىغىلى بولمىدى. %s"
+
+#: ../midori/main.c:681 ../panels/midori-extensions.c:90
+msgid "Extensions"
+msgstr "كېڭەيتىلمىلەر"
+
+#: ../midori/main.c:695
+msgid "Privacy"
+msgstr "شەخسىيەت"
+
+#: ../midori/main.c:707
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
+msgstr ""
+
+#: ../midori/main.c:763
+#, c-format
+msgid "The session couldn't be saved. %s"
+msgstr "ئەڭگىمەنى ساقلىغىلى بولمىدى. %s"
+
+#: ../midori/main.c:985
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
+msgstr ""
+"ئالىي ئىشلەتكۈچى ئىسپاتنامە ھۆججىتى يوق. SSL ئىسپاتنامىسىنى دەلىللىگىلى "
+"بولمايدۇ."
+
+#: ../midori/main.c:1077
+msgid ""
+"Midori seems to have crashed the last time it was opened. If this happened "
+"repeatedly, try one of the following options to solve the problem."
+msgstr ""
+"مىدورى(Midori) ئالدىنقى قېتىم قوزغىتىلغاندا غۇلاپ كەتكەندەك قىلىدۇ. بۇ يەنە "
+"تەكرارلانسا تۆۋەندىكى تاللانمىلارنى تاللاپ كۆرۈپ بېقىڭ."
+
+#: ../midori/main.c:1096
+msgid "Modify _preferences"
+msgstr "تەڭشەكنى ئۆزگەرت(_P)"
+
+#: ../midori/main.c:1100
+msgid "Disable all _extensions"
+msgstr "بارلىق كېڭەيتمىنى چەكلە(_E)"
+
+#: ../midori/main.c:1113
+msgid "Discard old tabs"
+msgstr "كونا بەتكۈچلەرنى تاشلىۋەت"
+
+#: ../midori/main.c:1114 ../midori/midori-websettings.c:224
+msgid "Show last tabs without loading"
+msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتنى قايتا ئوقۇماي كۆرسەت"
+
+#: ../midori/main.c:1115 ../midori/midori-websettings.c:223
+msgid "Show last open tabs"
+msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتكۈچنى كۆرسەت"
+
+#: ../midori/main.c:1363 ../midori/main.c:2417
+#, c-format
+msgid "The session couldn't be loaded: %s\n"
+msgstr "ئەڭگىمەنى ئوقۇغىلى بولمىدى: %s\n"
+
+#: ../midori/main.c:1501
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr "كۆرۈنۈش بۇ يەرگە ساقلاندى :%s\n"
+
+#: ../midori/main.c:1917
+msgid "Run ADDRESS as a web application"
+msgstr "ADDRESS نى تور پروگراممىسى قاتارىدا ئىجرا قىلىدۇ"
+
+#: ../midori/main.c:1917
+msgid "ADDRESS"
+msgstr "ADDRESS"
+
+#: ../midori/main.c:1920
+msgid "Use FOLDER as configuration folder"
+msgstr "FOLDER نى تەڭشەك مۇندەرىجىسى قىلىپ ئىشلىتىدۇ"
+
+#: ../midori/main.c:1920
+msgid "FOLDER"
+msgstr "FOLDER"
+
+#: ../midori/main.c:1923
+msgid "Private browsing, no changes are saved"
+msgstr "شەخسىي كۆرۈش، ئۆزگىرىشلەر ساقلانمىدى"
+
+#: ../midori/main.c:1925
+msgid "Show a diagnostic dialog"
+msgstr "دىئاگنوز سۆزلەشكۈسىنى كۆرسىتىدۇ"
+
+#: ../midori/main.c:1927
+msgid "Run the specified filename as javascript"
+msgstr "كۆرسىتىلگەن ھۆججەت نامىنى javascript دەپ قاراپ ئىجرا قىلىدۇ"
+
+#: ../midori/main.c:1929
+msgid "Take a snapshot of the specified URI"
+msgstr "كۆرسىتىلگەن URI نىڭ كۆرۈنۈشىنى ئالىدۇ"
+
+#: ../midori/main.c:1931
+msgid "Execute the specified command"
+msgstr "كۆرسىتىلگەن بۇيرۇقنى ئىجرا قىلىدۇ"
+
+#: ../midori/main.c:1933
+msgid "List available commands to execute with -e/ --execute"
+msgstr ""
+"تاللانما -e/ --execute بىلەن بىرگە ئىجرا قىلغىلى بولىدىغان بۇيرۇقلارنى "
+"كۆرسىتىدۇ"
+
+#: ../midori/main.c:1935
+msgid "Display program version"
+msgstr "پروگرامما نەشرى كۆرسىتىدۇ"
+
+#: ../midori/main.c:1937
+msgid "Addresses"
+msgstr "ئادرېسلار"
+
+#: ../midori/main.c:1939
+msgid "Block URIs according to regular expression PATTERN"
+msgstr "ئۆلچەملىك ئىپادە PATTERN غا بويسۇنۇپ URI چەكلە"
+
+#: ../midori/main.c:1939
+msgid "PATTERN"
+msgstr "PATTERN"
+
+#. i18n: CLI: Close tabs, clear private data, open starting page
+#: ../midori/main.c:1943
+msgid "Reset Midori after SECONDS seconds of inactivity"
+msgstr ""
+"مىدورى(Midori) ئاكتىپ ئەمەس ھالەتتە SECONDS سېكۇنت تۇرسا، Midori نى ئەسلىگە "
+"قايتىدۇ"
+
+#: ../midori/main.c:1943
+msgid "SECONDS"
+msgstr "SECONDS"
+
+#: ../midori/main.c:1946
+msgid "Redirects console warnings to the specified FILENAME"
+msgstr "ئېكراندىكى ئاگاھلاندۇرۇشلارنى FILENAME غا يوللايدۇ"
+
+#: ../midori/main.c:1946
+msgid "FILENAME"
+msgstr "FILENAME"
+
+#: ../midori/main.c:2048
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "پىكىر، تەكلىپ، شۇنداقلا كەمتۈكلەرنى بۇ يەرگە مەلۇم قىلىڭ:"
+
+#: ../midori/main.c:2050
+msgid "Check for new versions at:"
+msgstr "يېڭى نەشرىنى بۇ يەردىن تەكشۈر:"
+
+#. i18n: Logins and passwords in websites and web forms
+#: ../midori/main.c:2145
+msgid "Saved logins and _passwords"
+msgstr "ساقلانغان كىرىشلەر ۋە ئىملار(_P)"
+
+#: ../midori/main.c:2147
+msgid "Cookies and Website data"
+msgstr "Cookies ۋە تورتۇرا سانلىق-مەلۇماتلىرى"
+
+#. TODO: Preserve page icons of search engines and merge privacy items
+#: ../midori/main.c:2151 ../midori/midori-websettings.c:1021
+#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
+msgid "Web Cache"
+msgstr "تور غەملىكى"
+
+#: ../midori/main.c:2154
+msgid "Website icons"
+msgstr "تورتۇرا سىنبەلگىسى"
+
+#: ../midori/main.c:2258
+msgid "An unknown error occured"
+msgstr "نامەلۇم خاتالىق كۆرۈلدى"
+
+#: ../midori/main.c:2365
+msgid "An instance of Midori is already running but not responding.\n"
+msgstr "مىدورى(Midori)نىڭ ئۈلگىسى ئىجرا قىلىنىۋېتىپتۇ بىراق ئىنكاس يوق.\n"
+
+#: ../midori/main.c:2399
+#, c-format
+msgid "Bookmarks couldn't be loaded: %s\n"
+msgstr "خەتكۈشنى ئوقۇغىلى بولمىدى: %s\n"
+
+#: ../midori/main.c:2432
+#, c-format
+msgid "The trash couldn't be loaded: %s\n"
+msgstr "ئەخلەت ساندۇقىنى ئوقۇغىلى بولمىدى: %s\n"
+
+#: ../midori/main.c:2445
+#, c-format
+msgid "The history couldn't be loaded: %s\n"
+msgstr "ئىزلارنى ئوقۇغىلى بولمىدى: %s\n"
+
+#: ../midori/main.c:2460
+msgid "The following errors occured:"
+msgstr "تۆۋەندىكىدەك خاتالىق كۆرۈلدى:"
+
+#: ../midori/main.c:2476
+msgid "_Ignore"
+msgstr "پەرۋا قىلما(_I)"
+
+#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:557
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "تاسادىپىي مەشغۇلات ‹%s›"
+
+#: ../midori/midori-app.c:1459 ../midori/midori-browser.c:6452
+msgid "_Bookmarks"
+msgstr "خەتكۈش(_B)"
+
+#: ../midori/midori-app.c:1460
+msgid "Add Boo_kmark"
+msgstr "خەتكۈش قوش(_K)"
+
+#: ../midori/midori-app.c:1461
+msgid "_Extensions"
+msgstr "كېڭەيتمىلەر(_E)"
+
+#. i18n: Browsing history, visited web pages, closed tabs
+#: ../midori/midori-app.c:1462 ../midori/midori-browser.c:4905
+msgid "_History"
+msgstr "ئىز(_H)"
+
+#: ../midori/midori-app.c:1463
+msgid "_Userscripts"
+msgstr "_Userscripts"
+
+#: ../midori/midori-app.c:1464
+msgid "User_styles"
+msgstr "ئىشلەتكۈچى ئۇسلۇبى(_S)"
+
+#: ../midori/midori-app.c:1465
+msgid "New _Tab"
+msgstr "يېڭى بەتكۈچ(_T)"
+
+#: ../midori/midori-app.c:1466
+msgid "_Transfers"
+msgstr "ئۇزىتىش(_T)"
+
+#: ../midori/midori-app.c:1467
+msgid "Netscape p_lugins"
+msgstr "Netscape قىستۇرمىلىرى(_L)"
+
+#: ../midori/midori-app.c:1468
+msgid "_Closed Tabs"
+msgstr "تاقالغان بەتكۈچلەر(_C)"
+
+#: ../midori/midori-app.c:1469 ../midori/midori-browser.c:5588
+msgid "New _Window"
+msgstr "يېڭى كۆزنەك(_W)"
+
+#: ../midori/midori-app.c:1470
+msgid "New _Folder"
+msgstr "يېڭى مۇندەرىجە(_F)"
+
+#: ../midori/midori-app.c:1499
+msgid "[Addresses]"
+msgstr "[ئادرېسلار]"
+
+#: ../midori/midori-array.c:522
+msgid "File not found."
+msgstr "ھۆججەت تېپىلمىدى."
+
+#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
+#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
+msgid "Malformed document."
+msgstr "فورماتى خاتا بولغان پۈتۈك."
+
+#: ../midori/midori-array.c:628
+msgid "Unrecognized bookmark format."
+msgstr "فورماتى خاتا بولغان خەتكۈش."
+
+#: ../midori/midori-array.c:915
+msgid "Writing failed."
+msgstr "يېزىش مەغلۇپ بولدى."
+
+#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5676
+#: ../midori/midori-browser.c:5685
+msgid "Reload the current page"
+msgstr "ھازىرقى بەتنى قايتا ئوقۇيدۇ"
+
+#: ../midori/midori-browser.c:368 ../midori/midori-browser.c:5682
+msgid "Stop loading the current page"
+msgstr "ھازىرقى بېتىنى ئوقۇشنى توختىتىدۇ"
+
+#: ../midori/midori-browser.c:376 ../midori/midori-browser.c:5727
+msgid "Go forward to the next page"
+msgstr "كېيىنكى بەتكە ماڭىدۇ"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:383 ../midori/midori-browser.c:5735
+#: ../midori/midori-browser.c:5738
+msgid "Go to the next sub-page"
+msgstr "كېيىنكى بالا بەتكە يۆتكىلىدۇ"
+
+#: ../midori/midori-browser.c:542
+#, c-format
+msgid "Failed to update title: %s\n"
+msgstr "ماۋزۇنى يېڭىلاش مەغلۇپ بولدى: %s\n"
+
+#: ../midori/midori-browser.c:637
+#, c-format
+msgid "%s (Private Browsing)"
+msgstr "%s (شەخسىي كۆرۈش)"
+
+#: ../midori/midori-browser.c:747 ../midori/midori-browser.c:789
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "خەتكۈش"
+
+#: ../midori/midori-browser.c:849
+msgid "New folder"
+msgstr "يېڭى مۇندەرىجە"
+
+#: ../midori/midori-browser.c:849
+msgid "Edit folder"
+msgstr "مۇندەرىجە تەھرىرلەيدۇ"
+
+#: ../midori/midori-browser.c:851
+msgid "New bookmark"
+msgstr "يېڭى خەتكۈش"
+
+#: ../midori/midori-browser.c:851
+msgid "Edit bookmark"
+msgstr "خەتكۈش تەھرىرلەش"
+
+#: ../midori/midori-browser.c:885
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "خەتكۈشنىڭ ئاتىنى كىرگۈزۈپ ساقلايدىغان ئورۇننى كۆرسىتىپ بېرىدۇ."
+
+#: ../midori/midori-browser.c:946
+msgid "Add to _Speed Dial"
+msgstr "تەز تېلېفون قىلىشنى قوش(_S)"
+
+#: ../midori/midori-browser.c:952
+msgid "Show in the tool_bar"
+msgstr "قورال بالدىقىدا كۆرسەت(_B)"
+
+#: ../midori/midori-browser.c:960
+msgid "Run as _web application"
+msgstr "تور پروگراممىسى شەكلىدە ئىجرا قىل(_W)"
+
+#: ../midori/midori-browser.c:1031
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "ھۆججەت «%s» نى بۇ مۇندەرىجىگە ساقلىغىلى بولمىدى."
+
+#: ../midori/midori-browser.c:1033
+#, c-format
+msgid "You don't have permission to write in this location."
+msgstr "بۇ ئورۇنغا يېزىش ئىمتىيازىڭىز يوق."
+
+#: ../midori/midori-browser.c:1040
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "«%s» نى چۈشۈرۈشكە يېتەرلىك بوشلۇق يوق."
+
+#: ../midori/midori-browser.c:1043
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "ھۆججەتكە %s كېرەك ئىدى، بىراق %s لا بار ئىكەن."
+
+#: ../midori/midori-browser.c:1179 ../midori/midori-browser.c:4709
+msgid "Save file as"
+msgstr "باشقا نامدا ساقلا"
+
+#: ../midori/midori-browser.c:1185
+msgid "Save associated _resources"
+msgstr "مۇناسىۋەتلىك مەنبەلەرنى ساقلا(_R)"
+
+#: ../midori/midori-browser.c:1488
+msgid "A new window has been opened"
+msgstr "يېڭى بىر كۆزنەك ئېچىلدى"
+
+#: ../midori/midori-browser.c:1491
+msgid "A new tab has been opened"
+msgstr "يېڭى بەتكۈچ ئېچىلدى"
+
+#: ../midori/midori-browser.c:1508
+msgid "Error opening the image!"
+msgstr "مەزكۇر سۈرەتنى ئېچىشتا خاتالىق كۆرۈلدى!"
+
+#: ../midori/midori-browser.c:1509
+msgid "Can not open selected image in a default viewer."
+msgstr "تاللانغان سۈرەتنى كۆڭۈلدىكى كۆرگۈدە ئاچقىلى بولمىدى."
+
+#: ../midori/midori-browser.c:1515
+msgid "Error downloading the image!"
+msgstr "مەزكۇر سۈرەتنى چۈشۈرۈشتە خاتالىق كۆرۈلدى!"
+
+#: ../midori/midori-browser.c:1516
+msgid "Can not download selected image."
+msgstr "تاللانغان سۈرەتنى چۈشۈرگىلى بولمىدى."
+
+#: ../midori/midori-browser.c:1637
+msgid "Save file"
+msgstr "ھۆججەت ساقلا"
+
+#: ../midori/midori-browser.c:2540
+msgid "Open file"
+msgstr "ھۆججەتنى ئاچ"
+
+#: ../midori/midori-browser.c:2672
+msgid ""
+"To use the above URI open a news aggregator. There is usually a menu or "
+"button \"New Subscription\", \"New News Feed\" or similar.\n"
+"Alternatively go to Preferences, Applications in Midori, and select a News "
+"Aggregator. Next time you click the news feed icon, it will be added "
+"automatically."
+msgstr ""
+
+#: ../midori/midori-browser.c:2678 ../extensions/feed-panel/main.c:365
+msgid "New feed"
+msgstr "يېڭى feed"
+
+#: ../midori/midori-browser.c:2721 ../midori/midori-browser.c:5751
+#: ../panels/midori-bookmarks.c:527
+msgid "Add a new bookmark"
+msgstr "يېڭى خەتكۈش قوشىدۇ"
+
+#: ../midori/midori-browser.c:3265 ../midori/midori-searchaction.c:487
+msgid "Empty"
+msgstr "قۇرۇق"
+
+#: ../midori/midori-browser.c:3711 ../midori/midori-browser.c:3712
+msgid "Toggle text cursor navigation"
+msgstr "تېكىست نۇر بەلگىسى ئارقىلىق كۆرۈشكە ئۆزگەرت"
+
+#: ../midori/midori-browser.c:3714
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"كۇنۇپكا F7 بېسىلسا نۇربەلگە بىلەن كۆرۈشكە ئۆزگىرىدۇ. ئاكتىپ ھالەتتە بارلىق "
+"تور بەتلىرىدە تېكىست نۇر بەلگىسى كۆرۈنىدۇ."
+
+#: ../midori/midori-browser.c:3717
+msgid "_Enable Caret Browsing"
+msgstr "نۇربەلگە بىلەن كۆرۈش ئىناۋەتلىك قىل(_R)"
+
+#: ../midori/midori-browser.c:4109 ../midori/midori-browser.c:6145
+#, c-format
+msgid "Failed to insert new history item: %s\n"
+msgstr "يېڭى ئىز قىستۇرۇش مەغلۇپ بولدى: %s\n"
+
+#: ../midori/midori-browser.c:4435 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
+msgid "Open all in _Tabs"
+msgstr "ھەممىنى بەتكۈچتە ئاچ(_T)"
+
+#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
+msgid "Open in New _Tab"
+msgstr "يېڭى بەتكۈچتە ئاچ(_T)"
+
+#: ../midori/midori-browser.c:4445 ../midori/midori-view.c:2944
+#: ../midori/midori-view.c:5082 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
+msgid "Open in New _Window"
+msgstr "يېڭى كۆزنەكتە ئاچ(_W)"
+
+#: ../midori/midori-browser.c:4534
+msgid "Arora"
+msgstr "Arora"
+
+#: ../midori/midori-browser.c:4535
+msgid "Kazehakase"
+msgstr "Kazehakase"
+
+#: ../midori/midori-browser.c:4536
+msgid "Opera"
+msgstr "Opera"
+
+#: ../midori/midori-browser.c:4537
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../midori/midori-browser.c:4538
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../midori/midori-browser.c:4539
+#, c-format
+msgid "Firefox (%s)"
+msgstr "Firefox (%s)"
+
+#: ../midori/midori-browser.c:4540
+msgid "Midori 0.2.6"
+msgstr "مىدورى(Midori 0.2.6)"
+
+#: ../midori/midori-browser.c:4561
+msgid "Import bookmarks…"
+msgstr "خەتكۈش ئىمپورت قىل…"
+
+#: ../midori/midori-browser.c:4564 ../midori/midori-browser.c:5756
+msgid "_Import bookmarks"
+msgstr "خەتكۈش ئىمپورت قىل(_I)"
+
+#: ../midori/midori-browser.c:4575
+msgid "_Application:"
+msgstr "پروگرامما(_A):"
+
+#: ../midori/midori-browser.c:4640
+msgid "Import from XBEL or HTML file"
+msgstr "XBEL ياكى HTML دىن ئىمپورت قىلىش"
+
+#: ../midori/midori-browser.c:4668
+msgid "Import from a file"
+msgstr "ھۆججەتتىن ئىمپورت قىلىدۇ"
+
+#: ../midori/midori-browser.c:4680
+msgid "Failed to import bookmarks"
+msgstr "خەتكۈش ئىمپورت قىلىش مەغلۇپ بولدى"
+
+#: ../midori/midori-browser.c:4714
+msgid "XBEL Bookmarks"
+msgstr "XBEL خەتكۈش"
+
+#: ../midori/midori-browser.c:4719
+msgid "Netscape Bookmarks"
+msgstr "Netscape خەتكۈش"
+
+#: ../midori/midori-browser.c:4733
+msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
+msgstr ""
+"مىدورى(Midori) پەقەتلا XBEL (*.xbel) ۋە Netscape (*.html) غا ئېكسپورت "
+"قىلالايدۇ"
+
+#: ../midori/midori-browser.c:4748
+msgid "Failed to export bookmarks"
+msgstr "خەتكۈش ئېكسپورت قىلىش مەغلۇپ بولدى"
+
+#. i18n: Dialog: Clear Private Data, in the Tools menu
+#: ../midori/midori-browser.c:4870
+msgid "Clear Private Data"
+msgstr "شەخسىي سانلىق-مەلۇماتلارنى تازىلايدۇ"
+
+#: ../midori/midori-browser.c:4874
+msgid "_Clear private data"
+msgstr "شەخسىي سانلىق-مەلۇماتلار تازىلا(_C)"
+
+#: ../midori/midori-browser.c:4889
+msgid "Clear the following data:"
+msgstr "تۆۋەندىكى سانلىق-مەلۇماتلارنى تازىلا:"
+
+#: ../midori/midori-browser.c:4899
+msgid "Last open _tabs"
+msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتكۈچلەر"
+
+#: ../midori/midori-browser.c:4925
+msgid "Clear private data when _quitting Midori"
+msgstr ""
+"مىدورى(Midori) نى ئاخىرلاشقاندا شەخسىي سانلىق-مەلۇماتلار تازىلانسۇن(_Q)"
+
+#: ../midori/midori-browser.c:5140
+msgid "A lightweight web browser."
+msgstr "يېنىك ۋە ئەپچىل توركۆرگۈ."
+
+#: ../midori/midori-browser.c:5141
+msgid "See about:version for version info."
+msgstr "نەشر ئۇچۇرىنى about:version دىن كۆرۈڭ."
+
+#: ../midori/midori-browser.c:5143
+msgid ""
+"This library is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU Lesser General Public License as published by the "
+"Free Software Foundation; either version 2.1 of the License, or (at your "
+"option) any later version."
+msgstr ""
+"بۇ فۇنكسىيە ئامبىرى ئەركىن يۇمشاق دېتال؛ سىز ئەركىن يۇمشاق دېتال ۋەخپىسى "
+"تارقاتقان GNU ئادەتتىكى ئاممىۋى ئىجازەتنامە بويىچە ئۇنى قايتا تارقىتىپ ياكى "
+"ئۆزگەرتەلەيسىز؛ سىز شۇ ئىجازەت كېلىشىمىنىڭ ئىككىنچى نەشرى ياكى يۇقىرى "
+"نەشرىنى ئىشلەتسىڭىز بولىدۇ."
+
+#: ../midori/midori-browser.c:5173
+msgid "translator-credits"
+msgstr "غەيرەت ت.كەنجى "
+
+#: ../midori/midori-browser.c:5586
+msgid "_File"
+msgstr "ھۆججەت(_F)"
+
+#: ../midori/midori-browser.c:5589
+msgid "Open a new window"
+msgstr "يېڭى كۆزنەكتىن بىرنى ئاچىدۇ"
+
+#: ../midori/midori-browser.c:5592
+msgid "Open a new tab"
+msgstr "يېڭى بەتكۈچتىن بىرنى ئاچىدۇ"
+
+#: ../midori/midori-browser.c:5594
+msgid "New P_rivate Browsing Window"
+msgstr "يېڭى شەخسىي كۆرۈش كۆزنىكى(_R)"
+
+#: ../midori/midori-browser.c:5598
+msgid "Open a file"
+msgstr "ھۆججەت ئاچىدۇ"
+
+#: ../midori/midori-browser.c:5600
+msgid "_Save Page As…"
+msgstr "بەتنى باشقا ئاتتا ساقلا(_S)…"
+
+#: ../midori/midori-browser.c:5601
+msgid "Save to a file"
+msgstr "ھۆججەتكە ساقلايدۇ"
+
+#: ../midori/midori-browser.c:5603
+msgid "Add to Speed _dial"
+msgstr "تەز تېلېفون قىلىشنى قوش(_D)"
+
+#: ../midori/midori-browser.c:5607
+msgid "Add Shortcut to the _desktop"
+msgstr "ئۈستەلئۈستىگە تېزلەتمە قوش(_D)"
+
+#: ../midori/midori-browser.c:5609
+msgid "Create _Launcher"
+msgstr "ئىجراچى قۇر(_L)"
+
+#: ../midori/midori-browser.c:5613
+msgid "Subscribe to News _feed"
+msgstr "خەۋەر feed غا مۇشتەرى بول(_F)"
+
+#: ../midori/midori-browser.c:5619
+msgid "_Close Tab"
+msgstr "بەتكۈچنى تاقا(_C)"
+
+#: ../midori/midori-browser.c:5620
+msgid "Close the current tab"
+msgstr "ھازىرقى بەتكۈچنى تاقايدۇ"
+
+#: ../midori/midori-browser.c:5622
+msgid "C_lose Window"
+msgstr "كۆزنەك تاقا(_L)"
+
+#: ../midori/midori-browser.c:5626
+msgid "_Share"
+msgstr "ھەمبەھىرلە(_S)"
+
+#: ../midori/midori-browser.c:5631
+msgid "Print the current page"
+msgstr "ھازىرقى بەتنى باسىدۇ"
+
+#: ../midori/midori-browser.c:5634
+msgid "Close a_ll Windows"
+msgstr "بارلىق كۆزنەكلەر تاقا(_L)"
+
+#: ../midori/midori-browser.c:5637
+msgid "_Edit"
+msgstr "تەھرىر(_E)"
+
+#: ../midori/midori-browser.c:5660
+msgid "_Find…"
+msgstr "ئىزدە(_F)…"
+
+#: ../midori/midori-browser.c:5661
+msgid "Find a word or phrase in the page"
+msgstr "بەت ئىچىدىن سوز ياكى سوز بىرىكمىسىنى ئىزدەيدۇ"
+
+#: ../midori/midori-browser.c:5663
+msgid "Find _Next"
+msgstr "كېيىنكىسىنى ئىزدە(_N)"
+
+#: ../midori/midori-browser.c:5666
+msgid "Find _Previous"
+msgstr "ئالدىنقىنى ئىزدە(_P)"
+
+#: ../midori/midori-browser.c:5670
+msgid "Configure the application preferences"
+msgstr "مەزكۇر پروگراممىنىڭ تەڭشىكىنى تەڭشەيدۇ"
+
+#: ../midori/midori-browser.c:5672
+msgid "_View"
+msgstr "كۆرۈنۈش(_V)"
+
+#: ../midori/midori-browser.c:5673
+msgid "_Toolbars"
+msgstr "قورال بالدىقى(_T)"
+
+#: ../midori/midori-browser.c:5678
+msgid "Reload page without caching"
+msgstr "غەملىمەيلا ھۆججەتنى قايتا ئوقۇسۇن"
+
+#: ../midori/midori-browser.c:5688
+msgid "Increase the zoom level"
+msgstr "چوڭايتىش-كىچىكلىتىش دەرىجىسىنى چوڭايتىدۇ"
+
+#: ../midori/midori-browser.c:5691
+msgid "Decrease the zoom level"
+msgstr "چوڭايتىش-كىچىكلىتىش دەرىجىسىنى كىچىكلىتىدۇ"
+
+#: ../midori/midori-browser.c:5695
+msgid "_Encoding"
+msgstr "كودلىشى(_E)"
+
+#: ../midori/midori-browser.c:5697
+msgid "View So_urce"
+msgstr "مەنبەنى كۆرسەت(_U)"
+
+#: ../midori/midori-browser.c:5700
+msgid "Ca_ret Browsing"
+msgstr "نۇربەلگىسىدە كۆرۈش(_R)"
+
+#: ../midori/midori-browser.c:5704
+msgid "Toggle fullscreen view"
+msgstr "تولۇق ئېكران كۆرسىتىش/كۆرسەتمەسلىكنى ئالماشتۇرىدۇ"
+
+#: ../midori/midori-browser.c:5706
+msgid "Scroll _Left"
+msgstr "سولغا سىيرىل(_L)"
+
+#: ../midori/midori-browser.c:5709
+msgid "Scroll _Down"
+msgstr "پەسكە سىيرىل(_D)"
+
+#: ../midori/midori-browser.c:5712
+msgid "Scroll _Up"
+msgstr "ئۈستىگە سىيرىلىدۇ(_U)"
+
+#: ../midori/midori-browser.c:5715
+msgid "Scroll _Right"
+msgstr "ئوڭغا سىيرىل(_R)"
+
+#: ../midori/midori-browser.c:5718
+msgid "_Readable"
+msgstr "ئوقۇغىلى بولىدۇ(_R)"
+
+#: ../midori/midori-browser.c:5721
+msgid "_Go"
+msgstr "يۆتكەل(_G)"
+
+#: ../midori/midori-browser.c:5724
+msgid "Go back to the previous page"
+msgstr "ئالدىنقى بەتكە قايتىدۇ"
+
+#. i18n: Visit the previous logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:5731
+msgid "Go to the previous sub-page"
+msgstr "ئالدىنقى بالا بەتكە قايتىدۇ"
+
+#: ../midori/midori-browser.c:5740
+msgid "_Homepage"
+msgstr "ماكان بەت(_H)"
+
+#: ../midori/midori-browser.c:5741
+msgid "Go to your homepage"
+msgstr "ئانا بەتكە يۆتكىلىدۇ"
+
+#: ../midori/midori-browser.c:5743
+msgid "Empty Trash"
+msgstr "ئەخلەت ساندۇقىنى تازىلاش"
+
+#: ../midori/midori-browser.c:5746
+msgid "Undo _Close Tab"
+msgstr "تاقالغان بەتكۈچنى ئەسلى كەلتۈر(_C)"
+
+#: ../midori/midori-browser.c:5753
+msgid "Add a new _folder"
+msgstr "يېڭى مۇندەرىجە قوش(_F)"
+
+#: ../midori/midori-browser.c:5759
+msgid "_Export bookmarks"
+msgstr "خەتكۈشنى ئېكسپورت قىل(_E)"
+
+#: ../midori/midori-browser.c:5762 ../midori/midori-searchaction.c:496
+msgid "_Manage Search Engines"
+msgstr "ئىزدەش ماتورىنى باشقۇر(_M)"
+
+#: ../midori/midori-browser.c:5765
+msgid "_Clear Private Data"
+msgstr "شەخسىي سانلىق-مەلۇماتلارنى تازىلا(_C)"
+
+#: ../midori/midori-browser.c:5768
+msgid "_Inspect Page"
+msgstr "بەتنى تەكشۈر(_I)"
+
+#: ../midori/midori-browser.c:5772
+msgid "_Previous Tab"
+msgstr "ئالدىنقى بەتكۈچ(_P)"
+
+#: ../midori/midori-browser.c:5775
+msgid "_Next Tab"
+msgstr "كېيىنكى بەتكۈچ(_N)"
+
+#: ../midori/midori-browser.c:5777
+msgid "Move Tab _Backward"
+msgstr "بەتكۈچنى كەينىگە يۆتكەش(_B)"
+
+#: ../midori/midori-browser.c:5779
+msgid "_Move Tab Forward"
+msgstr "بەتكۈچنى ئالدىغا يۆتكەش(_B)"
+
+#: ../midori/midori-browser.c:5782
+msgid "Focus _Current Tab"
+msgstr "ھازىرقى بەتكۈچكە فوكۇسلان(_C)"
+
+#: ../midori/midori-browser.c:5785
+msgid "Focus _Next view"
+msgstr "كېيىنكى كۆرۈنۈشكە فوكۇسلان(_N)"
+
+#: ../midori/midori-browser.c:5788
+msgid "Only show the Icon of the _Current Tab"
+msgstr "پەقەت نۆۋەتتىكى بەتكۈچتىلا سىنبەلگىنى كۆرسەتسۇن(_C)"
+
+#: ../midori/midori-browser.c:5791
+msgid "_Duplicate Current Tab"
+msgstr "بەتكۈچنى تۇغدۇر(_D)"
+
+#: ../midori/midori-browser.c:5794
+msgid "Close Ot_her Tabs"
+msgstr "باشقا بەتكۈچلەرنى تاقا(_H)"
+
+#: ../midori/midori-browser.c:5797
+msgid "Open last _session"
+msgstr "ئەڭ ئاخىرقى ئەڭگىمەنى ئاچ(_S)"
+
+#: ../midori/midori-browser.c:5800
+msgid "_Help"
+msgstr "ياردەم(_H)"
+
+#: ../midori/midori-browser.c:5802
+msgid "_Frequent Questions"
+msgstr "كۆپ سورىلىدىغان سوئاللار(_F)"
+
+#: ../midori/midori-browser.c:5805
+msgid "_Report a Problem…"
+msgstr "كەمتۈك مەلۇم قىل(_R)"
+
+#: ../midori/midori-browser.c:5810 ../midori/midori-browser.c:6471
+msgid "_Tools"
+msgstr "قورال(_T)"
+
+#: ../midori/midori-browser.c:5817
+msgid "_Menubar"
+msgstr "تىزىملىك بالدىقى(_M)"
+
+#: ../midori/midori-browser.c:5821
+msgid "_Navigationbar"
+msgstr "يولچى بالدىقى(_N)"
+
+#: ../midori/midori-browser.c:5825
+msgid "Side_panel"
+msgstr "يان كۆزنەك(_P)"
+
+#: ../midori/midori-browser.c:5826
+msgid "Sidepanel"
+msgstr "يان كۆزنەك"
+
+#: ../midori/midori-browser.c:5829
+msgid "_Bookmarkbar"
+msgstr "خەتكۈش بالدىقى(_B)"
+
+#: ../midori/midori-browser.c:5833
+msgid "_Statusbar"
+msgstr "ھالەت بالدىقى(_S)"
+
+#: ../midori/midori-browser.c:5842 ../midori/midori-websettings.c:315
+msgid "_Automatic"
+msgstr "ئۆزلۈكىدىن(_A)"
+
+#: ../midori/midori-browser.c:5845 ../midori/midori-websettings.c:239
+msgid "Chinese Traditional (BIG5)"
+msgstr "مۇرەككەپ خەنزۇچە(BIG5)"
+
+#: ../midori/midori-browser.c:5848 ../midori/midori-websettings.c:240
+msgid "Chinese Simplified (GB18030)"
+msgstr "ئاددىيلاشتۇرۇلغان خەنزۇچە (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5852
+msgid "Japanese (SHIFT__JIS)"
+msgstr "ياپونچە (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5855 ../midori/midori-websettings.c:242
+msgid "Korean (EUC-KR)"
+msgstr "كورېيەچە(EUC-KR)"
+
+#: ../midori/midori-browser.c:5858 ../midori/midori-websettings.c:243
+msgid "Russian (KOI8-R)"
+msgstr "رۇسچە(KOI8-R)"
+
+#: ../midori/midori-browser.c:5861 ../midori/midori-websettings.c:244
+msgid "Unicode (UTF-8)"
+msgstr "يۇنىكود (UTF-8)"
+
+#: ../midori/midori-browser.c:5864 ../midori/midori-websettings.c:245
+msgid "Western (ISO-8859-1)"
+msgstr "غەربچە (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5867
+msgid "Custom…"
+msgstr "ئىختىيارىي…"
+
+#: ../midori/midori-browser.c:6377
+msgid "_Separator"
+msgstr "ئايرىغۇ(_S)"
+
+#: ../midori/midori-browser.c:6384
+msgid "_Location…"
+msgstr "ئورۇن(_L)…"
+
+#: ../midori/midori-browser.c:6386
+msgid "Open a particular location"
+msgstr "بەلگىلەنگەن ئورۇننى ئاچىدۇ"
+
+#: ../midori/midori-browser.c:6408
+msgid "_Web Search…"
+msgstr "توردىن ئىزدە(_W)…"
+
+#: ../midori/midori-browser.c:6410
+msgid "Run a web search"
+msgstr "توردىن ئىزدەيدۇ"
+
+#: ../midori/midori-browser.c:6437
+msgid "Reopen a previously closed tab or window"
+msgstr "بۇرۇن يېپىلغان بەتكۈچ ياكى كۆزنەكنى قايتا ئاچىدۇ"
+
+#: ../midori/midori-browser.c:6454
+msgid "Show the saved bookmarks"
+msgstr "ساقلانغان خەتكۈچلەرنى كۆرسىتىدۇ"
+
+#: ../midori/midori-browser.c:6487
+msgid "_Window"
+msgstr "كۆزنەك(_W)"
+
+#: ../midori/midori-browser.c:6489
+msgid "Show a list of all open tabs"
+msgstr "ئوچۇق بارلىق بەتكۈچلەرنى كۆرسىتىدۇ"
+
+#: ../midori/midori-browser.c:6503
+msgid "_Menu"
+msgstr "تىزىملىك(_M)"
+
+#: ../midori/midori-browser.c:6505
+msgid "Menu"
+msgstr "تىزىملىك"
+
+#: ../midori/midori-browser.c:7330
+#, c-format
+msgid "Unexpected setting '%s'"
+msgstr "ئويلىمىغان تەڭشەك ‹%s›"
+
+#: ../midori/midori-extension.c:329
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
+msgstr "كېڭەيتىلمە ‹%s› نىڭ سەپلىمىسىنى ساقلىغىلى بولمىدى: %s\n"
+
+#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
+#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
+#: ../extensions/addons.c:1688
+#, c-format
+msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
+msgstr "كېڭەيتىلمە ‹%s› نىڭ سەپلىمىسىنى ساقلىغىلى بولمىدى: %s\n"
+
+#: ../midori/midori-locationaction.c:398
+#, c-format
+msgid "Search with %s"
+msgstr "%s دا ئىزدە"
+
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "ئىزدە…"
+
+#: ../midori/midori-locationaction.c:545
+#, c-format
+msgid "Failed to select from history\n"
+msgstr "ئىزدىن تاللاش مەغلۇپ بولدى\n"
+
+#: ../midori/midori-locationaction.c:632
+#, c-format
+msgid "Search for %s"
+msgstr "%s نى ئىزدە"
+
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "گۇۋاھنامىنى ئېكسپورت قىلىش"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "ئىمزالىق گۇۋاھنامە تارقاتقۇچى ئېنىق ئەمەس."
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "گۇۋاھنامە، ئۇنى قايتۇرۇپ ئالغان تورتۇرادىن كەلگىنى بىلەن بىردەك ئەمەس."
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "گۇۋاھنامىنىڭ ئاكتىپلاش ۋاقتى يەنىلا كەلگۈسى ھالەتتە."
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "مەزكۇر ئىسپاتنامىنىڭ ۋاقتى ئۆتۈپ كېتىپتۇ"
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"گۇۋاھنامە GTlsConnection نىڭ يوق ئەمەلدىن قالدۇرۇش تىزىمىغا ئاساسەن ئەمەلدىن "
+"قالدۇرۇلدى."
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "گۇۋاھنامىنىڭ ھېسابلاش ئۇسۇلى(algorithm) بىخەتەر ئەمەستەك قىلىدۇ."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "ئىسپاتنامىنى دەلىللەۋاتقاندا بەزى خاتالىقلار كۆرۈلدى."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "گۇۋاھنامىنى ئېكسپورت قىل(_E)"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "ئۆزىنىڭ ئىمزاسى"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "بىخەتەرلىك تەپسىلاتلىرى"
+
+#. i18n: Right-click on Location, Open an URL from the clipboard
+#: ../midori/midori-locationaction.c:1650
+msgid "Paste and p_roceed"
+msgstr "چاپلا ۋە داۋاملاشتۇر(_R)"
+
+#: ../midori/midori-locationaction.c:1974
+msgid "Not verified"
+msgstr "تەھقىقلەنمىگەن"
+
+#: ../midori/midori-locationaction.c:1982
+msgid "Verified and encrypted connection"
+msgstr "تەھقىقلەنگەن ۋە شىفىرلانغان باغلىنىش"
+
+#: ../midori/midori-locationaction.c:1989
+msgid "Open, unencrypted connection"
+msgstr "ئوچۇق، شىفىرلانمىغان باغلىنىش"
+
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
+msgid "Align sidepanel to the right"
+msgstr "يان كۆزنەكنى ئوڭ تەرەپكە ئورۇنلاشتۇرىدۇ"
+
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
+msgid "Close panel"
+msgstr "كۆزنەكنى تاقا"
+
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
+msgid "Align sidepanel to the left"
+msgstr "يان كۆزنەكنى سول تەرەپكە ئورۇنلاشتۇرىدۇ"
+
+#: ../midori/midori-websettings.c:221
+msgid "Show Speed Dial"
+msgstr "تېز تېلېفون قىلىشنى كۆرسەت"
+
+#: ../midori/midori-websettings.c:222
+msgid "Show Homepage"
+msgstr "ماكان بەتنى كۆرسەت"
+
+#: ../midori/midori-websettings.c:241
+msgid "Japanese (SHIFT_JIS)"
+msgstr "ياپونچە (SHIFT_JIS)"
+
+#: ../midori/midori-websettings.c:246 ../midori/midori-websettings.c:322
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "ئىختىيارىي…"
+
+#: ../midori/midori-websettings.c:261
+msgid "New tab"
+msgstr "يېڭى بەتكۈچ"
+
+#: ../midori/midori-websettings.c:262
+msgid "New window"
+msgstr "يېڭى كۆزنەك"
+
+#: ../midori/midori-websettings.c:263
+msgid "Current tab"
+msgstr "ھازىرقى بەتكۈچ"
+
+#: ../midori/midori-websettings.c:278
+msgid "Default"
+msgstr "كۆڭۈلدىكى"
+
+#: ../midori/midori-websettings.c:279
+msgid "Icons"
+msgstr "سىنبەلگىلەر"
+
+#: ../midori/midori-websettings.c:280
+msgid "Small icons"
+msgstr "كىچىك سىنبەلگە"
+
+#: ../midori/midori-websettings.c:281
+msgid "Text"
+msgstr "تېكىست"
+
+#: ../midori/midori-websettings.c:282
+msgid "Icons and text"
+msgstr "سىنبەلگە ۋە تېكىست"
+
+#: ../midori/midori-websettings.c:283
+msgid "Text beside icons"
+msgstr "تېكىست سىنبەلگىنىڭ يېنىدا كۆرسىتىلسۇن"
+
+#: ../midori/midori-websettings.c:298
+msgid "Automatic (GNOME or environment)"
+msgstr "ئۆزلۈكىدىن (GNOME ياكى مۇھىت)"
+
+#: ../midori/midori-websettings.c:299
+msgid "HTTP proxy server"
+msgstr "HTTP ۋاكالەتچى مۇلازىمېتىر"
+
+#: ../midori/midori-websettings.c:300
+msgid "No proxy server"
+msgstr "ۋاكالەتچى مۇلازىمېتىر يوق"
+
+#: ../midori/midori-websettings.c:317
+msgid "Chrome"
+msgstr "خىروم(Chrome)"
+
+#: ../midori/midori-websettings.c:318
+msgid "Safari"
+msgstr "Safari"
+
+#: ../midori/midori-websettings.c:319
+msgid "iPhone"
+msgstr "iPhone"
+
+#: ../midori/midori-websettings.c:320
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../midori/midori-websettings.c:321
+msgid "Internet Explorer"
+msgstr "Internet Explorer"
+
+#: ../midori/midori-websettings.c:405
+msgid "Remember last window size"
+msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى چوڭلۇقىنى ئەستە تۇتۇۋال"
+
+#: ../midori/midori-websettings.c:406
+msgid "Whether to save the last window size"
+msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى چوڭلۇقىنى ئەستە تۇتۇۋالىدۇ"
+
+#: ../midori/midori-websettings.c:414
+msgid "Last window width"
+msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى كەڭلىكى"
+
+#: ../midori/midori-websettings.c:415
+msgid "The last saved window width"
+msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى كەڭلىكى"
+
+#: ../midori/midori-websettings.c:423
+msgid "Last window height"
+msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئېگىزلىكى"
+
+#: ../midori/midori-websettings.c:424
+msgid "The last saved window height"
+msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئېگىزلىكى"
+
+#: ../midori/midori-websettings.c:449
+msgid "Last panel position"
+msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئورنى"
+
+#: ../midori/midori-websettings.c:450
+msgid "The last saved panel position"
+msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئورنى"
+
+#. i18n: The internal index of the last opened panel
+#: ../midori/midori-websettings.c:459
+msgid "Last panel page"
+msgstr "كۆزنەكتىكى ئەڭ ئاخىرقى بەت"
+
+#: ../midori/midori-websettings.c:460
+msgid "The last saved panel page"
+msgstr "ئەڭ ئاخىرى ساقلانغان كۆزنەك بېتى"
+
+#: ../midori/midori-websettings.c:468
+msgid "Last Web search"
+msgstr "ئەڭ ئاخىرقى ئىزدەلگەنلىرى"
+
+#: ../midori/midori-websettings.c:469
+msgid "The last saved Web search"
+msgstr "ساقلانغان ئەڭ ئاخىرقى ئىزدەلگەن"
+
+#: ../midori/midori-websettings.c:493
+msgid "Show Menubar"
+msgstr "تىزىملىك بالدىقىنى كۆرسەت"
+
+#: ../midori/midori-websettings.c:494
+msgid "Whether to show the menubar"
+msgstr "تىزىملىك بالدىقىنى كۆرسىتىدۇ"
+
+#: ../midori/midori-websettings.c:502
+msgid "Show Navigationbar"
+msgstr "يولچى بالدىقىنى كۆرسەت"
+
+#: ../midori/midori-websettings.c:503
+msgid "Whether to show the navigationbar"
+msgstr "يولچى بالدىقىنى كۆرسىتىدۇ"
+
+#: ../midori/midori-websettings.c:511
+msgid "Show Bookmarkbar"
+msgstr "خەتكۈش بالدىقىنى كۆرسەت"
+
+#: ../midori/midori-websettings.c:512
+msgid "Whether to show the bookmarkbar"
+msgstr "خەتكۈش بالدىقىنى كۆرسىتىدۇ"
+
+#: ../midori/midori-websettings.c:520
+msgid "Show Panel"
+msgstr "كۆزنەكنى كۆرسەت"
+
+#: ../midori/midori-websettings.c:521
+msgid "Whether to show the panel"
+msgstr "كۆزنەكنى كۆرسىتىدۇ"
+
+#: ../midori/midori-websettings.c:529
+msgid "Show Statusbar"
+msgstr "ھالەت بالدىقىنى كۆرسەت"
+
+#: ../midori/midori-websettings.c:530
+msgid "Whether to show the statusbar"
+msgstr "ھالەت بالدىقىنى كۆرسىتىدۇ"
+
+#: ../midori/midori-websettings.c:539
+msgid "Toolbar Style:"
+msgstr "قورال بالدىقىنىڭ ئۇسلۇبى:"
+
+#: ../midori/midori-websettings.c:540
+msgid "The style of the toolbar"
+msgstr "قورال بالدىقىنىڭ ئۇسلۇبىنى بەلگىلەيدۇ"
+
+#: ../midori/midori-websettings.c:549
+msgid "Toolbar Items"
+msgstr "قورال بالدىقىدىكى تۈرلەر"
+
+#: ../midori/midori-websettings.c:550
+msgid "The items to show on the toolbar"
+msgstr "قورال بالدىقىدا كۆرسىتىلىدىغان تۈرلەرنى بەلگىلەيدۇ"
+
+#: ../midori/midori-websettings.c:558
+msgid "Compact Sidepanel"
+msgstr "يان كۆزنەكنى ئىخچام كۆرسەت"
+
+#: ../midori/midori-websettings.c:559
+msgid "Whether to make the sidepanel compact"
+msgstr "يان كۆزنەكنى ئىخچام كۆرسىتىدۇ"
+
+#: ../midori/midori-websettings.c:574
+msgid "Align sidepanel on the right"
+msgstr "يان كۆزنەكنى ئوڭ تەرەپكە ئورۇنلاشتۇر"
+
+#: ../midori/midori-websettings.c:575
+msgid "Whether to align the sidepanel on the right"
+msgstr "يان كۆزنەكنى ئوڭ تەرەپكە ئورۇنلاشتۇرىدۇ"
+
+#: ../midori/midori-websettings.c:590
+msgid "Open panels in separate windows"
+msgstr "كۆزنەكنى ئايرىم كۆزنەكتە ئاچ"
+
+#: ../midori/midori-websettings.c:591
+msgid "Whether to always open panels in separate windows"
+msgstr "كۆزنەكنى ئايرىم كۆزنەكتە ئاچىدىغان قىلىدۇ"
+
+#: ../midori/midori-websettings.c:600
+msgid "When Midori starts:"
+msgstr "مىدورى(Midori) قوزغالغاندا:"
+
+#: ../midori/midori-websettings.c:601
+msgid "What to do when Midori starts"
+msgstr "مىدورى(Midori) قوزغالغاندا نېمە قىلىش كېرەك"
+
+#: ../midori/midori-websettings.c:610
+msgid "Homepage:"
+msgstr "ماكان بەت:"
+
+#: ../midori/midori-websettings.c:611
+msgid "The homepage"
+msgstr "ماكان بەتنى ئاچىدۇ"
+
+#: ../midori/midori-websettings.c:626
+msgid "Show crash dialog"
+msgstr "غۇلاش كۆزنىكىنى كۆرسەت"
+
+#: ../midori/midori-websettings.c:627
+msgid "Show a dialog after Midori crashed"
+msgstr "مىدورى(Midori) غۇلاپ كېتىپ، قايتا قوزغالغاندا كۆزنەك كۆرسىتىدۇ"
+
+#: ../midori/midori-websettings.c:635
+msgid "Save downloaded files to:"
+msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ئورۇن:"
+
+#: ../midori/midori-websettings.c:636
+msgid "The folder downloaded files are saved to"
+msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ئورۇننى بەلگىلەيدۇ"
+
+#: ../midori/midori-websettings.c:644
+msgid "Text Editor"
+msgstr "تېكىست تەھرىرلىگۈ"
+
+#: ../midori/midori-websettings.c:645
+msgid "An external text editor"
+msgstr "سىرتقى تېكىست تەھرىرلىگۈنى بېكىتىدۇ"
+
+#: ../midori/midori-websettings.c:660
+msgid "News Aggregator"
+msgstr "خەۋەر يىغقۇچ"
+
+#: ../midori/midori-websettings.c:661
+msgid "An external news aggregator"
+msgstr "سىرتتىكى خەۋەر يىغقۇچ"
+
+#: ../midori/midori-websettings.c:669
+msgid "Location entry Search"
+msgstr "كىرگۈزگەن ئورۇندىن ئىزدە"
+
+#: ../midori/midori-websettings.c:670
+msgid "The search to perform inside the location entry"
+msgstr "ئىزدەش پەقەت كىرگۈزگەن ئورۇندىلا ئېلىپ بېرىلىدۇ"
+
+#: ../midori/midori-websettings.c:678
+msgid "Preferred Encoding"
+msgstr "ئامراق كودلاش"
+
+#: ../midori/midori-websettings.c:679
+msgid "The preferred character encoding"
+msgstr "ھەرپلەرنىڭ ئامراق كودلاش شەكلى"
+
+#: ../midori/midori-websettings.c:689
+msgid "Always Show Tabbar"
+msgstr "بەتكۈچ بالدىقىنى كۆرسەت"
+
+#: ../midori/midori-websettings.c:690
+msgid "Always show the tabbar"
+msgstr "بەتكۈچ بالدىقىنى كۆرسىتىپلا تۇرىدۇ"
+
+#: ../midori/midori-websettings.c:703
+msgid "Close Buttons on Tabs"
+msgstr "بەتكۈچتە تاقاش توپچىسىنى كۆرسەت"
+
+#: ../midori/midori-websettings.c:704
+msgid "Whether tabs have close buttons"
+msgstr "بەتكۈچتە تاقاش توپچىسىنى كۆرسىتىدۇ"
+
+#: ../midori/midori-websettings.c:729
+msgid "Open new pages in:"
+msgstr "يېڭى بەت ئاچقاندا:"
+
+#: ../midori/midori-websettings.c:730
+msgid "Where to open new pages"
+msgstr "يېڭى بەتنى قەيەردە ئاچىدىغانلىقىنى بەلگىلەيدۇ"
+
+#: ../midori/midori-websettings.c:739
+msgid "Middle click opens Selection"
+msgstr "چاشقىنەكنىڭ ئوتتۇرىسىنى چېكىپ تاللىغاننى ئاچ"
+
+#: ../midori/midori-websettings.c:740
+msgid "Load an address from the selection via middle click"
+msgstr ""
+"ئادرېسنى تاللاپ بولۇپ، چاشقىنەكنىڭ ئوتتۇرىسىنى چەكسە شۇ ئادرېس ئېچىلىدۇ"
+
+#: ../midori/midori-websettings.c:748
+msgid "Open tabs in the background"
+msgstr "بەتكۈچنى ئارقىدا تۇرۇپ ئاچ"
+
+#: ../midori/midori-websettings.c:749
+msgid "Whether to open new tabs in the background"
+msgstr "يېڭى بەتكۈچنى ئارقىدا تۇرۇپ ئاچىدۇ"
+
+#: ../midori/midori-websettings.c:757
+msgid "Open Tabs next to Current"
+msgstr "يېڭى بەتكۈچنى ھازىرقى بەتكۈچنىڭ يېنىدا ئاچ"
+
+#: ../midori/midori-websettings.c:758
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr "يېڭى بەتكۈچنى ھازىرقىنىڭ يېنىدا ياكى ئەڭ ئاخىرقىنىڭ يېنىدا ئاچىدۇ"
+
+#: ../midori/midori-websettings.c:766
+msgid "Open popups in tabs"
+msgstr "بەتكۈچتە قاڭقىشى ئاچ"
+
+#: ../midori/midori-websettings.c:767
+msgid "Whether to open popup windows in tabs"
+msgstr "بەتكۈچتە قاڭقىش تىزىملىكى ئاچىدىغان ئاچمايدىغانلىقنى بەلگىلەيدۇ"
+
+#: ../midori/midori-websettings.c:777 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "سۈرەتنى ئۆزلۈكىدىن يۈكلە"
+
+#: ../midori/midori-websettings.c:778
+msgid "Load and display images automatically"
+msgstr "سۈرەتنى ئۆزلۈكىدىن ئوقۇپ كۆرسىتىدۇ"
+
+#: ../midori/midori-websettings.c:785 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "قوليازما(script) ئىناۋەتلىك"
+
+#: ../midori/midori-websettings.c:786
+msgid "Enable embedded scripting languages"
+msgstr "سىڭدۈرمە قوليازما(script) تىلىنى ئىشلەتكىلى بولىدىغان قىلىدۇ"
+
+#: ../midori/midori-websettings.c:793 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Netscape قىستۇرمىلىرى ئېچىۋەت"
+
+#: ../midori/midori-websettings.c:794
+msgid "Enable embedded Netscape plugin objects"
+msgstr "سىڭدۈرمە Netscape قىستۇرمىلىرىنى ئىشلەتكىلى بولىدىغان قىلىدۇ"
+
+#: ../midori/midori-websettings.c:809
+msgid "Enable Spell Checking"
+msgstr "ئىملا تەكشۈرۈش ئىناۋەتلىك"
+
+#: ../midori/midori-websettings.c:810
+msgid "Enable spell checking while typing"
+msgstr "كىرگۈزۈۋاتقاندا ئىملا تەكشۈرىدۇ"
+
+#: ../midori/midori-websettings.c:816
+msgid "Enable HTML5 database support"
+msgstr "HTML5 ساندانىنى قوللا"
+
+#: ../midori/midori-websettings.c:817
+msgid "Whether to enable HTML5 database support"
+msgstr "HTML5 ساندانىنى ئىشلەتكىلى بولىدىغان قىلىدۇ"
+
+#: ../midori/midori-websettings.c:823
+msgid "Enable HTML5 local storage support"
+msgstr "HTML5 يەرلىك ساقلىغۇچنى قوللا"
+
+#: ../midori/midori-websettings.c:824
+msgid "Whether to enable HTML5 local storage support"
+msgstr "HTML5 يەرلىك ساقلىغۇچنى ئىشلەتكىلى بولىدىغان قىلىدۇ"
+
+#: ../midori/midori-websettings.c:830
+msgid "Enable offline web application cache"
+msgstr "تورسىز ھالەتتە تور پروگراممىلىرىنىڭ غەملىكىنى ئېچىۋەت"
+
+#: ../midori/midori-websettings.c:831
+msgid "Whether to enable offline web application cache"
+msgstr "تورسىز ھالەتتە تور پروگراممىلىرىنىڭ غەملىكىنى ئېچىۋېتىدۇ"
+
+#: ../midori/midori-websettings.c:852
+msgid "Flash window on background tabs"
+msgstr "ئارقا تەرەپتە بەتكۈچلەر ئېچىلسا كۆزنەك چاقنىسۇن"
+
+#: ../midori/midori-websettings.c:853
+msgid "Flash the browser window if a new tab was opened in the background"
+msgstr "ئارقا تەرەپتە يېڭى بەتكۈچ ئېچىلسا توركۆرگۈ كۆزنىكى چاقنايدۇ"
+
+#: ../midori/midori-websettings.c:861
+msgid "Enable WebGL support"
+msgstr "WebGL نى ئىناۋەتلىك قىل"
+
+#: ../midori/midori-websettings.c:862
+msgid "Allow websites to use OpenGL rendering"
+msgstr "تورتۇرالارنى OpenGL ئارقىلىق سىزىشقا ئىجازەت"
+
+#: ../midori/midori-websettings.c:888
+msgid "Zoom Text and Images"
+msgstr "تېكىست ۋە سۈرەتلەرنى چوڭايت تارايت"
+
+#: ../midori/midori-websettings.c:889
+msgid "Whether to zoom text and images"
+msgstr "تېكىست ۋە سۈرەتلەرنى چوڭايتىدۇ ياكى تارايتىدۇ"
+
+#: ../midori/midori-websettings.c:904
+msgid "Find inline while typing"
+msgstr "كىرگۈزگەن ھامان ئىزدە"
+
+#: ../midori/midori-websettings.c:905
+msgid "Whether to automatically find inline while typing"
+msgstr "كۇنۇپكا بېسىلغان ھامان ئىزدەش ئېلىپ بارىدۇ"
+
+#: ../midori/midori-websettings.c:920
+msgid "Kinetic scrolling"
+msgstr "Kinetic سىيرىلىش"
+
+#: ../midori/midori-websettings.c:921
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr "تېزلىكىگە ئاساسەن Kinetic سىيرىلىپ يۆتكىلىدۇ"
+
+#: ../midori/midori-websettings.c:929
+msgid "Delete old Cookies after:"
+msgstr "بۇ ۋاقىتتىن كېيىن كونا Cookies ئۆچۈرسۇن:"
+
+#: ../midori/midori-websettings.c:930
+msgid "The maximum number of days to save cookies for"
+msgstr "Cookie نىڭ ئەڭ ئۇزۇن ساقلىنىش ۋاقتى"
+
+#: ../midori/midori-websettings.c:946
+msgid "Only accept Cookies from sites you visit"
+msgstr "سىز زىيارەت قىلغان تورتۇرادىن كەلگەن cookie لارنىلا قوبۇل قىلىدۇ"
+
+#: ../midori/midori-websettings.c:947
+msgid "Block cookies sent by third-party websites"
+msgstr "ئۈچىنچى تەرەپ تورتۇراسىغا Cookies لارنى ئەۋەتىشنى توسۇن"
+
+#: ../midori/midori-websettings.c:961
+msgid "Delete pages from history after:"
+msgstr "ئىزدىن بەتلەرنى بۇ ۋاقىتتىن كېيىن ئۆچۈرسۇن:"
+
+#: ../midori/midori-websettings.c:962
+msgid "The maximum number of days to save the history for"
+msgstr "ئىزنىڭ ئەڭ ئۇزۇن ساقلىنىش ۋاقتى"
+
+#: ../midori/midori-websettings.c:977
+msgid "Proxy server"
+msgstr "ۋاكالەتچى مۇلازىمېتىر"
+
+#: ../midori/midori-websettings.c:978
+msgid "The type of proxy server to use"
+msgstr "ئىشلىتىدىغان ۋاكالەتچى مۇلازىمېتىرنىڭ تىپى"
+
+#: ../midori/midori-websettings.c:987
+msgid "HTTP Proxy Server"
+msgstr "HTTP ۋاكالەتچى مۇلازىمېتىر"
+
+#: ../midori/midori-websettings.c:988
+msgid "The proxy server used for HTTP connections"
+msgstr "HTTP باغلىنىشىدا ئىشلىتىدىغان ۋاكالەتچى مۇلازىمېتىرنى كۆرسىتىدۇ"
+
+#: ../midori/midori-websettings.c:1003
+msgid "Port"
+msgstr "ئېغىز"
+
+#: ../midori/midori-websettings.c:1004
+msgid "The proxy server port used for HTTP connections"
+msgstr "HTTP باغلىنىشىدا ئىشلىتىدىغان ۋاكالەتچى مۇلازىمېتىرنىڭ ئېغىزى"
+
+#: ../midori/midori-websettings.c:1022
+msgid "The maximum size of cached pages on disk"
+msgstr "دىسكىدىكى غەملەنگەن بەتلەرنىڭ ئەڭ چوڭ چوڭلۇقى"
+
+#. i18n: This refers to an application, not the 'user agent' string
+#: ../midori/midori-websettings.c:1039
+msgid "Identify as"
+msgstr "تونۇتۇلىدۇ"
+
+#: ../midori/midori-websettings.c:1040
+msgid "What to identify as to web pages"
+msgstr "قانداقلىرىنى تور بېتى دەپ تونۇتىدىغانلىقىنى بېكىتىدۇ"
+
+#: ../midori/midori-websettings.c:1056
+msgid "Identification string"
+msgstr "تونۇش ھەرپ تىزمىسى"
+
+#: ../midori/midori-websettings.c:1057
+msgid "The application identification string"
+msgstr "پروگراممىنىڭ كىملىك تېكىستى"
+
+#: ../midori/midori-websettings.c:1073
+msgid "Preferred languages"
+msgstr "ئامراق تىللار"
+
+#: ../midori/midori-websettings.c:1074
+msgid ""
+"A comma separated list of languages preferred for rendering multilingual "
+"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+msgstr ""
+"كۆپ تىللىق بەتلەرنى كۆرسەتكەندە ئالدىن ئويلىشىدىغان تىللارنىڭ تىزىملىكى. "
+"مەسىلەن \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+
+#: ../midori/midori-websettings.c:1089
+msgid "Clear private data"
+msgstr "شەخسىي سانلىق-مەلۇماتلارنى تازىلا"
+
+#: ../midori/midori-websettings.c:1090
+msgid "The private data selected for deletion"
+msgstr "تالانغان شەخسىي سانلىق-مەلۇماتلارنى ئۆچۈرىدۇ"
+
+#: ../midori/midori-websettings.c:1105
+msgid "Clear data"
+msgstr "شەخسىي سانلىق-مەلۇماتلارنى تازىلا"
+
+#: ../midori/midori-websettings.c:1106
+msgid "The data selected for deletion"
+msgstr "ئۆچۈرۈش ئۈچۈن تاللانغان سانلىق-مەلۇماتلار"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/midori-websettings.c:1155
+msgid "Strip referrer details sent to websites"
+msgstr "تورتۇرالارغا ئەۋەتىلىدىغان پايدىلىنىشنىڭ تەپسىلاتلىرى چىقىرىۋېتىلسۇن"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/midori-websettings.c:1157
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "بۇنىڭدا «Referer» قېشى قىسقارتىلىۋېتىلىدۇ."
+
+#: ../midori/midori-websettings.c:1171
+msgid "Always use my font choices"
+msgstr "ھەمىشە مەن تاللىغان خەت نۇسخىسىنى ئىشلەت"
+
+#: ../midori/midori-websettings.c:1172
+msgid "Override fonts picked by websites with user preferences"
+msgstr ""
+"تور بەتلىرىدىكى خەت نۇسخىلىرىدىنمۇ بەكرەك ئىشلەتكۈچى تەڭشىكى ئابرۇيلۇق بولسۇن"
+
+#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140
+msgid "Trust this website"
+msgstr "بۇ تورتۇراغا ئىشەن"
+
+#: ../midori/midori-view.c:1138
+msgid "Security unknown"
+msgstr "بىخەتەرلىكى نامەلۇم"
+
+#: ../midori/midori-view.c:1436
+#, c-format
+msgid "%s wants to save an HTML5 database."
+msgstr "%s نىڭ بىر HTML ساندىنىغا ساقلىغۇسى بار ئىكەن."
+
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
+msgid "_Deny"
+msgstr "رەت قىل(_D)"
+
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
+msgid "_Allow"
+msgstr "ئىجازەت(_A)"
+
+#: ../midori/midori-view.c:1469
+#, c-format
+msgid "%s wants to know your location."
+msgstr "%s نىڭ ئورنىڭىزنى بىلگۈسى بار ئىكەن."
+
+#: ../midori/midori-view.c:1565
+#, c-format
+msgid "Error - %s"
+msgstr "خاتالىق - %s"
+
+#: ../midori/midori-view.c:1566
+#, c-format
+msgid "The page '%s' couldn't be loaded."
+msgstr "بەت ‹%s› نى ئوقۇغىلى بولمىدى."
+
+#: ../midori/midori-view.c:1568
+msgid "Try again"
+msgstr "قايتا سىناپ كۆر"
+
+#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2879
+#, c-format
+msgid "Send a message to %s"
+msgstr "%s غا ئۇچۇر ئەۋەتىدۇ"
+
+#: ../midori/midori-view.c:2665
+msgid "Add _search engine..."
+msgstr "ئىزدەش ماتورى قوش(_S)…"
+
+#: ../midori/midori-view.c:2709 ../midori/midori-view.c:3035
+msgid "Inspect _Element"
+msgstr "ئېلېمېنتلارنى تەكشۈر(_E)"
+
+#: ../midori/midori-view.c:2761
+msgid "Open Link in New _Tab"
+msgstr "ئۇلانمىنى يېڭى بەتكۈچتە ئاچ(_T)"
+
+#: ../midori/midori-view.c:2765
+msgid "Open Link in _Foreground Tab"
+msgstr "ئۇلانمىنى ئەڭ ئالدىدىكى بەتكۈچتە ئاچ(_T)"
+
+#: ../midori/midori-view.c:2766
+msgid "Open Link in _Background Tab"
+msgstr "ئۇلانمىنى ئەڭ ئاخىرقى بەتكۈچتە ئاچ(_T)"
+
+#: ../midori/midori-view.c:2769
+msgid "Open Link in New _Window"
+msgstr "ئۇلانمىنى يېڭى كۆزنەكتە ئاچ(_W)"
+
+#: ../midori/midori-view.c:2772
+msgid "Open Link as Web A_pplication"
+msgstr "ئۇلانمىنى تور پروگراممىسى دەپ قاراپ ئاچ(_P)"
+
+#: ../midori/midori-view.c:2777
+msgid "Copy Link de_stination"
+msgstr "ئۇلانما نىشانىنى كۆچۈر(_S)"
+
+#: ../midori/midori-view.c:2793
+msgid "Open _Image in New Tab"
+msgstr "سۈرەتنى يېڭى بەتكۈچتە ئاچ(_I)"
+
+#: ../midori/midori-view.c:2796
+msgid "Copy Image _Address"
+msgstr "سۈرەت ئادرېسىنى كۆچۈر(_A)"
+
+#: ../midori/midori-view.c:2799
+msgid "Save I_mage"
+msgstr "سۈرەتنى ساقلا(_M)"
+
+#: ../midori/midori-view.c:2802
+msgid "Open in Image _Viewer"
+msgstr "سۈرەت كۆرگۈدە ئاچ(_V)"
+
+#: ../midori/midori-view.c:2809
+msgid "Copy Video _Address"
+msgstr "سىن ئادرېسىنى كۆچۈر(_A)"
+
+#: ../midori/midori-view.c:2812
+msgid "Save _Video"
+msgstr "سىننى ساقلا(_V)"
+
+#: ../midori/midori-view.c:2812
+msgid "Download _Video"
+msgstr "سىننى چۈشۈر(_V)"
+
+#: ../midori/midori-view.c:2838
+msgid "Search _with"
+msgstr "ئىزدە(_W)"
+
+#: ../midori/midori-view.c:2870
+msgid "_Search the Web"
+msgstr "توردا ئىزدە(_S)"
+
+#: ../midori/midori-view.c:2887
+msgid "Open Address in New _Tab"
+msgstr "ئادرېسنى يېڭى بەتكۈچتە ئاچ(_T)"
+
+#: ../midori/midori-view.c:2940
+msgid "Open _Frame in New Tab"
+msgstr "كاندۇكنى يېڭى بەتكۈچتە ئاچ(_F)"
+
+#: ../midori/midori-view.c:3201
+#, c-format
+msgid "Open or download file from %s"
+msgstr "ھۆججەتنى %s دىن ئېچىش ياكى چۈشۈرۈش"
+
+#: ../midori/midori-view.c:3225
+#, c-format
+msgid "File Name: %s"
+msgstr "ھۆججەت ئاتى: ‹%s›"
+
+#: ../midori/midori-view.c:3230
+#, c-format
+msgid "File Type: '%s'"
+msgstr "ھۆججەت تىپى: ‹%s›"
+
+#: ../midori/midori-view.c:3232
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "ھۆججەت تىپى: %s (‹%s›)"
+
+#: ../midori/midori-view.c:3267
+#, c-format
+msgid "Size: %s"
+msgstr "چوڭلۇقى: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3278
+#, c-format
+msgid "Open %s"
+msgstr "%s نى ئاچ"
+
+#: ../midori/midori-view.c:3897
+#, c-format
+msgid "Inspect page - %s"
+msgstr "بەتنى تەكشۈر - %s"
+
+#: ../midori/midori-view.c:4252
+msgid "Speed Dial"
+msgstr "تېز تېلېفون قىلىش"
+
+#: ../midori/midori-view.c:4253 ../midori/midori-view.c:4359
+msgid "Click to add a shortcut"
+msgstr "چەكسە تېزلەتمىگە قوشۇلىدۇ"
+
+#: ../midori/midori-view.c:4254
+msgid "Enter shortcut address"
+msgstr "تېزلەتمە ئادرېسىنى كىرگۈز"
+
+#: ../midori/midori-view.c:4255
+msgid "Enter shortcut title"
+msgstr "تېزلەتمە ماۋزۇسىنى كىرگۈز"
+
+#: ../midori/midori-view.c:4256
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "بۇ تېزلەتمىنى راستلا ئۆچۈرەمسىز؟"
+
+#: ../midori/midori-view.c:4429
+#, c-format
+msgid "No documentation installed"
+msgstr "پۈتۈك ئورنىتىلمىغان"
+
+#: ../midori/midori-view.c:4506
+msgid "Midori doesn't store any personal data:"
+msgstr "مىدورى(Midori) ھېچقانداق شەخسىي ئۇچۇرلارنى ساقلىمايدۇ:"
+
+#: ../midori/midori-view.c:4507
+msgid "No history or web cookies are being saved."
+msgstr "ھېچقانداق ئىز ۋە cookies لار ساقلانمىغان."
+
+#: ../midori/midori-view.c:4508
+msgid "Extensions are disabled."
+msgstr "كېڭەيتىلمىلەر چەكلەنگەن."
+
+#: ../midori/midori-view.c:4509
+msgid "HTML5 storage, local database and application caches are disabled."
+msgstr "يەرلىك ساندان، HTML5 ساقلىغۇچى ۋە پروگرامما غەملىكى چەكلەنگەن."
+
+#: ../midori/midori-view.c:4510
+msgid "Midori prevents websites from tracking the user:"
+msgstr "مىدورى(Midori) تورتۇرالارنىڭ ئىشلەتكۈچىنى ئىزلىشىنى توسىدۇ:"
+
+#: ../midori/midori-view.c:4511
+msgid "Referrer URLs are stripped down to the hostname."
+msgstr ""
+
+#: ../midori/midori-view.c:4512
+msgid "DNS prefetching is disabled."
+msgstr ""
+
+#: ../midori/midori-view.c:4513
+msgid "The language and timezone are not revealed to websites."
+msgstr "تىل ۋە ۋاقىت رايونى تورتۇراغا ئاشكارىلانمايدۇ."
+
+#: ../midori/midori-view.c:4514
+msgid "Flash and other Netscape plugins cannot be listed by websites."
+msgstr "بۇنىڭدا Flash ياكى Netscape قىستۇرمىلىرى تورتۇراغا خاتىرىلەنمەيدۇ."
+
+#: ../midori/midori-view.c:4603
+msgid "Version numbers in brackets show the version used at runtime."
+msgstr ""
+
+#: ../midori/midori-view.c:4653
+msgid "Page loading delayed"
+msgstr "بەتنى ئوقۇش كېچىكتۈرۈلدى"
+
+#: ../midori/midori-view.c:4654
+msgid "Loading delayed either due to a recent crash or startup preferences."
+msgstr "غۇلاش ياكى قوزغىلىش مايىللىقى سەۋەبىدىن ئوقۇش كېچىكتۈرۈلدى."
+
+#: ../midori/midori-view.c:4655
+msgid "Load Page"
+msgstr "بەتنى ئوقۇش"
+
+#: ../midori/midori-view.c:4822
+msgid "Blank page"
+msgstr "بوش بەت"
+
+#: ../midori/midori-view.c:5086
+msgid "_Duplicate Tab"
+msgstr "بەتكۈچنى تۇغدۇر(_D)"
+
+#: ../midori/midori-view.c:5091
+msgid "Show Tab _Label"
+msgstr "بەتكۈچ ئەنىنى كۆرسەت(_L)"
+
+#: ../midori/midori-view.c:5091
+msgid "Show Tab _Icon Only"
+msgstr "پەقەت بەتكۈچ سىنبەلگىسىنىلا كۆرسەت(_I)"
+
+#: ../midori/midori-view.c:5098
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "باشقا بەتكۈچلەرنى تاقا(_H)"
+
+#. i18n: word stem of "previous page" type links, case is not important
+#: ../midori/midori-view.c:5934
+msgid "previous"
+msgstr "ئالدىنقى"
+
+#. i18n: word stem of "next page" type links, case is not important
+#: ../midori/midori-view.c:5953
+msgid "next"
+msgstr "كېيىنكى"
+
+#: ../midori/midori-view.c:5966
+msgid "Print background images"
+msgstr "تەگ سۈرىتىنى بېسىپ چىقار"
+
+#: ../midori/midori-view.c:5967
+msgid "Whether background images should be printed"
+msgstr "تەگ سۈرىتىنى بېسىپ چىقىرىدۇ"
+
+#: ../midori/midori-view.c:5999
+msgid "Features"
+msgstr "ئىقتىدار"
+
+#: ../midori/midori-preferences.c:298
+msgid "Startup"
+msgstr "قوزغات"
+
+#: ../midori/midori-preferences.c:311
+msgid "Use _current page"
+msgstr "ھازىرقى بەتنى ئىشلىتىدۇ(_C)"
+
+#: ../midori/midori-preferences.c:315
+msgid "Use current page as homepage"
+msgstr "ھازىرقى بەتنى ماكان بەت قىلىدۇ"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:324
+msgid "Fonts"
+msgstr "خەت نۇسخىسى"
+
+#: ../midori/midori-preferences.c:327
+msgid "Proportional Font Family"
+msgstr "كەڭلىكى تەڭ بولمىغان خەت نۇسخىلىرى"
+
+#: ../midori/midori-preferences.c:331
+msgid "The default font family used to display text"
+msgstr "تېكىستلەرنى كۆرسىتىدىغان كۆڭۈلدىكى فونت"
+
+#: ../midori/midori-preferences.c:334
+msgid "The default font size used to display text"
+msgstr "تېكىستلەرنى كۆرسىتىدىغان كۆڭۈلدىكى فونتنىڭ چوڭلۇقى"
+
+#: ../midori/midori-preferences.c:336
+msgid "Fixed-width Font Family"
+msgstr "تەڭ كەڭلىكتىكى فونت"
+
+#: ../midori/midori-preferences.c:340
+msgid "The font family used to display fixed-width text"
+msgstr "تېكىستلەرنى تەڭ كەڭلىكتە كۆرسىتىدىغان فونت"
+
+#: ../midori/midori-preferences.c:343
+msgid "The font size used to display fixed-width text"
+msgstr "تېكىستلەرنى تەڭ كەڭلىكتە كۆرسىتىدىغان فونتنىڭ چوڭلۇقى"
+
+#: ../midori/midori-preferences.c:345
+msgid "Minimum Font Size"
+msgstr "فونتنىڭ ئەڭ كىچىك چوڭلۇقى"
+
+#: ../midori/midori-preferences.c:349
+msgid "The minimum font size used to display text"
+msgstr "تېكىستلەرنى كۆرسىتىدىغان فونتنىڭ ئەڭ كىچىك چوڭلۇقى"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:360
+msgid "Behavior"
+msgstr "ھەرىكىتى"
+
+#: ../midori/midori-preferences.c:386
+msgid "Allow scripts to open popups"
+msgstr "قوليازما ئىشلىتىپ سەكرىمىلەرنى چىقىرىشقا رۇخسەت قىل"
+
+#: ../midori/midori-preferences.c:387
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "قوليازما ئىشلىتىپ سەكرىمىلەرنى چىقىرىشقا رۇخسەت قىلىدۇ"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:418
+msgid "Browsing"
+msgstr "كۆز يۈگۈرت"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:458
+msgid "Network"
+msgstr "تور"
+
+#: ../midori/midori-preferences.c:465
+msgid "Hostname"
+msgstr "مۇلازىمېتىر نامى"
+
+#: ../midori/midori-preferences.c:489
+msgid "MB"
+msgstr "م ب"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Add search engine"
+msgstr "ئىزدەش ماتورى قوش"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Edit search engine"
+msgstr "ئىزدەش ماتورى تەھرىرلە"
+
+#: ../midori/midori-searchaction.c:985
+msgid "_Name:"
+msgstr "ئاتى(_N):"
+
+#: ../midori/midori-searchaction.c:1000
+msgid "_Description:"
+msgstr "چۈشەندۈرۈش(_D):"
+
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "ئادرېس(_A):"
+
+#: ../midori/midori-searchaction.c:1032
+msgid "_Token:"
+msgstr "ماياق(_T):"
+
+#: ../midori/midori-searchaction.c:1330
+msgid "Manage Search Engines"
+msgstr "ئىزدەش ماتورىنى باشقۇرۇش"
+
+#: ../midori/midori-searchaction.c:1432
+msgid "Use as _default"
+msgstr "كۆڭۈلدىكى قىلىپ ئىشلەت(_D)"
+
+#: ../midori/sokoke.c:346
+msgid "Open with"
+msgstr "بۇنىڭدا ئاچ"
+
+#: ../midori/sokoke.c:354
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "«%s» نى ئاچىدىغان پروگرامما ياكى بۇيرۇقنى تاللاڭ."
+
+#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
+msgid "Could not run external program."
+msgstr "سىرتقى پروگراممىنى ئىجرا قىلغىلى بولمىدى"
+
+#: ../midori/sokoke.c:1443
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d سائەت"
+
+#: ../midori/sokoke.c:1444
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d مىنۇت"
+
+#: ../midori/sokoke.c:1445
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d سېكۇنت"
+
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/sokoke.c:1453 ../panels/midori-transfers.c:268
+#, c-format
+msgid "%s of %s"
+msgstr "%s / %s"
+
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/sokoke.c:1462
+msgid "?B"
+msgstr "؟ب"
+
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/sokoke.c:1465
+#, c-format
+msgid " (%s/s)"
+msgstr " (%s/s)"
+
+#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
+#: ../midori/sokoke.c:1482
+#, c-format
+msgid " - %s remaining"
+msgstr " - %s قالدى"
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:265
+msgid "_Inline Find:"
+msgstr ""
+
+#: ../toolbars/midori-findbar.c:287
+msgid "Previous"
+msgstr "ئالدىنقى"
+
+#: ../toolbars/midori-findbar.c:293
+msgid "Next"
+msgstr "كېيىنكى"
+
+#: ../toolbars/midori-findbar.c:297
+msgid "Match Case"
+msgstr "چوڭ كىچىكلىكىگە قارىسۇن"
+
+#: ../toolbars/midori-findbar.c:306
+msgid "Highlight Matches"
+msgstr "ماس كەلگەنلىرىنى يورۇتسۇن"
+
+#: ../toolbars/midori-findbar.c:317
+msgid "Close Findbar"
+msgstr "تېپىش بالدىقىنى تاقاش"
+
+#: ../toolbars/midori-transferbar.c:124
+#, c-format
+msgid "The file '%s ' has been downloaded."
+msgstr "ھۆججەت '%s ' چۈشۈرۈلدى."
+
+#: ../toolbars/midori-transferbar.c:129
+msgid "Transfer completed"
+msgstr "ئۇزىتىش تاماملاندى"
+
+#: ../toolbars/midori-transferbar.c:201
+msgid "The downloaded file is erroneous."
+msgstr "چۈشۈرگەن ھۆججەتتە خاتالىقلار بار."
+
+#: ../toolbars/midori-transferbar.c:202
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
+msgstr ""
+
+#: ../toolbars/midori-transferbar.c:345 ../panels/midori-transfers.c:142
+msgid "Clear All"
+msgstr "ھەممىنى تازىلا"
+
+#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384
+msgid "Some files are being downloaded"
+msgstr "بەزى ھۆججەتلەر چۈشۈرۈلىدۇ"
+
+#: ../toolbars/midori-transferbar.c:388
+msgid "_Quit Midori"
+msgstr "مىدورى(Midori) نى ئاخىرلاشتۇر(_Q)"
+
+#: ../toolbars/midori-transferbar.c:390
+msgid "The transfers will be cancelled if Midori quits."
+msgstr "مىدورى(Midori) ئاخىرلاشتۇرۇلسا ئۇزىتىشلار ئۈزۈلىدۇ."
+
+#: ../panels/midori-bookmarks.c:308
+#, c-format
+msgid "Failed to add bookmark item: %s\n"
+msgstr "خەتكۈش تۇرىنى ئېچىش مەغلۇپ بولدى: %s\n"
+
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "خەتكۈش يېڭىلاش مەغلۇپ بولدى: %s\n"
+
+#: ../panels/midori-bookmarks.c:535
+msgid "Edit the selected bookmark"
+msgstr "تاللانغان خەتكۈشنى تەھرىرلەيدۇ"
+
+#: ../panels/midori-bookmarks.c:543
+msgid "Delete the selected bookmark"
+msgstr "تاللانغان خەتكۈشنى ئۆچۈرىدۇ"
+
+#: ../panels/midori-bookmarks.c:558
+msgid "Add a new folder"
+msgstr "يېڭى مۇندەرىجە قوش"
+
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
+msgid "Separator "
+msgstr "ئايرىغۇچ "
+
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr ""
+
+#: ../panels/midori-history.c:111
+msgid "History"
+msgstr "ئىز"
+
+#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
+msgid "Today"
+msgstr "بۈگۈن"
+
+#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
+msgid "Yesterday"
+msgstr "تۈنۈگۈن"
+
+#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d كۈن بۇرۇن"
+
+#: ../panels/midori-history.c:165 ../panels/midori-history.c:184
+msgid "A week ago"
+msgstr "بىر ھەپتە بۇرۇن"
+
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "ئىز ئۆچۈرۈش مەغلۇپ بولدى: %s\n"
+
+#: ../panels/midori-history.c:360
+msgid "Are you sure you want to remove all history items?"
+msgstr "بارلىق ئىزلارنى ئۆچۈرەمسىز؟"
+
+#: ../panels/midori-history.c:407
+msgid "Bookmark the selected history item"
+msgstr "تاللانغان ئىزنى خەتكۈچكە قوشىدۇ"
+
+#: ../panels/midori-history.c:416
+msgid "Delete the selected history item"
+msgstr "تاللانغان ئىزنى ئۆچۈرىدۇ"
+
+#: ../panels/midori-history.c:424
+msgid "Clear the entire history"
+msgstr "بارلىق ئىزنى تازىلايدۇ"
+
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "ئىزدەش ئىزلىرى"
+
+#: ../panels/midori-transfers.c:87
+msgid "Transfers"
+msgstr "ئۇزاتقانلىرى"
+
+#: ../panels/midori-transfers.c:470
+msgid "Open Destination _Folder"
+msgstr "نىشان مۇندەرىجىنى ئاچ(_F)"
+
+#: ../panels/midori-transfers.c:473
+msgid "Copy Link Loc_ation"
+msgstr "ئۇلانما ئورنىنى كۆچۈر(_A)"
+
+#: ../katze/katze-http-auth.c:210
+msgid "Authentication Required"
+msgstr "دەلىللەش زۆرۈر"
+
+#: ../katze/katze-http-auth.c:226
+msgid ""
+"A username and a password are required\n"
+"to open this location:"
+msgstr ""
+"بۇ ئورۇننى ئېچىش ئۈچۈن ئىشلەتكۈچى ئاتى ۋە ئىم\n"
+"زۆرۈردۇر:"
+
+#: ../katze/katze-http-auth.c:240
+msgid "Username"
+msgstr "ئىشلەتكۈچى ئاتى"
+
+#: ../katze/katze-http-auth.c:253
+msgid "Password"
+msgstr "ئىم"
+
+#: ../katze/katze-http-auth.c:267
+msgid "_Remember password"
+msgstr "ئىمنى ئەستە تۇتۇۋال(_R)"
+
+#: ../katze/katze-throbber.c:949
+#, c-format
+msgid "Named icon '%s' couldn't be loaded"
+msgstr "ئات قويۇلغان سىنبەلگە ‹%s› نى ئوقۇغىلى بولمىدى"
+
+#: ../katze/katze-throbber.c:962
+#, c-format
+msgid "Stock icon '%s' couldn't be loaded"
+msgstr ""
+
+#: ../katze/katze-throbber.c:1042
+msgid "Animation frames are broken"
+msgstr "جانلاندۇرۇم كاندۇكى بۇزۇلغان"
+
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
+#, c-format
+msgid "Property '%s' is invalid for %s"
+msgstr "خاسلىق ‹%s› ئىناۋەتسىز (%s نىڭ خاسلىقى)"
+
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:308
+msgid "Choose file"
+msgstr "ھۆججەت تاللا"
+
+#: ../katze/katze-utils.c:504
+msgid "Choose folder"
+msgstr "مۇندەرىجە تاللا"
+
+#: ../katze/katze-utils.c:602
+msgid "None"
+msgstr "يوق"
+
+#: ../katze/katze-utils.c:717
+msgid "1 hour"
+msgstr "بىر سائەت"
+
+#: ../katze/katze-utils.c:718
+msgid "1 day"
+msgstr "بىر كۈن"
+
+#: ../katze/katze-utils.c:719
+msgid "1 week"
+msgstr "بىر ھەپتە"
+
+#: ../katze/katze-utils.c:720
+msgid "1 month"
+msgstr "بىر ئاي"
+
+#: ../katze/katze-utils.c:721
+msgid "1 year"
+msgstr "بىر يىل"
+
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
+#, c-format
+msgid "Preferences for %s"
+msgstr "%s نى تەڭشىكى"
+
+#: ../extensions/adblock.c:470
+msgid "Configure Advertisement filters"
+msgstr "ئېلان سۈزگۈچىنى تەڭشەش"
+
+#: ../extensions/adblock.c:503
+#, c-format
+msgid ""
+"Type the address of a preconfigured filter list in the text entry and click "
+"\"Add\" to add it to the list. You can find more lists at %s."
+msgstr ""
+
+#: ../extensions/adblock.c:917
+msgid "Edit rule"
+msgstr "تۇزۇم تەھرىرلە"
+
+#: ../extensions/adblock.c:931
+msgid "_Rule:"
+msgstr "تۇزۇم(_R):"
+
+#: ../extensions/adblock.c:985
+msgid "Bl_ock image"
+msgstr "سۈرەتنى چەكلە(_O)"
+
+#: ../extensions/adblock.c:990
+msgid "Bl_ock link"
+msgstr "ئۇلانمىنى چەكلە(_O)"
+
+#: ../extensions/adblock.c:1689
+msgid "Advertisement blocker"
+msgstr "ئېلان چەكلىگۈ"
+
+#: ../extensions/adblock.c:1690
+msgid "Block advertisements according to a filter list"
+msgstr "سۈزگۈچ تىزىملىكىگە ئاساسەن ئېلاننى چەكلەيدۇ"
+
+#. i18n: An infobar shows up when viewing a script on userscripts.org
+#: ../extensions/addons.c:221
+msgid "This page appears to contain a user script. Do you wish to install it?"
+msgstr ""
+"مەزكۇر بەتتە ئىشلەتكۈچى قوليازما پروگراممىسى بار ئىكەن. ئورناتقۇڭىز بارمۇ؟"
+
+#: ../extensions/addons.c:222
+msgid "_Install user script"
+msgstr "ئىشلەتكۈچى قوليازما(script)سىنى ئورنات(_I)"
+
+#. i18n: An infobar shows up when viewing a style on userstyles.org
+#: ../extensions/addons.c:227
+msgid "This page appears to contain a user style. Do you wish to install it?"
+msgstr "مەزكۇر بەتتە ئىشلەتكۈچى ئۇسلۇبى بار ئىكەن. ئورناتقۇڭىز بارمۇ؟"
+
+#: ../extensions/addons.c:228
+msgid "_Install user style"
+msgstr "ئىشلەتكۈچى قوليازما پروگراممىسىنى ئورنات(_I)"
+
+#: ../extensions/addons.c:236
+msgid "Don't install"
+msgstr "ئورناتما"
+
+#: ../extensions/addons.c:319 ../extensions/addons.c:677
+msgid "Userscripts"
+msgstr "Userscripts"
+
+#: ../extensions/addons.c:324 ../extensions/addons.c:679
+msgid "Userstyles"
+msgstr "ئىشلەتكۈچى ئۇسلۇبى"
+
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
+#: ../extensions/feed-panel/main.c:129
+msgid "Error"
+msgstr "خاتالىق"
+
+#: ../extensions/addons.c:411
+#, c-format
+msgid "Do you want to delete '%s'?"
+msgstr "سىزنىڭ ‹%s› نى ئۆچۈرگۈڭىز بارمۇ؟"
+
+#: ../extensions/addons.c:417
+msgid "Delete user script"
+msgstr "ئىشلەتكۈچى قوليازما پروگراممىسىنى ئۆچۈر"
+
+#: ../extensions/addons.c:418
+msgid "Delete user style"
+msgstr "ئىشلەتكۈچى ئۇسلۇبىنى ئۆچۈر"
+
+#: ../extensions/addons.c:421
+#, c-format
+msgid "The file %s will be permanently deleted."
+msgstr "ھۆججەت %s مەڭگۈلۈككە ئۆچۈرۈلىدۇ."
+
+#: ../extensions/addons.c:566 ../extensions/addons.c:643
+msgid "Open in Text Editor"
+msgstr "تېكىست تەھرىرلىگۈدە ئېچىش"
+
+#: ../extensions/addons.c:568 ../extensions/addons.c:652
+msgid "Open Target Folder"
+msgstr "نىشان مۇندەرىجىنى ئېچىش"
+
+#: ../extensions/addons.c:634
+msgid "Add new addon"
+msgstr "يېڭى قوشۇلما قوش"
+
+#: ../extensions/addons.c:660
+msgid "Remove selected addon"
+msgstr "تاللانغان قوشۇلمىنى ئۆچۈر"
+
+#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
+msgid "User addons"
+msgstr "ئىشلەتكۈچى قوشۇلمىسى"
+
+#: ../extensions/addons.c:1819
+#, c-format
+msgid "Can't monitor folder '%s': %s"
+msgstr "قىسقۇچ ‹%s› نى كۆزەتكىلى بولمىدى: %s"
+
+#: ../extensions/addons.c:1908
+msgid "Support for userscripts and userstyles"
+msgstr ""
+"ئىشلەتكۈچى قوليازمىسى(userscripts ۋە) ئىشلەتكۈچى ئۇسلۇبىنى ئىشلەتكىلى بولىدۇ"
+
+#: ../extensions/colorful-tabs.c:201
+msgid "Colorful Tabs"
+msgstr "رەڭلىك بەتكۈچلەر"
+
+#: ../extensions/colorful-tabs.c:202
+msgid "Tint each tab distinctly"
+msgstr "ھەر بىر بەتكۈچنى ئوخشىمىغان رەڭدە كۆرسەت"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:73
+#: ../extensions/cookie-manager/main.c:35
+msgid "Cookie Manager"
+msgstr "كۇكى(Cookie) باشقۇرغۇ"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:103
+msgid "Delete All"
+msgstr "ھەممىنى ئۆچۈر…"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:105
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"كۆرۈنگەن ھەممە كۇكى(Cookie) نى ئۆچۈرىدۇ. ئەگەر سۈزگۈچ بار بولسا، "
+"سۈزۈلگەننىلا ئۆچۈرىدۇ."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:120
+msgid "Expand All"
+msgstr "ھەممىنى يايىدۇ"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:127
+msgid "Collapse All"
+msgstr "ھەممىنى قاتلايدۇ"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:572
+msgid "Do you really want to delete all cookies?"
+msgstr "ھەممە كۇكى(Cookie)نى راستلا ئۆچۈرەمسىز؟"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:574
+msgid "Question"
+msgstr "سوئال"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:583
+msgid "Only cookies which match the filter will be deleted."
+msgstr "سۈزۈلگەن كۇكى(Cookie) نىلا ئۆچۈرىدۇ."
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:671
+msgid "At the end of the session"
+msgstr "ئەڭگىمەنىڭ ئاخىرىغىچە"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:674
+#, c-format
+msgid ""
+"Host : %s\n"
+"Name : %s\n"
+"Value : %s\n"
+"Path : %s\n"
+"Secure : %s\n"
+"Expires : %s"
+msgstr ""
+"Host : %s\n"
+"ئاتى : %s\n"
+"قىممىتى : %s\n"
+"يولى : %s\n"
+"بىخەتەر : %s\n"
+"مۇددىتى : %s"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:680
+msgid "Yes"
+msgstr "ھەئە"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:680
+msgid "No"
+msgstr "ياق"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:694
+#, c-format
+msgid ""
+"Domain : %s\n"
+"Cookies : %d"
+msgstr ""
+"دائىرە : %s\n"
+"كۇكى(Cookie) سانى : %d"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
+msgid "Name"
+msgstr "ئاتى"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
+msgid "_Expand All"
+msgstr "ھەممىنى ياي(_E)"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+msgid "_Collapse All"
+msgstr "ھەممىنى قاتلا(_C)"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "ئاتى ياكى دائىرە بويىچە كۇكى(Cookie)لارنى ئىزدەش"
+
+#: ../extensions/cookie-manager/main.c:36
+msgid "List, view and delete cookies"
+msgstr "كۇكى(Cookie) نى تىزىپ كۆرسىتىدۇ، كۆرىدۇ، ئۆچۈرىدۇ"
+
+#: ../extensions/copy-tabs.c:38
+msgid "Copy Tab _Addresses"
+msgstr "بەتكۈچ ئادرېسىنى كۆچۈرىدۇ(_A)"
+
+#: ../extensions/copy-tabs.c:95
+msgid "Copy Addresses of Tabs"
+msgstr "بەتكۈچ ئادرېسىنى كۆچۈرىدۇ"
+
+#: ../extensions/copy-tabs.c:96
+msgid "Copy the addresses of all tabs to the clipboard"
+msgstr "بارلىق بەتكۈچنىڭ ئادرېسىنى چاپلاش تاختىسىغا كۆچۈرىدۇ"
+
+#: ../extensions/feed-panel/feed-atom.c:209
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr "XML غا زۆرۈر بولغان Atom \"entry\" ئېلېمېنتى تېپىلمىدى."
+
+#: ../extensions/feed-panel/feed-atom.c:315
+msgid "Failed to find required Atom \"feed\" elements in XML data."
+msgstr "XML غا زۆرۈر بولغان Atom \"feed\" ئېلېمېنتى تېپىلمىدى."
+
+#. i18n: The local date a feed was last updated
+#: ../extensions/feed-panel/feed-panel.c:387
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr "يېڭىلانغان ۋاقتى: %s"
+
+#: ../extensions/feed-panel/feed-panel.c:653
+msgid "Feeds"
+msgstr "فىدلار(Feeds)"
+
+#: ../extensions/feed-panel/feed-panel.c:706
+msgid "Add new feed"
+msgstr "يېڭى فىد(feed) قوش"
+
+#: ../extensions/feed-panel/feed-panel.c:713
+msgid "Delete feed"
+msgstr "فىد(feed) ئۆچۈر"
+
+#: ../extensions/feed-panel/feed-panel.c:795
+msgid "_Feeds"
+msgstr "فىدلار(_Feeds)"
+
+#: ../extensions/feed-panel/feed-parse.c:195
+#, c-format
+msgid "Failed to find root element in feed XML data."
+msgstr "فىد(feed) XML ئىچىدىن root ئېلېمېنتىنى تېپىش مەغلۇپ بولدى"
+
+#: ../extensions/feed-panel/feed-parse.c:235
+#, c-format
+msgid "Unsupported feed format."
+msgstr "بۇ خىل فىد(feed) فورماتىنى تېخى ئىشلەتكىلى بولمايدۇ"
+
+#: ../extensions/feed-panel/feed-parse.c:265
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr "XML فىد(feed) نى تەھلىل قىلىش مەغلۇپ بولدى: %s"
+
+#: ../extensions/feed-panel/feed-rss.c:46
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr "RSS XML ئىچىدىن \"channel\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى"
+
+#: ../extensions/feed-panel/feed-rss.c:51
+msgid "Unsupported RSS version found."
+msgstr "RSS نىڭ بۇ نەشرىنى تېخى ئىشلىتەلمەيمەن"
+
+#: ../extensions/feed-panel/feed-rss.c:148
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr "XML ئىچىدىن زۆرۈر بولغان RSS \"item\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى."
+
+#: ../extensions/feed-panel/feed-rss.c:248
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+"XML ئىچىدىن زۆرۈر بولغان RSS \"channel\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى."
+
+#: ../extensions/feed-panel/main.c:131
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr "فىد(feed) ‹%s› مەۋجۇت"
+
+#: ../extensions/feed-panel/main.c:208
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr "فىد(feed) ‹%s› نى ئوقۇشتا خاتالىق كۆرۈلدى"
+
+#: ../extensions/feed-panel/main.c:518
+msgid "Feed Panel"
+msgstr "فىد(feed) كۆزنىكى"
+
+#: ../extensions/feed-panel/main.c:519
+msgid "Read Atom/ RSS feeds"
+msgstr "Atom/RSS فىد(feed) نى ئوقۇۋاتىدۇ"
+
+#: ../extensions/formhistory/formhistory.c:39
+#, c-format
+msgid "Failed to add form value: %s\n"
+msgstr "جەدۋەل(form) قىممىتىنى قوشۇش مەغلۇپ بولدى: %s\n"
+
+#: ../extensions/formhistory/formhistory.c:95
+msgid "Form history"
+msgstr "ئىزدىن"
+
+#: ../extensions/formhistory/formhistory.c:112
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+"ئىم ساندانىنى ئېچىش ئۈچۈن\n"
+"ئاساسىي ئىم زۆرۈردۇر"
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember password on this page?"
+msgstr "بۇ بەتنىڭ ئىمنى ئەستە تۇتۇۋالسۇنمۇ(_R)"
+
+#: ../extensions/formhistory/formhistory.c:299
+msgid "Remember"
+msgstr "ئەستە تۇتۇۋالسۇن"
+
+#: ../extensions/formhistory/formhistory.c:300
+msgid "Not now"
+msgstr "ھازىر ئەمەس"
+
+#: ../extensions/formhistory/formhistory.c:301
+msgid "Never for this page"
+msgstr "بۇ بەتنىڭكىنى زادىلا ئەستە تۇتمىسۇن"
+
+#: ../extensions/formhistory/formhistory.c:437
+msgid "Toggle form history state"
+msgstr "جەدۋەل(form) ئىزىنىڭ ھالىتىنى ئالماشتۇرۇش"
+
+#: ../extensions/formhistory/formhistory.c:438
+msgid "Activate or deactivate form history for the current tab."
+msgstr ""
+"نۆۋەتتىكى بەتكۈچنىڭ جەدۋەل(form) ئىزىنىڭ ھالىتىنى ئاكتىپلايدۇ/ئاكتىپسىزلايدۇ"
+
+#: ../extensions/formhistory/formhistory.c:549
+#: ../extensions/formhistory/formhistory.c:553
+#, c-format
+msgid "Failed to execute database statement: %s\n"
+msgstr "ساندان جۈملىسىنى ئىجرا قىلىش مەغلۇپ بولدى: %s\n"
+
+#: ../extensions/formhistory/formhistory.c:629
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr ""
+"ھەر بىر بەتكۈچنىڭ جەدۋەل(form) ئىزىنى پەقەت (Ctrl+Shift+F) ئارقىلىق "
+"ئاكتىپلىسۇن"
+
+#: ../extensions/formhistory/formhistory.c:668
+msgid "Form history filler"
+msgstr "جەدۋەل(form) ئىزى تولدۇرغۇ"
+
+#: ../extensions/formhistory/formhistory.c:669
+msgid "Stores history of entered form data"
+msgstr "جەدۋەل(form) كىرگۈزۈلگەن ئۇچۇرلارنى ئەستە ساقلىۋالىدۇ"
+
+#: ../extensions/formhistory/formhistory-gdom-frontend.c:225
+#: ../extensions/formhistory/formhistory-js-frontend.c:106
+#, c-format
+msgid "Failed to select suggestions\n"
+msgstr "نامزاتنى تاللاش مەغلۇپ بولدى\n"
+
+#: ../extensions/history-list.vala:197
+msgid "There are no unvisited tabs"
+msgstr "زىيارەت قىلىنمىغان بەتكۈچ يوق"
+
+#: ../extensions/history-list.vala:235
+#, c-format
+msgid "History-List"
+msgstr "ئىز-تىزىم"
+
+#: ../extensions/history-list.vala:275
+msgid "Tab closing behavior"
+msgstr "بەتكۈچ يېپىلغاندا"
+
+#: ../extensions/history-list.vala:283
+msgid "Do nothing"
+msgstr "ھېچ ئىش قىلما"
+
+#: ../extensions/history-list.vala:289
+msgid "Switch to last viewed tab"
+msgstr "ئەڭ ئاخىرى كۆرگەن بەتكۈچكە ئالمىشىدۇ"
+
+#: ../extensions/history-list.vala:295
+msgid "Switch to newest tab"
+msgstr "ئەڭ يېڭى بەتكۈچكە ئالمىشىدۇ"
+
+#: ../extensions/history-list.vala:423
+msgid "Next new Tab (History List)"
+msgstr "كېيىنكى بەتكۈچ(ئىز تىزىمى)"
+
+#: ../extensions/history-list.vala:424
+msgid "Next new tab from history"
+msgstr "ئىزدىكى كېيىنكى يېڭى بەتكۈچ"
+
+#: ../extensions/history-list.vala:433
+msgid "Previous new Tab (History List)"
+msgstr "ئالدىنقى يېڭى بەتكۈچ (ئىز تىزىمى)"
+
+#: ../extensions/history-list.vala:434
+msgid "Previous new tab from history"
+msgstr "ئىزدىكى ئالدىنقى يېڭى بەتكۈچ"
+
+#: ../extensions/history-list.vala:443
+msgid "Display tab in background (History List)"
+msgstr "بەتكۈچنى ئارقىدا ئاچ(ئىز تىزىمى)"
+
+#: ../extensions/history-list.vala:444
+msgid "Display the current selected tab in background"
+msgstr "نۆۋەتتە تاللانغان بەتكۈچنى ئارقىدا ئاچىدۇ"
+
+#: ../extensions/history-list.vala:569
+msgid "History List"
+msgstr "ئىز تىزىمى"
+
+#: ../extensions/history-list.vala:570
+msgid "Move to the last used tab when switching or closing tabs"
+msgstr ""
+"بەتكۈچلەر يېپىلغاندا ياكى ئالماشتۇرۇلغاندا ئەڭ ئاخىرقى قېتىم ئىشلىتىلگەن "
+"بەتكۈچكە يۆتكەلسۇن"
+
+#: ../extensions/mouse-gestures.c:301
+msgid "Mouse Gestures"
+msgstr "چاشقىنەك ئىشارىتى"
+
+#: ../extensions/mouse-gestures.c:302
+msgid "Control Midori by moving the mouse"
+msgstr "چاشقىنەك ھەرىكىتىدە مىدورى(Midori) نى باشقۇرىدۇ"
+
+#: ../extensions/shortcuts.c:109
+msgid "Reload page or stop loading"
+msgstr "بەتنى قايتا ئوقۇيدۇ ياكى ئوقۇشنى توختىتىدۇ"
+
+#: ../extensions/shortcuts.c:176
+msgid "Customize Keyboard shortcuts"
+msgstr "كۇنۇپكا تېزلەتمىسىنى ئۆزلەشتۈر"
+
+#: ../extensions/shortcuts.c:283
+msgid "Customize Sh_ortcuts..."
+msgstr "تېزلەتمىلەرنى ئۆزلەشتۈر(_O)…"
+
+#: ../extensions/shortcuts.c:320
+msgid "Shortcuts"
+msgstr "تېزلەتمىلەر"
+
+#: ../extensions/shortcuts.c:321
+msgid "View and edit keyboard shortcuts"
+msgstr "كۇنۇپكا تېزلەتمىسىنى كۆرىدۇ ۋە تەھرىرلەيدۇ"
+
+#: ../extensions/status-clock.c:174
+msgid "Statusbar Clock"
+msgstr "ھالەت بالداق سائىتى"
+
+#: ../extensions/status-clock.c:175
+msgid "Display date and time in the statusbar"
+msgstr "چېسلا ۋە ۋاقىتنى ھالەت بالداقتا كۆرسىتىدۇ"
+
+#: ../extensions/statusbar-features.c:152
+msgid "Images"
+msgstr "سۈرەتلەر"
+
+#: ../extensions/statusbar-features.c:162
+msgid "Scripts"
+msgstr "قوليازمىلار"
+
+#: ../extensions/statusbar-features.c:174
+msgid "Netscape plugins"
+msgstr "Netscape قىستۇرمىلىرى"
+
+#: ../extensions/statusbar-features.c:259
+msgid "Statusbar Features"
+msgstr "ھالەت بالدىقى ئالاھىدىلىكلىرى"
+
+#: ../extensions/statusbar-features.c:260
+msgid "Easily toggle features on web pages on and off"
+msgstr "تور بەتنىڭ ئىقتىدارىنى ئاسانلا ئىناۋەتلىك/ئىناۋەتسىز قىلىدۇ"
+
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
+msgid "Tab Panel"
+msgstr "بەتكۈچ كۆزنەك"
+
+#: ../extensions/tab-panel.c:659
+msgid "T_ab Panel"
+msgstr "بەتكۈچ كۆزنەك(_A)"
+
+#: ../extensions/tab-panel.c:677
+msgid "Show tabs in a vertical panel"
+msgstr "بەتكۈچلەرنى تىك كۆزنەكتە كۆرسىتىدۇ"
+
+#: ../extensions/tabs-minimized.c:76
+msgid "Only Icons on Tabs by default"
+msgstr "كۆڭۈلدە بەتكۈچلەرنىڭ سىنبەلگىسىلا"
+
+#: ../extensions/tabs-minimized.c:77
+msgid "New tabs have no label by default"
+msgstr "كۆڭۈلدە يېڭى بەتكۈچلەرنىڭ ئەنى كۆرسىتىلمەيدۇ"
+
+#: ../extensions/toolbar-editor.c:395
+msgid "Customize Toolbar"
+msgstr "قورال ئىستونىنى ئۆزلەشتۈرۈش"
+
+#: ../extensions/toolbar-editor.c:411
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
+msgstr ""
+"قورال بالدىقىدا كۆرسىتىلىدىغان تۈرلەرنى تاللا. ئۇلارنى ئۇنىڭ تەرتىپىنى تۇتۇپ "
+"تاشلاپ ئۆزگەرتىشكە بولىدۇ"
+
+#: ../extensions/toolbar-editor.c:427
+msgid "Available Items"
+msgstr "بار تۈرلەر"
+
+#: ../extensions/toolbar-editor.c:448
+msgid "Displayed Items"
+msgstr "كۆرسىتىدىغان تۈرلەر"
+
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "قورال بالدىقىنى ئۆزلەشتۈر(_C)…"
+
+#: ../extensions/toolbar-editor.c:617
+msgid "Toolbar Editor"
+msgstr "قورال بالدىقى تەھرىرلىگۈ"
+
+#: ../extensions/toolbar-editor.c:618
+msgid "Easily edit the toolbar layout"
+msgstr "قورال بالدىقىنىڭ ئورۇنلاشتۇرۇلۇشىنى ئاسانلا تەھرىرلىگىلى بولىدۇ"
+
+#: ../extensions/web-cache.c:463
+msgid "Cache HTTP communication on disk"
+msgstr "HTTP ئالاقىسىنى دىسكىغا غەملەيدۇ"
diff --git a/po/uk.po b/po/uk.po
index a8235313..196a35ae 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: midori svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 04:45+0000\n"
+"POT-Creation-Date: 2012-09-11 05:48+0000\n"
"PO-Revision-Date: 2010-02-16 22:53+0100\n"
"Last-Translator: Yarema aka Knedlyk \n"
"Language-Team: Ukrainian \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
@@ -26,12 +26,28 @@ msgstr "Переглянути Веб"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996
-#: ../midori/main.c:2010 ../midori/midori-websettings.c:313
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1926 ../midori/main.c:1950
+#: ../midori/main.c:1964 ../midori/midori-websettings.c:199
msgid "Midori"
msgstr "Мідорі"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Midori - переглядач Веб-сторінок"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "Нове вікно в режимі приватності"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1314
+msgid "New Tab"
+msgstr "Нова вкладка"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1311
+msgid "New Window"
+msgstr "Нове вікно"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "Переглядач Веб"
@@ -43,71 +59,87 @@ msgstr "Мідорі перегляд в режимі приватності"
msgid "Open a new private browsing window"
msgstr "Відкрити нове вікно перегляду в режимі приватності"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4288
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4351
msgid "Private Browsing"
msgstr "Режим приватності"
-#: ../midori/main.c:97 ../midori/main.c:103
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "Неможливо завантажити конфігурацію: %s\n"
-#: ../midori/main.c:151
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "Значення '%s' є неправильним для %s"
-#: ../midori/main.c:156 ../midori/main.c:260
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "Неправильне значення конфігурації '%s'"
-#: ../midori/main.c:381
+#: ../midori/main.c:365
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "Неможливо завантажити пошукову машину. %s\n"
-#: ../midori/main.c:435
+#: ../midori/main.c:419
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "Невдача при очищенні історії: %s\n"
-#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:441 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "Не вдалось відкрити базу даних: %s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:525
+#: ../midori/main.c:513
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "Невдача видалення старих об'єктів історії: %s\n"
-#: ../midori/main.c:547
+#: ../midori/main.c:535
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "Неможливо зберегти конфігурацію. %s"
-#: ../midori/main.c:582
+#: ../midori/main.c:561
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "Неможливо зберегти пошукові машини. %s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:619
+#: ../midori/main.c:598
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "Неможливо зберегти смітник. %s"
-#: ../midori/main.c:660 ../panels/midori-extensions.c:91
+#: ../midori/main.c:671 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "Розширення"
-#: ../midori/main.c:674
+#: ../midori/main.c:685
msgid "Privacy"
msgstr "Приватність"
-#: ../midori/main.c:686
+#: ../midori/main.c:687
+msgid "Delete old Cookies after:"
+msgstr "Вилучити старі тістечка через:"
+
+#: ../midori/main.c:689 ../midori/main.c:692
+msgid "The maximum number of days to save cookies for"
+msgstr "Максимальне число днів зберігання тістечок для"
+
+#: ../midori/main.c:696
+msgid "Only accept Cookies from sites you visit"
+msgstr "Приймати тістечка тільки з сторінок які ви відвідуєте"
+
+#: ../midori/main.c:697
+msgid "Block cookies sent by third-party websites"
+msgstr "Блокувати тістечка що посилаються сторонніми сторінками"
+
+#: ../midori/main.c:702
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
@@ -115,18 +147,44 @@ msgstr ""
"Тістечка зберігають дані входу, зберігають ігри або профілі користувачів для "
"рекламних цілей."
-#: ../midori/main.c:742
+#: ../midori/main.c:709
+msgid "Enable offline web application cache"
+msgstr "Ввімкнути кеш веб переглядача при роботі поза мережею"
+
+#: ../midori/main.c:712
+msgid "Enable HTML5 local storage support"
+msgstr "Ввімкнути підтримку локального сховища HTML5"
+
+#. i18n: Reworded: Shorten details propagated when going to another page
+#: ../midori/main.c:716
+msgid "Strip referrer details sent to websites"
+msgstr "Пропустити деталі referer'а, що вислані до зовнішніх сторінок"
+
+#. i18n: Referer here is not a typo but a technical term
+#: ../midori/main.c:718
+msgid "Whether the \"Referer\" header should be shortened to the hostname"
+msgstr "Чи заголовок \"Referer'а\" повинен бути скорочений до назви сервера"
+
+#: ../midori/main.c:721
+msgid "Delete pages from history after:"
+msgstr "Видалити сторінку з історії через:"
+
+#: ../midori/main.c:723 ../midori/main.c:726
+msgid "The maximum number of days to save the history for"
+msgstr "Максимальне число днів зберігання історії для"
+
+#: ../midori/main.c:767
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "Сесія не може бути збережена. %s"
-#: ../midori/main.c:960
+#: ../midori/main.c:993
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr ""
"Немає доступних кореневих сертифікатів. Сертифікати SSL неможливо перевірити."
-#: ../midori/main.c:1036
+#: ../midori/main.c:1088
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."
@@ -134,230 +192,239 @@ msgstr ""
"Схоже, що Мідорі зазнало краху останнього разу. Якщо це трапилося не вперше, "
"то можливо якась з наступних опцій зможе посприяти вирішенню цієї проблеми."
-#: ../midori/main.c:1055
+#: ../midori/main.c:1107
msgid "Modify _preferences"
msgstr "Змінити _налаштування"
-#: ../midori/main.c:1059
+#: ../midori/main.c:1111
msgid "Disable all _extensions"
msgstr "Заборонити всі розширення"
-#: ../midori/main.c:1072
+#: ../midori/main.c:1120
+msgid "Show a dialog after Midori crashed"
+msgstr "Показати діалог, коли Мідорі зазнає краху"
+
+#: ../midori/main.c:1125
msgid "Discard old tabs"
msgstr "Видалити старі вкладки"
-#: ../midori/main.c:1073 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1126 ../midori/midori-websettings.c:107
msgid "Show last tabs without loading"
msgstr "Показати останні вкладки без завантаження"
-#: ../midori/main.c:1074 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1127 ../midori/midori-websettings.c:106
msgid "Show last open tabs"
msgstr "Показати останні відкриті вкладки"
-#: ../midori/main.c:1321 ../midori/main.c:2399
+#: ../midori/main.c:1374 ../midori/main.c:2378
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "Неможливо завантажити сесію: %s\n"
-#: ../midori/main.c:1459
+#: ../midori/main.c:1512
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "Знімок екрану збережено до: %s\n"
-#: ../midori/main.c:1875
+#: ../midori/main.c:1841
msgid "Run ADDRESS as a web application"
msgstr "Запустити АДРЕСУ як веб-додаток"
-#: ../midori/main.c:1875
+#: ../midori/main.c:1841
msgid "ADDRESS"
msgstr "АДРЕСА"
-#: ../midori/main.c:1878
+#: ../midori/main.c:1844
msgid "Use FOLDER as configuration folder"
msgstr "Використайте ТЕКУ як теку конфігурації"
-#: ../midori/main.c:1878
+#: ../midori/main.c:1844
msgid "FOLDER"
msgstr "ТЕКА"
-#: ../midori/main.c:1881
+#: ../midori/main.c:1847
msgid "Private browsing, no changes are saved"
msgstr "Захищений перегляд, жодні зміни не записуються"
-#: ../midori/main.c:1883
+#: ../midori/main.c:1850
+msgid "Portable mode, all runtime files are stored in one place"
+msgstr "Портативний режим, всі файли запуску збережено в одному місці"
+
+#: ../midori/main.c:1853
+msgid "Plain GTK+ window with WebKit, akin to GtkLauncher"
+msgstr "Звичайне GTK+ вікно з WebKit, аналогічно до GtkLauncher"
+
+#: ../midori/main.c:1855
msgid "Show a diagnostic dialog"
msgstr "Показати діалог діагностики"
-#: ../midori/main.c:1885
+#: ../midori/main.c:1857
msgid "Run the specified filename as javascript"
msgstr "Виконати визначений файл як джава-скрипт"
-#: ../midori/main.c:1887
+#: ../midori/main.c:1859
msgid "Take a snapshot of the specified URI"
msgstr "Зробити знімок вибраної сторінки/адреси"
-#: ../midori/main.c:1889
+#: ../midori/main.c:1861
msgid "Execute the specified command"
msgstr "Виконати вибрану команду"
-#: ../midori/main.c:1891
+#: ../midori/main.c:1863
msgid "List available commands to execute with -e/ --execute"
msgstr "Список можливих команд для запуску з -e/ --execute"
-#: ../midori/main.c:1893
+#: ../midori/main.c:1865
msgid "Display program version"
msgstr "Відобразити версію програми"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1867
msgid "Addresses"
msgstr "Адреси"
-#: ../midori/main.c:1897
+#: ../midori/main.c:1869
msgid "Block URIs according to regular expression PATTERN"
msgstr "Блокувати URI згідно з регулярним виразом PATTERN"
-#: ../midori/main.c:1897
+#: ../midori/main.c:1869
msgid "PATTERN"
msgstr "PATTERN"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1901
+#: ../midori/main.c:1873
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "Зареєструвати Midori після СЕКУНД неактивності"
-#: ../midori/main.c:1901
+#: ../midori/main.c:1873
msgid "SECONDS"
msgstr "СЕКУНД"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1876
msgid "Redirects console warnings to the specified FILENAME"
msgstr "Перенаправити попередження консолі до вказаного ФАЙЛ"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1876
msgid "FILENAME"
msgstr "ФАЙЛ"
-#: ../midori/main.c:1969
-msgid "[Addresses]"
-msgstr "[Адреси]"
-
-#: ../midori/main.c:2011
+#: ../midori/main.c:1965
msgid "Please report comments, suggestions and bugs to:"
msgstr "Будь ласка надсилайте звіти, коментарі, пропозиції і помилки до:"
-#: ../midori/main.c:2013
+#: ../midori/main.c:1967
msgid "Check for new versions at:"
msgstr "Перевірити на наявність нової версії на:"
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2108
+#: ../midori/main.c:2098
msgid "Saved logins and _passwords"
msgstr "Збережені логіни і _паролі"
-#: ../midori/main.c:2110
+#: ../midori/main.c:2100
msgid "Cookies and Website data"
msgstr "Дані коржиків і веб-сторінки"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2114 ../midori/midori-websettings.c:997
-#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
+#: ../midori/main.c:2104 ../midori/midori-preferences.c:505
+#: ../extensions/web-cache.c:461 ../extensions/web-cache.c:470
msgid "Web Cache"
msgstr "Веб-кеш"
-#: ../midori/main.c:2117
+#: ../midori/main.c:2107
msgid "Website icons"
msgstr "Значки веб-сторінок"
-#: ../midori/main.c:2223
+#: ../midori/main.c:2211
msgid "An unknown error occured"
msgstr "Сталася невідома помилка"
-#: ../midori/main.c:2330
+#: ../midori/main.c:2326
msgid "An instance of Midori is already running but not responding.\n"
msgstr ""
"Один із екземплярів програми Midori вже працює, але не відповідає на "
"запити.\n"
-#: ../midori/main.c:2366
+#: ../midori/main.c:2360
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "Неможливо завантажити закладки: %s\n"
-#: ../midori/main.c:2414
+#: ../midori/main.c:2393
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "Неможливо завантажити смітник: %s\n"
-#: ../midori/main.c:2427
+#: ../midori/main.c:2406
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "Неможливо завантажити історію: %s\n"
-#: ../midori/main.c:2443
+#: ../midori/main.c:2421
msgid "The following errors occured:"
msgstr "Отримано наступні помилки:"
-#: ../midori/main.c:2459
+#: ../midori/main.c:2437
msgid "_Ignore"
msgstr "_Ігнорувати"
-#: ../midori/midori-app.c:1339
-msgid "_Bookmark"
-msgstr "_Закладка"
+#: ../midori/midori-app.c:1156 ../midori/midori-browser.c:533
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "Несподівана дія '%s'."
-#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066
+#: ../midori/midori-app.c:1372 ../midori/midori-browser.c:6212
msgid "_Bookmarks"
msgstr "_Закладки"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1373
msgid "Add Boo_kmark"
msgstr "_Додати закладку"
-#: ../midori/midori-app.c:1342
-msgid "_Console"
-msgstr "_Консоль"
-
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1374
msgid "_Extensions"
msgstr "_Розширення"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591
+#: ../midori/midori-app.c:1375 ../midori/midori-browser.c:4665
msgid "_History"
msgstr "_Історія"
-#: ../midori/midori-app.c:1345
-msgid "_Homepage"
-msgstr "Д_омашня сторінка"
-
-#: ../midori/midori-app.c:1346
+#: ../midori/midori-app.c:1376
msgid "_Userscripts"
msgstr "_Скрипти користувача"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1377
+msgid "User_styles"
+msgstr "Стилі користувача"
+
+#: ../midori/midori-app.c:1378
msgid "New _Tab"
msgstr "Нова _вкладка"
-#: ../midori/midori-app.c:1348
+#: ../midori/midori-app.c:1379
msgid "_Transfers"
msgstr "_Завантаження"
-#: ../midori/midori-app.c:1349
+#: ../midori/midori-app.c:1380
msgid "Netscape p_lugins"
msgstr "Роз_ширення Netscape"
-#: ../midori/midori-app.c:1350
+#: ../midori/midori-app.c:1381
msgid "_Closed Tabs"
msgstr "_Закриті вкладки"
-#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218
+#: ../midori/midori-app.c:1382 ../midori/midori-browser.c:5348
msgid "New _Window"
msgstr "_Нове вікно"
-#: ../midori/midori-app.c:1352
+#: ../midori/midori-app.c:1383
msgid "New _Folder"
msgstr "Нова _тека"
+#: ../midori/midori-app.c:1437
+msgid "[Addresses]"
+msgstr "[Адреси]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "Файл не знайдений."
@@ -375,140 +442,113 @@ msgstr "Нерозпізнаний формат закладки."
msgid "Writing failed."
msgstr "Невдача запису."
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5487
+msgid "Go forward to the next page"
+msgstr "Перейти до наступної сторінки"
+
+#. i18n: Visit the following logical page, ie. in a forum or blog
+#: ../midori/midori-browser.c:353 ../midori/midori-browser.c:5495
+#: ../midori/midori-browser.c:5498
+msgid "Go to the next sub-page"
+msgstr "Перейти до наступної сторінки"
+
+#: ../midori/midori-browser.c:440 ../midori/midori-browser.c:5436
+#: ../midori/midori-browser.c:5445
msgid "Reload the current page"
msgstr "Оновити поточну сторінку"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:448 ../midori/midori-browser.c:5442
msgid "Stop loading the current page"
msgstr "Зупинити завантаження поточної сторінки"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:518
#, c-format
msgid "Failed to update title: %s\n"
msgstr "Невдача при оновленні назви: %s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "Несподівана дія '%s'."
-
-#: ../midori/midori-browser.c:569
+#: ../midori/midori-browser.c:613
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (Режим приватності)"
-#: ../midori/midori-browser.c:683 ../midori/midori-browser.c:716
-msgid "Toplevel folder"
-msgstr "Тека рівнем вище"
+#: ../midori/midori-browser.c:723 ../midori/midori-browser.c:765
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "Закладки"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:825
msgid "New folder"
msgstr "Нова тека"
-#: ../midori/midori-browser.c:774
+#: ../midori/midori-browser.c:825
msgid "Edit folder"
msgstr "Редагувати теку"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:827
msgid "New bookmark"
msgstr "Нова закладка"
-#: ../midori/midori-browser.c:776
+#: ../midori/midori-browser.c:827
msgid "Edit bookmark"
msgstr "Редагувати закладку"
-#: ../midori/midori-browser.c:818
-msgid "_Title:"
-msgstr "_Назва:"
+#: ../midori/midori-browser.c:861
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "Напишіть назву для цієї закладки і виберіть де її зберегти."
-#: ../midori/midori-browser.c:838 ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "_Адреса:"
-
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328
-msgid "_Folder:"
-msgstr "_Тека:"
-
-#: ../midori/midori-browser.c:877
+#: ../midori/midori-browser.c:922
msgid "Add to _Speed Dial"
msgstr "Додати до шви_дкого виклику"
-#: ../midori/midori-browser.c:890
+#: ../midori/midori-browser.c:928
msgid "Show in the tool_bar"
msgstr "Показати в панелі інструментів"
-#: ../midori/midori-browser.c:905
+#: ../midori/midori-browser.c:936
msgid "Run as _web application"
msgstr "Запустити як веб-додаток"
-#: ../midori/midori-browser.c:976
-#, c-format
-msgid "The file \"%s\" can't be saved in this folder."
-msgstr "Файл \"%s\" неможливо зберегти в цій теці."
-
-#: ../midori/midori-browser.c:978
-#, c-format
-msgid "You don't have permission to write in this location."
-msgstr "Ви не маєте прав доступу для запису."
-
-#: ../midori/midori-browser.c:985
-#, c-format
-msgid "There is not enough free space to download \"%s\"."
-msgstr "Немає достатньо вільного місця для завантаження \"%s\"."
-
-#: ../midori/midori-browser.c:988
-#, c-format
-msgid "The file needs %s but only %s are left."
-msgstr "Файл потребує %s, але тільки %s залишилося."
-
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397
+#: ../midori/midori-browser.c:1054 ../midori/midori-browser.c:4469
msgid "Save file as"
msgstr "Зберегти файл як"
-#: ../midori/midori-browser.c:1320
-msgid "New Window"
-msgstr "Нове вікно"
+#: ../midori/midori-browser.c:1064
+msgid "Save associated _resources"
+msgstr "Показати пов’язані _ресурси"
-#: ../midori/midori-browser.c:1320
+#: ../midori/midori-browser.c:1311
msgid "A new window has been opened"
msgstr "Відкрито нове вікно"
-#: ../midori/midori-browser.c:1323
-msgid "New Tab"
-msgstr "Нова вкладка"
-
-#: ../midori/midori-browser.c:1323
+#: ../midori/midori-browser.c:1314
msgid "A new tab has been opened"
msgstr "Відкрито нову вкладку"
-#: ../midori/midori-browser.c:1358
+#: ../midori/midori-browser.c:1331
msgid "Error opening the image!"
msgstr "Помилка відкривання малюнка!"
-#: ../midori/midori-browser.c:1359
+#: ../midori/midori-browser.c:1332
msgid "Can not open selected image in a default viewer."
msgstr "Неможливо відкрити вибраний малюнок в типовому переглядачі."
-#: ../midori/midori-browser.c:1365
+#: ../midori/midori-browser.c:1338
msgid "Error downloading the image!"
msgstr "Помилка звантаження малюнка!"
-#: ../midori/midori-browser.c:1366
+#: ../midori/midori-browser.c:1339
msgid "Can not download selected image."
msgstr "Неможливо звантажити вибраний малюнок."
-#: ../midori/midori-browser.c:1492
+#: ../midori/midori-browser.c:1396
msgid "Save file"
msgstr "Зберегти файл"
-#: ../midori/midori-browser.c:2367
+#: ../midori/midori-browser.c:2300
msgid "Open file"
msgstr "Відкрити файл"
-#: ../midori/midori-browser.c:2499
+#: ../midori/midori-browser.c:2432
msgid ""
"To use the above URI open a news aggregator. There is usually a menu or "
"button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -523,139 +563,155 @@ msgstr ""
"Переглядач новин. Якщо наступного Ви натиснете на іконку витка новин, то "
"вони будуть додані автоматично."
-#: ../midori/midori-browser.c:2505 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2438 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "Нова стрічка новин"
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2481 ../midori/midori-browser.c:5511
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "Додати нову закладку"
-#: ../midori/midori-browser.c:3047 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3025 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "Пусто"
-#: ../midori/midori-browser.c:3469
+#: ../midori/midori-browser.c:3471 ../midori/midori-browser.c:3472
msgid "Toggle text cursor navigation"
msgstr "Переключити текстовий курсор навігації"
-#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759
+#: ../midori/midori-browser.c:3474
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr ""
+"Натискання F7 включає курсорний перегляд. Після включення на всіх веб-"
+"сторінках появляється текстовий курсор."
+
+#: ../midori/midori-browser.c:3477
+msgid "_Enable Caret Browsing"
+msgstr "_Включення курсорного перегляду"
+
+#: ../midori/midori-browser.c:3869 ../midori/midori-browser.c:5905
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "Неможливо вставити новий об'єкт історії: %s\n"
-#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745
-#: ../panels/midori-history.c:803
+#: ../midori/midori-browser.c:4195 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "Відкрити все у в_кладках"
-#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4202 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "Відкрити у новій _вкладці"
-#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2688
-#: ../midori/midori-view.c:4828 ../panels/midori-bookmarks.c:753
-#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4205 ../midori/midori-view.c:2952
+#: ../midori/midori-view.c:4924 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "Відкрити у новому _вікні"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4294
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4295
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4296
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4297
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4219
+#: ../midori/midori-browser.c:4298
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4220
+#: ../midori/midori-browser.c:4299
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4241
-msgid "Import bookmarks..."
-msgstr "Імпорт закладок..."
+#: ../midori/midori-browser.c:4300
+msgid "Midori 0.2.6"
+msgstr "Мідорі 0.2.6"
-#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:4321
+msgid "Import bookmarks…"
+msgstr "Імпорт закладок…"
+
+#: ../midori/midori-browser.c:4324 ../midori/midori-browser.c:5516
msgid "_Import bookmarks"
msgstr "_Імпорт закладок"
-#: ../midori/midori-browser.c:4255
+#: ../midori/midori-browser.c:4335
msgid "_Application:"
msgstr "_Програма:"
-#: ../midori/midori-browser.c:4320
+#: ../midori/midori-browser.c:4400
msgid "Import from XBEL or HTML file"
msgstr "Імпорт з XBEL або HTML файлу"
-#: ../midori/midori-browser.c:4355
+#: ../midori/midori-browser.c:4428
msgid "Import from a file"
msgstr "Імпорт з файлу"
-#: ../midori/midori-browser.c:4367
+#: ../midori/midori-browser.c:4440
msgid "Failed to import bookmarks"
msgstr "Не вдалося імпортувати закладки"
-#: ../midori/midori-browser.c:4402
+#: ../midori/midori-browser.c:4474
msgid "XBEL Bookmarks"
msgstr "XBEL Закладки"
-#: ../midori/midori-browser.c:4407
+#: ../midori/midori-browser.c:4479
msgid "Netscape Bookmarks"
msgstr "Закладки Netscape"
-#: ../midori/midori-browser.c:4421
+#: ../midori/midori-browser.c:4493
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "Мідорі може експортувати тільки до XBEL (*.xbel) і Netscape (*.html)"
-#: ../midori/midori-browser.c:4436
+#: ../midori/midori-browser.c:4508
msgid "Failed to export bookmarks"
msgstr "Не вдалося експортувати закладки"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4558
+#: ../midori/midori-browser.c:4630
msgid "Clear Private Data"
msgstr "Очистити приватні дані"
-#: ../midori/midori-browser.c:4562
+#: ../midori/midori-browser.c:4634
msgid "_Clear private data"
msgstr "_Очистити приватні дані"
-#: ../midori/midori-browser.c:4575
+#: ../midori/midori-browser.c:4649
msgid "Clear the following data:"
msgstr "Очистити наступні дані:"
-#: ../midori/midori-browser.c:4585
+#: ../midori/midori-browser.c:4659
msgid "Last open _tabs"
msgstr "Останні відкриті _вкладки"
-#: ../midori/midori-browser.c:4611
+#: ../midori/midori-browser.c:4685
msgid "Clear private data when _quitting Midori"
msgstr "Очистити приватні дані при _виході з Мідорі"
-#: ../midori/midori-browser.c:4806
+#: ../midori/midori-browser.c:4900
msgid "A lightweight web browser."
msgstr "Легкий переглядач Веб."
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:4901
msgid "See about:version for version info."
msgstr "Дивіться about:version для отримання інформації про версію."
-#: ../midori/midori-browser.c:4809
+#: ../midori/midori-browser.c:4903
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 "
@@ -668,929 +724,604 @@ msgstr ""
"Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою "
"версією."
-#: ../midori/midori-browser.c:4830
+#: ../midori/midori-browser.c:4933
msgid "translator-credits"
msgstr "Yarema aka Knedlyk "
-#: ../midori/midori-browser.c:5216
+#: ../midori/midori-browser.c:5346
msgid "_File"
msgstr "_Файл"
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5349
msgid "Open a new window"
msgstr "Відкрити нове вікно"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5352
msgid "Open a new tab"
msgstr "Відкрити нову вкладку"
-#: ../midori/midori-browser.c:5224
+#: ../midori/midori-browser.c:5354
msgid "New P_rivate Browsing Window"
msgstr "Нове _вікно в режимі приватності"
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5358
msgid "Open a file"
msgstr "Відкрити файл"
-#: ../midori/midori-browser.c:5230
-msgid "_Save Page As..."
-msgstr "_Зберегти сторінку як..."
+#: ../midori/midori-browser.c:5360
+msgid "_Save Page As…"
+msgstr "_Зберегти сторінку як…"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5361
msgid "Save to a file"
msgstr "Зберегти в файл"
-#: ../midori/midori-browser.c:5233
+#: ../midori/midori-browser.c:5363
msgid "Add to Speed _dial"
msgstr "Додати до шви_дкого виклику"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5367
msgid "Add Shortcut to the _desktop"
msgstr "Додати скорочення до _стільниці"
-#: ../midori/midori-browser.c:5239
+#: ../midori/midori-browser.c:5369
msgid "Create _Launcher"
msgstr "Створити _Запускач"
-#: ../midori/midori-browser.c:5243
+#: ../midori/midori-browser.c:5373
msgid "Subscribe to News _feed"
msgstr "Підписатися на _стрічки новин"
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5379
msgid "_Close Tab"
msgstr "_Закрити вкладку"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5380
msgid "Close the current tab"
msgstr "Закрити поточну вкладку"
-#: ../midori/midori-browser.c:5252
+#: ../midori/midori-browser.c:5382
msgid "C_lose Window"
msgstr "З_акрити вікно"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5386
+msgid "_Share"
+msgstr "_Поділитися"
+
+#: ../midori/midori-browser.c:5391
msgid "Print the current page"
msgstr "Надрукувати поточну сторінку"
-#: ../midori/midori-browser.c:5258
+#: ../midori/midori-browser.c:5394
msgid "Close a_ll Windows"
msgstr "З_акрити всі вікна"
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5397
msgid "_Edit"
msgstr "_Редагувати"
-#: ../midori/midori-browser.c:5284
-msgid "_Find..."
-msgstr "_Знайти..."
+#: ../midori/midori-browser.c:5420
+msgid "_Find…"
+msgstr "_Знайти…"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5421
msgid "Find a word or phrase in the page"
msgstr "Шукати слово чи фразу на сторінці"
-#: ../midori/midori-browser.c:5287
+#: ../midori/midori-browser.c:5423
msgid "Find _Next"
msgstr "Шукати _наступне"
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5426
msgid "Find _Previous"
msgstr "Шукати _попереднє"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5430
msgid "Configure the application preferences"
msgstr "Налаштувати властивості програми"
-#: ../midori/midori-browser.c:5296
+#: ../midori/midori-browser.c:5432
msgid "_View"
msgstr "_Вигляд"
-#: ../midori/midori-browser.c:5297
+#: ../midori/midori-browser.c:5433
msgid "_Toolbars"
msgstr "Панелі _Інструментів"
-#: ../midori/midori-browser.c:5302
+#: ../midori/midori-browser.c:5438
msgid "Reload page without caching"
msgstr "Перезавантажити сторінку без кешування"
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5448
msgid "Increase the zoom level"
msgstr "Збільшити розмір перегляду"
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5451
msgid "Decrease the zoom level"
msgstr "Зменшити розмір перегляду"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5455
msgid "_Encoding"
msgstr "_Кодування"
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5457
msgid "View So_urce"
msgstr "Перегляд _коду"
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5460
msgid "Ca_ret Browsing"
msgstr "_Перегляд вставками"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5464
msgid "Toggle fullscreen view"
msgstr "Перемкнути в повноекранний режим"
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5466
msgid "Scroll _Left"
msgstr "Прокрутити _ліворуч"
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5469
msgid "Scroll _Down"
msgstr "Прокрутити в_низ"
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5472
msgid "Scroll _Up"
msgstr "Прокрутити в_верх"
-#: ../midori/midori-browser.c:5339
+#: ../midori/midori-browser.c:5475
msgid "Scroll _Right"
msgstr "Прокрутити _праворуч"
-#: ../midori/midori-browser.c:5342
+#: ../midori/midori-browser.c:5478
+msgid "_Readable"
+msgstr "_Можна читати"
+
+#: ../midori/midori-browser.c:5481
msgid "_Go"
msgstr "_Перейти"
-#: ../midori/midori-browser.c:5345
+#: ../midori/midori-browser.c:5484
msgid "Go back to the previous page"
msgstr "Повернутись на попередню сторінку"
-#: ../midori/midori-browser.c:5348
-msgid "Go forward to the next page"
-msgstr "Перейти до наступної сторінки"
-
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5352
+#: ../midori/midori-browser.c:5491
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
-msgid "Go to the next sub-page"
-msgstr "Перейти до наступної сторінки"
+#: ../midori/midori-browser.c:5500
+msgid "_Homepage"
+msgstr "Д_омашня сторінка"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5501
msgid "Go to your homepage"
msgstr "Перейти на домашню сторінку"
-#: ../midori/midori-browser.c:5361
+#: ../midori/midori-browser.c:5503
msgid "Empty Trash"
msgstr "Спорожнити смітник"
-#: ../midori/midori-browser.c:5364
+#: ../midori/midori-browser.c:5506
msgid "Undo _Close Tab"
msgstr "Повернути закриту вкладку"
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5513
msgid "Add a new _folder"
msgstr "Додати нову _теку"
-#: ../midori/midori-browser.c:5377
+#: ../midori/midori-browser.c:5519
msgid "_Export bookmarks"
msgstr "_Експорт закладок"
-#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5522 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "_Налаштувати пошукові машини"
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5525
msgid "_Clear Private Data"
msgstr "_Очистити приватні дані"
-#: ../midori/midori-browser.c:5386
+#: ../midori/midori-browser.c:5528
msgid "_Inspect Page"
msgstr "Перевірити сторінку"
-#: ../midori/midori-browser.c:5390
+#: ../midori/midori-browser.c:5532
msgid "_Previous Tab"
msgstr "_Попередня вкладка"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5535
msgid "_Next Tab"
msgstr "_Наступна вкладка"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5537
msgid "Move Tab _Backward"
msgstr "_Перенести вкладку назад"
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5539
msgid "_Move Tab Forward"
msgstr "_Перенести вкладку вперед"
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5542
msgid "Focus _Current Tab"
msgstr "Фокусувати поточну вкладку"
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5545
msgid "Focus _Next view"
msgstr "Фокусувати перегляд _наступного"
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5548
msgid "Only show the Icon of the _Current Tab"
msgstr "Показувати тільки іконку _поточної вкладки"
-#: ../midori/midori-browser.c:5409
+#: ../midori/midori-browser.c:5551
msgid "_Duplicate Current Tab"
msgstr "_Дублювати поточну вкладку"
-#: ../midori/midori-browser.c:5412
+#: ../midori/midori-browser.c:5554
msgid "Close Ot_her Tabs"
msgstr "_Закрити інші вкладки"
-#: ../midori/midori-browser.c:5415
+#: ../midori/midori-browser.c:5557
msgid "Open last _session"
msgstr "Відкрити останню _сесію"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5560
msgid "_Help"
msgstr "_Допомога"
-#: ../midori/midori-browser.c:5420
+#: ../midori/midori-browser.c:5562
msgid "_Frequent Questions"
msgstr "_Часті запитання"
-#: ../midori/midori-browser.c:5423
-msgid "_Report a Problem..."
-msgstr "П_овідомити про проблему..."
+#: ../midori/midori-browser.c:5565
+msgid "_Report a Problem…"
+msgstr "П_овідомити про проблему…"
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5570 ../midori/midori-browser.c:6231
+msgid "_Tools"
+msgstr "_Інструменти"
+
+#: ../midori/midori-browser.c:5577
msgid "_Menubar"
msgstr "Панель _меню"
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5581
msgid "_Navigationbar"
msgstr "Панель _навігації"
-#: ../midori/midori-browser.c:5443
+#: ../midori/midori-browser.c:5585
msgid "Side_panel"
msgstr "_Бічна панель"
-#: ../midori/midori-browser.c:5444
+#: ../midori/midori-browser.c:5586
msgid "Sidepanel"
msgstr "Бічна панель"
-#: ../midori/midori-browser.c:5447
+#: ../midori/midori-browser.c:5589
msgid "_Bookmarkbar"
msgstr "Панель _закладок"
-#: ../midori/midori-browser.c:5451
+#: ../midori/midori-browser.c:5593
msgid "_Statusbar"
msgstr "Панель _стану"
-#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312
+#: ../midori/midori-browser.c:5602 ../midori/midori-websettings.c:198
msgid "_Automatic"
msgstr "_Автоматично"
-#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236
+#: ../midori/midori-browser.c:5605 ../midori/midori-websettings.c:122
msgid "Chinese Traditional (BIG5)"
msgstr "Китайська Традиційна (BIG5)"
-#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237
+#: ../midori/midori-browser.c:5608 ../midori/midori-websettings.c:123
msgid "Chinese Simplified (GB18030)"
msgstr "Китайська Спрощена (GB18030)"
#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5470
+#: ../midori/midori-browser.c:5612
msgid "Japanese (SHIFT__JIS)"
msgstr "Японська (SHIFT_JIS)"
-#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5615 ../midori/midori-websettings.c:125
msgid "Korean (EUC-KR)"
msgstr "Корейська (EUC-KR)"
-#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5618 ../midori/midori-websettings.c:126
msgid "Russian (KOI8-R)"
msgstr "Російська (KOI8-R)"
-#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5621 ../midori/midori-websettings.c:127
msgid "Unicode (UTF-8)"
msgstr "Юнікод (UTF-8)"
-#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242
+#: ../midori/midori-browser.c:5624 ../midori/midori-websettings.c:128
msgid "Western (ISO-8859-1)"
msgstr "Західний (ISO-8859-1)"
-#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243
-#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "Інша..."
+#: ../midori/midori-browser.c:5627
+msgid "Custom…"
+msgstr "Інша…"
-#: ../midori/midori-browser.c:5991
+#: ../midori/midori-browser.c:6137
msgid "_Separator"
msgstr "_Роздільник"
-#: ../midori/midori-browser.c:5998
-msgid "_Location..."
-msgstr "_Адреса..."
+#: ../midori/midori-browser.c:6144
+msgid "_Location…"
+msgstr "_Адреса…"
-#: ../midori/midori-browser.c:6000
+#: ../midori/midori-browser.c:6146
msgid "Open a particular location"
msgstr "Відкрити певну адресу"
-#: ../midori/midori-browser.c:6022
-msgid "_Web Search..."
-msgstr "_Пошук у Веб..."
+#: ../midori/midori-browser.c:6168
+msgid "_Web Search…"
+msgstr "_Пошук у Веб…"
-#: ../midori/midori-browser.c:6024
+#: ../midori/midori-browser.c:6170
msgid "Run a web search"
msgstr "Запустити пошук у Веб"
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:6197
msgid "Reopen a previously closed tab or window"
msgstr "Знову відкрити закриту вкладку чи вікно"
-#: ../midori/midori-browser.c:6068
+#: ../midori/midori-browser.c:6214
msgid "Show the saved bookmarks"
msgstr "Показати збережені закладки"
-#: ../midori/midori-browser.c:6085
-msgid "_Tools"
-msgstr "_Інструменти"
-
-#: ../midori/midori-browser.c:6101
+#: ../midori/midori-browser.c:6247
msgid "_Window"
msgstr "_Вікно"
-#: ../midori/midori-browser.c:6103
+#: ../midori/midori-browser.c:6249
msgid "Show a list of all open tabs"
msgstr "Показати список відкритих вкладок"
-#: ../midori/midori-browser.c:6117
+#: ../midori/midori-browser.c:6263
msgid "_Menu"
msgstr "_Меню"
-#: ../midori/midori-browser.c:6119
+#: ../midori/midori-browser.c:6265
msgid "Menu"
msgstr "Меню"
-#: ../midori/midori-browser.c:6933
+#: ../midori/midori-browser.c:7090
#, c-format
msgid "Unexpected setting '%s'"
msgstr "Несподівані властивості '%s'"
-#: ../midori/midori-extension.c:329
+#: ../midori/midori-extension.c:330
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "Неможливо завантажити конфігурацію розширення '%s': %s\n"
-#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
-#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:752 ../midori/midori-extension.c:849
+#: ../midori/midori-extension.c:946 ../midori/midori-extension.c:1058
+#: ../extensions/addons.c:1686
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "Неможливо зберегти конфігурацію розширення '%s': %s\n"
-#: ../midori/midori-locationaction.c:394
+#: ../midori/midori-locationaction.c:398
#, c-format
msgid "Search with %s"
msgstr "Шукати з %s"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "Шукати з..."
+#: ../midori/midori-locationaction.c:418
+msgid "Search with…"
+msgstr "Шукати з…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:545
#, c-format
msgid "Failed to select from history\n"
msgstr "Невдача при виборі з історії\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:632
#, c-format
msgid "Search for %s"
msgstr "Шукати %s"
+#: ../midori/midori-locationaction.c:1227
+msgid "Export certificate"
+msgstr "Експортувати сертифікат"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The signing certificate authority is not known."
+msgstr "Підпис сертифікату невідомий."
+
+#: ../midori/midori-locationaction.c:1261
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"Сертифікат не відповідає очікуваному сертифікату, який отриманий з сторінки."
+
+#: ../midori/midori-locationaction.c:1263
+msgid "The certificate's activation time is still in the future."
+msgstr "Час активації сертифікату все ще у майбутньому."
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate has expired"
+msgstr "Термін дії сертифіката закінчився"
+
+#: ../midori/midori-locationaction.c:1267
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr ""
+"Сертифікат був анульований згідно зі списком відкликаних сертифікатів "
+"GTlsConnection"
+
+#: ../midori/midori-locationaction.c:1269
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Алгоритм сертифікату вважається небезпечним."
+
+#: ../midori/midori-locationaction.c:1271
+msgid "Some other error occurred validating the certificate."
+msgstr "Інші помилки появилися під час перевірки сертифікату."
+
+#: ../midori/midori-locationaction.c:1318
+msgid "_Export certificate"
+msgstr "_Експортувати сертифікат"
+
+#: ../midori/midori-locationaction.c:1333
+msgid "Self-signed"
+msgstr "Самопідписаний"
+
+#: ../midori/midori-locationaction.c:1367
+msgid "Security details"
+msgstr "Відомості про захист"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1398
+#: ../midori/midori-locationaction.c:1650
msgid "Paste and p_roceed"
msgstr "Вставити і про_довжити"
-#: ../midori/midori-locationaction.c:1739
+#: ../midori/midori-locationaction.c:1974
msgid "Not verified"
msgstr "Не перевірено"
-#: ../midori/midori-locationaction.c:1759
+#: ../midori/midori-locationaction.c:1982
msgid "Verified and encrypted connection"
msgstr "Перевірене і захищене з'єднання"
-#: ../midori/midori-locationaction.c:1771
+#: ../midori/midori-locationaction.c:1989
msgid "Open, unencrypted connection"
msgstr "Відкрите, незахищене з'єднання"
-#: ../midori/midori-panel.c:397 ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562 ../midori/midori-panel.c:565
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "Рівняти бічну панель по правому краю"
-#: ../midori/midori-panel.c:409 ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "Закрити панель"
-#: ../midori/midori-panel.c:563 ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "Рівняти бічну панель по лівому краю"
-#: ../midori/midori-websettings.c:218
+#: ../midori/midori-websettings.c:104
msgid "Show Speed Dial"
msgstr "Показати швидкий виклик"
-#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:105
msgid "Show Homepage"
msgstr "Показати домашню сторінку"
-#: ../midori/midori-websettings.c:238
+#: ../midori/midori-websettings.c:124
msgid "Japanese (SHIFT_JIS)"
msgstr "Японська (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:129 ../midori/midori-websettings.c:205
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "Інше…"
+
+#: ../midori/midori-websettings.c:144
msgid "New tab"
msgstr "Нова вкладка"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:145
msgid "New window"
msgstr "Нове вікно"
-#: ../midori/midori-websettings.c:260
+#: ../midori/midori-websettings.c:146
msgid "Current tab"
msgstr "Поточна вкладка"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:161
msgid "Default"
msgstr "Типово"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:162
msgid "Icons"
msgstr "Значки"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:163
msgid "Small icons"
msgstr "Маленькі значки"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:164
msgid "Text"
msgstr "Текст"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:165
msgid "Icons and text"
msgstr "Значки і текст"
-#: ../midori/midori-websettings.c:280
+#: ../midori/midori-websettings.c:166
msgid "Text beside icons"
msgstr "Текст за значками"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:181
msgid "Automatic (GNOME or environment)"
msgstr "Автоматично (GNOME або змінні оточення)"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:182
msgid "HTTP proxy server"
msgstr "Сервер HTTP проксі"
-#: ../midori/midori-websettings.c:297
+#: ../midori/midori-websettings.c:183
msgid "No proxy server"
msgstr "Немає сервера проксі"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:200
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:201
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:202
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:203
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:317
+#: ../midori/midori-websettings.c:204
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:401
-msgid "Remember last window size"
-msgstr "Запам'ятати останній розмір вікна"
-
-#: ../midori/midori-websettings.c:402
-msgid "Whether to save the last window size"
-msgstr "Чи зберігати останній розмір вікна"
-
-#: ../midori/midori-websettings.c:410
-msgid "Last window width"
-msgstr "Ширина останнього вікна"
-
-#: ../midori/midori-websettings.c:411
-msgid "The last saved window width"
-msgstr "Остання збережена ширина вікна"
-
-#: ../midori/midori-websettings.c:419
-msgid "Last window height"
-msgstr "Висота останнього вікна"
-
-#: ../midori/midori-websettings.c:420
-msgid "The last saved window height"
-msgstr "Остання збережена висота вікна"
-
-#: ../midori/midori-websettings.c:445
-msgid "Last panel position"
-msgstr "Остання позиція панелі"
-
-#: ../midori/midori-websettings.c:446
-msgid "The last saved panel position"
-msgstr "Остання збережена позиція панелі"
-
-#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:455
-msgid "Last panel page"
-msgstr "Остання сторінка панелі"
-
-#: ../midori/midori-websettings.c:456
-msgid "The last saved panel page"
-msgstr "Остання збережена сторінка панелі"
-
-#: ../midori/midori-websettings.c:464
-msgid "Last Web search"
-msgstr "Останній пошук у Веб"
-
-#: ../midori/midori-websettings.c:465
-msgid "The last saved Web search"
-msgstr "Останній збережений пошук у Веб"
-
-#: ../midori/midori-websettings.c:474
-msgid "Show Menubar"
-msgstr "Показати панель меню"
-
-#: ../midori/midori-websettings.c:475
-msgid "Whether to show the menubar"
-msgstr "Чи показувати панель меню"
-
-#: ../midori/midori-websettings.c:483
-msgid "Show Navigationbar"
-msgstr "Показати панель навігації"
-
-#: ../midori/midori-websettings.c:484
-msgid "Whether to show the navigationbar"
-msgstr "Чи показувати панель навігації"
-
-#: ../midori/midori-websettings.c:492
-msgid "Show Bookmarkbar"
-msgstr "Показати панель закладок"
-
-#: ../midori/midori-websettings.c:493
-msgid "Whether to show the bookmarkbar"
-msgstr "Чи показувати панель закладок"
-
-#: ../midori/midori-websettings.c:501
-msgid "Show Panel"
-msgstr "Показати панель"
-
-#: ../midori/midori-websettings.c:502
-msgid "Whether to show the panel"
-msgstr "Чи показувати панель"
-
-#: ../midori/midori-websettings.c:510
-msgid "Show Statusbar"
-msgstr "Показати панель стану"
-
-#: ../midori/midori-websettings.c:511
-msgid "Whether to show the statusbar"
-msgstr "Чи показувати панель стану"
-
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:277
msgid "Toolbar Style:"
msgstr "Стиль панелі:"
-#: ../midori/midori-websettings.c:521
+#: ../midori/midori-websettings.c:278
msgid "The style of the toolbar"
msgstr "Стиль панелі"
-#: ../midori/midori-websettings.c:530
-msgid "Toolbar Items"
-msgstr "Об'єкти панелі інструментів"
-
-#: ../midori/midori-websettings.c:531
-msgid "The items to show on the toolbar"
-msgstr "Об'єкти, що відображаються у панелі інструментів"
-
-#: ../midori/midori-websettings.c:539
-msgid "Compact Sidepanel"
-msgstr "Компактна бічна панель"
-
-#: ../midori/midori-websettings.c:540
-msgid "Whether to make the sidepanel compact"
-msgstr "Налаштування відображення компактної бічної панелі"
-
-#: ../midori/midori-websettings.c:555
-msgid "Align sidepanel on the right"
-msgstr "Рівняти бічну панель по правому краю"
-
-#: ../midori/midori-websettings.c:556
-msgid "Whether to align the sidepanel on the right"
-msgstr "Чи вирівнювати бічну панель по правому краю"
-
-#: ../midori/midori-websettings.c:571
-msgid "Open panels in separate windows"
-msgstr "Відкривати панелі в нових вікнах"
-
-#: ../midori/midori-websettings.c:572
-msgid "Whether to always open panels in separate windows"
-msgstr "Чи відкривати панелі в окремих вікнах"
-
-#: ../midori/midori-websettings.c:581
+#: ../midori/midori-websettings.c:287
msgid "When Midori starts:"
msgstr "Коли Мідорі стартує:"
-#: ../midori/midori-websettings.c:582
-msgid "What to do when Midori starts"
-msgstr "Що завантажувати при старті"
-
-#: ../midori/midori-websettings.c:591
-msgid "Homepage:"
-msgstr "Домашня сторінка:"
-
-#: ../midori/midori-websettings.c:592
-msgid "The homepage"
-msgstr "Домашня сторінка"
-
-#: ../midori/midori-websettings.c:607
-msgid "Show crash dialog"
-msgstr "Показати діалог краху"
-
-#: ../midori/midori-websettings.c:608
-msgid "Show a dialog after Midori crashed"
-msgstr "Показати діалог, коли Мідорі зазнає краху"
-
-#: ../midori/midori-websettings.c:616
-msgid "Save downloaded files to:"
-msgstr "Зберігати завантажені файли до:"
-
-#: ../midori/midori-websettings.c:617
-msgid "The folder downloaded files are saved to"
-msgstr "Завантажені файли зберігати в теку"
-
-#: ../midori/midori-websettings.c:625
-msgid "Text Editor"
-msgstr "Текстовий редактор"
-
-#: ../midori/midori-websettings.c:626
-msgid "An external text editor"
-msgstr "Зовнішній текстовий редактор"
-
-#: ../midori/midori-websettings.c:641
-msgid "News Aggregator"
-msgstr "Читалка новин"
-
-#: ../midori/midori-websettings.c:642
-msgid "An external news aggregator"
-msgstr "Зовнішня читалка стрічок новин"
-
-#: ../midori/midori-websettings.c:650
-msgid "Location entry Search"
-msgstr "Місце початку пошуку"
-
-#: ../midori/midori-websettings.c:651
-msgid "The search to perform inside the location entry"
-msgstr "Здійснювати пошук всередині місця входження"
-
-#: ../midori/midori-websettings.c:659
+#: ../midori/midori-websettings.c:297
msgid "Preferred Encoding"
msgstr "Типове кодування"
-#: ../midori/midori-websettings.c:660
-msgid "The preferred character encoding"
-msgstr "Типове кодування символів"
-
-#: ../midori/midori-websettings.c:670
-msgid "Always Show Tabbar"
-msgstr "Завжди відображати панель вкладок"
-
-#: ../midori/midori-websettings.c:671
-msgid "Always show the tabbar"
-msgstr "Завжди відображати панель вкладок"
-
-#: ../midori/midori-websettings.c:684
-msgid "Close Buttons on Tabs"
-msgstr "Кнопки закриття на вкладках"
-
-#: ../midori/midori-websettings.c:685
-msgid "Whether tabs have close buttons"
-msgstr "Чи матимуть вкладки кнопки закриття"
-
-#: ../midori/midori-websettings.c:710
+#: ../midori/midori-websettings.c:324
msgid "Open new pages in:"
msgstr "Відкривати нові сторінки в:"
-#: ../midori/midori-websettings.c:711
-msgid "Where to open new pages"
-msgstr "Де відкривати нові сторінки"
-
-#: ../midori/midori-websettings.c:720
-msgid "Middle click opens Selection"
-msgstr "Середня кнопка відкриває виділене"
-
-#: ../midori/midori-websettings.c:721
-msgid "Load an address from the selection via middle click"
-msgstr ""
-"Завантажувати посилання URL з виділеного через клацання середньої кнопки"
-
-#: ../midori/midori-websettings.c:729
-msgid "Open tabs in the background"
-msgstr "Відкривати вкладки в фоні"
-
-#: ../midori/midori-websettings.c:730
-msgid "Whether to open new tabs in the background"
-msgstr "Чи відкривати нові вкладки в фоновому режимі"
-
-#: ../midori/midori-websettings.c:738
-msgid "Open Tabs next to Current"
-msgstr "Відкривати вкладки у наступних після поточної"
-
-#: ../midori/midori-websettings.c:739
-msgid "Whether to open new tabs next to the current tab or after the last one"
-msgstr ""
-"Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки"
-
-#: ../midori/midori-websettings.c:747
-msgid "Open popups in tabs"
-msgstr "Відкривати спливаючі вікна у вкладках"
-
-#: ../midori/midori-websettings.c:748
-msgid "Whether to open popup windows in tabs"
-msgstr "Чи відкривати спливаючі вікна у вкладках"
-
-#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134
-msgid "Load images automatically"
-msgstr "Автоматично завантажити зображення"
-
-#: ../midori/midori-websettings.c:759
-msgid "Load and display images automatically"
-msgstr "Автоматично завантажити і показати зображення"
-
-#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143
-msgid "Enable scripts"
-msgstr "Ввімкнути скрипти"
-
-#: ../midori/midori-websettings.c:767
-msgid "Enable embedded scripting languages"
-msgstr "Ввімкнути вбудовані мови скриптів"
-
-#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154
-msgid "Enable Netscape plugins"
-msgstr "Ввімкнути розширення Netscape"
-
-#: ../midori/midori-websettings.c:775
-msgid "Enable embedded Netscape plugin objects"
-msgstr "Ввімкнути вбудовані об'єкти розширень Netscape"
-
-#: ../midori/midori-websettings.c:790
-msgid "Enable Spell Checking"
-msgstr "Ввімкнути перевірку правопису"
-
-#: ../midori/midori-websettings.c:791
-msgid "Enable spell checking while typing"
-msgstr "Ввімкнути перевірку правопису під час введення тексту"
-
-#: ../midori/midori-websettings.c:797
-msgid "Enable HTML5 database support"
-msgstr "Ввімкнути підтримку баз даних HTML5"
-
-#: ../midori/midori-websettings.c:798
-msgid "Whether to enable HTML5 database support"
-msgstr "Чи дозволити підтримку баз даних HTML5"
-
-#: ../midori/midori-websettings.c:804
-msgid "Enable HTML5 local storage support"
-msgstr "Ввімкнути підтримку локального сховища HTML5"
-
-#: ../midori/midori-websettings.c:805
-msgid "Whether to enable HTML5 local storage support"
-msgstr "Чи дозволити підтримку локального сховища HTML5"
-
-#: ../midori/midori-websettings.c:811
-msgid "Enable offline web application cache"
-msgstr "Ввімкнути кеш веб переглядача при роботі поза мережею"
-
-#: ../midori/midori-websettings.c:812
-msgid "Whether to enable offline web application cache"
-msgstr "Чи дозволити кеш веб переглядача при роботі поза мережею"
-
-#: ../midori/midori-websettings.c:828
-msgid "Flash window on background tabs"
-msgstr "Відкрити вікно у фонових вкладках"
-
-#: ../midori/midori-websettings.c:829
-msgid "Flash the browser window if a new tab was opened in the background"
-msgstr "Відкривати вікно переглядача, якщо нова вкладка відкрита в фоні"
-
-#: ../midori/midori-websettings.c:837
-msgid "Enable WebGL support"
-msgstr "Ввімкнути підтримку WebGL"
-
-#: ../midori/midori-websettings.c:838
-msgid "Allow websites to use OpenGL rendering"
-msgstr "Дозволити веб-сайтам використовувати OpenGL для формування зображення"
-
-#: ../midori/midori-websettings.c:864
-msgid "Zoom Text and Images"
-msgstr "Збільшувати/зменшувати текст і зображення"
-
-#: ../midori/midori-websettings.c:865
-msgid "Whether to zoom text and images"
-msgstr "Чи збільшувати/зменшувати текст і зображення"
-
-#: ../midori/midori-websettings.c:880
-msgid "Find inline while typing"
-msgstr "Шукати під час вписування"
-
-#: ../midori/midori-websettings.c:881
-msgid "Whether to automatically find inline while typing"
-msgstr "Чи автоматично шукати при вписуванні"
-
-#: ../midori/midori-websettings.c:896
-msgid "Kinetic scrolling"
-msgstr "Кінетичне прокручування"
-
-#: ../midori/midori-websettings.c:897
-msgid "Whether scrolling should kinetically move according to speed"
-msgstr "Чи прокручування повинно кінетично рухатися відповідно до швидкості"
-
-#: ../midori/midori-websettings.c:905
-msgid "Delete old Cookies after:"
-msgstr "Вилучити старі тістечка через:"
-
-#: ../midori/midori-websettings.c:906
-msgid "The maximum number of days to save cookies for"
-msgstr "Максимальне число днів зберігання тістечок для"
-
-#: ../midori/midori-websettings.c:922
-msgid "Only accept Cookies from sites you visit"
-msgstr "Приймати тістечка тільки з сторінок які ви відвідуєте"
-
-#: ../midori/midori-websettings.c:923
-msgid "Block cookies sent by third-party websites"
-msgstr "Блокувати тістечка що посилаються сторонніми сторінками"
-
-#: ../midori/midori-websettings.c:937
-msgid "Delete pages from history after:"
-msgstr "Видалити сторінку з історії через:"
-
-#: ../midori/midori-websettings.c:938
-msgid "The maximum number of days to save the history for"
-msgstr "Максимальне число днів зберігання історії для"
-
-#: ../midori/midori-websettings.c:953
-msgid "Proxy server"
-msgstr "Сервер проксі"
-
-#: ../midori/midori-websettings.c:954
-msgid "The type of proxy server to use"
-msgstr "Тип проксі-сервера для використання"
-
-#: ../midori/midori-websettings.c:963
-msgid "HTTP Proxy Server"
-msgstr "HTTP сервер проксі"
-
-#: ../midori/midori-websettings.c:964
-msgid "The proxy server used for HTTP connections"
-msgstr "Проксі, що використовується для HTTP з'єднань"
-
-#: ../midori/midori-websettings.c:979
-msgid "Port"
-msgstr "Порт"
-
-#: ../midori/midori-websettings.c:980
-msgid "The proxy server port used for HTTP connections"
-msgstr "Проксі, що використовується для HTTP з'єднань"
-
-#: ../midori/midori-websettings.c:998
-msgid "The maximum size of cached pages on disk"
-msgstr "Максимальний розмір кешованих сторінок на диску"
-
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:387
msgid "Identify as"
msgstr "Ідентифікувати як"
-#: ../midori/midori-websettings.c:1016
+#: ../midori/midori-websettings.c:388
msgid "What to identify as to web pages"
msgstr "Що ідентифікувати для веб-сторінок"
-#: ../midori/midori-websettings.c:1032
-msgid "Identification string"
-msgstr "Стрічка ідентифікації"
-
-#: ../midori/midori-websettings.c:1033
-msgid "The application identification string"
-msgstr "Стрічка ідентифікації програми"
-
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:421
msgid "Preferred languages"
msgstr "Типові мови"
-#: ../midori/midori-websettings.c:1050
+#: ../midori/midori-websettings.c:422
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1598,428 +1329,284 @@ msgstr ""
"Розділений комами список бажаних мов для відображання веб-сторінок, "
"наприклад: \"uk\", \"uk,ru,nl\" або \"en_us;q=1.0, fr-fr;q=0.667\""
-#: ../midori/midori-websettings.c:1065
-msgid "Clear private data"
-msgstr "Очистити приватні дані"
-
-#: ../midori/midori-websettings.c:1066
-msgid "The private data selected for deletion"
-msgstr "Приватні дані, що вибрані для очищення"
-
-#: ../midori/midori-websettings.c:1081
-msgid "Clear data"
-msgstr "Очистити дані"
-
-#: ../midori/midori-websettings.c:1082
-msgid "The data selected for deletion"
-msgstr "Дані, що вибрані для вилучення"
-
-#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1131
-msgid "Strip referrer details sent to websites"
-msgstr "Пропустити деталі referer'а, що вислані до зовнішніх сторінок"
-
-#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1133
-msgid "Whether the \"Referer\" header should be shortened to the hostname"
-msgstr "Чи заголовок \"Referer'а\" повинен бути скорочений до назви сервера"
-
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:471
msgid "Always use my font choices"
msgstr "Завжди використовувати мій вибір шрифтів"
-#: ../midori/midori-websettings.c:1148
+#: ../midori/midori-websettings.c:472
msgid "Override fonts picked by websites with user preferences"
msgstr "Перезаписати шрифти для веб-сторінок шрифтами вибраними користувачем"
-#: ../midori/midori-view.c:1375
+#: ../midori/midori-view.c:1012 ../midori/midori-view.c:1151
+msgid "Trust this website"
+msgstr "Довіряти цій веб-сторінці"
+
+#: ../midori/midori-view.c:1149
+msgid "Security unknown"
+msgstr "Захист невідомий"
+
+#: ../midori/midori-view.c:1447
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s бажає зберегти базу даних HTML5."
-#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Deny"
msgstr "_Заборонити"
-#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1411
+#: ../midori/midori-view.c:1451 ../midori/midori-view.c:1485
msgid "_Allow"
msgstr "_Дозволити"
-#: ../midori/midori-view.c:1407
+#: ../midori/midori-view.c:1480
#, c-format
msgid "%s wants to know your location."
msgstr "%s бажає знати Ваше знаходження."
-#: ../midori/midori-view.c:1500
+#: ../midori/midori-view.c:1576
#, c-format
msgid "Error - %s"
msgstr "Помилка - %s"
-#: ../midori/midori-view.c:1501
+#: ../midori/midori-view.c:1577
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "Сторінку '%s' неможливо завантажити."
-#: ../midori/midori-view.c:1503
+#: ../midori/midori-view.c:1579
msgid "Try again"
msgstr "Спробуйте знову"
-#: ../midori/midori-view.c:1701 ../midori/midori-view.c:2623
+#: ../midori/midori-view.c:1775 ../midori/midori-view.c:2887
#, c-format
msgid "Send a message to %s"
msgstr "Послати повідомлення до %s"
-#: ../midori/midori-view.c:2453 ../midori/midori-view.c:2779
+#: ../midori/midori-view.c:2673
+msgid "Add _search engine..."
+msgstr "Додати _пошукову машину"
+
+#: ../midori/midori-view.c:2717 ../midori/midori-view.c:3043
msgid "Inspect _Element"
msgstr "Перевірити _елемент"
-#: ../midori/midori-view.c:2505
+#: ../midori/midori-view.c:2769
msgid "Open Link in New _Tab"
msgstr "Відкрити посилання у новій в_кладці"
-#: ../midori/midori-view.c:2509
+#: ../midori/midori-view.c:2773
msgid "Open Link in _Foreground Tab"
msgstr "Відкривати посилання у в_кладці переднього плану"
-#: ../midori/midori-view.c:2510
+#: ../midori/midori-view.c:2774
msgid "Open Link in _Background Tab"
msgstr "Відкрити посилання у фоновій в_кладці"
-#: ../midori/midori-view.c:2513
+#: ../midori/midori-view.c:2777
msgid "Open Link in New _Window"
msgstr "Відкрити посилання у новому _вікні"
-#: ../midori/midori-view.c:2516
+#: ../midori/midori-view.c:2780
msgid "Open Link as Web A_pplication"
msgstr "Відкрити посилання як веб-_додаток"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2785
msgid "Copy Link de_stination"
msgstr "Копіювати поси_лання"
-#: ../midori/midori-view.c:2537
+#: ../midori/midori-view.c:2801
msgid "Open _Image in New Tab"
msgstr "Відкрити зображення у новій _вкладці"
-#: ../midori/midori-view.c:2540
+#: ../midori/midori-view.c:2804
msgid "Copy Image _Address"
msgstr "Копіювати адрес _зображення"
-#: ../midori/midori-view.c:2543
+#: ../midori/midori-view.c:2807
msgid "Save I_mage"
msgstr "Зберегти з_ображення"
-#: ../midori/midori-view.c:2546
+#: ../midori/midori-view.c:2810
msgid "Open in Image _Viewer"
msgstr "Відкрити малюнок в _Переглядачі зображень"
-#: ../midori/midori-view.c:2553
+#: ../midori/midori-view.c:2817
msgid "Copy Video _Address"
msgstr "Скопіювати адресу _відео"
-#: ../midori/midori-view.c:2556
+#: ../midori/midori-view.c:2820
msgid "Save _Video"
msgstr "Зберегти _відео"
-#: ../midori/midori-view.c:2556
+#: ../midori/midori-view.c:2820
msgid "Download _Video"
msgstr "Завантажити _відео"
-#: ../midori/midori-view.c:2582
+#: ../midori/midori-view.c:2846
msgid "Search _with"
msgstr "Шукати _з"
-#: ../midori/midori-view.c:2614
+#: ../midori/midori-view.c:2878
msgid "_Search the Web"
msgstr "_Шукати Веб"
-#: ../midori/midori-view.c:2631
+#: ../midori/midori-view.c:2895
msgid "Open Address in New _Tab"
msgstr "Відкрити адресу у новій _вкладці"
-#: ../midori/midori-view.c:2684
+#: ../midori/midori-view.c:2948
msgid "Open _Frame in New Tab"
msgstr "Відкрити _фрейм у новій _вкладці"
-#: ../midori/midori-view.c:2988
-msgid "Open or download file"
-msgstr "Відкрити або завантажити файл"
-
-#: ../midori/midori-view.c:3008
+#: ../midori/midori-view.c:3203
#, c-format
-msgid "File Type: '%s'"
-msgstr "Тип файлу: '%s'"
+msgid "Open or download file from %s"
+msgstr "Відкрити або завантажити файл з %s"
-#: ../midori/midori-view.c:3010
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "Тип файлу: %s ('%s')"
-
-#: ../midori/midori-view.c:3014
+#: ../midori/midori-view.c:3216
#, c-format
msgid "File Name: %s"
msgstr "Ім'я файлу: %s"
-#: ../midori/midori-view.c:3041
+#: ../midori/midori-view.c:3221
+#, c-format
+msgid "File Type: '%s'"
+msgstr "Тип файлу: '%s'"
+
+#: ../midori/midori-view.c:3223
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "Тип файлу: %s ('%s')"
+
+#: ../midori/midori-view.c:3260
+#, c-format
+msgid "Size: %s"
+msgstr "Розмір: %s"
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:3271
#, c-format
msgid "Open %s"
msgstr "Відкрити %s"
-#: ../midori/midori-view.c:3700
+#: ../midori/midori-view.c:3876
#, c-format
msgid "Inspect page - %s"
msgstr "Перевірка сторінки - %s"
-#: ../midori/midori-view.c:4047
-msgid "Speed Dial"
-msgstr "Швидкий виклик"
-
-#: ../midori/midori-view.c:4048 ../midori/midori-view.c:4144
-msgid "Click to add a shortcut"
-msgstr "Клікніть щоб додати скорочення"
-
-#: ../midori/midori-view.c:4049
-msgid "Enter shortcut address"
-msgstr "Введіть адресу скорочення"
-
-#: ../midori/midori-view.c:4050
-msgid "Enter shortcut title"
-msgstr "Введіть назву скорочення"
-
-#: ../midori/midori-view.c:4051
-msgid "Are you sure you want to delete this shortcut?"
-msgstr "Ви впевнені, що бажаєте видалити це скорочення?"
-
-#: ../midori/midori-view.c:4213
+#: ../midori/midori-view.c:4275
#, c-format
msgid "No documentation installed"
msgstr "Документація не встановлена"
-#: ../midori/midori-view.c:4289
+#: ../midori/midori-view.c:4352
msgid "Midori doesn't store any personal data:"
msgstr "Мідорі не зберігає жодні персональні дані:"
-#: ../midori/midori-view.c:4290
+#: ../midori/midori-view.c:4353
msgid "No history or web cookies are being saved."
msgstr "Історія і тістечка зберігаються."
-#: ../midori/midori-view.c:4291
+#: ../midori/midori-view.c:4354
msgid "Extensions are disabled."
msgstr "Додатки виключено."
-#: ../midori/midori-view.c:4292
+#: ../midori/midori-view.c:4355
msgid "HTML5 storage, local database and application caches are disabled."
msgstr "Сховище HTML5, локальна база даних і кеш програм виключено."
-#: ../midori/midori-view.c:4293
+#: ../midori/midori-view.c:4356
msgid "Midori prevents websites from tracking the user:"
msgstr "Мідорі забороняє веб-сторінкам відслідковувати користувача:"
-#: ../midori/midori-view.c:4294
+#: ../midori/midori-view.c:4357
msgid "Referrer URLs are stripped down to the hostname."
msgstr "URL реферера обмежується до назви вузла."
-#: ../midori/midori-view.c:4295
+#: ../midori/midori-view.c:4358
msgid "DNS prefetching is disabled."
msgstr "Попереднє отримання DNS виключено."
-#: ../midori/midori-view.c:4296
+#: ../midori/midori-view.c:4359
msgid "The language and timezone are not revealed to websites."
msgstr "Мова і часовий пояс не показуються веб-сторінкам."
-#: ../midori/midori-view.c:4297
+#: ../midori/midori-view.c:4360
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr "Flash та інші додатки Netscape не можуть бути показані веб-сторінкам."
-#: ../midori/midori-view.c:4346
+#: ../midori/midori-view.c:4446
msgid "Version numbers in brackets show the version used at runtime."
msgstr ""
"Номери версії в дужках показують версію, що використовується в робочому "
"процесі."
-#: ../midori/midori-view.c:4402
+#: ../midori/midori-view.c:4495
msgid "Page loading delayed"
msgstr "Завантаження сторінки затримане"
-#: ../midori/midori-view.c:4403
+#: ../midori/midori-view.c:4496
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr ""
"Завантаження затримане або в зв'язку з останнім крахом або з налаштуваннями "
"завантаження."
-#: ../midori/midori-view.c:4404
+#: ../midori/midori-view.c:4497
msgid "Load Page"
msgstr "Завантажити сторінку"
-#: ../midori/midori-view.c:4570
+#: ../midori/midori-view.c:4664
msgid "Blank page"
msgstr "Пуста сторінка"
-#: ../midori/midori-view.c:4832
+#: ../midori/midori-view.c:4928
msgid "_Duplicate Tab"
msgstr "_Дублювати вкладку"
-#: ../midori/midori-view.c:4837
+#: ../midori/midori-view.c:4933
msgid "Show Tab _Label"
msgstr "Показати мітку _вкладки"
-#: ../midori/midori-view.c:4837
+#: ../midori/midori-view.c:4933
msgid "Show Tab _Icon Only"
msgstr "Показати тільки _іконки вкладки"
-#: ../midori/midori-view.c:4843
-msgid "Close ot_her Tabs"
-msgstr "_Закрити інші вкладки"
+#: ../midori/midori-view.c:4940
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "Закрити _іншу вкладку"
+msgstr[1] "Закрити _інші вкладки"
+msgstr[2] "Закрити _інші вкладки"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5656
+#: ../midori/midori-view.c:5697
msgid "previous"
msgstr "попереднє"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5675
+#: ../midori/midori-view.c:5716
msgid "next"
msgstr "наступне"
-#: ../midori/midori-view.c:5688
+#: ../midori/midori-view.c:5729
msgid "Print background images"
msgstr "Відобразити зображення тла"
-#: ../midori/midori-view.c:5689
+#: ../midori/midori-view.c:5730
msgid "Whether background images should be printed"
msgstr "Чи відобразити зображення тла"
-#: ../midori/midori-view.c:5721
+#: ../midori/midori-view.c:5762
msgid "Features"
msgstr "Опції"
-#: ../midori/midori-preferences.c:297
-msgid "Startup"
-msgstr "Початкові"
-
-#: ../midori/midori-preferences.c:310
-msgid "Use _current page"
-msgstr "Використати _поточну сторінку"
-
-#: ../midori/midori-preferences.c:314
-msgid "Use current page as homepage"
-msgstr "Використати поточну сторінку як домашню"
-
-#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
-msgid "Fonts"
-msgstr "Шрифти"
-
-#: ../midori/midori-preferences.c:326
-msgid "Proportional Font Family"
-msgstr "Пропорційне сімейство шрифтів"
-
-#: ../midori/midori-preferences.c:330
-msgid "The default font family used to display text"
-msgstr "Шрифт по замовчуванню для відображення тексту"
-
-#: ../midori/midori-preferences.c:333
-msgid "The default font size used to display text"
-msgstr "Розмір шрифту по замовчуванню для відображення тексту"
-
-#: ../midori/midori-preferences.c:335
-msgid "Fixed-width Font Family"
-msgstr "Шрифти фіксованої ширини"
-
-#: ../midori/midori-preferences.c:339
-msgid "The font family used to display fixed-width text"
-msgstr "Шрифт для відображення тексту фіксованої ширини"
-
-#: ../midori/midori-preferences.c:342
-msgid "The font size used to display fixed-width text"
-msgstr "Розмір шрифту для відображення тексту фіксованої ширини"
-
-#: ../midori/midori-preferences.c:344
-msgid "Minimum Font Size"
-msgstr "Мінімальний розмір шрифту"
-
-#: ../midori/midori-preferences.c:348
-msgid "The minimum font size used to display text"
-msgstr "Мінімальний розмір шрифту для відображення тексту"
-
-#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
-msgid "Behavior"
-msgstr "Поведінка"
-
-#: ../midori/midori-preferences.c:385
-msgid "Allow scripts to open popups"
-msgstr "Дозволити скриптам відкривати спливаючі вікна"
-
-#: ../midori/midori-preferences.c:386
-msgid "Whether scripts are allowed to open popup windows automatically"
-msgstr "Чи дозволяти скриптам автоматично відкривати спливаючі вікна"
-
-#. Page "Interface"
-#: ../midori/midori-preferences.c:416
-msgid "Browsing"
-msgstr "Перегляд сторінок"
-
-#. Page "Network"
-#: ../midori/midori-preferences.c:456
-msgid "Network"
-msgstr "Мережа"
-
-#: ../midori/midori-preferences.c:463
-msgid "Hostname"
-msgstr "Назва сервера"
-
-#: ../midori/midori-preferences.c:487
-msgid "MB"
-msgstr "МБ"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Add search engine"
-msgstr "Додати пошукову машину"
-
-#: ../midori/midori-searchaction.c:902
-msgid "Edit search engine"
-msgstr "Редагувати пошукову машину"
-
-#: ../midori/midori-searchaction.c:931
-msgid "_Name:"
-msgstr "_Назва:"
-
-#: ../midori/midori-searchaction.c:947
-msgid "_Description:"
-msgstr "_Опис:"
-
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "З_начок:"
-
-#: ../midori/midori-searchaction.c:995
-msgid "_Token:"
-msgstr "_Ознака:"
-
-#: ../midori/midori-searchaction.c:1295
-msgid "Manage Search Engines"
-msgstr "Налаштувати пошукові машини"
-
-#: ../midori/midori-searchaction.c:1395
-msgid "Use as _default"
-msgstr "Використовувати по _замовчуванню"
-
-#: ../midori/sokoke.c:354
-msgid "Open with"
-msgstr "Відкрити з"
-
-#: ../midori/sokoke.c:362
+#. i18n: Download tooltip (size): 4KB of 43MB
+#: ../midori/midori-download.vala:48
#, c-format
-msgid "Choose an application or command to open \"%s\":"
-msgstr "Виберіть програму або команду для відкриття \"%s\":"
+msgid "%s of %s"
+msgstr "%s з %s"
-#: ../midori/sokoke.c:403 ../midori/sokoke.c:413 ../midori/sokoke.c:441
-#: ../midori/sokoke.c:470 ../midori/sokoke.c:484
-msgid "Could not run external program."
-msgstr "Неможливо запустити зовнішню програму."
-
-#: ../midori/sokoke.c:1595
+#: ../midori/midori-download.vala:64
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -2027,7 +1614,7 @@ msgstr[0] "%d година"
msgstr[1] "%d години"
msgstr[2] "%d годин"
-#: ../midori/sokoke.c:1596
+#: ../midori/midori-download.vala:65
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -2035,7 +1622,7 @@ msgstr[0] "%d хвилина"
msgstr[1] "%d хвилини"
msgstr[2] "%d хвилин"
-#: ../midori/sokoke.c:1597
+#: ../midori/midori-download.vala:66
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -2043,68 +1630,28 @@ msgstr[0] "%d секунда"
msgstr[1] "%d секунди"
msgstr[2] "%d секунд"
-#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1605 ../panels/midori-transfers.c:268
-#, c-format
-msgid "%s of %s"
-msgstr "%s з %s"
-
-#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1614
-msgid "?B"
-msgstr "?Б"
-
-#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1617
-#, c-format
-msgid " (%s/s)"
-msgstr " (%s/c)"
-
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1634
+#: ../midori/midori-download.vala:82
#, c-format
msgid " - %s remaining"
msgstr " - %s залишилось"
-#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:291
-msgid "_Inline Find:"
-msgstr "Знайти _входження:"
+#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
+#: ../midori/midori-download.vala:92
+msgid "?B"
+msgstr "?Б"
-#: ../toolbars/midori-findbar.c:317
-msgid "Previous"
-msgstr "Попереднє"
-
-#: ../toolbars/midori-findbar.c:323
-msgid "Next"
-msgstr "Наступне"
-
-#: ../toolbars/midori-findbar.c:327
-msgid "Match Case"
-msgstr "Врахувати регістр"
-
-#: ../toolbars/midori-findbar.c:336
-msgid "Highlight Matches"
-msgstr "Підсвітити збіги"
-
-#: ../toolbars/midori-findbar.c:347
-msgid "Close Findbar"
-msgstr "Закрити панель пошуку"
-
-#: ../toolbars/midori-transferbar.c:122
+#. i18n: Download tooltip (transfer rate): (130KB/s)
+#: ../midori/midori-download.vala:94
#, c-format
-msgid "The file '%s ' has been downloaded."
-msgstr "Файл '%s ' завантажено."
+msgid " (%s/s)"
+msgstr " (%s/c)"
-#: ../toolbars/midori-transferbar.c:125
-msgid "Transfer completed"
-msgstr "Передачу завершено"
-
-#: ../toolbars/midori-transferbar.c:193
+#: ../midori/midori-download.vala:188
msgid "The downloaded file is erroneous."
msgstr "Завантажений файл містить помилки."
-#: ../toolbars/midori-transferbar.c:194
+#: ../midori/midori-download.vala:189
msgid ""
"The checksum provided with the link did not match. This means the file is "
"probably incomplete or was modified afterwards."
@@ -2112,47 +1659,345 @@ msgstr ""
"Контрольна сума надана з посиланням не збігається. Це означає, що файл може "
"бути неповним або був зміненим пізніше."
-#: ../toolbars/midori-transferbar.c:334 ../panels/midori-transfers.c:141
+#: ../midori/midori-download.vala:298
+#, c-format
+msgid "The file \"%s\" can't be saved in this folder."
+msgstr "Файл \"%s\" неможливо зберегти в цій теці."
+
+#: ../midori/midori-download.vala:300
+msgid "You don't have permission to write in this location."
+msgstr "Ви не маєте прав доступу для запису."
+
+#: ../midori/midori-download.vala:303
+#, c-format
+msgid "There is not enough free space to download \"%s\"."
+msgstr "Немає достатньо вільного місця для завантаження \"%s\"."
+
+#: ../midori/midori-download.vala:305
+#, c-format
+msgid "The file needs %s but only %s are left."
+msgstr "Файл потребує %s, але тільки %s залишилося."
+
+#: ../midori/midori-speeddial.vala:164
+msgid "Speed Dial"
+msgstr "Швидкий виклик"
+
+#: ../midori/midori-speeddial.vala:165 ../midori/midori-speeddial.vala:250
+msgid "Click to add a shortcut"
+msgstr "Клікніть щоб додати скорочення"
+
+#: ../midori/midori-speeddial.vala:166
+msgid "Enter shortcut address"
+msgstr "Введіть адресу скорочення"
+
+#: ../midori/midori-speeddial.vala:167
+msgid "Enter shortcut title"
+msgstr "Введіть назву скорочення"
+
+#: ../midori/midori-speeddial.vala:168
+msgid "Are you sure you want to delete this shortcut?"
+msgstr "Ви впевнені, що бажаєте видалити це скорочення?"
+
+#: ../midori/midori-preferences.c:299
+msgid "Startup"
+msgstr "Початкові"
+
+#: ../midori/midori-preferences.c:305
+msgid "Homepage:"
+msgstr "Домашня сторінка:"
+
+#: ../midori/midori-preferences.c:313
+msgid "Use _current page"
+msgstr "Використати _поточну сторінку"
+
+#: ../midori/midori-preferences.c:317
+msgid "Use current page as homepage"
+msgstr "Використати поточну сторінку як домашню"
+
+#. Page "Appearance"
+#: ../midori/midori-preferences.c:326
+msgid "Fonts"
+msgstr "Шрифти"
+
+#: ../midori/midori-preferences.c:329
+msgid "Proportional Font Family"
+msgstr "Пропорційне сімейство шрифтів"
+
+#: ../midori/midori-preferences.c:333
+msgid "The default font family used to display text"
+msgstr "Шрифт по замовчуванню для відображення тексту"
+
+#: ../midori/midori-preferences.c:336
+msgid "The default font size used to display text"
+msgstr "Розмір шрифту по замовчуванню для відображення тексту"
+
+#: ../midori/midori-preferences.c:338
+msgid "Fixed-width Font Family"
+msgstr "Шрифти фіксованої ширини"
+
+#: ../midori/midori-preferences.c:342
+msgid "The font family used to display fixed-width text"
+msgstr "Шрифт для відображення тексту фіксованої ширини"
+
+#: ../midori/midori-preferences.c:345
+msgid "The font size used to display fixed-width text"
+msgstr "Розмір шрифту для відображення тексту фіксованої ширини"
+
+#: ../midori/midori-preferences.c:347
+msgid "Minimum Font Size"
+msgstr "Мінімальний розмір шрифту"
+
+#: ../midori/midori-preferences.c:351
+msgid "The minimum font size used to display text"
+msgstr "Мінімальний розмір шрифту для відображення тексту"
+
+#. Page "Behavior"
+#: ../midori/midori-preferences.c:362
+msgid "Behavior"
+msgstr "Поведінка"
+
+#: ../midori/midori-preferences.c:366 ../extensions/statusbar-features.c:155
+msgid "Load images automatically"
+msgstr "Автоматично завантажити зображення"
+
+#: ../midori/midori-preferences.c:369
+msgid "Enable Spell Checking"
+msgstr "Ввімкнути перевірку правопису"
+
+#: ../midori/midori-preferences.c:383 ../extensions/statusbar-features.c:165
+msgid "Enable scripts"
+msgstr "Ввімкнути скрипти"
+
+#: ../midori/midori-preferences.c:386 ../extensions/statusbar-features.c:177
+msgid "Enable Netscape plugins"
+msgstr "Ввімкнути розширення Netscape"
+
+#: ../midori/midori-preferences.c:391
+msgid "Zoom Text and Images"
+msgstr "Збільшувати/зменшувати текст і зображення"
+
+#: ../midori/midori-preferences.c:394
+msgid "Allow scripts to open popups"
+msgstr "Дозволити скриптам відкривати спливаючі вікна"
+
+#: ../midori/midori-preferences.c:395
+msgid "Whether scripts are allowed to open popup windows automatically"
+msgstr "Чи дозволяти скриптам автоматично відкривати спливаючі вікна"
+
+#: ../midori/midori-preferences.c:401
+msgid "Kinetic scrolling"
+msgstr "Кінетичне прокручування"
+
+#: ../midori/midori-preferences.c:402
+msgid "Whether scrolling should kinetically move according to speed"
+msgstr "Чи прокручування повинно кінетично рухатися відповідно до швидкості"
+
+#: ../midori/midori-preferences.c:407
+msgid "Middle click opens Selection"
+msgstr "Середня кнопка відкриває виділене"
+
+#: ../midori/midori-preferences.c:408
+msgid "Load an address from the selection via middle click"
+msgstr ""
+"Завантажувати посилання URL з виділеного через клацання середньої кнопки"
+
+#: ../midori/midori-preferences.c:414
+msgid "Enable WebGL support"
+msgstr "Ввімкнути підтримку WebGL"
+
+#: ../midori/midori-preferences.c:419
+msgid "Flash window on background tabs"
+msgstr "Відкрити вікно у фонових вкладках"
+
+#: ../midori/midori-preferences.c:428
+msgid "Save downloaded files to:"
+msgstr "Зберігати завантажені файли до:"
+
+#. Page "Interface"
+#: ../midori/midori-preferences.c:435
+msgid "Browsing"
+msgstr "Перегляд сторінок"
+
+#: ../midori/midori-preferences.c:451
+msgid "Close Buttons on Tabs"
+msgstr "Кнопки закриття на вкладках"
+
+#: ../midori/midori-preferences.c:455
+msgid "Always Show Tabbar"
+msgstr "Завжди відображати панель вкладок"
+
+#: ../midori/midori-preferences.c:459
+msgid "Open Tabs next to Current"
+msgstr "Відкривати вкладки у наступних після поточної"
+
+#: ../midori/midori-preferences.c:460
+msgid "Whether to open new tabs next to the current tab or after the last one"
+msgstr ""
+"Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки"
+
+#: ../midori/midori-preferences.c:463
+msgid "Open tabs in the background"
+msgstr "Відкривати вкладки в фоні"
+
+#: ../midori/midori-preferences.c:467
+msgid "Text Editor"
+msgstr "Текстовий редактор"
+
+#: ../midori/midori-preferences.c:472
+msgid "News Aggregator"
+msgstr "Читалка новин"
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:479
+msgid "Network"
+msgstr "Мережа"
+
+#: ../midori/midori-preferences.c:481
+msgid "Proxy server"
+msgstr "Сервер проксі"
+
+#: ../midori/midori-preferences.c:486
+msgid "Hostname"
+msgstr "Назва сервера"
+
+#: ../midori/midori-preferences.c:494
+msgid "Port"
+msgstr "Порт"
+
+#: ../midori/midori-preferences.c:506 ../midori/midori-preferences.c:509
+msgid "The maximum size of cached pages on disk"
+msgstr "Максимальний розмір кешованих сторінок на диску"
+
+#: ../midori/midori-preferences.c:511
+msgid "MB"
+msgstr "МБ"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Add search engine"
+msgstr "Додати пошукову машину"
+
+#: ../midori/midori-searchaction.c:957
+msgid "Edit search engine"
+msgstr "Редагувати пошукову машину"
+
+#: ../midori/midori-searchaction.c:985
+msgid "_Name:"
+msgstr "_Назва:"
+
+#: ../midori/midori-searchaction.c:1000
+msgid "_Description:"
+msgstr "_Опис:"
+
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "_Адреса:"
+
+#: ../midori/midori-searchaction.c:1032
+msgid "_Token:"
+msgstr "_Ознака:"
+
+#: ../midori/midori-searchaction.c:1330
+msgid "Manage Search Engines"
+msgstr "Налаштувати пошукові машини"
+
+#: ../midori/midori-searchaction.c:1432
+msgid "Use as _default"
+msgstr "Використовувати по _замовчуванню"
+
+#: ../midori/sokoke.c:353
+msgid "Open with"
+msgstr "Відкрити з"
+
+#: ../midori/sokoke.c:361
+#, c-format
+msgid "Choose an application or command to open \"%s\":"
+msgstr "Виберіть програму або команду для відкриття \"%s\":"
+
+#: ../midori/sokoke.c:476 ../midori/sokoke.c:490
+msgid "Could not run external program."
+msgstr "Неможливо запустити зовнішню програму."
+
+#. i18n: A panel at the bottom, to search text in pages
+#: ../toolbars/midori-findbar.c:265
+msgid "_Inline Find:"
+msgstr "Знайти _входження:"
+
+#: ../toolbars/midori-findbar.c:287
+msgid "Previous"
+msgstr "Попереднє"
+
+#: ../toolbars/midori-findbar.c:293
+msgid "Next"
+msgstr "Наступне"
+
+#: ../toolbars/midori-findbar.c:297
+msgid "Match Case"
+msgstr "Врахувати регістр"
+
+#: ../toolbars/midori-findbar.c:306
+msgid "Highlight Matches"
+msgstr "Підсвітити збіги"
+
+#: ../toolbars/midori-findbar.c:317
+msgid "Close Findbar"
+msgstr "Закрити панель пошуку"
+
+#: ../toolbars/midori-transferbar.c:109
+#, c-format
+msgid "The file '%s ' has been downloaded."
+msgstr "Файл '%s ' завантажено."
+
+#: ../toolbars/midori-transferbar.c:114
+msgid "Transfer completed"
+msgstr "Передачу завершено"
+
+#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139
msgid "Clear All"
msgstr "Очистити все"
-#: ../toolbars/midori-transferbar.c:371 ../toolbars/midori-transferbar.c:373
+#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274
msgid "Some files are being downloaded"
msgstr "Деякі файли завантажено"
-#: ../toolbars/midori-transferbar.c:377
+#: ../toolbars/midori-transferbar.c:278
msgid "_Quit Midori"
msgstr "_Вийти з Мідорі"
-#: ../toolbars/midori-transferbar.c:379
+#: ../toolbars/midori-transferbar.c:280
msgid "The transfers will be cancelled if Midori quits."
msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі."
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "Закладки"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "Не вдалося додати закладку: %s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "Не вдалося оновити закладку : %s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "Редагувати вибрану закладку"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "Видалити вибрану закладку"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "Додати нову теку"
-#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "Роздільник "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "Шукати закладки"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "Історія"
@@ -2198,15 +2043,20 @@ msgstr "Видалити вибраний об'єкт історії"
msgid "Clear the entire history"
msgstr "Очистити історію"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "Шукати в історії"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "Завантаження"
-#: ../panels/midori-transfers.c:469
+#: ../panels/midori-transfers.c:435
msgid "Open Destination _Folder"
msgstr "Відкрити теку при_значення"
-#: ../panels/midori-transfers.c:472
+#: ../panels/midori-transfers.c:438
msgid "Copy Link Loc_ation"
msgstr "Копіювати поси_лання"
@@ -2248,54 +2098,62 @@ msgstr "Значок '%s' не вдається завантажити"
msgid "Animation frames are broken"
msgstr "Кадри анімації пошкоджені"
-#: ../katze/katze-utils.c:445 ../katze/katze-utils.c:879
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:866
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "Властивості '%s' неправильні для %s"
-#: ../katze/katze-utils.c:491 ../katze/katze-utils.c:520
-#: ../extensions/addons.c:308
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
+#: ../extensions/addons.c:309
msgid "Choose file"
msgstr "Вибрати файл"
-#: ../katze/katze-utils.c:506
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "Вибрати теку"
-#: ../katze/katze-utils.c:610
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "Нічого"
-#: ../katze/katze-utils.c:725
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "1 година"
-#: ../katze/katze-utils.c:726
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "1 день"
-#: ../katze/katze-utils.c:727
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "1 тиждень"
-#: ../katze/katze-utils.c:728
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "1 місяць"
-#: ../katze/katze-utils.c:729
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "1 рік"
-#: ../katze/katze-preferences.c:91 ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "Налаштування для %s"
-#: ../extensions/adblock.c:473
+#: ../katze/midori-uri.vala:173
+msgid "MD5-Checksum:"
+msgstr "Контрольна сума MD5:"
+
+#: ../katze/midori-uri.vala:180
+msgid "SHA1-Checksum:"
+msgstr "Контрольна сума SHA1:"
+
+#: ../extensions/adblock.c:495
msgid "Configure Advertisement filters"
msgstr "Конфігурувати фільтр реклам"
-#: ../extensions/adblock.c:504
+#: ../extensions/adblock.c:528
#, c-format
msgid ""
"Type the address of a preconfigured filter list in the text entry and click "
@@ -2305,113 +2163,113 @@ msgstr ""
"натисніть кнопку \"Додати\", щоб додати його до списку. Ви можете знайти "
"більше списків на %s."
-#: ../extensions/adblock.c:882
+#: ../extensions/adblock.c:942
msgid "Edit rule"
msgstr "Додати правило"
-#: ../extensions/adblock.c:896
+#: ../extensions/adblock.c:956
msgid "_Rule:"
msgstr "_Правило:"
-#: ../extensions/adblock.c:950
+#: ../extensions/adblock.c:1010
msgid "Bl_ock image"
msgstr "Блокувати зображення"
-#: ../extensions/adblock.c:955
+#: ../extensions/adblock.c:1015
msgid "Bl_ock link"
msgstr "Блокувати посилання"
-#: ../extensions/adblock.c:1670
+#: ../extensions/adblock.c:1913
msgid "Advertisement blocker"
msgstr "Блокіратор реклами"
-#: ../extensions/adblock.c:1671
+#: ../extensions/adblock.c:1914
msgid "Block advertisements according to a filter list"
msgstr "Блокувати рекламу використовуючи список фільтрів"
#. i18n: An infobar shows up when viewing a script on userscripts.org
-#: ../extensions/addons.c:221
+#: ../extensions/addons.c:222
msgid "This page appears to contain a user script. Do you wish to install it?"
msgstr ""
"Здається, що ця сторінка містить користувацький скрипт. Ви бажаєте "
"встановити його?"
-#: ../extensions/addons.c:222
+#: ../extensions/addons.c:223
msgid "_Install user script"
msgstr "_Встановити скрипт користувача"
#. i18n: An infobar shows up when viewing a style on userstyles.org
-#: ../extensions/addons.c:227
+#: ../extensions/addons.c:228
msgid "This page appears to contain a user style. Do you wish to install it?"
msgstr ""
"Здається, що ця сторінка містить користувацький стиль. Ви бажаєте встановити "
"його?"
-#: ../extensions/addons.c:228
+#: ../extensions/addons.c:229
msgid "_Install user style"
msgstr "_Встановити стиль користувача"
-#: ../extensions/addons.c:236
+#: ../extensions/addons.c:237
msgid "Don't install"
msgstr "Не встановлювати"
-#: ../extensions/addons.c:319 ../extensions/addons.c:681
+#: ../extensions/addons.c:320 ../extensions/addons.c:675
msgid "Userscripts"
msgstr "Скрипти користувача"
-#: ../extensions/addons.c:324 ../extensions/addons.c:683
+#: ../extensions/addons.c:325 ../extensions/addons.c:677
msgid "Userstyles"
msgstr "Стилі користувача"
-#: ../extensions/addons.c:380 ../extensions/addons.c:459
+#: ../extensions/addons.c:371 ../extensions/addons.c:450
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "Помилка"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:412
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "Ви впевнені, що бажаєте видалити '%s'?"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:418
msgid "Delete user script"
msgstr "Видалити скрипт користувача"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:419
msgid "Delete user style"
msgstr "Видалити стиль користувача"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:422
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "Файл %s буде безповоротно вилучено."
-#: ../extensions/addons.c:570 ../extensions/addons.c:647
+#: ../extensions/addons.c:564 ../extensions/addons.c:641
msgid "Open in Text Editor"
msgstr "Відкрити в текстовому редакторі"
-#: ../extensions/addons.c:572 ../extensions/addons.c:656
+#: ../extensions/addons.c:566 ../extensions/addons.c:650
msgid "Open Target Folder"
msgstr "Відкрити теку призначення"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:632
msgid "Add new addon"
msgstr "Додати новий додаток"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:658
msgid "Remove selected addon"
msgstr "Видалити вибраний додаток"
-#: ../extensions/addons.c:1696 ../extensions/addons.c:1914
+#: ../extensions/addons.c:1687 ../extensions/addons.c:1905
msgid "User addons"
msgstr "Додатки користувача"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1817
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "Не можу моніторувати теку '%s': %s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1906
msgid "Support for userscripts and userstyles"
msgstr "Підтримка користувацьких скриптів і стилів"
@@ -2498,29 +2356,21 @@ msgstr ""
"Домен : %s\n"
"Тістечка : %d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "Назва"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "Роз_крити все"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "З_горнути все"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "Фільтр:"
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid ""
-"Enter a filter string to show only cookies whose name or domain field match "
-"the entered filter"
-msgstr ""
-"Введіть рядок фільтра, щоб показувати тільки тістечко, чиє поле імені або "
-"домену відповідає введеному фільтру"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "Шукати коржики за назвою або доменом"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2762,7 +2612,7 @@ msgstr "Редагувати скорочення клавіатури"
#: ../extensions/shortcuts.c:283
msgid "Customize Sh_ortcuts..."
-msgstr "Редагувати скоро_чення..."
+msgstr "Змінити скоро_чення…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2780,35 +2630,35 @@ msgstr "Годинник панелі статусу"
msgid "Display date and time in the statusbar"
msgstr "Показувати дату і час на панелі статусу"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "Зображення"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "Скрипти"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Розширення Netscape"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "Властивості панелі _стану"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "Просте включання і виключання перемикання функцій на веб-сторінках"
-#: ../extensions/tab-panel.c:593 ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "Панель вкладок"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "Панель в_кладок"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "Показати вкладки у вертикальній панелі"
@@ -2820,11 +2670,11 @@ msgstr "По замовчуванню тільки іконки на вклад
msgid "New tabs have no label by default"
msgstr "Нові вкладки по замовчуванню не будуть мати міток"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "Змінити панель інструментів"
-#: ../extensions/toolbar-editor.c:409
+#: ../extensions/toolbar-editor.c:411
msgid ""
"Select items to be displayed on the toolbar. Items can be reordered by drag "
"and drop."
@@ -2832,34 +2682,269 @@ msgstr ""
"Вибрати елементи, які будуть показані на панелі інструментів. Елементи можна "
"перевпорядкувати, пересуваючи їх мишою (drag'n'drop)."
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "Доступні елементи"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "Елементи для показу"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "Змінити пане_ль інструментів..."
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "Змінити панель _інструментів…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "_Налаштувати..."
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "Редактор панелі інструментів"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "Легко редагувати формат панелі інструментів"
-#: ../extensions/web-cache.c:463
+#: ../extensions/web-cache.c:462
msgid "Cache HTTP communication on disk"
msgstr "Кешувати комунікацію HTTP на диск"
+#~ msgid "Remember last window size"
+#~ msgstr "Запам'ятати останній розмір вікна"
+
+#~ msgid "Whether to save the last window size"
+#~ msgstr "Чи зберігати останній розмір вікна"
+
+#~ msgid "Last window width"
+#~ msgstr "Ширина останнього вікна"
+
+#~ msgid "The last saved window width"
+#~ msgstr "Остання збережена ширина вікна"
+
+#~ msgid "Last window height"
+#~ msgstr "Висота останнього вікна"
+
+#~ msgid "The last saved window height"
+#~ msgstr "Остання збережена висота вікна"
+
+#~ msgid "Last panel position"
+#~ msgstr "Остання позиція панелі"
+
+#~ msgid "The last saved panel position"
+#~ msgstr "Остання збережена позиція панелі"
+
+#~ msgid "Last panel page"
+#~ msgstr "Остання сторінка панелі"
+
+#~ msgid "The last saved panel page"
+#~ msgstr "Остання збережена сторінка панелі"
+
+#~ msgid "Last Web search"
+#~ msgstr "Останній пошук у Веб"
+
+#~ msgid "The last saved Web search"
+#~ msgstr "Останній збережений пошук у Веб"
+
+#~ msgid "Show Menubar"
+#~ msgstr "Показати панель меню"
+
+#~ msgid "Whether to show the menubar"
+#~ msgstr "Чи показувати панель меню"
+
+#~ msgid "Show Navigationbar"
+#~ msgstr "Показати панель навігації"
+
+#~ msgid "Whether to show the navigationbar"
+#~ msgstr "Чи показувати панель навігації"
+
+#~ msgid "Show Bookmarkbar"
+#~ msgstr "Показати панель закладок"
+
+#~ msgid "Whether to show the bookmarkbar"
+#~ msgstr "Чи показувати панель закладок"
+
+#~ msgid "Show Panel"
+#~ msgstr "Показати панель"
+
+#~ msgid "Whether to show the panel"
+#~ msgstr "Чи показувати панель"
+
+#~ msgid "Show Statusbar"
+#~ msgstr "Показати панель стану"
+
+#~ msgid "Whether to show the statusbar"
+#~ msgstr "Чи показувати панель стану"
+
+#~ msgid "Toolbar Items"
+#~ msgstr "Об'єкти панелі інструментів"
+
+#~ msgid "The items to show on the toolbar"
+#~ msgstr "Об'єкти, що відображаються у панелі інструментів"
+
+#~ msgid "Compact Sidepanel"
+#~ msgstr "Компактна бічна панель"
+
+#~ msgid "Whether to make the sidepanel compact"
+#~ msgstr "Налаштування відображення компактної бічної панелі"
+
+#~ msgid "Align sidepanel on the right"
+#~ msgstr "Рівняти бічну панель по правому краю"
+
+#~ msgid "Whether to align the sidepanel on the right"
+#~ msgstr "Чи вирівнювати бічну панель по правому краю"
+
+#~ msgid "Open panels in separate windows"
+#~ msgstr "Відкривати панелі в нових вікнах"
+
+#~ msgid "Whether to always open panels in separate windows"
+#~ msgstr "Чи відкривати панелі в окремих вікнах"
+
+#~ msgid "What to do when Midori starts"
+#~ msgstr "Що завантажувати при старті"
+
+#~ msgid "The homepage"
+#~ msgstr "Домашня сторінка"
+
+#~ msgid "Show crash dialog"
+#~ msgstr "Показати діалог краху"
+
+#~ msgid "The folder downloaded files are saved to"
+#~ msgstr "Завантажені файли зберігати в теку"
+
+#~ msgid "An external text editor"
+#~ msgstr "Зовнішній текстовий редактор"
+
+#~ msgid "An external news aggregator"
+#~ msgstr "Зовнішня читалка стрічок новин"
+
+#~ msgid "Location entry Search"
+#~ msgstr "Місце початку пошуку"
+
+#~ msgid "The search to perform inside the location entry"
+#~ msgstr "Здійснювати пошук всередині місця входження"
+
+#~ msgid "The preferred character encoding"
+#~ msgstr "Типове кодування символів"
+
+#~ msgid "Always show the tabbar"
+#~ msgstr "Завжди відображати панель вкладок"
+
+#~ msgid "Whether tabs have close buttons"
+#~ msgstr "Чи матимуть вкладки кнопки закриття"
+
+#~ msgid "Where to open new pages"
+#~ msgstr "Де відкривати нові сторінки"
+
+#~ msgid "Whether to open new tabs in the background"
+#~ msgstr "Чи відкривати нові вкладки в фоновому режимі"
+
+#~ msgid "Open popups in tabs"
+#~ msgstr "Відкривати спливаючі вікна у вкладках"
+
+#~ msgid "Whether to open popup windows in tabs"
+#~ msgstr "Чи відкривати спливаючі вікна у вкладках"
+
+#~ msgid "Load and display images automatically"
+#~ msgstr "Автоматично завантажити і показати зображення"
+
+#~ msgid "Enable embedded scripting languages"
+#~ msgstr "Ввімкнути вбудовані мови скриптів"
+
+#~ msgid "Enable embedded Netscape plugin objects"
+#~ msgstr "Ввімкнути вбудовані об'єкти розширень Netscape"
+
+#~ msgid "Enable spell checking while typing"
+#~ msgstr "Ввімкнути перевірку правопису під час введення тексту"
+
+#~ msgid "Enable HTML5 database support"
+#~ msgstr "Ввімкнути підтримку баз даних HTML5"
+
+#~ msgid "Whether to enable HTML5 database support"
+#~ msgstr "Чи дозволити підтримку баз даних HTML5"
+
+#~ msgid "Whether to enable HTML5 local storage support"
+#~ msgstr "Чи дозволити підтримку локального сховища HTML5"
+
+#~ msgid "Whether to enable offline web application cache"
+#~ msgstr "Чи дозволити кеш веб переглядача при роботі поза мережею"
+
+#~ msgid "Flash the browser window if a new tab was opened in the background"
+#~ msgstr "Відкривати вікно переглядача, якщо нова вкладка відкрита в фоні"
+
+#~ msgid "Allow websites to use OpenGL rendering"
+#~ msgstr ""
+#~ "Дозволити веб-сайтам використовувати OpenGL для формування зображення"
+
+#~ msgid "Whether to zoom text and images"
+#~ msgstr "Чи збільшувати/зменшувати текст і зображення"
+
+#~ msgid "Find inline while typing"
+#~ msgstr "Шукати під час вписування"
+
+#~ msgid "Whether to automatically find inline while typing"
+#~ msgstr "Чи автоматично шукати при вписуванні"
+
+#~ msgid "The type of proxy server to use"
+#~ msgstr "Тип проксі-сервера для використання"
+
+#~ msgid "HTTP Proxy Server"
+#~ msgstr "HTTP сервер проксі"
+
+#~ msgid "The proxy server used for HTTP connections"
+#~ msgstr "Проксі, що використовується для HTTP з'єднань"
+
+#~ msgid "The proxy server port used for HTTP connections"
+#~ msgstr "Проксі, що використовується для HTTP з'єднань"
+
+#~ msgid "Identification string"
+#~ msgstr "Стрічка ідентифікації"
+
+#~ msgid "The application identification string"
+#~ msgstr "Стрічка ідентифікації програми"
+
+#~ msgid "Clear private data"
+#~ msgstr "Очистити приватні дані"
+
+#~ msgid "The private data selected for deletion"
+#~ msgstr "Приватні дані, що вибрані для очищення"
+
+#~ msgid "Clear data"
+#~ msgstr "Очистити дані"
+
+#~ msgid "The data selected for deletion"
+#~ msgstr "Дані, що вибрані для вилучення"
+
+#~ msgid "Filter:"
+#~ msgstr "Фільтр:"
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr ""
+#~ "Введіть рядок фільтра, щоб показувати тільки тістечко, чиє поле імені або "
+#~ "домену відповідає введеному фільтру"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "_Закрити інші вкладки"
+
+#~ msgid "_Icon:"
+#~ msgstr "З_начок:"
+
+#~ msgid "_Bookmark"
+#~ msgstr "_Закладка"
+
+#~ msgid "_Console"
+#~ msgstr "_Консоль"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "Тека рівнем вище"
+
+#~ msgid "_Title:"
+#~ msgstr "_Назва:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Тека:"
+
+#~ msgid "_Customize…"
+#~ msgstr "_Налаштувати…"
+
#~ msgid "The bookmarks couldn't be saved. %s"
#~ msgstr "Неможливо зберегти закладки. %s"
@@ -2962,13 +3047,13 @@ msgstr "Кешувати комунікацію HTTP на диск"
#~ msgid "Add a new bookmark folder"
#~ msgstr "Додати нову теку закладок"
-#~ msgid "Add, edit and remove search engines..."
-#~ msgstr "Додати, редагувати чи видалити пошукові машини..."
+#~ msgid "Add, edit and remove search engines…"
+#~ msgstr "Додати, редагувати чи видалити пошукові машини…"
-#~ msgid "Clear private data..."
-#~ msgstr "Очистити приватні дані..."
+#~ msgid "Clear private data…"
+#~ msgstr "Очистити приватні дані…"
-#~ msgid "Inspect page details and access developer tools..."
+#~ msgid "Inspect page details and access developer tools…"
#~ msgstr "Перевірити сторінку і доступні знаряддя розробника"
#~ msgid "Switch to the previous tab"
@@ -3025,12 +3110,6 @@ msgstr "Кешувати комунікацію HTTP на диск"
#~ msgid "Show statusbar"
#~ msgstr "Показати панель стану"
-#~ msgid "MD5-Checksum:"
-#~ msgstr "Контрольна сума MD5:"
-
-#~ msgid "SHA1-Checksum:"
-#~ msgstr "Контрольна сума SHA1:"
-
#~ msgid "No filename specified"
#~ msgstr "Не вказано назви файлу"
@@ -3058,8 +3137,8 @@ msgstr "Кешувати комунікацію HTTP на диск"
#~ msgid "Reset the last _session"
#~ msgstr "Скинути останню _сесію"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "Конфігурувати фільтри _реклам..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "Конфігурувати фільтри _реклам…"
#~ msgid "Not found - %s"
#~ msgstr "Не знайдено - %s"
@@ -3387,9 +3466,6 @@ msgstr "Кешувати комунікацію HTTP на диск"
#~ msgid "Both horizontal"
#~ msgstr "Обоє горизонтальні"
-#~ msgid "_Enable"
-#~ msgstr "_Ввімкнути"
-
#~ msgid "Disable"
#~ msgstr "_Заборонити"
@@ -3438,17 +3514,14 @@ msgstr "Кешувати комунікацію HTTP на диск"
#~ msgid "The character encoding to use by default"
#~ msgstr "Типове кодування символів"
-#~ msgid "User_styles"
-#~ msgstr "Стилі користувача"
-
#~ msgid "Whether text areas are resizable"
#~ msgstr "Чи зберігати останні відвідані сторінки"
#~ msgid "Load on Startup"
#~ msgstr "Початкові"
-#~ msgid "Configure _Toolbar..."
-#~ msgstr "Редагувати _панель..."
+#~ msgid "Configure _Toolbar…"
+#~ msgstr "Редагувати _панель…"
#~ msgid "Enable"
#~ msgstr "Ввімкнути скрипти"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index baa09d39..1adde3b3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,19 +5,19 @@
# Stanley Zhang , 2009.
# Hunt Xu , 2009, 2010, 2011.
# Chipong Luo , 2011, 2012.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: midori\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-26 00:12+0000\n"
+"POT-Creation-Date: 2012-05-17 05:03+0000\n"
"PO-Revision-Date: 2011-02-15 21:26+0800\n"
"Last-Translator: Chipong Luo \n"
"Language-Team: Chinese (Simplified) \n"
-"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/midori.desktop.in.h:1
@@ -28,8 +28,8 @@ msgstr "浏览网络"
msgid "Internet;WWW;Explorer"
msgstr "互联网；WWW；浏览器"
-#: ../data/midori.desktop.in.h:3 ../midori/main.c:2048 ../midori/main.c:2072
-#: ../midori/main.c:2086 ../midori/midori-websettings.c:312
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:1972 ../midori/main.c:1996
+#: ../midori/main.c:2010 ../midori/midori-websettings.c:313
msgid "Midori"
msgstr "Midori 浏览器"
@@ -45,98 +45,87 @@ msgstr "Midori 私人浏览"
msgid "Open a new private browsing window"
msgstr "打开新的私人浏览窗口"
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4164
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4210
msgid "Private Browsing"
msgstr "私人浏览"
-#: ../midori/main.c:96 ../midori/main.c:102
+#: ../midori/main.c:97 ../midori/main.c:103
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "未能载入配置：%s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:151
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "值 ‘%s’ 对 %s 无效"
-#: ../midori/main.c:155 ../midori/main.c:259
+#: ../midori/main.c:156 ../midori/main.c:260
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "无效的配置值 ‘%s’"
-#: ../midori/main.c:380
+#: ../midori/main.c:381
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "未能载入搜索引擎。%s\n"
-#: ../midori/main.c:434
+#: ../midori/main.c:435
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "无法清除历史：%s\n"
-#: ../midori/main.c:454 ../midori/main.c:581
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:455 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "无法打开数据库：%s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:524
+#: ../midori/main.c:525
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "无法移除原历史项目：%s\n"
-#: ../midori/main.c:564 ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "无法移除历史项目：%s\n"
-
-#: ../midori/main.c:611
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "未能保存书签。%s"
-
-#: ../midori/main.c:633
+#: ../midori/main.c:547
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "未能保存配置。%s"
-#: ../midori/main.c:668
+#: ../midori/main.c:582
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "未能保存搜索引擎。%s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:705
+#: ../midori/main.c:619
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "未能保存回收站。%s"
-#: ../midori/main.c:746 ../panels/midori-extensions.c:91
+#: ../midori/main.c:660 ../panels/midori-extensions.c:91
msgid "Extensions"
msgstr "扩展"
-#: ../midori/main.c:760
+#: ../midori/main.c:674
msgid "Privacy"
msgstr "私人"
-#: ../midori/main.c:772
+#: ../midori/main.c:686
msgid ""
"Cookies store login data, saved games, or user profiles for advertisement "
"purposes."
msgstr "隐私信息存储登录数据、游戏状态或用于广告目的用户分布信息。"
-#: ../midori/main.c:828
+#: ../midori/main.c:742
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "未能保存会话。%s"
-#: ../midori/main.c:1046
+#: ../midori/main.c:960
msgid ""
"No root certificate file is available. SSL certificates cannot be verified."
msgstr "无有效的根证书文件。未能验证 SSL 证书。"
-#: ../midori/main.c:1115
+#: ../midori/main.c:1036
msgid ""
"Midori seems to have crashed the last time it was opened. If this happened "
"repeatedly, try one of the following options to solve the problem."
@@ -144,225 +133,225 @@ msgstr ""
"Midori 在上次打开时好像崩溃了。如果此情况反复出现，尝试下面的某种方法解决此问"
"题。"
-#: ../midori/main.c:1134
+#: ../midori/main.c:1055
msgid "Modify _preferences"
msgstr "修改首选项(_P)"
-#: ../midori/main.c:1138
+#: ../midori/main.c:1059
msgid "Disable all _extensions"
msgstr "禁用所有扩展(_E)"
-#: ../midori/main.c:1151
+#: ../midori/main.c:1072
msgid "Discard old tabs"
msgstr "舍弃原标签"
-#: ../midori/main.c:1152 ../midori/midori-websettings.c:221
+#: ../midori/main.c:1073 ../midori/midori-websettings.c:221
msgid "Show last tabs without loading"
msgstr "显示上次打开的标签但不载入"
-#: ../midori/main.c:1153 ../midori/midori-websettings.c:220
+#: ../midori/main.c:1074 ../midori/midori-websettings.c:220
msgid "Show last open tabs"
msgstr "显示上次打开的标签"
-#: ../midori/main.c:1400 ../midori/main.c:2464
+#: ../midori/main.c:1321 ../midori/main.c:2399
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "未能载入会话：%s\n"
-#: ../midori/main.c:1538
+#: ../midori/main.c:1459
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "截图保存至：%s\n"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1875
msgid "Run ADDRESS as a web application"
msgstr "将‘地址’作为网络应用程序运行"
-#: ../midori/main.c:1951
+#: ../midori/main.c:1875
msgid "ADDRESS"
msgstr "地址"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1878
msgid "Use FOLDER as configuration folder"
msgstr "使用‘文件夹’作为配置文件夹"
-#: ../midori/main.c:1954
+#: ../midori/main.c:1878
msgid "FOLDER"
msgstr "文件夹"
-#: ../midori/main.c:1957
+#: ../midori/main.c:1881
msgid "Private browsing, no changes are saved"
msgstr "私人浏览，未保存更改"
-#: ../midori/main.c:1959
+#: ../midori/main.c:1883
msgid "Show a diagnostic dialog"
msgstr "显示诊断对话框"
-#: ../midori/main.c:1961
+#: ../midori/main.c:1885
msgid "Run the specified filename as javascript"
msgstr "将指定的文件名作为 javascript 运行"
-#: ../midori/main.c:1963
+#: ../midori/main.c:1887
msgid "Take a snapshot of the specified URI"
msgstr "对指定的 URI 截图"
-#: ../midori/main.c:1965
+#: ../midori/main.c:1889
msgid "Execute the specified command"
msgstr "执行指定的命令"
-#: ../midori/main.c:1967
+#: ../midori/main.c:1891
msgid "List available commands to execute with -e/ --execute"
msgstr "列出可以带 -e/ --execute 执行的命令"
-#: ../midori/main.c:1969
+#: ../midori/main.c:1893
msgid "Display program version"
msgstr "显示程序版本"
-#: ../midori/main.c:1971
+#: ../midori/main.c:1895
msgid "Addresses"
msgstr "地址"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1897
msgid "Block URIs according to regular expression PATTERN"
msgstr "按正则表达式‘类型’屏蔽 URI"
-#: ../midori/main.c:1973
+#: ../midori/main.c:1897
msgid "PATTERN"
msgstr "类型"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1977
+#: ../midori/main.c:1901
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "在‘秒’秒内无响应后重置 Midori"
-#: ../midori/main.c:1977
+#: ../midori/main.c:1901
msgid "SECONDS"
msgstr "秒"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1904
msgid "Redirects console warnings to the specified FILENAME"
msgstr "重定向控制台警告信息至指定的‘文件名’"
-#: ../midori/main.c:1980
+#: ../midori/main.c:1904
msgid "FILENAME"
msgstr "文件名"
-#: ../midori/main.c:2045
+#: ../midori/main.c:1969
msgid "[Addresses]"
msgstr "[地址]"
-#: ../midori/main.c:2087
+#: ../midori/main.c:2011
msgid "Please report comments, suggestions and bugs to:"
msgstr "请将意见、建议和缺陷报告至："
-#: ../midori/main.c:2089
+#: ../midori/main.c:2013
msgid "Check for new versions at:"
msgstr "在此检查新版本："
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2173
+#: ../midori/main.c:2108
msgid "Saved logins and _passwords"
msgstr "已保存的用户名和密码(_P)"
-#: ../midori/main.c:2175
+#: ../midori/main.c:2110
msgid "Cookies and Website data"
msgstr "隐私信息和网站数据"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2179 ../midori/midori-websettings.c:996
+#: ../midori/main.c:2114 ../midori/midori-websettings.c:997
#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
msgstr "网页缓存"
-#: ../midori/main.c:2182
+#: ../midori/main.c:2117
msgid "Website icons"
msgstr "网站图标"
-#: ../midori/main.c:2288
+#: ../midori/main.c:2223
msgid "An unknown error occured"
msgstr "发生了一个未知错误"
-#: ../midori/main.c:2395
+#: ../midori/main.c:2330
msgid "An instance of Midori is already running but not responding.\n"
msgstr "已有一个 Midori 实例在运行但无响应。\n"
-#: ../midori/main.c:2431
+#: ../midori/main.c:2366
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "未能载入书签：%s\n"
-#: ../midori/main.c:2479
+#: ../midori/main.c:2414
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "未能载入回收站：%s\n"
-#: ../midori/main.c:2492
+#: ../midori/main.c:2427
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "未能载入历史：%s\n"
-#: ../midori/main.c:2508
+#: ../midori/main.c:2443
msgid "The following errors occured:"
msgstr "发生了以下错误："
-#: ../midori/main.c:2524
+#: ../midori/main.c:2459
msgid "_Ignore"
msgstr "忽略(_I)"
-#: ../midori/midori-app.c:1334
+#: ../midori/midori-app.c:1339
msgid "_Bookmark"
msgstr "书签(_B)"
-#: ../midori/midori-app.c:1335 ../midori/midori-browser.c:6060
+#: ../midori/midori-app.c:1340 ../midori/midori-browser.c:6066
msgid "_Bookmarks"
msgstr "书签(_B)"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1341
msgid "Add Boo_kmark"
msgstr "添加书签(_K)"
-#: ../midori/midori-app.c:1337
+#: ../midori/midori-app.c:1342
msgid "_Console"
msgstr "控制台(_C)"
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1343
msgid "_Extensions"
msgstr "扩展(_E)"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339 ../midori/midori-browser.c:4589
+#: ../midori/midori-app.c:1344 ../midori/midori-browser.c:4591
msgid "_History"
msgstr "历史(_H)"
-#: ../midori/midori-app.c:1340
+#: ../midori/midori-app.c:1345
msgid "_Homepage"
msgstr "主页(_H)"
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1346
msgid "_Userscripts"
msgstr "用户脚本(_U)"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1347
msgid "New _Tab"
msgstr "新建标签(_T)"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1348
msgid "_Transfers"
msgstr "传输(_T)"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1349
msgid "Netscape p_lugins"
msgstr "Netscape 插件(_L)"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1350
msgid "_Closed Tabs"
msgstr "已关闭的标签(_C)"
-#: ../midori/midori-app.c:1346 ../midori/midori-browser.c:5216
+#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5218
msgid "New _Window"
msgstr "新建窗口(_W)"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1352
msgid "New _Folder"
msgstr "新建文件夹(_F)"
@@ -383,12 +372,12 @@ msgstr "无法识别的书签格式。"
msgid "Writing failed."
msgstr "无法写入。"
-#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5298
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:350 ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5309
msgid "Reload the current page"
msgstr "重载当前页面"
-#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:359 ../midori/midori-browser.c:5306
msgid "Stop loading the current page"
msgstr "停止载入当前页面"
@@ -436,7 +425,7 @@ msgstr "标题(_T)："
msgid "_Address:"
msgstr "地址(_A)："
-#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4326
+#: ../midori/midori-browser.c:861 ../midori/midori-browser.c:4328
msgid "_Folder:"
msgstr "文件夹(_F)："
@@ -472,7 +461,7 @@ msgstr "没有足够的空闲空间用来下载 “%s”。"
msgid "The file needs %s but only %s are left."
msgstr "此文件需要 %s 但只剩余 %s。"
-#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4397
msgid "Save file as"
msgstr "文件另存为"
@@ -533,7 +522,7 @@ msgstr ""
msgid "New feed"
msgstr "新建源"
-#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5367
+#: ../midori/midori-browser.c:2548 ../midori/midori-browser.c:5369
#: ../panels/midori-bookmarks.c:427
msgid "Add a new bookmark"
msgstr "添加新书签"
@@ -542,126 +531,126 @@ msgstr "添加新书签"
msgid "Empty"
msgstr "清空"
-#: ../midori/midori-browser.c:3467
+#: ../midori/midori-browser.c:3469
msgid "Toggle text cursor navigation"
msgstr "切换文字光标导航"
-#: ../midori/midori-browser.c:3782 ../midori/midori-browser.c:5753
+#: ../midori/midori-browser.c:3784 ../midori/midori-browser.c:5759
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "无法插入新的历史项目：%s\n"
-#: ../midori/midori-browser.c:4114 ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4116 ../panels/midori-bookmarks.c:745
+#: ../panels/midori-history.c:803
msgid "Open all in _Tabs"
msgstr "全部在标签中打开(_T)"
-#: ../midori/midori-browser.c:4121 ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807 ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4123 ../panels/midori-bookmarks.c:751
+#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "在新标签中打开(_T)"
-#: ../midori/midori-browser.c:4124 ../midori/midori-view.c:2657
-#: ../midori/midori-view.c:4704 ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809 ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4126 ../midori/midori-view.c:2690
+#: ../midori/midori-view.c:4765 ../panels/midori-bookmarks.c:753
+#: ../panels/midori-history.c:811 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "在新窗口中打开(_W)"
-#: ../midori/midori-browser.c:4213
+#: ../midori/midori-browser.c:4215
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4214
+#: ../midori/midori-browser.c:4216
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4215
+#: ../midori/midori-browser.c:4217
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4216
+#: ../midori/midori-browser.c:4218
msgid "Konqueror"
msgstr "Konqueror"
-#: ../midori/midori-browser.c:4217
+#: ../midori/midori-browser.c:4219
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4218
+#: ../midori/midori-browser.c:4220
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox(%s)"
-#: ../midori/midori-browser.c:4239
-msgid "Import bookmarks..."
-msgstr "导入书签..."
+#: ../midori/midori-browser.c:4241
+msgid "Import bookmarks…"
+msgstr "导入书签…"
-#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5372
+#: ../midori/midori-browser.c:4244 ../midori/midori-browser.c:5374
msgid "_Import bookmarks"
msgstr "导入书签(_I)"
-#: ../midori/midori-browser.c:4253
+#: ../midori/midori-browser.c:4255
msgid "_Application:"
msgstr "应用程序(_A)："
-#: ../midori/midori-browser.c:4318
+#: ../midori/midori-browser.c:4320
msgid "Import from XBEL or HTML file"
msgstr "从 XBEL 或 HTML 文件导入"
-#: ../midori/midori-browser.c:4353
+#: ../midori/midori-browser.c:4355
msgid "Import from a file"
msgstr "从文件导入"
-#: ../midori/midori-browser.c:4365
+#: ../midori/midori-browser.c:4367
msgid "Failed to import bookmarks"
msgstr "无法导入书签"
-#: ../midori/midori-browser.c:4400
+#: ../midori/midori-browser.c:4402
msgid "XBEL Bookmarks"
msgstr "XBEL 书签"
-#: ../midori/midori-browser.c:4405
+#: ../midori/midori-browser.c:4407
msgid "Netscape Bookmarks"
msgstr "Netscape 书签"
-#: ../midori/midori-browser.c:4419
+#: ../midori/midori-browser.c:4421
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "Midori 只能导出为 XBEL(*.xbel) 和 Netscape(*.html)"
-#: ../midori/midori-browser.c:4434
+#: ../midori/midori-browser.c:4436
msgid "Failed to export bookmarks"
msgstr "无法导出书签"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4556
+#: ../midori/midori-browser.c:4558
msgid "Clear Private Data"
msgstr "清除隐私数据"
-#: ../midori/midori-browser.c:4560
+#: ../midori/midori-browser.c:4562
msgid "_Clear private data"
msgstr "清除隐私数据(_C)"
-#: ../midori/midori-browser.c:4573
+#: ../midori/midori-browser.c:4575
msgid "Clear the following data:"
msgstr "清除以下数据："
-#: ../midori/midori-browser.c:4583
+#: ../midori/midori-browser.c:4585
msgid "Last open _tabs"
msgstr "上次打开的标签(_T)"
-#: ../midori/midori-browser.c:4609
+#: ../midori/midori-browser.c:4611
msgid "Clear private data when _quitting Midori"
msgstr "退出 Midori 时清除隐私数据(_Q)"
-#: ../midori/midori-browser.c:4804
+#: ../midori/midori-browser.c:4806
msgid "A lightweight web browser."
msgstr "轻量级的网络浏览器。"
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:4807
msgid "See about:version for version info."
msgstr "查看 about:version 获取版本信息。"
-#: ../midori/midori-browser.c:4807
+#: ../midori/midori-browser.c:4809
msgid ""
"This library is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -671,366 +660,370 @@ msgstr ""
"此库文件是自由软件；您可以以自由软件基金会发布的 GNU 宽通用公共许可协议 2.1 "
"版或(您可以选择)更高版方式重新发布和/或修改它。"
-#: ../midori/midori-browser.c:4828
+#: ../midori/midori-browser.c:4830
msgid "translator-credits"
msgstr ""
"张翼 , 2009.\n"
"Hunt Xu , 2009, 2010, 2011.\n"
"Chipong Luo , 2011, 2012."
-#: ../midori/midori-browser.c:5214
+#: ../midori/midori-browser.c:5216
msgid "_File"
msgstr "文件(_F)"
-#: ../midori/midori-browser.c:5217
+#: ../midori/midori-browser.c:5219
msgid "Open a new window"
msgstr "打开一个新窗口"
-#: ../midori/midori-browser.c:5220
+#: ../midori/midori-browser.c:5222
msgid "Open a new tab"
msgstr "打开一个新标签"
-#: ../midori/midori-browser.c:5222
+#: ../midori/midori-browser.c:5224
msgid "New P_rivate Browsing Window"
msgstr "新建私人浏览窗口(_R)"
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5228
msgid "Open a file"
msgstr "打开文件"
-#: ../midori/midori-browser.c:5228
-msgid "_Save Page As..."
-msgstr "页面另存为(_S)..."
+#: ../midori/midori-browser.c:5230
+msgid "_Save Page As…"
+msgstr "页面另存为(_S)…"
-#: ../midori/midori-browser.c:5229
+#: ../midori/midori-browser.c:5231
msgid "Save to a file"
msgstr "保存至文件"
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5233
msgid "Add to Speed _dial"
msgstr "添加至快速拨号(_D)"
-#: ../midori/midori-browser.c:5235
+#: ../midori/midori-browser.c:5237
msgid "Add Shortcut to the _desktop"
msgstr "添加快捷方式至桌面(_D)"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5239
msgid "Create _Launcher"
msgstr "创建启动器(_L)"
-#: ../midori/midori-browser.c:5241
+#: ../midori/midori-browser.c:5243
msgid "Subscribe to News _feed"
msgstr "订阅至新闻源(_F)"
-#: ../midori/midori-browser.c:5247
+#: ../midori/midori-browser.c:5249
msgid "_Close Tab"
msgstr "关闭标签(_C)"
-#: ../midori/midori-browser.c:5248
+#: ../midori/midori-browser.c:5250
msgid "Close the current tab"
msgstr "关闭当前标签"
-#: ../midori/midori-browser.c:5250
+#: ../midori/midori-browser.c:5252
msgid "C_lose Window"
msgstr "关闭窗口(_L)"
-#: ../midori/midori-browser.c:5254
+#: ../midori/midori-browser.c:5256
msgid "Print the current page"
msgstr "打印当前页面"
-#: ../midori/midori-browser.c:5256
+#: ../midori/midori-browser.c:5258
msgid "Close a_ll Windows"
msgstr "关闭所有窗口(_L)"
-#: ../midori/midori-browser.c:5259
+#: ../midori/midori-browser.c:5261
msgid "_Edit"
msgstr "编辑(_E)"
-#: ../midori/midori-browser.c:5282
-msgid "_Find..."
-msgstr "查找(_F)..."
+#: ../midori/midori-browser.c:5284
+msgid "_Find…"
+msgstr "查找(_F)…"
-#: ../midori/midori-browser.c:5283
+#: ../midori/midori-browser.c:5285
msgid "Find a word or phrase in the page"
msgstr "在页面中查找字词或短语"
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5287
msgid "Find _Next"
msgstr "查找下一个(_N)"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5290
msgid "Find _Previous"
msgstr "查找上一个(_P)"
-#: ../midori/midori-browser.c:5292
+#: ../midori/midori-browser.c:5294
msgid "Configure the application preferences"
msgstr "配置应用程序首选项"
-#: ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:5296
msgid "_View"
msgstr "视图(_V)"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5297
msgid "_Toolbars"
msgstr "工具栏(_T)"
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5302
msgid "Reload page without caching"
msgstr "重载页面但不缓存"
-#: ../midori/midori-browser.c:5310
+#: ../midori/midori-browser.c:5312
msgid "Increase the zoom level"
msgstr "增加缩放等级"
-#: ../midori/midori-browser.c:5313
+#: ../midori/midori-browser.c:5315
msgid "Decrease the zoom level"
msgstr "减小缩放等级"
-#: ../midori/midori-browser.c:5317
+#: ../midori/midori-browser.c:5319
msgid "_Encoding"
msgstr "编码(_E)"
-#: ../midori/midori-browser.c:5319
+#: ../midori/midori-browser.c:5321
msgid "View So_urce"
msgstr "查看源码(_U)"
-#: ../midori/midori-browser.c:5322
+#: ../midori/midori-browser.c:5324
msgid "Ca_ret Browsing"
msgstr "光标浏览(_R)"
-#: ../midori/midori-browser.c:5326
+#: ../midori/midori-browser.c:5328
msgid "Toggle fullscreen view"
msgstr "切换全屏视图"
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5330
msgid "Scroll _Left"
msgstr "向左滚动(_L)"
-#: ../midori/midori-browser.c:5331
+#: ../midori/midori-browser.c:5333
msgid "Scroll _Down"
msgstr "向下滚动(_D)"
-#: ../midori/midori-browser.c:5334
+#: ../midori/midori-browser.c:5336
msgid "Scroll _Up"
msgstr "向上滚动(_U)"
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5339
msgid "Scroll _Right"
msgstr "向右滚动(_R)"
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5342
msgid "_Go"
msgstr "转到(_G)"
-#: ../midori/midori-browser.c:5343
+#: ../midori/midori-browser.c:5345
msgid "Go back to the previous page"
msgstr "返回上一页面"
-#: ../midori/midori-browser.c:5346
+#: ../midori/midori-browser.c:5348
msgid "Go forward to the next page"
msgstr "进入下一页面"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:5352
msgid "Go to the previous sub-page"
msgstr "转到上一子页面"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5354
+#: ../midori/midori-browser.c:5356
msgid "Go to the next sub-page"
msgstr "转到下一子页面"
-#: ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:5359
msgid "Go to your homepage"
msgstr "进入您的主页"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5361
msgid "Empty Trash"
msgstr "清空回收站"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5364
msgid "Undo _Close Tab"
msgstr "撤销关闭标签(_C)"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5371
msgid "Add a new _folder"
msgstr "添加新文件夹(_F)"
-#: ../midori/midori-browser.c:5375
+#: ../midori/midori-browser.c:5377
msgid "_Export bookmarks"
msgstr "导出书签(_E)"
-#: ../midori/midori-browser.c:5378 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:497
msgid "_Manage Search Engines"
msgstr "管理搜索引擎(_M)"
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5383
msgid "_Clear Private Data"
msgstr "清除隐私数据(_C)"
-#: ../midori/midori-browser.c:5384
+#: ../midori/midori-browser.c:5386
msgid "_Inspect Page"
msgstr "检查页面(_I)"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5390
msgid "_Previous Tab"
msgstr "上一标签(_P)"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5393
msgid "_Next Tab"
msgstr "下一标签(_N)"
-#: ../midori/midori-browser.c:5393
+#: ../midori/midori-browser.c:5395
msgid "Move Tab _Backward"
msgstr "向后移动标签(_B)"
-#: ../midori/midori-browser.c:5395
+#: ../midori/midori-browser.c:5397
msgid "_Move Tab Forward"
msgstr "向前移动标签(_M)"
-#: ../midori/midori-browser.c:5398
+#: ../midori/midori-browser.c:5400
msgid "Focus _Current Tab"
msgstr "聚焦当前标签(_C)"
-#: ../midori/midori-browser.c:5401
+#: ../midori/midori-browser.c:5403
msgid "Focus _Next view"
msgstr "聚焦下一视图(_N)"
-#: ../midori/midori-browser.c:5404
+#: ../midori/midori-browser.c:5406
msgid "Only show the Icon of the _Current Tab"
msgstr "仅显示当前标签的图标(_C)"
-#: ../midori/midori-browser.c:5407
+#: ../midori/midori-browser.c:5409
msgid "_Duplicate Current Tab"
msgstr "复制当前标签(_D)"
-#: ../midori/midori-browser.c:5410
+#: ../midori/midori-browser.c:5412
msgid "Close Ot_her Tabs"
msgstr "关闭其它标签(_H)"
-#: ../midori/midori-browser.c:5413
+#: ../midori/midori-browser.c:5415
msgid "Open last _session"
msgstr "打开上次会话(_S)"
-#: ../midori/midori-browser.c:5416
+#: ../midori/midori-browser.c:5418
msgid "_Help"
msgstr "帮助(_H)"
-#: ../midori/midori-browser.c:5418
+#: ../midori/midori-browser.c:5420
msgid "_Frequent Questions"
msgstr "常见问题(_F)"
-#: ../midori/midori-browser.c:5421
-msgid "_Report a Problem..."
-msgstr "报告问题(_R)..."
+#: ../midori/midori-browser.c:5423
+msgid "_Report a Problem…"
+msgstr "报告问题(_R)…"
-#: ../midori/midori-browser.c:5433
+#: ../midori/midori-browser.c:5435
msgid "_Menubar"
msgstr "菜单栏(_M)"
-#: ../midori/midori-browser.c:5437
+#: ../midori/midori-browser.c:5439
msgid "_Navigationbar"
msgstr "导航栏(_N)"
-#: ../midori/midori-browser.c:5441
+#: ../midori/midori-browser.c:5443
msgid "Side_panel"
msgstr "侧边栏(_P)"
-#: ../midori/midori-browser.c:5442
+#: ../midori/midori-browser.c:5444
msgid "Sidepanel"
msgstr "侧边栏"
-#: ../midori/midori-browser.c:5445
+#: ../midori/midori-browser.c:5447
msgid "_Bookmarkbar"
msgstr "书签栏(_B)"
-#: ../midori/midori-browser.c:5449
+#: ../midori/midori-browser.c:5451
msgid "_Statusbar"
msgstr "状态栏(_S)"
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:311
+#: ../midori/midori-browser.c:5460 ../midori/midori-websettings.c:312
msgid "_Automatic"
msgstr "自动(_A)"
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:236
-msgid "Chinese (BIG5)"
-msgstr "中文(BIG5)"
+#: ../midori/midori-browser.c:5463 ../midori/midori-websettings.c:236
+msgid "Chinese Traditional (BIG5)"
+msgstr "繁体中文 (BIG5)"
+
+#: ../midori/midori-browser.c:5466 ../midori/midori-websettings.c:237
+msgid "Chinese Simplified (GB18030)"
+msgstr "简体中文 (GB18030)"
#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5465
+#: ../midori/midori-browser.c:5470
msgid "Japanese (SHIFT__JIS)"
msgstr "日语(SHIFT_JIS)"
-#: ../midori/midori-browser.c:5468 ../midori/midori-websettings.c:238
+#: ../midori/midori-browser.c:5473 ../midori/midori-websettings.c:239
msgid "Korean (EUC-KR)"
msgstr "韩语(EUC-KR)"
-#: ../midori/midori-browser.c:5471 ../midori/midori-websettings.c:239
+#: ../midori/midori-browser.c:5476 ../midori/midori-websettings.c:240
msgid "Russian (KOI8-R)"
msgstr "俄语(KOI8-R)"
-#: ../midori/midori-browser.c:5474 ../midori/midori-websettings.c:240
+#: ../midori/midori-browser.c:5479 ../midori/midori-websettings.c:241
msgid "Unicode (UTF-8)"
msgstr "Unicode(UTF-8)"
-#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:241
+#: ../midori/midori-browser.c:5482 ../midori/midori-websettings.c:242
msgid "Western (ISO-8859-1)"
msgstr "西方语言(ISO-8859-1)"
-#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:242
-#: ../midori/midori-websettings.c:317 ../katze/katze-utils.c:641
-msgid "Custom..."
-msgstr "自定义..."
+#: ../midori/midori-browser.c:5485 ../midori/midori-websettings.c:243
+#: ../midori/midori-websettings.c:318 ../katze/katze-utils.c:641
+msgid "Custom…"
+msgstr "自定义…"
-#: ../midori/midori-browser.c:5985
+#: ../midori/midori-browser.c:5991
msgid "_Separator"
msgstr "分隔符(_S)"
-#: ../midori/midori-browser.c:5992
-msgid "_Location..."
-msgstr "位置(_L)..."
+#: ../midori/midori-browser.c:5998
+msgid "_Location…"
+msgstr "位置(_L)…"
-#: ../midori/midori-browser.c:5994
+#: ../midori/midori-browser.c:6000
msgid "Open a particular location"
msgstr "打开特定位置"
-#: ../midori/midori-browser.c:6016
-msgid "_Web Search..."
-msgstr "网络搜索(_W)..."
+#: ../midori/midori-browser.c:6022
+msgid "_Web Search…"
+msgstr "网络搜索(_W)…"
-#: ../midori/midori-browser.c:6018
+#: ../midori/midori-browser.c:6024
msgid "Run a web search"
msgstr "运行网络搜索"
-#: ../midori/midori-browser.c:6045
+#: ../midori/midori-browser.c:6051
msgid "Reopen a previously closed tab or window"
msgstr "重新打开先前关闭的标签或窗口"
-#: ../midori/midori-browser.c:6062
+#: ../midori/midori-browser.c:6068
msgid "Show the saved bookmarks"
msgstr "显示已保存的书签"
-#: ../midori/midori-browser.c:6079
+#: ../midori/midori-browser.c:6085
msgid "_Tools"
msgstr "工具(_T)"
-#: ../midori/midori-browser.c:6095
+#: ../midori/midori-browser.c:6101
msgid "_Window"
msgstr "窗口(_W)"
-#: ../midori/midori-browser.c:6097
+#: ../midori/midori-browser.c:6103
msgid "Show a list of all open tabs"
msgstr "显示所有打开标签的列表"
-#: ../midori/midori-browser.c:6111
+#: ../midori/midori-browser.c:6117
msgid "_Menu"
msgstr "菜单(_M)"
-#: ../midori/midori-browser.c:6113
+#: ../midori/midori-browser.c:6119
msgid "Menu"
msgstr "菜单"
-#: ../midori/midori-browser.c:6927
+#: ../midori/midori-browser.c:6933
#, c-format
msgid "Unexpected setting '%s'"
msgstr "意外的设置 ‘%s’"
@@ -1053,8 +1046,8 @@ msgid "Search with %s"
msgstr "用 %s 搜索"
#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "搜索方式..."
+msgid "Search with…"
+msgstr "搜索方式…"
#: ../midori/midori-locationaction.c:537
#, c-format
@@ -1104,493 +1097,493 @@ msgstr "显示快速拨号"
msgid "Show Homepage"
msgstr "显示主页"
-#: ../midori/midori-websettings.c:237
+#: ../midori/midori-websettings.c:238
msgid "Japanese (SHIFT_JIS)"
msgstr "日语(SHIFT_JIS)"
-#: ../midori/midori-websettings.c:257
+#: ../midori/midori-websettings.c:258
msgid "New tab"
msgstr "新建标签"
-#: ../midori/midori-websettings.c:258
+#: ../midori/midori-websettings.c:259
msgid "New window"
msgstr "新建窗口"
-#: ../midori/midori-websettings.c:259
+#: ../midori/midori-websettings.c:260
msgid "Current tab"
msgstr "当前标签"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:275
msgid "Default"
msgstr "默认"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:276
msgid "Icons"
msgstr "图标"
-#: ../midori/midori-websettings.c:276
+#: ../midori/midori-websettings.c:277
msgid "Small icons"
msgstr "小图标"
-#: ../midori/midori-websettings.c:277
+#: ../midori/midori-websettings.c:278
msgid "Text"
msgstr "文字"
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:279
msgid "Icons and text"
msgstr "图标和文字"
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:280
msgid "Text beside icons"
msgstr "文字在图标旁"
-#: ../midori/midori-websettings.c:294
+#: ../midori/midori-websettings.c:295
msgid "Automatic (GNOME or environment)"
msgstr "自动(GNOME 或其它环境)"
-#: ../midori/midori-websettings.c:295
+#: ../midori/midori-websettings.c:296
msgid "HTTP proxy server"
msgstr "HTTP 代理服务器"
-#: ../midori/midori-websettings.c:296
+#: ../midori/midori-websettings.c:297
msgid "No proxy server"
msgstr "无代理服务器"
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:314
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:314
+#: ../midori/midori-websettings.c:315
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:315
+#: ../midori/midori-websettings.c:316
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:316
+#: ../midori/midori-websettings.c:317
msgid "Internet Explorer"
msgstr "Internet Explorer"
-#: ../midori/midori-websettings.c:400
+#: ../midori/midori-websettings.c:401
msgid "Remember last window size"
msgstr "记住上个窗口的大小"
-#: ../midori/midori-websettings.c:401
+#: ../midori/midori-websettings.c:402
msgid "Whether to save the last window size"
msgstr "是否保存上个窗口的大小"
-#: ../midori/midori-websettings.c:409
+#: ../midori/midori-websettings.c:410
msgid "Last window width"
msgstr "上个窗口宽度"
-#: ../midori/midori-websettings.c:410
+#: ../midori/midori-websettings.c:411
msgid "The last saved window width"
msgstr "上个保存的窗口宽度"
-#: ../midori/midori-websettings.c:418
+#: ../midori/midori-websettings.c:419
msgid "Last window height"
msgstr "上个窗口高度"
-#: ../midori/midori-websettings.c:419
+#: ../midori/midori-websettings.c:420
msgid "The last saved window height"
msgstr "上个保存的窗口高度"
-#: ../midori/midori-websettings.c:444
+#: ../midori/midori-websettings.c:445
msgid "Last panel position"
msgstr "上个侧边栏位置"
-#: ../midori/midori-websettings.c:445
+#: ../midori/midori-websettings.c:446
msgid "The last saved panel position"
msgstr "上个保存的侧边栏位置"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:454
+#: ../midori/midori-websettings.c:455
msgid "Last panel page"
msgstr "上个侧边栏页面"
-#: ../midori/midori-websettings.c:455
+#: ../midori/midori-websettings.c:456
msgid "The last saved panel page"
msgstr "上个保存的侧边栏页面"
-#: ../midori/midori-websettings.c:463
+#: ../midori/midori-websettings.c:464
msgid "Last Web search"
msgstr "上个网络搜索"
-#: ../midori/midori-websettings.c:464
+#: ../midori/midori-websettings.c:465
msgid "The last saved Web search"
msgstr "上个保存的网络搜索"
-#: ../midori/midori-websettings.c:473
+#: ../midori/midori-websettings.c:474
msgid "Show Menubar"
msgstr "显示菜单栏"
-#: ../midori/midori-websettings.c:474
+#: ../midori/midori-websettings.c:475
msgid "Whether to show the menubar"
msgstr "是否显示菜单栏"
-#: ../midori/midori-websettings.c:482
+#: ../midori/midori-websettings.c:483
msgid "Show Navigationbar"
msgstr "显示导航栏"
-#: ../midori/midori-websettings.c:483
+#: ../midori/midori-websettings.c:484
msgid "Whether to show the navigationbar"
msgstr "是否显示导航栏"
-#: ../midori/midori-websettings.c:491
+#: ../midori/midori-websettings.c:492
msgid "Show Bookmarkbar"
msgstr "显示书签栏"
-#: ../midori/midori-websettings.c:492
+#: ../midori/midori-websettings.c:493
msgid "Whether to show the bookmarkbar"
msgstr "是否显示书签栏"
-#: ../midori/midori-websettings.c:500
+#: ../midori/midori-websettings.c:501
msgid "Show Panel"
msgstr "显示侧边栏"
-#: ../midori/midori-websettings.c:501
+#: ../midori/midori-websettings.c:502
msgid "Whether to show the panel"
msgstr "是否显示侧边栏"
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:510
msgid "Show Statusbar"
msgstr "显示状态栏"
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:511
msgid "Whether to show the statusbar"
msgstr "是否显示状态栏"
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:520
msgid "Toolbar Style:"
msgstr "工具栏样式："
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:521
msgid "The style of the toolbar"
msgstr "工具栏的样式"
-#: ../midori/midori-websettings.c:529
+#: ../midori/midori-websettings.c:530
msgid "Toolbar Items"
msgstr "工具栏项目"
-#: ../midori/midori-websettings.c:530
+#: ../midori/midori-websettings.c:531
msgid "The items to show on the toolbar"
msgstr "在工具栏中要显示的项目"
-#: ../midori/midori-websettings.c:538
+#: ../midori/midori-websettings.c:539
msgid "Compact Sidepanel"
msgstr "紧凑侧边栏"
-#: ../midori/midori-websettings.c:539
+#: ../midori/midori-websettings.c:540
msgid "Whether to make the sidepanel compact"
msgstr "是否紧凑显示侧边栏"
-#: ../midori/midori-websettings.c:554
+#: ../midori/midori-websettings.c:555
msgid "Align sidepanel on the right"
msgstr "侧边栏放在右边"
-#: ../midori/midori-websettings.c:555
+#: ../midori/midori-websettings.c:556
msgid "Whether to align the sidepanel on the right"
msgstr "是否将侧边栏放在右边"
-#: ../midori/midori-websettings.c:570
+#: ../midori/midori-websettings.c:571
msgid "Open panels in separate windows"
msgstr "在单独窗口中打开侧边栏"
-#: ../midori/midori-websettings.c:571
+#: ../midori/midori-websettings.c:572
msgid "Whether to always open panels in separate windows"
msgstr "是否总是在单独窗口中打开侧边栏"
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:581
msgid "When Midori starts:"
msgstr "Midori 启动时："
-#: ../midori/midori-websettings.c:581
+#: ../midori/midori-websettings.c:582
msgid "What to do when Midori starts"
msgstr "Midori 启动时做的事"
-#: ../midori/midori-websettings.c:590
+#: ../midori/midori-websettings.c:591
msgid "Homepage:"
msgstr "主页："
-#: ../midori/midori-websettings.c:591
+#: ../midori/midori-websettings.c:592
msgid "The homepage"
msgstr "主页"
-#: ../midori/midori-websettings.c:606
+#: ../midori/midori-websettings.c:607
msgid "Show crash dialog"
msgstr "显示崩溃对话框"
-#: ../midori/midori-websettings.c:607
+#: ../midori/midori-websettings.c:608
msgid "Show a dialog after Midori crashed"
msgstr "Midori 崩溃后显示对话框"
-#: ../midori/midori-websettings.c:615
+#: ../midori/midori-websettings.c:616
msgid "Save downloaded files to:"
msgstr "保存下载的文件至："
-#: ../midori/midori-websettings.c:616
+#: ../midori/midori-websettings.c:617
msgid "The folder downloaded files are saved to"
msgstr "已下载文件所保存的文件夹"
-#: ../midori/midori-websettings.c:624
+#: ../midori/midori-websettings.c:625
msgid "Text Editor"
msgstr "文本编辑器"
-#: ../midori/midori-websettings.c:625
+#: ../midori/midori-websettings.c:626
msgid "An external text editor"
msgstr "外部文本编辑器"
-#: ../midori/midori-websettings.c:640
+#: ../midori/midori-websettings.c:641
msgid "News Aggregator"
msgstr "新闻聚合器"
-#: ../midori/midori-websettings.c:641
+#: ../midori/midori-websettings.c:642
msgid "An external news aggregator"
msgstr "外部新闻聚合器"
-#: ../midori/midori-websettings.c:649
+#: ../midori/midori-websettings.c:650
msgid "Location entry Search"
msgstr "位置栏搜索"
-#: ../midori/midori-websettings.c:650
+#: ../midori/midori-websettings.c:651
msgid "The search to perform inside the location entry"
msgstr "在位置栏内执行的搜索"
-#: ../midori/midori-websettings.c:658
+#: ../midori/midori-websettings.c:659
msgid "Preferred Encoding"
msgstr "首选编码"
-#: ../midori/midori-websettings.c:659
+#: ../midori/midori-websettings.c:660
msgid "The preferred character encoding"
msgstr "首选的字符编码"
-#: ../midori/midori-websettings.c:669
+#: ../midori/midori-websettings.c:670
msgid "Always Show Tabbar"
msgstr "总是显示标签栏"
-#: ../midori/midori-websettings.c:670
+#: ../midori/midori-websettings.c:671
msgid "Always show the tabbar"
msgstr "总是显示标签栏"
-#: ../midori/midori-websettings.c:683
+#: ../midori/midori-websettings.c:684
msgid "Close Buttons on Tabs"
msgstr "标签上有关闭按钮"
-#: ../midori/midori-websettings.c:684
+#: ../midori/midori-websettings.c:685
msgid "Whether tabs have close buttons"
msgstr "标签上是否有关闭按钮"
-#: ../midori/midori-websettings.c:709
+#: ../midori/midori-websettings.c:710
msgid "Open new pages in:"
msgstr "在此打开新页面："
-#: ../midori/midori-websettings.c:710
+#: ../midori/midori-websettings.c:711
msgid "Where to open new pages"
msgstr "在哪里打开新页面"
-#: ../midori/midori-websettings.c:719
+#: ../midori/midori-websettings.c:720
msgid "Middle click opens Selection"
msgstr "中击打开所选内容"
-#: ../midori/midori-websettings.c:720
+#: ../midori/midori-websettings.c:721
msgid "Load an address from the selection via middle click"
msgstr "通过中击从所选内容中载入地址"
-#: ../midori/midori-websettings.c:728
+#: ../midori/midori-websettings.c:729
msgid "Open tabs in the background"
msgstr "在后台打开标签"
-#: ../midori/midori-websettings.c:729
+#: ../midori/midori-websettings.c:730
msgid "Whether to open new tabs in the background"
msgstr "是否在后台打开新标签"
-#: ../midori/midori-websettings.c:737
+#: ../midori/midori-websettings.c:738
msgid "Open Tabs next to Current"
msgstr "在当前标签后打开标签"
-#: ../midori/midori-websettings.c:738
+#: ../midori/midori-websettings.c:739
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr "在当前标签后还是在上一标签后打开新标签"
-#: ../midori/midori-websettings.c:746
+#: ../midori/midori-websettings.c:747
msgid "Open popups in tabs"
msgstr "在标签中打开弹出窗口"
-#: ../midori/midori-websettings.c:747
+#: ../midori/midori-websettings.c:748
msgid "Whether to open popup windows in tabs"
msgstr "是否在标签中打开弹出窗口"
-#: ../midori/midori-websettings.c:757 ../extensions/statusbar-features.c:134
+#: ../midori/midori-websettings.c:758 ../extensions/statusbar-features.c:134
msgid "Load images automatically"
msgstr "自动载入图片"
-#: ../midori/midori-websettings.c:758
+#: ../midori/midori-websettings.c:759
msgid "Load and display images automatically"
msgstr "自动载入并显示图片"
-#: ../midori/midori-websettings.c:765 ../extensions/statusbar-features.c:143
+#: ../midori/midori-websettings.c:766 ../extensions/statusbar-features.c:143
msgid "Enable scripts"
msgstr "启用脚本"
-#: ../midori/midori-websettings.c:766
+#: ../midori/midori-websettings.c:767
msgid "Enable embedded scripting languages"
msgstr "启用已嵌入的脚本语言"
-#: ../midori/midori-websettings.c:773 ../extensions/statusbar-features.c:154
+#: ../midori/midori-websettings.c:774 ../extensions/statusbar-features.c:154
msgid "Enable Netscape plugins"
msgstr "启用 Netscape 插件"
-#: ../midori/midori-websettings.c:774
+#: ../midori/midori-websettings.c:775
msgid "Enable embedded Netscape plugin objects"
msgstr "启用已嵌入的 Netscape 插件对象"
-#: ../midori/midori-websettings.c:789
+#: ../midori/midori-websettings.c:790
msgid "Enable Spell Checking"
msgstr "启用拼写检查"
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:791
msgid "Enable spell checking while typing"
msgstr "输入时启用拼写检查"
-#: ../midori/midori-websettings.c:796
+#: ../midori/midori-websettings.c:797
msgid "Enable HTML5 database support"
msgstr "启用 HTML5 数据库支持"
-#: ../midori/midori-websettings.c:797
+#: ../midori/midori-websettings.c:798
msgid "Whether to enable HTML5 database support"
msgstr "是否启用 HTML5 数据库支持"
-#: ../midori/midori-websettings.c:803
+#: ../midori/midori-websettings.c:804
msgid "Enable HTML5 local storage support"
msgstr "启用 HTML5 本地存储支持"
-#: ../midori/midori-websettings.c:804
+#: ../midori/midori-websettings.c:805
msgid "Whether to enable HTML5 local storage support"
msgstr "是否启用 HTML5 本地存储支持"
-#: ../midori/midori-websettings.c:810
+#: ../midori/midori-websettings.c:811
msgid "Enable offline web application cache"
msgstr "启用离线网络应用程序缓存"
-#: ../midori/midori-websettings.c:811
+#: ../midori/midori-websettings.c:812
msgid "Whether to enable offline web application cache"
msgstr "是否启用离线网络应用程序缓存"
-#: ../midori/midori-websettings.c:827
+#: ../midori/midori-websettings.c:828
msgid "Flash window on background tabs"
msgstr "在后台标签的窗口闪烁"
-#: ../midori/midori-websettings.c:828
+#: ../midori/midori-websettings.c:829
msgid "Flash the browser window if a new tab was opened in the background"
msgstr "新标签在后台打开时浏览器窗口闪烁"
-#: ../midori/midori-websettings.c:836
+#: ../midori/midori-websettings.c:837
msgid "Enable WebGL support"
msgstr "启用 WebGL 支持"
-#: ../midori/midori-websettings.c:837
+#: ../midori/midori-websettings.c:838
msgid "Allow websites to use OpenGL rendering"
msgstr "允许站点使用 OpenGL 渲染"
-#: ../midori/midori-websettings.c:863
+#: ../midori/midori-websettings.c:864
msgid "Zoom Text and Images"
msgstr "缩放文字和图片"
-#: ../midori/midori-websettings.c:864
+#: ../midori/midori-websettings.c:865
msgid "Whether to zoom text and images"
msgstr "是否缩放文字和图片"
-#: ../midori/midori-websettings.c:879
+#: ../midori/midori-websettings.c:880
msgid "Find inline while typing"
msgstr "输入时在文中查找"
-#: ../midori/midori-websettings.c:880
+#: ../midori/midori-websettings.c:881
msgid "Whether to automatically find inline while typing"
msgstr "输入时是否在文中自动查找"
-#: ../midori/midori-websettings.c:895
+#: ../midori/midori-websettings.c:896
msgid "Kinetic scrolling"
msgstr "动态滚动"
-#: ../midori/midori-websettings.c:896
+#: ../midori/midori-websettings.c:897
msgid "Whether scrolling should kinetically move according to speed"
msgstr "滚动是否按速度动态地移动"
-#: ../midori/midori-websettings.c:904
+#: ../midori/midori-websettings.c:905
msgid "Delete old Cookies after:"
msgstr "删除此后的原隐私信息："
-#: ../midori/midori-websettings.c:905
+#: ../midori/midori-websettings.c:906
msgid "The maximum number of days to save cookies for"
msgstr "最长隐私信息保存天数"
-#: ../midori/midori-websettings.c:921
+#: ../midori/midori-websettings.c:922
msgid "Only accept Cookies from sites you visit"
msgstr "只接受您访问的网站的隐私信息"
-#: ../midori/midori-websettings.c:922
+#: ../midori/midori-websettings.c:923
msgid "Block cookies sent by third-party websites"
msgstr "屏蔽第三方网站发送的隐私信息"
-#: ../midori/midori-websettings.c:936
+#: ../midori/midori-websettings.c:937
msgid "Delete pages from history after:"
msgstr "删除此历史后的页面："
-#: ../midori/midori-websettings.c:937
+#: ../midori/midori-websettings.c:938
msgid "The maximum number of days to save the history for"
msgstr "最长历史保存天数"
-#: ../midori/midori-websettings.c:952
+#: ../midori/midori-websettings.c:953
msgid "Proxy server"
msgstr "代理服务器"
-#: ../midori/midori-websettings.c:953
+#: ../midori/midori-websettings.c:954
msgid "The type of proxy server to use"
msgstr "所使用的代理服务器类型"
-#: ../midori/midori-websettings.c:962
+#: ../midori/midori-websettings.c:963
msgid "HTTP Proxy Server"
msgstr "HTTP 代理服务器"
-#: ../midori/midori-websettings.c:963
+#: ../midori/midori-websettings.c:964
msgid "The proxy server used for HTTP connections"
msgstr "HTTP 连接所使用的代理服务器"
-#: ../midori/midori-websettings.c:978
+#: ../midori/midori-websettings.c:979
msgid "Port"
msgstr "端口"
-#: ../midori/midori-websettings.c:979
+#: ../midori/midori-websettings.c:980
msgid "The proxy server port used for HTTP connections"
msgstr "HTTP 连接所使用的代理服务器端口"
-#: ../midori/midori-websettings.c:997
+#: ../midori/midori-websettings.c:998
msgid "The maximum size of cached pages on disk"
msgstr "磁盘上缓存页面最大值"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1014
+#: ../midori/midori-websettings.c:1015
msgid "Identify as"
msgstr "识别为"
-#: ../midori/midori-websettings.c:1015
+#: ../midori/midori-websettings.c:1016
msgid "What to identify as to web pages"
msgstr "让网页识别为什么"
-#: ../midori/midori-websettings.c:1031
+#: ../midori/midori-websettings.c:1032
msgid "Identification string"
msgstr "识别字符串"
-#: ../midori/midori-websettings.c:1032
+#: ../midori/midori-websettings.c:1033
msgid "The application identification string"
msgstr "应用程序识别字符串"
-#: ../midori/midori-websettings.c:1048
+#: ../midori/midori-websettings.c:1049
msgid "Preferred languages"
msgstr "首选语言"
-#: ../midori/midori-websettings.c:1049
+#: ../midori/midori-websettings.c:1050
msgid ""
"A comma separated list of languages preferred for rendering multilingual "
"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
@@ -1598,290 +1591,294 @@ msgstr ""
"一个由逗号分隔的用以显示多语言网页的首选语言列表，例如 “de”，“ru,nl” 或 “en-"
"us;q=1.0, fr-fr;q=0.667”"
-#: ../midori/midori-websettings.c:1064
+#: ../midori/midori-websettings.c:1065
msgid "Clear private data"
msgstr "清除隐私数据"
-#: ../midori/midori-websettings.c:1065
+#: ../midori/midori-websettings.c:1066
msgid "The private data selected for deletion"
msgstr "选中的要删除的隐私数据"
-#: ../midori/midori-websettings.c:1080
+#: ../midori/midori-websettings.c:1081
msgid "Clear data"
msgstr "清除数据"
-#: ../midori/midori-websettings.c:1081
+#: ../midori/midori-websettings.c:1082
msgid "The data selected for deletion"
msgstr "选中的要删除的数据"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1130
+#: ../midori/midori-websettings.c:1131
msgid "Strip referrer details sent to websites"
msgstr "剥离向站点发送的提交信息详情"
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1132
+#: ../midori/midori-websettings.c:1133
msgid "Whether the \"Referer\" header should be shortened to the hostname"
msgstr "“提交信息” 头文件是否缩短为主机名"
-#: ../midori/midori-websettings.c:1146
+#: ../midori/midori-websettings.c:1147
msgid "Always use my font choices"
msgstr "总是使用我的字体选择"
-#: ../midori/midori-websettings.c:1147
+#: ../midori/midori-websettings.c:1148
msgid "Override fonts picked by websites with user preferences"
msgstr "使用用户首选项替换网站采用的字体"
-#: ../midori/midori-view.c:1360
+#: ../midori/midori-view.c:1375
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s 要保存 HTML5 数据库。"
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413
msgid "_Deny"
msgstr "拒绝(_D)"
-#: ../midori/midori-view.c:1364 ../midori/midori-view.c:1396
+#: ../midori/midori-view.c:1379 ../midori/midori-view.c:1413
msgid "_Allow"
msgstr "允许(_A)"
-#: ../midori/midori-view.c:1392
+#: ../midori/midori-view.c:1408
#, c-format
msgid "%s wants to know your location."
msgstr "%s 要获知您的位置。"
-#: ../midori/midori-view.c:1485
+#: ../midori/midori-view.c:1502
#, c-format
msgid "Error - %s"
msgstr "错误-%s"
-#: ../midori/midori-view.c:1486
+#: ../midori/midori-view.c:1503
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "未能载入 ‘%s’ 页面。"
-#: ../midori/midori-view.c:1488
+#: ../midori/midori-view.c:1505
msgid "Try again"
msgstr "重试"
-#: ../midori/midori-view.c:1685 ../midori/midori-view.c:2598
+#: ../midori/midori-view.c:1703 ../midori/midori-view.c:2625
#, c-format
msgid "Send a message to %s"
msgstr "向 %s 发送邮件"
-#: ../midori/midori-view.c:2428 ../midori/midori-view.c:2747
+#: ../midori/midori-view.c:2455 ../midori/midori-view.c:2781
msgid "Inspect _Element"
msgstr "检查元素(_E)"
-#: ../midori/midori-view.c:2480
+#: ../midori/midori-view.c:2507
msgid "Open Link in New _Tab"
msgstr "在新标签中打开链接(_T)"
-#: ../midori/midori-view.c:2484
+#: ../midori/midori-view.c:2511
msgid "Open Link in _Foreground Tab"
msgstr "在前台标签中打开链接(_F)"
-#: ../midori/midori-view.c:2485
+#: ../midori/midori-view.c:2512
msgid "Open Link in _Background Tab"
msgstr "在后台标签中打开链接(_B)"
-#: ../midori/midori-view.c:2488
+#: ../midori/midori-view.c:2515
msgid "Open Link in New _Window"
msgstr "在新窗口中打开链接(_W)"
-#: ../midori/midori-view.c:2491
+#: ../midori/midori-view.c:2518
msgid "Open Link as Web A_pplication"
msgstr "将链接作为网络应用程序打开(_P)"
-#: ../midori/midori-view.c:2496
+#: ../midori/midori-view.c:2523
msgid "Copy Link de_stination"
msgstr "复制链接目的地(_S)"
-#: ../midori/midori-view.c:2512
+#: ../midori/midori-view.c:2539
msgid "Open _Image in New Tab"
msgstr "在新标签中打开图片(_I)"
-#: ../midori/midori-view.c:2515
+#: ../midori/midori-view.c:2542
msgid "Copy Image _Address"
msgstr "复制图片地址(_A)"
-#: ../midori/midori-view.c:2518
+#: ../midori/midori-view.c:2545
msgid "Save I_mage"
msgstr "保存图片(_M)"
-#: ../midori/midori-view.c:2521
+#: ../midori/midori-view.c:2548
msgid "Open in Image _Viewer"
msgstr "在图片查看器中打开(_V)"
-#: ../midori/midori-view.c:2528
+#: ../midori/midori-view.c:2555
msgid "Copy Video _Address"
msgstr "复制视频地址(_A)"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2558
msgid "Save _Video"
msgstr "保存视频(_V)"
-#: ../midori/midori-view.c:2531
+#: ../midori/midori-view.c:2558
msgid "Download _Video"
msgstr "下载视频(_V)"
-#: ../midori/midori-view.c:2557
+#: ../midori/midori-view.c:2584
msgid "Search _with"
msgstr "搜索方式(_W)"
-#: ../midori/midori-view.c:2589
+#: ../midori/midori-view.c:2616
msgid "_Search the Web"
msgstr "搜索网络(_S)"
-#: ../midori/midori-view.c:2606
+#: ../midori/midori-view.c:2633
msgid "Open Address in New _Tab"
msgstr "在新标签中打开地址(_T)"
-#: ../midori/midori-view.c:2909
+#: ../midori/midori-view.c:2686
+msgid "Open _Frame in New Tab"
+msgstr "在新标签中打开帧(_F)"
+
+#: ../midori/midori-view.c:2946
msgid "Open or download file"
msgstr "打开或下载文件"
-#: ../midori/midori-view.c:2929
+#: ../midori/midori-view.c:2966
#, c-format
msgid "File Type: '%s'"
msgstr "文件类型：‘%s’"
-#: ../midori/midori-view.c:2931
+#: ../midori/midori-view.c:2968
#, c-format
msgid "File Type: %s ('%s')"
msgstr "文件类型：%s(‘%s’)"
-#: ../midori/midori-view.c:2935
+#: ../midori/midori-view.c:2972
#, c-format
msgid "File Name: %s"
msgstr "文件名：%s"
-#: ../midori/midori-view.c:2955
+#: ../midori/midori-view.c:2999
#, c-format
msgid "Open %s"
msgstr "打开 %s"
-#: ../midori/midori-view.c:3576
+#: ../midori/midori-view.c:3622
#, c-format
msgid "Inspect page - %s"
msgstr "检查页面-%s"
-#: ../midori/midori-view.c:3923
+#: ../midori/midori-view.c:3969
msgid "Speed Dial"
msgstr "快速拨号"
-#: ../midori/midori-view.c:3924 ../midori/midori-view.c:4020
+#: ../midori/midori-view.c:3970 ../midori/midori-view.c:4066
msgid "Click to add a shortcut"
msgstr "点击添加快捷方式"
-#: ../midori/midori-view.c:3925
+#: ../midori/midori-view.c:3971
msgid "Enter shortcut address"
msgstr "输入快捷方式地址"
-#: ../midori/midori-view.c:3926
+#: ../midori/midori-view.c:3972
msgid "Enter shortcut title"
msgstr "输入快捷方式标题"
-#: ../midori/midori-view.c:3927
+#: ../midori/midori-view.c:3973
msgid "Are you sure you want to delete this shortcut?"
msgstr "您确定要删除此快捷方式吗？"
-#: ../midori/midori-view.c:4089
+#: ../midori/midori-view.c:4135
#, c-format
msgid "No documentation installed"
msgstr "未安装文档"
-#: ../midori/midori-view.c:4165
+#: ../midori/midori-view.c:4211
msgid "Midori doesn't store any personal data:"
msgstr "Midori 没有存储任何个人数据："
-#: ../midori/midori-view.c:4166
+#: ../midori/midori-view.c:4212
msgid "No history or web cookies are being saved."
msgstr "未保存历史或网络隐私信息。"
-#: ../midori/midori-view.c:4167
+#: ../midori/midori-view.c:4213
msgid "Extensions are disabled."
msgstr "已禁用扩展。"
-#: ../midori/midori-view.c:4168
+#: ../midori/midori-view.c:4214
msgid "HTML5 storage, local database and application caches are disabled."
msgstr "已禁用 HTML5 存储、本地数据库和应用程序缓存。"
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4215
msgid "Midori prevents websites from tracking the user:"
msgstr "Midori 阻止网站追踪用户："
-#: ../midori/midori-view.c:4170
+#: ../midori/midori-view.c:4216
msgid "Referrer URLs are stripped down to the hostname."
msgstr "剥离提交信息 URL 为主机名。"
-#: ../midori/midori-view.c:4171
+#: ../midori/midori-view.c:4217
msgid "DNS prefetching is disabled."
msgstr "已禁用 DNS 预取。"
-#: ../midori/midori-view.c:4172
+#: ../midori/midori-view.c:4218
msgid "The language and timezone are not revealed to websites."
msgstr "不向网站透露语言和时区。"
-#: ../midori/midori-view.c:4173
+#: ../midori/midori-view.c:4219
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr "网站未能列出动画和其它 Netscape 插件。"
-#: ../midori/midori-view.c:4222
+#: ../midori/midori-view.c:4289
msgid "Version numbers in brackets show the version used at runtime."
msgstr "在括号中的版本号显示运行时的版本。"
-#: ../midori/midori-view.c:4278
+#: ../midori/midori-view.c:4339
msgid "Page loading delayed"
msgstr "页面载入发生延迟"
-#: ../midori/midori-view.c:4279
+#: ../midori/midori-view.c:4340
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr "由于最近的崩溃或启动首选项，载入页面发生延迟。"
-#: ../midori/midori-view.c:4280
+#: ../midori/midori-view.c:4341
msgid "Load Page"
msgstr "载入页面"
-#: ../midori/midori-view.c:4446
+#: ../midori/midori-view.c:4507
msgid "Blank page"
msgstr "空白页面"
-#: ../midori/midori-view.c:4708
+#: ../midori/midori-view.c:4769
msgid "_Duplicate Tab"
msgstr "复制标签(_D)"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4774
msgid "Show Tab _Label"
msgstr "显示标签标记(_L)"
-#: ../midori/midori-view.c:4713
+#: ../midori/midori-view.c:4774
msgid "Show Tab _Icon Only"
msgstr "仅显示标签图标(_I)"
-#: ../midori/midori-view.c:4719
+#: ../midori/midori-view.c:4780
msgid "Close ot_her Tabs"
msgstr "关闭其它标签(_H)"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5532
+#: ../midori/midori-view.c:5593
msgid "previous"
msgstr "上一个"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5551
+#: ../midori/midori-view.c:5612
msgid "next"
msgstr "下一个"
-#: ../midori/midori-view.c:5564
+#: ../midori/midori-view.c:5625
msgid "Print background images"
msgstr "打印背景图片"
-#: ../midori/midori-view.c:5565
+#: ../midori/midori-view.c:5626
msgid "Whether background images should be printed"
msgstr "是否打印页面的背景图片"
-#: ../midori/midori-view.c:5597
+#: ../midori/midori-view.c:5658
msgid "Features"
msgstr "功能"
@@ -2133,7 +2130,7 @@ msgstr "删除选中的书签"
msgid "Add a new folder"
msgstr "添加新文件夹"
-#: ../panels/midori-bookmarks.c:592 ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:594 ../panels/midori-history.c:635
msgid "Separator "
msgstr "分隔符 "
@@ -2159,6 +2156,11 @@ msgstr[0] "%d 天前"
msgid "A week ago"
msgstr "一周前"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "无法移除历史项目：%s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "您确定要移除所有历史项目吗？"
@@ -2727,8 +2729,8 @@ msgid "Customize Keyboard shortcuts"
msgstr "自定义键盘快捷键"
#: ../extensions/shortcuts.c:283
-msgid "Customize Sh_ortcuts..."
-msgstr "自定义快捷键(_O)..."
+msgid "Customize Sh_ortcuts…"
+msgstr "自定义快捷键(_O)…"
#: ../extensions/shortcuts.c:320
msgid "Shortcuts"
@@ -2805,12 +2807,12 @@ msgid "Displayed Items"
msgstr "已显示的项目"
#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "自定义工具栏(_T)..."
+msgid "Customize _Toolbar…"
+msgstr "自定义工具栏(_T)…"
#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "自定义(_C)..."
+msgid "_Customize…"
+msgstr "自定义(_C)…"
#: ../extensions/toolbar-editor.c:627
msgid "Toolbar Editor"
@@ -2824,6 +2826,9 @@ msgstr "轻松地编辑工具栏布局"
msgid "Cache HTTP communication on disk"
msgstr "在磁盘上缓存 HTTP 通讯"
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "未能保存书签。%s"
+
#~ msgid "The specified configuration folder is invalid."
#~ msgstr "指定的配置文件夹无效。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index de50f798..e6a806df 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the midori package.
# Wei-Lun Chao , 2009.
# Cheng-Chia Tseng , 2010.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: midori master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-21 08:42+0000\n"
-"PO-Revision-Date: 2012-03-21 22:17+0800\n"
+"POT-Creation-Date: 2012-08-09 11:21+0000\n"
+"PO-Revision-Date: 2012-07-17 14:22+0800\n"
"Last-Translator: Cheng-Chia Tseng \n"
"Language-Team: chinese-l10n \n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/midori.desktop.in.h:1
@@ -26,15 +26,28 @@ msgstr "瀏覽網頁"
msgid "Internet;WWW;Explorer"
msgstr "Internet;WWW;Explorer"
-#: ../data/midori.desktop.in.h:3
-#: ../midori/main.c:1989
-#: ../midori/main.c:2009
-#: ../midori/main.c:2023
-#: ../midori/midori-websettings.c:308
+#: ../data/midori.desktop.in.h:3 ../midori/main.c:2025 ../midori/main.c:2049
+#: ../midori/main.c:2063 ../midori/midori-websettings.c:315
msgid "Midori"
msgstr "Midori"
#: ../data/midori.desktop.in.h:4
+msgid "Midori Web Browser"
+msgstr "Midori 網頁瀏覽器"
+
+#: ../data/midori.desktop.in.h:5
+msgid "New Private Browsing Window"
+msgstr "新增私人瀏覽視窗"
+
+#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1479
+msgid "New Tab"
+msgstr "新分頁"
+
+#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1476
+msgid "New Window"
+msgstr "新增視窗"
+
+#: ../data/midori.desktop.in.h:8
msgid "Web Browser"
msgstr "網頁瀏覽器"
@@ -46,346 +59,319 @@ msgstr "Midori 私密瀏覽"
msgid "Open a new private browsing window"
msgstr "開啟新的私密瀏覽視窗"
-#: ../data/midori-private.desktop.in.h:3
-#: ../midori/midori-view.c:4114
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4494
msgid "Private Browsing"
msgstr "私密瀏覽"
-#: ../midori/main.c:96
-#: ../midori/main.c:102
+#: ../midori/main.c:91 ../midori/main.c:97
#, c-format
msgid "The configuration couldn't be loaded: %s\n"
msgstr "無法載入組態：%s\n"
-#: ../midori/main.c:150
+#: ../midori/main.c:145
#, c-format
msgid "Value '%s' is invalid for %s"
msgstr "「%s」值對於 %s 無效"
-#: ../midori/main.c:155
-#: ../midori/main.c:259
+#: ../midori/main.c:150 ../midori/main.c:254
#, c-format
msgid "Invalid configuration value '%s'"
msgstr "無效的組態值「%s」"
-#: ../midori/main.c:364
+#: ../midori/main.c:375
#, c-format
msgid "The search engines couldn't be loaded. %s\n"
msgstr "無法載入搜尋引擎。%s\n"
-#: ../midori/main.c:418
+#: ../midori/main.c:429
#, c-format
msgid "Failed to clear history: %s\n"
msgstr "清空歷史時失敗：%s\n"
-#: ../midori/main.c:438
-#: ../midori/main.c:562
-#: ../extensions/formhistory/formhistory.c:531
+#: ../midori/main.c:451 ../extensions/formhistory/formhistory.c:531
#, c-format
msgid "Failed to open database: %s\n"
msgstr "開啟資料庫時失敗：%s\n"
#. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:505
+#: ../midori/main.c:523
#, c-format
msgid "Failed to remove old history items: %s\n"
msgstr "移除舊的歷史項目時失敗：%s\n"
#: ../midori/main.c:545
-#: ../panels/midori-history.c:232
-#, c-format
-msgid "Failed to remove history item: %s\n"
-msgstr "移除歷史項目時失敗：%s\n"
-
-#: ../midori/main.c:592
-#, c-format
-msgid "The bookmarks couldn't be saved. %s"
-msgstr "無法儲存書籤。%s"
-
-#: ../midori/main.c:614
#, c-format
msgid "The configuration couldn't be saved. %s"
msgstr "無法儲存組態。%s"
-#: ../midori/main.c:649
+#: ../midori/main.c:571
#, c-format
msgid "The search engines couldn't be saved. %s"
msgstr "無法儲存搜尋引擎。%s"
#. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:686
+#: ../midori/main.c:608
#, c-format
msgid "The trash couldn't be saved. %s"
msgstr "無法儲存回收筒。%s"
-#: ../midori/main.c:727
-#: ../panels/midori-extensions.c:91
+#: ../midori/main.c:681 ../panels/midori-extensions.c:90
msgid "Extensions"
msgstr "擴充功能"
-#: ../midori/main.c:741
+#: ../midori/main.c:695
msgid "Privacy"
msgstr "隱私"
-#: ../midori/main.c:753
-msgid "Cookies store login data, saved games, or user profiles for advertisement purposes."
+#: ../midori/main.c:707
+msgid ""
+"Cookies store login data, saved games, or user profiles for advertisement "
+"purposes."
msgstr "訊餅用來儲藏登入資料、儲存的遊戲，或為廣告目的採集使用者個人資料。"
-#: ../midori/main.c:809
+#: ../midori/main.c:763
#, c-format
msgid "The session couldn't be saved. %s"
msgstr "無法儲存執行階段。%s"
-#: ../midori/main.c:1027
-msgid "No root certificate file is available. SSL certificates cannot be verified."
+#: ../midori/main.c:1001
+msgid ""
+"No root certificate file is available. SSL certificates cannot be verified."
msgstr "沒有可用的根憑證。SSL 憑證無法通過驗證。"
-#: ../midori/main.c:1096
-msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem."
-msgstr "Midori 似乎於上次開啟時發生當機。如果這種情況重複出現，請試著以下列選項之一來解決問題。"
+#: ../midori/main.c:1093
+msgid ""
+"Midori seems to have crashed the last time it was opened. If this happened "
+"repeatedly, try one of the following options to solve the problem."
+msgstr ""
+"Midori 似乎於上次開啟時發生當機。如果這種情況重複出現，請試著以下列選項之一來"
+"解決問題。"
-#: ../midori/main.c:1115
+#: ../midori/main.c:1112
msgid "Modify _preferences"
msgstr "修改偏好設定(_P)"
-#: ../midori/main.c:1119
+#: ../midori/main.c:1116
msgid "Disable all _extensions"
msgstr "停用所有擴充功能(_E)"
-#: ../midori/main.c:1132
+#: ../midori/main.c:1129
msgid "Discard old tabs"
msgstr "丟棄舊分頁"
-#: ../midori/main.c:1133
-#: ../midori/midori-websettings.c:217
+#: ../midori/main.c:1130 ../midori/midori-websettings.c:223
msgid "Show last tabs without loading"
msgstr "顯示上次的分頁但不要載入"
-#: ../midori/main.c:1134
-#: ../midori/midori-websettings.c:216
+#: ../midori/main.c:1131 ../midori/midori-websettings.c:222
msgid "Show last open tabs"
msgstr "顯示最近開啟的分頁"
-#: ../midori/main.c:1342
-#: ../midori/main.c:2400
+#: ../midori/main.c:1379 ../midori/main.c:2433
#, c-format
msgid "The session couldn't be loaded: %s\n"
msgstr "無法載入執行階段：%s\n"
-#: ../midori/main.c:1480
+#: ../midori/main.c:1517
#, c-format
msgid "Snapshot saved to: %s\n"
msgstr "快照已儲存至：%s\n"
-#: ../midori/main.c:1892
+#: ../midori/main.c:1933
msgid "Run ADDRESS as a web application"
msgstr "將 ADDRESS 作為網頁應用程式執行"
-#: ../midori/main.c:1892
+#: ../midori/main.c:1933
msgid "ADDRESS"
msgstr "ADDRESS"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1936
msgid "Use FOLDER as configuration folder"
msgstr "使用 FOLDER 作為組態資料夾"
-#: ../midori/main.c:1895
+#: ../midori/main.c:1936
msgid "FOLDER"
msgstr "FOLDER"
-#: ../midori/main.c:1898
+#: ../midori/main.c:1939
msgid "Private browsing, no changes are saved"
msgstr "私密瀏覽，不會儲存任何更動"
-#: ../midori/main.c:1900
+#: ../midori/main.c:1941
msgid "Show a diagnostic dialog"
msgstr "顯示診斷對話窗"
-#: ../midori/main.c:1902
+#: ../midori/main.c:1943
msgid "Run the specified filename as javascript"
msgstr "將指定檔名當做 javascript 來執行"
-#: ../midori/main.c:1904
+#: ../midori/main.c:1945
msgid "Take a snapshot of the specified URI"
msgstr "拍攝指定 URI 的快照"
-#: ../midori/main.c:1906
+#: ../midori/main.c:1947
msgid "Execute the specified command"
msgstr "執行指定的指令"
-#: ../midori/main.c:1908
+#: ../midori/main.c:1949
msgid "List available commands to execute with -e/ --execute"
msgstr "列出可透過 -e/ --execute 執行的指令"
-#: ../midori/main.c:1910
+#: ../midori/main.c:1951
msgid "Display program version"
msgstr "顯示程式版本"
-#: ../midori/main.c:1912
+#: ../midori/main.c:1953
msgid "Addresses"
msgstr "位址"
-#: ../midori/main.c:1914
+#: ../midori/main.c:1955
msgid "Block URIs according to regular expression PATTERN"
msgstr "根據常規表示式 PATTERN 封鎖 URI"
-#: ../midori/main.c:1914
+#: ../midori/main.c:1955
msgid "PATTERN"
msgstr "PATTERN"
#. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1918
+#: ../midori/main.c:1959
msgid "Reset Midori after SECONDS seconds of inactivity"
msgstr "在 SECONDS 秒不活動後重設 Midori"
-#: ../midori/main.c:1918
+#: ../midori/main.c:1959
msgid "SECONDS"
msgstr "SECONDS"
-#: ../midori/main.c:1921
+#: ../midori/main.c:1962
msgid "Redirects console warnings to the specified FILENAME"
msgstr "將主控臺警告重新導向至指定的 FILENAME"
-#: ../midori/main.c:1921
+#: ../midori/main.c:1962
msgid "FILENAME"
msgstr "FILENAME"
-#: ../midori/main.c:1986
-msgid "[Addresses]"
-msgstr "[位址]"
-
-#: ../midori/main.c:1996
-msgid "The specified configuration folder is invalid."
-msgstr "指定的組態資料夾無效。"
-
-#: ../midori/main.c:2024
+#: ../midori/main.c:2064
msgid "Please report comments, suggestions and bugs to:"
msgstr "請回報意見、建議和錯誤給："
-#: ../midori/main.c:2026
+#: ../midori/main.c:2066
msgid "Check for new versions at:"
msgstr "檢查看看新版本於："
#. i18n: Logins and passwords in websites and web forms
-#: ../midori/main.c:2110
+#: ../midori/main.c:2161
msgid "Saved logins and _passwords"
msgstr "儲存登入名稱與密碼(_P)"
-#: ../midori/main.c:2112
+#: ../midori/main.c:2163
msgid "Cookies and Website data"
msgstr "訊餅與網站資料"
#. TODO: Preserve page icons of search engines and merge privacy items
-#: ../midori/main.c:2116
-#: ../midori/midori-websettings.c:985
-#: ../extensions/web-cache.c:462
-#: ../extensions/web-cache.c:471
+#: ../midori/main.c:2167 ../midori/midori-websettings.c:1020
+#: ../extensions/web-cache.c:462 ../extensions/web-cache.c:471
msgid "Web Cache"
msgstr "網頁快取"
-#: ../midori/main.c:2119
+#: ../midori/main.c:2170
msgid "Website icons"
msgstr "網站圖示"
-#: ../midori/main.c:2225
+#: ../midori/main.c:2274
msgid "An unknown error occured"
msgstr "遭遇未知錯誤"
-#: ../midori/main.c:2331
+#: ../midori/main.c:2381
msgid "An instance of Midori is already running but not responding.\n"
msgstr "Midori 的實體已經在執行中但沒有回應。\n"
-#: ../midori/main.c:2367
+#: ../midori/main.c:2415
#, c-format
msgid "Bookmarks couldn't be loaded: %s\n"
msgstr "無法載入書籤：%s\n"
-#: ../midori/main.c:2415
+#: ../midori/main.c:2448
#, c-format
msgid "The trash couldn't be loaded: %s\n"
msgstr "無法載入回收筒：%s\n"
-#: ../midori/main.c:2428
+#: ../midori/main.c:2461
#, c-format
msgid "The history couldn't be loaded: %s\n"
msgstr "無法載入歷史：%s\n"
-#: ../midori/main.c:2444
+#: ../midori/main.c:2476
msgid "The following errors occured:"
msgstr "發生下列錯誤："
-#: ../midori/main.c:2460
+#: ../midori/main.c:2492
msgid "_Ignore"
msgstr "忽略(_I)"
-#: ../midori/midori-app.c:1334
-msgid "_Bookmark"
-msgstr "書籤(_B)"
+#: ../midori/midori-app.c:1155 ../midori/midori-browser.c:545
+#, c-format
+msgid "Unexpected action '%s'."
+msgstr "未預期的動作「%s」。"
-#: ../midori/midori-app.c:1335
-#: ../midori/midori-browser.c:6038
+#: ../midori/midori-app.c:1457 ../midori/midori-browser.c:6435
msgid "_Bookmarks"
msgstr "書籤(_B)"
-#: ../midori/midori-app.c:1336
+#: ../midori/midori-app.c:1458
msgid "Add Boo_kmark"
msgstr "加入書籤(_K)"
-#: ../midori/midori-app.c:1337
-msgid "_Console"
-msgstr "主控臺(_C)"
-
-#: ../midori/midori-app.c:1338
+#: ../midori/midori-app.c:1459
msgid "_Extensions"
msgstr "擴充功能(_E)"
#. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1339
-#: ../midori/midori-browser.c:4566
+#: ../midori/midori-app.c:1460 ../midori/midori-browser.c:4891
msgid "_History"
msgstr "歷史(_H)"
-#: ../midori/midori-app.c:1340
-msgid "_Homepage"
-msgstr "首頁(_H)"
-
-#: ../midori/midori-app.c:1341
+#: ../midori/midori-app.c:1461
msgid "_Userscripts"
msgstr "使用者指令稿(_U)"
-#: ../midori/midori-app.c:1342
+#: ../midori/midori-app.c:1462
+msgid "User_styles"
+msgstr "使用者樣式(_S)"
+
+#: ../midori/midori-app.c:1463
msgid "New _Tab"
msgstr "新分頁(_T)"
-#: ../midori/midori-app.c:1343
+#: ../midori/midori-app.c:1464
msgid "_Transfers"
msgstr "傳輸(_T)"
-#: ../midori/midori-app.c:1344
+#: ../midori/midori-app.c:1465
msgid "Netscape p_lugins"
msgstr "Netscape 外掛程式(_L)"
-#: ../midori/midori-app.c:1345
+#: ../midori/midori-app.c:1466
msgid "_Closed Tabs"
msgstr "關閉的分頁(_C)"
-#: ../midori/midori-app.c:1346
-#: ../midori/midori-browser.c:5194
+#: ../midori/midori-app.c:1467 ../midori/midori-browser.c:5574
msgid "New _Window"
msgstr "開新視窗(_W)"
-#: ../midori/midori-app.c:1347
+#: ../midori/midori-app.c:1468
msgid "New _Folder"
msgstr "新資料夾(_F)"
+#: ../midori/midori-app.c:1497
+msgid "[Addresses]"
+msgstr "[位址]"
+
#: ../midori/midori-array.c:522
msgid "File not found."
msgstr "找不到檔案。"
-#: ../midori/midori-array.c:547
-#: ../midori/midori-array.c:586
-#: ../midori/midori-array.c:609
-#: ../midori/midori-array.c:619
+#: ../midori/midori-array.c:547 ../midori/midori-array.c:586
+#: ../midori/midori-array.c:609 ../midori/midori-array.c:619
msgid "Malformed document."
msgstr "異常文件。"
@@ -397,682 +383,678 @@ msgstr "無法辨識的書籤格式。"
msgid "Writing failed."
msgstr "寫入失敗。"
-#: ../midori/midori-browser.c:331
-#: ../midori/midori-browser.c:5276
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5662
+#: ../midori/midori-browser.c:5671
msgid "Reload the current page"
msgstr "重新載入目前頁面"
-#: ../midori/midori-browser.c:340
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:373 ../midori/midori-browser.c:5668
msgid "Stop loading the current page"
msgstr "停止載入目前頁面"
-#: ../midori/midori-browser.c:476
+#: ../midori/midori-browser.c:530
#, c-format
msgid "Failed to update title: %s\n"
msgstr "更新標題失敗：%s\n"
-#: ../midori/midori-browser.c:489
-#, c-format
-msgid "Unexpected action '%s'."
-msgstr "未預期的動作「%s」。"
-
-#: ../midori/midori-browser.c:579
+#: ../midori/midori-browser.c:625
#, c-format
msgid "%s (Private Browsing)"
msgstr "%s (私密瀏覽)"
-#: ../midori/midori-browser.c:693
-#: ../midori/midori-browser.c:726
-msgid "Toplevel folder"
-msgstr "最上層資料夾"
+#: ../midori/midori-browser.c:735 ../midori/midori-browser.c:777
+#: ../panels/midori-bookmarks.c:114
+msgid "Bookmarks"
+msgstr "書籤"
-#: ../midori/midori-browser.c:784
+#: ../midori/midori-browser.c:837
msgid "New folder"
msgstr "新資料夾"
-#: ../midori/midori-browser.c:784
+#: ../midori/midori-browser.c:837
msgid "Edit folder"
msgstr "編輯資料夾"
-#: ../midori/midori-browser.c:786
+#: ../midori/midori-browser.c:839
msgid "New bookmark"
msgstr "新書籤"
-#: ../midori/midori-browser.c:786
+#: ../midori/midori-browser.c:839
msgid "Edit bookmark"
msgstr "編輯書籤"
-#: ../midori/midori-browser.c:828
-msgid "_Title:"
-msgstr "標題(_T)："
+#: ../midori/midori-browser.c:873
+msgid "Type a name for this bookmark and choose where to keep it."
+msgstr "請為此書籤輸入個名稱，並選擇您想將它保存在哪個地方。"
-#: ../midori/midori-browser.c:848
-#: ../midori/midori-searchaction.c:961
-#: ../extensions/feed-panel/main.c:377
-msgid "_Address:"
-msgstr "位址(_A)："
-
-#: ../midori/midori-browser.c:871
-#: ../midori/midori-browser.c:4303
-msgid "_Folder:"
-msgstr "資料夾(_F)："
-
-#: ../midori/midori-browser.c:887
+#: ../midori/midori-browser.c:934
msgid "Add to _Speed Dial"
msgstr "加入至快速播號(_S)"
-#: ../midori/midori-browser.c:900
+#: ../midori/midori-browser.c:940
msgid "Show in the tool_bar"
msgstr "顯示於工具列內(_B)"
-#: ../midori/midori-browser.c:915
+#: ../midori/midori-browser.c:948
msgid "Run as _web application"
msgstr "以網頁應用程式執行(_W)"
-#: ../midori/midori-browser.c:986
+#: ../midori/midori-browser.c:1019
#, c-format
msgid "The file \"%s\" can't be saved in this folder."
msgstr "標題「%s」無法儲存於此資料夾。"
-#: ../midori/midori-browser.c:988
+#: ../midori/midori-browser.c:1021
#, c-format
msgid "You don't have permission to write in this location."
msgstr "您尚未獲得寫入此位置的許可。"
-#: ../midori/midori-browser.c:995
+#: ../midori/midori-browser.c:1028
#, c-format
msgid "There is not enough free space to download \"%s\"."
msgstr "沒有足夠的空間可以讓您下載「%s」。"
-#: ../midori/midori-browser.c:998
+#: ../midori/midori-browser.c:1031
#, c-format
msgid "The file needs %s but only %s are left."
msgstr "該檔案需要 %s，但僅剩 %s。"
-#: ../midori/midori-browser.c:1036
-#: ../midori/midori-browser.c:4372
+#: ../midori/midori-browser.c:1167 ../midori/midori-browser.c:4695
msgid "Save file as"
msgstr "檔案另存為"
-#: ../midori/midori-browser.c:1330
-msgid "New Window"
-msgstr "新增視窗"
+#: ../midori/midori-browser.c:1173
+msgid "Save associated _resources"
+msgstr "儲存相關資源(_R)"
-#: ../midori/midori-browser.c:1330
+#: ../midori/midori-browser.c:1476
msgid "A new window has been opened"
msgstr "新視窗已經開啟"
-#: ../midori/midori-browser.c:1333
-msgid "New Tab"
-msgstr "新分頁"
-
-#: ../midori/midori-browser.c:1333
+#: ../midori/midori-browser.c:1479
msgid "A new tab has been opened"
msgstr "新分頁已經開啟"
-#: ../midori/midori-browser.c:1368
+#: ../midori/midori-browser.c:1496
msgid "Error opening the image!"
msgstr "開啟影像時發生錯誤！"
-#: ../midori/midori-browser.c:1369
+#: ../midori/midori-browser.c:1497
msgid "Can not open selected image in a default viewer."
msgstr "無法在預設檢視器中開啟所選的影像。"
-#: ../midori/midori-browser.c:1375
+#: ../midori/midori-browser.c:1503
msgid "Error downloading the image!"
msgstr "下載影像流時發生錯誤！"
-#: ../midori/midori-browser.c:1376
+#: ../midori/midori-browser.c:1504
msgid "Can not download selected image."
msgstr "無法下載所選的影像。"
-#: ../midori/midori-browser.c:1479
+#: ../midori/midori-browser.c:1625
msgid "Save file"
msgstr "儲存檔案"
-#: ../midori/midori-browser.c:2346
+#: ../midori/midori-browser.c:2528
msgid "Open file"
msgstr "開啟檔案"
-#: ../midori/midori-browser.c:2478
+#: ../midori/midori-browser.c:2660
msgid ""
-"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n"
-"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically."
+"To use the above URI open a news aggregator. There is usually a menu or "
+"button \"New Subscription\", \"New News Feed\" or similar.\n"
+"Alternatively go to Preferences, Applications in Midori, and select a News "
+"Aggregator. Next time you click the news feed icon, it will be added "
+"automatically."
msgstr ""
-"若要使用上方的 URI，請開啟新聞匯流器。通常都會有個名為「新聞訂閱」、「新聞 Feed」等類似的選單或按鈕。\n"
-"或者前往 Midori 中「偏好設定」的「應用程式」內，並選取一個新聞匯流器。下一次您按下新聞饋流按鈕時，它就會被自動加入。"
+"若要使用上方的 URI，請開啟新聞匯流器。通常都會有個名為「新聞訂閱」、「新聞 "
+"Feed」等類似的選單或按鈕。\n"
+"或者前往 Midori 中「偏好設定」的「應用程式」內，並選取一個新聞匯流器。下一次"
+"您按下新聞饋流按鈕時，它就會被自動加入。"
-#: ../midori/midori-browser.c:2484
-#: ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2666 ../extensions/feed-panel/main.c:365
msgid "New feed"
msgstr "新饋流"
-#: ../midori/midori-browser.c:2527
-#: ../midori/midori-browser.c:5345
-#: ../panels/midori-bookmarks.c:427
+#: ../midori/midori-browser.c:2709 ../midori/midori-browser.c:5734
+#: ../panels/midori-bookmarks.c:527
msgid "Add a new bookmark"
msgstr "加入新的書籤"
-#: ../midori/midori-browser.c:3026
-#: ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3253 ../midori/midori-searchaction.c:487
msgid "Empty"
msgstr "清空"
-#: ../midori/midori-browser.c:3446
+#: ../midori/midori-browser.c:3699 ../midori/midori-browser.c:3700
msgid "Toggle text cursor navigation"
msgstr "切換文字游標導覽"
-#: ../midori/midori-browser.c:3762
-#: ../midori/midori-browser.c:5731
+#: ../midori/midori-browser.c:3702
+msgid ""
+"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in "
+"all websites."
+msgstr "請按下 F7 來切換鍵盤瀏覽功能。啟用時，所有的網站都會出現文字游標。"
+
+#: ../midori/midori-browser.c:3705
+msgid "_Enable Caret Browsing"
+msgstr "啟用鍵盤瀏覽(_E)"
+
+#: ../midori/midori-browser.c:4095 ../midori/midori-browser.c:6128
#, c-format
msgid "Failed to insert new history item: %s\n"
msgstr "無法插入新歷史項目：%s\n"
-#: ../midori/midori-browser.c:4091
-#: ../panels/midori-bookmarks.c:743
-#: ../panels/midori-history.c:801
+#: ../midori/midori-browser.c:4421 ../panels/midori-bookmarks.c:850
+#: ../panels/midori-history.c:806
msgid "Open all in _Tabs"
msgstr "以分頁開啟全部(_T)"
-#: ../midori/midori-browser.c:4098
-#: ../panels/midori-bookmarks.c:749
-#: ../panels/midori-history.c:807
-#: ../extensions/feed-panel/feed-panel.c:528
+#: ../midori/midori-browser.c:4428 ../panels/midori-bookmarks.c:856
+#: ../panels/midori-history.c:812 ../extensions/feed-panel/feed-panel.c:528
msgid "Open in New _Tab"
msgstr "在新分頁中開啟(_T)"
-#: ../midori/midori-browser.c:4101
-#: ../midori/midori-view.c:2645
-#: ../midori/midori-view.c:4643
-#: ../panels/midori-bookmarks.c:751
-#: ../panels/midori-history.c:809
-#: ../extensions/feed-panel/feed-panel.c:530
+#: ../midori/midori-browser.c:4431 ../midori/midori-view.c:2940
+#: ../midori/midori-view.c:5071 ../panels/midori-bookmarks.c:858
+#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:530
msgid "Open in New _Window"
msgstr "在新視窗中開啟(_W)"
-#: ../midori/midori-browser.c:4190
+#: ../midori/midori-browser.c:4520
msgid "Arora"
msgstr "Arora"
-#: ../midori/midori-browser.c:4191
+#: ../midori/midori-browser.c:4521
msgid "Kazehakase"
msgstr "Kazehakase"
-#: ../midori/midori-browser.c:4192
+#: ../midori/midori-browser.c:4522
msgid "Opera"
msgstr "Opera"
-#: ../midori/midori-browser.c:4193
+#: ../midori/midori-browser.c:4523
msgid "Konqueror"
msgstr "征服家"
-#: ../midori/midori-browser.c:4194
+#: ../midori/midori-browser.c:4524
msgid "Epiphany"
msgstr "Epiphany"
-#: ../midori/midori-browser.c:4195
+#: ../midori/midori-browser.c:4525
#, c-format
msgid "Firefox (%s)"
msgstr "Firefox (%s)"
-#: ../midori/midori-browser.c:4216
-msgid "Import bookmarks..."
-msgstr "匯入書籤..."
+#: ../midori/midori-browser.c:4526
+msgid "Midori 0.2.6"
+msgstr "Midori 0.2.6"
-#: ../midori/midori-browser.c:4219
-#: ../midori/midori-browser.c:5350
+#: ../midori/midori-browser.c:4547
+msgid "Import bookmarks…"
+msgstr "匯入書籤…"
+
+#: ../midori/midori-browser.c:4550 ../midori/midori-browser.c:5739
msgid "_Import bookmarks"
msgstr "匯入書籤(_I)"
-#: ../midori/midori-browser.c:4230
+#: ../midori/midori-browser.c:4561
msgid "_Application:"
msgstr "應用程式(_A)："
-#: ../midori/midori-browser.c:4295
+#: ../midori/midori-browser.c:4626
msgid "Import from XBEL or HTML file"
msgstr "從 XBEL 或 HTML 檔案匯入"
-#: ../midori/midori-browser.c:4330
+#: ../midori/midori-browser.c:4654
msgid "Import from a file"
msgstr "從檔案匯入"
-#: ../midori/midori-browser.c:4342
+#: ../midori/midori-browser.c:4666
msgid "Failed to import bookmarks"
msgstr "匯入書籤失敗"
-#: ../midori/midori-browser.c:4377
+#: ../midori/midori-browser.c:4700
msgid "XBEL Bookmarks"
msgstr "XBEL 書籤"
-#: ../midori/midori-browser.c:4382
+#: ../midori/midori-browser.c:4705
msgid "Netscape Bookmarks"
msgstr "Netscape 書籤"
-#: ../midori/midori-browser.c:4396
+#: ../midori/midori-browser.c:4719
msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
msgstr "Midori 僅能匯出為 XBEL (*.xbel) 與 Netscape (*.html)"
-#: ../midori/midori-browser.c:4411
+#: ../midori/midori-browser.c:4734
msgid "Failed to export bookmarks"
msgstr "無法匯出書籤"
#. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4533
+#: ../midori/midori-browser.c:4856
msgid "Clear Private Data"
msgstr "清除隱私資料"
-#: ../midori/midori-browser.c:4537
+#: ../midori/midori-browser.c:4860
msgid "_Clear private data"
msgstr "清除隱私資料(_C)"
-#: ../midori/midori-browser.c:4550
+#: ../midori/midori-browser.c:4875
msgid "Clear the following data:"
msgstr "清除下列資料："
-#: ../midori/midori-browser.c:4560
+#: ../midori/midori-browser.c:4885
msgid "Last open _tabs"
msgstr "上次開啟頁面(_T)"
-#: ../midori/midori-browser.c:4586
+#: ../midori/midori-browser.c:4911
msgid "Clear private data when _quitting Midori"
msgstr "當退出 Midori 時清除隱私資料(_Q)"
-#: ../midori/midori-browser.c:4781
+#: ../midori/midori-browser.c:5126
msgid "A lightweight web browser."
msgstr "輕量網頁瀏覽器。"
-#: ../midori/midori-browser.c:4782
+#: ../midori/midori-browser.c:5127
msgid "See about:version for version info."
msgstr "查看 about:version 來取得版本資訊。"
-#: ../midori/midori-browser.c:4784
-msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version."
-msgstr "這個函式庫為自由軟體；基於 Free Software Foundation 所發布的 GNU Lesser General Public License 授權條款，不管是該條款的 2.1 版，或是 (您可自由選擇) 任意後續版本；您可以將它再次散布出去，與/或修改它。"
+#: ../midori/midori-browser.c:5129
+msgid ""
+"This library is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU Lesser General Public License as published by the "
+"Free Software Foundation; either version 2.1 of the License, or (at your "
+"option) any later version."
+msgstr ""
+"這個函式庫為自由軟體；基於 Free Software Foundation 所發布的 GNU Lesser "
+"General Public License 授權條款，不管是該條款的 2.1 版，或是 (您可自由選擇) "
+"任意後續版本；您可以將它再次散布出去，與/或修改它。"
-#: ../midori/midori-browser.c:4805
+#: ../midori/midori-browser.c:5159
msgid "translator-credits"
msgstr ""
"趙惟倫 , 2009.\n"
"曾政嘉 , 2010."
-#: ../midori/midori-browser.c:5192
+#: ../midori/midori-browser.c:5572
msgid "_File"
msgstr "檔案(_F)"
-#: ../midori/midori-browser.c:5195
+#: ../midori/midori-browser.c:5575
msgid "Open a new window"
msgstr "開啟新視窗"
-#: ../midori/midori-browser.c:5198
+#: ../midori/midori-browser.c:5578
msgid "Open a new tab"
msgstr "開啟新分頁"
-#: ../midori/midori-browser.c:5200
+#: ../midori/midori-browser.c:5580
msgid "New P_rivate Browsing Window"
msgstr "新增私人瀏覽視窗(_R)"
-#: ../midori/midori-browser.c:5204
+#: ../midori/midori-browser.c:5584
msgid "Open a file"
msgstr "開啟檔案"
-#: ../midori/midori-browser.c:5206
-msgid "_Save Page As..."
-msgstr "另存網頁為(_S)..."
+#: ../midori/midori-browser.c:5586
+msgid "_Save Page As…"
+msgstr "另存網頁為(_S)…"
-#: ../midori/midori-browser.c:5207
+#: ../midori/midori-browser.c:5587
msgid "Save to a file"
msgstr "儲存到檔案"
-#: ../midori/midori-browser.c:5209
+#: ../midori/midori-browser.c:5589
msgid "Add to Speed _dial"
msgstr "加入快速播號(_D)"
-#: ../midori/midori-browser.c:5213
+#: ../midori/midori-browser.c:5593
msgid "Add Shortcut to the _desktop"
msgstr "將捷徑加入至桌面(_D)"
-#: ../midori/midori-browser.c:5215
+#: ../midori/midori-browser.c:5595
msgid "Create _Launcher"
msgstr "建立啟動器(_L)"
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5599
msgid "Subscribe to News _feed"
msgstr "訂閱新聞饋流(_F)"
-#: ../midori/midori-browser.c:5225
+#: ../midori/midori-browser.c:5605
msgid "_Close Tab"
msgstr "關閉分頁(_C)"
-#: ../midori/midori-browser.c:5226
+#: ../midori/midori-browser.c:5606
msgid "Close the current tab"
msgstr "關閉目前分頁"
-#: ../midori/midori-browser.c:5228
+#: ../midori/midori-browser.c:5608
msgid "C_lose Window"
msgstr "關閉視窗(_L)"
-#: ../midori/midori-browser.c:5232
+#: ../midori/midori-browser.c:5612
+msgid "_Share"
+msgstr "分享(_S)"
+
+#: ../midori/midori-browser.c:5617
msgid "Print the current page"
msgstr "列印目前頁面"
-#: ../midori/midori-browser.c:5234
+#: ../midori/midori-browser.c:5620
msgid "Close a_ll Windows"
msgstr "關閉所有視窗(_L)"
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5623
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../midori/midori-browser.c:5260
-msgid "_Find..."
+#: ../midori/midori-browser.c:5646
+msgid "_Find…"
msgstr "尋找(_F)…"
-#: ../midori/midori-browser.c:5261
+#: ../midori/midori-browser.c:5647
msgid "Find a word or phrase in the page"
msgstr "在頁面中尋找字詞或片語"
-#: ../midori/midori-browser.c:5263
+#: ../midori/midori-browser.c:5649
msgid "Find _Next"
msgstr "找下一個(_N)"
-#: ../midori/midori-browser.c:5266
+#: ../midori/midori-browser.c:5652
msgid "Find _Previous"
msgstr "找上一個(_P)"
-#: ../midori/midori-browser.c:5270
+#: ../midori/midori-browser.c:5656
msgid "Configure the application preferences"
msgstr "組配應用程式偏好設定"
-#: ../midori/midori-browser.c:5272
+#: ../midori/midori-browser.c:5658
msgid "_View"
msgstr "檢視(_V)"
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5659
msgid "_Toolbars"
msgstr "工具列(_T)"
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5664
msgid "Reload page without caching"
msgstr "重新載入頁面而不使用快取功能"
-#: ../midori/midori-browser.c:5288
+#: ../midori/midori-browser.c:5674
msgid "Increase the zoom level"
msgstr "增加縮放等級"
-#: ../midori/midori-browser.c:5291
+#: ../midori/midori-browser.c:5677
msgid "Decrease the zoom level"
msgstr "減少縮放等級"
-#: ../midori/midori-browser.c:5295
+#: ../midori/midori-browser.c:5681
msgid "_Encoding"
msgstr "編碼(_E)"
-#: ../midori/midori-browser.c:5297
+#: ../midori/midori-browser.c:5683
msgid "View So_urce"
msgstr "檢視源碼(_U)"
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5686
msgid "Ca_ret Browsing"
msgstr "鍵盤瀏覽(_R)"
-#: ../midori/midori-browser.c:5304
+#: ../midori/midori-browser.c:5690
msgid "Toggle fullscreen view"
msgstr "切換全螢幕檢視"
-#: ../midori/midori-browser.c:5306
+#: ../midori/midori-browser.c:5692
msgid "Scroll _Left"
msgstr "向左捲(_L)"
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:5695
msgid "Scroll _Down"
msgstr "向下捲(_D)"
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5698
msgid "Scroll _Up"
msgstr "向上捲(_U)"
-#: ../midori/midori-browser.c:5315
+#: ../midori/midori-browser.c:5701
msgid "Scroll _Right"
msgstr "向右捲(_R)"
-#: ../midori/midori-browser.c:5318
+#: ../midori/midori-browser.c:5704
+msgid "_Readable"
+msgstr "可讀(_E)"
+
+#: ../midori/midori-browser.c:5707
msgid "_Go"
msgstr "前往(_G)"
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5710
msgid "Go back to the previous page"
msgstr "回到上一頁"
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5713
msgid "Go forward to the next page"
msgstr "前往下一頁"
#. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5328
+#: ../midori/midori-browser.c:5717
msgid "Go to the previous sub-page"
msgstr "回到上一子頁"
#. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5332
+#: ../midori/midori-browser.c:5721
msgid "Go to the next sub-page"
msgstr "前往下一子頁"
-#: ../midori/midori-browser.c:5335
+#: ../midori/midori-browser.c:5723
+msgid "_Homepage"
+msgstr "首頁(_H)"
+
+#: ../midori/midori-browser.c:5724
msgid "Go to your homepage"
msgstr "前往您的首頁"
-#: ../midori/midori-browser.c:5337
+#: ../midori/midori-browser.c:5726
msgid "Empty Trash"
msgstr "清空回收筒"
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5729
msgid "Undo _Close Tab"
msgstr "復原關閉分頁(_C)"
-#: ../midori/midori-browser.c:5347
+#: ../midori/midori-browser.c:5736
msgid "Add a new _folder"
msgstr "加入新的資料夾(_F)"
-#: ../midori/midori-browser.c:5353
+#: ../midori/midori-browser.c:5742
msgid "_Export bookmarks"
msgstr "匯出書籤(_E)"
-#: ../midori/midori-browser.c:5356
-#: ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5745 ../midori/midori-searchaction.c:496
msgid "_Manage Search Engines"
msgstr "管理搜尋引擎(_M)"
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5748
msgid "_Clear Private Data"
msgstr "清除隱私資料(_C)"
-#: ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:5751
msgid "_Inspect Page"
msgstr "審閱頁面(_I)"
-#: ../midori/midori-browser.c:5366
+#: ../midori/midori-browser.c:5755
msgid "_Previous Tab"
msgstr "上一個分頁(_P)"
-#: ../midori/midori-browser.c:5369
+#: ../midori/midori-browser.c:5758
msgid "_Next Tab"
msgstr "下一個分頁(_N)"
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5760
msgid "Move Tab _Backward"
msgstr "將分頁往後移(_B)"
-#: ../midori/midori-browser.c:5373
+#: ../midori/midori-browser.c:5762
msgid "_Move Tab Forward"
msgstr "將分頁往前移(_M)"
-#: ../midori/midori-browser.c:5376
+#: ../midori/midori-browser.c:5765
msgid "Focus _Current Tab"
msgstr "專注於目前分頁(_C)"
-#: ../midori/midori-browser.c:5379
+#: ../midori/midori-browser.c:5768
msgid "Focus _Next view"
msgstr "聚焦下個檢視點(_N)"
-#: ../midori/midori-browser.c:5382
+#: ../midori/midori-browser.c:5771
msgid "Only show the Icon of the _Current Tab"
msgstr "只顯示目前分頁的圖示(_C)"
-#: ../midori/midori-browser.c:5385
+#: ../midori/midori-browser.c:5774
msgid "_Duplicate Current Tab"
msgstr "製作目前分頁的複本(_D)"
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5777
msgid "Close Ot_her Tabs"
msgstr "關閉其它分頁(_H)"
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5780
msgid "Open last _session"
msgstr "開啟上次工作階段(_S)"
-#: ../midori/midori-browser.c:5394
+#: ../midori/midori-browser.c:5783
msgid "_Help"
msgstr "求助(_H)"
-#: ../midori/midori-browser.c:5396
+#: ../midori/midori-browser.c:5785
msgid "_Frequent Questions"
msgstr "常見問題(_F)"
-#: ../midori/midori-browser.c:5399
-msgid "_Report a Problem..."
-msgstr "回報問題(_R)..."
+#: ../midori/midori-browser.c:5788
+msgid "_Report a Problem…"
+msgstr "回報問題(_R)…"
-#: ../midori/midori-browser.c:5411
-msgid "_Menubar"
-msgstr "選單列(_M)"
-
-#: ../midori/midori-browser.c:5415
-msgid "_Navigationbar"
-msgstr "導覽列(_N)"
-
-#: ../midori/midori-browser.c:5419
-msgid "Side_panel"
-msgstr "側邊面板(_P)"
-
-#: ../midori/midori-browser.c:5420
-msgid "Sidepanel"
-msgstr "側邊面板"
-
-#: ../midori/midori-browser.c:5423
-msgid "_Bookmarkbar"
-msgstr "書籤列(_B)"
-
-#: ../midori/midori-browser.c:5427
-msgid "_Statusbar"
-msgstr "狀態列(_S)"
-
-#: ../midori/midori-browser.c:5436
-#: ../midori/midori-websettings.c:307
-msgid "_Automatic"
-msgstr "自動(_A)"
-
-#: ../midori/midori-browser.c:5439
-#: ../midori/midori-websettings.c:232
-msgid "Chinese (BIG5)"
-msgstr "中文 (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5443
-msgid "Japanese (SHIFT__JIS)"
-msgstr "日文 (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:5446
-#: ../midori/midori-websettings.c:234
-msgid "Korean (EUC-KR)"
-msgstr "韓文 (EUC-KR)"
-
-#: ../midori/midori-browser.c:5449
-#: ../midori/midori-websettings.c:235
-msgid "Russian (KOI8-R)"
-msgstr "俄文 (KOI8-R)"
-
-#: ../midori/midori-browser.c:5452
-#: ../midori/midori-websettings.c:236
-msgid "Unicode (UTF-8)"
-msgstr "統一碼 (UTF-8)"
-
-#: ../midori/midori-browser.c:5455
-#: ../midori/midori-websettings.c:237
-msgid "Western (ISO-8859-1)"
-msgstr "西歐 (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:5458
-#: ../midori/midori-websettings.c:238
-#: ../midori/midori-websettings.c:313
-#: ../katze/katze-utils.c:635
-msgid "Custom..."
-msgstr "自訂…"
-
-#: ../midori/midori-browser.c:5963
-msgid "_Separator"
-msgstr "分隔符號(_S)"
-
-#: ../midori/midori-browser.c:5970
-msgid "_Location..."
-msgstr "位置(_L)…"
-
-#: ../midori/midori-browser.c:5972
-msgid "Open a particular location"
-msgstr "開啟特定位置"
-
-#: ../midori/midori-browser.c:5994
-msgid "_Web Search..."
-msgstr "網頁搜尋(_W)…"
-
-#: ../midori/midori-browser.c:5996
-msgid "Run a web search"
-msgstr "執行網頁搜尋"
-
-#: ../midori/midori-browser.c:6023
-msgid "Reopen a previously closed tab or window"
-msgstr "重新開啟之前關閉的分頁或視窗"
-
-#: ../midori/midori-browser.c:6040
-msgid "Show the saved bookmarks"
-msgstr "顯示已儲存書籤"
-
-#: ../midori/midori-browser.c:6057
+#: ../midori/midori-browser.c:5793 ../midori/midori-browser.c:6454
msgid "_Tools"
msgstr "工具(_T)"
-#: ../midori/midori-browser.c:6073
+#: ../midori/midori-browser.c:5800
+msgid "_Menubar"
+msgstr "選單列(_M)"
+
+#: ../midori/midori-browser.c:5804
+msgid "_Navigationbar"
+msgstr "導覽列(_N)"
+
+#: ../midori/midori-browser.c:5808
+msgid "Side_panel"
+msgstr "側邊面板(_P)"
+
+#: ../midori/midori-browser.c:5809
+msgid "Sidepanel"
+msgstr "側邊面板"
+
+#: ../midori/midori-browser.c:5812
+msgid "_Bookmarkbar"
+msgstr "書籤列(_B)"
+
+#: ../midori/midori-browser.c:5816
+msgid "_Statusbar"
+msgstr "狀態列(_S)"
+
+#: ../midori/midori-browser.c:5825 ../midori/midori-websettings.c:314
+msgid "_Automatic"
+msgstr "自動(_A)"
+
+#: ../midori/midori-browser.c:5828 ../midori/midori-websettings.c:238
+msgid "Chinese Traditional (BIG5)"
+msgstr "正體中文 (BIG5)"
+
+#: ../midori/midori-browser.c:5831 ../midori/midori-websettings.c:239
+msgid "Chinese Simplified (GB18030)"
+msgstr "簡體中文 (GB18030)"
+
+#. i18n: A double underscore "__" is used to prevent the mnemonic
+#: ../midori/midori-browser.c:5835
+msgid "Japanese (SHIFT__JIS)"
+msgstr "日文 (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:5838 ../midori/midori-websettings.c:241
+msgid "Korean (EUC-KR)"
+msgstr "韓文 (EUC-KR)"
+
+#: ../midori/midori-browser.c:5841 ../midori/midori-websettings.c:242
+msgid "Russian (KOI8-R)"
+msgstr "俄文 (KOI8-R)"
+
+#: ../midori/midori-browser.c:5844 ../midori/midori-websettings.c:243
+msgid "Unicode (UTF-8)"
+msgstr "統一碼 (UTF-8)"
+
+#: ../midori/midori-browser.c:5847 ../midori/midori-websettings.c:244
+msgid "Western (ISO-8859-1)"
+msgstr "西歐 (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:5850
+msgid "Custom…"
+msgstr "自訂…"
+
+#: ../midori/midori-browser.c:6360
+msgid "_Separator"
+msgstr "分隔符號(_S)"
+
+#: ../midori/midori-browser.c:6367
+msgid "_Location…"
+msgstr "位置(_L)…"
+
+#: ../midori/midori-browser.c:6369
+msgid "Open a particular location"
+msgstr "開啟特定位置"
+
+#: ../midori/midori-browser.c:6391
+msgid "_Web Search…"
+msgstr "網頁搜尋(_W)…"
+
+#: ../midori/midori-browser.c:6393
+msgid "Run a web search"
+msgstr "執行網頁搜尋"
+
+#: ../midori/midori-browser.c:6420
+msgid "Reopen a previously closed tab or window"
+msgstr "重新開啟之前關閉的分頁或視窗"
+
+#: ../midori/midori-browser.c:6437
+msgid "Show the saved bookmarks"
+msgstr "顯示已儲存書籤"
+
+#: ../midori/midori-browser.c:6470
msgid "_Window"
msgstr "視窗(_W)"
-#: ../midori/midori-browser.c:6075
+#: ../midori/midori-browser.c:6472
msgid "Show a list of all open tabs"
msgstr "顯示所有開啟分頁的清單"
-#: ../midori/midori-browser.c:6089
+#: ../midori/midori-browser.c:6486
msgid "_Menu"
msgstr "選單(_M)"
-#: ../midori/midori-browser.c:6091
+#: ../midori/midori-browser.c:6488
msgid "Menu"
msgstr "選單"
-#: ../midori/midori-browser.c:6787
+#: ../midori/midori-browser.c:7313
#, c-format
msgid "Unexpected setting '%s'"
msgstr "未預期的設定「%s」"
-#: ../midori/midori-extension.c:310
+#: ../midori/midori-extension.c:329
#, c-format
msgid "The configuration of the extension '%s' couldn't be loaded: %s\n"
msgstr "無法載入「%s」擴充功能的組態：%s\n"
-#: ../midori/midori-extension.c:721
-#: ../midori/midori-extension.c:818
-#: ../midori/midori-extension.c:915
-#: ../midori/midori-extension.c:1027
-#: ../extensions/addons.c:1695
+#: ../midori/midori-extension.c:747 ../midori/midori-extension.c:844
+#: ../midori/midori-extension.c:941 ../midori/midori-extension.c:1053
+#: ../extensions/addons.c:1688
#, c-format
msgid "The configuration of the extension '%s' couldn't be saved: %s\n"
msgstr "無法儲存「%s」擴充功能的組態：%s\n"
@@ -1082,1127 +1064,1203 @@ msgstr "無法儲存「%s」擴充功能的組態：%s\n"
msgid "Search with %s"
msgstr "以 %s 搜尋"
-#: ../midori/midori-locationaction.c:412
-msgid "Search with..."
-msgstr "搜尋採用..."
+#: ../midori/midori-locationaction.c:414
+msgid "Search with…"
+msgstr "搜尋採用…"
-#: ../midori/midori-locationaction.c:537
+#: ../midori/midori-locationaction.c:541
#, c-format
msgid "Failed to select from history\n"
msgstr "從歷史選取時失敗\n"
-#: ../midori/midori-locationaction.c:624
+#: ../midori/midori-locationaction.c:628
#, c-format
msgid "Search for %s"
msgstr "搜尋 %s"
+#: ../midori/midori-locationaction.c:1223
+msgid "Export certificate"
+msgstr "匯出憑證"
+
+#: ../midori/midori-locationaction.c:1255
+msgid "The signing certificate authority is not known."
+msgstr "簽署憑證的授權機構未知。"
+
+#: ../midori/midori-locationaction.c:1257
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "憑證不符合其由來網站的預期身份。"
+
+#: ../midori/midori-locationaction.c:1259
+msgid "The certificate's activation time is still in the future."
+msgstr "憑證的啟用時間仍在未來。"
+
+#: ../midori/midori-locationaction.c:1261
+msgid "The certificate has expired"
+msgstr "憑證已過期"
+
+#: ../midori/midori-locationaction.c:1263
+msgid ""
+"The certificate has been revoked according to the GTlsConnection's "
+"certificate revocation list."
+msgstr "憑證已根據 GTlsConnection 的憑證撤銷清單而被撤銷。"
+
+#: ../midori/midori-locationaction.c:1265
+msgid "The certificate's algorithm is considered insecure."
+msgstr "憑證的演算法被認為是不安全的。"
+
+#: ../midori/midori-locationaction.c:1267
+msgid "Some other error occurred validating the certificate."
+msgstr "驗證平證實遭遇一些其他錯誤。"
+
+#: ../midori/midori-locationaction.c:1314
+msgid "_Export certificate"
+msgstr "匯出憑證(_E)"
+
+#: ../midori/midori-locationaction.c:1329
+msgid "Self-signed"
+msgstr "自我簽署"
+
+#: ../midori/midori-locationaction.c:1363
+msgid "Security details"
+msgstr "安全性細節"
+
#. i18n: Right-click on Location, Open an URL from the clipboard
-#: ../midori/midori-locationaction.c:1400
+#: ../midori/midori-locationaction.c:1646
msgid "Paste and p_roceed"
msgstr "貼上並處理(_R)"
-#: ../midori/midori-locationaction.c:1768
+#: ../midori/midori-locationaction.c:1970
msgid "Not verified"
msgstr "尚未驗證"
-#: ../midori/midori-locationaction.c:1788
+#: ../midori/midori-locationaction.c:1978
msgid "Verified and encrypted connection"
msgstr "通過驗證且經過加密的連線"
-#: ../midori/midori-panel.c:397
-#: ../midori/midori-panel.c:399
-#: ../midori/midori-panel.c:562
-#: ../midori/midori-panel.c:565
+#: ../midori/midori-locationaction.c:1985
+msgid "Open, unencrypted connection"
+msgstr "開放、未加密的連線"
+
+#: ../midori/midori-panel.c:317 ../midori/midori-panel.c:319
+#: ../midori/midori-panel.c:483 ../midori/midori-panel.c:486
msgid "Align sidepanel to the right"
msgstr "側面板靠右對齊"
-#: ../midori/midori-panel.c:409
-#: ../midori/midori-panel.c:410
+#: ../midori/midori-panel.c:329 ../midori/midori-panel.c:330
msgid "Close panel"
msgstr "關閉面板"
-#: ../midori/midori-panel.c:563
-#: ../midori/midori-panel.c:566
+#: ../midori/midori-panel.c:484 ../midori/midori-panel.c:487
msgid "Align sidepanel to the left"
msgstr "側面板靠左對齊"
-#: ../midori/midori-websettings.c:214
+#: ../midori/midori-websettings.c:220
msgid "Show Speed Dial"
msgstr "顯示快速播號"
-#: ../midori/midori-websettings.c:215
+#: ../midori/midori-websettings.c:221
msgid "Show Homepage"
msgstr "顯示首頁"
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:240
msgid "Japanese (SHIFT_JIS)"
msgstr "日文 (SHIFT_JIS)"
-#: ../midori/midori-websettings.c:253
+#: ../midori/midori-websettings.c:245 ../midori/midori-websettings.c:321
+#: ../katze/katze-utils.c:633
+msgid "Custom..."
+msgstr "自訂..."
+
+#: ../midori/midori-websettings.c:260
msgid "New tab"
msgstr "新分頁"
-#: ../midori/midori-websettings.c:254
+#: ../midori/midori-websettings.c:261
msgid "New window"
msgstr "新視窗"
-#: ../midori/midori-websettings.c:255
+#: ../midori/midori-websettings.c:262
msgid "Current tab"
msgstr "目前分頁"
-#: ../midori/midori-websettings.c:270
+#: ../midori/midori-websettings.c:277
msgid "Default"
msgstr "預設"
-#: ../midori/midori-websettings.c:271
+#: ../midori/midori-websettings.c:278
msgid "Icons"
msgstr "圖示"
-#: ../midori/midori-websettings.c:272
+#: ../midori/midori-websettings.c:279
msgid "Small icons"
msgstr "小圖示"
-#: ../midori/midori-websettings.c:273
+#: ../midori/midori-websettings.c:280
msgid "Text"
msgstr "文字"
-#: ../midori/midori-websettings.c:274
+#: ../midori/midori-websettings.c:281
msgid "Icons and text"
msgstr "圖示與文字"
-#: ../midori/midori-websettings.c:275
+#: ../midori/midori-websettings.c:282
msgid "Text beside icons"
msgstr "文字於圖示旁"
-#: ../midori/midori-websettings.c:290
+#: ../midori/midori-websettings.c:297
msgid "Automatic (GNOME or environment)"
msgstr "自動 (GNOME 或環境)"
-#: ../midori/midori-websettings.c:291
+#: ../midori/midori-websettings.c:298
msgid "HTTP proxy server"
msgstr "HTTP 代理伺服器"
-#: ../midori/midori-websettings.c:292
+#: ../midori/midori-websettings.c:299
msgid "No proxy server"
msgstr "無代理伺服器"
-#: ../midori/midori-websettings.c:309
+#: ../midori/midori-websettings.c:316
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../midori/midori-websettings.c:317
msgid "Safari"
msgstr "Safari"
-#: ../midori/midori-websettings.c:310
+#: ../midori/midori-websettings.c:318
msgid "iPhone"
msgstr "iPhone"
-#: ../midori/midori-websettings.c:311
+#: ../midori/midori-websettings.c:319
msgid "Firefox"
msgstr "Firefox"
-#: ../midori/midori-websettings.c:312
+#: ../midori/midori-websettings.c:320
msgid "Internet Explorer"
msgstr "網路探險家"
-#: ../midori/midori-websettings.c:388
+#: ../midori/midori-websettings.c:404
msgid "Remember last window size"
msgstr "記住上次視窗大小"
-#: ../midori/midori-websettings.c:389
+#: ../midori/midori-websettings.c:405
msgid "Whether to save the last window size"
msgstr "是否要儲存上次視窗大小"
-#: ../midori/midori-websettings.c:397
+#: ../midori/midori-websettings.c:413
msgid "Last window width"
msgstr "上次視窗寬度"
-#: ../midori/midori-websettings.c:398
+#: ../midori/midori-websettings.c:414
msgid "The last saved window width"
msgstr "上次儲存的視窗寬度"
-#: ../midori/midori-websettings.c:406
+#: ../midori/midori-websettings.c:422
msgid "Last window height"
msgstr "上次視窗高度"
-#: ../midori/midori-websettings.c:407
+#: ../midori/midori-websettings.c:423
msgid "The last saved window height"
msgstr "上次儲存的視窗高度"
-#: ../midori/midori-websettings.c:432
+#: ../midori/midori-websettings.c:448
msgid "Last panel position"
msgstr "上次面板位置"
-#: ../midori/midori-websettings.c:433
+#: ../midori/midori-websettings.c:449
msgid "The last saved panel position"
msgstr "上次儲存的面板位置"
#. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:442
+#: ../midori/midori-websettings.c:458
msgid "Last panel page"
msgstr "上次面板頁面"
-#: ../midori/midori-websettings.c:443
+#: ../midori/midori-websettings.c:459
msgid "The last saved panel page"
msgstr "上次儲存的面板頁面"
-#: ../midori/midori-websettings.c:451
+#: ../midori/midori-websettings.c:467
msgid "Last Web search"
msgstr "上次網頁搜尋"
-#: ../midori/midori-websettings.c:452
+#: ../midori/midori-websettings.c:468
msgid "The last saved Web search"
msgstr "上次儲存的網頁搜尋"
-#: ../midori/midori-websettings.c:461
+#: ../midori/midori-websettings.c:492
msgid "Show Menubar"
msgstr "顯示選單列"
-#: ../midori/midori-websettings.c:462
+#: ../midori/midori-websettings.c:493
msgid "Whether to show the menubar"
msgstr "是否要顯示選單列"
-#: ../midori/midori-websettings.c:470
+#: ../midori/midori-websettings.c:501
msgid "Show Navigationbar"
msgstr "顯示導覽列"
-#: ../midori/midori-websettings.c:471
+#: ../midori/midori-websettings.c:502
msgid "Whether to show the navigationbar"
msgstr "是否要顯示導覽列"
-#: ../midori/midori-websettings.c:479
+#: ../midori/midori-websettings.c:510
msgid "Show Bookmarkbar"
msgstr "顯示書籤列"
-#: ../midori/midori-websettings.c:480
+#: ../midori/midori-websettings.c:511
msgid "Whether to show the bookmarkbar"
msgstr "是否要顯示書籤列"
-#: ../midori/midori-websettings.c:488
+#: ../midori/midori-websettings.c:519
msgid "Show Panel"
msgstr "顯示面板"
-#: ../midori/midori-websettings.c:489
+#: ../midori/midori-websettings.c:520
msgid "Whether to show the panel"
msgstr "是否要顯示面板"
-#: ../midori/midori-websettings.c:497
+#: ../midori/midori-websettings.c:528
msgid "Show Statusbar"
msgstr "顯示狀態列"
-#: ../midori/midori-websettings.c:498
+#: ../midori/midori-websettings.c:529
msgid "Whether to show the statusbar"
msgstr "是否要顯示狀態列"
-#: ../midori/midori-websettings.c:507
+#: ../midori/midori-websettings.c:538
msgid "Toolbar Style:"
msgstr "工具列樣式："
-#: ../midori/midori-websettings.c:508
+#: ../midori/midori-websettings.c:539
msgid "The style of the toolbar"
msgstr "工具列的樣式"
-#: ../midori/midori-websettings.c:517
+#: ../midori/midori-websettings.c:548
msgid "Toolbar Items"
msgstr "工具列項目"
-#: ../midori/midori-websettings.c:518
+#: ../midori/midori-websettings.c:549
msgid "The items to show on the toolbar"
msgstr "顯示在工具列上的項目"
-#: ../midori/midori-websettings.c:526
+#: ../midori/midori-websettings.c:557
msgid "Compact Sidepanel"
msgstr "壓縮側邊面板"
-#: ../midori/midori-websettings.c:527
+#: ../midori/midori-websettings.c:558
msgid "Whether to make the sidepanel compact"
msgstr "是否要壓縮側邊面板"
-#: ../midori/midori-websettings.c:542
+#: ../midori/midori-websettings.c:573
msgid "Align sidepanel on the right"
msgstr "側邊面板靠右對齊"
-#: ../midori/midori-websettings.c:543
+#: ../midori/midori-websettings.c:574
msgid "Whether to align the sidepanel on the right"
msgstr "是否要將側邊面板靠右對齊"
-#: ../midori/midori-websettings.c:558
+#: ../midori/midori-websettings.c:589
msgid "Open panels in separate windows"
msgstr "在獨立的視窗中開啟面板"
-#: ../midori/midori-websettings.c:559
+#: ../midori/midori-websettings.c:590
msgid "Whether to always open panels in separate windows"
msgstr "是否總是要在獨立的視窗中開啟面板"
-#: ../midori/midori-websettings.c:568
+#: ../midori/midori-websettings.c:599
msgid "When Midori starts:"
msgstr "當 Midori 啟動時："
-#: ../midori/midori-websettings.c:569
+#: ../midori/midori-websettings.c:600
msgid "What to do when Midori starts"
msgstr "Midori 啟動時要載入什麼"
-#: ../midori/midori-websettings.c:578
+#: ../midori/midori-websettings.c:609
msgid "Homepage:"
msgstr "首頁："
-#: ../midori/midori-websettings.c:579
+#: ../midori/midori-websettings.c:610
msgid "The homepage"
msgstr "首頁"
-#: ../midori/midori-websettings.c:594
+#: ../midori/midori-websettings.c:625
msgid "Show crash dialog"
msgstr "顯示當機對話窗"
-#: ../midori/midori-websettings.c:595
+#: ../midori/midori-websettings.c:626
msgid "Show a dialog after Midori crashed"
msgstr "Midori 當機之後顯示對話窗"
-#: ../midori/midori-websettings.c:603
+#: ../midori/midori-websettings.c:634
msgid "Save downloaded files to:"
msgstr "儲存下載檔案至："
-#: ../midori/midori-websettings.c:604
+#: ../midori/midori-websettings.c:635
msgid "The folder downloaded files are saved to"
msgstr "儲存下載檔案的資料夾"
-#: ../midori/midori-websettings.c:612
+#: ../midori/midori-websettings.c:643
msgid "Text Editor"
msgstr "文字編輯器"
-#: ../midori/midori-websettings.c:613
+#: ../midori/midori-websettings.c:644
msgid "An external text editor"
msgstr "外部文字編輯器"
-#: ../midori/midori-websettings.c:628
+#: ../midori/midori-websettings.c:659
msgid "News Aggregator"
msgstr "新聞匯流器"
-#: ../midori/midori-websettings.c:629
+#: ../midori/midori-websettings.c:660
msgid "An external news aggregator"
msgstr "外部新聞匯流程式"
-#: ../midori/midori-websettings.c:637
+#: ../midori/midori-websettings.c:668
msgid "Location entry Search"
msgstr "位置欄搜尋"
-#: ../midori/midori-websettings.c:638
+#: ../midori/midori-websettings.c:669
msgid "The search to perform inside the location entry"
msgstr "於位置列之內進行的搜尋"
-#: ../midori/midori-websettings.c:646
+#: ../midori/midori-websettings.c:677
msgid "Preferred Encoding"
msgstr "偏好的編碼"
-#: ../midori/midori-websettings.c:647
+#: ../midori/midori-websettings.c:678
msgid "The preferred character encoding"
msgstr "偏好的字元編碼"
-#: ../midori/midori-websettings.c:657
+#: ../midori/midori-websettings.c:688
msgid "Always Show Tabbar"
msgstr "固定顯示分頁列"
-#: ../midori/midori-websettings.c:658
+#: ../midori/midori-websettings.c:689
msgid "Always show the tabbar"
msgstr "固定顯示分頁列"
-#: ../midori/midori-websettings.c:672
+#: ../midori/midori-websettings.c:702
msgid "Close Buttons on Tabs"
msgstr "關閉按鈕位於分頁上"
-#: ../midori/midori-websettings.c:673
+#: ../midori/midori-websettings.c:703
msgid "Whether tabs have close buttons"
msgstr "分頁上是否有關閉按鈕"
-#: ../midori/midori-websettings.c:698
+#: ../midori/midori-websettings.c:728
msgid "Open new pages in:"
msgstr "開啟新頁面於："
-#: ../midori/midori-websettings.c:699
+#: ../midori/midori-websettings.c:729
msgid "Where to open new pages"
msgstr "何處開啟新頁面"
-#: ../midori/midori-websettings.c:708
+#: ../midori/midori-websettings.c:738
msgid "Middle click opens Selection"
msgstr "按下滑鼠中鍵開啟所選"
-#: ../midori/midori-websettings.c:709
+#: ../midori/midori-websettings.c:739
msgid "Load an address from the selection via middle click"
msgstr "透過按下滑鼠中鍵以載入所選位址"
-#: ../midori/midori-websettings.c:717
+#: ../midori/midori-websettings.c:747
msgid "Open tabs in the background"
msgstr "在背景中開啟分頁"
-#: ../midori/midori-websettings.c:718
+#: ../midori/midori-websettings.c:748
msgid "Whether to open new tabs in the background"
msgstr "是否要在背景中開啟分頁"
-#: ../midori/midori-websettings.c:726
+#: ../midori/midori-websettings.c:756
msgid "Open Tabs next to Current"
msgstr "於目前之下開啟分頁"
-#: ../midori/midori-websettings.c:727
+#: ../midori/midori-websettings.c:757
msgid "Whether to open new tabs next to the current tab or after the last one"
msgstr "是否要開啟新分頁於目前分頁之下或最後一頁之後"
-#: ../midori/midori-websettings.c:735
+#: ../midori/midori-websettings.c:765
msgid "Open popups in tabs"
msgstr "在分頁中開啟對話框"
-#: ../midori/midori-websettings.c:736
+#: ../midori/midori-websettings.c:766
msgid "Whether to open popup windows in tabs"
msgstr "是否要在分頁中開啟彈出視窗"
-#: ../midori/midori-websettings.c:746
-#: ../extensions/statusbar-features.c:134
+#: ../midori/midori-websettings.c:776 ../extensions/statusbar-features.c:155
msgid "Load images automatically"
msgstr "自動載入圖像"
-#: ../midori/midori-websettings.c:747
+#: ../midori/midori-websettings.c:777
msgid "Load and display images automatically"
msgstr "自動載入與顯示圖像"
-#: ../midori/midori-websettings.c:754
-#: ../extensions/statusbar-features.c:143
+#: ../midori/midori-websettings.c:784 ../extensions/statusbar-features.c:165
msgid "Enable scripts"
msgstr "啟用命令稿"
-#: ../midori/midori-websettings.c:755
+#: ../midori/midori-websettings.c:785
msgid "Enable embedded scripting languages"
msgstr "啟用嵌入式命令稿語言"
-#: ../midori/midori-websettings.c:762
-#: ../extensions/statusbar-features.c:154
+#: ../midori/midori-websettings.c:792 ../extensions/statusbar-features.c:177
msgid "Enable Netscape plugins"
msgstr "啟用 Netscape 外掛程式"
-#: ../midori/midori-websettings.c:763
+#: ../midori/midori-websettings.c:793
msgid "Enable embedded Netscape plugin objects"
msgstr "啟用嵌入式 Netscape 外掛程式物件"
-#: ../midori/midori-websettings.c:778
+#: ../midori/midori-websettings.c:808
msgid "Enable Spell Checking"
msgstr "啟用拼字檢查"
-#: ../midori/midori-websettings.c:779
+#: ../midori/midori-websettings.c:809
msgid "Enable spell checking while typing"
msgstr "啟用打字時的拼字檢查"
-#: ../midori/midori-websettings.c:785
+#: ../midori/midori-websettings.c:815
msgid "Enable HTML5 database support"
msgstr "啟用 HTML 資料庫支援"
-#: ../midori/midori-websettings.c:786
+#: ../midori/midori-websettings.c:816
msgid "Whether to enable HTML5 database support"
msgstr "是否要啟用 HTML5 資料庫支援"
-#: ../midori/midori-websettings.c:792
+#: ../midori/midori-websettings.c:822
msgid "Enable HTML5 local storage support"
msgstr "啟用 HTML 本地端儲存支援"
-#: ../midori/midori-websettings.c:793
+#: ../midori/midori-websettings.c:823
msgid "Whether to enable HTML5 local storage support"
msgstr "是否要啟用 HTML 本地端儲存支援"
-#: ../midori/midori-websettings.c:799
+#: ../midori/midori-websettings.c:829
msgid "Enable offline web application cache"
msgstr "啟用離線網頁應用程式快取"
-#: ../midori/midori-websettings.c:800
+#: ../midori/midori-websettings.c:830
msgid "Whether to enable offline web application cache"
msgstr "是否啟用離線網頁應用程式快取"
-#: ../midori/midori-websettings.c:816
+#: ../midori/midori-websettings.c:851
msgid "Flash window on background tabs"
msgstr "於背景分頁閃動視窗"
-#: ../midori/midori-websettings.c:817
+#: ../midori/midori-websettings.c:852
msgid "Flash the browser window if a new tab was opened in the background"
msgstr "新分頁在背景開啟時是否要閃動瀏覽器視窗"
-#: ../midori/midori-websettings.c:825
+#: ../midori/midori-websettings.c:860
msgid "Enable WebGL support"
msgstr "啟用 WebGL 支援"
-#: ../midori/midori-websettings.c:826
+#: ../midori/midori-websettings.c:861
msgid "Allow websites to use OpenGL rendering"
msgstr "允許網站使用 OpenGL 算圖"
-#: ../midori/midori-websettings.c:852
+#: ../midori/midori-websettings.c:887
msgid "Zoom Text and Images"
msgstr "縮放文字和圖像"
-#: ../midori/midori-websettings.c:853
+#: ../midori/midori-websettings.c:888
msgid "Whether to zoom text and images"
msgstr "是否要縮放文字和圖像"
-#: ../midori/midori-websettings.c:868
+#: ../midori/midori-websettings.c:903
msgid "Find inline while typing"
msgstr "輸入時於列內尋找"
-#: ../midori/midori-websettings.c:869
+#: ../midori/midori-websettings.c:904
msgid "Whether to automatically find inline while typing"
msgstr "是否要在輸入時自動在列內尋找"
-#: ../midori/midori-websettings.c:884
+#: ../midori/midori-websettings.c:919
msgid "Kinetic scrolling"
msgstr "動力捲動"
-#: ../midori/midori-websettings.c:885
+#: ../midori/midori-websettings.c:920
msgid "Whether scrolling should kinetically move according to speed"
msgstr "捲動是否該根據速度動態移動"
-#: ../midori/midori-websettings.c:893
+#: ../midori/midori-websettings.c:928
msgid "Delete old Cookies after:"
msgstr "刪除舊訊餅經過："
-#: ../midori/midori-websettings.c:894
+#: ../midori/midori-websettings.c:929
msgid "The maximum number of days to save cookies for"
msgstr "訊餅的最大儲存日數限制"
-#: ../midori/midori-websettings.c:910
+#: ../midori/midori-websettings.c:945
msgid "Only accept Cookies from sites you visit"
msgstr "只接受來自您造訪網站的訊餅"
-#: ../midori/midori-websettings.c:911
+#: ../midori/midori-websettings.c:946
msgid "Block cookies sent by third-party websites"
msgstr "阻擋第三方網站訊餅"
-#: ../midori/midori-websettings.c:925
+#: ../midori/midori-websettings.c:960
msgid "Delete pages from history after:"
msgstr "從歷史刪除頁面經過："
-#: ../midori/midori-websettings.c:926
+#: ../midori/midori-websettings.c:961
msgid "The maximum number of days to save the history for"
msgstr "造訪歷史的最大儲存日數限制"
-#: ../midori/midori-websettings.c:941
+#: ../midori/midori-websettings.c:976
msgid "Proxy server"
msgstr "代理伺服器"
-#: ../midori/midori-websettings.c:942
+#: ../midori/midori-websettings.c:977
msgid "The type of proxy server to use"
msgstr "要使用的代理伺服器類型"
-#: ../midori/midori-websettings.c:951
+#: ../midori/midori-websettings.c:986
msgid "HTTP Proxy Server"
msgstr "HTTP 代理伺服器"
-#: ../midori/midori-websettings.c:952
+#: ../midori/midori-websettings.c:987
msgid "The proxy server used for HTTP connections"
msgstr "用於 HTTP 連接的代理伺服器"
-#: ../midori/midori-websettings.c:967
+#: ../midori/midori-websettings.c:1002
msgid "Port"
msgstr "連接埠"
-#: ../midori/midori-websettings.c:968
+#: ../midori/midori-websettings.c:1003
msgid "The proxy server port used for HTTP connections"
msgstr "用於 HTTP 連線的代理伺服器"
-#: ../midori/midori-websettings.c:986
+#: ../midori/midori-websettings.c:1021
msgid "The maximum size of cached pages on disk"
msgstr "磁碟上快取網頁的大小上限"
#. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:1003
+#: ../midori/midori-websettings.c:1038
msgid "Identify as"
msgstr "識別為"
-#: ../midori/midori-websettings.c:1004
+#: ../midori/midori-websettings.c:1039
msgid "What to identify as to web pages"
msgstr "要讓網頁識別為什麼"
-#: ../midori/midori-websettings.c:1020
+#: ../midori/midori-websettings.c:1055
msgid "Identification string"
msgstr "識別字串"
-#: ../midori/midori-websettings.c:1021
+#: ../midori/midori-websettings.c:1056
msgid "The application identification string"
msgstr "應用程式識別字串"
-#: ../midori/midori-websettings.c:1037
+#: ../midori/midori-websettings.c:1072
msgid "Preferred languages"
msgstr "偏好的語言"
-#: ../midori/midori-websettings.c:1038
-msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
-msgstr "用於繪製多語網頁時所偏好的語言清單，請用半形逗號 (,) 隔開語言。例：「de」，「ru,nl」或「en-us;q=1.0, fr-fr;q=0.667」"
+#: ../midori/midori-websettings.c:1073
+msgid ""
+"A comma separated list of languages preferred for rendering multilingual "
+"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\""
+msgstr ""
+"用於繪製多語網頁時所偏好的語言清單，請用半形逗號 (,) 隔開語言。例：「de」，"
+"「ru,nl」或「en-us;q=1.0, fr-fr;q=0.667」"
-#: ../midori/midori-websettings.c:1053
+#: ../midori/midori-websettings.c:1088
msgid "Clear private data"
msgstr "清除隱私資料"
-#: ../midori/midori-websettings.c:1054
+#: ../midori/midori-websettings.c:1089
msgid "The private data selected for deletion"
msgstr "選取要刪除的隱私資料"
-#: ../midori/midori-websettings.c:1069
+#: ../midori/midori-websettings.c:1104
msgid "Clear data"
msgstr "清除資料"
-#: ../midori/midori-websettings.c:1070
+#: ../midori/midori-websettings.c:1105
msgid "The data selected for deletion"
msgstr "選取要刪除的資料"
#. i18n: Reworded: Shorten details propagated when going to another page
-#: ../midori/midori-websettings.c:1119
+#: ../midori/midori-websettings.c:1154
msgid "Strip referrer details sent to websites"
-msgstr "截短傳送給網站的參照子細節"
+msgstr "截短傳送給網站的 referrer 細節"
#. i18n: Referer here is not a typo but a technical term
-#: ../midori/midori-websettings.c:1121
+#: ../midori/midori-websettings.c:1156
msgid "Whether the \"Referer\" header should be shortened to the hostname"
msgstr "是否「Referer」標頭要被截短成主機名稱"
-#: ../midori/midori-websettings.c:1135
+#: ../midori/midori-websettings.c:1170
msgid "Always use my font choices"
msgstr "總是使用我的字型選擇"
-#: ../midori/midori-websettings.c:1136
+#: ../midori/midori-websettings.c:1171
msgid "Override fonts picked by websites with user preferences"
msgstr "用使用者的偏好設定凌駕網站挑選的字型"
-#: ../midori/midori-view.c:1353
+#: ../midori/midori-view.c:1002 ../midori/midori-view.c:1140
+msgid "Trust this website"
+msgstr "信任此網站"
+
+#: ../midori/midori-view.c:1138
+msgid "Security unknown"
+msgstr "安全性未知"
+
+#: ../midori/midori-view.c:1436
#, c-format
msgid "%s wants to save an HTML5 database."
msgstr "%s 想要儲存一門 HTML 資料庫。"
-#: ../midori/midori-view.c:1357
-#: ../midori/midori-view.c:1389
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Deny"
msgstr "拒絕(_D)"
-#: ../midori/midori-view.c:1357
-#: ../midori/midori-view.c:1389
+#: ../midori/midori-view.c:1440 ../midori/midori-view.c:1474
msgid "_Allow"
msgstr "允許(_A)"
-#: ../midori/midori-view.c:1385
+#: ../midori/midori-view.c:1469
#, c-format
msgid "%s wants to know your location."
msgstr "%s 想要知道您的所在位置。"
-#: ../midori/midori-view.c:1476
+#: ../midori/midori-view.c:1565
#, c-format
msgid "Error - %s"
msgstr "錯誤 - %s"
-#: ../midori/midori-view.c:1477
+#: ../midori/midori-view.c:1566
#, c-format
msgid "The page '%s' couldn't be loaded."
msgstr "無法載入「%s」頁面。"
-#: ../midori/midori-view.c:1479
+#: ../midori/midori-view.c:1568
msgid "Try again"
msgstr "重試"
-#: ../midori/midori-view.c:1676
-#: ../midori/midori-view.c:2586
+#: ../midori/midori-view.c:1766 ../midori/midori-view.c:2875
#, c-format
msgid "Send a message to %s"
msgstr "傳送訊息至 %s"
-#: ../midori/midori-view.c:2416
-#: ../midori/midori-view.c:2735
+#: ../midori/midori-view.c:2661
+msgid "Add _search engine..."
+msgstr "加入搜尋引擎(_S)..."
+
+#: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031
msgid "Inspect _Element"
msgstr "審閱元素(_E)"
-#: ../midori/midori-view.c:2468
+#: ../midori/midori-view.c:2757
msgid "Open Link in New _Tab"
msgstr "在新分頁中開啟鏈結(_T)"
-#: ../midori/midori-view.c:2472
+#: ../midori/midori-view.c:2761
msgid "Open Link in _Foreground Tab"
msgstr "在前景分頁中開啟鏈結(_F)"
-#: ../midori/midori-view.c:2473
+#: ../midori/midori-view.c:2762
msgid "Open Link in _Background Tab"
msgstr "在背景分頁中開啟鏈結(_B)"
-#: ../midori/midori-view.c:2476
+#: ../midori/midori-view.c:2765
msgid "Open Link in New _Window"
msgstr "在開新視窗中開啟鏈結(_W)"
-#: ../midori/midori-view.c:2479
+#: ../midori/midori-view.c:2768
msgid "Open Link as Web A_pplication"
msgstr "開啟鏈結為網頁應用程式(_P)"
-#: ../midori/midori-view.c:2484
+#: ../midori/midori-view.c:2773
msgid "Copy Link de_stination"
msgstr "複製鏈結目的地(_S)"
-#: ../midori/midori-view.c:2500
+#: ../midori/midori-view.c:2789
msgid "Open _Image in New Tab"
msgstr "於新分頁中開啟影像(_I)"
-#: ../midori/midori-view.c:2503
+#: ../midori/midori-view.c:2792
msgid "Copy Image _Address"
msgstr "複製影像位址(_A)"
-#: ../midori/midori-view.c:2506
+#: ../midori/midori-view.c:2795
msgid "Save I_mage"
msgstr "儲存影像(_M)"
-#: ../midori/midori-view.c:2509
+#: ../midori/midori-view.c:2798
msgid "Open in Image _Viewer"
msgstr "於影像檢視器中開啟(_V)"
-#: ../midori/midori-view.c:2516
+#: ../midori/midori-view.c:2805
msgid "Copy Video _Address"
msgstr "複製視訊位址(_A)"
-#: ../midori/midori-view.c:2519
+#: ../midori/midori-view.c:2808
msgid "Save _Video"
msgstr "儲存視訊(_V)"
-#: ../midori/midori-view.c:2519
+#: ../midori/midori-view.c:2808
msgid "Download _Video"
msgstr "下載視訊(_V)"
-#: ../midori/midori-view.c:2545
+#: ../midori/midori-view.c:2834
msgid "Search _with"
msgstr "以此搜尋(_S)"
-#: ../midori/midori-view.c:2577
+#: ../midori/midori-view.c:2866
msgid "_Search the Web"
msgstr "搜尋網頁(_S)"
-#: ../midori/midori-view.c:2594
+#: ../midori/midori-view.c:2883
msgid "Open Address in New _Tab"
msgstr "在新分頁中開啟位址(_T)"
-#: ../midori/midori-view.c:2883
+#: ../midori/midori-view.c:2936
+msgid "Open _Frame in New Tab"
+msgstr "於新分頁中開啟框架(_F)"
+
+#: ../midori/midori-view.c:3190
msgid "Open or download file"
msgstr "開啟或下載檔案"
-#: ../midori/midori-view.c:2902
-#, c-format
-msgid "File Type: '%s'"
-msgstr "檔案類型：'%s'"
-
-#: ../midori/midori-view.c:2904
-#, c-format
-msgid "File Type: %s ('%s')"
-msgstr "檔案類型：%s ('%s')"
-
-#: ../midori/midori-view.c:2908
+#: ../midori/midori-view.c:3214
#, c-format
msgid "File Name: %s"
msgstr "檔案名稱：%s"
+#: ../midori/midori-view.c:3219
+#, c-format
+msgid "File Type: '%s'"
+msgstr "檔案類型：'%s'"
+
+#: ../midori/midori-view.c:3221
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr "檔案類型：%s ('%s')"
+
+#: ../midori/midori-view.c:3256
+#, c-format
+msgid "Size: %s"
+msgstr "大小：%s"
+
#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:2927
+#: ../midori/midori-view.c:3267
#, c-format
msgid "Open %s"
msgstr "開啟 %s"
-#: ../midori/midori-view.c:3572
+#: ../midori/midori-view.c:3886
#, c-format
msgid "Inspect page - %s"
msgstr "審閱頁面 - %s"
-#: ../midori/midori-view.c:3873
+#: ../midori/midori-view.c:4241
msgid "Speed Dial"
msgstr "快速播號"
-#: ../midori/midori-view.c:3874
-#: ../midori/midori-view.c:3970
+#: ../midori/midori-view.c:4242 ../midori/midori-view.c:4348
msgid "Click to add a shortcut"
msgstr "按一下以加入捷徑"
-#: ../midori/midori-view.c:3875
+#: ../midori/midori-view.c:4243
msgid "Enter shortcut address"
msgstr "輸入捷徑位址"
-#: ../midori/midori-view.c:3876
+#: ../midori/midori-view.c:4244
msgid "Enter shortcut title"
msgstr "輸入捷徑標題"
-#: ../midori/midori-view.c:3877
+#: ../midori/midori-view.c:4245
msgid "Are you sure you want to delete this shortcut?"
msgstr "確定要刪除這個捷徑？"
-#: ../midori/midori-view.c:4039
+#: ../midori/midori-view.c:4418
#, c-format
msgid "No documentation installed"
msgstr "沒有已安裝文件"
-#: ../midori/midori-view.c:4115
+#: ../midori/midori-view.c:4495
msgid "Midori doesn't store any personal data:"
msgstr "Midori 不會儲存任何個人資料；"
-#: ../midori/midori-view.c:4116
+#: ../midori/midori-view.c:4496
msgid "No history or web cookies are being saved."
msgstr "沒有歷史或網頁訊餅將被儲存。"
-#: ../midori/midori-view.c:4117
+#: ../midori/midori-view.c:4497
msgid "Extensions are disabled."
msgstr "擴充套件已停用。"
-#: ../midori/midori-view.c:4118
+#: ../midori/midori-view.c:4498
msgid "HTML5 storage, local database and application caches are disabled."
msgstr "HTML 5 儲存、本地端資料庫、應用程式快取等皆已停用。"
-#: ../midori/midori-view.c:4119
+#: ../midori/midori-view.c:4499
msgid "Midori prevents websites from tracking the user:"
msgstr "Midori 防止下列網站追蹤使用者："
-#: ../midori/midori-view.c:4120
+#: ../midori/midori-view.c:4500
msgid "Referrer URLs are stripped down to the hostname."
-msgstr "參照子 URL 被截短成主機名稱。"
+msgstr "Referrer URL 被截短成主機名稱。"
-#: ../midori/midori-view.c:4121
+#: ../midori/midori-view.c:4501
msgid "DNS prefetching is disabled."
msgstr "DNS 預擷取已停用。"
-#: ../midori/midori-view.c:4122
+#: ../midori/midori-view.c:4502
msgid "The language and timezone are not revealed to websites."
msgstr "語言與時區不顯露給這些網站。"
-#: ../midori/midori-view.c:4123
+#: ../midori/midori-view.c:4503
msgid "Flash and other Netscape plugins cannot be listed by websites."
msgstr "Flash 與其他 Netscape 插件無法被這些網站列出。"
-#: ../midori/midori-view.c:4161
+#: ../midori/midori-view.c:4592
msgid "Version numbers in brackets show the version used at runtime."
msgstr "中括號內的版本編號顯示執行時期使用的版本。"
-#: ../midori/midori-view.c:4217
+#: ../midori/midori-view.c:4642
msgid "Page loading delayed"
msgstr "頁面載入延遲"
-#: ../midori/midori-view.c:4218
+#: ../midori/midori-view.c:4643
msgid "Loading delayed either due to a recent crash or startup preferences."
msgstr "載入延遲，可能是因為最近的當掉或啟動偏好設定之故。"
-#: ../midori/midori-view.c:4219
+#: ../midori/midori-view.c:4644
msgid "Load Page"
msgstr "載入頁面"
-#: ../midori/midori-view.c:4385
+#: ../midori/midori-view.c:4811
msgid "Blank page"
msgstr "空白頁面"
-#: ../midori/midori-view.c:4647
+#: ../midori/midori-view.c:5075
msgid "_Duplicate Tab"
msgstr "製作頁面複本(_E)"
-#: ../midori/midori-view.c:4652
+#: ../midori/midori-view.c:5080
msgid "Show Tab _Label"
msgstr "顯示分頁標籤(_L)"
-#: ../midori/midori-view.c:4652
+#: ../midori/midori-view.c:5080
msgid "Show Tab _Icon Only"
msgstr "只顯示分頁圖示(_I)"
-#: ../midori/midori-view.c:4658
-msgid "Close ot_her Tabs"
-msgstr "關閉其它分頁(_H)"
+#: ../midori/midori-view.c:5087
+msgid "Close Ot_her Tab"
+msgid_plural "Close Ot_her Tabs"
+msgstr[0] "關閉其他分頁(_H)"
#. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5429
+#: ../midori/midori-view.c:5923
msgid "previous"
msgstr "上一頁"
#. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5448
+#: ../midori/midori-view.c:5942
msgid "next"
msgstr "下一頁"
-#: ../midori/midori-view.c:5461
+#: ../midori/midori-view.c:5955
msgid "Print background images"
msgstr "列印背景圖像"
-#: ../midori/midori-view.c:5462
+#: ../midori/midori-view.c:5956
msgid "Whether background images should be printed"
msgstr "是否應該列印背景圖像"
-#: ../midori/midori-view.c:5494
+#: ../midori/midori-view.c:5988
msgid "Features"
msgstr "特色"
-#: ../midori/midori-preferences.c:297
+#: ../midori/midori-preferences.c:298
msgid "Startup"
msgstr "啟動"
-#: ../midori/midori-preferences.c:310
+#: ../midori/midori-preferences.c:311
msgid "Use _current page"
msgstr "使用目前頁面(_C)"
-#: ../midori/midori-preferences.c:314
+#: ../midori/midori-preferences.c:315
msgid "Use current page as homepage"
msgstr "使用目前頁面作為首頁"
#. Page "Appearance"
-#: ../midori/midori-preferences.c:323
+#: ../midori/midori-preferences.c:324
msgid "Fonts"
msgstr "字型"
-#: ../midori/midori-preferences.c:326
+#: ../midori/midori-preferences.c:327
msgid "Proportional Font Family"
msgstr "比例字族"
-#: ../midori/midori-preferences.c:330
+#: ../midori/midori-preferences.c:331
msgid "The default font family used to display text"
msgstr "用來顯示文字的預設字族"
-#: ../midori/midori-preferences.c:333
+#: ../midori/midori-preferences.c:334
msgid "The default font size used to display text"
msgstr "用來顯示文字的預設字型大小"
-#: ../midori/midori-preferences.c:335
+#: ../midori/midori-preferences.c:336
msgid "Fixed-width Font Family"
msgstr "等寬字族"
-#: ../midori/midori-preferences.c:339
+#: ../midori/midori-preferences.c:340
msgid "The font family used to display fixed-width text"
msgstr "用來顯示等寬文字的字族"
-#: ../midori/midori-preferences.c:342
+#: ../midori/midori-preferences.c:343
msgid "The font size used to display fixed-width text"
msgstr "用來顯示等寬文字的字型大小"
-#: ../midori/midori-preferences.c:344
+#: ../midori/midori-preferences.c:345
msgid "Minimum Font Size"
msgstr "最小字型尺寸"
-#: ../midori/midori-preferences.c:348
+#: ../midori/midori-preferences.c:349
msgid "The minimum font size used to display text"
msgstr "用來顯示文字的最小字型尺寸"
#. Page "Behavior"
-#: ../midori/midori-preferences.c:359
+#: ../midori/midori-preferences.c:360
msgid "Behavior"
msgstr "行為"
-#: ../midori/midori-preferences.c:385
+#: ../midori/midori-preferences.c:386
msgid "Allow scripts to open popups"
msgstr "允許指令稿開啟彈出式視窗"
-#: ../midori/midori-preferences.c:386
+#: ../midori/midori-preferences.c:387
msgid "Whether scripts are allowed to open popup windows automatically"
msgstr "是否允許指令稿自動開啟彈出視窗"
#. Page "Interface"
-#: ../midori/midori-preferences.c:416
+#: ../midori/midori-preferences.c:418
msgid "Browsing"
msgstr "瀏覽"
#. Page "Network"
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:458
msgid "Network"
msgstr "網路"
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:465
msgid "Hostname"
msgstr "主機名稱"
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:489
msgid "MB"
msgstr "MB"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Add search engine"
msgstr "加入搜尋引擎"
-#: ../midori/midori-searchaction.c:902
+#: ../midori/midori-searchaction.c:957
msgid "Edit search engine"
msgstr "編輯搜尋引擎"
-#: ../midori/midori-searchaction.c:931
+#: ../midori/midori-searchaction.c:985
msgid "_Name:"
msgstr "名稱(_N)："
-#: ../midori/midori-searchaction.c:947
+#: ../midori/midori-searchaction.c:1000
msgid "_Description:"
msgstr "描述(_D)："
-#: ../midori/midori-searchaction.c:981
-msgid "_Icon:"
-msgstr "圖示(_I)："
+#: ../midori/midori-searchaction.c:1013 ../extensions/feed-panel/main.c:377
+msgid "_Address:"
+msgstr "位址(_A)："
-#: ../midori/midori-searchaction.c:995
+#: ../midori/midori-searchaction.c:1032
msgid "_Token:"
msgstr "符記(_T)："
-#: ../midori/midori-searchaction.c:1295
+#: ../midori/midori-searchaction.c:1330
msgid "Manage Search Engines"
msgstr "管理搜尋引擎"
-#: ../midori/midori-searchaction.c:1395
+#: ../midori/midori-searchaction.c:1432
msgid "Use as _default"
msgstr "作為預設使用(_D)"
-#: ../midori/sokoke.c:412
+#: ../midori/sokoke.c:346
msgid "Open with"
msgstr "以此開啟"
-#: ../midori/sokoke.c:420
+#: ../midori/sokoke.c:354
#, c-format
msgid "Choose an application or command to open \"%s\":"
msgstr "選擇開啟「%s」用的應用程式或指令："
-#: ../midori/sokoke.c:461
-#: ../midori/sokoke.c:471
-#: ../midori/sokoke.c:499
-#: ../midori/sokoke.c:528
-#: ../midori/sokoke.c:542
+#: ../midori/sokoke.c:468 ../midori/sokoke.c:482
msgid "Could not run external program."
msgstr "無法執行外部程式。"
-#: ../midori/sokoke.c:1653
+#: ../midori/sokoke.c:1529
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d 小時"
-#: ../midori/sokoke.c:1654
+#: ../midori/sokoke.c:1530
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d 分鐘"
-#: ../midori/sokoke.c:1655
+#: ../midori/sokoke.c:1531
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d 秒"
#. i18n: Download tooltip (size): 4KB of 43MB
-#: ../midori/sokoke.c:1663
-#: ../panels/midori-transfers.c:267
+#: ../midori/sokoke.c:1539 ../panels/midori-transfers.c:269
#, c-format
msgid "%s of %s"
msgstr "%s / %s"
#. i18n: Unknown number of bytes, used for transfer rate like ?B/s
-#: ../midori/sokoke.c:1672
+#: ../midori/sokoke.c:1548
msgid "?B"
msgstr "?B"
#. i18n: Download tooltip (transfer rate): (130KB/s)
-#: ../midori/sokoke.c:1675
+#: ../midori/sokoke.c:1551
#, c-format
msgid " (%s/s)"
msgstr " (%s/s)"
#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning
-#: ../midori/sokoke.c:1692
+#: ../midori/sokoke.c:1568
#, c-format
msgid " - %s remaining"
msgstr " - 還要 %s"
#. i18n: A panel at the bottom, to search text in pages
-#: ../toolbars/midori-findbar.c:264
+#: ../toolbars/midori-findbar.c:265
msgid "_Inline Find:"
msgstr "列內尋找(_I)："
-#: ../toolbars/midori-findbar.c:290
+#: ../toolbars/midori-findbar.c:287
msgid "Previous"
msgstr "上一個"
-#: ../toolbars/midori-findbar.c:296
+#: ../toolbars/midori-findbar.c:293
msgid "Next"
msgstr "下一個"
-#: ../toolbars/midori-findbar.c:300
+#: ../toolbars/midori-findbar.c:297
msgid "Match Case"
msgstr "符合大小寫"
-#: ../toolbars/midori-findbar.c:309
+#: ../toolbars/midori-findbar.c:306
msgid "Highlight Matches"
msgstr "突顯相符者"
-#: ../toolbars/midori-findbar.c:320
+#: ../toolbars/midori-findbar.c:317
msgid "Close Findbar"
msgstr "關閉尋找列"
-#: ../toolbars/midori-transferbar.c:122
+#: ../toolbars/midori-transferbar.c:124
#, c-format
msgid "The file '%s ' has been downloaded."
msgstr "已下載「%s 」檔案。"
-#: ../toolbars/midori-transferbar.c:125
+#: ../toolbars/midori-transferbar.c:129
msgid "Transfer completed"
msgstr "傳輸完成"
-#: ../toolbars/midori-transferbar.c:193
+#: ../toolbars/midori-transferbar.c:201
msgid "The downloaded file is erroneous."
msgstr "下載的檔案有錯誤。"
-#: ../toolbars/midori-transferbar.c:194
-msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards."
+#: ../toolbars/midori-transferbar.c:202
+msgid ""
+"The checksum provided with the link did not match. This means the file is "
+"probably incomplete or was modified afterwards."
msgstr "連結所提供的檢驗計算碼不相符。這代表檔案可能不完整或之後有被修改過。"
-#: ../toolbars/midori-transferbar.c:331
-#: ../panels/midori-transfers.c:141
+#: ../toolbars/midori-transferbar.c:345 ../panels/midori-transfers.c:142
msgid "Clear All"
msgstr "清除全部"
-#: ../toolbars/midori-transferbar.c:368
-#: ../toolbars/midori-transferbar.c:370
+#: ../toolbars/midori-transferbar.c:382 ../toolbars/midori-transferbar.c:384
msgid "Some files are being downloaded"
msgstr "有些檔案正在下載中"
-#: ../toolbars/midori-transferbar.c:374
+#: ../toolbars/midori-transferbar.c:388
msgid "_Quit Midori"
msgstr "退出 Midori(_Q)"
-#: ../toolbars/midori-transferbar.c:376
+#: ../toolbars/midori-transferbar.c:390
msgid "The transfers will be cancelled if Midori quits."
msgstr "若退出 Midori，將會取消傳輸作業。"
-#: ../panels/midori-bookmarks.c:114
-msgid "Bookmarks"
-msgstr "書籤"
-
-#: ../panels/midori-bookmarks.c:257
+#: ../panels/midori-bookmarks.c:308
#, c-format
msgid "Failed to add bookmark item: %s\n"
msgstr "加入書籤項目失敗：%s\n"
-#: ../panels/midori-bookmarks.c:435
+#: ../panels/midori-bookmarks.c:475
+#, c-format
+msgid "Failed to update bookmark : %s\n"
+msgstr "無法更新書籤：%s\n"
+
+#: ../panels/midori-bookmarks.c:535
msgid "Edit the selected bookmark"
msgstr "編輯所選書籤"
-#: ../panels/midori-bookmarks.c:443
+#: ../panels/midori-bookmarks.c:543
msgid "Delete the selected bookmark"
msgstr "刪除所選書籤"
-#: ../panels/midori-bookmarks.c:458
+#: ../panels/midori-bookmarks.c:558
msgid "Add a new folder"
msgstr "加入新的資料夾"
-#: ../panels/midori-bookmarks.c:592
-#: ../panels/midori-history.c:633
+#: ../panels/midori-bookmarks.c:697 ../panels/midori-history.c:638
msgid "Separator "
msgstr "分隔符號 "
+#. Create the filter entry
+#: ../panels/midori-bookmarks.c:1027
+msgid "Search Bookmarks"
+msgstr "搜尋書籤"
+
#: ../panels/midori-history.c:111
msgid "History"
msgstr "歷史"
-#: ../panels/midori-history.c:158
-#: ../panels/midori-history.c:189
+#: ../panels/midori-history.c:158 ../panels/midori-history.c:189
msgid "Today"
msgstr "今天"
-#: ../panels/midori-history.c:160
-#: ../panels/midori-history.c:191
+#: ../panels/midori-history.c:160 ../panels/midori-history.c:191
msgid "Yesterday"
msgstr "昨天"
-#: ../panels/midori-history.c:162
-#: ../panels/midori-history.c:186
+#: ../panels/midori-history.c:162 ../panels/midori-history.c:186
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d 天前"
-#: ../panels/midori-history.c:165
-#: ../panels/midori-history.c:184
+#: ../panels/midori-history.c:165 ../panels/midori-history.c:184
msgid "A week ago"
msgstr "一週前"
+#: ../panels/midori-history.c:232
+#, c-format
+msgid "Failed to remove history item: %s\n"
+msgstr "移除歷史項目時失敗：%s\n"
+
#: ../panels/midori-history.c:360
msgid "Are you sure you want to remove all history items?"
msgstr "確定要移除所有歷史項目？"
@@ -2219,15 +2277,20 @@ msgstr "刪除所選歷史項目"
msgid "Clear the entire history"
msgstr "清空整個歷史"
-#: ../panels/midori-transfers.c:86
+#. Create the filter entry
+#: ../panels/midori-history.c:997
+msgid "Search History"
+msgstr "搜尋歷史"
+
+#: ../panels/midori-transfers.c:87
msgid "Transfers"
msgstr "傳輸"
-#: ../panels/midori-transfers.c:467
+#: ../panels/midori-transfers.c:470
msgid "Open Destination _Folder"
msgstr "開啟目的地資料夾(_F)"
-#: ../panels/midori-transfers.c:470
+#: ../panels/midori-transfers.c:473
msgid "Copy Link Loc_ation"
msgstr "複製鏈結位置(_A)"
@@ -2269,82 +2332,83 @@ msgstr "無法載入庫存圖示「%s」"
msgid "Animation frames are broken"
msgstr "動畫訊框損壞"
-#: ../katze/katze-utils.c:439
-#: ../katze/katze-utils.c:873
+#: ../katze/katze-utils.c:443 ../katze/katze-utils.c:867
#, c-format
msgid "Property '%s' is invalid for %s"
msgstr "屬性「%s」對於 %s 無效"
-#: ../katze/katze-utils.c:485
-#: ../katze/katze-utils.c:514
+#: ../katze/katze-utils.c:489 ../katze/katze-utils.c:518
#: ../extensions/addons.c:308
msgid "Choose file"
msgstr "選擇檔案"
-#: ../katze/katze-utils.c:500
+#: ../katze/katze-utils.c:504
msgid "Choose folder"
msgstr "選擇資料夾"
-#: ../katze/katze-utils.c:604
+#: ../katze/katze-utils.c:602
msgid "None"
msgstr "無"
-#: ../katze/katze-utils.c:719
+#: ../katze/katze-utils.c:717
msgid "1 hour"
msgstr "一小時"
-#: ../katze/katze-utils.c:720
+#: ../katze/katze-utils.c:718
msgid "1 day"
msgstr "一天"
-#: ../katze/katze-utils.c:721
+#: ../katze/katze-utils.c:719
msgid "1 week"
msgstr "一週"
-#: ../katze/katze-utils.c:722
+#: ../katze/katze-utils.c:720
msgid "1 month"
msgstr "一個月"
-#: ../katze/katze-utils.c:723
+#: ../katze/katze-utils.c:721
msgid "1 year"
msgstr "一年"
-#: ../katze/katze-preferences.c:91
-#: ../extensions/history-list.vala:235
+#: ../katze/katze-preferences.c:98 ../extensions/history-list.vala:235
#, c-format
msgid "Preferences for %s"
msgstr "偏好設定用於 %s"
-#: ../extensions/adblock.c:467
+#: ../extensions/adblock.c:470
msgid "Configure Advertisement filters"
msgstr "設定廣告過濾條件"
-#: ../extensions/adblock.c:498
+#: ../extensions/adblock.c:503
#, c-format
-msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s."
-msgstr "於文字輸入區輸入預先設定好的過濾清單位址，按下「加入」以將它加入清單內。您可以在 %s 找到更多清單。"
+msgid ""
+"Type the address of a preconfigured filter list in the text entry and click "
+"\"Add\" to add it to the list. You can find more lists at %s."
+msgstr ""
+"於文字輸入區輸入預先設定好的過濾清單位址，按下「加入」以將它加入清單內。您可"
+"以在 %s 找到更多清單。"
-#: ../extensions/adblock.c:846
+#: ../extensions/adblock.c:917
msgid "Edit rule"
msgstr "編輯規則"
-#: ../extensions/adblock.c:860
+#: ../extensions/adblock.c:931
msgid "_Rule:"
msgstr "規則(_R)："
-#: ../extensions/adblock.c:914
+#: ../extensions/adblock.c:985
msgid "Bl_ock image"
msgstr "阻擋影像(_O)"
-#: ../extensions/adblock.c:919
+#: ../extensions/adblock.c:990
msgid "Bl_ock link"
msgstr "阻擋鏈結(_O)"
-#: ../extensions/adblock.c:1620
+#: ../extensions/adblock.c:1689
msgid "Advertisement blocker"
msgstr "廣告阻擋器"
-#: ../extensions/adblock.c:1621
+#: ../extensions/adblock.c:1690
msgid "Block advertisements according to a filter list"
msgstr "根據過濾清單阻擋廣告"
@@ -2370,69 +2434,63 @@ msgstr "安裝使用者樣式(_I)"
msgid "Don't install"
msgstr "不要安裝"
-#: ../extensions/addons.c:319
-#: ../extensions/addons.c:681
+#: ../extensions/addons.c:319 ../extensions/addons.c:677
msgid "Userscripts"
msgstr "使用者指令稿"
-#: ../extensions/addons.c:324
-#: ../extensions/addons.c:683
+#: ../extensions/addons.c:324 ../extensions/addons.c:679
msgid "Userstyles"
msgstr "使用者樣式"
-#: ../extensions/addons.c:380
-#: ../extensions/addons.c:459
+#: ../extensions/addons.c:370 ../extensions/addons.c:449
#: ../extensions/feed-panel/main.c:129
msgid "Error"
msgstr "錯誤"
-#: ../extensions/addons.c:421
+#: ../extensions/addons.c:411
#, c-format
msgid "Do you want to delete '%s'?"
msgstr "您想要刪除「%s」嗎？"
-#: ../extensions/addons.c:427
+#: ../extensions/addons.c:417
msgid "Delete user script"
msgstr "刪除使用者指令稿"
-#: ../extensions/addons.c:428
+#: ../extensions/addons.c:418
msgid "Delete user style"
msgstr "刪除使用者樣式"
-#: ../extensions/addons.c:431
+#: ../extensions/addons.c:421
#, c-format
msgid "The file %s will be permanently deleted."
msgstr "將永遠刪除 %s 檔案。"
-#: ../extensions/addons.c:570
-#: ../extensions/addons.c:647
+#: ../extensions/addons.c:566 ../extensions/addons.c:643
msgid "Open in Text Editor"
msgstr "以文字編輯器開啟"
-#: ../extensions/addons.c:572
-#: ../extensions/addons.c:656
+#: ../extensions/addons.c:568 ../extensions/addons.c:652
msgid "Open Target Folder"
msgstr "開啟目標資料夾"
-#: ../extensions/addons.c:638
+#: ../extensions/addons.c:634
msgid "Add new addon"
msgstr "加入新的附加元件"
-#: ../extensions/addons.c:664
+#: ../extensions/addons.c:660
msgid "Remove selected addon"
msgstr "移除所選的附加元件"
-#: ../extensions/addons.c:1696
-#: ../extensions/addons.c:1914
+#: ../extensions/addons.c:1689 ../extensions/addons.c:1907
msgid "User addons"
msgstr "使用者附加元件"
-#: ../extensions/addons.c:1826
+#: ../extensions/addons.c:1819
#, c-format
msgid "Can't monitor folder '%s': %s"
msgstr "無法監控「%s」資料夾：%s"
-#: ../extensions/addons.c:1915
+#: ../extensions/addons.c:1908
msgid "Support for userscripts and userstyles"
msgstr "支援使用者指令稿與使用者樣式"
@@ -2454,8 +2512,11 @@ msgid "Delete All"
msgstr "刪除全部"
#: ../extensions/cookie-manager/cookie-manager-page.c:105
-msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter."
-msgstr "刪除所有顯示的訊餅。若有設定過濾條件，只有那些符合過濾條件的訊餅會被刪除。"
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+"刪除所有顯示的訊餅。若有設定過濾條件，只有那些符合過濾條件的訊餅會被刪除。"
#: ../extensions/cookie-manager/cookie-manager-page.c:120
msgid "Expand All"
@@ -2515,25 +2576,21 @@ msgstr ""
"網域 ：%s\n"
"訊餅 ：%d"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1024
+#: ../extensions/cookie-manager/cookie-manager-page.c:1017
msgid "Name"
msgstr "名稱"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1077
+#: ../extensions/cookie-manager/cookie-manager-page.c:1069
msgid "_Expand All"
msgstr "全部擴展(_E)"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1085
+#: ../extensions/cookie-manager/cookie-manager-page.c:1077
msgid "_Collapse All"
msgstr "全部折疊(_C)"
-#: ../extensions/cookie-manager/cookie-manager-page.c:1139
-msgid "Filter:"
-msgstr "過濾條件："
-
-#: ../extensions/cookie-manager/cookie-manager-page.c:1144
-msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter"
-msgstr "輸入過濾條件字串，只會顯示名稱或網域符合輸入的過濾字串的訊餅"
+#: ../extensions/cookie-manager/cookie-manager-page.c:1129
+msgid "Search Cookies by Name or Domain"
+msgstr "按名稱或網域搜尋 Cookies"
#: ../extensions/cookie-manager/main.c:36
msgid "List, view and delete cookies"
@@ -2789,36 +2846,35 @@ msgstr "狀態列時鐘"
msgid "Display date and time in the statusbar"
msgstr "於狀態列顯示日期與時間"
-#: ../extensions/statusbar-features.c:131
+#: ../extensions/statusbar-features.c:152
msgid "Images"
msgstr "影像"
-#: ../extensions/statusbar-features.c:140
+#: ../extensions/statusbar-features.c:162
msgid "Scripts"
msgstr "指令稿"
-#: ../extensions/statusbar-features.c:151
+#: ../extensions/statusbar-features.c:174
msgid "Netscape plugins"
msgstr "Netscapte 外掛程式"
-#: ../extensions/statusbar-features.c:199
+#: ../extensions/statusbar-features.c:259
msgid "Statusbar Features"
msgstr "狀態列特色"
-#: ../extensions/statusbar-features.c:200
+#: ../extensions/statusbar-features.c:260
msgid "Easily toggle features on web pages on and off"
msgstr "輕鬆開啟或關閉網頁上的功能"
-#: ../extensions/tab-panel.c:593
-#: ../extensions/tab-panel.c:680
+#: ../extensions/tab-panel.c:589 ../extensions/tab-panel.c:676
msgid "Tab Panel"
msgstr "分頁面板"
-#: ../extensions/tab-panel.c:663
+#: ../extensions/tab-panel.c:659
msgid "T_ab Panel"
msgstr "分頁面板(_A)"
-#: ../extensions/tab-panel.c:681
+#: ../extensions/tab-panel.c:677
msgid "Show tabs in a vertical panel"
msgstr "以垂直面板顯示分頁"
@@ -2830,35 +2886,33 @@ msgstr "分頁預設只使用圖示表示"
msgid "New tabs have no label by default"
msgstr "新分頁預設情況下沒有分頁標籤"
-#: ../extensions/toolbar-editor.c:393
+#: ../extensions/toolbar-editor.c:395
msgid "Customize Toolbar"
msgstr "自訂工具列"
-#: ../extensions/toolbar-editor.c:409
-msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop."
+#: ../extensions/toolbar-editor.c:411
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reordered by drag "
+"and drop."
msgstr "選取工具列上要顯示的項目。這些項目可以利用拖曳方式來重新調整位置。"
-#: ../extensions/toolbar-editor.c:425
+#: ../extensions/toolbar-editor.c:427
msgid "Available Items"
msgstr "可用項目"
-#: ../extensions/toolbar-editor.c:446
+#: ../extensions/toolbar-editor.c:448
msgid "Displayed Items"
msgstr "顯示的項目"
-#: ../extensions/toolbar-editor.c:581
-msgid "Customize _Toolbar..."
-msgstr "自訂工具列(_T)…"
+#: ../extensions/toolbar-editor.c:588
+msgid "_Customize Toolbar…"
+msgstr "自訂工具列(_C)…"
-#: ../extensions/toolbar-editor.c:597
-msgid "_Customize..."
-msgstr "自訂(_C)…"
-
-#: ../extensions/toolbar-editor.c:627
+#: ../extensions/toolbar-editor.c:617
msgid "Toolbar Editor"
msgstr "工具列編輯器"
-#: ../extensions/toolbar-editor.c:628
+#: ../extensions/toolbar-editor.c:618
msgid "Easily edit the toolbar layout"
msgstr "輕鬆編輯工具列配置"
@@ -2866,6 +2920,47 @@ msgstr "輕鬆編輯工具列配置"
msgid "Cache HTTP communication on disk"
msgstr "對 HTTP 通訊製作一份硬碟快取"
+#~ msgid "Load page"
+#~ msgstr "載入頁面"
+
+#~ msgid "Close ot_her Tabs"
+#~ msgstr "關閉其它分頁(_H)"
+
+#~ msgid "_Icon:"
+#~ msgstr "圖示(_I)："
+
+#~ msgid "Filter:"
+#~ msgstr "過濾條件："
+
+#~ msgid ""
+#~ "Enter a filter string to show only cookies whose name or domain field "
+#~ "match the entered filter"
+#~ msgstr "輸入過濾條件字串，只會顯示名稱或網域符合輸入的過濾字串的訊餅"
+
+#~ msgid "_Bookmark"
+#~ msgstr "書籤(_B)"
+
+#~ msgid "_Console"
+#~ msgstr "主控臺(_C)"
+
+#~ msgid "The bookmarks couldn't be saved. %s"
+#~ msgstr "無法儲存書籤。%s"
+
+#~ msgid "The specified configuration folder is invalid."
+#~ msgstr "指定的組態資料夾無效。"
+
+#~ msgid "Toplevel folder"
+#~ msgstr "最上層資料夾"
+
+#~ msgid "_Title:"
+#~ msgstr "標題(_T)："
+
+#~ msgid "_Folder:"
+#~ msgstr "資料夾(_F)："
+
+#~ msgid "_Customize…"
+#~ msgstr "自訂(_C)…"
+
#~ msgid "Cookies"
#~ msgstr "訊餅"
@@ -2965,14 +3060,14 @@ msgstr "對 HTTP 通訊製作一份硬碟快取"
#~ msgid "Add a new bookmark folder"
#~ msgstr "加入新的書籤資料夾"
-#~ msgid "Add, edit and remove search engines..."
+#~ msgid "Add, edit and remove search engines…"
#~ msgstr "加入、編輯、移除搜尋引擎…"
-#~ msgid "Clear private data..."
-#~ msgstr "清除隱私資料..."
+#~ msgid "Clear private data…"
+#~ msgstr "清除隱私資料…"
-#~ msgid "Inspect page details and access developer tools..."
-#~ msgstr "審閱頁面詳細資料並存取開發者工具..."
+#~ msgid "Inspect page details and access developer tools…"
+#~ msgstr "審閱頁面詳細資料並存取開發者工具…"
#~ msgid "Switch to the previous tab"
#~ msgstr "切換至上一個分頁"
@@ -3085,11 +3180,9 @@ msgstr "對 HTTP 通訊製作一份硬碟快取"
#~ msgid "Whether to show the transferbar"
#~ msgstr "是否要顯示傳輸列"
-#, fuzzy
#~ msgid "Search engines in location completion"
#~ msgstr "在位置欄中顯示進度"
-#, fuzzy
#~ msgid "Whether to show search engines in the location completion"
#~ msgstr "是否要在位置欄中顯示載入進度"
@@ -3189,8 +3282,8 @@ msgstr "對 HTTP 通訊製作一份硬碟快取"
#~ msgid "Delete old cookies after 1 year"
#~ msgstr "刪除大於 1 年的舊訊餅"
-#~ msgid "Configure _Advertisement filters..."
-#~ msgstr "設定廣告過濾條件(_A)..."
+#~ msgid "Configure _Advertisement filters…"
+#~ msgstr "設定廣告過濾條件(_A)…"
#~ msgid "Open target folder for selected addon"
#~ msgstr "為所選的附加元件開啟目標資料夾"
@@ -3337,9 +3430,6 @@ msgstr "對 HTTP 通訊製作一份硬碟快取"
#~ msgid "Warning: You are using a superuser account!"
#~ msgstr "警告：您正在使用超級使用者帳號！"
-#~ msgid "User_styles"
-#~ msgstr "使用者樣式(_S)"
-
#~ msgid "%s has no property '%s'"
#~ msgstr "%s 沒有任何「%s」屬性"
@@ -3349,9 +3439,6 @@ msgstr "對 HTTP 通訊製作一份硬碟快取"
#~ msgid "%s.%s cannot be accessed"
#~ msgstr "%s.%s 無法被存取"
-#~ msgid "_Enable"
-#~ msgstr "啟用(_E)"
-
#~ msgid "_Disable"
#~ msgstr "停用(_D)"
diff --git a/tests/bookmarks.c b/tests/bookmarks.c
index 9a135936..eaf11dab 100644
--- a/tests/bookmarks.c
+++ b/tests/bookmarks.c
@@ -40,7 +40,7 @@ fixture_setup (BookmarksFixture* fixture,
gchar *errmsg = NULL;
fixture->db_bookmarks = katze_array_new (KATZE_TYPE_ARRAY);
- db = midori_bookmarks_initialize (fixture->db_bookmarks, params->dbfile, &errmsg);
+ db = NULL; /* FIXME midori_bookmarks_initialize (fixture->db_bookmarks, params->dbfile, &errmsg); */
if (db == NULL)
g_error ("Bookmarks couldn't be loaded: %s\n", errmsg);
g_assert (errmsg == NULL);
@@ -195,9 +195,8 @@ main (int argc,
//TestParameters default_params = {":memory:", TRUE, NULL, NULL};
TestParameters default_params = {":memory:", FALSE, NULL, NULL};
- midori_app_setup (argv);
g_test_init (&argc, &argv, NULL);
- gtk_init_check (&argc, &argv);
+ midori_app_setup (&argc, &argv, NULL, NULL);
g_test_add ("/bookmarks/simple test",
BookmarksFixture, &default_params,
diff --git a/tests/browser.c b/tests/browser.c
index c6fda193..fa949124 100644
--- a/tests/browser.c
+++ b/tests/browser.c
@@ -15,32 +15,16 @@ static void
browser_create (void)
{
MidoriApp* app;
+ MidoriSpeedDial* dial;
MidoriBrowser* browser;
- GtkActionGroup* action_group;
- GList* actions;
app = midori_app_new ();
+ dial = midori_speed_dial_new ("/", NULL);
+ g_object_set (app, "speed-dial", dial, NULL);
browser = midori_app_create_browser (app);
gtk_widget_destroy (GTK_WIDGET (browser));
-
- app = midori_app_new ();
- browser = midori_app_create_browser (app);
- action_group = midori_browser_get_action_group (browser);
- actions = gtk_action_group_list_actions (action_group);
- while (actions)
- {
- GtkAction* action = actions->data;
- if (g_strcmp0 (gtk_action_get_name (action), "WindowClose"))
- if (g_strcmp0 (gtk_action_get_name (action), "EncodingCustom"))
- if (g_strcmp0 (gtk_action_get_name (action), "AddSpeedDial"))
- if (g_strcmp0 (gtk_action_get_name (action), "PrivateBrowsing"))
- if (g_strcmp0 (gtk_action_get_name (action), "AddDesktopShortcut"))
- gtk_action_activate (action);
- actions = g_list_next (actions);
- }
- g_list_free (actions);
- gtk_widget_destroy (GTK_WIDGET (browser));
g_object_unref (app);
+ g_object_unref (dial);
}
static void
@@ -130,11 +114,12 @@ int
main (int argc,
char** argv)
{
- midori_app_setup (argv);
+ g_test_init (&argc, &argv, NULL);
+ midori_app_setup (&argc, &argv, NULL, NULL);
+ midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, NULL);
+
g_object_set_data (G_OBJECT (webkit_get_default_session ()),
"midori-session-initialized", (void*)1);
- g_test_init (&argc, &argv, NULL);
- gtk_init_check (&argc, &argv);
g_test_add_func ("/browser/create", browser_create);
g_test_add_func ("/browser/tooltips", browser_tooltips);
diff --git a/tests/download.vala b/tests/download.vala
new file mode 100644
index 00000000..c5e0f98e
--- /dev/null
+++ b/tests/download.vala
@@ -0,0 +1,58 @@
+/*
+ Copyright (C) 2012 Christian Dywan
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+struct TestCase {
+ public string data;
+ public string? expected;
+}
+
+const TestCase[] filenames = {
+ { "/tmp/midori-user/tumblr123.jpg", ".jpg" },
+ { "https://green.cat/8019B6/a.b/500.jpg", ".jpg" },
+ { "http://example.com/file.png", ".png" }
+};
+
+static void download_extension () {
+ foreach (var filename in filenames) {
+ string? result = Midori.Download.get_extension_for_uri (filename.data);
+ Katze.assert_str_equal (filename.data, result, filename.expected);
+ }
+}
+
+static void download_unique () {
+ string folder = DirUtils.make_tmp ("cacheXXXXXX");
+ string filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, "foo.png");
+ string unique = Midori.Download.get_unique_filename (filename);
+ Katze.assert_str_equal (folder, unique, filename);
+ FileUtils.set_contents (filename, "12345");
+ unique = Midori.Download.get_unique_filename (filename);
+ filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, "foo-0.png");
+ Katze.assert_str_equal (folder, unique, filename);
+ FileUtils.set_contents (filename, "12345");
+ unique = Midori.Download.get_unique_filename (filename);
+ filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, "foo-1.png");
+ Katze.assert_str_equal (folder, unique, filename);
+
+ filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, "foo-9.png");
+ FileUtils.set_contents (filename, "12345");
+ unique = Midori.Download.get_unique_filename (filename);
+ filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, "foo-10.png");
+ Katze.assert_str_equal (folder, unique, filename);
+ DirUtils.remove (folder);
+}
+
+void main (string[] args) {
+ Test.init (ref args);
+ Test.add_func ("/download/extension", download_extension);
+ Test.add_func ("/download/unique", download_unique);
+ Test.run ();
+}
+
diff --git a/tests/extensions.c b/tests/extensions.c
index a5baa1fa..b3d5330f 100644
--- a/tests/extensions.c
+++ b/tests/extensions.c
@@ -245,9 +245,9 @@ int
main (int argc,
char** argv)
{
- midori_app_setup (argv);
g_test_init (&argc, &argv, NULL);
- gtk_init_check (&argc, &argv);
+ midori_app_setup (&argc, &argv, NULL, NULL);
+ midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, NULL);
soup_session_add_feature_by_type (webkit_get_default_session (),
SOUP_TYPE_COOKIE_JAR);
diff --git a/tests/hsts.vala b/tests/hsts.vala
new file mode 100644
index 00000000..a71ec9da
--- /dev/null
+++ b/tests/hsts.vala
@@ -0,0 +1,31 @@
+/*
+ Copyright (C) 2012 Christian Dywan
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+static void http_hsts () {
+ Midori.HSTS.Directive d;
+ d = new Midori.HSTS.Directive.from_header ("max-age=31536000");
+ assert (d.is_valid () && !d.sub_domains);
+ d = new Midori.HSTS.Directive.from_header ("max-age=15768000 ; includeSubDomains");
+ assert (d.is_valid () && d.sub_domains);
+
+ /* Invalid */
+ d = new Midori.HSTS.Directive.from_header ("");
+ assert (!d.is_valid () && !d.sub_domains);
+ d = new Midori.HSTS.Directive.from_header ("includeSubDomains");
+ assert (!d.is_valid () && d.sub_domains);
+}
+
+void main (string[] args) {
+ Test.init (ref args);
+ Test.add_func ("/http/hsts", http_hsts);
+ Test.run ();
+}
+
diff --git a/tests/magic-uri.c b/tests/magic-uri.c
index f06a8b32..be9a1999 100644
--- a/tests/magic-uri.c
+++ b/tests/magic-uri.c
@@ -38,6 +38,16 @@ test_input (const gchar* input,
"token", "se", NULL);
katze_array_add_item (search_engines, item);
g_object_unref (item);
+ item = g_object_new (KATZE_TYPE_ITEM,
+ "uri", "ddg.gg",
+ "token", "dd", NULL);
+ katze_array_add_item (search_engines, item);
+ g_object_unref (item);
+ item = g_object_new (KATZE_TYPE_ITEM,
+ "uri", "google.com",
+ "token", "d", NULL);
+ katze_array_add_item (search_engines, item);
+ g_object_unref (item);
}
uri = sokoke_magic_uri (input);
@@ -160,6 +170,8 @@ static void
magic_uri_search (void)
{
test_input ("sm midori", SM "midori");
+ test_input ("d midori browser", "google.com" "midori%20browser");
+ test_input ("dd midori browser", "ddg.gg" "midori%20browser");
test_input ("sm cats dogs", SM "cats%20dogs");
test_input ("se cats dogs", SM "cats%20dogs");
test_input ("dict midori", NULL);
@@ -200,7 +212,6 @@ static void
magic_uri_pseudo (void)
{
test_input ("javascript:alert(1)", "javascript:alert(1)");
- test_input ("mailto:christian@twotoasts.de", "mailto:christian@twotoasts.de");
test_input ("data:text/html;charset=utf-8,Test Test",
"data:text/html;charset=utf-8,Test Test");
}
@@ -237,6 +248,22 @@ magic_uri_fingerprint (void)
g_assert_cmpint (midori_uri_get_fingerprint (uri, NULL, NULL), ==, G_MAXINT);
uri = "http://midori-0.4.1.tar.bz2#abcdefg";
g_assert_cmpint (midori_uri_get_fingerprint (uri, NULL, NULL), ==, G_MAXINT);
+ uri = "http://midori-0.4.1.tar.bz2";
+ g_assert_cmpint (midori_uri_get_fingerprint (uri, NULL, NULL), ==, G_MAXINT);
+}
+
+static void
+magic_uri_ip (void)
+{
+ g_assert (midori_uri_is_ip_address ("192.168.1.1"));
+ g_assert (midori_uri_is_ip_address ("192.168.1.1:1234"));
+ g_assert (!midori_uri_is_ip_address ("0.168.1.1"));
+ g_assert (midori_uri_is_ip_address ("user@192.168.1.1"));
+ g_assert (midori_uri_is_ip_address ("user:password@192.168.1.1"));
+ g_assert (midori_uri_is_ip_address ("2001:0db8:85a3:0000:0000:8a2e:0370:7334"));
+ g_assert (midori_uri_is_ip_address ("fe80:0:0:0:202:b3ff:fe1e:8329"));
+ g_assert (midori_uri_is_ip_address ("fe80::202:b3ff:fe1e:8329"));
+ g_assert (midori_uri_is_ip_address ("fe80::76e5:bff:fe04:38e0/64"));
}
static void
@@ -287,13 +314,55 @@ magic_uri_prefetch (void)
g_assert (!sokoke_prefetch_uri (NULL, "javascript: alert()", NULL, NULL));
}
+static void
+magic_uri_commands (void)
+{
+ typedef struct
+ {
+ const gchar* command;
+ gboolean quote;
+ const gchar* expected;
+ } CommandItem;
+
+ static const CommandItem commands[] = {
+ { "midori", TRUE, NULL },
+ { "/usr/bin/midori", TRUE, NULL },
+ { "C:/Program Files/Midori/bin/midori.exe", TRUE, NULL },
+ { "C:/Programme/Midori/bin/midori.exe", TRUE, NULL },
+ };
+ static const CommandItem arguments[] = {
+ { "-a 'http://lunduke.com/?p=3606'", FALSE, NULL },
+ { "about:private", FALSE, NULL },
+ };
+ guint i, j;
+
+ for (i = 0; i < G_N_ELEMENTS (commands); i++)
+ for (j = 0; j < G_N_ELEMENTS (arguments); j++)
+ {
+ gchar* input = g_strconcat (commands[i].command, " ", arguments[j].command, NULL);
+ gchar* ce = commands[i].expected ? (gchar*)commands[i].expected
+ : g_strconcat ("'", commands[i].command, "'", NULL);
+ gchar* ae = arguments[j].expected ? (gchar*)arguments[j].expected
+ : (arguments[j].quote ? g_strconcat ("'", arguments[j].command, "'", NULL)
+ : g_strdup (arguments[j].command));
+ gchar* expected = g_strconcat (ce, " ", ae, NULL);
+ gchar* result = sokoke_prepare_command (commands[i].command,
+ commands[i].quote, arguments[j].command, arguments[j].quote);
+ katze_assert_str_equal (input, result, expected);
+ g_free (input);
+ g_free (ce);
+ g_free (ae);
+ g_free (expected);
+ g_free (result);
+ }
+}
+
int
main (int argc,
char** argv)
{
- midori_app_setup (argv);
g_test_init (&argc, &argv, NULL);
- gtk_init_check (&argc, &argv);
+ midori_app_setup (&argc, &argv, NULL, NULL);
g_test_add_func ("/magic-uri/uri", magic_uri_uri);
g_test_add_func ("/magic-uri/idn", magic_uri_idn);
@@ -301,8 +370,10 @@ main (int argc,
g_test_add_func ("/magic-uri/pseudo", magic_uri_pseudo);
g_test_add_func ("/magic-uri/performance", magic_uri_performance);
g_test_add_func ("/magic-uri/fingerprint", magic_uri_fingerprint);
+ g_test_add_func ("/magic-uri/ip", magic_uri_ip);
g_test_add_func ("/magic-uri/format", magic_uri_format);
g_test_add_func ("/magic-uri/prefetch", magic_uri_prefetch);
+ g_test_add_func ("/magic-uri/commands", magic_uri_commands);
return g_test_run ();
}
diff --git a/tests/properties.c b/tests/properties.c
index e6d29947..2613fdb7 100644
--- a/tests/properties.c
+++ b/tests/properties.c
@@ -11,29 +11,6 @@
#include "midori.h"
-typedef struct
-{
- const gchar* type;
- const gchar* property;
-} ObjectProperty;
-
-static ObjectProperty properties_object_skip[] =
-{
- { "MidoriWebSettings", "user-agent" },
-};
-
-static gboolean
-properties_should_skip (const gchar* type,
- const gchar* property)
-{
- guint i;
- for (i = 0; i < G_N_ELEMENTS (properties_object_skip); i++)
- if (g_str_equal (properties_object_skip[i].type, type))
- if (g_str_equal (properties_object_skip[i].property, property))
- return TRUE;
- return FALSE;
-}
-
#define pspec_is_writable(pspec) (pspec->flags & G_PARAM_WRITABLE \
&& !(pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)))
@@ -49,19 +26,12 @@ properties_object_get_set (GObject* object)
for (i = 0; i < n_properties; i++)
{
GParamSpec *pspec = pspecs[i];
- GType type = G_PARAM_SPEC_TYPE (pspec);
- const gchar* property = g_param_spec_get_name (pspec);
- void* value = NULL;
guint j;
/* Skip properties of parent classes */
if (pspec->owner_type != G_OBJECT_TYPE (object))
continue;
- /* Skip properties that cannot be tested generically */
- if (properties_should_skip (G_OBJECT_TYPE_NAME (object), property))
- continue;
-
/* Verify that the ID is unique */
if (pspecs[i]->owner_type == G_OBJECT_TYPE (object))
for (j = 0; j < n_properties; j++)
@@ -71,81 +41,6 @@ properties_object_get_set (GObject* object)
pspec->param_id,
g_param_spec_get_name (pspec),
g_param_spec_get_name (pspecs[j]));
-
- if (!(pspec->flags & G_PARAM_READABLE))
- continue;
-
- g_object_get (object, property, &value, NULL);
- if (type == G_TYPE_PARAM_BOOLEAN)
- {
- gboolean current_value = value ? TRUE : FALSE;
- gboolean default_value = G_PARAM_SPEC_BOOLEAN (pspec)->default_value;
- if (current_value != default_value)
- g_error ("Set %s.%s to default (%d), but returned '%d'",
- G_OBJECT_TYPE_NAME (object), property,
- G_PARAM_SPEC_BOOLEAN (pspec)->default_value, current_value);
- if (pspec_is_writable (pspec))
- {
- g_object_set (object, property, !default_value, NULL);
- g_object_get (object, property, ¤t_value, NULL);
- if (current_value == default_value)
- g_error ("Set %s.%s to non-default (%d), but returned '%d'",
- G_OBJECT_TYPE_NAME (object), property,
- !G_PARAM_SPEC_BOOLEAN (pspec)->default_value, current_value);
- g_object_set (object, property, default_value, NULL);
- g_object_get (object, property, ¤t_value, NULL);
- if (current_value != default_value)
- g_error ("Set %s.%s to default again (%d), but returned '%d'",
- G_OBJECT_TYPE_NAME (object), property,
- G_PARAM_SPEC_BOOLEAN (pspec)->default_value, current_value);
- }
- }
- else if (type == G_TYPE_PARAM_STRING)
- {
- g_free (value);
- if (pspec_is_writable (pspec))
- {
- g_object_set (object, property,
- G_PARAM_SPEC_STRING (pspec)->default_value, NULL);
- g_object_get (object, property, &value, NULL);
- if (g_strcmp0 (value, G_PARAM_SPEC_STRING (pspec)->default_value))
- g_error ("Set %s.%s to %s, but returned '%s'",
- G_OBJECT_TYPE_NAME (object), property,
- G_PARAM_SPEC_STRING (pspec)->default_value, (gchar*)value);
- g_free (value);
- }
- }
- else if (type == G_TYPE_PARAM_ENUM)
- {
- GEnumClass* enum_class = G_ENUM_CLASS (
- g_type_class_ref (pspec->value_type));
-
- if (pspec_is_writable (pspec))
- {
- gint k;
- g_object_set (object, property,
- G_PARAM_SPEC_ENUM (pspec)->default_value, NULL);
- for (k = enum_class->minimum; k < enum_class->maximum; k++)
- {
- GEnumValue* enum_value;
- GEnumValue* enum_value_;
-
- enum_value = g_enum_get_value (enum_class, k);
- if (!enum_value)
- g_error ("%s.%s has no value %d",
- G_OBJECT_TYPE_NAME (object), property, k);
- enum_value_ = g_enum_get_value_by_name (enum_class,
- enum_value->value_name);
- if (!enum_value)
- g_error ("%s.%s has no value '%s'",
- G_OBJECT_TYPE_NAME (object), property, enum_value->value_name);
- g_assert_cmpint (enum_value->value, ==, enum_value_->value);
- g_object_set (object, property, k, NULL);
- }
- }
-
- g_type_class_unref (enum_class);
- }
}
g_free (pspecs);
}
@@ -187,11 +82,12 @@ int
main (int argc,
char** argv)
{
- midori_app_setup (argv);
+ g_test_init (&argc, &argv, NULL);
+ midori_app_setup (&argc, &argv, NULL, NULL);
+ midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, NULL);
+
g_object_set_data (G_OBJECT (webkit_get_default_session ()),
"midori-session-initialized", (void*)1);
- g_test_init (&argc, &argv, NULL);
- gtk_init_check (&argc, &argv);
g_test_add_data_func ("/properties/app",
(gconstpointer)MIDORI_TYPE_APP, properties_type_test);
diff --git a/tests/searchaction.vala b/tests/searchaction.vala
new file mode 100644
index 00000000..60dc81a0
--- /dev/null
+++ b/tests/searchaction.vala
@@ -0,0 +1,46 @@
+/*
+ Copyright (C) 2012 Christian Dywan
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+/*
+struct FormSpec {
+ public string html;
+ public Pango.EllipsizeMode ellipsize;
+ public string? uri;
+ public string? title;
+}
+
+const FormSpec[] forms = {
+ { "", Pango.EllipsizeMode.END, null, null },
+ { "", Pango.EllipsizeMode.END, null, null }
+};
+*/
+
+void searchaction_form () {
+ /*
+ foreach (var form in forms) {
+ var view = new Midori.View.with_title ();
+ view.get_web_view ().load_html_string (form.html, "");
+ Katze.Item? result = Midori.SearchAction.get_engine_for_form (
+ view.get_web_view (), form.ellipsize);
+ Katze.assert_str_equal (form.html,
+ result != null ? result.uri : null, form.uri);
+ Katze.assert_str_equal (form.html,
+ result != null ? result.name : null, form.title);
+ }
+ */
+}
+
+void main (string[] args) {
+ Test.init (ref args);
+ Test.add_func ("/searchaction/form", searchaction_form);
+ Test.run ();
+}
+
diff --git a/tests/speeddial.vala b/tests/speeddial.vala
new file mode 100644
index 00000000..513f0b50
--- /dev/null
+++ b/tests/speeddial.vala
@@ -0,0 +1,92 @@
+/*
+ Copyright (C) 2012 Christian Dywan
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+string get_test_file (string contents) {
+ string file;
+ int fd = FileUtils.open_tmp ("speeddialXXXXXX", out file);
+ FileUtils.set_contents (file, contents, -1);
+ FileUtils.close (fd);
+ return file;
+}
+
+static void speeddial_load () {
+ string data = get_test_file ("""
+ [Dial 1]
+ uri=http://example.com
+ title=Example
+ [settings]
+ columns=3
+ rows=3
+ """);
+
+ string json = get_test_file ("""
+ '{"shortcuts":[{"id":"s1","href":"http://example.com","title":"Example","img":"a2F0emU="}]}'
+ """);
+
+ var dial_data = new Midori.SpeedDial (data, "");
+ var dial_json = new Midori.SpeedDial ("", json);
+ FileUtils.remove (data);
+ FileUtils.remove (json);
+
+ Katze.assert_str_equal (json, dial_data.keyfile.to_data (), dial_json.keyfile.to_data ());
+ Katze.assert_str_equal (json, dial_data.get_next_free_slot (), "Dial 2");
+ Katze.assert_str_equal (json, dial_json.get_next_free_slot (), "Dial 2");
+
+ try {
+ dial_data.save_message ("SpeedDial");
+ assert_not_reached ();
+ }
+ catch (Error error) { /* Error expected: pass */ }
+ try {
+ dial_data.save_message ("speed_dial-save-rename ");
+ assert_not_reached ();
+ }
+ catch (Error error) { /* Error expected: pass */ }
+ try {
+ dial_data.save_message ("speed_dial-save-foo 1");
+ assert_not_reached ();
+ }
+ catch (Error error) { /* Error expected: pass */ }
+
+ dial_data.save_message ("speed_dial-save-rename 1 Lorem");
+ Katze.assert_str_equal (data, dial_data.keyfile.get_string ("Dial 1", "title"), "Lorem");
+ dial_data.save_message ("speed_dial-save-delete 1");
+ Katze.assert_str_equal (data, dial_data.get_next_free_slot (), "Dial 1");
+
+ data = get_test_file ("""
+ [settings]
+ columns=3
+ rows=3
+
+ [Dial 2]
+ uri=http://green.cat
+ title=Green cat is green
+
+ [Dial 4]
+ uri=http://heise.de
+ title=IT-News
+ """);
+ dial_data = new Midori.SpeedDial (data, "");
+ FileUtils.remove (data);
+ Katze.assert_str_equal (data, dial_data.get_next_free_slot (), "Dial 1");
+ dial_data.save_message ("speed_dial-save-swap 2 4");
+ Katze.assert_str_equal (data, dial_data.keyfile.get_string ("Dial 2", "title"), "IT-News");
+}
+
+void main (string[] args) {
+ string temporary_cache = DirUtils.make_tmp ("cacheXXXXXX");
+ Environment.set_variable ("XDG_CACHE_HOME", temporary_cache, true);
+ Test.init (ref args);
+ Midori.Paths.init (Midori.RuntimeMode.PRIVATE, null);
+ Test.add_func ("/speeddial/load", speeddial_load);
+ Test.run ();
+ DirUtils.remove (temporary_cache);
+}
+
diff --git a/tests/wscript_build b/tests/wscript_build
index b1c02528..28b8c0c7 100644
--- a/tests/wscript_build
+++ b/tests/wscript_build
@@ -14,7 +14,7 @@ for test in tests:
for fila in files:
if fila[-2:] == '.c':
source += ' ' + test + os.sep + fila
- elif 'VALAC' in bld.env and file[-5:] == '.vala':
+ elif file[-5:] == '.vala':
source += ' ' + test + os.sep + fila
if not source:
Utils.pprint ('RED', folder + ': No source files found')
@@ -22,7 +22,7 @@ for test in tests:
else:
if test[-2:] == '.c':
target = test[:-2]
- elif 'VALAC' in bld.env and test[-5:] == '.vala':
+ elif test[-5:] == '.vala':
target = test[:-5]
else:
continue
@@ -33,8 +33,12 @@ for test in tests:
obj.includes = '.. ../midori ../panels'
obj.cflags = ['-DEXTENSION_PATH="' + os.path.abspath ('_build/default/extensions') + '"']
obj.source = source
- obj.vapi_dirs = '../midori'
- obj.packages = 'glib-2.0 gio-2.0 gtk+-2.0 libsoup-2.4 webkit-1.0 midori'
- obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE'
+ obj.vapi_dirs = '../midori ../katze'
+ obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 katze midori midori-core'
+ if bld.env['HAVE_GTK3']:
+ obj.packages += ' gtk+-3.0 webkitgtk-3.0'
+ else:
+ obj.packages += ' gtk+-2.0 webkit-1.0'
+ obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE ZEITGEIST'
obj.uselib_local = 'midori-core'
obj.unit_test = 1
diff --git a/toolbars/midori-findbar.c b/toolbars/midori-findbar.c
index cbee17b5..3c617956 100644
--- a/toolbars/midori-findbar.c
+++ b/toolbars/midori-findbar.c
@@ -50,27 +50,16 @@ midori_findbar_set_icon (MidoriFindbar* findbar,
GtkIconEntryPosition icon_pos,
const gchar* icon_name)
{
- #if !HAVE_HILDON
- GdkScreen* screen = gtk_widget_get_screen (findbar->find_text);
- GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen);
- gchar* symbolic_icon_name;
-
- if (icon_name == NULL)
+ if (icon_name != NULL)
{
- gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (findbar->find_text),
- icon_pos, NULL);
- return;
+ gchar* symbolic_icon_name = g_strconcat (icon_name, "-symbolic", NULL);
+ gtk_entry_set_icon_from_gicon (GTK_ENTRY (findbar->find_text), icon_pos,
+ g_themed_icon_new_with_default_fallbacks (symbolic_icon_name));
+ g_free (symbolic_icon_name);
}
-
- symbolic_icon_name = g_strconcat (icon_name, "-symbolic", NULL);
- if (gtk_icon_theme_has_icon (icon_theme, symbolic_icon_name))
- gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (findbar->find_text),
- icon_pos, symbolic_icon_name);
else
gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (findbar->find_text),
- icon_pos, icon_name);
- g_free (symbolic_icon_name);
- #endif
+ icon_pos, NULL);
}
static void
@@ -104,18 +93,6 @@ midori_findbar_find_key_press_event_cb (MidoriFindbar* findbar,
return FALSE;
}
-static void
-midori_findbar_entry_clear_icon_released_cb (GtkIconEntry* entry,
- gint icon_pos,
- gint button,
- MidoriFindbar*findbar)
-{
- if (icon_pos == GTK_ICON_ENTRY_SECONDARY)
- {
- midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, "edit-find");
- }
-}
-
static gboolean
midori_findbar_case_sensitive (MidoriFindbar* findbar)
{
@@ -191,7 +168,7 @@ midori_findbar_invoke (MidoriFindbar* findbar)
GtkWidget* view = midori_browser_get_current_tab (browser);
const gchar* text;
- midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, "edit-find");
+ midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, STOCK_EDIT_FIND);
gtk_widget_show (GTK_WIDGET (findbar->find_case));
gtk_widget_show (GTK_WIDGET (findbar->find_highlight));
gtk_widget_show (GTK_WIDGET (findbar->find_close));
@@ -233,7 +210,7 @@ midori_findbar_preedit_changed_cb (GtkWidget* entry,
midori_view_unmark_text_matches (MIDORI_VIEW (view));
if (g_utf8_strlen (preedit, -1) >= 1)
{
- midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_SECONDARY, "edit-clear");
+ midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_SECONDARY, STOCK_EDIT_CLEAR);
midori_findbar_find_text (findbar, preedit, TRUE);
}
else
@@ -274,10 +251,7 @@ midori_findbar_init (MidoriFindbar* findbar)
GtkToolItem* toolitem;
gtk_widget_set_name (GTK_WIDGET (findbar), "MidoriFindbar");
- #if GTK_CHECK_VERSION (3, 0, 0)
- gtk_style_context_add_class (
- gtk_widget_get_style_context (GTK_WIDGET (findbar)), "bottom-toolbar");
- #endif
+ katze_widget_add_class (GTK_WIDGET (findbar), "bottom-toolbar");
gtk_toolbar_set_icon_size (GTK_TOOLBAR (findbar), GTK_ICON_SIZE_MENU);
gtk_toolbar_set_style (GTK_TOOLBAR (findbar), GTK_TOOLBAR_BOTH_HORIZ);
gtk_toolbar_set_show_arrow (GTK_TOOLBAR (findbar), FALSE);
@@ -290,11 +264,7 @@ midori_findbar_init (MidoriFindbar* findbar)
/* i18n: A panel at the bottom, to search text in pages */
gtk_label_new_with_mnemonic (_("_Inline Find:")));
gtk_toolbar_insert (GTK_TOOLBAR (findbar), toolitem, -1);
- findbar->find_text = gtk_icon_entry_new ();
- midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, "edit-find");
- sokoke_entry_set_clear_button_visible (GTK_ENTRY (findbar->find_text), TRUE);
- g_signal_connect (findbar->find_text, "icon-release",
- G_CALLBACK (midori_findbar_entry_clear_icon_released_cb), findbar);
+ findbar->find_text = sokoke_search_entry_new (NULL);
g_signal_connect (findbar->find_text, "activate",
G_CALLBACK (midori_findbar_next_activate_cb), findbar);
g_signal_connect (findbar->find_text, "preedit-changed",
@@ -370,7 +340,7 @@ midori_findbar_search_text (MidoriFindbar* findbar,
gboolean case_sensitive;
gboolean highlight;
- midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, found ? "edit-find" : "stop");
+ midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, found ? STOCK_EDIT_FIND : STOCK_STOP);
if (typing)
{
diff --git a/toolbars/midori-transferbar.c b/toolbars/midori-transferbar.c
index de2b96e9..81ad85a5 100644
--- a/toolbars/midori-transferbar.c
+++ b/toolbars/midori-transferbar.c
@@ -76,17 +76,11 @@ midori_transferbar_download_notify_progress_cb (WebKitDownload* download,
GtkWidget* progress)
{
gchar* tooltip;
- gchar* text;
-
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress),
- webkit_download_get_progress (download));
- tooltip = midori_download_prepare_tooltip_text (download);
- text = g_strdup_printf ("%s\n%s",
- gtk_progress_bar_get_text (GTK_PROGRESS_BAR (progress)), tooltip);
- gtk_widget_set_tooltip_text (progress, text);
-
+ midori_download_get_progress (download));
+ tooltip = midori_download_get_tooltip (download);
+ gtk_widget_set_tooltip_text (progress, tooltip);
g_free (tooltip);
- g_free (text);
}
static void
@@ -95,78 +89,39 @@ midori_transferbar_download_notify_status_cb (WebKitDownload* download,
TransferInfo* info)
{
GtkWidget* button = info->button;
- GtkWidget* icon;
- switch (webkit_download_get_status (download))
+ const gchar* stock_id = midori_download_action_stock_id (download);
+ GtkWidget* icon = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU);
+ gtk_button_set_image (GTK_BUTTON (button), icon);
+
+ if (webkit_download_get_status (download) == WEBKIT_DOWNLOAD_STATUS_FINISHED)
{
- case WEBKIT_DOWNLOAD_STATUS_FINISHED:
- {
MidoriBrowser* browser = midori_browser_get_for_widget (button);
- WebKitNetworkRequest* request;
- const gchar* original_uri;
- GChecksumType checksum_type;
- gchar* fingerprint;
- gboolean verified = TRUE;
+ MidoriDownloadType type = midori_download_get_type (download);
- icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
- gtk_button_set_image (GTK_BUTTON (button), icon);
- if (g_object_get_data (G_OBJECT (download), "open-download"))
+ if (type == MIDORI_DOWNLOAD_OPEN)
gtk_button_clicked (GTK_BUTTON (button));
- if (1)
{
const gchar* uri = webkit_download_get_destination_uri (download);
- gchar* path = soup_uri_decode (uri);
- gchar* filename = g_strrstr (path, "/") + 1;
+ gchar* filename = g_path_get_basename (uri);
gchar* msg = g_strdup_printf (
_("The file '%s ' has been downloaded."), filename);
- g_free (path);
+ KatzeItem* item = katze_item_new ();
+ item->uri = (gchar*)uri;
+ item->name = filename;
g_signal_emit_by_name (browser, "send-notification",
_("Transfer completed"), msg);
g_free (msg);
+ midori_browser_update_history (item, "download", "create");
+ item->uri = item->name = NULL;
+ g_object_unref (item);
+ g_free (filename);
}
- /* Link Fingerprint */
- request = webkit_download_get_network_request (download);
- original_uri = g_object_get_data (G_OBJECT (request), "midori-original-uri");
- if (!original_uri)
- original_uri = webkit_download_get_uri (download);
- checksum_type = midori_uri_get_fingerprint (original_uri, &fingerprint, NULL);
- if (fingerprint != NULL)
- {
- gchar* filename = g_filename_from_uri (
- webkit_download_get_destination_uri (download), NULL, NULL);
- gchar* contents;
- gsize length;
- gboolean y = g_file_get_contents (filename, &contents, &length, NULL);
- gchar* checksum = g_compute_checksum_for_data (checksum_type,
- (guchar*)contents, length);
- g_free (filename);
- g_free (contents);
- /* Checksums are case-insensitive */
- if (!y || g_ascii_strcasecmp (fingerprint, checksum) != 0)
- verified = FALSE;
- g_free (checksum);
- }
- g_free (fingerprint);
- if (verified)
- {
- if (!sokoke_is_app_or_private ())
- gtk_recent_manager_add_item (gtk_recent_manager_get_default (),
- webkit_download_get_destination_uri (download));
- }
- else
- gtk_image_set_from_stock (GTK_IMAGE (icon),
- GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
- break;
- }
- case WEBKIT_DOWNLOAD_STATUS_CANCELLED:
- case WEBKIT_DOWNLOAD_STATUS_ERROR:
- icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU);
- gtk_button_set_image (GTK_BUTTON (button), icon);
- break;
- default:
- break;
+ if (!midori_download_has_wrong_checksum (download))
+ gtk_recent_manager_add_item (gtk_recent_manager_get_default (),
+ webkit_download_get_destination_uri (download));
}
}
@@ -175,37 +130,8 @@ midori_transferbar_download_button_clicked_cb (GtkWidget* button,
TransferInfo* info)
{
WebKitDownload* download = info->download;
-
- switch (webkit_download_get_status (download))
- {
- case WEBKIT_DOWNLOAD_STATUS_STARTED:
- webkit_download_cancel (download);
- break;
- case WEBKIT_DOWNLOAD_STATUS_FINISHED:
- {
- const gchar* uri = webkit_download_get_destination_uri (download);
- GtkWidget* icon = gtk_button_get_image (GTK_BUTTON (button));
- gchar* stock_id;
- gtk_image_get_stock (GTK_IMAGE (icon), &stock_id, NULL);
- if (g_str_equal (stock_id, GTK_STOCK_DIALOG_WARNING))
- {
- sokoke_message_dialog (GTK_MESSAGE_WARNING,
- _("The downloaded file is erroneous."),
- _("The checksum provided with the link did not match. " \
- "This means the file is probably incomplete or was " \
- "modified afterwards."),
- TRUE);
- }
- else if (sokoke_show_uri (gtk_widget_get_screen (button),
- uri, gtk_get_current_event_time (), NULL))
- gtk_widget_destroy (button);
- break;
- }
- case WEBKIT_DOWNLOAD_STATUS_CANCELLED:
- gtk_widget_destroy (button);
- default:
- break;
- }
+ if (midori_download_action_clear (download, button, NULL))
+ gtk_widget_destroy (button);
}
void
@@ -226,13 +152,9 @@ midori_transferbar_check_size (GtkWidget* statusbar,
for (list = transferbar->infos; list != NULL; list = g_list_next (list))
{
TransferInfo* info = list->data;
- WebKitDownloadStatus status = webkit_download_get_status (info->download);
- if (status == WEBKIT_DOWNLOAD_STATUS_ERROR
- || status == WEBKIT_DOWNLOAD_STATUS_CANCELLED
- || status == WEBKIT_DOWNLOAD_STATUS_FINISHED)
- {
+ if (midori_download_is_finished (info->download)
+ || webkit_download_get_status (info->download) == WEBKIT_DOWNLOAD_STATUS_STARTED)
gtk_widget_destroy (info->button);
- }
}
}
}
@@ -246,35 +168,25 @@ midori_transferbar_add_download_item (MidoriTransferbar* transferbar,
GtkToolItem* toolitem;
GtkWidget* button;
GtkWidget* progress;
- const gchar* uri;
+ const gchar* filename;
gint width;
TransferInfo* info;
box = gtk_hbox_new (FALSE, 0);
progress = gtk_progress_bar_new ();
- gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (progress),
- PANGO_ELLIPSIZE_MIDDLE);
- if ((uri = webkit_download_get_destination_uri (download)))
- {
- gchar* path = soup_uri_decode (uri);
- gchar* filename = g_strrstr (path, "/") + 1;
- gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), filename);
- g_free (path);
- }
- else
- {
- gchar* filename = sokoke_get_download_filename (download);
- gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), filename);
- g_free (filename);
- }
+ #if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (progress), TRUE);
+ #endif
+ gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (progress), PANGO_ELLIPSIZE_MIDDLE);
+ filename = g_strrstr (webkit_download_get_destination_uri (download), "/") + 1;
+ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), filename);
sokoke_widget_get_text_size (progress, "M", &width, NULL);
gtk_widget_set_size_request (progress, width * 10, 1);
- /* Avoid a bug in WebKit */
- if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_CREATED)
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress),
- webkit_download_get_progress (download));
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress),
+ midori_download_get_progress (download));
gtk_box_pack_start (GTK_BOX (box), progress, FALSE, FALSE, 0);
- icon = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU);
+ icon = gtk_image_new_from_stock (
+ midori_download_action_stock_id (download), GTK_ICON_SIZE_MENU);
button = gtk_button_new ();
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
@@ -301,8 +213,6 @@ midori_transferbar_add_download_item (MidoriTransferbar* transferbar,
G_CALLBACK (midori_transferbar_download_notify_status_cb), info);
g_signal_connect (button, "clicked",
G_CALLBACK (midori_transferbar_download_button_clicked_cb), info);
- g_object_set_data_full (G_OBJECT (download), "last-time", g_new0 (gdouble, 1), g_free);
- g_object_set_data_full (G_OBJECT (download), "last-size", g_new0 (guint64, 1), g_free);
}
static void
@@ -314,13 +224,8 @@ midori_transferbar_clear_clicked_cb (GtkWidget* button,
for (list = transferbar->infos; list != NULL; list = g_list_next (list))
{
TransferInfo* info = list->data;
- WebKitDownloadStatus status = webkit_download_get_status (info->download);
- if (status == WEBKIT_DOWNLOAD_STATUS_ERROR
- || status == WEBKIT_DOWNLOAD_STATUS_CANCELLED
- || status == WEBKIT_DOWNLOAD_STATUS_FINISHED)
- {
+ if (midori_download_is_finished (info->download))
gtk_widget_destroy (info->button);
- }
}
}
@@ -351,11 +256,7 @@ midori_transferbar_confirm_delete (MidoriTransferbar* transferbar)
for (list = transferbar->infos; list != NULL; list = g_list_next (list))
{
TransferInfo* info = list->data;
- WebKitDownloadStatus status = webkit_download_get_status (info->download);
-
- if (status != WEBKIT_DOWNLOAD_STATUS_FINISHED
- && status != WEBKIT_DOWNLOAD_STATUS_CANCELLED
- && status != WEBKIT_DOWNLOAD_STATUS_ERROR)
+ if (!midori_download_is_finished (info->download))
{
all_done = FALSE;
break;
diff --git a/win32/makedist/makedist.midori b/win32/makedist/makedist.midori
index 785a7ca5..478dd51f 100755
--- a/win32/makedist/makedist.midori
+++ b/win32/makedist/makedist.midori
@@ -35,19 +35,28 @@ temp_dir=`mktemp -d`
# check if we can use 7zip
have_7zip=`which 7za`
+grep -q gtk-3.0 _build/config.log && GTK3_BUILD=1
+version=`grep PACKAGE_VERSION _build/default/config.h | awk '{ print $3 $4; }' | sed 's@(debug)@-debug@g'|sed 's@"@@g'`
+
if [ "$1" != "" ]; then
if [ "$1" == "debug" ]; then
DEBUG_BUILD=1
- else
- version_tag=$1
+ shift
fi
+ version_tag="$1"
+fi
+
+if [ $version_tag != "" ]; then
+ version_tag=$version_tag-$version
+else
+ version_tag=$version
fi
# generate unique filename
if [ "$have_7zip" != "" ]; then
- ARCHIVE=midori$version_tag-`date +%Y%m%d%H%M`.7z
+ ARCHIVE=midori-$version_tag-`date +%Y%m%d%H%M`.7z
else
- ARCHIVE=midori$version_tag-`date +%Y%m%d%H%M`.zip
+ ARCHIVE=midori-$version_tag-`date +%Y%m%d%H%M`.zip
fi
# function: dll-recursive
@@ -93,7 +102,7 @@ grab_files ()
echo -n "Creating $ARCHIVE ."
# create destination folder
-workdir=$temp_dir/midori$version_tag
+workdir=$temp_dir/midori-$version_tag
mkdir $workdir
echo -n .
@@ -133,11 +142,19 @@ grab_files etc pango
# copy configuration, otherwise webkit will crash
grab_files etc fonts
+# We need to ship our CA bundle for now
+cp /etc/pki/tls/certs/ca-bundle.crt $workdir/share/midori/res/
+
echo -n .
# copy lib
+if [ "$GTK3_BUILD" == "1" ]; then
+ grab_files lib gtk-3.0
+else
+ grab_files lib gtk-2.0
+fi
+
grab_files lib midori
-grab_files lib gtk-2.0
grab_files lib/engines "*"
grab_files lib gdk-pixbuf-2.0
@@ -154,16 +171,34 @@ echo -n .
# copy share
grab_files share midori
grab_files share icons
-grab_files share MS-Windows
grab_files share mime
grab_files share midori.mo
-grab_files share webkitgtk-1.0
+if [ "$GTK3_BUILD" == "1" ]; then
+ grab_files share webkitgtk-3.0
+ grab_files share schemas
+ MO_VER=30
+else
+ grab_files share MS-Windows
+ grab_files share webkitgtk-1.0
+ MO_VER=20
+fi
if [ "$DEBUG_BUILD" == "" ];then
pushd $workdir > /dev/null
find -iname *.debug -exec rm {} \;
popd > /dev/null
+else
+ #add some gdb helper scripts
+ cat > $workdir/bin/backtrace.gdb << _EOF
+set logging on debug.log
+run
+thread apply all bt
+quit
+_EOF
+
+echo 'gdb.exe --command=backtrace.gdb midori.exe' > $workdir/bin/debug.bat
+
fi
# copy locales for gtk
@@ -174,17 +209,42 @@ find share "(" -name "midori.mo" ")" > $temp_dir/locale.list
mkdir -p $workdir/share/locale/
for LOCALE in $(cat $temp_dir/locale.list); do
LOCALE=$(echo $LOCALE|awk -F/ '{print $3}')
- cp /usr/share/locale/$LOCALE/LC_MESSAGES/gtk20.mo $workdir/share/locale/$LOCALE/LC_MESSAGES/
+ cp /usr/share/locale/$LOCALE/LC_MESSAGES/gtk$MO_VER.mo $workdir/share/locale/$LOCALE/LC_MESSAGES/
done
rm $temp_dir/locale.list
-# Use small icons and tango icons
-gtk_etc_dir="$workdir/etc/gtk-2.0/"
+# we want to override default gtk settings
+if [ "$GTK3_BUILD" == "1" ]; then
+ gtk_etc_dir="$workdir/etc/gtk-3.0/"
+ gtk_rc_file="$gtk_etc_dir/settings.ini"
+else
+ gtk_etc_dir="$workdir/etc/gtk-2.0/"
+ gtk_rc_file="$gtk_etc_dir/gtkrc"
+fi
+
mkdir -p $gtk_etc_dir
-cat > $gtk_etc_dir/gtkrc << _EOF
+rm $gtk_rc_file
+
+
+# Use small icons by default and Tango theme
+if [ "$GTK3_BUILD" == "1" ]; then
+
+ cat > $gtk_rc_file << _EOF
+[Settings]
+gtk-icon-theme-name = Faenza
+_EOF
+
+else
+ cat > $gtk_rc_file << _EOF
gtk-theme-name = "MS-Windows"
-gtk-fallback-icon-theme = "Tango"
+gtk-icon-theme-name = "Faenza"
+_EOF
+
+fi
+
+cat >> $gtk_rc_file << _EOF
gtk-toolbar-style = GTK_TOOLBAR_ICONS
+gtk-toolbar-icon-size = GTK_ICON_SIZE_MENU
_EOF
popd > /dev/null
@@ -196,14 +256,17 @@ cp -L $workdir/share/doc/midori/{COPYING,AUTHORS} $workdir
echo -n .
+#drop a/la files, we don't do static builds anyway
+find $workdir -iname *.*a -exec rm {} \;
+
ARCHIVE=`pwd`/$ARCHIVE
# store as zip/7z file
pushd $temp_dir > /dev/null
if [ "$have_7zip" != "" ]; then
- 7za a -m0=lzma $ARCHIVE midori$version_tag
+ 7za a -m0=lzma $ARCHIVE midori-$version_tag
else
- zip -rq $ARCHIVE midori$version_tag
+ zip -rq $ARCHIVE midori-$version_tag
fi
popd > /dev/null
diff --git a/win32/makedist/midori-0.3.3.nsi b/win32/makedist/midori-0.3.3.nsi
index cb19b2b2..aabed201 100644
--- a/win32/makedist/midori-0.3.3.nsi
+++ b/win32/makedist/midori-0.3.3.nsi
@@ -25,13 +25,14 @@ RequestExecutionLevel user ; set execution level for Windows Vista
!define PRODUCT_BUILD "0"
!define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}"
!define PRODUCT_PUBLISHER "Christian Dywan"
-!define PRODUCT_WEB_SITE "http://www.twotoasts.de/"
+!define PRODUCT_WEB_SITE "http://www.midori-browser.org"
!define PRODUCT_DIR_REGKEY "Software\${PRODUCT_NAME}"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_BROWER_KEY "Software\Clients\StartMenuInternet"
!define PRODUCT_EXE "$INSTDIR\bin\midori.exe"
!define UNINSTALL_EXE "$INSTDIR\uninst.exe"
!define RESOURCEDIR "midori-${PRODUCT_VERSION}"
+!define ICON_THEME "Faenza"
;;;;;;;;;;;;;;;;;;;;;
; Version resource ;
@@ -40,7 +41,7 @@ VIProductVersion "${PRODUCT_VERSION_ID}"
VIAddVersionKey "ProductName" "${PRODUCT_NAME}"
VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}"
VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}"
-VIAddVersionKey "LegalCopyright" "Copyright 2009 by Christian Dywan"
+VIAddVersionKey "LegalCopyright" "Copyright 2009-2012 by Christian Dywan"
VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer"
BrandingText "$(^NAME) installer (NSIS ${NSIS_VERSION})"
@@ -122,10 +123,10 @@ Section "!Program Files" SEC01
File /r /x "midori" "${RESOURCEDIR}\lib\*"
SetOutPath "$INSTDIR\share"
- File /r /x "locale" /x "user" /x "Tango" "${RESOURCEDIR}\share\*"
+ File /r /x "locale" /x "user" /x "${ICON_THEME}" "${RESOURCEDIR}\share\*"
- SetOutPath "$INSTDIR\share\icons\Tango"
- File "${RESOURCEDIR}\share\icons\Tango\index.theme"
+ SetOutPath "$INSTDIR\share\icons\${ICON_THEME}"
+ File "${RESOURCEDIR}\share\icons\${ICON_THEME}\index.theme"
SetOutPath "$INSTDIR"
CreateShortCut "$INSTDIR\Midori.lnk" "${PRODUCT_EXE}"
@@ -134,6 +135,132 @@ Section "!Program Files" SEC01
CreateDirectory "$SMPROGRAMS\$StartmenuFolder"
CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Midori.lnk" "${PRODUCT_EXE}"
!insertmacro MUI_STARTMENU_WRITE_END
+
+!macro InstallIconThemeRenameSmall OPath IPath
+ File "/oname=16x16\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\16x16\${IPath}.png"
+ File "/oname=22x22\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\22x22\${IPath}.png"
+ File "/oname=24x24\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\24x24\${IPath}.png"
+ File "/oname=32x32\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\32x32\${IPath}.png"
+!macroend
+
+!macro InstallIconThemeRename OPath IPath
+ !insertmacro InstallIconThemeRenameSmall ${OPath} ${IPath}
+ File "/oname=48x48\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\48x48\${IPath}.png"
+ File "/oname=scalable\${OPath}.svg" "${RESOURCEDIR}\share\icons\${ICON_THEME}\scalable\${IPath}.svg"
+!macroend
+
+!macro InstallIconThemeSmall IconPath
+ !insertmacro InstallIconThemeRenameSmall ${IconPath} ${IconPath}
+!macroend
+
+!macro InstallIconTheme IconPath
+ !insertmacro InstallIconThemeRename ${IconPath} ${IconPath}
+!macroend
+
+!macro CreateIconThemeSectionsSmall SectionPath
+ CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\16x16\${SectionPath}"
+ CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\22x22\${SectionPath}"
+ CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\24x24\${SectionPath}"
+ CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\32x32\${SectionPath}"
+!macroend
+
+!macro CreateIconThemeSections SectionPath
+ !insertmacro CreateIconThemeSectionsSmall ${SectionPath}
+ CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\48x48\${SectionPath}"
+ CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\scalable\${SectionPath}"
+!macroend
+
+ SetOutPath "$INSTDIR\share\icons\${ICON_THEME}"
+
+ !insertmacro CreateIconThemeSections "actions"
+ #!insertmacro CreateIconThemeSectionsSmall "animations"
+ !insertmacro CreateIconThemeSections "apps"
+ !insertmacro CreateIconThemeSections "categories"
+ !insertmacro CreateIconThemeSections "devices"
+ !insertmacro CreateIconThemeSections "mimetypes"
+ !insertmacro CreateIconThemeSections "places"
+ !insertmacro CreateIconThemeSections "status"
+
+ !insertmacro InstallIconTheme "actions\bookmark-new"
+ !insertmacro InstallIconTheme "actions\document-open"
+ !insertmacro InstallIconTheme "actions\document-open-recent"
+ !insertmacro InstallIconTheme "actions\document-print"
+ !insertmacro InstallIconTheme "actions\document-properties"
+ !insertmacro InstallIconTheme "actions\document-save-as"
+ !insertmacro InstallIconTheme "actions\document-save"
+ !insertmacro InstallIconTheme "actions\edit-clear"
+ !insertmacro InstallIconTheme "actions\edit-copy"
+ !insertmacro InstallIconTheme "actions\edit-cut"
+ !insertmacro InstallIconTheme "actions\edit-delete"
+ !insertmacro InstallIconTheme "actions\edit-find"
+ !insertmacro InstallIconTheme "actions\edit-paste"
+ !insertmacro InstallIconTheme "actions\edit-redo"
+ !insertmacro InstallIconTheme "actions\edit-select-all"
+ !insertmacro InstallIconTheme "actions\edit-undo"
+ !insertmacro InstallIconTheme "actions\folder-new"
+ !insertmacro InstallIconTheme "actions\format-indent-more"
+ !insertmacro InstallIconTheme "actions\go-home"
+ !insertmacro InstallIconTheme "actions\go-jump"
+ !insertmacro InstallIconTheme "actions\go-next"
+ !insertmacro InstallIconTheme "actions\go-previous"
+ !insertmacro InstallIconTheme "actions\gtk-cancel"
+ !insertmacro InstallIconTheme "actions\gtk-edit"
+ !insertmacro InstallIconTheme "actions\gtk-no"
+ !insertmacro InstallIconTheme "actions\gtk-ok"
+ !insertmacro InstallIconTheme "actions\gtk-save"
+ !insertmacro InstallIconTheme "actions\help-about"
+ !insertmacro InstallIconTheme "actions\help-contents"
+ !insertmacro InstallIconTheme "actions\list-add"
+ !insertmacro InstallIconTheme "actions\list-remove"
+ !insertmacro InstallIconTheme "actions\media-skip-backward"
+ !insertmacro InstallIconTheme "actions\media-skip-forward"
+ !insertmacro InstallIconTheme "actions\process-stop"
+ !insertmacro InstallIconTheme "actions\stop"
+ !insertmacro InstallIconTheme "actions\tab-new"
+ !insertmacro InstallIconTheme "actions\tools-check-spelling"
+ !insertmacro InstallIconTheme "actions\view-fullscreen"
+ !insertmacro InstallIconTheme "actions\view-refresh"
+ !insertmacro InstallIconTheme "actions\window-close"
+ !insertmacro InstallIconTheme "actions\window-new"
+ !insertmacro InstallIconTheme "actions\zoom-in"
+ !insertmacro InstallIconTheme "actions\zoom-out"
+
+ #!insertmacro InstallIconThemeSmall "animations\process-working"
+
+ !insertmacro InstallIconTheme "apps\internet-news-reader"
+ !insertmacro InstallIconTheme "apps\midori"
+ !insertmacro InstallIconTheme "apps\preferences-desktop-theme"
+ !insertmacro InstallIconTheme "apps\web-browser"
+
+ !insertmacro InstallIconTheme "categories\gtk-preferences"
+
+ !insertmacro InstallIconTheme "devices\drive-harddisk"
+ !insertmacro InstallIconTheme "devices\media-optical-dvd-rom"
+
+ !insertmacro InstallIconTheme "mimetypes\application-x-shockwave-flash"
+ !insertmacro InstallIconTheme "mimetypes\extension"
+ !insertmacro InstallIconTheme "mimetypes\gtk-file"
+ !insertmacro InstallIconTheme "mimetypes\image-x-generic"
+ !insertmacro InstallIconTheme "mimetypes\package"
+ !insertmacro InstallIconTheme "mimetypes\text-html"
+ !insertmacro InstallIconTheme "mimetypes\text-x-generic"
+ !insertmacro InstallIconTheme "mimetypes\text-x-javascript"
+
+ !insertmacro InstallIconTheme "places\folder-documents"
+ !insertmacro InstallIconTheme "places\folder-downloads"
+ !insertmacro InstallIconTheme "places\folder-music"
+ !insertmacro InstallIconTheme "places\folder-pictures"
+ !insertmacro InstallIconTheme "places\folder"
+ !insertmacro InstallIconTheme "places\folder-videos"
+ !insertmacro InstallIconTheme "places\inode-directory"
+ !insertmacro InstallIconTheme "places\user-bookmarks"
+ !insertmacro InstallIconTheme "places\user-desktop"
+ !insertmacro InstallIconTheme "places\user-home"
+ !insertmacro InstallIconTheme "places\user-trash"
+
+ !insertmacro InstallIconTheme "status\dialog-password"
+ #!insertmacro InstallIconTheme "status\locked"
+
SectionEnd
Section "Extensions" SEC04
@@ -149,166 +276,6 @@ Section "Language Files" SEC02
File /r "${RESOURCEDIR}\share\locale"
SectionEnd
-Section "FAQ" SEC06
- SectionIn 1
- SetOutPath "$INSTDIR\share\doc\midori"
- File "${RESOURCEDIR}\share\doc\midori\faq.css"
- File "${RESOURCEDIR}\share\doc\midori\faq.html"
-SectionEnd
-
-!macro InstallTangoIconRenameSmall OPath IPath
- File "/oname=16x16\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\16x16\${IPath}.png"
- File "/oname=22x22\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\22x22\${IPath}.png"
- File "/oname=32x32\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\32x32\${IPath}.png"
-!macroend
-
-!macro InstallTangoIconRename OPath IPath
- !insertmacro InstallTangoIconRenameSmall ${OPath} ${IPath}
- File "/oname=48x48\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\48x48\${IPath}.png"
- File /nonfatal "/oname=64x64\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\64x64\${IPath}.png"
- File /nonfatal "/oname=72x72\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\72x72\${IPath}.png"
- File /nonfatal "/oname=96x96\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\96x96\${IPath}.png"
- File /nonfatal "/oname=128x128\${OPath}.png" "${RESOURCEDIR}\share\icons\Tango\128x128\${IPath}.png"
- File "/oname=scalable\${OPath}.svg" "${RESOURCEDIR}\share\icons\Tango\scalable\${IPath}.svg"
- File /nonfatal "/oname=scalable\${OPath}.icon" "${RESOURCEDIR}\share\icons\Tango\scalable\${IPath}.icon"
-!macroend
-
-!macro InstallTangoIconSmall IconPath
- !insertmacro InstallTangoIconRenameSmall ${IconPath} ${IconPath}
-!macroend
-
-!macro InstallTangoIcon IconPath
- !insertmacro InstallTangoIconRename ${IconPath} ${IconPath}
-!macroend
-
-!macro CreateTangoSectionsSmall SectionPath
- CreateDirectory "$INSTDIR\share\icons\Tango\16x16\${SectionPath}"
- CreateDirectory "$INSTDIR\share\icons\Tango\22x22\${SectionPath}"
- CreateDirectory "$INSTDIR\share\icons\Tango\32x32\${SectionPath}"
-!macroend
-
-!macro CreateTangoSections SectionPath
- !insertmacro CreateTangoSectionsSmall ${SectionPath}
- CreateDirectory "$INSTDIR\share\icons\Tango\48x48\${SectionPath}"
- CreateDirectory "$INSTDIR\share\icons\Tango\64x64\${SectionPath}"
- CreateDirectory "$INSTDIR\share\icons\Tango\72x72\${SectionPath}"
- CreateDirectory "$INSTDIR\share\icons\Tango\96x96\${SectionPath}"
- CreateDirectory "$INSTDIR\share\icons\Tango\128x128\${SectionPath}"
- CreateDirectory "$INSTDIR\share\icons\Tango\scalable\${SectionPath}"
-!macroend
-
-Section "Tango icons" SEC07
- SectionIn 1
- SetOutPath "$INSTDIR\share\icons\Tango"
-
- !insertmacro CreateTangoSections "actions"
- !insertmacro CreateTangoSectionsSmall "animations"
- !insertmacro CreateTangoSections "apps"
- !insertmacro CreateTangoSections "categories"
- !insertmacro CreateTangoSections "devices"
- !insertmacro CreateTangoSections "emblems"
- !insertmacro CreateTangoSections "emotes"
- !insertmacro CreateTangoSections "mimetypes"
- !insertmacro CreateTangoSections "places"
- !insertmacro CreateTangoSections "status"
-
- !insertmacro InstallTangoIcon "actions\gtk-add"
- !insertmacro InstallTangoIcon "actions\gtk-bold"
- !insertmacro InstallTangoIcon "actions\gtk-cancel"
- !insertmacro InstallTangoIcon "actions\gtk-cancel"
- !insertmacro InstallTangoIcon "actions\gtk-clear"
- !insertmacro InstallTangoIcon "actions\gtk-copy"
- !insertmacro InstallTangoIcon "actions\gtk-cut"
- !insertmacro InstallTangoIcon "actions\gtk-delete"
- !insertmacro InstallTangoIcon "actions\gtk-find"
- !insertmacro InstallTangoIcon "actions\gtk-fullscreen"
- !insertmacro InstallTangoIcon "actions\gtk-go-back-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-go-back-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-go-down"
- !insertmacro InstallTangoIcon "actions\gtk-go-forward-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-go-forward-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-go-up"
- !insertmacro InstallTangoIcon "actions\gtk-goto-first-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-goto-first-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-goto-last-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-goto-last-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-home"
- !insertmacro InstallTangoIcon "actions\gtk-indent-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-indent-rtl"
- !insertmacro InstallTangoIcon "actions\gtk-italic"
- !insertmacro InstallTangoIcon "actions\gtk-jump-to-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-jump-to-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-media-next-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-media-next-rtl"
- !insertmacro InstallTangoIcon "actions\gtk-media-previous-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-media-previous-rtl"
- !insertmacro InstallTangoIcon "actions\gtk-open"
- !insertmacro InstallTangoIcon "actions\gtk-paste"
- !insertmacro InstallTangoIcon "actions\gtk-print"
- !insertmacro InstallTangoIcon "actions\gtk-properties"
- !insertmacro InstallTangoIcon "actions\gtk-redo-ltr"
- !insertmacro InstallTangoIcon "actions\gtk-refresh"
- !insertmacro InstallTangoIcon "actions\gtk-remove"
- !insertmacro InstallTangoIcon "actions\gtk-save"
- !insertmacro InstallTangoIcon "actions\gtk-save-as"
- !insertmacro InstallTangoIcon "actions\gtk-select-all"
- !insertmacro InstallTangoIcon "actions\gtk-stop"
- !insertmacro InstallTangoIcon "actions\gtk-underline"
- !insertmacro InstallTangoIcon "actions\gtk-undo-ltr"
- !insertmacro InstallTangoIcon "actions\stock_add-bookmark"
- !insertmacro InstallTangoIcon "actions\stock_new-tab"
- !insertmacro InstallTangoIcon "actions\stock_new-window"
- !insertmacro InstallTangoIconSmall "animations\process-working"
- !insertmacro InstallTangoIcon "apps\gnome-settings-theme"
- !insertmacro InstallTangoIcon "apps\gtk-help"
- !insertmacro InstallTangoIcon "apps\terminal"
- !insertmacro InstallTangoIcon "apps\web-browser"
- !insertmacro InstallTangoIcon "categories\gtk-preferences"
- #!insertmacro InstallTangoIcon "cookie-manager"
- #!insertmacro InstallTangoIcon "document-open-recent"
- #!insertmacro InstallTangoIcon "extention"
- #!insertmacro InstallTangoIcon "feed-panel"
- #!insertmacro InstallTangoIcon "gtk-about"
- #!insertmacro InstallTangoIcon "gtk-close"
- #!insertmacro InstallTangoIcon "gtk-convert"
- #!insertmacro InstallTangoIcon "gtk-dialog-authentication"
- #!insertmacro InstallTangoIcon "gtk-dnd-multiple"
- #!insertmacro InstallTangoIcon "gtk-edit"
- #!insertmacro InstallTangoIcon "gtk-execute"
- #!insertmacro InstallTangoIcon "gtk-file"
- #!insertmacro InstallTangoIcon "gtk-index"
- #!insertmacro InstallTangoIcon "gtk-info"
- #!insertmacro InstallTangoIcon "gtk-ok"
- #!insertmacro InstallTangoIcon "gtk-orientation-portait"
- #!insertmacro InstallTangoIcon "gtk-quit"
- #!insertmacro InstallTangoIcon "gtk-select-color"
- #!insertmacro InstallTangoIcon "gtk-select-font"
- #!insertmacro InstallTangoIcon "gtk-sort-ascending"
- #!insertmacro InstallTangoIcon "gtk-spell-check"
- #!insertmacro InstallTangoIcon "gtk-undelete"
- #!insertmacro InstallTangoIcon "gtk-yes"
- #!insertmacro InstallTangoIcon "gtk-zoom-100"
- #!insertmacro InstallTangoIcon "gtk-zoom-in"
- #!insertmacro InstallTangoIcon "gtk-zoom-out"
- !insertmacro InstallTangoIcon "mimetypes\gnome-mime-application-x-shockwave-flash"
- !insertmacro InstallTangoIcon "mimetypes\gnome-mime-image"
- !insertmacro InstallTangoIcon "mimetypes\package"
- !insertmacro InstallTangoIcon "mimetypes\stock_script"
- !insertmacro InstallTangoIcon "mimetypes\vcard"
- #!insertmacro InstallTangoIcon "news-feed"
- #!insertmacro InstallTangoIcon "place-holder"
- !insertmacro InstallTangoIcon "places\gnome-stock-trash"
- !insertmacro InstallTangoIcon "places\gtk-directory"
- !insertmacro InstallTangoIcon "places\gtk-network"
- !insertmacro InstallTangoIcon "status\gtk-dialog-error"
- !insertmacro InstallTangoIcon "status\gtk-dialog-info"
- !insertmacro InstallTangoIcon "status\gtk-dialog-warning"
- !insertmacro InstallTangoIcon "status\gtk-missing-image"
- !insertmacro InstallTangoIcon "status\network-offline"
- #!insertmacro InstallTangoIcon "stock_bookmark"
- #!insertmacro InstallTangoIcon "stock_mail-send"
- #!insertmacro InstallTangoIcon "tab-panel"
-SectionEnd
Section "Desktop Shortcuts" SEC03
SectionIn 1
@@ -407,8 +374,6 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Create shortcuts for Midori on the desktop and in the Quicklaunch Bar"
!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Available plugins like 'Advertisement Blocker', 'Form history filler' and 'Mouse Gestures'."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Make Midori the default browser."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "User manual of the Midori application."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "Better looking icons from the Tango icon theme."
!insertmacro MUI_FUNCTION_DESCRIPTION_END
;;;;;;;;;;;;;;;;;;;;;
diff --git a/wscript b/wscript
index f0c42eb8..0699b740 100644
--- a/wscript
+++ b/wscript
@@ -29,7 +29,7 @@ from Configure import find_program_impl
major = 0
minor = 4
-micro = 6
+micro = 7
APPNAME = 'midori'
VERSION = VERSION_FULL = str (major) + '.' + str (minor) + '.' + str (micro)
@@ -94,7 +94,9 @@ def configure (conf):
def check_version (given_version, major, minor, micro):
if '.' in given_version:
- given_major, given_minor, given_micro = given_version.split ('.')
+ given_major, given_minor, given_micro = given_version.split ('.', 2)
+ if '.' in given_micro:
+ given_micro, given_pico = given_micro.split ('.', 1)
else:
given_major, given_minor, given_micro = given_version
return int(given_major) > major or \
@@ -181,6 +183,13 @@ def configure (conf):
atleast_version=version, mandatory=mandatory)
return conf.env['HAVE_' + var]
+ if option_enabled ('gtk3'):
+ gcr_pkg = 'gcr-3'
+ else:
+ gcr_pkg = 'gcr-3-gtk2'
+ check_pkg (gcr_pkg, '2.32', mandatory=False)
+ conf.define ('GCR_VERSION', ['No',conf.check_cfg(modversion=gcr_pkg)][conf.env['HAVE_GCR'] == 1])
+
if option_enabled ('unique'):
if option_enabled('gtk3'): unique_pkg = 'unique-3.0'
else: unique_pkg = 'unique-1.0'
@@ -228,6 +237,7 @@ def configure (conf):
granite = 'no '
conf.define ('GRANITE_VERSION', 'No')
+ check_pkg ('zeitgeist-1.0', '0.3.14', mandatory=False)
conf.check (lib='m', mandatory=True)
check_pkg ('gmodule-2.0', '2.8.0', False)
check_pkg ('gthread-2.0', '2.8.0', False)
@@ -235,6 +245,7 @@ def configure (conf):
args = ''
if Options.platform == 'win32':
args = '--define-variable=target=win32'
+ conf.env.append_value ('VALAFLAGS', '-D HAVE_WIN32')
elif sys.platform != 'darwin':
check_pkg ('x11')
# Pass /usr/X11R6/include for OpenBSD
@@ -251,11 +262,14 @@ def configure (conf):
if check_version (conf.check_cfg (modversion='webkitgtk-3.0'), 1, 5, 1):
check_pkg ('javascriptcoregtk-3.0', '1.5.1', args=args)
conf.env.append_value ('VALAFLAGS', '-D HAVE_GTK3')
+ conf.env.append_value ('VALAFLAGS', '-D HAVE_OFFSCREEN')
else:
- check_pkg ('gtk+-2.0', '2.10.0', var='GTK')
+ check_pkg ('gtk+-2.0', '2.16.0', var='GTK')
check_pkg ('webkit-1.0', '1.1.17', args=args)
if check_version (conf.check_cfg (modversion='webkit-1.0'), 1, 5, 1):
check_pkg ('javascriptcoregtk-1.0', '1.5.1', args=args)
+ if check_version (conf.check_cfg (modversion='gtk+-2.0'), 2, 20, 0):
+ conf.env.append_value ('VALAFLAGS', '-D HAVE_OFFSCREEN')
conf.env['HAVE_GTK3'] = option_enabled ('gtk3')
check_pkg ('libsoup-2.4', '2.27.90')
conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4'))
@@ -265,10 +279,12 @@ def configure (conf):
conf.define ('HAVE_LIBSOUP_2_29_91', 1)
if check_version (conf.env['LIBSOUP_VERSION'], 2, 33, 4):
conf.define ('HAVE_LIBSOUP_2_33_4', 1)
+ if check_version (conf.env['LIBSOUP_VERSION'], 2, 34, 0):
+ conf.define ('HAVE_LIBSOUP_2_34_0', 1)
if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1):
conf.define ('HAVE_LIBSOUP_2_37_1', 1)
check_pkg ('libxml-2.0', '2.6')
- check_pkg ('sqlite3', '3.0', True, var='SQLITE')
+ check_pkg ('sqlite3', '3.6.19', True, var='SQLITE')
if option_enabled ('hildon'):
if check_pkg ('hildon-1', mandatory=False, var='HILDON'):
@@ -374,6 +390,14 @@ def configure (conf):
if unique == 'yes' and conf.check_cfg (modversion='unique-1.0') == '1.0.4':
Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.')
Utils.pprint ('RED', 'Please use an older or newer version.')
+ sys.exit (1)
+ if check_version (conf.env['LIBSOUP_VERSION'], 2, 33, 4) \
+ and check_version (conf.check_cfg (modversion='gio-2.0'), 2, 32, 1) \
+ and not check_version (conf.check_cfg (modversion='gio-2.0'), 2, 32, 3):
+ Utils.pprint ('RED', 'libsoup >= 2.33.4 found with glib >= 2.32.1 < 2.32.3:')
+ Utils.pprint ('RED', 'This combination breaks the download GUI.')
+ Utils.pprint ('RED', 'See https://bugs.launchpad.net/midori/+bug/780133/comments/14')
+ sys.exit (1)
def set_options (opt):
def is_maemo (): return os.path.exists ('/etc/osso-af-init/')
@@ -518,11 +542,8 @@ def build (bld):
else:
Utils.pprint ('BLUE', "logo-shade could not be rasterized.")
- for res_file in ['about.css', 'error.html', 'close.png']:
+ for res_file in ['about.css', 'error.html', 'close.png', 'gtk3.css', 'speeddial-head.html']:
bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/' + res_file)
- bld.install_as ( \
- '${MDATADIR}/' + APPNAME + '/res/speeddial-head-%s.html' % VERSION, \
- 'data/speeddial-head.html')
if bld.env['addons']:
bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.js')
@@ -608,7 +629,6 @@ def shutdown ():
except:
pass
try:
- ext = 'MIDORI_EXTENSION_PATH=' + relfolder + os.sep + 'extensions'
nls = 'MIDORI_NLSPATH=' + relfolder + os.sep + 'po'
lang = os.environ['LANG']
try:
@@ -625,7 +645,7 @@ def shutdown ():
'LC_MESSAGES' + os.sep + APPNAME + '.mo')
except:
pass
- command = ext + ' ' + nls + ' '
+ command = nls + ' '
if is_mingw (Build.bld.env):
# This works only if everything is installed to that prefix
os.chdir (Build.bld.env['PREFIX'] + os.sep + 'bin')
![](\"res://logo-shade.png\"){kind=logo}
"
"