From ec64b98001f1ccaafd75f258bd91254ccb274f81 Mon Sep 17 00:00:00 2001 From: Ryan Niebur Date: Wed, 2 Sep 2009 11:26:57 -0700 Subject: [PATCH] Imported Upstream version 0.1.9 --- AUTHORS | 1 + ChangeLog | 11 + extensions/adblock.c | 92 ++- extensions/shortcuts.c | 46 +- extensions/tab-panel.c | 91 ++- extensions/toolbar-editor.c | 34 +- extensions/wscript_build | 3 - katze/katze-arrayaction.c | 8 + katze/katze-item.c | 32 +- midori/main.c | 48 +- midori/midori-browser.c | 389 ++++++---- midori/midori-browser.h | 4 + midori/midori-locationaction.c | 20 +- midori/midori-panel.c | 203 +++++- midori/midori-preferences.c | 6 +- midori/midori-searchaction.c | 4 + midori/midori-view.c | 128 +++- midori/midori-view.h | 3 + midori/midori-viewable.c | 31 +- midori/midori-websettings.c | 49 +- midori/midori-websettings.h | 11 + midori/sokoke.c | 10 +- po/de.po | 887 +++++++++++----------- po/el.po | 1045 ++++++++++++++------------ po/midori.pot | 1077 ++++++++++++++------------- po/pt.po | 1258 +++++++++++++++++--------------- wscript | 2 +- 27 files changed, 3217 insertions(+), 2276 deletions(-) diff --git a/AUTHORS b/AUTHORS index bc77c4db..6d1db6f2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -17,6 +17,7 @@ Contributors: Johannes Reinhardt Jean-François Guchens Jérôme Geulfucci + Alexander Butenko Graphics: extension: Nancy Runge diff --git a/ChangeLog b/ChangeLog index cc7ff6da..758b9b50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.1.9: + + Preserve navigation history with new tabs + + Implement clearing private data when quitting + + Ellipsize and show close icons in the tab panel + + Allow hiding panel operating controls + + Integrate Tools with the compact menu + + Fix User scripts, User styles and Plugins panel + + Remove the bookmarkbar popup + + Add New Tab to the tab context menu + + Implement minimizing tabs + v0.1.8: + Initial support for extension unit tests + Set a "browser" role on browser windows diff --git a/extensions/adblock.c b/extensions/adblock.c index 8debf5e1..6d8bfe76 100644 --- a/extensions/adblock.c +++ b/extensions/adblock.c @@ -1,5 +1,6 @@ /* Copyright (C) 2009 Christian Dywan + Copyright (C) 2009 Alexander Butenko This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -19,6 +20,43 @@ #include #endif +static gchar * +adblock_fixup_regexp (gchar* src) +{ + gchar* dst; + gchar* s; + /* FIXME: Avoid always allocating twice the string */ + s = dst = g_malloc (strlen (src) * 2); + + while (*src) + { + switch (*src) + { + case '*': + *s++ = '.'; + break; + case '.': + *s++ = '\\'; + break; + case '?': + *s++ = '\\'; + break; + case '|': + *s++ = '\\'; + break; + } + *s++ = *src; + src++; + } + *s = 0; + return dst; +} + +static void +adblock_browser_populate_tool_menu_cb (MidoriBrowser* browser, + GtkWidget* menu, + MidoriExtension* extension); + static void adblock_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, @@ -26,13 +64,14 @@ adblock_app_add_browser_cb (MidoriApp* app, static void adblock_deactivate_cb (MidoriExtension* extension, - GtkWidget* menuitem) + MidoriBrowser* browser) { MidoriApp* app = midori_extension_get_app (extension); - gtk_widget_destroy (menuitem); g_signal_handlers_disconnect_by_func ( - extension, adblock_deactivate_cb, menuitem); + browser, adblock_browser_populate_tool_menu_cb, extension); + g_signal_handlers_disconnect_by_func ( + extension, adblock_deactivate_cb, browser); g_signal_handlers_disconnect_by_func ( app, adblock_app_add_browser_cb, extension); /* FIXME: Disconnect session callbacks */ @@ -256,26 +295,28 @@ adblock_menu_configure_filters_activate_cb (GtkWidget* menuitem, } static void -adblock_app_add_browser_cb (MidoriApp* app, - MidoriBrowser* browser, - MidoriExtension* extension) +adblock_browser_populate_tool_menu_cb (MidoriBrowser* browser, + GtkWidget* menu, + MidoriExtension* extension) { - GtkWidget* panel; - GtkWidget* menu; GtkWidget* menuitem; - panel = katze_object_get_object (browser, "panel"); - menu = katze_object_get_object (panel, "menu"); menuitem = gtk_menu_item_new_with_mnemonic (_("Configure _Advertisement filters...")); g_signal_connect (menuitem, "activate", G_CALLBACK (adblock_menu_configure_filters_activate_cb), extension); gtk_widget_show (menuitem); - gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 3); - g_object_unref (menu); - g_object_unref (panel); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); +} +static void +adblock_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + g_signal_connect (browser, "populate-tool-menu", + G_CALLBACK (adblock_browser_populate_tool_menu_cb), extension); g_signal_connect (extension, "deactivate", - G_CALLBACK (adblock_deactivate_cb), menuitem); + G_CALLBACK (adblock_deactivate_cb), browser); } static gboolean @@ -322,12 +363,7 @@ adblock_parse_line (gchar* line) if (line[0] == '[') return NULL; g_strchomp (line); - /* TODO: Replace trailing '*' with '.*' */ - if (line[0] == '*') - return g_strconcat (".", line, NULL); - else if (line[0] == '?') - return g_strconcat ("\\", line, NULL); - return g_strdup (line); + return adblock_fixup_regexp (line); } static GHashTable* @@ -469,11 +505,11 @@ test_adblock_parse (void) g_assert_cmpstr (adblock_parse_line ("*foo"), ==, ".*foo"); g_assert_cmpstr (adblock_parse_line ("?foo"), ==, "\\?foo"); - /* g_assert_cmpstr (adblock_parse_line ("foo*"), ==, "foo.*"); - g_assert_cmpstr (adblock_parse_line ("foo?"), ==, "foo\\?"); */ + g_assert_cmpstr (adblock_parse_line ("foo*"), ==, "foo.*"); + g_assert_cmpstr (adblock_parse_line ("foo?"), ==, "foo\\?"); - g_assert_cmpstr (adblock_parse_line (".*foo/bar"), ==, ".*foo/bar"); - g_assert_cmpstr (adblock_parse_line ("http://bla.blub/.*"), ==, "http://bla.blub/.*"); + g_assert_cmpstr (adblock_parse_line (".*foo/bar"), ==, "\\..*foo/bar"); + g_assert_cmpstr (adblock_parse_line ("http://bla.blub/*"), ==, "http://bla\\.blub/.*"); } static void @@ -486,10 +522,10 @@ test_adblock_pattern (void) temp = g_file_open_tmp ("midori_adblock_match_test_XXXXXX", &filename, NULL); g_file_set_contents (filename, - "*ads.foo.bar.*\n" - ".*ads.bogus.name.*\n" - "http://ads.bla.blub/.*\n" - "http://ads.blub.boing/*.", + "*ads.foo.bar*\n" + "*ads.bogus.name*\n" + "http://ads.bla.blub/*\n" + "http://ads.blub.boing/*", -1, NULL); pattern = adblock_parse_file (filename); diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c index 741e73aa..e555b97c 100644 --- a/extensions/shortcuts.c +++ b/extensions/shortcuts.c @@ -14,6 +14,11 @@ #include #include "config.h" +static void +shortcuts_browser_populate_tool_menu_cb (MidoriBrowser* browser, + GtkWidget* menu, + MidoriExtension* extension); + static void shortcuts_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, @@ -21,13 +26,14 @@ shortcuts_app_add_browser_cb (MidoriApp* app, static void shortcuts_deactivate_cb (MidoriExtension* extension, - GtkWidget* menuitem) + MidoriBrowser* browser) { MidoriApp* app = midori_extension_get_app (extension); - gtk_widget_destroy (menuitem); g_signal_handlers_disconnect_by_func ( - extension, shortcuts_deactivate_cb, menuitem); + browser, shortcuts_browser_populate_tool_menu_cb, extension); + g_signal_handlers_disconnect_by_func ( + extension, shortcuts_deactivate_cb, browser); g_signal_handlers_disconnect_by_func ( app, shortcuts_app_add_browser_cb, extension); } @@ -163,7 +169,7 @@ shortcuts_get_preferences_dialog (MidoriExtension* extension) app = midori_extension_get_app (extension); browser = katze_object_get_object (app, "browser"); - dialog_title = _("Configure Keyboard shortcuts"); + dialog_title = _("Customize Keyboard shortcuts"); dialog = gtk_dialog_new_with_buttons (dialog_title, GTK_WINDOW (browser), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, #if !HAVE_OSX @@ -248,27 +254,29 @@ shortcuts_menu_configure_shortcuts_activate_cb (GtkWidget* menuitem, gtk_window_present (GTK_WINDOW (dialog)); } +static void +shortcuts_browser_populate_tool_menu_cb (MidoriBrowser* browser, + GtkWidget* menu, + MidoriExtension* extension) +{ + GtkWidget* menuitem; + + menuitem = gtk_menu_item_new_with_mnemonic (_("Customize Sh_ortcuts...")); + g_signal_connect (menuitem, "activate", + G_CALLBACK (shortcuts_menu_configure_shortcuts_activate_cb), extension); + gtk_widget_show (menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); +} + static void shortcuts_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, MidoriExtension* extension) { - GtkWidget* panel; - GtkWidget* menu; - GtkWidget* menuitem; - - panel = katze_object_get_object (browser, "panel"); - menu = katze_object_get_object (panel, "menu"); - g_object_unref (panel); - menuitem = gtk_menu_item_new_with_mnemonic (_("Configure Sh_ortcuts...")); - g_signal_connect (menuitem, "activate", - G_CALLBACK (shortcuts_menu_configure_shortcuts_activate_cb), extension); - gtk_widget_show (menuitem); - gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 3); - g_object_unref (menu); - + g_signal_connect (browser, "populate-tool-menu", + G_CALLBACK (shortcuts_browser_populate_tool_menu_cb), extension); g_signal_connect (extension, "deactivate", - G_CALLBACK (shortcuts_deactivate_cb), menuitem); + G_CALLBACK (shortcuts_deactivate_cb), browser); } static void diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c index d2a4025e..d4827a83 100644 --- a/extensions/tab-panel.c +++ b/extensions/tab-panel.c @@ -19,6 +19,11 @@ tab_panel_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, MidoriExtension* extension); +static void +tab_panel_settings_notify_cb (MidoriWebSettings* settings, + GParamSpec* pspec, + GtkTreeModel* model); + static void tab_panel_deactivate_cb (MidoriExtension* extension, GtkWidget* panel) @@ -37,6 +42,8 @@ tab_panel_deactivate_cb (MidoriExtension* extension, extension, tab_panel_deactivate_cb, panel); g_signal_handlers_disconnect_by_func ( app, tab_panel_app_add_browser_cb, extension); + g_signal_handlers_disconnect_by_func ( + browser, tab_panel_settings_notify_cb, model); } static void @@ -46,6 +53,36 @@ 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, + gint y, + gboolean keyboard_tip, + GtkTooltip* tooltip, + gpointer user_data) +{ + GtkTreeIter iter; + GtkTreePath* path; + GtkTreeModel* model; + MidoriView* view; + + if (!gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (treeview), + &x, &y, keyboard_tip, &model, &path, &iter)) + return FALSE; + + gtk_tree_model_get (model, &iter, 0, &view, -1); + + gtk_tooltip_set_text (tooltip, midori_view_get_display_title (view)); + gtk_tree_view_set_tooltip_row (GTK_TREE_VIEW (treeview), tooltip, path); + + gtk_tree_path_free (path); + g_object_unref (view); + + return TRUE; +} +#endif + static void midori_extension_treeview_render_icon_cb (GtkTreeViewColumn* column, GtkCellRenderer* renderer, @@ -75,7 +112,8 @@ midori_extension_treeview_render_text_cb (GtkTreeViewColumn* column, gtk_tree_model_get (model, iter, 0, &view, -1); - g_object_set (renderer, "text", midori_view_get_display_title (view), NULL); + g_object_set (renderer, "text", midori_view_get_display_title (view), + "ellipsize", midori_view_get_label_ellipsize (view), NULL); g_object_unref (view); } @@ -136,7 +174,13 @@ midori_extension_button_release_event_cb (GtkWidget* widget, if (event->button == 1) { MidoriBrowser* browser = midori_browser_get_for_widget (widget); - midori_browser_set_current_tab (browser, view); + GtkTreeViewColumn* column; + 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); + else + midori_browser_set_current_tab (browser, view); } else if (event->button == 2) gtk_widget_destroy (view); @@ -176,6 +220,20 @@ midori_extension_popup_menu_cb (GtkWidget* widget, } } +static void +tab_panel_settings_notify_cb (MidoriWebSettings* settings, + GParamSpec* pspec, + GtkTreeModel* model) +{ + gboolean buttons = katze_object_get_boolean (settings, "close-buttons-on-tabs"); + guint i; + GtkTreeIter iter; + + i = 0; + while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i++)) + gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 2, buttons, -1); +} + static void tab_panel_browser_add_tab_cb (MidoriBrowser* browser, GtkWidget* view, @@ -185,9 +243,16 @@ tab_panel_browser_add_tab_cb (MidoriBrowser* browser, GtkTreeIter iter; GtkWidget* notebook = katze_object_get_object (browser, "notebook"); gint page = gtk_notebook_page_num (GTK_NOTEBOOK (notebook), view); - g_object_unref (notebook); + MidoriWebSettings* settings = katze_object_get_object (browser, "settings"); + gboolean buttons = katze_object_get_boolean (settings, "close-buttons-on-tabs"); + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), - &iter, NULL, page, 0, view, -1); + &iter, NULL, page, 0, view, 1, GTK_STOCK_CLOSE, 2, buttons, -1); + g_signal_connect (settings, "notify::close-buttons-on-tabs", + G_CALLBACK (tab_panel_settings_notify_cb), model); + + g_object_unref (notebook); + g_object_unref (settings); } static void @@ -247,6 +312,12 @@ tab_panel_app_add_browser_cb (MidoriApp* app, model = g_object_get_data (G_OBJECT (extension), "treemodel"); 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); @@ -254,10 +325,17 @@ tab_panel_app_add_browser_cb (MidoriApp* app, (GtkTreeCellDataFunc)midori_extension_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_extension_treeview_render_text_cb, treeview, NULL); + gtk_tree_view_column_set_expand (column, TRUE); + gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer_pixbuf, + "stock-id", 1, "follow-state", 2, "visible", 2, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); g_object_connect (treeview, "signal::row-activated", @@ -313,7 +391,8 @@ tab_panel_activate_cb (MidoriExtension* extension, MidoriBrowser* browser; guint i; - model = gtk_tree_store_new (1, MIDORI_TYPE_VIEW); + model = gtk_tree_store_new (3, MIDORI_TYPE_VIEW, + G_TYPE_STRING, G_TYPE_BOOLEAN); g_object_set_data (G_OBJECT (extension), "treemodel", model); browsers = katze_object_get_object (app, "browsers"); diff --git a/extensions/toolbar-editor.c b/extensions/toolbar-editor.c index 5e6f96eb..dd038a94 100644 --- a/extensions/toolbar-editor.c +++ b/extensions/toolbar-editor.c @@ -48,16 +48,17 @@ 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_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext); -static void tb_editor_deactivate_cb(MidoriExtension *extension, GtkWidget *menuitem) +static void tb_editor_deactivate_cb(MidoriExtension *extension, MidoriBrowser *browser) { MidoriApp *app = midori_extension_get_app(extension); - gtk_widget_destroy(menuitem); - g_signal_handlers_disconnect_by_func(extension, tb_editor_deactivate_cb, menuitem); + g_signal_handlers_disconnect_by_func(browser, tb_editor_browser_populate_tool_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); } @@ -571,24 +572,21 @@ 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_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext) { - GtkWidget *panel; - GtkWidget *menu; - GtkWidget *menuitem; - - panel = katze_object_get_object(browser, "panel"); - menu = katze_object_get_object(panel, "menu"); - g_object_unref(panel); - menuitem = gtk_menu_item_new_with_mnemonic(_("Configure _Toolbar...")); - g_signal_connect(menuitem, "activate", - G_CALLBACK(tb_editor_menu_configure_toolbar_activate_cb), browser); - gtk_widget_show(menuitem); - gtk_menu_shell_insert(GTK_MENU_SHELL (menu), menuitem, 3); - g_object_unref(menu); - - g_signal_connect(ext, "deactivate", G_CALLBACK(tb_editor_deactivate_cb), menuitem); + g_signal_connect(browser, "populate-tool-menu", G_CALLBACK(tb_editor_browser_populate_tool_menu_cb), ext); + g_signal_connect(ext, "deactivate", G_CALLBACK(tb_editor_deactivate_cb), browser); } diff --git a/extensions/wscript_build b/extensions/wscript_build index 751162ad..8f84a173 100644 --- a/extensions/wscript_build +++ b/extensions/wscript_build @@ -6,9 +6,6 @@ import os extensions = os.listdir ('extensions') for extension in extensions: - # Adblock is incomplete and not ready for release - if extension == 'adblock.c': - continue folder = 'extensions' + os.sep + extension if os.path.isdir (folder): files = os.listdir (folder) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index 96c25cb1..1fb6b925 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -307,6 +307,10 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, g_object_unref (icon); } gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); + #if GTK_CHECK_VERSION (2, 16, 0) + gtk_image_menu_item_set_always_show_image ( + GTK_IMAGE_MENU_ITEM (menuitem), TRUE); + #endif gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); if (KATZE_IS_ARRAY (item)) @@ -499,6 +503,10 @@ katze_array_action_proxy_create_menu_proxy_cb (GtkWidget* proxy, g_object_unref (icon); } gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); + #if GTK_CHECK_VERSION (2, 16, 0) + gtk_image_menu_item_set_always_show_image ( + GTK_IMAGE_MENU_ITEM (menuitem), TRUE); + #endif g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); g_signal_connect (menuitem, "button-press-event", G_CALLBACK (katze_array_action_menu_button_press_cb), array_action); diff --git a/katze/katze-item.c b/katze/katze-item.c index d96490cb..a63afd45 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -24,7 +24,7 @@ * several commonly needed properties. */ -G_DEFINE_TYPE (KatzeItem, katze_item, G_TYPE_OBJECT) +G_DEFINE_TYPE (KatzeItem, katze_item, G_TYPE_OBJECT); enum { @@ -39,6 +39,14 @@ enum PROP_PARENT }; +enum { + META_DATA_CHANGED, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + static void katze_item_finalize (GObject* object); @@ -60,6 +68,26 @@ katze_item_class_init (KatzeItemClass* class) GObjectClass* gobject_class; GParamFlags flags; + /** + * KatzeItem::meta-data-changed: + * @item: the object on which the signal is emitted + * @key: the key that changed + * + * Emitted when a meta data value was changed. + * + * Since: 0.1.9 + */ + signals[META_DATA_CHANGED] = g_signal_new ( + "meta-data-changed", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = katze_item_finalize; gobject_class->set_property = katze_item_set_property; @@ -482,7 +510,7 @@ katze_item_set_meta_data_value (KatzeItem* item, g_hash_table_insert (item->metadata, g_strdup (&key[7]), value); else g_hash_table_insert (item->metadata, g_strdup (key), value); - /* TODO: Emit meta-key-changed */ + g_signal_emit (item, signals[META_DATA_CHANGED], 0, key); } /** diff --git a/midori/main.c b/midori/main.c index 6ed70b6a..4852a150 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1335,7 +1335,6 @@ midori_load_session (gpointer data) return FALSE; } -#ifdef HAVE_JSCORE static gint midori_run_script (const gchar* filename) { @@ -1373,7 +1372,6 @@ midori_run_script (const gchar* filename) g_print ("%s - Exception: %s\n", filename, exception); return 1; } -#endif #if WEBKIT_CHECK_VERSION (1, 1, 6) static void @@ -1415,6 +1413,20 @@ midori_web_app_browser_notify_load_status_cb (MidoriBrowser* browser, } } +static void +midori_remove_config_file (gint clear_prefs, + gint flag, + const gchar* filename) +{ + if ((clear_prefs & flag) == flag) + { + gchar* config_file = build_config_filename (filename); + if (is_writable (config_file)) + g_unlink (config_file); + g_free (config_file); + } +} + int main (int argc, char** argv) @@ -1435,10 +1447,8 @@ main (int argc, N_("Run ADDRESS as a web application"), N_("ADDRESS") }, { "config", 'c', 0, G_OPTION_ARG_FILENAME, &config, N_("Use FOLDER as configuration folder"), N_("FOLDER") }, - #ifdef HAVE_JSCORE { "run", 'r', 0, G_OPTION_ARG_NONE, &run, N_("Run the specified filename as javascript"), NULL }, - #endif #if WEBKIT_CHECK_VERSION (1, 1, 6) { "snapshot", 's', 0, G_OPTION_ARG_STRING, &snapshot, N_("Take a snapshot of the specified URI"), NULL }, @@ -1472,6 +1482,7 @@ main (int argc, #if HAVE_HILDON osso_context_t* osso_context; #endif + gint clear_prefs = MIDORI_CLEAR_NONE; #if ENABLE_NLS setlocale (LC_ALL, ""); @@ -1589,11 +1600,9 @@ main (int argc, return 0; } - #ifdef HAVE_JSCORE /* Standalone javascript support */ if (run) return midori_run_script (uris ? *uris : NULL); - #endif #if HAVE_HILDON osso_context = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL); @@ -1931,12 +1940,35 @@ main (int argc, osso_deinitialize (osso_context); #endif - #if HAVE_SQLITE settings = katze_object_get_object (app, "settings"); + #if HAVE_SQLITE g_object_get (settings, "maximum-history-age", &max_history_age, NULL); - g_object_unref (settings); midori_history_terminate (db, max_history_age); #endif + + /* Clear data on quit, according to the Clear private data dialog */ + g_object_get (settings, "clear-private-data", &clear_prefs, NULL); + #if HAVE_SQLITE + midori_remove_config_file (clear_prefs, MIDORI_CLEAR_HISTORY, "history.db"); + #endif + midori_remove_config_file (clear_prefs, MIDORI_CLEAR_COOKIES, "cookies.txt"); + if ((clear_prefs & MIDORI_CLEAR_FLASH_COOKIES) == MIDORI_CLEAR_FLASH_COOKIES) + { + gchar* cache = g_build_filename (g_get_home_dir (), ".macromedia", + "Flash_Player", NULL); + sokoke_remove_path (cache, TRUE); + g_free (cache); + } + if ((clear_prefs & MIDORI_CLEAR_WEBSITE_ICONS) == MIDORI_CLEAR_WEBSITE_ICONS) + { + gchar* cache = g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, "icons", NULL); + sokoke_remove_path (cache, TRUE); + g_free (cache); + } + midori_remove_config_file (clear_prefs, MIDORI_CLEAR_TRASH, "tabtrash.xbel"); + + g_object_unref (settings); g_object_unref (app); g_free (config_file); return 0; diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f03a525f..5e5ee274 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -50,7 +50,6 @@ struct _MidoriBrowser GtkWidget* menu_tools; GtkWidget* throbber; GtkWidget* navigationbar; - GtkWidget* bookmark_popup; GtkWidget* bookmarkbar; GtkToolItem* homepage; @@ -133,21 +132,12 @@ enum CONTEXT_READY, ADD_DOWNLOAD, SEND_NOTIFICATION, + POPULATE_TOOL_MENU, QUIT, LAST_SIGNAL }; -enum -{ - MIDORI_CLEAR_NONE = 0, - MIDORI_CLEAR_HISTORY = 1, - MIDORI_CLEAR_COOKIES = 2, - MIDORI_CLEAR_FLASH_COOKIES = 4, - MIDORI_CLEAR_WEBSITE_ICONS = 8, - MIDORI_CLEAR_TRASH = 16 -}; - static guint signals[LAST_SIGNAL]; static void @@ -176,6 +166,15 @@ static void _midori_browser_set_toolbar_style (MidoriBrowser* browser, MidoriToolbarStyle toolbar_style); +GtkWidget* +midori_panel_construct_menu_item (MidoriPanel* panel, + MidoriViewable* viewable); + +static void +midori_browser_settings_notify (MidoriWebSettings* web_settings, + GParamSpec* pspec, + MidoriBrowser* browser); + static GtkAction* _action_by_name (MidoriBrowser* browser, const gchar* name) @@ -353,12 +352,8 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser, MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action); if (text && *text) { - static GdkPixbuf* blank = NULL; - if (G_UNLIKELY (!blank)) - blank = gdk_pixbuf_new_from_data ((guchar*)"", - GDK_COLORSPACE_RGB, TRUE, 8, 1, 1, 1, NULL, NULL); midori_location_action_set_uri (location_action, text); - midori_location_action_set_icon (location_action, blank); + midori_location_action_set_icon (location_action, NULL); midori_location_action_set_secondary_icon (location_action, NULL); } else @@ -1094,6 +1089,33 @@ midori_view_attach_inspector_cb (GtkWidget* view, browser->inspector_view = inspector_view; } +static void +midori_browser_view_copy_history (GtkWidget* view_to, + GtkWidget* view_from, + gboolean omit_last) +{ + WebKitWebView* copy_from; + WebKitWebBackForwardList* list_from; + WebKitWebView* copy_to; + WebKitWebBackForwardList* list_to; + guint length_from; + gint i; + + copy_from = WEBKIT_WEB_VIEW (gtk_bin_get_child (GTK_BIN (view_from))); + list_from = webkit_web_view_get_back_forward_list (copy_from); + copy_to = WEBKIT_WEB_VIEW (gtk_bin_get_child (GTK_BIN (view_to))); + list_to = webkit_web_view_get_back_forward_list (copy_to); + length_from = webkit_web_back_forward_list_get_back_length (list_from); + + g_return_if_fail (!webkit_web_back_forward_list_get_back_length (list_to)); + + for (i = -length_from; i <= (omit_last ? -1 : 0); i++) + { + webkit_web_back_forward_list_add_item (list_to, + webkit_web_back_forward_list_get_nth_item (list_from, i)); + } +} + static void midori_view_new_tab_cb (GtkWidget* view, const gchar* uri, @@ -1101,7 +1123,11 @@ midori_view_new_tab_cb (GtkWidget* view, MidoriBrowser* browser) { gint n = midori_browser_add_uri (browser, uri); - _midori_browser_set_current_page_smartly (browser, n); + midori_browser_view_copy_history (midori_browser_get_nth_tab (browser, n), + view, FALSE); + + if (!background) + midori_browser_set_current_page (browser, n); } static void @@ -1120,6 +1146,7 @@ midori_view_new_view_cb (GtkWidget* view, MidoriNewView where, MidoriBrowser* browser) { + midori_browser_view_copy_history (new_view, view, TRUE); if (where == MIDORI_NEW_VIEW_WINDOW) { MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, NULL); @@ -1173,7 +1200,7 @@ midori_browser_download_notify_status_cb (WebKitDownload* download, gchar* path = soup_uri_decode (uri); gchar* filename = g_strrstr (path, "/") + 1; gchar* msg = g_strdup_printf ( - _("The file %s has been downloaded."), filename); + _("The file '%s' has been downloaded."), filename); g_free (path); g_signal_emit (browser, signals[SEND_NOTIFICATION], 0, @@ -1699,6 +1726,27 @@ midori_browser_class_init (MidoriBrowserClass* class) G_TYPE_STRING, G_TYPE_STRING); + /** + * MidoriBrowser::populate-tool-menu: + * @browser: the object on which the signal is emitted + * @menu: the #GtkMenu to populate + * + * Emitted when a Tool menu is displayed, such as the + * toplevel Tools in the menubar or the compact menu. + * + * Since: 0.1.9 + */ + signals[POPULATE_TOOL_MENU] = g_signal_new ( + "populate-tool-menu", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_MENU); + signals[QUIT] = g_signal_new ( "quit", G_TYPE_FROM_CLASS (class), @@ -2345,7 +2393,7 @@ midori_browser_get_toolbar_actions (MidoriBrowser* browser) static const gchar* actions[] = { "WindowNew", "TabNew", "Open", "SaveAs", "Print", "Find", "Fullscreen", "Preferences", "Window", "Bookmarks", - "RecentlyVisited", "ReloadStop", "ZoomIn", + "RecentlyVisited", "ReloadStop", "ZoomIn", "TabClose", "ZoomOut", "Separator", "Back", "Forward", "Homepage", "Panel", "Trash", "Search", NULL }; @@ -2485,6 +2533,59 @@ _action_bookmarks_activate_item (GtkAction* action, gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } +static void +_action_tools_populate_popup (GtkAction* action, + GtkMenu* menu, + MidoriBrowser* browser) +{ + static const GtkActionEntry actions[] = { + { "ManageSearchEngines" }, + { "ClearPrivateData" }, + { "-" }, + { NULL }, + { "p" }, + #ifdef G_OS_WIN32 + { NULL }, + { "Preferences" }, + #endif + }; + guint i; + + for (i = 0; i < G_N_ELEMENTS (actions); i++) + { + GtkWidget* menuitem; + if (actions[i].name != NULL) + { + if (actions[i].name[0] == '-') + { + g_signal_emit (browser, signals[POPULATE_TOOL_MENU], 0, menu); + continue; + } + else if (actions[i].name[0] == 'p') + { + MidoriPanel* panel; + gsize j; + GtkWidget* widget; + + panel = MIDORI_PANEL (browser->panel); + j = 0; + while ((widget = midori_panel_get_nth_page (panel, j++))) + { + menuitem = midori_panel_construct_menu_item (panel, MIDORI_VIEWABLE (widget)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + } + continue; + } + menuitem = sokoke_action_create_popup_menu_item ( + _action_by_name (browser, actions[i].name)); + } + else + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + } +} + static gboolean _action_menus_activate_item_alt (GtkAction* action, KatzeItem* item, @@ -2546,16 +2647,17 @@ _action_compact_menu_populate_popup (GtkAction* action, { "TabNew" }, { "WindowNew" }, { "Open" }, - { "PrivateBrowsing" }, { "Print" }, + { "PrivateBrowsing" }, { NULL }, { "Bookmarkbar" }, { "Panel" }, { "Statusbar" }, { NULL }, + { "-" }, + { "ClearPrivateData" }, { "Fullscreen" }, { "Preferences" }, - { "ClearPrivateData" }, }; guint i; @@ -2563,14 +2665,20 @@ _action_compact_menu_populate_popup (GtkAction* action, { GtkWidget* menuitem; if (actions[i].name != NULL) + { + if (actions[i].name[0] == '-') + { + g_signal_emit (browser, signals[POPULATE_TOOL_MENU], 0, menu); + continue; + } menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, actions[i].name)); + } else menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); } - - gtk_widget_show_all (GTK_WIDGET (menu)); } static void @@ -3024,32 +3132,6 @@ midori_browser_bookmark_homepage_clicked_cb (GtkToolItem* button, gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } -static void -midori_browser_position_popup (GtkWidget* popup, - GtkWidget* widget) -{ - gint wx, wy; - GtkRequisition menu_req; - GtkRequisition widget_req; - - if (GTK_WIDGET_NO_WINDOW (widget)) - { - gdk_window_get_position (widget->window, &wx, &wy); - wx += widget->allocation.x; - wy += widget->allocation.y; - } - else - gdk_window_get_origin (widget->window, &wx, &wy); - gtk_widget_size_request (popup, &menu_req); - gtk_widget_size_request (widget, &widget_req); - - gtk_widget_show_all (popup); - gtk_window_move (GTK_WINDOW (popup), - wx, wy + widget_req.height); - gtk_window_resize (GTK_WINDOW (popup), - widget->allocation.width, 1); -} - static void browser_bookmarks_add_item_cb (KatzeArray* array, KatzeItem* item, @@ -3061,53 +3143,6 @@ _action_location_focus_in (GtkAction* action, { midori_location_action_set_secondary_icon ( MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); - if (!GTK_WIDGET_VISIBLE (browser->bookmarkbar)) - { - GSList* proxies = gtk_action_get_proxies (action); - GtkWidget* proxy = g_slist_nth_data (proxies, 0); - - if (G_UNLIKELY (!browser->bookmark_popup)) - { - GtkWidget* popup = gtk_window_new (GTK_WINDOW_POPUP); - GtkWidget* box = gtk_toolbar_new (); - gchar* homepage = NULL; - guint i; - KatzeItem* item; - - /* FIXME: Resize popup to avoid overflowing items */ - /* FIXME: Take care of added and removed items */ - if (browser->settings) - g_object_get (browser->settings, "homepage", &homepage, NULL); - if (homepage && homepage) - { - GtkToolItem* toolitem; - - toolitem = gtk_tool_button_new_from_stock (STOCK_HOMEPAGE); - gtk_tool_item_set_is_important (toolitem, TRUE); - gtk_widget_show (GTK_WIDGET (toolitem)); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_browser_bookmark_homepage_clicked_cb), - browser); - gtk_toolbar_insert (GTK_TOOLBAR (box), toolitem, -1); - } - - gtk_container_add (GTK_CONTAINER (popup), box); - gtk_window_set_transient_for (GTK_WINDOW (popup), GTK_WINDOW (browser)); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (box), GTK_ICON_SIZE_MENU); - gtk_toolbar_set_style (GTK_TOOLBAR (box), GTK_TOOLBAR_BOTH_HORIZ); - i = 0; - if (browser->bookmarks) - while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) - browser_bookmarks_add_item_cb (browser->bookmarks, item, box); - browser->bookmark_popup = popup; - g_signal_connect (popup, "destroy", - G_CALLBACK (gtk_widget_destroyed), &browser->bookmark_popup); - } - - if (!GTK_IS_TOOL_ITEM (proxy)) - proxy = g_slist_nth_data (proxies, 1); - midori_browser_position_popup (browser->bookmark_popup, proxy); - } } static void @@ -3116,9 +3151,6 @@ _action_location_focus_out (GtkAction* action, { GtkWidget* view = midori_browser_get_current_tab (browser); - if (browser->bookmark_popup) - gtk_widget_hide (browser->bookmark_popup); - if (!browser->show_navigationbar) gtk_widget_hide (browser->navigationbar); @@ -3712,6 +3744,16 @@ midori_browser_clear_private_data_response_cb (GtkWidget* dialog, gtk_widget_destroy (dialog); } +static void +midori_browser_clear_on_quit_toggled_cb (GtkToggleButton* button, + MidoriWebSettings* settings) +{ + gint clear_prefs = MIDORI_CLEAR_NONE; + g_object_get (settings, "clear-private-data", &clear_prefs, NULL); + clear_prefs ^= MIDORI_CLEAR_ON_QUIT; + g_object_set (settings, "clear-private-data", clear_prefs, NULL); +} + static void _action_clear_private_data_activate (GtkAction* action, MidoriBrowser* browser) @@ -3783,7 +3825,7 @@ _action_clear_private_data_activate (GtkAction* action, gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); g_object_set_data (G_OBJECT (dialog), "website-icons", button); gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); - button = gtk_check_button_new_with_mnemonic (_("_Closed Tabs and Windows")); + button = gtk_check_button_new_with_mnemonic (_("_Closed Tabs")); if ((clear_prefs & MIDORI_CLEAR_TRASH) == MIDORI_CLEAR_TRASH) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); g_object_set_data (G_OBJECT (dialog), "trash", button); @@ -3791,6 +3833,15 @@ _action_clear_private_data_activate (GtkAction* action, gtk_container_add (GTK_CONTAINER (alignment), vbox); gtk_box_pack_start (GTK_BOX (hbox), alignment, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0); + button = gtk_check_button_new_with_mnemonic (_("Clear private data when _quitting Midori")); + if ((clear_prefs & MIDORI_CLEAR_ON_QUIT) == MIDORI_CLEAR_ON_QUIT) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); + g_signal_connect (button, "toggled", + G_CALLBACK (midori_browser_clear_on_quit_toggled_cb), browser->settings); + alignment = gtk_alignment_new (0, 0, 1, 1); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 2, 0); + gtk_container_add (GTK_CONTAINER (alignment), button); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), alignment, FALSE, FALSE, 0); gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); g_signal_connect (dialog, "response", @@ -3951,6 +4002,38 @@ midori_panel_notify_page_cb (MidoriPanel* panel, g_object_set (browser->settings, "last-panel-page", page, NULL); } +static void +midori_panel_notify_show_titles_cb (MidoriPanel* panel, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + gboolean show_titles = katze_object_get_boolean (panel, "show-titles"); + if (browser->settings) + { + g_signal_handlers_block_by_func (browser->settings, + midori_browser_settings_notify, browser); + g_object_set (browser->settings, "compact-sidepanel", !show_titles, NULL); + g_signal_handlers_unblock_by_func (browser->settings, + midori_browser_settings_notify, browser); + } +} + +static void +midori_panel_notify_show_controls_cb (MidoriPanel* panel, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + gboolean show_controls = katze_object_get_boolean (panel, "show-controls"); + if (browser->settings) + { + g_signal_handlers_block_by_func (browser->settings, + midori_browser_settings_notify, browser); + g_object_set (browser->settings, "show-panel-controls", show_controls, NULL); + g_signal_handlers_unblock_by_func (browser->settings, + midori_browser_settings_notify, browser); + } +} + static void midori_panel_notify_right_aligned_cb (MidoriPanel* panel, GParamSpec* pspec, @@ -4110,7 +4193,7 @@ _action_trash_empty_activate (GtkAction* action, static const GtkActionEntry entries[] = { { "File", NULL, N_("_File") }, { "WindowNew", STOCK_WINDOW_NEW, - NULL, "n", + N_("New _Window"), "n", N_("Open a new window"), G_CALLBACK (_action_window_new_activate) }, { "TabNew", STOCK_TAB_NEW, NULL, "t", @@ -4124,7 +4207,7 @@ static const GtkActionEntry entries[] = { { "AddSpeedDial", NULL, N_("Add to Speed _dial"), "h", N_("Add shortcut to speed dial"), G_CALLBACK (_action_add_speed_dial_activate) }, - { "TabClose", NULL, + { "TabClose", GTK_STOCK_CLOSE, N_("_Close Tab"), "w", N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) }, { "WindowClose", NULL, @@ -4159,7 +4242,7 @@ static const GtkActionEntry entries[] = { { "Find", GTK_STOCK_FIND, NULL, "f", N_("Find a word or phrase in the page"), G_CALLBACK (_action_find_activate) }, - { "FindNext", GTK_STOCK_GO_FORWARD, + { "FindNext", NULL, N_("Find _Next"), "g", N_("Find the next occurrence of a word or phrase"), G_CALLBACK (_action_find_next_activate) }, { "FindPrevious", GTK_STOCK_GO_BACK, @@ -4222,15 +4305,14 @@ static const GtkActionEntry entries[] = { { "BookmarkAdd", STOCK_BOOKMARK_ADD, NULL, "d", N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) }, - { "BookmarkFolderAdd", GTK_STOCK_DIRECTORY, + { "BookmarkFolderAdd", NULL, N_("Add a new _folder"), "", N_("Add a new bookmark folder"), G_CALLBACK (_action_bookmark_folder_add_activate) }, - { "Tools", NULL, N_("_Tools") }, { "ManageSearchEngines", GTK_STOCK_PROPERTIES, N_("_Manage Search Engines"), "s", N_("Add, edit and remove search engines..."), G_CALLBACK (_action_manage_search_engines_activate) }, - { "ClearPrivateData", GTK_STOCK_CLEAR, + { "ClearPrivateData", NULL, N_("_Clear Private Data"), "Delete", N_("Clear private data..."), G_CALLBACK (_action_clear_private_data_activate) }, @@ -4479,15 +4561,7 @@ static const gchar* ui_markup = "" "" "" - "" - "" - "" - /* Panel items shall be appended here */ - #ifdef G_OS_WIN32 - "" - "" - #endif - "" + "" "" "" "" @@ -4502,10 +4576,13 @@ static const gchar* ui_markup = "" "" "" + "" + "" "" "" "" "" + "" "" "" "" @@ -4695,7 +4772,6 @@ midori_browser_init (MidoriBrowser* browser) browser->net = katze_net_new (); - browser->bookmark_popup = NULL; browser->settings = midori_web_settings_new (); browser->proxy_array = katze_array_new (KATZE_TYPE_ARRAY); browser->bookmarks = NULL; @@ -4861,6 +4937,18 @@ midori_browser_init (MidoriBrowser* browser) gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); + action = g_object_new (KATZE_TYPE_ARRAY_ACTION, + "name", "Tools", + "label", _("_Tools"), + "array", katze_array_new (KATZE_TYPE_ITEM), + NULL); + g_object_connect (action, + "signal::populate-popup", + _action_tools_populate_popup, browser, + NULL); + gtk_action_group_add_action (browser->action_group, action); + g_object_unref (action); + action = g_object_new (KATZE_TYPE_ARRAY_ACTION, "name", "Window", "label", _("_Window"), @@ -4922,20 +5010,19 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_set_sensitive (menuitem, FALSE); gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menubar), menuitem); - browser->menu_tools = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( - gtk_ui_manager_get_widget (ui_manager, "/menubar/Tools"))); - menuitem = gtk_separator_menu_item_new (); - gtk_widget_show (menuitem); - gtk_menu_shell_insert (GTK_MENU_SHELL (browser->menu_tools), menuitem, 3); + browser->menu_tools = gtk_menu_new (); + + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM ( + gtk_ui_manager_get_widget (ui_manager, "/menubar/File/WindowNew")), NULL); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM ( + gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Location")), NULL); homepage = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Homepage"); g_signal_connect (homepage, "button-press-event", G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser); - back = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Back"); g_signal_connect (back, "button-press-event", G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser); - forward = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Forward"); g_signal_connect (forward, "button-press-event", G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser); @@ -5004,12 +5091,18 @@ midori_browser_init (MidoriBrowser* browser) browser->panel = g_object_new (MIDORI_TYPE_PANEL, "menu", browser->menu_tools, NULL); - g_signal_connect (browser->panel, "notify::page", - G_CALLBACK (midori_panel_notify_page_cb), browser); - g_signal_connect (browser->panel, "notify::right-aligned", - G_CALLBACK (midori_panel_notify_right_aligned_cb), browser); - g_signal_connect (browser->panel, "close", - G_CALLBACK (midori_panel_close_cb), browser); + g_object_connect (browser->panel, + "signal::notify::page", + midori_panel_notify_page_cb, browser, + "signal::notify::show-titles", + midori_panel_notify_show_titles_cb, browser, + "signal::notify::show-controls", + midori_panel_notify_show_controls_cb, browser, + "signal::notify::right-aligned", + midori_panel_notify_right_aligned_cb, browser, + "signal::close", + midori_panel_close_cb, browser, + NULL); gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); /* Notebook, containing all views */ @@ -5307,7 +5400,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) gboolean remember_last_window_size; gint last_window_width, last_window_height; MidoriWindowState last_window_state; - gboolean compact_sidepanel, right_align_sidepanel; + gboolean compact_sidepanel, show_panel_controls, right_align_sidepanel; gint last_panel_position, last_panel_page; gboolean show_menubar, show_bookmarkbar; gboolean show_panel, show_transferbar; @@ -5328,6 +5421,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "last-window-height", &last_window_height, "last-window-state", &last_window_state, "compact-sidepanel", &compact_sidepanel, + "show-panel-controls", &show_panel_controls, "right-align-sidepanel", &right_align_sidepanel, "last-panel-position", &last_panel_position, "last-panel-page", &last_panel_page, @@ -5401,9 +5495,9 @@ _midori_browser_update_settings (MidoriBrowser* browser) } } - midori_panel_set_compact (MIDORI_PANEL (browser->panel), compact_sidepanel); - midori_panel_set_right_aligned (MIDORI_PANEL (browser->panel), - right_align_sidepanel); + g_object_set (browser->panel, "show-titles", !compact_sidepanel, + "show-controls", show_panel_controls, + "right-aligned", right_align_sidepanel, NULL); gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)), last_panel_position); /* The browser may not yet be visible, which means that we can't set the @@ -5447,8 +5541,11 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, else if (name == g_intern_string ("toolbar-items")) _midori_browser_set_toolbar_items (browser, g_value_get_string (&value)); else if (name == g_intern_string ("compact-sidepanel")) - midori_panel_set_compact (MIDORI_PANEL (browser->panel), - g_value_get_boolean (&value)); + g_object_set (browser->panel, "show-titles", + !g_value_get_boolean (&value), NULL); + else if (name == g_intern_string ("show-controls")) + g_object_set (browser->panel, "show-controls", + g_value_get_boolean (&value), NULL); else if (name == g_intern_string ("always-show-tabbar")) _toggle_tabbar_smartly (browser); else if (name == g_intern_string ("show-navigationbar")) @@ -6010,6 +6107,28 @@ midori_browser_get_current_page (MidoriBrowser* browser) return gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); } +/** + * midori_browser_get_nth_tab: + * @browser: a #MidoriBrowser + * @page: the index of a tab + * + * Retrieves the tab at the position @page. + * + * If there is no page present at all, %NULL is returned. + * + * Return value: the selected page, or -1 + * + * Since: 0.1.9 + **/ +GtkWidget* +midori_browser_get_nth_tab (MidoriBrowser* browser, + gint page) +{ + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); + + return gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), page); +} + /** * midori_browser_set_current_tab: * @browser: a #MidoriBrowser diff --git a/midori/midori-browser.h b/midori/midori-browser.h index 49d475d6..08340280 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -122,6 +122,10 @@ midori_browser_set_current_page (MidoriBrowser* browser, gint midori_browser_get_current_page (MidoriBrowser* browser); +GtkWidget* +midori_browser_get_nth_tab (MidoriBrowser* browser, + gint n); + void midori_browser_set_current_tab (MidoriBrowser* browser, GtkWidget* widget); diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 3d630fd1..dcae3f64 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1119,6 +1119,16 @@ midori_location_action_set_uri (MidoriLocationAction* location_action, midori_location_action_set_text (location_action, uri); } +/** + * midori_location_action_set_icon: + * @location_action: a #MidoriLocationAction + * @icon: a #GdkPixbuf or %NULL + * + * Sets the icon shown on the left hand side. + * + * Note: Since 0.1.8 %NULL can be passed to indicate that the + * visible URI refers to a target, not the current location. + **/ void midori_location_action_set_icon (MidoriLocationAction* location_action, GdkPixbuf* icon) @@ -1128,7 +1138,7 @@ midori_location_action_set_icon (MidoriLocationAction* location_action, GtkWidget* entry; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - g_return_if_fail (GDK_IS_PIXBUF (icon)); + g_return_if_fail (!icon || GDK_IS_PIXBUF (icon)); proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); @@ -1138,8 +1148,12 @@ midori_location_action_set_icon (MidoriLocationAction* location_action, location_entry = midori_location_action_entry_for_proxy (proxies->data); entry = gtk_bin_get_child (GTK_BIN (location_entry)); - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, icon); + if (icon) + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, icon); + else + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_JUMP_TO); } } diff --git a/midori/midori-panel.c b/midori/midori-panel.c index c299a9f4..6ae27e1c 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -23,6 +23,7 @@ struct _MidoriPanel { GtkHBox parent_instance; + GtkWidget* labelbar; GtkWidget* toolbar; GtkToolItem* button_align; GtkToolItem* button_detach; @@ -32,6 +33,8 @@ struct _MidoriPanel GtkWidget* notebook; GtkMenu* menu; + gboolean show_titles; + gboolean show_controls; gboolean right_aligned; }; @@ -53,6 +56,8 @@ enum PROP_SHADOW_TYPE, PROP_MENU, PROP_PAGE, + PROP_SHOW_TITLES, + PROP_SHOW_CONTROLS, PROP_RIGHT_ALIGNED, }; @@ -133,6 +138,15 @@ midori_panel_class_init (MidoriPanelClass* class) GTK_SHADOW_NONE, flags)); + /** + * MidoriWebSettings:menu: + * + * This is the menu that holds the panel menu items. + * + * You shouldn't use this menu or add items. + * + * Deprecated: 0.1.9 + */ g_object_class_install_property (gobject_class, PROP_MENU, g_param_spec_object ( @@ -151,6 +165,38 @@ midori_panel_class_init (MidoriPanelClass* class) -1, G_MAXINT, -1, flags)); + /** + * MidoriWebSettings:show-titles: + * + * Whether to show panel titles. + * + * Since: 0.1.9 + */ + g_object_class_install_property (gobject_class, + PROP_SHOW_TITLES, + g_param_spec_boolean ( + "show-titles", + "Show Titles", + "Whether to show panel titles", + TRUE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + /** + * MidoriWebSettings:show-controls: + * + * Whether to show operating controls. + * + * Since: 0.1.9 + */ + g_object_class_install_property (gobject_class, + PROP_SHOW_CONTROLS, + g_param_spec_boolean ( + "show-controls", + "Show Controls", + "Whether to show operating controls", + TRUE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** * MidoriWebSettings:right-aligned: * @@ -301,6 +347,8 @@ midori_panel_init (MidoriPanel* panel) GtkWidget* labelbar; GtkToolItem* toolitem; + panel->show_titles = TRUE; + panel->show_controls = TRUE; panel->right_aligned = FALSE; /* Create the sidebar */ @@ -317,6 +365,7 @@ midori_panel_init (MidoriPanel* panel) /* Create the titlebar */ labelbar = gtk_toolbar_new (); + 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); toolitem = gtk_tool_item_new (); @@ -329,6 +378,8 @@ midori_panel_init (MidoriPanel* panel) toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN); gtk_widget_set_sensitive (GTK_WIDGET (toolitem), FALSE); panel->button_detach = toolitem; + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), + _("Detach chosen panel from the window")); gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), _("Detach chosen panel from the window")); g_signal_connect (toolitem, "clicked", @@ -339,6 +390,8 @@ midori_panel_init (MidoriPanel* panel) gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); #endif toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), + _("Align sidepanel to the right")); gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), _("Align sidepanel to the right")); g_signal_connect (toolitem, "clicked", @@ -404,11 +457,23 @@ midori_panel_set_property (GObject* object, break; case PROP_MENU: katze_object_assign (panel->menu, g_value_dup_object (value)); - /* FIXME: Move existing items to the new menu */ break; case PROP_PAGE: midori_panel_set_current_page (panel, g_value_get_int (value)); break; + case PROP_SHOW_TITLES: + panel->show_titles = g_value_get_boolean (value); + #if HAVE_HILDON + panel->show_titles = TRUE; + #endif + gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), + panel->show_titles ? GTK_TOOLBAR_BOTH : GTK_TOOLBAR_ICONS); + break; + case PROP_SHOW_CONTROLS: + panel->show_controls = g_value_get_boolean (value); + sokoke_widget_set_visible (panel->labelbar, panel->show_controls); + sokoke_widget_set_visible (panel->toolbar, panel->show_controls); + break; case PROP_RIGHT_ALIGNED: midori_panel_set_right_aligned (panel, g_value_get_boolean (value)); break; @@ -438,6 +503,12 @@ midori_panel_get_property (GObject* object, case PROP_PAGE: g_value_set_int (value, midori_panel_get_current_page (panel)); break; + case PROP_SHOW_TITLES: + g_value_set_boolean (value, panel->show_titles); + break; + case PROP_SHOW_CONTROLS: + g_value_set_boolean (value, panel->show_controls); + break; case PROP_RIGHT_ALIGNED: g_value_set_boolean (value, panel->right_aligned); break; @@ -468,6 +539,8 @@ midori_panel_new (void) * @compact: %TRUE if the panel should be compact * * Determines if the panel should be compact. + * + * Deprecated: 0.1.9 **/ void midori_panel_set_compact (MidoriPanel* panel, @@ -475,11 +548,7 @@ midori_panel_set_compact (MidoriPanel* panel, { g_return_if_fail (MIDORI_IS_PANEL (panel)); - #if HAVE_HILDON - compact = TRUE; - #endif - gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), - compact ? GTK_TOOLBAR_ICONS : GTK_TOOLBAR_BOTH); + g_object_set (panel, "show-titles", !compact, NULL); } /** @@ -504,6 +573,9 @@ midori_panel_set_right_aligned (MidoriPanel* panel, gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (panel->button_align), right_aligned ? GTK_STOCK_GO_BACK : GTK_STOCK_GO_FORWARD); panel->right_aligned = right_aligned; + gtk_tool_button_set_label (GTK_TOOL_BUTTON (panel->button_align), + !panel->right_aligned ? _("Align sidepanel to the right") + : _("Align sidepanel to the left")); gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (panel->button_align), !panel->right_aligned ? _("Align sidepanel to the right") : _("Align sidepanel to the left")); @@ -515,26 +587,46 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, MidoriPanel* panel) { GtkWidget* child; - GtkToggleToolButton* toolitem; + GtkToolItem* toolitem; guint n; child = g_object_get_data (G_OBJECT (widget), "page"); - toolitem = g_object_get_data (G_OBJECT (widget), "toolitem"); + n = midori_panel_page_num (panel, child); + toolitem = gtk_toolbar_get_nth_item (GTK_TOOLBAR (panel->toolbar), n); if (toolitem) { /* Unsetting the button before setting it ensures that it will emit signals even if it was active before */ - gtk_toggle_tool_button_set_active (toolitem, FALSE); - gtk_toggle_tool_button_set_active (toolitem, TRUE); - } - else - { - n = midori_panel_page_num (panel, child); - midori_panel_set_current_page (panel, n); - g_signal_emit (panel, signals[SWITCH_PAGE], 0, n); - gtk_widget_show (GTK_WIDGET (panel)); + GtkToggleToolButton* button = GTK_TOGGLE_TOOL_BUTTON (toolitem); + g_signal_handlers_block_by_func (widget, + midori_panel_menu_item_activate_cb, panel); + gtk_toggle_tool_button_set_active (button, FALSE); + gtk_toggle_tool_button_set_active (button, TRUE); + g_signal_handlers_unblock_by_func (widget, + midori_panel_menu_item_activate_cb, panel); } + + midori_panel_set_current_page (panel, n); + g_signal_emit (panel, signals[SWITCH_PAGE], 0, n); + gtk_widget_show (GTK_WIDGET (panel)); +} + +/* Private function, used by MidoriBrowser */ +/* static */ GtkWidget* +midori_panel_construct_menu_item (MidoriPanel* panel, + MidoriViewable* viewable) +{ + const gchar* stock_id; + GtkWidget* menuitem; + + stock_id = midori_viewable_get_stock_id (viewable); + menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); + gtk_widget_show (menuitem); + g_object_set_data (G_OBJECT (menuitem), "page", viewable); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_panel_menu_item_activate_cb), panel); + return menuitem; } static void @@ -582,6 +674,54 @@ midori_panel_construct_tool_item (MidoriPanel* panel, return toolitem; } +static void +midori_panel_show_titles_toggled_cb (GtkWidget* menuitem, + MidoriPanel* panel) +{ + g_object_set (panel, "show-titles", !panel->show_titles, NULL); +} + +static void +midori_panel_show_controls_toggled_cb (GtkWidget* menuitem, + MidoriPanel* panel) +{ + g_object_set (panel, "show-controls", !panel->show_controls, NULL); +} + +static void +midori_panel_options_clicked_cb (GtkToolItem* toolitem, + MidoriPanel* panel) +{ + gint n; + GtkWidget* viewable; + GtkWidget* menu; + GtkWidget* menuitem; + + n = midori_panel_get_current_page (panel); + viewable = midori_panel_get_nth_page (panel, n); + menu = gtk_menu_new (); + #if !HAVE_HILDON + menuitem = gtk_check_menu_item_new_with_mnemonic (_("Show panel _titles")); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), + panel->show_titles); + g_signal_connect (menuitem, "toggled", + G_CALLBACK (midori_panel_show_titles_toggled_cb), panel); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + #endif + menuitem = gtk_check_menu_item_new_with_mnemonic (_("Show operating _controls")); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), + panel->show_controls); + g_signal_connect (menuitem, "toggled", + G_CALLBACK (midori_panel_show_controls_toggled_cb), panel); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + g_signal_emit_by_name (viewable, "populate-option-menu", menu); + + katze_widget_popup (GTK_WIDGET (toolitem), GTK_MENU (menu), + NULL, SOKOKE_MENU_POSITION_LEFT); +} + /** * midori_panel_append_page: * @panel: a #MidoriPanel @@ -608,10 +748,8 @@ midori_panel_append_page (MidoriPanel* panel, GObjectClass* gobject_class; GtkWidget* widget; GtkWidget* toolbar; - const gchar* label; - const gchar* stock_id; GtkToolItem* toolitem; - GtkWidget* menuitem; + const gchar* label; guint n; g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); @@ -641,6 +779,12 @@ midori_panel_append_page (MidoriPanel* panel, gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled); toolbar = midori_viewable_get_toolbar (viewable); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_PROPERTIES); + gtk_tool_item_set_tooltip_text (toolitem, _("Options")); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_panel_options_clicked_cb), panel); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, 0); + gtk_widget_show (GTK_WIDGET (toolitem)); gtk_widget_show (toolbar); gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); g_signal_connect (viewable, "destroy", @@ -648,26 +792,9 @@ midori_panel_append_page (MidoriPanel* panel, n = midori_panel_page_num (panel, scrolled); label = midori_viewable_get_label (viewable); - stock_id = midori_viewable_get_stock_id (viewable); - - toolitem = midori_panel_construct_tool_item (panel, viewable); - - if (panel->menu) - { - menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); - gtk_widget_show (menuitem); - g_object_set_data (G_OBJECT (menuitem), "page", viewable); - g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_panel_menu_item_activate_cb), - panel); - gtk_menu_shell_insert (GTK_MENU_SHELL (panel->menu), menuitem, 4); - g_object_set_data (G_OBJECT (scrolled), "panel-menuitem", menuitem); - g_signal_connect (viewable, "destroy", - G_CALLBACK (midori_panel_widget_destroy_cb), menuitem); - } g_object_set_data (G_OBJECT (viewable), "parent", scrolled); + midori_panel_construct_tool_item (panel, viewable); g_signal_connect (viewable, "destroy", G_CALLBACK (midori_panel_viewable_destroy_cb), panel); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 50ee3871..ada6ad5d 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -562,11 +562,9 @@ midori_preferences_set_settings (MidoriPreferences* preferences, #if !HAVE_HILDON button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); INDENTED_ADD (button, 0, 1, 3, 4); - button = katze_property_proxy (settings, "compact-sidepanel", NULL); - WIDGET_ADD (button, 1, 2, 3, 4); + button = katze_property_proxy (settings, "open-popups-in-tabs", NULL); + SPANNED_ADD (button, 1, 2, 3, 4); #endif - /* button = katze_property_proxy (settings, "open-popups-in-tabs", NULL); - SPANNED_ADD (button, 0, 1, 4, 5);*/ button = katze_property_proxy (settings, "open-tabs-next-to-current", NULL); WIDGET_ADD (button, 0, 1, 5, 6); button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index e5196249..816f1e1b 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -471,6 +471,10 @@ midori_search_action_icon_released_cb (GtkWidget* entry, gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon); g_object_unref (icon); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); + #if GTK_CHECK_VERSION (2, 16, 0) + gtk_image_menu_item_set_always_show_image ( + GTK_IMAGE_MENU_ITEM (menuitem), TRUE); + #endif gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "engine", item); g_signal_connect (menuitem, "activate", diff --git a/midori/midori-view.c b/midori/midori-view.c index a8886d43..1dc16d06 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -52,6 +52,11 @@ midori_view_get_snapshot (MidoriView* view, gint width, gint height); +static void +midori_view_item_meta_data_changed (KatzeItem* item, + const gchar* key, + MidoriView* view); + struct _MidoriView { GtkScrolledWindow parent_instance; @@ -62,6 +67,7 @@ struct _MidoriView GdkPixbuf* icon; gdouble progress; MidoriLoadStatus load_status; + gboolean minimized; gchar* statusbar_text; gchar* link_uri; gboolean has_selection; @@ -144,6 +150,7 @@ enum PROP_ICON, PROP_LOAD_STATUS, PROP_PROGRESS, + PROP_MINIMIZED, PROP_ZOOM_LEVEL, PROP_NEWS_FEEDS, PROP_STATUSBAR_TEXT, @@ -464,6 +471,26 @@ midori_view_class_init (MidoriViewClass* class) 0.0, 1.0, 0.0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /** + * MidoriView:minimized: + * + * Whether the view is minimized or in normal state. + * + * Minimizing a view indicates that only the icon should + * be advertised rather than the full blown tab label and + * it might otherwise be presented specially. + * + * Since: 0.1.8 + */ + g_object_class_install_property (gobject_class, + PROP_MINIMIZED, + g_param_spec_boolean ( + "minimized", + "Minimized", + "Whether the view is minimized or in normal state", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, PROP_ZOOM_LEVEL, g_param_spec_float ( @@ -1084,12 +1111,17 @@ static void midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, MidoriView* view) { - gchar* uri = view->link_uri; - - if (!uri) - uri = (gchar*)g_object_get_data (G_OBJECT (widget), "uri"); - g_signal_emit (view, signals[NEW_TAB], 0, uri, - view->open_tabs_in_the_background); + if (view->link_uri) + g_signal_emit (view, signals[NEW_TAB], 0, view->link_uri, + view->open_tabs_in_the_background); + else + { + gchar* data = (gchar*)g_object_get_data (G_OBJECT (widget), "uri"); + gchar* uri = sokoke_magic_uri (data, NULL); + g_signal_emit (view, signals[NEW_TAB], 0, uri, + view->open_tabs_in_the_background); + g_free (uri); + } } static void @@ -1259,6 +1291,10 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, icon = gtk_image_new_from_pixbuf (pixbuf); g_object_unref (pixbuf); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + #if GTK_CHECK_VERSION (2, 16, 0) + gtk_image_menu_item_set_always_show_image ( + GTK_IMAGE_MENU_ITEM (menuitem), TRUE); + #endif gtk_menu_shell_insert (GTK_MENU_SHELL (sub_menu), menuitem, i - 1); g_object_set_data (G_OBJECT (menuitem), "search", (gchar*)katze_item_get_uri (item)); @@ -1596,6 +1632,7 @@ midori_view_init (MidoriView* view) GTK_ICON_SIZE_MENU, NULL); view->progress = 0.0; view->load_status = MIDORI_LOAD_FINISHED; + view->minimized = FALSE; view->statusbar_text = NULL; view->link_uri = NULL; view->selected_text = NULL; @@ -1621,6 +1658,9 @@ midori_view_finalize (GObject* object) if (view->settings) g_signal_handlers_disconnect_by_func (view->settings, midori_view_settings_notify_cb, view); + if (view->item) + g_signal_handlers_disconnect_by_func (view->item, + midori_view_item_meta_data_changed, view); katze_assign (view->uri, NULL); katze_assign (view->title, NULL); @@ -1657,6 +1697,20 @@ midori_view_set_property (GObject* object, katze_assign (view->title, g_value_dup_string (value)); midori_view_update_title (view); break; + case PROP_MINIMIZED: + view->minimized = g_value_get_boolean (value); + if (view->item) + { + g_signal_handlers_block_by_func (view->item, + midori_view_item_meta_data_changed, view); + katze_item_set_meta_integer (view->item, "minimized", + view->minimized ? 1 : -1); + g_signal_handlers_unblock_by_func (view->item, + midori_view_item_meta_data_changed, view); + } + if (view->tab_label) + sokoke_widget_set_visible (view->tab_title, !view->minimized); + break; case PROP_ZOOM_LEVEL: midori_view_set_zoom_level (view, g_value_get_float (value)); break; @@ -1705,6 +1759,9 @@ midori_view_get_property (GObject* object, case PROP_LOAD_STATUS: g_value_set_enum (value, midori_view_get_load_status (view)); break; + case PROP_MINIMIZED: + g_value_set_boolean (value, view->minimized); + break; case PROP_ZOOM_LEVEL: g_value_set_float (value, midori_view_get_zoom_level (view)); break; @@ -2427,6 +2484,13 @@ midori_view_get_proxy_menu_item (MidoriView* view) return view->menu_item; } +static void +midori_view_tab_label_menu_new_tab_cb (GtkWidget* menuitem, + MidoriView* view) +{ + g_signal_emit (view, signals[NEW_TAB], 0, "", FALSE); +} + static void midori_view_tab_label_menu_open_cb (GtkWidget* menuitem, GtkWidget* view) @@ -2452,9 +2516,17 @@ midori_view_tab_label_menu_duplicate_tab_cb (GtkWidget* menuitem, "net", view->net, "settings", view->settings, NULL); midori_view_set_uri (MIDORI_VIEW (new_view), midori_view_get_display_uri (view)); + gtk_widget_show (new_view); g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where); } +static void +midori_view_tab_label_menu_minimize_tab_cb (GtkWidget* menuitem, + MidoriView* view) +{ + g_object_set (view, "minimized", !view->minimized, NULL); +} + static void midori_view_tab_label_menu_close_cb (GtkWidget* menuitem, GtkWidget* view) @@ -2482,6 +2554,12 @@ midori_view_get_tab_menu (MidoriView* view) g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); menu = gtk_menu_new (); + menuitem = gtk_menu_item_new_with_mnemonic (_("New _Tab")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_view_tab_label_menu_new_tab_cb), view); + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_OPEN, NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_signal_connect (menuitem, "activate", @@ -2494,6 +2572,11 @@ midori_view_get_tab_menu (MidoriView* view) gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_view_tab_label_menu_duplicate_tab_cb), view); + menuitem = gtk_menu_item_new_with_mnemonic ( + view->minimized ? _("_Restore Tab") : _("_Minimize Tab")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_view_tab_label_menu_minimize_tab_cb), view); menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLOSE, NULL); @@ -2668,6 +2751,27 @@ midori_view_tab_label_query_tooltip_cb (GtkWidget* tab_label, } #endif +/** + * midori_view_get_label_ellipsize: + * @view: a #MidoriView + * + * Determines how labels representing the view should be + * ellipsized, which is helpful for alternative labels. + * + * Return value: how to ellipsize the label + * + * Since: 0.1.9 + **/ +PangoEllipsizeMode +midori_view_get_label_ellipsize (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), PANGO_ELLIPSIZE_END); + + if (view->tab_label) + return gtk_label_get_ellipsize (GTK_LABEL (view->tab_title)); + return PANGO_ELLIPSIZE_END; +} + /** * midori_view_get_proxy_tab_label: * @view: a #MidoriView @@ -2763,6 +2867,16 @@ midori_view_get_proxy_tab_label (MidoriView* view) return view->tab_label; } +static void +midori_view_item_meta_data_changed (KatzeItem* item, + const gchar* key, + MidoriView* view) +{ + if (g_str_equal (key, "minimized")) + g_object_set (view, "minimized", + katze_item_get_meta_string (item, key) != NULL, NULL); +} + /** * midori_view_get_proxy_item: * @view: a #MidoriView @@ -2790,6 +2904,8 @@ midori_view_get_proxy_item (MidoriView* view) katze_item_set_uri (view->item, uri); title = midori_view_get_display_title (view); katze_item_set_name (view->item, title); + g_signal_connect (view->item, "meta-data-changed", + G_CALLBACK (midori_view_item_meta_data_changed), view); } return view->item; } diff --git a/midori/midori-view.h b/midori/midori-view.h index 017499a6..0dbfc52b 100644 --- a/midori/midori-view.h +++ b/midori/midori-view.h @@ -116,6 +116,9 @@ midori_view_get_proxy_menu_item (MidoriView* view); GtkWidget* midori_view_get_tab_menu (MidoriView* view); +PangoEllipsizeMode +midori_view_get_label_ellipsize (MidoriView* view); + GtkWidget* midori_view_get_proxy_tab_label (MidoriView* view); diff --git a/midori/midori-viewable.c b/midori/midori-viewable.c index 7d43ea28..2425ad39 100644 --- a/midori/midori-viewable.c +++ b/midori/midori-viewable.c @@ -13,6 +13,14 @@ #include +enum { + POPULATE_OPTION_MENU, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + static void midori_viewable_base_init (MidoriViewableIface* iface); @@ -68,6 +76,27 @@ midori_viewable_base_init (MidoriViewableIface* iface) 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. + * + * Since: 0.1.9 + */ + 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->p = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); iface->get_stock_id = midori_viewable_default_get_stock_id; @@ -258,6 +287,6 @@ midori_viewable_get_toolbar (MidoriViewable* viewable) toolbar = MIDORI_VIEWABLE_GET_IFACE (viewable)->get_toolbar (viewable); if (!toolbar) - toolbar = gtk_event_box_new (); + toolbar = gtk_toolbar_new (); return toolbar; } diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index db35ba50..9b0aba94 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -48,6 +48,7 @@ struct _MidoriWebSettings gboolean search_engines_in_completion; gchar* toolbar_items; gboolean compact_sidepanel; + gboolean show_panel_controls; gboolean right_align_sidepanel; MidoriStartup load_on_startup; @@ -123,6 +124,7 @@ enum PROP_SEARCH_ENGINES_IN_COMPLETION, PROP_TOOLBAR_ITEMS, PROP_COMPACT_SIDEPANEL, + PROP_SHOW_PANEL_CONTROLS, PROP_RIGHT_ALIGN_SIDEPANEL, PROP_LOAD_ON_STARTUP, @@ -192,9 +194,9 @@ midori_startup_get_type (void) if (!type) { static const GEnumValue values[] = { - { MIDORI_STARTUP_BLANK_PAGE, "MIDORI_STARTUP_BLANK_PAGE", N_("Blank page") }, - { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", N_("Homepage") }, - { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", N_("Last open pages") }, + { MIDORI_STARTUP_BLANK_PAGE, "MIDORI_STARTUP_BLANK_PAGE", N_("Show Blank page") }, + { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", N_("Show Homepage") }, + { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", N_("Show last open tabs") }, { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriStartup", values); @@ -249,8 +251,8 @@ midori_toolbar_style_get_type (void) { MIDORI_TOOLBAR_DEFAULT, "MIDORI_TOOLBAR_DEFAULT", N_("Default") }, { MIDORI_TOOLBAR_ICONS, "MIDORI_TOOLBAR_ICONS", N_("Icons") }, { MIDORI_TOOLBAR_TEXT, "MIDORI_TOOLBAR_TEXT", N_("Text") }, - { MIDORI_TOOLBAR_BOTH, "MIDORI_TOOLBAR_BOTH", N_("Both") }, - { MIDORI_TOOLBAR_BOTH_HORIZ, "MIDORI_TOOLBAR_BOTH_HORIZ", N_("Both horizontal") }, + { MIDORI_TOOLBAR_BOTH, "MIDORI_TOOLBAR_BOTH", N_("Icons and text") }, + { MIDORI_TOOLBAR_BOTH_HORIZ, "MIDORI_TOOLBAR_BOTH_HORIZ", N_("Text beside icons") }, { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriToolbarStyle", values); @@ -473,7 +475,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) PROP_TOOLBAR_STYLE, g_param_spec_enum ( "toolbar-style", - _("Toolbar Style"), + _("Toolbar Style:"), _("The style of the toolbar"), MIDORI_TYPE_TOOLBAR_STYLE, MIDORI_TOOLBAR_DEFAULT, @@ -529,6 +531,22 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) FALSE, flags)); + /** + * MidoriWebSettings:show-panel-controls: + * + * Whether to show the operating controls of the panel. + * + * Since: 0.1.9 + */ + g_object_class_install_property (gobject_class, + PROP_SHOW_PANEL_CONTROLS, + g_param_spec_boolean ( + "show-panel-controls", + _("Show operating controls of the panel"), + _("Whether to show the operating controls of the panel"), + TRUE, + flags)); + /** * MidoriWebSettings:right-sidepanel: * @@ -550,8 +568,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) PROP_LOAD_ON_STARTUP, g_param_spec_enum ( "load-on-startup", - _("Load on Startup"), - _("What to load on startup"), + _("When Midori starts:"), + _("What to do when Midori starts"), MIDORI_TYPE_STARTUP, MIDORI_STARTUP_LAST_OPEN_PAGES, flags)); @@ -560,7 +578,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) PROP_HOMEPAGE, g_param_spec_string ( "homepage", - _("Homepage"), + _("Homepage:"), _("The homepage"), "http://www.google.com", flags)); @@ -602,7 +620,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) PROP_DOWNLOAD_FOLDER, g_param_spec_string ( "download-folder", - _("Download Folder"), + _("Save downloaded files to:"), _("The folder downloaded files are saved to"), midori_get_download_dir (), #if WEBKIT_CHECK_VERSION (1, 1, 3) @@ -727,7 +745,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) PROP_OPEN_NEW_PAGES_IN, g_param_spec_enum ( "open-new-pages-in", - _("Open new pages in"), + _("Open new pages in:"), _("Where to open new pages"), MIDORI_TYPE_NEW_PAGE, MIDORI_NEW_PAGE_TAB, @@ -737,7 +755,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) PROP_OPEN_EXTERNAL_PAGES_IN, g_param_spec_enum ( "open-external-pages-in", - _("Open external pages in"), + _("Open external pages in:"), _("Where to open externally opened pages"), MIDORI_TYPE_NEW_PAGE, MIDORI_NEW_PAGE_TAB, @@ -1000,6 +1018,7 @@ midori_web_settings_init (MidoriWebSettings* web_settings) web_settings->notify_transfer_completed = TRUE; web_settings->download_folder = g_strdup (midori_get_download_dir ()); web_settings->http_proxy = NULL; + web_settings->show_panel_controls = TRUE; web_settings->open_popups_in_tabs = TRUE; web_settings->remember_last_form_inputs = TRUE; web_settings->remember_last_downloaded_files = TRUE; @@ -1174,6 +1193,9 @@ midori_web_settings_set_property (GObject* object, case PROP_COMPACT_SIDEPANEL: web_settings->compact_sidepanel = g_value_get_boolean (value); break; + case PROP_SHOW_PANEL_CONTROLS: + web_settings->show_panel_controls = g_value_get_boolean (value); + break; case PROP_RIGHT_ALIGN_SIDEPANEL: web_settings->right_align_sidepanel = g_value_get_boolean (value); break; @@ -1386,6 +1408,9 @@ midori_web_settings_get_property (GObject* object, case PROP_COMPACT_SIDEPANEL: g_value_set_boolean (value, web_settings->compact_sidepanel); break; + case PROP_SHOW_PANEL_CONTROLS: + g_value_set_boolean (value, web_settings->show_panel_controls); + break; case PROP_RIGHT_ALIGN_SIDEPANEL: g_value_set_boolean (value, web_settings->right_align_sidepanel); break; diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h index 84742759..91d88a08 100644 --- a/midori/midori-websettings.h +++ b/midori/midori-websettings.h @@ -34,6 +34,17 @@ G_BEGIN_DECLS typedef struct _MidoriWebSettings MidoriWebSettings; typedef struct _MidoriWebSettingsClass MidoriWebSettingsClass; +enum +{ + MIDORI_CLEAR_NONE = 0, + MIDORI_CLEAR_HISTORY = 1, + MIDORI_CLEAR_COOKIES = 2, + MIDORI_CLEAR_FLASH_COOKIES = 4, + MIDORI_CLEAR_WEBSITE_ICONS = 8, + MIDORI_CLEAR_TRASH = 16, + MIDORI_CLEAR_ON_QUIT = 32, +}; + typedef enum { MIDORI_WINDOW_NORMAL, diff --git a/midori/sokoke.c b/midori/sokoke.c index 97d932f2..17abbde2 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -36,7 +36,6 @@ #include #endif -#ifdef HAVE_JSCORE static gchar* sokoke_js_string_utf8 (JSStringRef js_string) { @@ -50,22 +49,18 @@ sokoke_js_string_utf8 (JSStringRef js_string) JSStringGetUTF8CString (js_string, string_utf8, size_utf8); return string_utf8; } -#endif gchar* sokoke_js_script_eval (JSContextRef js_context, const gchar* script, gchar** exception) { - #ifdef HAVE_JSCORE gchar* value; JSStringRef js_value_string; - #endif g_return_val_if_fail (js_context, FALSE); g_return_val_if_fail (script, FALSE); - #ifdef HAVE_JSCORE JSStringRef js_script = JSStringCreateWithUTF8CString (script); JSValueRef js_exception = NULL; JSValueRef js_value = JSEvaluateScript (js_context, js_script, @@ -84,9 +79,6 @@ sokoke_js_script_eval (JSContextRef js_context, value = sokoke_js_string_utf8 (js_value_string); JSStringRelease (js_value_string); return value; - #else - return g_strdup (""); - #endif } static void @@ -873,7 +865,7 @@ sokoke_register_stock_items (void) { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, GTK_STOCK_ADD }, { STOCK_TRANSFERS, N_("_Transfers"), 0, 0, GTK_STOCK_SAVE }, { STOCK_PLUGINS, N_("Netscape p_lugins"), 0, 0, GTK_STOCK_CONVERT }, - { STOCK_USER_TRASH, N_("_Closed Tabs and Windows"), 0, 0, "gtk-undo-ltr" }, + { STOCK_USER_TRASH, N_("_Closed Tabs"), 0, 0, "gtk-undo-ltr" }, { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, }; diff --git a/po/de.po b/po/de.po index 709fbe66..114c4a9c 100644 --- a/po/de.po +++ b/po/de.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.7\n" +"Project-Id-Version: midori 0.1.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-20 01:57+0200\n" +"POT-Creation-Date: 2009-07-29 23:58+0200\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Internetbetrachter" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1344 ../midori/main.c:1498 -#: ../midori/main.c:1506 ../midori/main.c:1517 -#: ../midori/midori-websettings.c:285 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1343 ../midori/main.c:1517 +#: ../midori/main.c:1525 ../midori/main.c:1536 +#: ../midori/midori-websettings.c:287 msgid "Midori" msgstr "Midori" @@ -123,105 +123,105 @@ msgstr "Die letzte _Sitzung zurücksetzen" msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1344 +#: ../midori/main.c:1343 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1367 +#: ../midori/main.c:1366 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1400 +#: ../midori/main.c:1398 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Schnappschuss gespeichert: %s\n" -#: ../midori/main.c:1435 +#: ../midori/main.c:1447 msgid "Run ADDRESS as a web application" msgstr "ADRESSE als Internetanwendung starten" -#: ../midori/main.c:1435 +#: ../midori/main.c:1447 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1437 +#: ../midori/main.c:1449 msgid "Use FOLDER as configuration folder" msgstr "ORDNER als Konfigurationsordner benutzen" -#: ../midori/main.c:1437 +#: ../midori/main.c:1449 msgid "FOLDER" msgstr "ORDNER" -#: ../midori/main.c:1440 +#: ../midori/main.c:1451 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1444 +#: ../midori/main.c:1454 msgid "Take a snapshot of the specified URI" msgstr "Schnappschuss der angegebenen URI aufnehmen" -#: ../midori/main.c:1447 +#: ../midori/main.c:1457 msgid "Execute the specified command" msgstr "Den angegebenen Befehl ausführen" -#: ../midori/main.c:1449 +#: ../midori/main.c:1459 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1451 +#: ../midori/main.c:1461 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1495 +#: ../midori/main.c:1514 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1518 +#: ../midori/main.c:1537 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1520 +#: ../midori/main.c:1539 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1602 +#: ../midori/main.c:1619 msgid "The specified configuration folder is invalid." msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." -#: ../midori/main.c:1638 +#: ../midori/main.c:1655 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:1688 +#: ../midori/main.c:1715 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1700 +#: ../midori/main.c:1727 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1715 +#: ../midori/main.c:1742 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1728 +#: ../midori/main.c:1755 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1741 +#: ../midori/main.c:1768 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1753 +#: ../midori/main.c:1780 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1769 +#: ../midori/main.c:1796 msgid "_Ignore" msgstr "_Ignorieren" @@ -233,575 +233,583 @@ msgstr "Datei nicht gefunden." msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/midori-array.c:429 ../midori/sokoke.c:700 +#: ../midori/midori-array.c:429 ../midori/sokoke.c:694 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:304 ../midori/midori-browser.c:4177 -#: ../midori/midori-browser.c:4183 +#: ../midori/midori-browser.c:307 ../midori/midori-browser.c:4229 +#: ../midori/midori-browser.c:4235 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:315 ../midori/midori-browser.c:4180 +#: ../midori/midori-browser.c:318 ../midori/midori-browser.c:4232 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:410 +#: ../midori/midori-browser.c:409 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:435 +#: ../midori/midori-browser.c:434 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:617 +#: ../midori/midori-browser.c:616 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:617 +#: ../midori/midori-browser.c:616 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:618 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:618 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:649 +#: ../midori/midori-browser.c:648 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:661 ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:681 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:680 ../midori/midori-searchaction.c:966 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:700 +#: ../midori/midori-browser.c:699 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:705 ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:704 ../midori/midori-browser.c:745 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:822 +#: ../midori/midori-browser.c:821 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1169 +#: ../midori/midori-browser.c:1172 #, c-format -msgid "The file %s has been downloaded." -msgstr "Die Datei %s wurde heruntergeladen." +msgid "The file '%s' has been downloaded." +msgstr "Die Datei «%s» wurde heruntergeladen." -#: ../midori/midori-browser.c:1173 +#: ../midori/midori-browser.c:1176 msgid "Transfer completed" msgstr "Übertragung abgeschlossen" -#: ../midori/midori-browser.c:1314 +#: ../midori/midori-browser.c:1317 msgid "Save file" msgstr "Datei speichern" -#: ../midori/midori-browser.c:1960 +#: ../midori/midori-browser.c:1984 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:3429 ../panels/midori-bookmarks.c:781 +#: ../midori/midori-browser.c:3430 ../panels/midori-bookmarks.c:781 #: ../panels/midori-history.c:812 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:3436 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:3437 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:3439 ../panels/midori-bookmarks.c:789 +#: ../midori/midori-browser.c:3440 ../panels/midori-bookmarks.c:789 #: ../panels/midori-history.c:820 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:3739 +#: ../midori/midori-browser.c:3750 msgid "Clear Private Data" msgstr "Private Daten löschen" -#: ../midori/midori-browser.c:3743 +#: ../midori/midori-browser.c:3754 msgid "_Clear private data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:3756 +#: ../midori/midori-browser.c:3767 msgid "Clear the following data:" msgstr "Folgende Daten löschen:" -#: ../midori/midori-browser.c:3766 ../midori/midori-preferences.c:675 +#: ../midori/midori-browser.c:3777 ../midori/midori-preferences.c:671 #: ../panels/midori-history.c:108 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:3771 +#: ../midori/midori-browser.c:3782 msgid "Cookies" msgstr "Benutzerprofile/ Cookies" -#: ../midori/midori-browser.c:3776 +#: ../midori/midori-browser.c:3787 msgid "'Flash' Cookies" msgstr "«Flash» Cookies" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:3792 msgid "Website icons" msgstr "Symbole von Internetseiten" -#: ../midori/midori-browser.c:3786 ../midori/sokoke.c:874 -msgid "_Closed Tabs and Windows" -msgstr "_Geschlossene Reiter und Fenster" +#: ../midori/midori-browser.c:3797 ../midori/sokoke.c:868 +msgid "_Closed Tabs" +msgstr "Ges_chlossene Reiter" -#: ../midori/midori-browser.c:3869 +#: ../midori/midori-browser.c:3805 +msgid "Clear private data when _quitting Midori" +msgstr "Private Daten beim _Beenden von Midori löschen" + +#: ../midori/midori-browser.c:3889 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:3877 +#: ../midori/midori-browser.c:3897 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:4111 +#: ../midori/midori-browser.c:4163 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:4114 +#: ../midori/midori-browser.c:4165 ../midori/sokoke.c:869 +msgid "New _Window" +msgstr "Neues _Fenster" + +#: ../midori/midori-browser.c:4166 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:4117 +#: ../midori/midori-browser.c:4169 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:4120 +#: ../midori/midori-browser.c:4172 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:4123 +#: ../midori/midori-browser.c:4175 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:4125 +#: ../midori/midori-browser.c:4177 msgid "Add to Speed _dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:4126 +#: ../midori/midori-browser.c:4178 msgid "Add shortcut to speed dial" msgstr "Eine Verknüpfung zur Schnellwahl hinzufügen" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:4180 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:4129 +#: ../midori/midori-browser.c:4181 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:4131 +#: ../midori/midori-browser.c:4183 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:4132 +#: ../midori/midori-browser.c:4184 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:4135 +#: ../midori/midori-browser.c:4187 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:4138 +#: ../midori/midori-browser.c:4190 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:4140 +#: ../midori/midori-browser.c:4192 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:4143 +#: ../midori/midori-browser.c:4195 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:4146 ../midori/midori-browser.c:4149 +#: ../midori/midori-browser.c:4198 ../midori/midori-browser.c:4201 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:4152 +#: ../midori/midori-browser.c:4204 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:4155 +#: ../midori/midori-browser.c:4207 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:4158 +#: ../midori/midori-browser.c:4210 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:4161 +#: ../midori/midori-browser.c:4213 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:4163 +#: ../midori/midori-browser.c:4215 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:4164 +#: ../midori/midori-browser.c:4216 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:4166 +#: ../midori/midori-browser.c:4218 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:4167 +#: ../midori/midori-browser.c:4219 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:4171 +#: ../midori/midori-browser.c:4223 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:4173 +#: ../midori/midori-browser.c:4225 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:4174 +#: ../midori/midori-browser.c:4226 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:4186 +#: ../midori/midori-browser.c:4238 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:4189 +#: ../midori/midori-browser.c:4241 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:4192 +#: ../midori/midori-browser.c:4244 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:4193 +#: ../midori/midori-browser.c:4245 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:4195 +#: ../midori/midori-browser.c:4247 msgid "View So_urce" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:4196 +#: ../midori/midori-browser.c:4248 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:4198 +#: ../midori/midori-browser.c:4250 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:4199 +#: ../midori/midori-browser.c:4251 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:4203 +#: ../midori/midori-browser.c:4255 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:4205 +#: ../midori/midori-browser.c:4257 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:4208 +#: ../midori/midori-browser.c:4260 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:4211 +#: ../midori/midori-browser.c:4263 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:4214 +#: ../midori/midori-browser.c:4266 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:4268 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:4217 +#: ../midori/midori-browser.c:4269 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4271 msgid "Undo _Close Tab" msgstr "Reiter _zurückholen" -#: ../midori/midori-browser.c:4220 +#: ../midori/midori-browser.c:4272 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:4224 ../panels/midori-bookmarks.c:231 +#: ../midori/midori-browser.c:4276 ../panels/midori-bookmarks.c:231 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:4278 msgid "Add a new _folder" msgstr "Einen neuen _Ordner hinzufügen" -#: ../midori/midori-browser.c:4227 +#: ../midori/midori-browser.c:4279 msgid "Add a new bookmark folder" msgstr "Einen neuen Lesezeichenordner hinzufügen" -#: ../midori/midori-browser.c:4228 -msgid "_Tools" -msgstr "_Extras" - -#: ../midori/midori-browser.c:4230 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4281 ../midori/midori-searchaction.c:497 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:4231 +#: ../midori/midori-browser.c:4282 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:4234 +#: ../midori/midori-browser.c:4285 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4286 msgid "Clear private data..." msgstr "Private Daten löschen..." -#: ../midori/midori-browser.c:4239 +#: ../midori/midori-browser.c:4290 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:4240 +#: ../midori/midori-browser.c:4291 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:4242 +#: ../midori/midori-browser.c:4293 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:4243 +#: ../midori/midori-browser.c:4294 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:4245 +#: ../midori/midori-browser.c:4296 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:4247 +#: ../midori/midori-browser.c:4298 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4299 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:4250 +#: ../midori/midori-browser.c:4301 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:4251 +#: ../midori/midori-browser.c:4302 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:4253 +#: ../midori/midori-browser.c:4304 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:4254 +#: ../midori/midori-browser.c:4305 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:4257 +#: ../midori/midori-browser.c:4308 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:4264 +#: ../midori/midori-browser.c:4315 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:4265 +#: ../midori/midori-browser.c:4316 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4321 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:4271 +#: ../midori/midori-browser.c:4322 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4325 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:4275 +#: ../midori/midori-browser.c:4326 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4329 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:4330 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:4333 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:4283 +#: ../midori/midori-browser.c:4334 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:4286 +#: ../midori/midori-browser.c:4337 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:4287 +#: ../midori/midori-browser.c:4338 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:4341 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:4291 +#: ../midori/midori-browser.c:4342 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:4298 +#: ../midori/midori-browser.c:4349 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:4301 ../midori/midori-websettings.c:212 +#: ../midori/midori-browser.c:4352 ../midori/midori-websettings.c:214 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4356 msgid "Japanese (SHIFT__JIS)" msgstr "Japanisch (SHIFT__JIS)" -#: ../midori/midori-browser.c:4308 ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:4359 ../midori/midori-websettings.c:216 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:4311 ../midori/midori-websettings.c:215 +#: ../midori/midori-browser.c:4362 ../midori/midori-websettings.c:217 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4314 ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:4365 ../midori/midori-websettings.c:218 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:4317 ../midori/midori-websettings.c:217 -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-browser.c:4368 ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:291 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:4755 +#: ../midori/midori-browser.c:4806 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:4762 +#: ../midori/midori-browser.c:4813 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:4764 +#: ../midori/midori-browser.c:4815 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:4788 +#: ../midori/midori-browser.c:4839 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:4790 +#: ../midori/midori-browser.c:4841 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:4811 +#: ../midori/midori-browser.c:4862 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:4877 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:4879 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:4843 ../midori/sokoke.c:863 +#: ../midori/midori-browser.c:4894 ../midori/sokoke.c:857 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:4896 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:4860 +#: ../midori/midori-browser.c:4911 +msgid "_Tools" +msgstr "_Extras" + +#: ../midori/midori-browser.c:4923 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:4862 +#: ../midori/midori-browser.c:4925 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:4939 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:4941 msgid "Menu" msgstr "Menü" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:5127 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5152 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:5089 +#: ../midori/midori-browser.c:5157 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5162 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:5102 +#: ../midori/midori-browser.c:5170 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:5112 +#: ../midori/midori-browser.c:5180 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:5147 +#: ../midori/midori-browser.c:5215 #: ../extensions/cookie-manager/cookie-manager-page.c:109 msgid "Delete All" msgstr "Alle löschen" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5552 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" @@ -811,638 +819,679 @@ msgstr "Unerwartete Einstellung »%s«" msgid "Search with %s" msgstr "Suchen mit %s" -#: ../midori/midori-panel.c:333 +#: ../midori/midori-panel.c:382 ../midori/midori-panel.c:384 msgid "Detach chosen panel from the window" msgstr "Gewählte Leiste vom Fenster ablösen" -#: ../midori/midori-panel.c:343 ../midori/midori-panel.c:508 +#: ../midori/midori-panel.c:394 ../midori/midori-panel.c:396 +#: ../midori/midori-panel.c:577 ../midori/midori-panel.c:580 msgid "Align sidepanel to the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-panel.c:353 ../midori/midori-panel.c:354 +#: ../midori/midori-panel.c:406 ../midori/midori-panel.c:407 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-panel.c:509 +#: ../midori/midori-panel.c:578 ../midori/midori-panel.c:581 msgid "Align sidepanel to the left" msgstr "Seitenleiste links anordnen" -#: ../midori/midori-websettings.c:195 ../midori/midori-view.c:2265 -msgid "Blank page" -msgstr "Leere Seite" +#: ../midori/midori-panel.c:704 +msgid "Show panel _titles" +msgstr "Leisten_titel anzeigen" -#: ../midori/midori-websettings.c:196 ../midori/midori-websettings.c:563 -msgid "Homepage" -msgstr "Startseite" +#: ../midori/midori-panel.c:712 +msgid "Show operating _controls" +msgstr "_Bedienelemente anzeigen" + +#: ../midori/midori-panel.c:783 +msgid "Options" +msgstr "Optionen" #: ../midori/midori-websettings.c:197 -msgid "Last open pages" -msgstr "Zuletzt geöffnete Seiten" +msgid "Show Blank page" +msgstr "Leere Seite anzeigen" -#: ../midori/midori-websettings.c:213 +#: ../midori/midori-websettings.c:198 +msgid "Show Homepage" +msgstr "Startseite anzeigen" + +#: ../midori/midori-websettings.c:199 +msgid "Show last open tabs" +msgstr "Zuletzt geöffnete Reiter anzeigen" + +#: ../midori/midori-websettings.c:215 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:251 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:252 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:252 -msgid "Both" -msgstr "Beides" +#: ../midori/midori-websettings.c:254 +msgid "Icons and text" +msgstr "Symbole und Text" -#: ../midori/midori-websettings.c:253 -msgid "Both horizontal" -msgstr "Beides horizontal" +#: ../midori/midori-websettings.c:255 +msgid "Text beside icons" +msgstr "Text neben Symbolen" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:271 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:270 ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:87 +#: ../midori/midori-websettings.c:272 ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:93 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:288 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:289 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:290 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:341 +#: ../midori/midori-websettings.c:343 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:344 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:350 +#: ../midori/midori-websettings.c:352 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:353 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:361 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:360 +#: ../midori/midori-websettings.c:362 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:397 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:398 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:406 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:407 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:416 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:417 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:425 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:426 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:434 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:435 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:443 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:459 msgid "Show Transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:460 msgid "Whether to show the transferbar" msgstr "Die Übertragungsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:468 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:476 -msgid "Toolbar Style" -msgstr "Werkzeugleistenstil" +#: ../midori/midori-websettings.c:478 +msgid "Toolbar Style:" +msgstr "Werkzeugleistenstil:" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:479 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:495 msgid "Show progress in location entry" msgstr "Fortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:496 msgid "Whether to show loading progress in the location entry" msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:511 msgid "Search engines in location completion" msgstr "Suchmaschinen in Vervollständigung" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:512 msgid "Whether to show search engines in the location completion" msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:520 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:521 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:529 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:530 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 +msgid "Show operating controls of the panel" +msgstr "Bedienelemente der Leiste anzeigen" + +#: ../midori/midori-websettings.c:546 +msgid "Whether to show the operating controls of the panel" +msgstr "Die Bedienelemente der Leiste anzeigen oder verbergen" + +#: ../midori/midori-websettings.c:561 msgid "Align sidepanel on the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:562 msgid "Whether to align the sidepanel on the right" msgstr "Die Seitenleiste auf der rechten Seite anordnen" -#: ../midori/midori-websettings.c:553 -msgid "Load on Startup" -msgstr "Beim Programmstart öffnen" +#: ../midori/midori-websettings.c:571 +msgid "When Midori starts:" +msgstr "Beim Starten von Midori:" -#: ../midori/midori-websettings.c:554 -msgid "What to load on startup" -msgstr "Was beim Programmstart geöffnet werden soll" +#: ../midori/midori-websettings.c:572 +msgid "What to do when Midori starts" +msgstr "Was beim Starten von Midori passieren soll" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:581 +msgid "Homepage:" +msgstr "Startseite:" + +#: ../midori/midori-websettings.c:582 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:597 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:598 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:614 msgid "Show speed dial in new tabs" msgstr "Schnellwahl in neuen Reitern anzeigen" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:615 msgid "Show speed dial in newly opened tabs" msgstr "Schnellwahl in neu geöffneten Reitern anzeigen" -#: ../midori/midori-websettings.c:605 -msgid "Download Folder" -msgstr "Dateispeicherordner" +#: ../midori/midori-websettings.c:623 +msgid "Save downloaded files to:" +msgstr "Heruntergeladene Dateien speichern:" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:624 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:643 msgid "Ask for the destination folder" msgstr "Nach dem Zielordner fragen" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:644 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Beim Herunterladen einer Datei nach dem Zielordner fragen" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:663 msgid "Notify when a transfer has been completed" msgstr "Benachrichtigen bei Abschluss der Übertragung" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:664 msgid "Whether to show a notification when a transfer has been completed" msgstr "" "Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:676 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:677 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:685 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:686 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:701 msgid "News Aggregator" msgstr "Nachrichtenaggregator" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:702 msgid "An external news aggregator" msgstr "Ein externer Nachrichtenaggregator" -#: ../midori/midori-websettings.c:692 +#: ../midori/midori-websettings.c:710 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:711 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:719 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:720 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:712 +#: ../midori/midori-websettings.c:730 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:731 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:739 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:740 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:730 -msgid "Open new pages in" -msgstr "Öffne neue Seiten in" +#: ../midori/midori-websettings.c:748 +msgid "Open new pages in:" +msgstr "Öffne neue Seiten in:" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:749 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:740 -msgid "Open external pages in" -msgstr "Öffne Seiten von außerhalb in" +#: ../midori/midori-websettings.c:758 +msgid "Open external pages in:" +msgstr "Öffne Seiten von außerhalb in:" -#: ../midori/midori-websettings.c:741 +#: ../midori/midori-websettings.c:759 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:768 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:769 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:777 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:778 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:786 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:787 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:781 +#: ../midori/midori-websettings.c:795 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:796 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:812 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:813 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:828 msgid "Find inline while typing" msgstr "Inkrementelle Suche beim Eintippen" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:829 msgid "Whether to automatically find inline while typing" msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:837 msgid "Accept cookies" msgstr "Cookies annehmen" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:838 msgid "What type of cookies to accept" msgstr "Welche Art von Profildateien (Cookies) angenommen werden" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:847 msgid "Original cookies only" msgstr "Nur ursprüngliche Profildateien" -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:848 msgid "Accept cookies from the original website only" msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:856 msgid "Maximum cookie age" msgstr "Maximales Alter von Cookiedaten" -#: ../midori/midori-websettings.c:843 +#: ../midori/midori-websettings.c:857 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:853 +#: ../midori/midori-websettings.c:867 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:868 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:862 +#: ../midori/midori-websettings.c:876 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:877 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:871 +#: ../midori/midori-websettings.c:885 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:886 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:894 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:895 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:905 msgid "Proxy Server" msgstr "Zwischenrechner (Proxy)" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:906 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:907 +#: ../midori/midori-websettings.c:921 msgid "Detect proxy server automatically" msgstr "Proxyrechner automatisch erkennen" -#: ../midori/midori-websettings.c:908 +#: ../midori/midori-websettings.c:922 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zwischenrechner automatisch über die Umgebung erkennen" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:938 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:939 msgid "What to identify as to web pages" msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:955 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:956 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:950 +#: ../midori/midori-websettings.c:964 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:951 +#: ../midori/midori-websettings.c:965 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" -#: ../midori/midori-websettings.c:966 +#: ../midori/midori-websettings.c:980 msgid "Clear private data" msgstr "Private Daten löschen" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:981 msgid "The private data selected for deletion" msgstr "Zum Löschen ausgewählte private Daten" -#: ../midori/midori-view.c:750 +#: ../midori/midori-view.c:781 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Die Seite «%s» konnte nicht geladen werden." #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c:752 ../midori/midori-view.c:2897 +#: ../midori/midori-view.c:783 ../midori/midori-view.c:3013 #: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "Fehler" -#: ../midori/midori-view.c:755 +#: ../midori/midori-view.c:786 msgid "Try again" msgstr "Erneut versuchen" #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:785 ../midori/midori-view.c:2901 +#: ../midori/midori-view.c:818 ../midori/midori-view.c:3017 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:1172 +#: ../midori/midori-view.c:1205 msgid "Open _Link" msgstr "Verweis ö_ffnen" -#: ../midori/midori-view.c:1174 +#: ../midori/midori-view.c:1207 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1191 +#: ../midori/midori-view.c:1224 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:1197 +#: ../midori/midori-view.c:1230 msgid "_Download Link destination" msgstr "Verweisziel herunter_laden" -#: ../midori/midori-view.c:1203 +#: ../midori/midori-view.c:1236 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:1212 +#: ../midori/midori-view.c:1245 msgid "Download with Download _Manager" msgstr "Mit Übertragungs_manager herunterladen" -#: ../midori/midori-view.c:1241 +#: ../midori/midori-view.c:1274 msgid "Search _with" msgstr "Suchen _mit" -#: ../midori/midori-view.c:1269 +#: ../midori/midori-view.c:1306 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:1279 +#: ../midori/midori-view.c:1316 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1457 +#: ../midori/midori-view.c:1494 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1511 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: «%s»" -#: ../midori/midori-view.c:1477 +#: ../midori/midori-view.c:1514 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1481 +#: ../midori/midori-view.c:1518 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:1899 +#: ../midori/midori-view.c:1957 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:2089 +#: ../midori/midori-view.c:2147 msgid "Speed dial" msgstr "Schnellwahl" -#: ../midori/midori-view.c:2090 +#: ../midori/midori-view.c:2148 msgid "Click to add a shortcut" msgstr "Klicken um eine Verknüpfung hinzuzufügen" -#: ../midori/midori-view.c:2091 +#: ../midori/midori-view.c:2149 msgid "Enter shortcut address" msgstr "Ziel der Verknüpfung eingeben" -#: ../midori/midori-view.c:2092 +#: ../midori/midori-view.c:2150 msgid "Enter shortcut title" msgstr "Titel der Verknüpfung eingeben" -#: ../midori/midori-view.c:2093 +#: ../midori/midori-view.c:2151 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:2123 +#: ../midori/midori-view.c:2181 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:2140 +#: ../midori/midori-view.c:2198 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" -#: ../midori/midori-view.c:2487 +#: ../midori/midori-view.c:2323 +msgid "Blank page" +msgstr "Leere Seite" + +#: ../midori/midori-view.c:2551 ../midori/sokoke.c:865 +msgid "New _Tab" +msgstr "Neuer _Reiter" + +#: ../midori/midori-view.c:2565 msgid "_Duplicate Tab" msgstr "Reiter _verdoppeln" +#: ../midori/midori-view.c:2570 +msgid "_Restore Tab" +msgstr "Reiter _wiederherstellen" + +#: ../midori/midori-view.c:2570 +msgid "_Minimize Tab" +msgstr "Reiter _minimieren" + #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" @@ -1622,120 +1671,112 @@ msgid "Browsing" msgstr "Navigation" #. Page "Applications" -#: ../midori/midori-preferences.c:578 +#: ../midori/midori-preferences.c:574 msgid "Applications" msgstr "Anwendungen" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:575 msgid "External applications" msgstr "Externe Anwendungen" #. Page "Network" -#: ../midori/midori-preferences.c:625 ../midori/midori-preferences.c:626 +#: ../midori/midori-preferences.c:621 ../midori/midori-preferences.c:622 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:649 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:658 +#: ../midori/midori-preferences.c:654 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:659 +#: ../midori/midori-preferences.c:655 msgid "Web Cookies" msgstr "Benutzerprofile" -#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682 +#: ../midori/midori-preferences.c:668 ../midori/midori-preferences.c:678 msgid "days" msgstr "Tage" -#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:331 +#: ../midori/midori-searchaction.c:488 ../katze/katze-arrayaction.c:335 msgid "Empty" msgstr "Leer" -#: ../midori/midori-searchaction.c:904 +#: ../midori/midori-searchaction.c:908 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchaction.c:904 +#: ../midori/midori-searchaction.c:908 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchaction.c:932 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:976 +#: ../midori/midori-searchaction.c:980 msgid "_Icon:" msgstr "_Symbol:" -#: ../midori/midori-searchaction.c:990 +#: ../midori/midori-searchaction.c:994 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1209 +#: ../midori/midori-searchaction.c:1213 msgid "Manage Search Engines" msgstr "Suchmaschinen verwalten" -#: ../midori/midori-searchaction.c:1308 +#: ../midori/midori-searchaction.c:1312 msgid "Use as _default" msgstr "Als _Standard" -#: ../midori/sokoke.c:172 ../midori/sokoke.c:184 +#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." -#: ../midori/sokoke.c:862 +#: ../midori/sokoke.c:856 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/sokoke.c:864 +#: ../midori/sokoke.c:858 msgid "Add Boo_kmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/sokoke.c:865 +#: ../midori/sokoke.c:859 msgid "_Console" msgstr "_Konsole" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:860 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/sokoke.c:867 +#: ../midori/sokoke.c:861 msgid "_History" msgstr "_Verlauf" -#: ../midori/sokoke.c:868 +#: ../midori/sokoke.c:862 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/sokoke.c:869 +#: ../midori/sokoke.c:863 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/sokoke.c:870 +#: ../midori/sokoke.c:864 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/sokoke.c:871 -msgid "New _Tab" -msgstr "Neuer _Reiter" - -#: ../midori/sokoke.c:872 +#: ../midori/sokoke.c:866 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/sokoke.c:873 +#: ../midori/sokoke.c:867 msgid "Netscape p_lugins" msgstr "Netscape-Module" -#: ../midori/sokoke.c:875 -msgid "New _Window" -msgstr "Neues _Fenster" - #: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Benutzerskripte" @@ -1871,19 +1912,19 @@ msgstr "Datei wählen" msgid "Choose folder" msgstr "Dateispeicherordner auswählen" -#: ../extensions/adblock.c:128 +#: ../extensions/adblock.c:167 msgid "Configure Advertisement filters" msgstr "Werbefilter einstellen" -#: ../extensions/adblock.c:269 +#: ../extensions/adblock.c:304 msgid "Configure _Advertisement filters..." msgstr "Werbefilter einstellen..." -#: ../extensions/adblock.c:526 +#: ../extensions/adblock.c:562 msgid "Advertisement blocker" msgstr "Werbeblocker" -#: ../extensions/adblock.c:527 +#: ../extensions/adblock.c:563 msgid "Block advertisements according to a filter list" msgstr "Werbung an Hand einer Filterliste blockieren" @@ -2099,19 +2140,19 @@ msgstr "Seitenhalter" msgid "_Pageholder" msgstr "_Seitenhalter" -#: ../extensions/shortcuts.c:166 -msgid "Configure Keyboard shortcuts" -msgstr "Tastaturkürzel einstellen" +#: ../extensions/shortcuts.c:172 +msgid "Customize Keyboard shortcuts" +msgstr "Tastaturkürzel anpassen" -#: ../extensions/shortcuts.c:263 -msgid "Configure Sh_ortcuts..." -msgstr "Tastaturkürzel einstellen..." +#: ../extensions/shortcuts.c:264 +msgid "Customize Sh_ortcuts..." +msgstr "Tastaturkürzel anpassen..." -#: ../extensions/shortcuts.c:295 +#: ../extensions/shortcuts.c:303 msgid "Shortcuts" msgstr "Tastaturkürzel" -#: ../extensions/shortcuts.c:296 +#: ../extensions/shortcuts.c:304 msgid "View and edit keyboard shortcuts" msgstr "Tastaturkürzel ansehen und bearbeiten" @@ -2131,49 +2172,71 @@ msgstr "Funktionen in der Statusleiste" msgid "Easily toggle features on web pages on and off" msgstr "Funktionen auf Internetseiten leicht an- und abstellen" -#: ../extensions/tab-panel.c:293 ../extensions/tab-panel.c:352 +#: ../extensions/tab-panel.c:383 ../extensions/tab-panel.c:443 msgid "Tab Panel" msgstr "Reiterleiste" -#: ../extensions/tab-panel.c:336 +#: ../extensions/tab-panel.c:427 msgid "T_ab Panel" msgstr "_Reiterleiste" -#: ../extensions/tab-panel.c:353 +#: ../extensions/tab-panel.c:444 msgid "Show tabs in a vertical panel" msgstr "Reiter in einer senkrechten Leiste anzeigen" -#: ../extensions/toolbar-editor.c:390 +#: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" -#: ../extensions/toolbar-editor.c:406 +#: ../extensions/toolbar-editor.c:407 msgid "" "Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." -msgstr "Wähle Elemente, die in der Werkzeugleiste erscheinen sollen. " -"Elemente lassen sich durch Ziehen und Ablegen ordnen." +msgstr "" +"Wähle Elemente, die in der Werkzeugleiste erscheinen sollen. Elemente lassen " +"sich durch Ziehen und Ablegen ordnen." -#: ../extensions/toolbar-editor.c:422 +#: ../extensions/toolbar-editor.c:423 msgid "Available Items" msgstr "Verfügbare Elemente" -#: ../extensions/toolbar-editor.c:443 +#: ../extensions/toolbar-editor.c:444 msgid "Displayed Items" msgstr "Angezeigte Elemente" -#: ../extensions/toolbar-editor.c:584 -msgid "Configure _Toolbar..." -msgstr "Werkzeugleiste anpassen..." +#: ../extensions/toolbar-editor.c:579 +msgid "Customize _Toolbar..." +msgstr "_Werkzeugleiste anpassen..." -#: ../extensions/toolbar-editor.c:613 +#: ../extensions/toolbar-editor.c:611 msgid "Toolbar Editor" msgstr "Werkzeugleisteneditor" -#: ../extensions/toolbar-editor.c:614 +#: ../extensions/toolbar-editor.c:612 msgid "Easily edit the toolbar layout" msgstr "Werkzeugleisten leicht anpassen" +#~ msgid "_Closed Tabs and Windows" +#~ msgstr "_Geschlossene Reiter und Fenster" + +#~ msgid "Last open pages" +#~ msgstr "Zuletzt geöffnete Seiten" + +#~ msgid "Both" +#~ msgstr "Beides" + +#~ msgid "Both horizontal" +#~ msgstr "Beides horizontal" + +#~ msgid "Load on Startup" +#~ msgstr "Beim Programmstart öffnen" + +#~ msgid "Download Folder" +#~ msgstr "Dateispeicherordner" + +#~ msgid "Configure _Toolbar..." +#~ msgstr "Werkzeugleiste anpassen..." + #~ msgid "Whether to detach the chosen panel from the window" #~ msgstr "Die gewählte Seitenleiste vom Fenster ablösen" diff --git a/po/el.po b/po/el.po index f6ada54a..a8e93382 100644 --- a/po/el.po +++ b/po/el.po @@ -4,10 +4,10 @@ # Evaggelos Balaskas 2008-2009 msgid "" msgstr "" -"Project-Id-Version: midori 0.1.7\n" +"Project-Id-Version: midori 0.1.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-17 18:56+0300\n" -"PO-Revision-Date: 2009-06-17 19:28+0200\n" +"POT-Creation-Date: 2009-07-26 13:00+0300\n" +"PO-Revision-Date: 2009-07-26 13:06+0200\n" "Last-Translator: Evaggelos Balaskas \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" @@ -21,10 +21,10 @@ msgid "Lightweight web browser" msgstr "Ελαφρύς περιηγητής ιστού" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1339 -#: ../midori/main.c:1480 -#: ../midori/main.c:1488 -#: ../midori/main.c:1499 +#: ../midori/main.c:1343 +#: ../midori/main.c:1502 +#: ../midori/main.c:1510 +#: ../midori/main.c:1521 #: ../midori/midori-websettings.c:285 msgid "Midori" msgstr "Μιντόρι" @@ -127,741 +127,749 @@ msgstr "Επαναφορά της τελευταίας σ_υνεδρίας" msgid "Disable all _extensions" msgstr "Απενεργοποίηση όλων των επ_εκτάσεων" -#: ../midori/main.c:1339 +#: ../midori/main.c:1343 msgid "No filename specified" msgstr "Δεν ορίστηκε όνομα αρχείου" -#: ../midori/main.c:1362 +#: ../midori/main.c:1366 msgid "An unknown error occured." msgstr "Συνέβει ένα άγνωστο σφάλμα." -#: ../midori/main.c:1395 +#: ../midori/main.c:1398 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Το στιγμιότυπο αποθηκεύτηκε στο: %s\n" -#: ../midori/main.c:1417 +#: ../midori/main.c:1433 msgid "Run ADDRESS as a web application" msgstr "Άνοιγμα της διεύθυνσης ως διαδικτυακή εφαρμογή" -#: ../midori/main.c:1417 +#: ../midori/main.c:1433 msgid "ADDRESS" msgstr "Διεύθυνση" -#: ../midori/main.c:1419 +#: ../midori/main.c:1435 msgid "Use FOLDER as configuration folder" msgstr "Χρήση φακέλου ως φάκελος ρύθμισης" -#: ../midori/main.c:1419 +#: ../midori/main.c:1435 msgid "FOLDER" msgstr "ΦΑΚΕΛΟΣ" -#: ../midori/main.c:1422 +#: ../midori/main.c:1437 msgid "Run the specified filename as javascript" msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript" -#: ../midori/main.c:1426 +#: ../midori/main.c:1440 msgid "Take a snapshot of the specified URI" msgstr "Αποθήκευση του συγκεκριμένου URI" -#: ../midori/main.c:1429 +#: ../midori/main.c:1443 msgid "Execute the specified command" msgstr "Εκτέλεση συγκεκριμένης εντολής" -#: ../midori/main.c:1431 +#: ../midori/main.c:1445 msgid "Display program version" msgstr "Προβολή έκδοσης προγράμματος" -#: ../midori/main.c:1433 +#: ../midori/main.c:1447 msgid "Addresses" msgstr "Διευθύνσεις" -#: ../midori/main.c:1477 +#: ../midori/main.c:1499 msgid "[Addresses]" msgstr "[Διευθύνσεις" -#: ../midori/main.c:1500 +#: ../midori/main.c:1522 msgid "Please report comments, suggestions and bugs to:" msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:" -#: ../midori/main.c:1502 +#: ../midori/main.c:1524 msgid "Check for new versions at:" msgstr "Έλεγχος για νέα έκδοση στο:" -#: ../midori/main.c:1581 +#: ../midori/main.c:1604 msgid "The specified configuration folder is invalid." msgstr "Η συγκεκριμένη ρύθμιση φακέλου είναι άκυρη." -#: ../midori/main.c:1617 +#: ../midori/main.c:1640 msgid "An instance of Midori is already running but not responding.\n" msgstr "Όλα τα στιγμιότυπα του Μιντόρι τρέχουν ήδη αλλά δεν ανταποκρίνονται.\n" -#: ../midori/main.c:1667 +#: ../midori/main.c:1700 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Οι μηχανές αναζήτησης δεν μπορούν να φορτωθούν. %s\n" -#: ../midori/main.c:1679 +#: ../midori/main.c:1712 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:1694 +#: ../midori/main.c:1727 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n" -#: ../midori/main.c:1707 +#: ../midori/main.c:1740 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Τα απορρίμματα δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:1720 +#: ../midori/main.c:1753 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Το ιστορικό δεν μπορεί να φορτωθεί: %s\n" -#: ../midori/main.c:1732 +#: ../midori/main.c:1765 msgid "The following errors occured:" msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:" -#: ../midori/main.c:1748 +#: ../midori/main.c:1781 msgid "_Ignore" msgstr "Α_γνόησε" -#: ../midori/midori-array.c:195 +#: ../midori/midori-array.c:250 msgid "File not found." msgstr "Το αρχείο δεν βρέθηκε." -#: ../midori/midori-array.c:203 -#: ../midori/midori-array.c:212 +#: ../midori/midori-array.c:258 +#: ../midori/midori-array.c:267 msgid "Malformed document." msgstr "Κακοσχηματισμένο έγγραφο." -#: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:700 +#: ../midori/midori-array.c:429 +#: ../midori/sokoke.c:694 #, c-format msgid "Writing failed." msgstr "Αποτυχία εγγραφής." -#: ../midori/midori-browser.c:296 -#: ../midori/midori-browser.c:4021 -#: ../midori/midori-browser.c:4027 +#: ../midori/midori-browser.c:312 +#: ../midori/midori-browser.c:4183 +#: ../midori/midori-browser.c:4189 msgid "Reload the current page" msgstr "Ανανέωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:307 -#: ../midori/midori-browser.c:4024 +#: ../midori/midori-browser.c:323 +#: ../midori/midori-browser.c:4186 msgid "Stop loading the current page" msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:368 +#: ../midori/midori-browser.c:414 #, c-format msgid "%d%% loaded" msgstr "%d%% φορτώθηκε" -#: ../midori/midori-browser.c:393 +#: ../midori/midori-browser.c:439 #, c-format msgid "Unexpected action '%s'." msgstr "Αναπάντεχη ενέργεια '%s'." -#: ../midori/midori-browser.c:575 +#: ../midori/midori-browser.c:621 msgid "New folder" msgstr "Νέος φάκελος" -#: ../midori/midori-browser.c:575 +#: ../midori/midori-browser.c:621 msgid "Edit folder" msgstr "Επεξεργασία φακέλου" -#: ../midori/midori-browser.c:577 +#: ../midori/midori-browser.c:623 msgid "New bookmark" msgstr "Νέος σελιδοδείκτης" -#: ../midori/midori-browser.c:577 +#: ../midori/midori-browser.c:623 msgid "Edit bookmark" msgstr "Επεξεργασία σελιδοδείκτη" -#: ../midori/midori-browser.c:607 +#: ../midori/midori-browser.c:653 msgid "_Title:" msgstr "_Τίτλος:" -#: ../midori/midori-browser.c:620 +#: ../midori/midori-browser.c:666 #: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Περιγραφή:" -#: ../midori/midori-browser.c:639 +#: ../midori/midori-browser.c:685 #: ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Διεύθυνση:" -#: ../midori/midori-browser.c:658 +#: ../midori/midori-browser.c:704 msgid "_Folder:" msgstr "_Φάκελος:" -#: ../midori/midori-browser.c:663 -#: ../midori/midori-browser.c:704 +#: ../midori/midori-browser.c:709 +#: ../midori/midori-browser.c:750 msgid "Toplevel folder" msgstr "Αρχικός φάκελος" -#: ../midori/midori-browser.c:780 +#: ../midori/midori-browser.c:826 msgid "Save file as" msgstr "Αποθήκευση αρχείου ως" -#: ../midori/midori-browser.c:1127 +#: ../midori/midori-browser.c:1177 #, c-format -msgid "The file %s has been downloaded." -msgstr "Το αρχείο %s έχει κατέβει." +msgid "The file '%s' has been downloaded." +msgstr "Το αρχείο '%s' έχει κατέβει." -#: ../midori/midori-browser.c:1131 +#: ../midori/midori-browser.c:1181 msgid "Transfer completed" msgstr "Η μεταφορά ολοκληρώθηκε" -#: ../midori/midori-browser.c:1272 +#: ../midori/midori-browser.c:1322 msgid "Save file" msgstr "Αποθήκευση αρχείου" -#: ../midori/midori-browser.c:1899 +#: ../midori/midori-browser.c:1989 msgid "Open file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:3290 +#: ../midori/midori-browser.c:3435 #: ../panels/midori-bookmarks.c:781 #: ../panels/midori-history.c:812 msgid "Open all in _Tabs" msgstr "Άνοιγμα όλων σε _καρτέλες" -#: ../midori/midori-browser.c:3297 +#: ../midori/midori-browser.c:3442 #: ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:818 #: ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Άνοιγμα σε νέα_καρτέλα" -#: ../midori/midori-browser.c:3300 +#: ../midori/midori-browser.c:3445 #: ../panels/midori-bookmarks.c:789 #: ../panels/midori-history.c:820 #: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Άνοιγμα σε νέο _παράθυρο" -#: ../midori/midori-browser.c:3600 +#: ../midori/midori-browser.c:3745 msgid "Clear Private Data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:3604 +#: ../midori/midori-browser.c:3749 msgid "_Clear private data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:3617 +#: ../midori/midori-browser.c:3762 msgid "Clear the following data:" msgstr "Καθαρισμός των παρακάτω δεδομένων:" -#: ../midori/midori-browser.c:3627 -#: ../midori/midori-preferences.c:675 +#: ../midori/midori-browser.c:3772 +#: ../midori/midori-preferences.c:673 #: ../panels/midori-history.c:108 msgid "History" msgstr "Ιστορικό" -#: ../midori/midori-browser.c:3632 +#: ../midori/midori-browser.c:3777 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:3637 +#: ../midori/midori-browser.c:3782 msgid "'Flash' Cookies" msgstr "Άδειασμα των cookies" -#: ../midori/midori-browser.c:3642 +#: ../midori/midori-browser.c:3787 msgid "Website icons" msgstr "Εικονίδια ιστότοπων" -#: ../midori/midori-browser.c:3647 -#: ../midori/sokoke.c:867 -msgid "_Closed Tabs and Windows" -msgstr "_Κλείσιμο των καρτέλων και των παραθύρων" +#: ../midori/midori-browser.c:3792 +#: ../midori/sokoke.c:868 +msgid "_Closed Tabs" +msgstr "_Κλειστές καρτέλες" -#: ../midori/midori-browser.c:3730 +#: ../midori/midori-browser.c:3875 msgid "A lightweight web browser." msgstr "Ένας ελαφρύς περιηγητής ιστού" -#: ../midori/midori-browser.c:3738 +#: ../midori/midori-browser.c:3883 msgid "translator-credits" msgstr "Ευάγγελος Μπαλάσκας 2008" -#: ../midori/midori-browser.c:3955 +#: ../midori/midori-browser.c:4117 msgid "_File" msgstr "_Αρχείο" -#: ../midori/midori-browser.c:3958 +#: ../midori/midori-browser.c:4119 +#: ../midori/sokoke.c:869 +msgid "New _Window" +msgstr "Νέο _παράθυρο" + +#: ../midori/midori-browser.c:4120 msgid "Open a new window" msgstr "Άνοιγμα ενός νέου παραθύρου" -#: ../midori/midori-browser.c:3961 +#: ../midori/midori-browser.c:4123 msgid "Open a new tab" msgstr "Άνοιγμα μίας νέας καρτέλας" -#: ../midori/midori-browser.c:3964 +#: ../midori/midori-browser.c:4126 msgid "Open a file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:3967 +#: ../midori/midori-browser.c:4129 msgid "Save to a file" msgstr "Αποθήκευση σε αρχείου" -#: ../midori/midori-browser.c:3969 -#: ../midori/midori-view.c:1340 +#: ../midori/midori-browser.c:4131 msgid "Add to Speed _dial" msgstr "Προσθήκη σε γρήγορη σ_ύνδεση" -#: ../midori/midori-browser.c:3970 +#: ../midori/midori-browser.c:4132 msgid "Add shortcut to speed dial" msgstr "Προσθήκη συντόμευσης σε γρήγορη σύνδεση" -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4134 msgid "_Close Tab" msgstr "_Κλείσιμο καρτέλας" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4135 msgid "Close the current tab" msgstr "Κλείσιμο της τρέχουσας καρτέλας" -#: ../midori/midori-browser.c:3975 +#: ../midori/midori-browser.c:4137 msgid "C_lose Window" msgstr "Κ_λείσιμο παραθύρου" -#: ../midori/midori-browser.c:3976 +#: ../midori/midori-browser.c:4138 msgid "Close this window" msgstr "Κλείσιμο αυτού του παραθύρου" -#: ../midori/midori-browser.c:3979 +#: ../midori/midori-browser.c:4141 msgid "Print the current page" msgstr "Εκτύπωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:3982 +#: ../midori/midori-browser.c:4144 msgid "Quit the application" msgstr "Έξοδος από την εφαρμογή" -#: ../midori/midori-browser.c:3984 +#: ../midori/midori-browser.c:4146 msgid "_Edit" msgstr "_Επεξεργασία" -#: ../midori/midori-browser.c:3987 +#: ../midori/midori-browser.c:4149 msgid "Cut the selected text" msgstr "Αποκοπή επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:3990 -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4152 +#: ../midori/midori-browser.c:4155 msgid "Copy the selected text" msgstr "Αντιγραφή επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:3996 +#: ../midori/midori-browser.c:4158 msgid "Paste text from the clipboard" msgstr "Επικόλληση κειμένου από το πρόχειρο" -#: ../midori/midori-browser.c:3999 +#: ../midori/midori-browser.c:4161 msgid "Delete the selected text" msgstr "Διαγραφή του επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:4002 +#: ../midori/midori-browser.c:4164 msgid "Select all text" msgstr "Επιλογή όλου του κειμένου" -#: ../midori/midori-browser.c:4005 +#: ../midori/midori-browser.c:4167 msgid "Find a word or phrase in the page" msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα" -#: ../midori/midori-browser.c:4007 +#: ../midori/midori-browser.c:4169 msgid "Find _Next" msgstr "Εύρεση επ_όμενο" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4170 msgid "Find the next occurrence of a word or phrase" msgstr "Εύρεση της επόμενης ύπαρξης της λέξης ή της φράσης" -#: ../midori/midori-browser.c:4010 +#: ../midori/midori-browser.c:4172 msgid "Find _Previous" msgstr "Εύρεση _προηγούμενο" -#: ../midori/midori-browser.c:4011 +#: ../midori/midori-browser.c:4173 msgid "Find the previous occurrence of a word or phrase" msgstr "Εύρεση της προηγούμενης ύπαρξης της λέξης ή της φράσης" -#: ../midori/midori-browser.c:4015 +#: ../midori/midori-browser.c:4177 msgid "Configure the application preferences" msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής" -#: ../midori/midori-browser.c:4017 +#: ../midori/midori-browser.c:4179 msgid "_View" msgstr "_Εμφάνιση" -#: ../midori/midori-browser.c:4018 +#: ../midori/midori-browser.c:4180 msgid "_Toolbars" msgstr "_Εργαλειοθήκες" -#: ../midori/midori-browser.c:4030 +#: ../midori/midori-browser.c:4192 msgid "Increase the zoom level" msgstr "Αύξηση του επίπεδου εστίασης" -#: ../midori/midori-browser.c:4033 +#: ../midori/midori-browser.c:4195 msgid "Decrease the zoom level" msgstr "Μείωση του επιπέδου εστίασης" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4198 msgid "Reset the zoom level" msgstr "Επαναφορά του επιπέδου εστίασης" -#: ../midori/midori-browser.c:4037 +#: ../midori/midori-browser.c:4199 msgid "_Encoding" msgstr "_Κωδικοποίηση" -#: ../midori/midori-browser.c:4039 +#: ../midori/midori-browser.c:4201 +msgid "View So_urce" +msgstr "Προβολή κ_ώδικα" + +#: ../midori/midori-browser.c:4202 +msgid "View the source code of the page" +msgstr "Προβολή του πηγαίου κώδικα αυτής της σελίδας" + +#: ../midori/midori-browser.c:4204 +msgid "View Selection Source" +msgstr "Προβολή του επιλεγμένου κώδικα" + +#: ../midori/midori-browser.c:4205 +msgid "View the source code of the selection" +msgstr "Προβολή του πηγαίου κώδικα του επιλεγμένου" + +#: ../midori/midori-browser.c:4209 +msgid "Toggle fullscreen view" +msgstr "Εναλλαγή σε πλήρη οθόνη" + +#: ../midori/midori-browser.c:4211 +msgid "_Go" +msgstr "_Μετάβαση" + +#: ../midori/midori-browser.c:4214 +msgid "Go back to the previous page" +msgstr "Μετάβαση στην προηγούμενη σελίδα" + +#: ../midori/midori-browser.c:4217 +msgid "Go forward to the next page" +msgstr "Μετάβαση στην επόμενη σελίδα" + +#: ../midori/midori-browser.c:4220 +msgid "Go to your homepage" +msgstr "Μετάβαση στην αρχική σελίδα" + +#: ../midori/midori-browser.c:4222 +msgid "Empty Trash" +msgstr "Άδειασμα αποριμμάτων" + +#: ../midori/midori-browser.c:4223 +msgid "Delete the contents of the trash" +msgstr "Διαγραφή των περιεχομένων των απορριμάτων" + +#: ../midori/midori-browser.c:4225 +msgid "Undo _Close Tab" +msgstr "Αναίρεση κλ_είσιμο καρτέλας" + +#: ../midori/midori-browser.c:4226 +msgid "Open the last closed tab" +msgstr "Άνοιγμα της τελευταίας καρτέλας που έκλεισε" + +#: ../midori/midori-browser.c:4230 +#: ../panels/midori-bookmarks.c:231 +msgid "Add a new bookmark" +msgstr "Προσθήκη ενός νέου σελιδοδείκτη" + +#: ../midori/midori-browser.c:4232 +msgid "Add a new _folder" +msgstr "Προσθήκη ενός νέου φ_ακέλου" + +#: ../midori/midori-browser.c:4233 +msgid "Add a new bookmark folder" +msgstr "Προσθήκη ενός νέου φακέλου σελιδοδεικτών" + +#: ../midori/midori-browser.c:4235 +#: ../midori/midori-searchaction.c:493 +msgid "_Manage Search Engines" +msgstr "_Διαχείριση των μηχανών αναζήτησης" + +#: ../midori/midori-browser.c:4236 +msgid "Add, edit and remove search engines..." +msgstr "Προσθήκη, επεξεργασία και διαγραφή των μηχανών αναζήτησης..." + +#: ../midori/midori-browser.c:4239 +msgid "_Clear Private Data" +msgstr "_Καθαρισμός προσωπικών δεδομένων" + +#: ../midori/midori-browser.c:4240 +msgid "Clear private data..." +msgstr "Καθαρισμός προσωπικών δεδομένων..." + +#: ../midori/midori-browser.c:4244 +msgid "_Previous Tab" +msgstr "_Προηγούμενη καρτέλα" + +#: ../midori/midori-browser.c:4245 +msgid "Switch to the previous tab" +msgstr "Μετάβαση στην προηγούμενη καρτέλα" + +#: ../midori/midori-browser.c:4247 +msgid "_Next Tab" +msgstr "Επόμε_νη καρτέλα" + +#: ../midori/midori-browser.c:4248 +msgid "Switch to the next tab" +msgstr "Μετάβαση στην επόμενη καρτέλα" + +#: ../midori/midori-browser.c:4250 +msgid "_Help" +msgstr "_Βοήθεια" + +#: ../midori/midori-browser.c:4252 +msgid "_Contents" +msgstr "_Περιεχόμενα" + +#: ../midori/midori-browser.c:4253 +msgid "Show the documentation" +msgstr "Εμφάνιση της τεκμηρίωσης" + +#: ../midori/midori-browser.c:4255 +msgid "_Frequent Questions" +msgstr "Σ_υχνές ερωτήσεις" + +#: ../midori/midori-browser.c:4256 +msgid "Show the Frequently Asked Questions" +msgstr "Εμφάνιση των πιο συχνά ερωτηθέντων ερωτήσεων" + +#: ../midori/midori-browser.c:4258 +msgid "_Report a Bug" +msgstr "Α_ναφορά σφάλματος" + +#: ../midori/midori-browser.c:4259 +msgid "Open Midori's bug tracker" +msgstr "Άνοιγμα καταγραφής σφαλμάτων midori" + +#: ../midori/midori-browser.c:4262 +msgid "Show information about the program" +msgstr "Εμφάνιση πληροφοριών σχετικά με την εφαρμογή" + +#: ../midori/midori-browser.c:4269 +msgid "P_rivate Browsing" +msgstr "Π_ροσωπική περιήγηση" + +#: ../midori/midori-browser.c:4270 +msgid "Don't save any private data while browsing" +msgstr "Να μην γίνει αποθήκευση προσωπικών δεδομένων κατά την περιήγηση" + +#: ../midori/midori-browser.c:4275 +msgid "_Menubar" +msgstr "_Μπάρα μενού" + +#: ../midori/midori-browser.c:4276 +msgid "Show menubar" +msgstr "Προβολή μπάρας μενού" + +#: ../midori/midori-browser.c:4279 +msgid "_Navigationbar" +msgstr "_Μπάρα περιήγησης" + +#: ../midori/midori-browser.c:4280 +msgid "Show navigationbar" +msgstr "Εμφάνιση περιήγησης" + +#: ../midori/midori-browser.c:4283 +msgid "Side_panel" +msgstr "Πλαϊνό _πλαίσιο" + +#: ../midori/midori-browser.c:4284 +msgid "Show sidepanel" +msgstr "Εμφάνιση πλαϊνού πλαισίου" + +#: ../midori/midori-browser.c:4287 +msgid "_Bookmarkbar" +msgstr "_Μπάρα σελιδοδείκτη" + +#: ../midori/midori-browser.c:4288 +msgid "Show bookmarkbar" +msgstr "Εμφάνιση μπάρα σελιδοδείκτη" + +#: ../midori/midori-browser.c:4291 +msgid "_Transferbar" +msgstr "_Μπάρα μεταφορών" + +#: ../midori/midori-browser.c:4292 +msgid "Show transferbar" +msgstr "Εμφάνιση μπάρα μεταφορών" + +#: ../midori/midori-browser.c:4295 +msgid "_Statusbar" +msgstr "_Γραμμή κατάστασης" + +#: ../midori/midori-browser.c:4296 +msgid "Show statusbar" +msgstr "Εμφάνιση γραμμής κατάστασης" + +#: ../midori/midori-browser.c:4303 msgid "_Automatic" msgstr "_Αυτόματα" -#: ../midori/midori-browser.c:4042 +#: ../midori/midori-browser.c:4306 #: ../midori/midori-websettings.c:212 msgid "Chinese (BIG5)" msgstr "Κινέζικα (BIG5)" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4046 +#: ../midori/midori-browser.c:4310 msgid "Japanese (SHIFT__JIS)" msgstr "Ιαπωνικά (SHIFT__JIS)" -#: ../midori/midori-browser.c:4049 +#: ../midori/midori-browser.c:4313 #: ../midori/midori-websettings.c:214 msgid "Russian (KOI8-R)" msgstr "Ρωσικά (KOI8-R)" -#: ../midori/midori-browser.c:4052 +#: ../midori/midori-browser.c:4316 #: ../midori/midori-websettings.c:215 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4055 +#: ../midori/midori-browser.c:4319 #: ../midori/midori-websettings.c:216 msgid "Western (ISO-8859-1)" msgstr "Δυτικά (ISO-8859-1)" -#: ../midori/midori-browser.c:4058 +#: ../midori/midori-browser.c:4322 #: ../midori/midori-websettings.c:217 #: ../midori/midori-websettings.c:289 msgid "Custom..." msgstr "Προσαρμογή..." -#: ../midori/midori-browser.c:4061 -#: ../midori/midori-view.c:1359 -msgid "View So_urce" -msgstr "Προβολή κ_ώδικα" - -#: ../midori/midori-browser.c:4062 -msgid "View the source code of the page" -msgstr "Προβολή του πηγαίου κώδικα αυτής της σελίδας" - -#: ../midori/midori-browser.c:4064 -msgid "View Selection Source" -msgstr "Προβολή του επιλεγμένου κώδικα" - -#: ../midori/midori-browser.c:4065 -msgid "View the source code of the selection" -msgstr "Προβολή του πηγαίου κώδικα του επιλεγμένου" - -#: ../midori/midori-browser.c:4069 -msgid "Toggle fullscreen view" -msgstr "Εναλλαγή σε πλήρη οθόνη" - -#: ../midori/midori-browser.c:4071 -msgid "_Go" -msgstr "_Μετάβαση" - -#: ../midori/midori-browser.c:4074 -msgid "Go back to the previous page" -msgstr "Μετάβαση στην προηγούμενη σελίδα" - -#: ../midori/midori-browser.c:4077 -msgid "Go forward to the next page" -msgstr "Μετάβαση στην επόμενη σελίδα" - -#: ../midori/midori-browser.c:4080 -msgid "Go to your homepage" -msgstr "Μετάβαση στην αρχική σελίδα" - -#: ../midori/midori-browser.c:4082 -msgid "Empty Trash" -msgstr "Άδειασμα αποριμμάτων" - -#: ../midori/midori-browser.c:4083 -msgid "Delete the contents of the trash" -msgstr "Διαγραφή των περιεχομένων των απορριμάτων" - -#: ../midori/midori-browser.c:4085 -#: ../midori/midori-view.c:1317 -msgid "Undo _Close Tab" -msgstr "Αναίρεση κλ_είσιμο καρτέλας" - -#: ../midori/midori-browser.c:4086 -msgid "Open the last closed tab" -msgstr "Άνοιγμα της τελευταίας καρτέλας που έκλεισε" - -#: ../midori/midori-browser.c:4090 -#: ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "Προσθήκη ενός νέου σελιδοδείκτη" - -#: ../midori/midori-browser.c:4092 -msgid "Add a new _folder" -msgstr "Προσθήκη ενός νέου φ_ακέλου" - -#: ../midori/midori-browser.c:4093 -msgid "Add a new bookmark folder" -msgstr "Προσθήκη ενός νέου φακέλου σελιδοδεικτών" - -#: ../midori/midori-browser.c:4094 -msgid "_Tools" -msgstr "_Εργαλεία" - -#: ../midori/midori-browser.c:4096 -#: ../midori/midori-searchaction.c:493 -msgid "_Manage Search Engines" -msgstr "_Διαχείριση των μηχανών αναζήτησης" - -#: ../midori/midori-browser.c:4097 -msgid "Add, edit and remove search engines..." -msgstr "Προσθήκη, επεξεργασία και διαγραφή των μηχανών αναζήτησης..." - -#: ../midori/midori-browser.c:4100 -msgid "_Clear Private Data" -msgstr "_Καθαρισμός προσωπικών δεδομένων" - -#: ../midori/midori-browser.c:4101 -msgid "Clear private data..." -msgstr "Καθαρισμός προσωπικών δεδομένων..." - -#: ../midori/midori-browser.c:4105 -msgid "_Previous Tab" -msgstr "_Προηγούμενη καρτέλα" - -#: ../midori/midori-browser.c:4106 -msgid "Switch to the previous tab" -msgstr "Μετάβαση στην προηγούμενη καρτέλα" - -#: ../midori/midori-browser.c:4108 -msgid "_Next Tab" -msgstr "Επόμε_νη καρτέλα" - -#: ../midori/midori-browser.c:4109 -msgid "Switch to the next tab" -msgstr "Μετάβαση στην επόμενη καρτέλα" - -#: ../midori/midori-browser.c:4111 -msgid "_Help" -msgstr "_Βοήθεια" - -#: ../midori/midori-browser.c:4113 -msgid "_Contents" -msgstr "_Περιεχόμενα" - -#: ../midori/midori-browser.c:4114 -msgid "Show the documentation" -msgstr "Εμφάνιση της τεκμηρίωσης" - -#: ../midori/midori-browser.c:4116 -msgid "_Frequent Questions" -msgstr "Σ_υχνές ερωτήσεις" - -#: ../midori/midori-browser.c:4117 -msgid "Show the Frequently Asked Questions" -msgstr "Εμφάνιση των πιο συχνά ερωτηθέντων ερωτήσεων" - -#: ../midori/midori-browser.c:4119 -msgid "_Report a Bug" -msgstr "Α_ναφορά σφάλματος" - -#: ../midori/midori-browser.c:4120 -msgid "Open Midori's bug tracker" -msgstr "Άνοιγμα καταγραφής σφαλμάτων midori" - -#: ../midori/midori-browser.c:4123 -msgid "Show information about the program" -msgstr "Εμφάνιση πληροφοριών σχετικά με την εφαρμογή" - -#: ../midori/midori-browser.c:4130 -msgid "P_rivate Browsing" -msgstr "Π_ροσωπική περιήγηση" - -#: ../midori/midori-browser.c:4131 -msgid "Don't save any private data while browsing" -msgstr "Να μην γίνει αποθήκευση προσωπικών δεδομένων κατά την περιήγηση" - -#: ../midori/midori-browser.c:4136 -msgid "_Menubar" -msgstr "_Μπάρα μενού" - -#: ../midori/midori-browser.c:4137 -msgid "Show menubar" -msgstr "Προβολή μπάρας μενού" - -#: ../midori/midori-browser.c:4140 -msgid "_Navigationbar" -msgstr "_Μπάρα περιήγησης" - -#: ../midori/midori-browser.c:4141 -msgid "Show navigationbar" -msgstr "Εμφάνιση περιήγησης" - -#: ../midori/midori-browser.c:4144 -msgid "Side_panel" -msgstr "Πλαϊνό _ταμπλό" - -#: ../midori/midori-browser.c:4145 -msgid "Show sidepanel" -msgstr "Εμφάνιση πλαϊνού ταμπλό" - -#: ../midori/midori-browser.c:4148 -msgid "_Bookmarkbar" -msgstr "_Μπάρα σελιδοδείκτη" - -#: ../midori/midori-browser.c:4149 -msgid "Show bookmarkbar" -msgstr "Εμφάνιση μπάρα σελιδοδείκτη" - -#: ../midori/midori-browser.c:4152 -msgid "_Transferbar" -msgstr "_Μπάρα μεταφορών" - -#: ../midori/midori-browser.c:4153 -msgid "Show transferbar" -msgstr "Εμφάνιση μπάρα μεταφορών" - -#: ../midori/midori-browser.c:4156 -msgid "_Statusbar" -msgstr "_Γραμμή κατάστασης" - -#: ../midori/midori-browser.c:4157 -msgid "Show statusbar" -msgstr "Εμφάνιση γραμμής κατάστασης" - -#: ../midori/midori-browser.c:4581 +#: ../midori/midori-browser.c:4760 msgid "_Separator" msgstr "_Διαχωριστής" -#: ../midori/midori-browser.c:4588 +#: ../midori/midori-browser.c:4767 msgid "_Location..." msgstr "_Τοποθεσία:" -#: ../midori/midori-browser.c:4590 +#: ../midori/midori-browser.c:4769 msgid "Open a particular location" msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας" -#: ../midori/midori-browser.c:4614 +#: ../midori/midori-browser.c:4793 msgid "_Web Search..." msgstr "_Αναζήτηση ιστού..." -#: ../midori/midori-browser.c:4616 +#: ../midori/midori-browser.c:4795 msgid "Run a web search" msgstr "Εκκίνηση μίας αναζήτησης ιστού" -#: ../midori/midori-browser.c:4637 +#: ../midori/midori-browser.c:4816 msgid "Reopen a previously closed tab or window" msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει" -#: ../midori/midori-browser.c:4652 +#: ../midori/midori-browser.c:4831 msgid "_Recently visited pages" msgstr "_Πρόσφατες επισκεπτόμενες σελίδες " -#: ../midori/midori-browser.c:4654 +#: ../midori/midori-browser.c:4833 msgid "Reopen pages that you visited earlier" msgstr "Ξανα-άνοιγμα σελίδων που επισκεφτήκατε νωρίτερα" -#: ../midori/midori-browser.c:4669 -#: ../midori/sokoke.c:856 +#: ../midori/midori-browser.c:4848 +#: ../midori/sokoke.c:857 msgid "_Bookmarks" msgstr "_Σελιδοδείκτες" -#: ../midori/midori-browser.c:4671 +#: ../midori/midori-browser.c:4850 msgid "Show the saved bookmarks" msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών" -#: ../midori/midori-browser.c:4686 +#: ../midori/midori-browser.c:4865 +msgid "_Tools" +msgstr "_Εργαλεία" + +#: ../midori/midori-browser.c:4877 msgid "_Window" msgstr "_Παράθυρο" -#: ../midori/midori-browser.c:4688 +#: ../midori/midori-browser.c:4879 msgid "Show a list of all open tabs" msgstr "Εμφάνιση μίας λίστας με όλα τις ανοιχτές καρτέλες" +#: ../midori/midori-browser.c:4893 +msgid "_Menu" +msgstr "_Μενού" + +#: ../midori/midori-browser.c:4895 +msgid "Menu" +msgstr "Μενού" + #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4863 +#: ../midori/midori-browser.c:5072 msgid "_Inline Find:" msgstr "Ε_νσωματωμένη αναζήτηση:" -#: ../midori/midori-browser.c:4888 +#: ../midori/midori-browser.c:5097 msgid "Previous" msgstr "Προηγούμενο" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:5102 msgid "Next" msgstr "Επόμενο" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5107 msgid "Match Case" msgstr "Ταίριασμα πεζών" -#: ../midori/midori-browser.c:4906 +#: ../midori/midori-browser.c:5115 msgid "Highlight Matches" msgstr "Τονισμός των ταιριασμάτων" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:5125 msgid "Close Findbar" msgstr "Κλείσιμο μπάρας εύρεσης" -#: ../midori/midori-browser.c:4951 +#: ../midori/midori-browser.c:5160 #: ../extensions/cookie-manager/cookie-manager-page.c:109 msgid "Delete All" msgstr "Διαγραφή όλων" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5493 #, c-format msgid "Unexpected setting '%s'" msgstr "Αναπάντεχη ρύθμιση '%s'" -#: ../midori/midori-locationaction.c:915 +#: ../midori/midori-locationaction.c:901 #, c-format msgid "Search with %s" msgstr "Αναζήτηση με %s" -#: ../midori/midori-panel.c:333 +#: ../midori/midori-panel.c:342 msgid "Detach chosen panel from the window" -msgstr "Αποσύνδεση επιλεγμένου ταμπλό από το παράθυρο" +msgstr "Αποσύνδεση επιλεγμένου πλαισίου από το παράθυρο" -#: ../midori/midori-panel.c:343 -#: ../midori/midori-panel.c:508 +#: ../midori/midori-panel.c:352 +#: ../midori/midori-panel.c:516 msgid "Align sidepanel to the right" -msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό ταμπλό στα δεξιά" +msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό πλαίσιο στα δεξιά" -#: ../midori/midori-panel.c:353 -#: ../midori/midori-panel.c:354 +#: ../midori/midori-panel.c:362 +#: ../midori/midori-panel.c:363 msgid "Close panel" -msgstr "Κλείσιμο ταμπλού" +msgstr "Κλείσιμο πλαισίου" -#: ../midori/midori-panel.c:509 +#: ../midori/midori-panel.c:517 msgid "Align sidepanel to the left" -msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό ταμπλό στα αριστερά" +msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό πλαίσιο στα αριστερά" #: ../midori/midori-websettings.c:195 -#: ../midori/midori-view.c:2262 -msgid "Blank page" -msgstr "Κενή σελίδα" +msgid "Show Blank page" +msgstr "Εμφάνιση κενής σελίδας" #: ../midori/midori-websettings.c:196 -#: ../midori/midori-websettings.c:563 -msgid "Homepage" -msgstr "Αρχική σελίδα" +msgid "Show Homepage" +msgstr "Εμφάνιση αρχικής σελίδας" #: ../midori/midori-websettings.c:197 -msgid "Last open pages" -msgstr "Άνοιγμα τελευταίων σελίδων" +msgid "Show last open tabs" +msgstr "Εμφάνιση των τελευταίων ανοιχτών καρτέλων" #: ../midori/midori-websettings.c:213 msgid "Japanese (SHIFT_JIS)" @@ -892,12 +900,12 @@ msgid "Text" msgstr "Κείμενο" #: ../midori/midori-websettings.c:252 -msgid "Both" -msgstr "Και τα δύο" +msgid "Icons and text" +msgstr "Εικονίδια με κείμενο" #: ../midori/midori-websettings.c:253 -msgid "Both horizontal" -msgstr "Και τα δύο οριζόντια" +msgid "Text beside icons" +msgstr "Κείμενο δίπλα στα εικονίδια" #: ../midori/midori-websettings.c:268 msgid "All cookies" @@ -909,6 +917,7 @@ msgstr "Cookies συνεδρίας" #: ../midori/midori-websettings.c:270 #: ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:93 msgid "None" msgstr "Κανένα" @@ -950,20 +959,20 @@ msgstr "Το τελευταίο ύψος αποθηκευμένου παραθύ #: ../midori/midori-websettings.c:385 msgid "Last panel position" -msgstr "Θέση τελευταίου ταμπλό" +msgstr "Η τελευταία θέση πλαισίου" #: ../midori/midori-websettings.c:386 msgid "The last saved panel position" -msgstr "Η τελευταία αποθηκευμένη θέση ταμπλό" +msgstr "Η τελευταία αποθηκευμένη θέση πλαισίου" #. i18n: The internal index of the last opened panel #: ../midori/midori-websettings.c:395 msgid "Last panel page" -msgstr "Τελευταία σελίδα ταμπλό" +msgstr "Η τελευταία σελίδα πλαισίου" #: ../midori/midori-websettings.c:396 msgid "The last saved panel page" -msgstr "Η τελευταία αποθηκευμένη σελίδα ταμπλό" +msgstr "Η τελευταία αποθηκευμένη σελίδα πλαισίου" #: ../midori/midori-websettings.c:404 msgid "Last Web search" @@ -999,11 +1008,11 @@ msgstr "Εάν θα φαίνεται η μπάρα των σελιλοδεικτ #: ../midori/midori-websettings.c:441 msgid "Show Panel" -msgstr "Εμφάνιση ταμπλό" +msgstr "Εμφάνιση πλαισίου" #: ../midori/midori-websettings.c:442 msgid "Whether to show the panel" -msgstr "Εάν θα φαίνεται το ταμπλό" +msgstr "Εάν θα φαίνεται το πλαίσιο" #: ../midori/midori-websettings.c:457 msgid "Show Transferbar" @@ -1022,8 +1031,8 @@ msgid "Whether to show the statusbar" msgstr "Εάν θα φαίνεται η γραμμή κατάστασης" #: ../midori/midori-websettings.c:476 -msgid "Toolbar Style" -msgstr "Στυλ εργαλειοθήκης" +msgid "Toolbar Style:" +msgstr "Στυλ εργαλειοθήκης:" #: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" @@ -1055,27 +1064,31 @@ msgstr "Τι αντικείμενα να εμφανίζονται στην ερ #: ../midori/midori-websettings.c:527 msgid "Compact Sidepanel" -msgstr "Σύμπτυξη πλαϊνού ταμπλό" +msgstr "Σύμπτυξη πλαϊνού πλαισίου" #: ../midori/midori-websettings.c:528 msgid "Whether to make the sidepanel compact" -msgstr "Εάν θα γίνει σύμπτυξη του πλαϊνού ταμπλό" +msgstr "Εάν θα γίνει σύμπτυξη του πλαϊνού πλαισίου" #: ../midori/midori-websettings.c:543 msgid "Align sidepanel on the right" -msgstr "Ευθυγράμμιση πλαϊνού ταμπλό στα δεξιά" +msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα δεξιά" #: ../midori/midori-websettings.c:544 msgid "Whether to align the sidepanel on the right" -msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό ταμπλό στα δεξιά" +msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό πλαίσιο στα δεξιά" #: ../midori/midori-websettings.c:553 -msgid "Load on Startup" -msgstr "Να φορτώνεται στην εκκίνηση" +msgid "When Midori starts:" +msgstr "Κατά την εκκίνηση του midori:" #: ../midori/midori-websettings.c:554 -msgid "What to load on startup" -msgstr "Τι να φορτώνει κατά την εκκίνηση" +msgid "What to do when Midori starts" +msgstr "Κατά την εκκίνηση του midori να φορτώνει:" + +#: ../midori/midori-websettings.c:563 +msgid "Homepage:" +msgstr "Αρχική σελίδα:" #: ../midori/midori-websettings.c:564 msgid "The homepage" @@ -1099,8 +1112,8 @@ msgid "Show speed dial in newly opened tabs" msgstr "Εμφάνιση γρήγορης σύνδεσης στις νέες ανοιχτές καρτέλες" #: ../midori/midori-websettings.c:605 -msgid "Download Folder" -msgstr "Φάκελος μεταφορών" +msgid "Save downloaded files to:" +msgstr "Αποθήκευση των αρχείων που κατέβηκαν στο:" #: ../midori/midori-websettings.c:606 msgid "The folder downloaded files are saved to" @@ -1179,291 +1192,312 @@ msgid "Whether tabs have close buttons" msgstr "Εάν οι καρτέλες θα έχουν κουμπί κλεισίματος" #: ../midori/midori-websettings.c:730 -msgid "Open new pages in" -msgstr "Άνοιγμα νέων σελίδων σε" +msgid "Open new pages in:" +msgstr "Άνοιγμα νέων σελίδων σε:" #: ../midori/midori-websettings.c:731 msgid "Where to open new pages" msgstr "Που να ανοίγουν οι νέες σελίδες" #: ../midori/midori-websettings.c:740 -msgid "Open external pages in" -msgstr "Άνοιγμα εξωτερικών σελίδων σε" +msgid "Open external pages in:" +msgstr "Άνοιγμα εξωτερικών σελίδων σε:" #: ../midori/midori-websettings.c:741 msgid "Where to open externally opened pages" msgstr "Που να ανοίγουν οι εξωτερικές ανοιγμένες σελίδες" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:750 msgid "Middle click opens Selection" msgstr "Το μεσαίο κλικ ανοίγει την Επιλογή" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:751 msgid "Load an address from the selection via middle click" msgstr "Φόρτωση μίας διεύθυνσης από την επιλογή μέσω του μεσαίου κλικ" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:759 msgid "Open tabs in the background" msgstr "Άνοιγμα των καρτελών στο παρασκήνιο" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:760 msgid "Whether to open new tabs in the background" msgstr "Εάν θα ανοίγονται νέες καρτέλες στο παρασκήνιο" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:768 msgid "Open Tabs next to Current" msgstr "Άνοιγμα των καρτελών δίπλα στο τρέχων" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:769 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την τελευταία" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:777 msgid "Open popups in tabs" msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:778 msgid "Whether to open popup windows in tabs" msgstr "Εάν θα ανοίγονται τα αναδυόμενα παράθυρα σε καρτέλες" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:794 msgid "Zoom Text and Images" msgstr "Εστίαση κειμένου και εικόνων" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:795 msgid "Whether to zoom text and images" msgstr "Εάν θα εστιάζεται το κείμενο και οι εικόνες" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:810 msgid "Find inline while typing" msgstr "Ενσωματωμένη εύρεση κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:811 msgid "Whether to automatically find inline while typing" msgstr "Εάν θα γίνεται αυτόματη ενσωματωμένη αναζήτηση κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:819 msgid "Accept cookies" msgstr "Αποδοχή cookies" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:820 msgid "What type of cookies to accept" msgstr "Τι τύπο cookies να γίνονται αποδεκτά" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:829 msgid "Original cookies only" msgstr "Μόνο πρωτότυπα cookies" -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:830 msgid "Accept cookies from the original website only" msgstr "Αποδοχή cookies μόνο από πρωτότυπους ιστότοπους" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:838 msgid "Maximum cookie age" msgstr "Μέγιστος χρόνος cookie" -#: ../midori/midori-websettings.c:843 +#: ../midori/midori-websettings.c:839 msgid "The maximum number of days to save cookies for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση των cookies" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:849 msgid "Remember last visited pages" msgstr "Απομνημόνευση των τελευταίων επισκεπτόμενων σελίδων" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:850 msgid "Whether the last visited pages are saved" msgstr "Εάν θα αποθηκεύονται οι τελευταίες επισκεπτόμενες σελίδες" -#: ../midori/midori-websettings.c:862 +#: ../midori/midori-websettings.c:858 msgid "Maximum history age" msgstr "Μέγιστο χρόνος ιστορικού" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:859 msgid "The maximum number of days to save the history for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση του ιστορικού" -#: ../midori/midori-websettings.c:871 +#: ../midori/midori-websettings.c:867 msgid "Remember last form inputs" msgstr "Απομνημόνευση των τελευταίων εισαγωγών" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:868 msgid "Whether the last form inputs are saved" msgstr "Εάν θα αποθηκεύονται οι τελευταίες εισαγωγές φορμών" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:876 msgid "Remember last downloaded files" msgstr "Απομνημόνευση των τελευταίων αρχείων που κατέβηκαν" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:877 msgid "Whether the last downloaded files are saved" msgstr "Εάν θα αποθηκεύονται τα τελευταία αρχεία που κατέβηκαν" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:887 msgid "Proxy Server" msgstr "Διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:888 msgid "The proxy server used for HTTP connections" msgstr "Ο μεσολαβητής χρησιμοποιείται για http συνδέσεις" -#: ../midori/midori-websettings.c:907 +#: ../midori/midori-websettings.c:903 msgid "Detect proxy server automatically" msgstr "Αυτόματη εύρεση διακομιστή μεσολάβησης" -#: ../midori/midori-websettings.c:908 +#: ../midori/midori-websettings.c:904 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:924 +#: ../midori/midori-websettings.c:920 msgid "Identify as" msgstr "Αναγνώριση ως" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:921 msgid "What to identify as to web pages" msgstr "Με τι να αναγνωρίζεται στις σελίδες ιστού" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:937 msgid "Identification string" msgstr "Αλφαριθμητικό αναγνώρισης" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:938 msgid "The application identification string" msgstr "Το αλφαριθμητικό αναγνώρισης της εφαρμογής" -#: ../midori/midori-websettings.c:950 +#: ../midori/midori-websettings.c:946 msgid "Cache size" msgstr "Μέγεθος προσωρινής μνήμης" -#: ../midori/midori-websettings.c:951 +#: ../midori/midori-websettings.c:947 msgid "The allowed size of the cache" msgstr "Το επιτρεπόμενο μέγεθος της προσωρινής μνήμης" -#: ../midori/midori-websettings.c:966 +#: ../midori/midori-websettings.c:962 msgid "Clear private data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:963 msgid "The private data selected for deletion" msgstr "Τα προσωπικά δεδομένα που επιλέχθηκαν για διαγραφή" -#: ../midori/midori-view.c:749 +#: ../midori/midori-view.c:781 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Η σελίδα '%s' δεν μπορεί να φορτωθεί." #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c:751 -#: ../midori/midori-view.c:2807 +#: ../midori/midori-view.c:783 +#: ../midori/midori-view.c:2988 #: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "Σφάλμα" -#: ../midori/midori-view.c:754 +#: ../midori/midori-view.c:786 msgid "Try again" msgstr "Δοκιμάστε ξανά" #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:784 -#: ../midori/midori-view.c:2811 +#: ../midori/midori-view.c:818 +#: ../midori/midori-view.c:2992 #, c-format msgid "Not found - %s" msgstr "Δεν βρέθηκε - %s" -#: ../midori/midori-view.c:1182 +#: ../midori/midori-view.c:1205 msgid "Open _Link" msgstr "Άνοιγμα _συνδέσμου" -#: ../midori/midori-view.c:1184 +#: ../midori/midori-view.c:1207 msgid "Open Link in New _Tab" msgstr "Άνοιγμα συνδέσμου σε νέα κ_αρτέλα" -#: ../midori/midori-view.c:1201 +#: ../midori/midori-view.c:1224 msgid "Open Link in New _Window" msgstr "Άνοιγμα συνδέσμου σε νέο _παραθύρο" -#: ../midori/midori-view.c:1207 +#: ../midori/midori-view.c:1230 msgid "_Download Link destination" msgstr "Κ_ατέβασμα συνδέσμου προορισμού" -#: ../midori/midori-view.c:1213 +#: ../midori/midori-view.c:1236 msgid "_Save Link destination" msgstr "Απ_οθήκευση συνδέσμου προορισμού" -#: ../midori/midori-view.c:1222 +#: ../midori/midori-view.c:1245 msgid "Download with Download _Manager" msgstr "Κατέβασμα με τον διαχειριστή μεταφορών" -#: ../midori/midori-view.c:1251 +#: ../midori/midori-view.c:1274 msgid "Search _with" msgstr "Αναζήτηση _με" -#: ../midori/midori-view.c:1279 +#: ../midori/midori-view.c:1302 msgid "_Search the Web" msgstr "_Αναζήτηση στον ιστό" -#: ../midori/midori-view.c:1289 +#: ../midori/midori-view.c:1312 msgid "Open Address in New _Tab" msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα" -#: ../midori/midori-view.c:1456 +#: ../midori/midori-view.c:1490 msgid "Open or download file" msgstr "Άνοιγμα ή κατέβασμα αρχείου" -#: ../midori/midori-view.c:1473 +#: ../midori/midori-view.c:1507 #, c-format msgid "File Type: '%s'" msgstr "Τύπος αρχείου: '%s'" -#: ../midori/midori-view.c:1476 +#: ../midori/midori-view.c:1510 #, 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:1480 +#: ../midori/midori-view.c:1514 #, c-format msgid "Open %s" msgstr "Άνοιγμα %s" -#: ../midori/midori-view.c:1898 +#: ../midori/midori-view.c:1953 #, c-format msgid "Inspect page - %s" msgstr "Εξέταση σελίδα -%s" -#: ../midori/midori-view.c:2088 +#: ../midori/midori-view.c:2143 msgid "Speed dial" msgstr "Γρήγορη σύνδεση" -#: ../midori/midori-view.c:2089 +#: ../midori/midori-view.c:2144 msgid "Click to add a shortcut" msgstr "Κάντε click για προσθήκη συντόμευσης" -#: ../midori/midori-view.c:2090 +#: ../midori/midori-view.c:2145 msgid "Enter shortcut address" msgstr "Εισάγεται διεύθυνση συντόμευσης" -#: ../midori/midori-view.c:2091 +#: ../midori/midori-view.c:2146 msgid "Enter shortcut title" msgstr "Εισάγετε τίτλο συντόμευσης" -#: ../midori/midori-view.c:2092 +#: ../midori/midori-view.c:2147 msgid "Are you sure you want to delete this shortcut?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την συντόμευση;" -#: ../midori/midori-view.c:2122 +#: ../midori/midori-view.c:2177 #, c-format msgid "Document cannot be displayed" msgstr "Το αρχείο δεν μπορεί να εμφανιστεί" -#: ../midori/midori-view.c:2139 +#: ../midori/midori-view.c:2194 #, c-format msgid "No documentation installed" msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση" +#: ../midori/midori-view.c:2319 +msgid "Blank page" +msgstr "Κενή σελίδα" + +#: ../midori/midori-view.c:2547 +#: ../midori/sokoke.c:865 +msgid "New _Tab" +msgstr "Νέα _καρτέλα" + +#: ../midori/midori-view.c:2561 +msgid "_Duplicate Tab" +msgstr "_Διπλότυπη καρτέλα" + +#: ../midori/midori-view.c:2566 +msgid "_Restore Tab" +msgstr "_Επαναφορά καρτέλας" + +#: ../midori/midori-view.c:2566 +msgid "_Minimize Tab" +msgstr "_Ελαχιστοποίηση καρτέλας" + #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" @@ -1643,35 +1677,35 @@ msgid "Browsing" msgstr "Περιήγηση" #. Page "Applications" -#: ../midori/midori-preferences.c:578 +#: ../midori/midori-preferences.c:576 msgid "Applications" msgstr "Εφαρμογές" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:577 msgid "External applications" msgstr "Εξωτερικές εφαρμογές" #. Page "Network" -#: ../midori/midori-preferences.c:625 -#: ../midori/midori-preferences.c:626 +#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:624 msgid "Network" msgstr "Δίκτυο" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:651 msgid "MB" msgstr "ΜΒ" #. Page "Privacy" -#: ../midori/midori-preferences.c:658 +#: ../midori/midori-preferences.c:656 msgid "Privacy" msgstr "Προσωπικό απόρρητο" -#: ../midori/midori-preferences.c:659 +#: ../midori/midori-preferences.c:657 msgid "Web Cookies" msgstr "Cookies ιστού" -#: ../midori/midori-preferences.c:672 -#: ../midori/midori-preferences.c:682 +#: ../midori/midori-preferences.c:670 +#: ../midori/midori-preferences.c:680 msgid "days" msgstr "ημέρες" @@ -1708,59 +1742,51 @@ msgstr "Διαχείριση των μηχανών αναζήτησης" msgid "Use as _default" msgstr "Χρήση ως _προκαθορισμένο" -#: ../midori/sokoke.c:172 -#: ../midori/sokoke.c:184 +#: ../midori/sokoke.c:162 +#: ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα." -#: ../midori/sokoke.c:855 +#: ../midori/sokoke.c:856 msgid "_Bookmark" msgstr "_Σελιδοδείκτης" -#: ../midori/sokoke.c:857 +#: ../midori/sokoke.c:858 msgid "Add Boo_kmark" msgstr "Προσθήκη σ_ελιδοδείκτη" -#: ../midori/sokoke.c:858 +#: ../midori/sokoke.c:859 msgid "_Console" msgstr "_Τερματικό" -#: ../midori/sokoke.c:859 +#: ../midori/sokoke.c:860 msgid "_Extensions" msgstr "_Επεκτάσεις" -#: ../midori/sokoke.c:860 +#: ../midori/sokoke.c:861 msgid "_History" msgstr "_Ιστορικό" -#: ../midori/sokoke.c:861 +#: ../midori/sokoke.c:862 msgid "_Homepage" msgstr "_Αρχική σελίδα" -#: ../midori/sokoke.c:862 +#: ../midori/sokoke.c:863 msgid "_Userscripts" msgstr "_Σενάρια χρήστη" -#: ../midori/sokoke.c:863 +#: ../midori/sokoke.c:864 msgid "User_styles" msgstr "_Θέματα χρήστη" -#: ../midori/sokoke.c:864 -msgid "New _Tab" -msgstr "Νέα _καρτέλα" - -#: ../midori/sokoke.c:865 +#: ../midori/sokoke.c:866 msgid "_Transfers" msgstr "_Μεταφορές" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:867 msgid "Netscape p_lugins" msgstr "Α_ρθρωμάτων netscape" -#: ../midori/sokoke.c:868 -msgid "New _Window" -msgstr "Νέο _παράθυρο" - #: ../panels/midori-addons.c:95 #: ../panels/midori-addons.c:141 msgid "Userscripts" @@ -1901,19 +1927,19 @@ msgstr "Επιλογή αρχείου" msgid "Choose folder" msgstr "Επιλογή φακέλου" -#: ../extensions/adblock.c:78 +#: ../extensions/adblock.c:167 msgid "Configure Advertisement filters" msgstr "Ρύθμιση φίλτρων διαφημίσεων" -#: ../extensions/adblock.c:214 +#: ../extensions/adblock.c:304 msgid "Configure _Advertisement filters..." msgstr "Ρύθμιση φίλτρων δ_ιαφημίσεων..." -#: ../extensions/adblock.c:374 +#: ../extensions/adblock.c:562 msgid "Advertisement blocker" msgstr "Εμποδιστής διαφημίσεων" -#: ../extensions/adblock.c:375 +#: ../extensions/adblock.c:563 msgid "Block advertisements according to a filter list" msgstr "Μπλόκαρε διαφημίσεις σύμφωνα με μία λίστα με φίλτρα" @@ -2093,7 +2119,7 @@ msgstr "Νέα ροή" #: ../extensions/feed-panel/main.c:489 msgid "Feed Panel" -msgstr "Ταμπλό ροής" +msgstr "Πλαίσιο ροής" #: ../extensions/feed-panel/main.c:490 msgid "Read Atom/ RSS feeds" @@ -2117,19 +2143,19 @@ msgstr "Αποθήκευση Σελίδων" msgid "_Pageholder" msgstr "_Αποθήκευση σελίδων" -#: ../extensions/shortcuts.c:156 -msgid "Configure Keyboard shortcuts" -msgstr "Ρύθμιση συντομεύσεων πληκτρολογίου" +#: ../extensions/shortcuts.c:172 +msgid "Customize Keyboard shortcuts" +msgstr "Προσαρμογή συντομεύσεων πληκτρολογίου" -#: ../extensions/shortcuts.c:253 -msgid "Configure Sh_ortcuts..." -msgstr "Ρύθμιση σ_υντομεύσεων ..." +#: ../extensions/shortcuts.c:264 +msgid "Customize Sh_ortcuts..." +msgstr "Προσαρμογή σ_υντομεύσεων..." -#: ../extensions/shortcuts.c:285 +#: ../extensions/shortcuts.c:303 msgid "Shortcuts" msgstr "Συντομεύσεις" -#: ../extensions/shortcuts.c:286 +#: ../extensions/shortcuts.c:304 msgid "View and edit keyboard shortcuts" msgstr "Εμφάνιση και επεξεργασία συντομεύσεων πληκτρολογίου" @@ -2149,6 +2175,61 @@ msgstr "Γραμμή κατάστασης χαρακτηριστικών" msgid "Easily toggle features on web pages on and off" msgstr "Εύκολη εναλλαγή χαρακτηριστικών στις ιστοσελίδες ενεργοποίηση και απενεργοποίηση" +#: ../extensions/tab-panel.c:293 +#: ../extensions/tab-panel.c:352 +msgid "Tab Panel" +msgstr "Πλαίσιο καρτέλας" + +#: ../extensions/tab-panel.c:336 +msgid "T_ab Panel" +msgstr "Πλαίσιο κ_αρτέλας" + +#: ../extensions/tab-panel.c:353 +msgid "Show tabs in a vertical panel" +msgstr "Εμφάνιση καρτελών στο κάθετο πλαίσιο" + +#: ../extensions/toolbar-editor.c:391 +msgid "Customize Toolbar" +msgstr "Προσαρμογή εργαλειοθήκης" + +#: ../extensions/toolbar-editor.c:407 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Επιλέξτε τα αντικείμενα που θα εμφανίζονται στην εργαλειοθήκη. Τα αντικείμενα μπορούνε να ταξινομηθούν κατά την μεταφορά." + +#: ../extensions/toolbar-editor.c:423 +msgid "Available Items" +msgstr "Διαθέσιμα αντικείμενα" + +#: ../extensions/toolbar-editor.c:444 +msgid "Displayed Items" +msgstr "Εμφανίσιμα αντικείμενα" + +#: ../extensions/toolbar-editor.c:579 +msgid "Customize _Toolbar..." +msgstr "Προσαρμογή _εργαλειοθήκης..." + +#: ../extensions/toolbar-editor.c:611 +msgid "Toolbar Editor" +msgstr "Επεξεργασία εργαλειοθήκης" + +#: ../extensions/toolbar-editor.c:612 +msgid "Easily edit the toolbar layout" +msgstr "Εύκολη επεξεργασία της εμφάνισης της εργαλειοθήκης" + +#~ msgid "_Closed Tabs and Windows" +#~ msgstr "_Κλείσιμο των καρτέλων και των παραθύρων" +#~ msgid "Last open pages" +#~ msgstr "Άνοιγμα τελευταίων σελίδων" +#~ msgid "Both" +#~ msgstr "Και τα δύο" +#~ msgid "Both horizontal" +#~ msgstr "Και τα δύο οριζόντια" +#~ msgid "Load on Startup" +#~ msgstr "Να φορτώνεται στην εκκίνηση" +#~ msgid "Download Folder" +#~ msgstr "Φάκελος μεταφορών" +#~ msgid "Configure _Toolbar..." +#~ msgstr "Ρύθμιση _εργαλειοθήκης..." #~ msgid "_Quick Find" #~ msgstr "_Έξοδος αναζήτησης" #~ msgid "Quickly jump to a word or phrase" diff --git a/po/midori.pot b/po/midori.pot index dd28db9d..0039b58b 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-20 01:57+0200\n" +"POT-Creation-Date: 2009-07-29 23:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1344 ../midori/main.c:1498 -#: ../midori/main.c:1506 ../midori/main.c:1517 -#: ../midori/midori-websettings.c:285 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1343 ../midori/main.c:1517 +#: ../midori/main.c:1525 ../midori/main.c:1536 +#: ../midori/midori-websettings.c:287 msgid "Midori" msgstr "" @@ -121,105 +121,105 @@ msgstr "" msgid "Disable all _extensions" msgstr "" -#: ../midori/main.c:1344 +#: ../midori/main.c:1343 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1367 +#: ../midori/main.c:1366 msgid "An unknown error occured." msgstr "" -#: ../midori/main.c:1400 +#: ../midori/main.c:1398 #, c-format msgid "Snapshot saved to: %s\n" msgstr "" -#: ../midori/main.c:1435 +#: ../midori/main.c:1447 msgid "Run ADDRESS as a web application" msgstr "" -#: ../midori/main.c:1435 +#: ../midori/main.c:1447 msgid "ADDRESS" msgstr "" -#: ../midori/main.c:1437 +#: ../midori/main.c:1449 msgid "Use FOLDER as configuration folder" msgstr "" -#: ../midori/main.c:1437 +#: ../midori/main.c:1449 msgid "FOLDER" msgstr "" -#: ../midori/main.c:1440 +#: ../midori/main.c:1451 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1444 +#: ../midori/main.c:1454 msgid "Take a snapshot of the specified URI" msgstr "" -#: ../midori/main.c:1447 +#: ../midori/main.c:1457 msgid "Execute the specified command" msgstr "" -#: ../midori/main.c:1449 +#: ../midori/main.c:1459 msgid "Display program version" msgstr "" -#: ../midori/main.c:1451 +#: ../midori/main.c:1461 msgid "Addresses" msgstr "" -#: ../midori/main.c:1495 +#: ../midori/main.c:1514 msgid "[Addresses]" msgstr "" -#: ../midori/main.c:1518 +#: ../midori/main.c:1537 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:1520 +#: ../midori/main.c:1539 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:1602 +#: ../midori/main.c:1619 msgid "The specified configuration folder is invalid." msgstr "" -#: ../midori/main.c:1638 +#: ../midori/main.c:1655 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1688 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "" - -#: ../midori/main.c:1700 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "" - #: ../midori/main.c:1715 #, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "" + +#: ../midori/main.c:1727 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1742 +#, c-format msgid "The session couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1728 +#: ../midori/main.c:1755 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1741 +#: ../midori/main.c:1768 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1753 +#: ../midori/main.c:1780 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:1769 +#: ../midori/main.c:1796 msgid "_Ignore" msgstr "" @@ -231,573 +231,581 @@ msgstr "" msgid "Malformed document." msgstr "" -#: ../midori/midori-array.c:429 ../midori/sokoke.c:700 +#: ../midori/midori-array.c:429 ../midori/sokoke.c:694 #, c-format msgid "Writing failed." msgstr "" -#: ../midori/midori-browser.c:304 ../midori/midori-browser.c:4177 -#: ../midori/midori-browser.c:4183 +#: ../midori/midori-browser.c:307 ../midori/midori-browser.c:4229 +#: ../midori/midori-browser.c:4235 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:315 ../midori/midori-browser.c:4180 +#: ../midori/midori-browser.c:318 ../midori/midori-browser.c:4232 msgid "Stop loading the current page" msgstr "" -#: ../midori/midori-browser.c:410 +#: ../midori/midori-browser.c:409 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:435 +#: ../midori/midori-browser.c:434 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:617 +#: ../midori/midori-browser.c:616 msgid "New folder" msgstr "" -#: ../midori/midori-browser.c:617 +#: ../midori/midori-browser.c:616 msgid "Edit folder" msgstr "" -#: ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:618 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:618 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:649 +#: ../midori/midori-browser.c:648 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:661 ../midori/midori-searchaction.c:952 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:681 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:680 ../midori/midori-searchaction.c:966 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "" -#: ../midori/midori-browser.c:700 +#: ../midori/midori-browser.c:699 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:705 ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:704 ../midori/midori-browser.c:745 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:822 +#: ../midori/midori-browser.c:821 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1169 +#: ../midori/midori-browser.c:1172 #, c-format -msgid "The file %s has been downloaded." +msgid "The file '%s' has been downloaded." msgstr "" -#: ../midori/midori-browser.c:1173 +#: ../midori/midori-browser.c:1176 msgid "Transfer completed" msgstr "" -#: ../midori/midori-browser.c:1314 +#: ../midori/midori-browser.c:1317 msgid "Save file" msgstr "" -#: ../midori/midori-browser.c:1960 +#: ../midori/midori-browser.c:1984 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:3429 ../panels/midori-bookmarks.c:781 +#: ../midori/midori-browser.c:3430 ../panels/midori-bookmarks.c:781 #: ../panels/midori-history.c:812 msgid "Open all in _Tabs" msgstr "" -#: ../midori/midori-browser.c:3436 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:3437 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:3439 ../panels/midori-bookmarks.c:789 +#: ../midori/midori-browser.c:3440 ../panels/midori-bookmarks.c:789 #: ../panels/midori-history.c:820 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:3739 +#: ../midori/midori-browser.c:3750 msgid "Clear Private Data" msgstr "" -#: ../midori/midori-browser.c:3743 +#: ../midori/midori-browser.c:3754 msgid "_Clear private data" msgstr "" -#: ../midori/midori-browser.c:3756 +#: ../midori/midori-browser.c:3767 msgid "Clear the following data:" msgstr "" -#: ../midori/midori-browser.c:3766 ../midori/midori-preferences.c:675 +#: ../midori/midori-browser.c:3777 ../midori/midori-preferences.c:671 #: ../panels/midori-history.c:108 msgid "History" msgstr "" -#: ../midori/midori-browser.c:3771 +#: ../midori/midori-browser.c:3782 msgid "Cookies" msgstr "" -#: ../midori/midori-browser.c:3776 +#: ../midori/midori-browser.c:3787 msgid "'Flash' Cookies" msgstr "" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:3792 msgid "Website icons" msgstr "" -#: ../midori/midori-browser.c:3786 ../midori/sokoke.c:874 -msgid "_Closed Tabs and Windows" +#: ../midori/midori-browser.c:3797 ../midori/sokoke.c:868 +msgid "_Closed Tabs" msgstr "" -#: ../midori/midori-browser.c:3869 +#: ../midori/midori-browser.c:3805 +msgid "Clear private data when _quitting Midori" +msgstr "" + +#: ../midori/midori-browser.c:3889 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:3877 +#: ../midori/midori-browser.c:3897 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:4111 +#: ../midori/midori-browser.c:4163 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:4114 -msgid "Open a new window" -msgstr "" - -#: ../midori/midori-browser.c:4117 -msgid "Open a new tab" -msgstr "" - -#: ../midori/midori-browser.c:4120 -msgid "Open a file" -msgstr "" - -#: ../midori/midori-browser.c:4123 -msgid "Save to a file" -msgstr "" - -#: ../midori/midori-browser.c:4125 -msgid "Add to Speed _dial" -msgstr "" - -#: ../midori/midori-browser.c:4126 -msgid "Add shortcut to speed dial" -msgstr "" - -#: ../midori/midori-browser.c:4128 -msgid "_Close Tab" -msgstr "" - -#: ../midori/midori-browser.c:4129 -msgid "Close the current tab" -msgstr "" - -#: ../midori/midori-browser.c:4131 -msgid "C_lose Window" -msgstr "" - -#: ../midori/midori-browser.c:4132 -msgid "Close this window" -msgstr "" - -#: ../midori/midori-browser.c:4135 -msgid "Print the current page" -msgstr "" - -#: ../midori/midori-browser.c:4138 -msgid "Quit the application" -msgstr "" - -#: ../midori/midori-browser.c:4140 -msgid "_Edit" -msgstr "" - -#: ../midori/midori-browser.c:4143 -msgid "Cut the selected text" -msgstr "" - -#: ../midori/midori-browser.c:4146 ../midori/midori-browser.c:4149 -msgid "Copy the selected text" -msgstr "" - -#: ../midori/midori-browser.c:4152 -msgid "Paste text from the clipboard" -msgstr "" - -#: ../midori/midori-browser.c:4155 -msgid "Delete the selected text" -msgstr "" - -#: ../midori/midori-browser.c:4158 -msgid "Select all text" -msgstr "" - -#: ../midori/midori-browser.c:4161 -msgid "Find a word or phrase in the page" -msgstr "" - -#: ../midori/midori-browser.c:4163 -msgid "Find _Next" -msgstr "" - -#: ../midori/midori-browser.c:4164 -msgid "Find the next occurrence of a word or phrase" +#: ../midori/midori-browser.c:4165 ../midori/sokoke.c:869 +msgid "New _Window" msgstr "" #: ../midori/midori-browser.c:4166 -msgid "Find _Previous" +msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:4167 -msgid "Find the previous occurrence of a word or phrase" +#: ../midori/midori-browser.c:4169 +msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:4171 -msgid "Configure the application preferences" +#: ../midori/midori-browser.c:4172 +msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:4173 -msgid "_View" +#: ../midori/midori-browser.c:4175 +msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:4174 -msgid "_Toolbars" +#: ../midori/midori-browser.c:4177 +msgid "Add to Speed _dial" msgstr "" -#: ../midori/midori-browser.c:4186 -msgid "Increase the zoom level" +#: ../midori/midori-browser.c:4178 +msgid "Add shortcut to speed dial" msgstr "" -#: ../midori/midori-browser.c:4189 -msgid "Decrease the zoom level" +#: ../midori/midori-browser.c:4180 +msgid "_Close Tab" +msgstr "" + +#: ../midori/midori-browser.c:4181 +msgid "Close the current tab" +msgstr "" + +#: ../midori/midori-browser.c:4183 +msgid "C_lose Window" +msgstr "" + +#: ../midori/midori-browser.c:4184 +msgid "Close this window" +msgstr "" + +#: ../midori/midori-browser.c:4187 +msgid "Print the current page" +msgstr "" + +#: ../midori/midori-browser.c:4190 +msgid "Quit the application" msgstr "" #: ../midori/midori-browser.c:4192 -msgid "Reset the zoom level" -msgstr "" - -#: ../midori/midori-browser.c:4193 -msgid "_Encoding" +msgid "_Edit" msgstr "" #: ../midori/midori-browser.c:4195 -msgid "View So_urce" +msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:4196 -msgid "View the source code of the page" +#: ../midori/midori-browser.c:4198 ../midori/midori-browser.c:4201 +msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:4198 -msgid "View Selection Source" +#: ../midori/midori-browser.c:4204 +msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:4199 -msgid "View the source code of the selection" +#: ../midori/midori-browser.c:4207 +msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:4203 -msgid "Toggle fullscreen view" +#: ../midori/midori-browser.c:4210 +msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:4205 -msgid "_Go" +#: ../midori/midori-browser.c:4213 +msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:4208 -msgid "Go back to the previous page" -msgstr "" - -#: ../midori/midori-browser.c:4211 -msgid "Go forward to the next page" -msgstr "" - -#: ../midori/midori-browser.c:4214 -msgid "Go to your homepage" +#: ../midori/midori-browser.c:4215 +msgid "Find _Next" msgstr "" #: ../midori/midori-browser.c:4216 -msgid "Empty Trash" +msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:4217 -msgid "Delete the contents of the trash" +#: ../midori/midori-browser.c:4218 +msgid "Find _Previous" msgstr "" #: ../midori/midori-browser.c:4219 -msgid "Undo _Close Tab" +msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:4220 -msgid "Open the last closed tab" +#: ../midori/midori-browser.c:4223 +msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:4224 ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" +#: ../midori/midori-browser.c:4225 +msgid "_View" msgstr "" #: ../midori/midori-browser.c:4226 -msgid "Add a new _folder" +msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:4227 -msgid "Add a new bookmark folder" +#: ../midori/midori-browser.c:4238 +msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:4228 -msgid "_Tools" +#: ../midori/midori-browser.c:4241 +msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:4230 ../midori/midori-searchaction.c:493 -msgid "_Manage Search Engines" -msgstr "" - -#: ../midori/midori-browser.c:4231 -msgid "Add, edit and remove search engines..." -msgstr "" - -#: ../midori/midori-browser.c:4234 -msgid "_Clear Private Data" -msgstr "" - -#: ../midori/midori-browser.c:4235 -msgid "Clear private data..." -msgstr "" - -#: ../midori/midori-browser.c:4239 -msgid "_Previous Tab" -msgstr "" - -#: ../midori/midori-browser.c:4240 -msgid "Switch to the previous tab" -msgstr "" - -#: ../midori/midori-browser.c:4242 -msgid "_Next Tab" -msgstr "" - -#: ../midori/midori-browser.c:4243 -msgid "Switch to the next tab" +#: ../midori/midori-browser.c:4244 +msgid "Reset the zoom level" msgstr "" #: ../midori/midori-browser.c:4245 -msgid "_Help" +msgid "_Encoding" msgstr "" #: ../midori/midori-browser.c:4247 -msgid "_Contents" +msgid "View So_urce" msgstr "" #: ../midori/midori-browser.c:4248 -msgid "Show the documentation" +msgid "View the source code of the page" msgstr "" #: ../midori/midori-browser.c:4250 -msgid "_Frequent Questions" +msgid "View Selection Source" msgstr "" #: ../midori/midori-browser.c:4251 -msgid "Show the Frequently Asked Questions" +msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:4253 -msgid "_Report a Bug" -msgstr "" - -#: ../midori/midori-browser.c:4254 -msgid "Open Midori's bug tracker" +#: ../midori/midori-browser.c:4255 +msgid "Toggle fullscreen view" msgstr "" #: ../midori/midori-browser.c:4257 -msgid "Show information about the program" +msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:4264 -msgid "P_rivate Browsing" +#: ../midori/midori-browser.c:4260 +msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:4265 -msgid "Don't save any private data while browsing" +#: ../midori/midori-browser.c:4263 +msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:4270 -msgid "_Menubar" +#: ../midori/midori-browser.c:4266 +msgid "Go to your homepage" +msgstr "" + +#: ../midori/midori-browser.c:4268 +msgid "Empty Trash" +msgstr "" + +#: ../midori/midori-browser.c:4269 +msgid "Delete the contents of the trash" msgstr "" #: ../midori/midori-browser.c:4271 -msgid "Show menubar" +msgid "Undo _Close Tab" msgstr "" -#: ../midori/midori-browser.c:4274 -msgid "_Navigationbar" +#: ../midori/midori-browser.c:4272 +msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:4275 -msgid "Show navigationbar" +#: ../midori/midori-browser.c:4276 ../panels/midori-bookmarks.c:231 +msgid "Add a new bookmark" msgstr "" #: ../midori/midori-browser.c:4278 -msgid "Side_panel" +msgid "Add a new _folder" msgstr "" #: ../midori/midori-browser.c:4279 -msgid "Show sidepanel" +msgid "Add a new bookmark folder" +msgstr "" + +#: ../midori/midori-browser.c:4281 ../midori/midori-searchaction.c:497 +msgid "_Manage Search Engines" msgstr "" #: ../midori/midori-browser.c:4282 -msgid "_Bookmarkbar" +msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:4283 -msgid "Show bookmarkbar" +#: ../midori/midori-browser.c:4285 +msgid "_Clear Private Data" msgstr "" #: ../midori/midori-browser.c:4286 -msgid "_Transferbar" -msgstr "" - -#: ../midori/midori-browser.c:4287 -msgid "Show transferbar" +msgid "Clear private data..." msgstr "" #: ../midori/midori-browser.c:4290 -msgid "_Statusbar" +msgid "_Previous Tab" msgstr "" #: ../midori/midori-browser.c:4291 -msgid "Show statusbar" +msgid "Switch to the previous tab" +msgstr "" + +#: ../midori/midori-browser.c:4293 +msgid "_Next Tab" +msgstr "" + +#: ../midori/midori-browser.c:4294 +msgid "Switch to the next tab" +msgstr "" + +#: ../midori/midori-browser.c:4296 +msgid "_Help" msgstr "" #: ../midori/midori-browser.c:4298 +msgid "_Contents" +msgstr "" + +#: ../midori/midori-browser.c:4299 +msgid "Show the documentation" +msgstr "" + +#: ../midori/midori-browser.c:4301 +msgid "_Frequent Questions" +msgstr "" + +#: ../midori/midori-browser.c:4302 +msgid "Show the Frequently Asked Questions" +msgstr "" + +#: ../midori/midori-browser.c:4304 +msgid "_Report a Bug" +msgstr "" + +#: ../midori/midori-browser.c:4305 +msgid "Open Midori's bug tracker" +msgstr "" + +#: ../midori/midori-browser.c:4308 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:4315 +msgid "P_rivate Browsing" +msgstr "" + +#: ../midori/midori-browser.c:4316 +msgid "Don't save any private data while browsing" +msgstr "" + +#: ../midori/midori-browser.c:4321 +msgid "_Menubar" +msgstr "" + +#: ../midori/midori-browser.c:4322 +msgid "Show menubar" +msgstr "" + +#: ../midori/midori-browser.c:4325 +msgid "_Navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:4326 +msgid "Show navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:4329 +msgid "Side_panel" +msgstr "" + +#: ../midori/midori-browser.c:4330 +msgid "Show sidepanel" +msgstr "" + +#: ../midori/midori-browser.c:4333 +msgid "_Bookmarkbar" +msgstr "" + +#: ../midori/midori-browser.c:4334 +msgid "Show bookmarkbar" +msgstr "" + +#: ../midori/midori-browser.c:4337 +msgid "_Transferbar" +msgstr "" + +#: ../midori/midori-browser.c:4338 +msgid "Show transferbar" +msgstr "" + +#: ../midori/midori-browser.c:4341 +msgid "_Statusbar" +msgstr "" + +#: ../midori/midori-browser.c:4342 +msgid "Show statusbar" +msgstr "" + +#: ../midori/midori-browser.c:4349 msgid "_Automatic" msgstr "" -#: ../midori/midori-browser.c:4301 ../midori/midori-websettings.c:212 +#: ../midori/midori-browser.c:4352 ../midori/midori-websettings.c:214 msgid "Chinese (BIG5)" msgstr "" #. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4356 msgid "Japanese (SHIFT__JIS)" msgstr "" -#: ../midori/midori-browser.c:4308 ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:4359 ../midori/midori-websettings.c:216 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-browser.c:4311 ../midori/midori-websettings.c:215 +#: ../midori/midori-browser.c:4362 ../midori/midori-websettings.c:217 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-browser.c:4314 ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:4365 ../midori/midori-websettings.c:218 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-browser.c:4317 ../midori/midori-websettings.c:217 -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-browser.c:4368 ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:291 msgid "Custom..." msgstr "" -#: ../midori/midori-browser.c:4755 +#: ../midori/midori-browser.c:4806 msgid "_Separator" msgstr "" -#: ../midori/midori-browser.c:4762 +#: ../midori/midori-browser.c:4813 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:4764 +#: ../midori/midori-browser.c:4815 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:4788 +#: ../midori/midori-browser.c:4839 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:4790 +#: ../midori/midori-browser.c:4841 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:4811 +#: ../midori/midori-browser.c:4862 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:4877 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:4879 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:4843 ../midori/sokoke.c:863 +#: ../midori/midori-browser.c:4894 ../midori/sokoke.c:857 msgid "_Bookmarks" msgstr "" -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:4896 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:4860 +#: ../midori/midori-browser.c:4911 +msgid "_Tools" +msgstr "" + +#: ../midori/midori-browser.c:4923 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:4862 +#: ../midori/midori-browser.c:4925 msgid "Show a list of all open tabs" msgstr "" -#: ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:4939 msgid "_Menu" msgstr "" -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:4941 msgid "Menu" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:5127 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5152 msgid "Previous" msgstr "" -#: ../midori/midori-browser.c:5089 +#: ../midori/midori-browser.c:5157 msgid "Next" msgstr "" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5162 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:5102 +#: ../midori/midori-browser.c:5170 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:5112 +#: ../midori/midori-browser.c:5180 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:5147 +#: ../midori/midori-browser.c:5215 #: ../extensions/cookie-manager/cookie-manager-page.c:109 msgid "Delete All" msgstr "" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5552 #, c-format msgid "Unexpected setting '%s'" msgstr "" @@ -807,637 +815,678 @@ msgstr "" msgid "Search with %s" msgstr "" -#: ../midori/midori-panel.c:333 +#: ../midori/midori-panel.c:382 ../midori/midori-panel.c:384 msgid "Detach chosen panel from the window" msgstr "" -#: ../midori/midori-panel.c:343 ../midori/midori-panel.c:508 +#: ../midori/midori-panel.c:394 ../midori/midori-panel.c:396 +#: ../midori/midori-panel.c:577 ../midori/midori-panel.c:580 msgid "Align sidepanel to the right" msgstr "" -#: ../midori/midori-panel.c:353 ../midori/midori-panel.c:354 +#: ../midori/midori-panel.c:406 ../midori/midori-panel.c:407 msgid "Close panel" msgstr "" -#: ../midori/midori-panel.c:509 +#: ../midori/midori-panel.c:578 ../midori/midori-panel.c:581 msgid "Align sidepanel to the left" msgstr "" -#: ../midori/midori-websettings.c:195 ../midori/midori-view.c:2265 -msgid "Blank page" +#: ../midori/midori-panel.c:704 +msgid "Show panel _titles" msgstr "" -#: ../midori/midori-websettings.c:196 ../midori/midori-websettings.c:563 -msgid "Homepage" +#: ../midori/midori-panel.c:712 +msgid "Show operating _controls" +msgstr "" + +#: ../midori/midori-panel.c:783 +msgid "Options" msgstr "" #: ../midori/midori-websettings.c:197 -msgid "Last open pages" +msgid "Show Blank page" msgstr "" -#: ../midori/midori-websettings.c:213 +#: ../midori/midori-websettings.c:198 +msgid "Show Homepage" +msgstr "" + +#: ../midori/midori-websettings.c:199 +msgid "Show last open tabs" +msgstr "" + +#: ../midori/midori-websettings.c:215 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:251 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:252 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:252 -msgid "Both" +#: ../midori/midori-websettings.c:254 +msgid "Icons and text" msgstr "" -#: ../midori/midori-websettings.c:253 -msgid "Both horizontal" +#: ../midori/midori-websettings.c:255 +msgid "Text beside icons" msgstr "" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:271 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:270 ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:87 +#: ../midori/midori-websettings.c:272 ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:93 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:288 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:289 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:290 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:341 +#: ../midori/midori-websettings.c:343 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:344 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:350 +#: ../midori/midori-websettings.c:352 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:353 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:361 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:360 +#: ../midori/midori-websettings.c:362 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:397 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:398 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:406 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:407 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:416 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:417 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:425 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:426 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:434 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:435 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:443 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:459 msgid "Show Transferbar" msgstr "" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:460 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:468 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:476 -msgid "Toolbar Style" +#: ../midori/midori-websettings.c:478 +msgid "Toolbar Style:" msgstr "" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:479 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:495 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:496 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:511 msgid "Search engines in location completion" msgstr "" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:512 msgid "Whether to show search engines in the location completion" msgstr "" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:520 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:521 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:529 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:530 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 +msgid "Show operating controls of the panel" +msgstr "" + +#: ../midori/midori-websettings.c:546 +msgid "Whether to show the operating controls of the panel" +msgstr "" + +#: ../midori/midori-websettings.c:561 msgid "Align sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:562 msgid "Whether to align the sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:553 -msgid "Load on Startup" +#: ../midori/midori-websettings.c:571 +msgid "When Midori starts:" msgstr "" -#: ../midori/midori-websettings.c:554 -msgid "What to load on startup" +#: ../midori/midori-websettings.c:572 +msgid "What to do when Midori starts" msgstr "" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:581 +msgid "Homepage:" +msgstr "" + +#: ../midori/midori-websettings.c:582 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:597 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:598 msgid "Show a dialog after Midori crashed" msgstr "" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:614 msgid "Show speed dial in new tabs" msgstr "" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:615 msgid "Show speed dial in newly opened tabs" msgstr "" -#: ../midori/midori-websettings.c:605 -msgid "Download Folder" +#: ../midori/midori-websettings.c:623 +msgid "Save downloaded files to:" msgstr "" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:624 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:643 msgid "Ask for the destination folder" msgstr "" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:644 msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:663 msgid "Notify when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:664 msgid "Whether to show a notification when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:676 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:677 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:685 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:686 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:701 msgid "News Aggregator" msgstr "" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:702 msgid "An external news aggregator" msgstr "" -#: ../midori/midori-websettings.c:692 +#: ../midori/midori-websettings.c:710 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:711 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:719 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:720 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:712 +#: ../midori/midori-websettings.c:730 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:731 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:739 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:740 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:730 -msgid "Open new pages in" +#: ../midori/midori-websettings.c:748 +msgid "Open new pages in:" msgstr "" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:749 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:740 -msgid "Open external pages in" +#: ../midori/midori-websettings.c:758 +msgid "Open external pages in:" msgstr "" -#: ../midori/midori-websettings.c:741 +#: ../midori/midori-websettings.c:759 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:768 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:769 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:777 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:778 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:786 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:787 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:795 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:796 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:812 msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:813 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:828 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:829 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:837 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:838 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:847 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:848 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:856 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:843 +#: ../midori/midori-websettings.c:857 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:867 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:868 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:862 +#: ../midori/midori-websettings.c:876 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:877 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:871 +#: ../midori/midori-websettings.c:885 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:886 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:894 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:895 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:905 msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:906 msgid "The proxy server used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:907 +#: ../midori/midori-websettings.c:921 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:908 +#: ../midori/midori-websettings.c:922 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:924 +#: ../midori/midori-websettings.c:938 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:939 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:941 +#: ../midori/midori-websettings.c:955 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:956 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:950 +#: ../midori/midori-websettings.c:964 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:951 +#: ../midori/midori-websettings.c:965 msgid "The allowed size of the cache" msgstr "" -#: ../midori/midori-websettings.c:966 +#: ../midori/midori-websettings.c:980 msgid "Clear private data" msgstr "" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:981 msgid "The private data selected for deletion" msgstr "" -#: ../midori/midori-view.c:750 +#: ../midori/midori-view.c:781 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "" #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c:752 ../midori/midori-view.c:2897 +#: ../midori/midori-view.c:783 ../midori/midori-view.c:3013 #: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "" -#: ../midori/midori-view.c:755 +#: ../midori/midori-view.c:786 msgid "Try again" msgstr "" #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:785 ../midori/midori-view.c:2901 +#: ../midori/midori-view.c:818 ../midori/midori-view.c:3017 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:1172 +#: ../midori/midori-view.c:1205 msgid "Open _Link" msgstr "" -#: ../midori/midori-view.c:1174 +#: ../midori/midori-view.c:1207 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:1191 +#: ../midori/midori-view.c:1224 msgid "Open Link in New _Window" msgstr "" -#: ../midori/midori-view.c:1197 +#: ../midori/midori-view.c:1230 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:1203 +#: ../midori/midori-view.c:1236 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:1212 +#: ../midori/midori-view.c:1245 msgid "Download with Download _Manager" msgstr "" -#: ../midori/midori-view.c:1241 +#: ../midori/midori-view.c:1274 msgid "Search _with" msgstr "" -#: ../midori/midori-view.c:1269 +#: ../midori/midori-view.c:1306 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:1279 +#: ../midori/midori-view.c:1316 msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1457 +#: ../midori/midori-view.c:1494 msgid "Open or download file" msgstr "" -#: ../midori/midori-view.c:1474 +#: ../midori/midori-view.c:1511 #, c-format msgid "File Type: '%s'" msgstr "" -#: ../midori/midori-view.c:1477 +#: ../midori/midori-view.c:1514 #, c-format msgid "File Type: %s ('%s')" msgstr "" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1481 +#: ../midori/midori-view.c:1518 #, c-format msgid "Open %s" msgstr "" -#: ../midori/midori-view.c:1899 +#: ../midori/midori-view.c:1957 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:2089 +#: ../midori/midori-view.c:2147 msgid "Speed dial" msgstr "" -#: ../midori/midori-view.c:2090 +#: ../midori/midori-view.c:2148 msgid "Click to add a shortcut" msgstr "" -#: ../midori/midori-view.c:2091 +#: ../midori/midori-view.c:2149 msgid "Enter shortcut address" msgstr "" -#: ../midori/midori-view.c:2092 +#: ../midori/midori-view.c:2150 msgid "Enter shortcut title" msgstr "" -#: ../midori/midori-view.c:2093 +#: ../midori/midori-view.c:2151 msgid "Are you sure you want to delete this shortcut?" msgstr "" -#: ../midori/midori-view.c:2123 +#: ../midori/midori-view.c:2181 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:2140 +#: ../midori/midori-view.c:2198 #, c-format msgid "No documentation installed" msgstr "" -#: ../midori/midori-view.c:2487 +#: ../midori/midori-view.c:2323 +msgid "Blank page" +msgstr "" + +#: ../midori/midori-view.c:2551 ../midori/sokoke.c:865 +msgid "New _Tab" +msgstr "" + +#: ../midori/midori-view.c:2565 msgid "_Duplicate Tab" msgstr "" +#: ../midori/midori-view.c:2570 +msgid "_Restore Tab" +msgstr "" + +#: ../midori/midori-view.c:2570 +msgid "_Minimize Tab" +msgstr "" + #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" @@ -1615,120 +1664,112 @@ msgid "Browsing" msgstr "" #. Page "Applications" -#: ../midori/midori-preferences.c:578 +#: ../midori/midori-preferences.c:574 msgid "Applications" msgstr "" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:575 msgid "External applications" msgstr "" #. Page "Network" -#: ../midori/midori-preferences.c:625 ../midori/midori-preferences.c:626 +#: ../midori/midori-preferences.c:621 ../midori/midori-preferences.c:622 msgid "Network" msgstr "" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:649 msgid "MB" msgstr "" #. Page "Privacy" -#: ../midori/midori-preferences.c:658 +#: ../midori/midori-preferences.c:654 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:659 +#: ../midori/midori-preferences.c:655 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682 +#: ../midori/midori-preferences.c:668 ../midori/midori-preferences.c:678 msgid "days" msgstr "" -#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:331 +#: ../midori/midori-searchaction.c:488 ../katze/katze-arrayaction.c:335 msgid "Empty" msgstr "" -#: ../midori/midori-searchaction.c:904 +#: ../midori/midori-searchaction.c:908 msgid "Add search engine" msgstr "" -#: ../midori/midori-searchaction.c:904 +#: ../midori/midori-searchaction.c:908 msgid "Edit search engine" msgstr "" -#: ../midori/midori-searchaction.c:932 +#: ../midori/midori-searchaction.c:936 msgid "_Name:" msgstr "" -#: ../midori/midori-searchaction.c:976 +#: ../midori/midori-searchaction.c:980 msgid "_Icon:" msgstr "" -#: ../midori/midori-searchaction.c:990 +#: ../midori/midori-searchaction.c:994 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1209 +#: ../midori/midori-searchaction.c:1213 msgid "Manage Search Engines" msgstr "" -#: ../midori/midori-searchaction.c:1308 +#: ../midori/midori-searchaction.c:1312 msgid "Use as _default" msgstr "" -#: ../midori/sokoke.c:172 ../midori/sokoke.c:184 +#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "" -#: ../midori/sokoke.c:862 +#: ../midori/sokoke.c:856 msgid "_Bookmark" msgstr "" -#: ../midori/sokoke.c:864 +#: ../midori/sokoke.c:858 msgid "Add Boo_kmark" msgstr "" -#: ../midori/sokoke.c:865 +#: ../midori/sokoke.c:859 msgid "_Console" msgstr "" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:860 msgid "_Extensions" msgstr "" -#: ../midori/sokoke.c:867 +#: ../midori/sokoke.c:861 msgid "_History" msgstr "" -#: ../midori/sokoke.c:868 +#: ../midori/sokoke.c:862 msgid "_Homepage" msgstr "" -#: ../midori/sokoke.c:869 +#: ../midori/sokoke.c:863 msgid "_Userscripts" msgstr "" -#: ../midori/sokoke.c:870 +#: ../midori/sokoke.c:864 msgid "User_styles" msgstr "" -#: ../midori/sokoke.c:871 -msgid "New _Tab" -msgstr "" - -#: ../midori/sokoke.c:872 +#: ../midori/sokoke.c:866 msgid "_Transfers" msgstr "" -#: ../midori/sokoke.c:873 +#: ../midori/sokoke.c:867 msgid "Netscape p_lugins" msgstr "" -#: ../midori/sokoke.c:875 -msgid "New _Window" -msgstr "" - #: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "" @@ -1862,19 +1903,19 @@ msgstr "" msgid "Choose folder" msgstr "" -#: ../extensions/adblock.c:128 +#: ../extensions/adblock.c:167 msgid "Configure Advertisement filters" msgstr "" -#: ../extensions/adblock.c:269 +#: ../extensions/adblock.c:304 msgid "Configure _Advertisement filters..." msgstr "" -#: ../extensions/adblock.c:526 +#: ../extensions/adblock.c:562 msgid "Advertisement blocker" msgstr "" -#: ../extensions/adblock.c:527 +#: ../extensions/adblock.c:563 msgid "Block advertisements according to a filter list" msgstr "" @@ -2075,19 +2116,19 @@ msgstr "" msgid "_Pageholder" msgstr "" -#: ../extensions/shortcuts.c:166 -msgid "Configure Keyboard shortcuts" +#: ../extensions/shortcuts.c:172 +msgid "Customize Keyboard shortcuts" msgstr "" -#: ../extensions/shortcuts.c:263 -msgid "Configure Sh_ortcuts..." +#: ../extensions/shortcuts.c:264 +msgid "Customize Sh_ortcuts..." msgstr "" -#: ../extensions/shortcuts.c:295 +#: ../extensions/shortcuts.c:303 msgid "Shortcuts" msgstr "" -#: ../extensions/shortcuts.c:296 +#: ../extensions/shortcuts.c:304 msgid "View and edit keyboard shortcuts" msgstr "" @@ -2107,44 +2148,44 @@ msgstr "" msgid "Easily toggle features on web pages on and off" msgstr "" -#: ../extensions/tab-panel.c:293 ../extensions/tab-panel.c:352 +#: ../extensions/tab-panel.c:383 ../extensions/tab-panel.c:443 msgid "Tab Panel" msgstr "" -#: ../extensions/tab-panel.c:336 +#: ../extensions/tab-panel.c:427 msgid "T_ab Panel" msgstr "" -#: ../extensions/tab-panel.c:353 +#: ../extensions/tab-panel.c:444 msgid "Show tabs in a vertical panel" msgstr "" -#: ../extensions/toolbar-editor.c:390 +#: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" msgstr "" -#: ../extensions/toolbar-editor.c:406 +#: ../extensions/toolbar-editor.c:407 msgid "" "Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." msgstr "" -#: ../extensions/toolbar-editor.c:422 +#: ../extensions/toolbar-editor.c:423 msgid "Available Items" msgstr "" -#: ../extensions/toolbar-editor.c:443 +#: ../extensions/toolbar-editor.c:444 msgid "Displayed Items" msgstr "" -#: ../extensions/toolbar-editor.c:584 -msgid "Configure _Toolbar..." +#: ../extensions/toolbar-editor.c:579 +msgid "Customize _Toolbar..." msgstr "" -#: ../extensions/toolbar-editor.c:613 +#: ../extensions/toolbar-editor.c:611 msgid "Toolbar Editor" msgstr "" -#: ../extensions/toolbar-editor.c:614 +#: ../extensions/toolbar-editor.c:612 msgid "Easily edit the toolbar layout" msgstr "" diff --git a/po/pt.po b/po/pt.po index acf82eaa..5952df1e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -5,26 +5,27 @@ # msgid "" msgstr "" -"Project-Id-Version: Midori 0.1.6\n" +"Project-Id-Version: Midori 0.1.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-10 16:06+0200\n" +"POT-Creation-Date: 2009-07-20 01:57+0200\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Navegador Web leve" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1315 -#: ../midori/main.c:1449 -#: ../midori/main.c:1457 -#: ../midori/main.c:1468 -#: ../midori/midori-websettings.c:277 +#: ../midori/main.c:1344 +#: ../midori/main.c:1498 +#: ../midori/main.c:1506 +#: ../midori/main.c:1517 +#: ../midori/midori-websettings.c:285 msgid "Midori" msgstr "Midori" @@ -86,1361 +87,1393 @@ msgstr "Falha ao remover histórico antigo: %s\n" msgid "The configuration couldn't be saved. %s" msgstr "A configuração não foi guardada. %s" -#: ../midori/main.c:770 +#: ../midori/main.c:779 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Os motores de pesquisa não foram guardados. %s" -#: ../midori/main.c:789 -#: ../midori/main.c:817 -#: ../midori/main.c:846 +#: ../midori/main.c:798 +#: ../midori/main.c:826 +#: ../midori/main.c:855 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Os marcadores não foram guardados. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:869 -#: ../midori/main.c:892 +#: ../midori/main.c:878 +#: ../midori/main.c:901 #, c-format msgid "The trash couldn't be saved. %s" msgstr "O lixo não foi guardado. %s" -#: ../midori/main.c:965 +#: ../midori/main.c:974 #, c-format msgid "The session couldn't be saved. %s" msgstr "A sessão não foi guardada. %s" -#: ../midori/main.c:1092 +#: ../midori/main.c:1101 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "O Midori encerrou abruptamente da última vez que foi aberto. Se isto ocorrer repetidamente, tente uma das seguintes opções para resolver o problema." -#: ../midori/main.c:1107 +#: ../midori/main.c:1116 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/main.c:1111 +#: ../midori/main.c:1120 msgid "Reset the last _session" msgstr "Restaurar última _sessão" -#: ../midori/main.c:1116 +#: ../midori/main.c:1125 msgid "Disable all _extensions" msgstr "Desactivar todas as _extensões" -#: ../midori/main.c:1315 +#: ../midori/main.c:1344 msgid "No filename specified" msgstr "Nenhum nome especificado" -#: ../midori/main.c:1338 +#: ../midori/main.c:1367 msgid "An unknown error occured." msgstr "Ocorreu um erro desconhecido." -#: ../midori/main.c:1370 +#: ../midori/main.c:1400 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura guardada em: %s\n" -#: ../midori/main.c:1391 +#: ../midori/main.c:1435 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREÇO como aplicação web" -#: ../midori/main.c:1391 +#: ../midori/main.c:1435 msgid "ADDRESS" msgstr "ENDEREÇO" -#: ../midori/main.c:1393 +#: ../midori/main.c:1437 msgid "Use FOLDER as configuration folder" msgstr "Usar PASTA como pasta de configuração" -#: ../midori/main.c:1393 +#: ../midori/main.c:1437 msgid "FOLDER" msgstr "PASTA" -#: ../midori/main.c:1395 +#: ../midori/main.c:1440 msgid "Run the specified filename as javascript" msgstr "Executar o ficheiro especificado como argumento java" -#: ../midori/main.c:1398 +#: ../midori/main.c:1444 msgid "Take a snapshot of the specified URI" msgstr "Tirar uma captura da URI especificada" -#: ../midori/main.c:1401 +#: ../midori/main.c:1447 +msgid "Execute the specified command" +msgstr "Executar o comando especificado" + +#: ../midori/main.c:1449 msgid "Display program version" msgstr "Apresentar versão do programa" -#: ../midori/main.c:1403 +#: ../midori/main.c:1451 msgid "Addresses" msgstr "Endereços " -#: ../midori/main.c:1446 +#: ../midori/main.c:1495 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/main.c:1469 +#: ../midori/main.c:1518 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor reporte comentários, sugestões e erros para:" -#: ../midori/main.c:1471 +#: ../midori/main.c:1520 msgid "Check for new versions at:" msgstr "Verificar por novas versões a:" -#: ../midori/main.c:1548 +#: ../midori/main.c:1602 msgid "The specified configuration folder is invalid." msgstr "A pasta de configuração especificada é inválida." -#: ../midori/main.c:1583 +#: ../midori/main.c:1638 msgid "An instance of Midori is already running but not responding.\n" msgstr "Já existe uma instância de Midori em execução mas não está respondendo.\n" -#: ../midori/main.c:1633 +#: ../midori/main.c:1688 #, 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:1645 +#: ../midori/main.c:1700 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/main.c:1660 +#: ../midori/main.c:1715 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não foi carregada: %s\n" -#: ../midori/main.c:1673 +#: ../midori/main.c:1728 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/main.c:1686 +#: ../midori/main.c:1741 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/main.c:1698 +#: ../midori/main.c:1753 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:1714 +#: ../midori/main.c:1769 msgid "_Ignore" msgstr "_Ignorar " -#: ../midori/midori-array.c:195 +#: ../midori/midori-array.c:250 msgid "File not found." msgstr "Ficheiro não encontrado." -#: ../midori/midori-array.c:203 -#: ../midori/midori-array.c:212 +#: ../midori/midori-array.c:258 +#: ../midori/midori-array.c:267 msgid "Malformed document." msgstr "Documento mal formado." -#: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:716 +#: ../midori/midori-array.c:429 +#: ../midori/sokoke.c:700 #, c-format msgid "Writing failed." msgstr "Falhou escrita." -#: ../midori/midori-browser.c:287 -#: ../midori/midori-browser.c:3819 -#: ../midori/midori-browser.c:3825 +#: ../midori/midori-browser.c:304 +#: ../midori/midori-browser.c:4177 +#: ../midori/midori-browser.c:4183 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:298 -#: ../midori/midori-browser.c:3822 +#: ../midori/midori-browser.c:315 +#: ../midori/midori-browser.c:4180 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" -#: ../midori/midori-browser.c:360 +#: ../midori/midori-browser.c:410 #, c-format msgid "%d%% loaded" msgstr "%d%% carregado" -#: ../midori/midori-browser.c:385 +#: ../midori/midori-browser.c:435 #, c-format msgid "Unexpected action '%s'." msgstr "Acção inesperada '%s'." -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:617 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:617 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:619 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:619 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:649 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:648 +#: ../midori/midori-browser.c:662 #: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-browser.c:667 +#: ../midori/midori-browser.c:681 #: ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:686 +#: ../midori/midori-browser.c:700 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:691 -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:705 +#: ../midori/midori-browser.c:746 msgid "Toplevel folder" msgstr "Pasta Superior" -#: ../midori/midori-browser.c:808 +#: ../midori/midori-browser.c:822 msgid "Save file as" msgstr "Guardar como" -#: ../midori/midori-browser.c:1119 +#: ../midori/midori-browser.c:1169 #, c-format msgid "The file %s has been downloaded." msgstr "O ficheiro %s foi transferido." -#: ../midori/midori-browser.c:1123 +#: ../midori/midori-browser.c:1173 msgid "Transfer completed" msgstr "Transferência concluída" -#: ../midori/midori-browser.c:1820 +#: ../midori/midori-browser.c:1314 +msgid "Save file" +msgstr "Guardar ficheiro" + +#: ../midori/midori-browser.c:1960 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:3152 -#: ../panels/midori-bookmarks.c:778 -#: ../panels/midori-history.c:808 +#: ../midori/midori-browser.c:3429 +#: ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:812 msgid "Open all in _Tabs" msgstr "Abrir todas em _Separadores" -#: ../midori/midori-browser.c:3159 -#: ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:814 +#: ../midori/midori-browser.c:3436 +#: ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:818 #: ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:3162 -#: ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:816 +#: ../midori/midori-browser.c:3439 +#: ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:820 #: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" -#: ../midori/midori-browser.c:3425 +#: ../midori/midori-browser.c:3739 msgid "Clear Private Data" msgstr "Limpar Dados Privados" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3743 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:3441 +#: ../midori/midori-browser.c:3756 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:3449 -#: ../midori/midori-preferences.c:669 +#: ../midori/midori-browser.c:3766 +#: ../midori/midori-preferences.c:675 #: ../panels/midori-history.c:108 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3771 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3776 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:3458 +#: ../midori/midori-browser.c:3781 msgid "Website icons" msgstr "Ícones de sítios Web" -#: ../midori/midori-browser.c:3538 +#: ../midori/midori-browser.c:3786 +#: ../midori/sokoke.c:874 +msgid "_Closed Tabs and Windows" +msgstr "Separadores e Janelas Fe_chadas" + +#: ../midori/midori-browser.c:3869 msgid "A lightweight web browser." msgstr "Um navegador web leve." -#: ../midori/midori-browser.c:3546 +#: ../midori/midori-browser.c:3877 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:4111 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:3753 +#: ../midori/midori-browser.c:4114 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:3756 +#: ../midori/midori-browser.c:4117 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:4120 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:3762 +#: ../midori/midori-browser.c:4123 msgid "Save to a file" msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:3764 -#: ../midori/midori-view.c:1256 +#: ../midori/midori-browser.c:4125 msgid "Add to Speed _dial" msgstr "Adicionar a ligação rápi_da" -#: ../midori/midori-browser.c:3765 +#: ../midori/midori-browser.c:4126 msgid "Add shortcut to speed dial" msgstr "Adicionar atalho a ligação rápida" -#: ../midori/midori-browser.c:3767 +#: ../midori/midori-browser.c:4128 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:3768 +#: ../midori/midori-browser.c:4129 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:3770 +#: ../midori/midori-browser.c:4131 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:3771 +#: ../midori/midori-browser.c:4132 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:3774 +#: ../midori/midori-browser.c:4135 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:3777 +#: ../midori/midori-browser.c:4138 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:3779 +#: ../midori/midori-browser.c:4140 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:4143 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:3785 -#: ../midori/midori-browser.c:3788 +#: ../midori/midori-browser.c:4146 +#: ../midori/midori-browser.c:4149 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:3791 +#: ../midori/midori-browser.c:4152 msgid "Paste text from the clipboard" msgstr "Colar texto da área de transferência" -#: ../midori/midori-browser.c:3794 +#: ../midori/midori-browser.c:4155 msgid "Delete the selected text" msgstr "Apagar o texto seleccionado" -#: ../midori/midori-browser.c:3797 +#: ../midori/midori-browser.c:4158 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:3800 +#: ../midori/midori-browser.c:4161 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:4163 msgid "Find _Next" msgstr "_Localizar Próxima" -#: ../midori/midori-browser.c:3803 +#: ../midori/midori-browser.c:4164 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar próxima ocorrência da palavra ou frase" -#: ../midori/midori-browser.c:3805 +#: ../midori/midori-browser.c:4166 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:3806 +#: ../midori/midori-browser.c:4167 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocorrência anterior da palavra ou frase" -#: ../midori/midori-browser.c:3809 -msgid "_Quick Find" -msgstr "Localização _Rápida" - -#: ../midori/midori-browser.c:3810 -msgid "Quickly jump to a word or phrase" -msgstr "Avanço rápido para palavra ou frase" - -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:4171 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:4173 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:3816 +#: ../midori/midori-browser.c:4174 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:4186 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:3831 +#: ../midori/midori-browser.c:4189 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:3834 +#: ../midori/midori-browser.c:4192 msgid "Reset the zoom level" msgstr "Repor Zoom" -#: ../midori/midori-browser.c:3835 +#: ../midori/midori-browser.c:4193 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:3837 -msgid "_Automatic" -msgstr "_Automático" +#: ../midori/midori-browser.c:4195 +msgid "View So_urce" +msgstr "Ver Fo_nte" -#: ../midori/midori-browser.c:3840 -#: ../midori/midori-websettings.c:204 -msgid "Chinese (BIG5)" -msgstr "Chinês (BIG5)" - -#: ../midori/midori-browser.c:3843 -#: ../midori/midori-websettings.c:205 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japonês (SHIFT_JIS)" - -#: ../midori/midori-browser.c:3846 -#: ../midori/midori-websettings.c:206 -msgid "Russian (KOI8-R)" -msgstr "Russo (KOI8-R)" - -#: ../midori/midori-browser.c:3849 -#: ../midori/midori-websettings.c:207 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-browser.c:3852 -#: ../midori/midori-websettings.c:208 -msgid "Western (ISO-8859-1)" -msgstr "Ocidental (ISO-8859-1)" - -#: ../midori/midori-browser.c:3855 -#: ../midori/midori-websettings.c:209 -#: ../midori/midori-websettings.c:281 -msgid "Custom..." -msgstr "Personalizar..." - -#: ../midori/midori-browser.c:3858 -#: ../midori/midori-view.c:1275 -msgid "View _Source" -msgstr "Ver _Origem" - -#: ../midori/midori-browser.c:3859 +#: ../midori/midori-browser.c:4196 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:3861 +#: ../midori/midori-browser.c:4198 msgid "View Selection Source" msgstr "Ver Origem da Selecção" -#: ../midori/midori-browser.c:3862 +#: ../midori/midori-browser.c:4199 msgid "View the source code of the selection" msgstr "Ver código fonte da selecção" -#: ../midori/midori-browser.c:3866 +#: ../midori/midori-browser.c:4203 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:3868 +#: ../midori/midori-browser.c:4205 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:3871 +#: ../midori/midori-browser.c:4208 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:3874 +#: ../midori/midori-browser.c:4211 msgid "Go forward to the next page" msgstr "Ir para página seguinte" -#: ../midori/midori-browser.c:3877 +#: ../midori/midori-browser.c:4214 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:3879 +#: ../midori/midori-browser.c:4216 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:3880 +#: ../midori/midori-browser.c:4217 msgid "Delete the contents of the trash" msgstr "Apagar conteúdos do lixo" -#: ../midori/midori-browser.c:3882 -#: ../midori/midori-view.c:1233 -msgid "Undo Close Tab" -msgstr "Desfazer Fecho de Separador" +#: ../midori/midori-browser.c:4219 +msgid "Undo _Close Tab" +msgstr "Desfazer _Fecho de Separadores" -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:4220 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:3887 -#: ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:4224 +#: ../panels/midori-bookmarks.c:231 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3889 -#: ../panels/midori-bookmarks.c:259 -msgid "Add a new folder" -msgstr "Adicionar nova pasta" +#: ../midori/midori-browser.c:4226 +msgid "Add a new _folder" +msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:4227 msgid "Add a new bookmark folder" msgstr "Adicionar nova pasta de marcadores" -#: ../midori/midori-browser.c:3891 +#: ../midori/midori-browser.c:4228 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:3893 +#: ../midori/midori-browser.c:4230 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gerir Motores de _Pesquisa" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:4231 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:3897 +#: ../midori/midori-browser.c:4234 msgid "_Clear Private Data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:3898 +#: ../midori/midori-browser.c:4235 msgid "Clear private data..." msgstr "Limpar dados privados..." -#: ../midori/midori-browser.c:3902 +#: ../midori/midori-browser.c:4239 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:3903 +#: ../midori/midori-browser.c:4240 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4242 msgid "_Next Tab" msgstr "_Próximo Separador" -#: ../midori/midori-browser.c:3906 +#: ../midori/midori-browser.c:4243 msgid "Switch to the next tab" msgstr "Mudar para próximo separador" -#: ../midori/midori-browser.c:3908 +#: ../midori/midori-browser.c:4245 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:3910 +#: ../midori/midori-browser.c:4247 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:3911 +#: ../midori/midori-browser.c:4248 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:3913 +#: ../midori/midori-browser.c:4250 msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:3914 +#: ../midori/midori-browser.c:4251 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:3916 +#: ../midori/midori-browser.c:4253 msgid "_Report a Bug" msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4254 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4257 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:3927 +#: ../midori/midori-browser.c:4264 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:3928 +#: ../midori/midori-browser.c:4265 msgid "Don't save any private data while browsing" msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4270 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4271 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4274 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:3938 +#: ../midori/midori-browser.c:4275 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:3941 +#: ../midori/midori-browser.c:4278 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:3942 +#: ../midori/midori-browser.c:4279 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:3945 +#: ../midori/midori-browser.c:4282 msgid "_Bookmarkbar" msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4283 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:4286 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:3950 +#: ../midori/midori-browser.c:4287 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:3953 +#: ../midori/midori-browser.c:4290 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:3954 +#: ../midori/midori-browser.c:4291 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:4389 +#: ../midori/midori-browser.c:4298 +msgid "_Automatic" +msgstr "_Automático" + +#: ../midori/midori-browser.c:4301 +#: ../midori/midori-websettings.c:212 +msgid "Chinese (BIG5)" +msgstr "Chinês (BIG5)" + +#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic +#: ../midori/midori-browser.c:4305 +msgid "Japanese (SHIFT__JIS)" +msgstr "Japonês (SHIFT__JIS)" + +#: ../midori/midori-browser.c:4308 +#: ../midori/midori-websettings.c:214 +msgid "Russian (KOI8-R)" +msgstr "Russo (KOI8-R)" + +#: ../midori/midori-browser.c:4311 +#: ../midori/midori-websettings.c:215 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:4314 +#: ../midori/midori-websettings.c:216 +msgid "Western (ISO-8859-1)" +msgstr "Ocidental (ISO-8859-1)" + +#: ../midori/midori-browser.c:4317 +#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:289 +msgid "Custom..." +msgstr "Personalizar..." + +#: ../midori/midori-browser.c:4755 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:4762 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:4398 +#: ../midori/midori-browser.c:4764 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4788 msgid "_Web Search..." msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:4422 +#: ../midori/midori-browser.c:4790 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:4443 +#: ../midori/midori-browser.c:4811 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:4458 +#: ../midori/midori-browser.c:4826 msgid "_Recently visited pages" msgstr "Páginas _Recentes" -#: ../midori/midori-browser.c:4460 +#: ../midori/midori-browser.c:4828 msgid "Reopen pages that you visited earlier" msgstr "Reabrir páginas visitadas anteriormente" -#: ../midori/midori-browser.c:4475 -#: ../midori/sokoke.c:872 +#: ../midori/midori-browser.c:4843 +#: ../midori/sokoke.c:863 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:4477 +#: ../midori/midori-browser.c:4845 msgid "Show the saved bookmarks" msgstr "Mostrar marcadores guardados" -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4860 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:4494 +#: ../midori/midori-browser.c:4862 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" +#: ../midori/midori-browser.c:4876 +msgid "_Menu" +msgstr "_Menu" + +#: ../midori/midori-browser.c:4878 +msgid "Menu" +msgstr "Menu" + #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4674 +#: ../midori/midori-browser.c:5059 msgid "_Inline Find:" msgstr "Localizar:" -#: ../midori/midori-browser.c:4699 +#: ../midori/midori-browser.c:5084 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:5089 msgid "Next" msgstr "Seguinte" -#: ../midori/midori-browser.c:4709 +#: ../midori/midori-browser.c:5094 msgid "Match Case" msgstr "Maiúsculas e Minúsculas" -#: ../midori/midori-browser.c:4717 +#: ../midori/midori-browser.c:5102 msgid "Highlight Matches" msgstr "Realçar Correspondências" -#: ../midori/midori-browser.c:4727 +#: ../midori/midori-browser.c:5112 msgid "Close Findbar" msgstr "Fechar" -#: ../midori/midori-browser.c:4762 -#: ../extensions/cookie-manager.c:821 +#: ../midori/midori-browser.c:5147 +#: ../extensions/cookie-manager/cookie-manager-page.c:109 msgid "Delete All" msgstr "Apagar Todos" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5476 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" +#: ../midori/midori-locationaction.c:901 +#, c-format +msgid "Search with %s" +msgstr "Pesquisar com %s" + #: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "Separar da janela o painel escolhido" -#: ../midori/midori-panel.c:335 -msgid "Whether to detach the chosen panel from the window" -msgstr "Marque se quiser separar da janela o painel escolhido" +#: ../midori/midori-panel.c:343 +#: ../midori/midori-panel.c:508 +msgid "Align sidepanel to the right" +msgstr "Alinhar painel à direita" -#: ../midori/midori-panel.c:345 -#: ../midori/midori-websettings.c:535 -msgid "Align sidepanel on the right" -msgstr "Alinhar painel lateral à direita" - -#: ../midori/midori-panel.c:347 -#: ../midori/midori-websettings.c:536 -msgid "Whether to align the sidepanel on the right" -msgstr "Marque se quiser alinhar o painel lateral à direita" - -#: ../midori/midori-panel.c:357 -#: ../midori/midori-panel.c:358 +#: ../midori/midori-panel.c:353 +#: ../midori/midori-panel.c:354 msgid "Close panel" msgstr "Fechar painel" -#: ../midori/midori-websettings.c:187 -#: ../midori/midori-view.c:1999 -#: ../midori/midori-view.c:2176 +#: ../midori/midori-panel.c:509 +msgid "Align sidepanel to the left" +msgstr "Alinhar painel à esquerda" + +#: ../midori/midori-websettings.c:195 +#: ../midori/midori-view.c:2265 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-websettings.c:188 -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:196 +#: ../midori/midori-websettings.c:563 msgid "Homepage" msgstr "Página Inicial" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:197 msgid "Last open pages" msgstr "Últimas páginas abertas" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:213 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japonês (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:232 msgid "New tab" msgstr "Novo separador" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:233 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:234 msgid "Current tab" msgstr "Separador actual" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:249 msgid "Default" msgstr "Omissão" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:250 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:251 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:252 msgid "Both" msgstr "Texto e Ícones" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:253 msgid "Both horizontal" msgstr "Ambos na horizontal" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:268 msgid "All cookies" msgstr "Todos os cookies" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:269 msgid "Session cookies" msgstr "Cookies da sessão" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:270 #: ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:87 msgid "None" msgstr "Nenhum" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:286 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:287 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:288 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:333 +#: ../midori/midori-websettings.c:341 msgid "Remember last window size" msgstr "Lembrar último tamanho de janela" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:342 msgid "Whether to save the last window size" msgstr "Marque se quiser guardar o último tamanho de janela" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:350 msgid "Last window width" msgstr "Largura da última janela" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:351 msgid "The last saved window width" msgstr "Última largura de janela guardada" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:359 msgid "Last window height" msgstr "Altura da última janela" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:360 msgid "The last saved window height" msgstr "Última altura de janela guardada" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:385 msgid "Last panel position" msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel position" msgstr "Última posição de painel guardada" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:395 msgid "Last panel page" msgstr "Última página do painel" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:396 msgid "The last saved panel page" msgstr "Última posição de painel de página guardada" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:404 msgid "Last Web search" msgstr "Última pesquisa Web" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:405 msgid "The last saved Web search" msgstr "Última pesquisa Web guardada" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:414 msgid "Show Menubar" msgstr "Mostrar Barra de Menu" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:415 msgid "Whether to show the menubar" msgstr "Marque se quiser mostrar a barra de menu" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:423 msgid "Show Navigationbar" msgstr "Mostrar Barra de Navegação" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:424 msgid "Whether to show the navigationbar" msgstr "Marque se quiser mostrar a barra de navegação" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:432 msgid "Show Bookmarkbar" msgstr "Mostrar Barra de Marcadores" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:433 msgid "Whether to show the bookmarkbar" msgstr "Marque se quiser mostrar a barra de marcadores" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:441 msgid "Show Panel" msgstr "Mostrar Painel" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the panel" msgstr "Marque se quiser mostrar o painel" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:457 msgid "Show Transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the transferbar" msgstr "Marque se quiser mostrar a barra de transferências" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:466 msgid "Show Statusbar" msgstr "Mostrar Barra de Estado" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the statusbar" msgstr "Marque se quiser mostrar a barra de estado" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style" msgstr "Estilo da Barra de Ferramentas" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:493 msgid "Show progress in location entry" msgstr "Mostrar evolução na entrada de localização" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:494 msgid "Whether to show loading progress in the location entry" msgstr "Marque se quiser mostrar a evolução do carregamento na entrada de localização" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:509 msgid "Search engines in location completion" msgstr "Motores de pesquisa na conclusão da localização" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:510 msgid "Whether to show search engines in the location completion" msgstr "Marque se quiser mostrar motores de pesquisa na conclusão da localização" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:518 msgid "Toolbar Items" msgstr "Itens da Barra de Ferramentas" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:519 msgid "The items to show on the toolbar" msgstr "Itens a mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:527 msgid "Compact Sidepanel" msgstr "Compactar Painel Lateral" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:528 msgid "Whether to make the sidepanel compact" msgstr "Marque se quiser compactar o painel lateral" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:543 +msgid "Align sidepanel on the right" +msgstr "Alinhar painel lateral à direita" + +#: ../midori/midori-websettings.c:544 +msgid "Whether to align the sidepanel on the right" +msgstr "Marque se quiser alinhar o painel lateral à direita" + +#: ../midori/midori-websettings.c:553 msgid "Load on Startup" msgstr "Carregar ao Iniciar" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:554 msgid "What to load on startup" msgstr "Carregar ao iniciar" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:564 msgid "The homepage" msgstr "A página inicial" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:579 msgid "Show crash dialog" msgstr "Mostrar diálogo sobre encerramento" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:580 msgid "Show a dialog after Midori crashed" msgstr "Mostrar diálogo após o encerramento do Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:596 msgid "Show speed dial in new tabs" msgstr "Mostrar ligação rapida em novos separadores" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:597 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar ligação rápida em separadores recentemente abertos" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:605 msgid "Download Folder" msgstr "Pasta de Transferências" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:606 msgid "The folder downloaded files are saved to" msgstr "A pasta para guardar transferências" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:625 msgid "Ask for the destination folder" msgstr "Perguntar pasta de destino" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:626 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Marcar se quiser perguntar por uma pasta de destino ao transferir um ficheiro" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:645 msgid "Notify when a transfer has been completed" msgstr "Notificar ao concluir a transferência" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:646 msgid "Whether to show a notification when a transfer has been completed" msgstr "Marque se quiser mostrar uma notificação ao concluir a transferência" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:658 msgid "Download Manager" msgstr "Gestor de Transferências" -#: ../midori/midori-websettings.c:651 +#: ../midori/midori-websettings.c:659 msgid "An external download manager" msgstr "Um gestor de transferências externo" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:667 msgid "Text Editor" msgstr "Editor de Texto" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:668 msgid "An external text editor" msgstr "Um editor de texto externo" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:683 msgid "News Aggregator" msgstr "Agregador de Notícias" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:684 msgid "An external news aggregator" msgstr "Um agregador de notícias externo" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:692 msgid "Location entry Search" msgstr "Pesquisa de entrada Local" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:693 msgid "The search to perform inside the location entry" msgstr "A pesquisa a executar dentro da entrada local" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:701 msgid "Preferred Encoding" msgstr "Codificação Preferida" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:702 msgid "The preferred character encoding" msgstr "A codificação de caracteres preferida" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:712 msgid "Always Show Tabbar" msgstr "Mostrar sempre Barra de Separadores" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:713 msgid "Always show the tabbar" msgstr "Mostrar sempre barra de separadores" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:721 msgid "Close Buttons on Tabs" msgstr "Ícone Fechar nos Separadores" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:722 msgid "Whether tabs have close buttons" msgstr "Marque se quiser que os separadores tenham botões para fechar" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:730 msgid "Open new pages in" msgstr "Abrir novas páginas em" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:731 msgid "Where to open new pages" msgstr "Onde abrir novas páginas" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:740 msgid "Open external pages in" msgstr "Abrir páginas externas em" -#: ../midori/midori-websettings.c:733 +#: ../midori/midori-websettings.c:741 msgid "Where to open externally opened pages" msgstr "Onde abrir páginas abertas externamente" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:754 msgid "Middle click opens Selection" msgstr "Clique na roda do rato abre Selecção" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:755 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:755 +#: ../midori/midori-websettings.c:763 msgid "Open tabs in the background" msgstr "Abrir separadores em segundo plano" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:764 msgid "Whether to open new tabs in the background" msgstr "Marque se quiser abrir os novos separadores em segundo plano" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:772 msgid "Open Tabs next to Current" msgstr "Abrir Separadores perto do Actual" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:773 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Marque se quiser abrir os novos separadores perto do actual ou após o último " -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:781 msgid "Open popups in tabs" msgstr "Abrir popups em separadores" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:782 msgid "Whether to open popup windows in tabs" msgstr "Marque se quiser abrir janelas popup em separadores" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:798 msgid "Zoom Text and Images" msgstr "Zoom de Texto e Imagens" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:799 msgid "Whether to zoom text and images" msgstr "Marque se quiser ajustar zoom de texto e imagens" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:814 msgid "Find inline while typing" msgstr "Encontrar ao escrever" -#: ../midori/midori-websettings.c:807 +#: ../midori/midori-websettings.c:815 msgid "Whether to automatically find inline while typing" msgstr "Marque se quiser encontrar automaticamente ao escrever" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:823 msgid "Accept cookies" msgstr "Aceitar cookies" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:824 msgid "What type of cookies to accept" msgstr "Tipo de cookies a aceitar" -#: ../midori/midori-websettings.c:825 +#: ../midori/midori-websettings.c:833 msgid "Original cookies only" msgstr "Apenas cookies originais" -#: ../midori/midori-websettings.c:826 +#: ../midori/midori-websettings.c:834 msgid "Accept cookies from the original website only" msgstr "Aceitar cookies apenas do sítio web original" -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:842 msgid "Maximum cookie age" msgstr "Antiguidade máxima de cookies" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:843 msgid "The maximum number of days to save cookies for" msgstr "Número máximo de dias para guardar cookies" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:853 msgid "Remember last visited pages" msgstr "Lembrar últimas páginas visitadas" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:854 msgid "Whether the last visited pages are saved" msgstr "Marque se quiser guardar as últimas páginas visitadas" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:862 msgid "Maximum history age" msgstr "Antiguidade máxima do histórico" -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:863 msgid "The maximum number of days to save the history for" msgstr "O número máximo de dias para guardar histórico" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:871 msgid "Remember last form inputs" msgstr "Lembrar dados de formulários" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:872 msgid "Whether the last form inputs are saved" msgstr "Marque se quiser guardar os dados de formulário" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:880 msgid "Remember last downloaded files" msgstr "Lembrar últimas transferências " -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:881 msgid "Whether the last downloaded files are saved" msgstr "Marque se quiser guardar as últimas transferências" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:891 msgid "Proxy Server" msgstr "Servidor Proxy" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:892 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy para ligações HTTP" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:907 msgid "Detect proxy server automatically" msgstr "Detectar servidor proxy automaticamente" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:908 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Marque se quiser detectar automaticamente o servidor proxy do ambiente" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:916 +#: ../midori/midori-websettings.c:924 msgid "Identify as" msgstr "Identificar como" -#: ../midori/midori-websettings.c:917 +#: ../midori/midori-websettings.c:925 msgid "What to identify as to web pages" msgstr "Identificar nas páginas web como" -#: ../midori/midori-websettings.c:933 +#: ../midori/midori-websettings.c:941 msgid "Identification string" msgstr "Linha de Identificação" -#: ../midori/midori-websettings.c:934 +#: ../midori/midori-websettings.c:942 msgid "The application identification string" msgstr "A linha de identificação da aplicação" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:950 msgid "Cache size" msgstr "Tamanho de cache" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:951 msgid "The allowed size of the cache" msgstr "Tamanho de cache permitido" -#: ../midori/midori-view.c:686 +#: ../midori/midori-websettings.c:966 +msgid "Clear private data" +msgstr "Limpar dados privados" + +#: ../midori/midori-websettings.c:967 +msgid "The private data selected for deletion" +msgstr "Os dados privados seleccionados para apagar" + +#: ../midori/midori-view.c:750 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "A página '%s' não foi carregada." #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c:688 -#: ../midori/midori-view.c:2701 +#: ../midori/midori-view.c:752 +#: ../midori/midori-view.c:2897 #: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "Erro" -#: ../midori/midori-view.c:691 +#: ../midori/midori-view.c:755 msgid "Try again" msgstr "Tente novamente" #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:721 -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:785 +#: ../midori/midori-view.c:2901 #, c-format msgid "Not found - %s" msgstr "Não encontrada(o) - %s" -#: ../midori/midori-view.c:1095 +#: ../midori/midori-view.c:1172 msgid "Open _Link" msgstr "Abrir _Ligação" -#: ../midori/midori-view.c:1097 +#: ../midori/midori-view.c:1174 msgid "Open Link in New _Tab" msgstr "Abrir Ligação em Novo _Separador" -#: ../midori/midori-view.c:1114 +#: ../midori/midori-view.c:1191 msgid "Open Link in New _Window" msgstr "Abrir Ligação em Nova _Janela" -#: ../midori/midori-view.c:1123 +#: ../midori/midori-view.c:1197 msgid "_Download Link destination" msgstr "_Destino de Transferir Ligação" -#: ../midori/midori-view.c:1129 +#: ../midori/midori-view.c:1203 msgid "_Save Link destination" msgstr "De_stino para Guardar Ligação" -#: ../midori/midori-view.c:1138 +#: ../midori/midori-view.c:1212 msgid "Download with Download _Manager" msgstr "Transferir com _Gestor de Transferências" -#: ../midori/midori-view.c:1167 +#: ../midori/midori-view.c:1241 msgid "Search _with" msgstr "Pesquisar _com" -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1269 msgid "_Search the Web" msgstr "_Pesquisar na Web" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1279 msgid "Open Address in New _Tab" msgstr "Abrir Endereço em Novo _Separador" -#: ../midori/midori-view.c:1372 +#: ../midori/midori-view.c:1457 msgid "Open or download file" msgstr "Abrir ou transferir ficheiro" -#: ../midori/midori-view.c:1389 +#: ../midori/midori-view.c:1474 #, c-format msgid "File Type: '%s'" msgstr "Tipo de Ficheiro: '%s' " -#: ../midori/midori-view.c:1392 +#: ../midori/midori-view.c:1477 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de Ficheiro: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1396 +#: ../midori/midori-view.c:1481 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:1816 +#: ../midori/midori-view.c:1899 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar página - %s" -#: ../midori/midori-view.c:2001 -#: ../midori/midori-view.c:2002 -msgid "Search" -msgstr "Procurar" +#: ../midori/midori-view.c:2089 +msgid "Speed dial" +msgstr "Ligação rápida" -#: ../midori/midori-view.c:2003 +#: ../midori/midori-view.c:2090 msgid "Click to add a shortcut" msgstr "Clique para adicionar atalho" -#: ../midori/midori-view.c:2004 +#: ../midori/midori-view.c:2091 msgid "Enter shortcut address" msgstr "Introduza endereço do atalho" -#: ../midori/midori-view.c:2005 +#: ../midori/midori-view.c:2092 msgid "Enter shortcut title" msgstr "Introduza título do atalho" -#: ../midori/midori-view.c:2006 +#: ../midori/midori-view.c:2093 msgid "Are you sure you want to delete this shortcut?" msgstr "Tem a certeza que quer apagar este atalho ?" -#: ../midori/midori-view.c:2038 +#: ../midori/midori-view.c:2123 #, c-format msgid "Document cannot be displayed" msgstr "O documento não pode ser apresentado" -#: ../midori/midori-view.c:2055 +#: ../midori/midori-view.c:2140 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" +#: ../midori/midori-view.c:2487 +msgid "_Duplicate Tab" +msgstr "_Duplicar Separador" + #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" @@ -1489,166 +1522,171 @@ msgstr "O tamanho da fonte, por omissão, para apresentar texto" msgid "Fixed-width Font Family" msgstr "Familia de Fontes de Largura Fixa" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:457 msgid "The font family used to display fixed-width text" msgstr "A família de fontes usada para apresentar texto com largura fixa" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "Tamanho da fonte para apresentar texto com largura fixa" + +#: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" msgstr "Tamanho Mínimo de Fonte" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" msgstr "Tamanho mínimo de fonte para apresentar texto" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:473 msgid "Encoding" msgstr "Codificação" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" msgstr "A codificação de caracteres por omissão" #. Page "Behavior" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:484 msgid "Features" msgstr "Funções" -#: ../midori/midori-preferences.c:482 -#: ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:487 +#: ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Carregar imagens automaticamente" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:488 msgid "Load and display images automatically" msgstr "Carregar e apresentar automaticamente as imagens " -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:491 msgid "Shrink images automatically" msgstr "Encolher imagens automaticamente" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:492 msgid "Automatically shrink standalone images to fit" msgstr "Encolher imagens automaticamente para caber" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:495 msgid "Print background images" msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:496 msgid "Whether background images should be printed" msgstr "Marque se quiser imprimir as imagens em segundo plano" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:499 msgid "Resizable text areas" msgstr "Áreas de texto dimensionáveis" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:500 msgid "Whether text areas are resizable" msgstr "Marque se quiser redimensionar as áreas de texto" -#: ../midori/midori-preferences.c:498 -#: ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:503 +#: ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Activar argumentos" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:504 msgid "Enable embedded scripting languages" msgstr "Activar argumentos de idiomas incorporados" -#: ../midori/midori-preferences.c:502 -#: ../extensions/statusbar-features.c:72 +#: ../midori/midori-preferences.c:507 +#: ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Activar plugins Netscape" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:508 msgid "Enable embedded Netscape plugin objects" msgstr "Activar plugins Netscape incorporados" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:511 msgid "Enforce 96 dots per inch" msgstr "Forçar 96 pontos por polegada" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:512 msgid "Enforce a video dot density of 96 DPI" msgstr "Forçar densidade de vídeo de 96 PPP" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:515 msgid "Enable developer tools" msgstr "Activar ferramentas de desenvolvimento" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:516 msgid "Enable special extensions for developers" msgstr "Activar extensões especiais de desenvolvimento" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:523 msgid "Spell Checking" msgstr "Verificação Ortográfica" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:526 msgid "Enable Spell Checking" msgstr "Activar Verificação Ortográfica" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:527 msgid "Enable spell checking while typing" msgstr "Activar verificação ortográfica ao escrever" -#: ../midori/midori-preferences.c:525 +#. i18n: The example should be adjusted to contain a good local default +#: ../midori/midori-preferences.c:531 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "Uma lista de idiomas, separados por vírgulas, para a verificação ortográficas, por exemplo \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:536 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:537 msgid "Navigationbar" msgstr "Barra de Navegação" -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:548 msgid "Browsing" msgstr "Navegar" #. Page "Applications" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:578 msgid "Applications" msgstr "Aplicações" -#: ../midori/midori-preferences.c:573 +#: ../midori/midori-preferences.c:579 msgid "External applications" msgstr "Aplicações externas" #. Page "Network" -#: ../midori/midori-preferences.c:619 -#: ../midori/midori-preferences.c:620 +#: ../midori/midori-preferences.c:625 +#: ../midori/midori-preferences.c:626 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:653 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:652 +#: ../midori/midori-preferences.c:658 msgid "Privacy" msgstr "Privacidade" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:659 msgid "Web Cookies" msgstr "Web Cookies" -#: ../midori/midori-preferences.c:666 -#: ../midori/midori-preferences.c:676 +#: ../midori/midori-preferences.c:672 +#: ../midori/midori-preferences.c:682 msgid "days" msgstr "dias" #: ../midori/midori-searchaction.c:484 -#: ../katze/katze-arrayaction.c:314 +#: ../katze/katze-arrayaction.c:331 msgid "Empty" msgstr "Vazio" @@ -1672,73 +1710,64 @@ msgstr "_Icone:" msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1195 +#: ../midori/midori-searchaction.c:1209 msgid "Manage Search Engines" msgstr "Gerir Motores de Pesquisa" -#: ../midori/midori-searchaction.c:1292 +#: ../midori/midori-searchaction.c:1308 msgid "Use as _default" msgstr "Usar por _omissão" -#: ../midori/sokoke.c:162 -#: ../midori/sokoke.c:174 +#: ../midori/sokoke.c:172 +#: ../midori/sokoke.c:184 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." -#. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:520 -msgid "Warning: You are using a superuser account!" -msgstr "Aviso: Está a utilizar uma conta de super utilizador!" - -#: ../midori/sokoke.c:871 +#: ../midori/sokoke.c:862 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/sokoke.c:873 -msgid "_Add Bookmark" -msgstr "_Adicionar Marcador" +#: ../midori/sokoke.c:864 +msgid "Add Boo_kmark" +msgstr "Adicionar _Marcador" -#: ../midori/sokoke.c:874 +#: ../midori/sokoke.c:865 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:875 +#: ../midori/sokoke.c:866 msgid "_Extensions" msgstr "_Extensões" -#: ../midori/sokoke.c:876 +#: ../midori/sokoke.c:867 msgid "_History" msgstr "_Histórico" -#: ../midori/sokoke.c:877 +#: ../midori/sokoke.c:868 msgid "_Homepage" msgstr "_Página Inicial" -#: ../midori/sokoke.c:878 +#: ../midori/sokoke.c:869 msgid "_Userscripts" msgstr "Argumentos de _Utilizador" -#: ../midori/sokoke.c:879 +#: ../midori/sokoke.c:870 msgid "User_styles" msgstr "E_stilos de Utilizador" -#: ../midori/sokoke.c:880 +#: ../midori/sokoke.c:871 msgid "New _Tab" msgstr "_Novo Separador" -#: ../midori/sokoke.c:881 +#: ../midori/sokoke.c:872 msgid "_Transfers" msgstr "_Transferências" -#: ../midori/sokoke.c:882 +#: ../midori/sokoke.c:873 msgid "Netscape p_lugins" msgstr "P_lugins Netscape" -#: ../midori/sokoke.c:883 -msgid "_Closed Tabs and Windows" -msgstr "Separadores e Janelas Fe_chadas" - -#: ../midori/sokoke.c:884 +#: ../midori/sokoke.c:875 msgid "New _Window" msgstr "Nova _Janela" @@ -1752,39 +1781,23 @@ msgstr "Argumentos de Utilizador" msgid "Userstyles" msgstr "Estilos de utilizador" -#: ../panels/midori-addons.c:927 -#: ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "_Activar" - -#: ../panels/midori-addons.c:928 -#: ../panels/midori-extensions.c:145 -msgid "Enable" -msgstr "Activar" - -#: ../panels/midori-addons.c:937 -#: ../panels/midori-extensions.c:154 -msgid "_Disable" -msgstr "_Desactivar" - -#: ../panels/midori-addons.c:938 -#: ../panels/midori-extensions.c:155 -msgid "Disable" -msgstr "Desactivar" - -#: ../panels/midori-bookmarks.c:107 +#: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:238 +#: ../panels/midori-bookmarks.c:239 msgid "Edit the selected bookmark" msgstr "Editar marcador seleccionado" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" msgstr "Apagar marcador seleccionado" -#: ../panels/midori-bookmarks.c:591 +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "Adicionar nova pasta" + +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Separador" @@ -1792,7 +1805,7 @@ msgstr "Separador" msgid "Console" msgstr "Consola" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensões" @@ -1812,37 +1825,43 @@ msgstr "Apagar item de histórico seleccionado" msgid "Clear the entire history" msgstr "Limpar todo o histórico" -#: ../panels/midori-history.c:599 +#: ../panels/midori-history.c:601 msgid "A week ago" msgstr "Uma semana atrás" -#: ../panels/midori-history.c:604 +#: ../panels/midori-history.c:606 #, c-format msgid "%d day ago" -msgstr "%d dia(s) atrás" +msgid_plural "%d days ago" +msgstr[0] "%d dia atrás" +msgstr[1] "%d dias atrás" -#: ../panels/midori-history.c:605 -#, c-format -msgid "%d days ago" -msgstr "%d dias atrás" - -#: ../panels/midori-history.c:612 +#: ../panels/midori-history.c:614 msgid "Today" msgstr "Hoje" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:616 msgid "Yesterday" msgstr "Ontem" #: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "Plugins Netscape" -#: ../panels/midori-transfers.c:256 +#: ../panels/midori-transfers.c:271 #, c-format msgid "%s of %s" msgstr "%s de %s" +#: ../panels/midori-transfers.c:479 +msgid "Open Destination _Folder" +msgstr "Abrir Pas_ta de Destino" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "Copiar Localização da Lig_ação" + #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "Autenticação Necessária " @@ -1877,21 +1896,37 @@ msgstr "O ícone '%s' não foi carregado" msgid "Animation frames are broken" msgstr "As frames de animação estão corrompidas" -#: ../katze/katze-utils.c:183 -#: ../katze/katze-utils.c:385 +#: ../katze/katze-utils.c:200 +#: ../katze/katze-utils.c:407 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Propriedade %s' é inválida para %s" -#: ../katze/katze-utils.c:215 -#: ../katze/katze-utils.c:244 +#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:264 msgid "Choose file" msgstr "Escolha ficheiro" -#: ../katze/katze-utils.c:230 +#: ../katze/katze-utils.c:250 msgid "Choose folder" msgstr "Escolha pasta" +#: ../extensions/adblock.c:128 +msgid "Configure Advertisement filters" +msgstr "Configurar filtros de Publicidade" + +#: ../extensions/adblock.c:269 +msgid "Configure _Advertisement filters..." +msgstr "Configurar filtros de _Publicidade..." + +#: ../extensions/adblock.c:526 +msgid "Advertisement blocker" +msgstr "Bloqueador de publicidade" + +#: ../extensions/adblock.c:527 +msgid "Block advertisements according to a filter list" +msgstr "Bloquear publicidade de acordo com a lista " + #: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "Cor distinta de separadores" @@ -1904,11 +1939,40 @@ msgstr "Separadores Coloridos" msgid "Tint each tab distinctly" msgstr "Cor distinta para cada separador" -#: ../extensions/cookie-manager.c:201 +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "Gestor de Cookies" + +#: ../extensions/cookie-manager/cookie-manager-page.c:111 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Apagar todos os cookies mostrados. Se definir um filtro, só serão eliminados os cookies que coincidirem com o filtro." + +#: ../extensions/cookie-manager/cookie-manager-page.c:126 +msgid "Expand All" +msgstr "Expandir Todos" + +#: ../extensions/cookie-manager/cookie-manager-page.c:133 +msgid "Collapse All" +msgstr "_Unir Todos" + +#: ../extensions/cookie-manager/cookie-manager-page.c:460 +msgid "Do you really want to delete all cookies?" +msgstr "Deseja realmente apagar todos os cookies?" + +#: ../extensions/cookie-manager/cookie-manager-page.c:462 +msgid "Question" +msgstr "Pergunta" + +#: ../extensions/cookie-manager/cookie-manager-page.c:471 +msgid "Only cookies which match the filter will be deleted." +msgstr "Apenas serão apagados os cookies que coincidam com o filtro." + +#: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" msgstr "No fim da sessão" -#: ../extensions/cookie-manager.c:204 +#: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format msgid "" "Host: %s\n" @@ -1925,68 +1989,39 @@ msgstr "" "Seguro: %s\n" "Expira: %s" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" msgstr "Sim" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" msgstr "Não" -#: ../extensions/cookie-manager.c:493 -msgid "Do you really want to delete all cookies?" -msgstr "Deseja realmente apagar todos os cookies?" - -#: ../extensions/cookie-manager.c:495 -msgid "Question" -msgstr "Pergunta" - -#: ../extensions/cookie-manager.c:504 -msgid "Only cookies which match the filter will be deleted." -msgstr "Apenas serão apagados os cookies que coincidam com o filtro." - -#: ../extensions/cookie-manager.c:682 +#: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" msgstr "Nome" -#: ../extensions/cookie-manager.c:742 +#: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" msgstr "_Expandir Todos" -#: ../extensions/cookie-manager.c:750 +#: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" msgstr "_Unir Todos" -#: ../extensions/cookie-manager.c:823 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Apagar todos os cookies mostrados. Se definir um filtro, só serão eliminados os cookies que coincidirem com o filtro." - -#: ../extensions/cookie-manager.c:838 -msgid "Expand All" -msgstr "Expandir Todos" - -#: ../extensions/cookie-manager.c:845 -msgid "Collapse All" -msgstr "_Unir Todos" - -#: ../extensions/cookie-manager.c:876 +#: ../extensions/cookie-manager/cookie-manager-page.c:923 msgid "Filter:" msgstr "Filtro:" -#: ../extensions/cookie-manager.c:881 +#: ../extensions/cookie-manager/cookie-manager-page.c:928 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Introduza um filtro para apenas mostrar os cookies cujo nome ou domínio coincidam com o filtro" -#: ../extensions/cookie-manager.c:916 -#: ../extensions/cookie-manager.c:964 -msgid "Cookie Manager" -msgstr "Gestor de Cookies" - -#: ../extensions/cookie-manager.c:948 +#: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" msgstr "Gestor de _Cookies" -#: ../extensions/cookie-manager.c:965 +#: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" msgstr "Listar, ver e apagar cookies" @@ -2021,17 +2056,17 @@ msgstr "Apagar feed" msgid "_Feeds" msgstr "_Feeds" -#: ../extensions/feed-panel/feed-parse.c:175 +#: ../extensions/feed-panel/feed-parse.c:185 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Falha ao encontrar os elementos root nos dados feed XML." -#: ../extensions/feed-panel/feed-parse.c:215 +#: ../extensions/feed-panel/feed-parse.c:225 #, c-format msgid "Unsupported feed format." msgstr "Formato de feed não suportado" -#: ../extensions/feed-panel/feed-parse.c:245 +#: ../extensions/feed-panel/feed-parse.c:255 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Falha ao analisar o XML do feed: %s" @@ -2044,11 +2079,11 @@ msgstr "Falha ao encontrar os elementos de \"canal\" nos dados RSS XML." msgid "Unsupported RSS version found." msgstr "Encontrada uma versão RSS não suportada." -#: ../extensions/feed-panel/feed-rss.c:144 +#: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." msgstr "Falha ao encontrar os elementos de RSS \"item\" nos dados XML." -#: ../extensions/feed-panel/feed-rss.c:229 +#: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Falha ao encontrar os elementos de RSS \"canal\" nos dados XML." @@ -2074,11 +2109,11 @@ msgstr "Painel de Feeds" msgid "Read Atom/ RSS feeds" msgstr "Ler feeds Atom/ RSS" -#: ../extensions/mouse-gestures/main.c:216 +#: ../extensions/mouse-gestures/main.c:236 msgid "Mouse Gestures" msgstr "Gestos de Rato" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures/main.c:237 msgid "Control Midori by moving the mouse" msgstr "Controlar Midori movendo o rato" @@ -2092,14 +2127,99 @@ msgstr "Titular de Página" msgid "_Pageholder" msgstr "Titular de _Página" -#: ../extensions/statusbar-features.c:104 +#: ../extensions/shortcuts.c:166 +msgid "Configure Keyboard shortcuts" +msgstr "Configurar atalhos do teclado" + +#: ../extensions/shortcuts.c:263 +msgid "Configure Sh_ortcuts..." +msgstr "Configurar Atalh_os..." + +#: ../extensions/shortcuts.c:295 +msgid "Shortcuts" +msgstr "Atalhos" + +#: ../extensions/shortcuts.c:296 +msgid "View and edit keyboard shortcuts" +msgstr "Ver e editar os atalhos de teclado" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "Imagens" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "Argumentos" + +#: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" msgstr "Funçoes da barra de estado" -#: ../extensions/statusbar-features.c:105 +#: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" msgstr "Alternar facilmente as funções ligado e desligado nas páginas web" +#: ../extensions/tab-panel.c:293 +#: ../extensions/tab-panel.c:352 +msgid "Tab Panel" +msgstr "Painel de Separadores" + +#: ../extensions/tab-panel.c:336 +msgid "T_ab Panel" +msgstr "P_ainel de Separadores" + +#: ../extensions/tab-panel.c:353 +msgid "Show tabs in a vertical panel" +msgstr "Mostrar separadores em painel vertical" + +#: ../extensions/toolbar-editor.c:390 +msgid "Customize Toolbar" +msgstr "Personalizar Barra de Ferramentas" + +#: ../extensions/toolbar-editor.c:406 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Selecione os itens a mostar na barra de ferramentas. Os itens podem ser ordenados por arrastamento." + +#: ../extensions/toolbar-editor.c:422 +msgid "Available Items" +msgstr "Itens Disponíveis" + +#: ../extensions/toolbar-editor.c:443 +msgid "Displayed Items" +msgstr "Itens Apresentados" + +#: ../extensions/toolbar-editor.c:584 +msgid "Configure _Toolbar..." +msgstr "Configurar Barra de Ferramentas" + +#: ../extensions/toolbar-editor.c:613 +msgid "Toolbar Editor" +msgstr "Editor da Barra de Ferramentas" + +#: ../extensions/toolbar-editor.c:614 +msgid "Easily edit the toolbar layout" +msgstr "Editor fácil da barra de ferramentas" + +#~ msgid "_Quick Find" +#~ msgstr "Localização _Rápida" +#~ msgid "Quickly jump to a word or phrase" +#~ msgstr "Avanço rápido para palavra ou frase" +#~ msgid "Whether to detach the chosen panel from the window" +#~ msgstr "Marque se quiser separar da janela o painel escolhido" +#~ msgid "Search" +#~ msgstr "Procurar" +#~ msgid "Warning: You are using a superuser account!" +#~ msgstr "Aviso: Está a utilizar uma conta de super utilizador!" +#~ msgid "_Enable" +#~ msgstr "_Activar" +#~ msgid "Enable" +#~ msgstr "Activar" +#~ msgid "_Disable" +#~ msgstr "_Desactivar" +#~ msgid "Disable" +#~ msgstr "Desactivar" +#~ msgid "%d days ago" +#~ msgstr "%d dias atrás" #~ msgid "P_lugins" #~ msgstr "P_lugins" #~ msgid "Plugins" @@ -2110,10 +2230,6 @@ msgstr "Alternar facilmente as funções ligado e desligado nas páginas web" #~ msgstr "Não pode assinar %s para %s.%s" #~ msgid "%s.%s cannot be accessed" #~ msgstr "%s. Não pode aceder a %s" -#~ msgid "Images" -#~ msgstr "Imagens" -#~ msgid "Scripts" -#~ msgstr "Argumentos" #~ msgid "Source" #~ msgstr "Origem" #~ msgid "URIs" diff --git a/wscript b/wscript index d6ef7380..68cd1927 100644 --- a/wscript +++ b/wscript @@ -25,7 +25,7 @@ import misc major = 0 minor = 1 -micro = 8 +micro = 9 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro)