diff --git a/AUTHORS b/AUTHORS index 59d2077b..bc77c4db 100644 --- a/AUTHORS +++ b/AUTHORS @@ -48,6 +48,7 @@ Translations: hu: SZERVÁC Attila id: Andhika Padmawan it: Sergio Durzu + it: Luca Perri ja: Masato Hashimoto nl: Vincent Tunru pl: Przemysław Sitek @@ -58,8 +59,10 @@ Translations: ru: Troitskiy Nikita ru: Anton Shestakov sk: Robert Hartl + sr: Miloš Popović sv: Mikael Magnusson tr: Mirat Can Bayrak + tr: Gökmen Görgen uk: Dmitry Nikitin zh_CN: Stanley Zhang zh_TW: Wei-Lun Chao @@ -67,5 +70,7 @@ Translations: Code from other projects: GTK+/ GdkPixbuf, Matthias Clasen GTK+/ GtkEntry, Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + GTK+/ GtkToolbar, Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald Modified by the GTK+ Team and others 1997-2000 libSoup/ CookieJarText, Copyright (C) 2008 Xan Lopez , Dan Winship + libSylph, Copyright 1999-2008 Hiroyuki Yamamoto, Copyright 2006-2009 Enrico Tröger diff --git a/ChangeLog b/ChangeLog index fa03998c..cc7ff6da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,33 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.1.8: + + Initial support for extension unit tests + + Set a "browser" role on browser windows + + Support typing search tokens to open websites + + Fix focus loss when switching search engines + + Rewrite Netscape Plugins panel backed by javascript + + Implement a compact menu if menubar is hidden + + Provide a context menu for tab labels + + Implement Tab Panel as a tabbar replacement + + Remember the last active tab + + Read and write XBEL metadata internally + + Implement -e, --execute to perform commands + + Support socket based single instance + + Move Go button inside the location entry + + Fix the ident string after Midori updates + + Bind Alt + n to switching to the n-th tab + + Revisit conflicting mnemonics + + Add a Toolbar Editor extension + + Add a Shortcut Editor extension + + Implement context menu in the Transfers panel + + Simplified Extensions and Addons panels with tick marks + + Fix Mouse Gestures often ignoreing gestures + + Use one cookie manager model in all windows + + Support building Midori for Win32 + + Add an entry to specify Fixed-Width font size + + Implement Save As in the download dialog + + Use one history model in all windows + v0.1.7: + Save the activation status of extensions + Catch and ignore mouse buttons meant for horizontal scrolling diff --git a/TODO b/TODO index a9852067..27f4bf1e 100644 --- a/TODO +++ b/TODO @@ -18,17 +18,13 @@ TODO: . Have an internal uri scheme, eg. 'res:', to reference eg. themed icons . 'about:' uris: about, blank, cache, config, plugins . Panel of open tabs (with tree-structure), optional thumbnail-view - . Spell check support . Check specific bookmarks for updates automatically (extension) . Mark "new" as well as "actually modified" tabs specially (even over sessions) . SearchEngine: "Show in context menu" - . Use libnotify for events, e.g. download finished . Save screenshot of a document? . Right-click a textbox in a search form and choose 'add to websearch' . Honor design principle "no warnings but undo of backups"? . Support widgets 1.0 spec in tool windows and standalone? - . Blank page: several custom links, displayed as thumbnails, like Opera? - . Handle downloads, optionally in a downloadbar . Protected tabs prompt when attempting to close them . Provide a 'sleep mode' after a crash where open documents are loaded manually . Option to run plugins or scripts only on demand, like NoScript, per-site diff --git a/data/midori.rc b/data/midori.rc new file mode 100644 index 00000000..b1f1556b --- /dev/null +++ b/data/midori.rc @@ -0,0 +1,2 @@ + +IDR_MAINFRAME ICON DISCARDABLE "../_build_/default/data/midori.ico" diff --git a/data/speeddial-head.html b/data/speeddial-head.html index dbe55371..955535e1 100644 --- a/data/speeddial-head.html +++ b/data/speeddial-head.html @@ -235,10 +235,6 @@ var a = cross.getNext (); var p = a.getNext (); - cross.dispose (); - div.removeClass ('activated'); - a.empty (); - cross.dispose (); div.removeClass ('activated'); a.empty ().set ('html', '

' + num + '

'); diff --git a/docs/api/wscript_build b/docs/api/wscript_build index ddbcfc59..70165263 100644 --- a/docs/api/wscript_build +++ b/docs/api/wscript_build @@ -3,6 +3,7 @@ # This file is licensed under the terms of the expat license, see the file EXPAT. import pproc as subprocess +import os for module in ('midori', 'katze'): try: diff --git a/extensions/adblock.c b/extensions/adblock.c index b294df7c..8debf5e1 100644 --- a/extensions/adblock.c +++ b/extensions/adblock.c @@ -15,6 +15,9 @@ #include "config.h" #include +#if HAVE_UNISTD_H + #include +#endif static void adblock_app_add_browser_cb (MidoriApp* app, @@ -36,17 +39,64 @@ adblock_deactivate_cb (MidoriExtension* extension, } static void -adblock_preferences_render_text (GtkTreeViewColumn* column, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - MidoriExtension* extension) +adblock_preferences_renderer_text_edited_cb (GtkCellRenderer* renderer, + const gchar* tree_path, + const gchar* new_text, + GtkTreeModel* model) { - gchar* uri; + GtkTreeIter iter; - gtk_tree_model_get (model, iter, 0, &uri, -1); - g_object_set (renderer, "text", uri, NULL); - g_free (uri); + if (gtk_tree_model_get_iter_from_string (model, &iter, tree_path)) + gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, new_text, -1); +} + +static void +adblock_preferences_model_row_changed_cb (GtkTreeModel* model, + GtkTreePath* path, + GtkTreeIter* iter, + MidoriExtension* extension) +{ + gsize length = gtk_tree_model_iter_n_children (model, NULL); + gchar** filters = g_new (gchar*, length + 1); + guint i = 0; + + if (gtk_tree_model_iter_children (model, iter, NULL)) + do + { + gchar* filter; + gtk_tree_model_get (model, iter, 0, &filter, -1); + filters[i++] = filter; + } + while (gtk_tree_model_iter_next (model, iter)); + filters[length] = NULL; + midori_extension_set_string_list (extension, "filters", filters, length); +} + +static void +adblock_preferences_model_row_deleted_cb (GtkTreeModel* model, + GtkTreePath* path, + MidoriExtension* extension) +{ + GtkTreeIter iter; + adblock_preferences_model_row_changed_cb (model, path, &iter, extension); +} + +static void +adblock_preferences_add_clicked_cb (GtkWidget* button, + GtkTreeModel* model) +{ + gtk_list_store_insert_with_values (GTK_LIST_STORE (model), + NULL, 0, 0, "", -1); +} + +static void +adblock_preferences_remove_clicked_cb (GtkWidget* button, + GtkTreeView* treeview) +{ + GtkTreeModel* model; + GtkTreeIter iter; + if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); } static GtkWidget* @@ -102,19 +152,26 @@ adblock_get_preferences_dialog (MidoriExtension* extension) gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, TRUE, TRUE, 12); liststore = gtk_list_store_new (1, G_TYPE_STRING); + g_object_connect (liststore, + "signal::row-inserted", + adblock_preferences_model_row_changed_cb, extension, + "signal::row-changed", + adblock_preferences_model_row_changed_cb, extension, + "signal::row-deleted", + adblock_preferences_model_row_deleted_cb, extension, + NULL); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); column = gtk_tree_view_column_new (); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); - /* gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, - (GtkTreeCellDataFunc)adblock_preferences_render_icon_cb, - treeview, NULL); */ renderer_text = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer_text, TRUE); - gtk_tree_view_column_set_cell_data_func (column, renderer_text, - (GtkTreeCellDataFunc)adblock_preferences_render_text, - extension, NULL); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer_text, + "text", 0, NULL); + g_object_set (renderer_text, "editable", TRUE, NULL); + g_signal_connect (renderer_text, "edited", + G_CALLBACK (adblock_preferences_renderer_text_edited_cb), liststore); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), @@ -138,18 +195,16 @@ adblock_get_preferences_dialog (MidoriExtension* extension) vbox = gtk_vbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 4); button = gtk_button_new_from_stock (GTK_STOCK_ADD); - /* g_signal_connect (button, "clicked", - G_CALLBACK (adblock_preferences_add_cb), extension); */ + g_signal_connect (button, "clicked", + G_CALLBACK (adblock_preferences_add_clicked_cb), liststore); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_from_stock (GTK_STOCK_EDIT); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); - /* g_signal_connect (button, "clicked", - G_CALLBACK (adblock_preferences_remove_cb), extension); */ + g_signal_connect (button, "clicked", + G_CALLBACK (adblock_preferences_remove_clicked_cb), treeview); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_widget_set_sensitive (button, FALSE); button = gtk_label_new (""); /* This is an invisible separator */ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 8); gtk_widget_set_sensitive (button, FALSE); @@ -223,14 +278,22 @@ adblock_app_add_browser_cb (MidoriApp* app, G_CALLBACK (adblock_deactivate_cb), menuitem); } +static gboolean +adblock_is_matched (const gchar* pattern, + const GRegex* regex, + const gchar* uri) +{ + return g_regex_match_full (regex, uri, -1, 0, 0, NULL, NULL); +} + static void adblock_session_request_queued_cb (SoupSession* session, SoupMessage* msg, - GRegex* regex) + GHashTable* pattern) { SoupURI* soup_uri = soup_message_get_uri (msg); gchar* uri = soup_uri ? soup_uri_to_string (soup_uri, FALSE) : g_strdup (""); - if (g_regex_match_full (regex, uri, -1, 0, 0, NULL, NULL)) + if (g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, uri)) { /* g_debug ("match! '%s'", uri); */ /* FIXME: This leads to funny error pages if frames are blocked */ @@ -239,60 +302,77 @@ adblock_session_request_queued_cb (SoupSession* session, g_free (uri); } -static void -adblock_session_add_filter (SoupSession* session, - gchar* path) +static gchar* +adblock_parse_line (gchar* line) +{ + if (!line) + return NULL; + + /* Ignore comments and new lines */ + if (line[0] == '!') + return NULL; + /* FIXME: No support for whitelisting */ + if (line[0] == '@' && line[1] == '@') + return NULL; + /* FIXME: Differentiate # comments from element hiding */ + /* FIXME: No support for element hiding */ + if (line[0] == '#' && line[1] == '#') + return NULL; + /* FIXME: No support for [include] and [exclude] tags */ + 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); +} + +static GHashTable* +adblock_parse_file (gchar* path) { FILE* file; if ((file = g_fopen (path, "r"))) { - /* We assume filter lists found on the web are commonly very long */ - GString* pattern = g_string_sized_new (1000 * 200); + GHashTable* pattern = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify)g_free, + (GDestroyNotify)g_regex_unref); + + gboolean have_pattern = FALSE; gchar line[255]; GRegex* regex; - GError* error; while (fgets (line, 255, file)) { - /* Ignore comments and new lines */ - if (line[0] == '!') - continue; - /* FIXME: No support for whitelisting */ - if (line[0] == '@' && line[1] == '@') - continue; - /* FIXME: Differentiate # comments from element hiding */ - /* FIXME: No support for element hiding */ - if (line[0] == '#' && line[1] == '#') - continue; - /* FIXME: No support for [include] and [exclude] tags */ - if (line[0] == '[') - continue; - g_strchomp (line); - g_string_append (pattern, line); - g_string_append_c (pattern, '|'); - } + GError* error = NULL; + gchar* parsed; - error = NULL; - if (pattern->len > 2 && - (regex = g_regex_new (pattern->str, G_REGEX_OPTIMIZE, - G_REGEX_MATCH_NOTEMPTY, &error))) - { - /* g_debug ("%s: '%s'", G_STRFUNC, pattern->str); */ - g_signal_connect_data (session, "request-queued", - G_CALLBACK (adblock_session_request_queued_cb), - regex, (GClosureNotify)g_regex_unref, 0); + parsed = adblock_parse_line (line); + regex = g_regex_new (parsed, G_REGEX_OPTIMIZE, + G_REGEX_MATCH_NOTEMPTY, &error); + if (error) + { + g_warning ("%s: %s", G_STRFUNC, error->message); + g_error_free (error); + g_free (parsed); + } + else + { + have_pattern = TRUE; + g_hash_table_insert (pattern, parsed, regex); + } } - else if (error) - { - /* g_warning ("%s: %s", G_STRFUNC, error->message); */ - g_error_free (error); - } - g_string_free (pattern, TRUE); fclose (file); + + if (have_pattern) + return pattern; } /* FIXME: This should presumably be freed, but there's a possible crash g_free (path); */ + return NULL; } #if WEBKIT_CHECK_VERSION (1, 1, 3) @@ -302,7 +382,11 @@ adblock_download_notify_status_cb (WebKitDownload* download, gchar* path) { SoupSession* session = webkit_get_default_session (); - adblock_session_add_filter (session, path); + GHashTable* pattern = adblock_parse_file (path); + if (pattern) + g_signal_connect_data (session, "request-queued", + G_CALLBACK (adblock_session_request_queued_cb), + pattern, (GClosureNotify)g_hash_table_destroy, 0); /* g_object_unref (download); */ } #endif @@ -359,7 +443,13 @@ adblock_activate_cb (MidoriExtension* extension, #endif } else - adblock_session_add_filter (session, path); + { + GHashTable* pattern = adblock_parse_file (path); + if (pattern) + g_signal_connect_data (session, "request-queued", + G_CALLBACK (adblock_session_request_queued_cb), + pattern, (GClosureNotify)g_hash_table_destroy, 0); + } g_free (filename); } } @@ -367,6 +457,68 @@ adblock_activate_cb (MidoriExtension* extension, g_free (folder); } +#if G_ENABLE_DEBUG +static void +test_adblock_parse (void) +{ + g_assert (!adblock_parse_line (NULL)); + g_assert (!adblock_parse_line ("!")); + g_assert (!adblock_parse_line ("@@")); + g_assert (!adblock_parse_line ("##")); + g_assert (!adblock_parse_line ("[")); + + g_assert_cmpstr (adblock_parse_line ("*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/.*"); +} + +static void +test_adblock_pattern (void) +{ + gint temp; + gchar* filename; + GHashTable* pattern; + + 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/*.", + -1, NULL); + pattern = adblock_parse_file (filename); + + g_assert (g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, + "http://ads.foo.bar/teddy")); + g_assert (!g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, + "http://ads.fuu.bar/teddy")); + g_assert (g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, + "https://ads.bogus.name/blub")); + g_assert (g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, + "http://ads.bla.blub/kitty")); + g_assert (g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, + "http://ads.blub.boing/soda")); + g_assert (!g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, + "http://ads.foo.boing/beer")); + + g_hash_table_destroy (pattern); + close (temp); + g_unlink (filename); +} + +void +extension_test (void) +{ + g_test_add_func ("/extensions/adblock/parse", test_adblock_parse); + g_test_add_func ("/extensions/adblock/pattern", test_adblock_pattern); +} +#endif + MidoriExtension* extension_init (void) { diff --git a/extensions/colorful-tabs.c b/extensions/colorful-tabs.c index 0cd76368..69f584fd 100644 --- a/extensions/colorful-tabs.c +++ b/extensions/colorful-tabs.c @@ -72,7 +72,7 @@ static void colorful_tabs_button_toggled_cb (GtkWidget* button, MidoriExtension* extension) { - MidoriBrowser* browser = MIDORI_BROWSER (gtk_widget_get_toplevel (button)); + MidoriBrowser* browser = midori_browser_get_for_widget (button); midori_extension_set_boolean (extension, "tint", !midori_extension_get_boolean (extension, "tint")); @@ -96,7 +96,7 @@ colorful_tabs_deactivate_cb (MidoriExtension* extension, g_signal_handlers_disconnect_by_func ( extension, colorful_tabs_deactivate_cb, bbox); /* FIXME: Disconnect signals */ - midori_browser_foreach (MIDORI_BROWSER (gtk_widget_get_toplevel (bbox)), + midori_browser_foreach (midori_browser_get_for_widget (bbox), (GtkCallback)colorful_tabs_browser_foreach_cb, extension); gtk_widget_destroy (bbox); } diff --git a/extensions/cookie-manager/cookie-manager-page.c b/extensions/cookie-manager/cookie-manager-page.c index 9e73fe38..71df49df 100644 --- a/extensions/cookie-manager/cookie-manager-page.c +++ b/extensions/cookie-manager/cookie-manager-page.c @@ -28,22 +28,17 @@ typedef struct _CookieManagerPagePrivate CookieManagerPagePrivate; #define CM_EMPTY_LABEL_TEXT "\n\n\n\n\n\n" -enum -{ - COOKIE_MANAGER_COL_NAME, - COOKIE_MANAGER_COL_COOKIE, - COOKIE_MANAGER_COL_VISIBLE, - COOKIE_MANAGER_N_COLUMNS -}; - struct _CookieManagerPagePrivate { + CookieManager *parent; + GtkWidget *treeview; GtkTreeStore *store; GtkTreeModel *filter; GtkWidget *filter_entry; + gboolean ignore_changed_filter; GtkWidget *desc_label; GtkWidget *delete_button; @@ -53,11 +48,13 @@ struct _CookieManagerPagePrivate GtkWidget *toolbar; GtkWidget *popup_menu; +}; - GSList *cookies; - SoupCookieJar *jar; - guint timer_id; - gint ignore_changed_count; +enum +{ + PROP_0, + PROP_STORE, + PROP_PARENT }; @@ -69,7 +66,6 @@ static void cm_button_delete_all_clicked_cb(GtkToolButton *button, CookieManager static void cm_tree_popup_collapse_activate_cb(GtkMenuItem *item, CookieManagerPage *cmp); static void cm_tree_popup_expand_activate_cb(GtkMenuItem *item, CookieManagerPage *cmp); static void cm_filter_tree(CookieManagerPage *cmp, const gchar *filter_text); -static void cm_jar_changed_cb(SoupCookieJar *jar, SoupCookie *old, SoupCookie *new, CookieManagerPage *cmp); G_DEFINE_TYPE_WITH_CODE(CookieManagerPage, cookie_manager_page, GTK_TYPE_VBOX, @@ -90,22 +86,6 @@ static const gchar *cookie_manager_page_get_stock_id(MidoriViewable *viewable) } -static void cm_free_cookie_list(CookieManagerPage *cmp) -{ - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); - - if (priv->cookies != NULL) - { - GSList *l; - - for (l = priv->cookies; l != NULL; l = g_slist_next(l)) - soup_cookie_free(l->data); - g_slist_free(priv->cookies); - priv->cookies = NULL; - } -} - - static void cm_create_toolbar(CookieManagerPage *cmp) { CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); @@ -174,73 +154,19 @@ static void cookie_manager_page_viewable_iface_init(MidoriViewableIface* iface) } -static void cookie_manager_page_finalize(GObject *object) +static void cookie_manager_page_pre_cookies_change_cb(CookieManager *cm, CookieManagerPage *cmp) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(object); - - g_signal_handlers_disconnect_by_func(priv->jar, cm_jar_changed_cb, object); - - if (priv->timer_id > 0) - g_source_remove(priv->timer_id); - - cm_free_cookie_list(COOKIE_MANAGER_PAGE(object)); - - gtk_widget_destroy(priv->popup_menu); - - G_OBJECT_CLASS(cookie_manager_page_parent_class)->finalize(object); -} - - -static void cm_refresh_store(CookieManagerPage *cmp) -{ - GSList *l; - GHashTable *parents; - GtkTreeIter iter; - GtkTreeIter *parent_iter; - SoupCookie *cookie; - const gchar *filter_text; CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); g_object_ref(priv->filter); gtk_tree_view_set_model(GTK_TREE_VIEW(priv->treeview), NULL); +} - gtk_tree_store_clear(priv->store); - /* free the old list */ - cm_free_cookie_list(cmp); - - priv->cookies = soup_cookie_jar_all_cookies(priv->jar); - - /* Hashtable holds domain names as keys, the corresponding tree iters as values */ - parents = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); - - for (l = priv->cookies; l != NULL; l = g_slist_next(l)) - { - cookie = l->data; - - /* look for the parent item for the current domain name and create it if it doesn't exist */ - if ((parent_iter = (GtkTreeIter*) g_hash_table_lookup(parents, cookie->domain)) == NULL) - { - parent_iter = g_new0(GtkTreeIter, 1); - - gtk_tree_store_append(priv->store, parent_iter, NULL); - gtk_tree_store_set(priv->store, parent_iter, - COOKIE_MANAGER_COL_NAME, cookie->domain, - COOKIE_MANAGER_COL_COOKIE, NULL, - COOKIE_MANAGER_COL_VISIBLE, TRUE, - -1); - - g_hash_table_insert(parents, g_strdup(cookie->domain), parent_iter); - } - - gtk_tree_store_append(priv->store, &iter, parent_iter); - gtk_tree_store_set(priv->store, &iter, - COOKIE_MANAGER_COL_NAME, cookie->name, - COOKIE_MANAGER_COL_COOKIE, cookie, - COOKIE_MANAGER_COL_VISIBLE, TRUE, - -1); - } - g_hash_table_destroy(parents); +static void cookie_manager_page_cookies_changed_cb(CookieManager *cm, CookieManagerPage *cmp) +{ + const gchar *filter_text; + CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); gtk_tree_view_set_model(GTK_TREE_VIEW(priv->treeview), GTK_TREE_MODEL(priv->filter)); g_object_unref(priv->filter); @@ -255,32 +181,78 @@ static void cm_refresh_store(CookieManagerPage *cmp) } -static gboolean cm_delayed_refresh(CookieManagerPage *cmp) +static void cookie_manager_page_filter_changed_cb(CookieManager *cm, const gchar *text, + CookieManagerPage *cmp) { CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); - cm_refresh_store(cmp); - priv->timer_id = 0; - - return FALSE; + priv->ignore_changed_filter = TRUE; + gtk_entry_set_text(GTK_ENTRY(priv->filter_entry), text); + priv->ignore_changed_filter = FALSE; } -static void cm_jar_changed_cb(SoupCookieJar *jar, SoupCookie *old, SoupCookie *new, - CookieManagerPage *cmp) +static void cookie_manager_page_finalize(GObject *object) { - CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(object); - if (priv->ignore_changed_count > 0) + gtk_widget_destroy(priv->popup_menu); + + g_signal_handlers_disconnect_by_func(priv->parent, + cookie_manager_page_pre_cookies_change_cb, object); + g_signal_handlers_disconnect_by_func(priv->parent, + cookie_manager_page_cookies_changed_cb, object); + g_signal_handlers_disconnect_by_func(priv->parent, + cookie_manager_page_filter_changed_cb, object); + + G_OBJECT_CLASS(cookie_manager_page_parent_class)->finalize(object); +} + + +static void cookie_manager_page_set_property(GObject *object, guint prop_id, const GValue *value, + GParamSpec *pspec) +{ + CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(object); + switch (prop_id) { - priv->ignore_changed_count--; - return; - } + case PROP_STORE: + { + priv->store = g_value_get_object(value); - /* We delay these events a little bit to avoid too many rebuilds of the tree. - * Some websites (like Flyspray bugtrackers sent a whole bunch of cookies at once. */ - if (priv->timer_id == 0) - priv->timer_id = g_timeout_add_seconds(1, (GSourceFunc) cm_delayed_refresh, cmp); + /* setting filter and model */ + priv->filter = gtk_tree_model_filter_new(GTK_TREE_MODEL(priv->store), NULL); + gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(priv->filter), + COOKIE_MANAGER_COL_VISIBLE); + gtk_tree_view_set_model(GTK_TREE_VIEW(priv->treeview), GTK_TREE_MODEL(priv->filter)); + g_object_unref(priv->filter); + + break; + } + case PROP_PARENT: + { + if (priv->parent != NULL) + { + g_signal_handlers_disconnect_by_func(priv->parent, + cookie_manager_page_pre_cookies_change_cb, object); + g_signal_handlers_disconnect_by_func(priv->parent, + cookie_manager_page_cookies_changed_cb, object); + g_signal_handlers_disconnect_by_func(priv->parent, + cookie_manager_page_filter_changed_cb, object); + } + priv->parent = g_value_get_object(value); + + g_signal_connect(priv->parent, "pre-cookies-change", + G_CALLBACK(cookie_manager_page_pre_cookies_change_cb), object); + g_signal_connect(priv->parent, "cookies-changed", + G_CALLBACK(cookie_manager_page_cookies_changed_cb), object); + g_signal_connect(priv->parent, "filter-changed", + G_CALLBACK(cookie_manager_page_filter_changed_cb), object); + break; + } + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } } @@ -288,7 +260,27 @@ static void cookie_manager_page_class_init(CookieManagerPageClass *klass) { GObjectClass *g_object_class; g_object_class = G_OBJECT_CLASS(klass); + g_object_class->finalize = cookie_manager_page_finalize; + g_object_class->set_property = cookie_manager_page_set_property; + + g_object_class_install_property(g_object_class, + PROP_STORE, + g_param_spec_object( + "store", + "Treestore", + "The tree store", + GTK_TYPE_TREE_STORE, + G_PARAM_WRITABLE)); + + g_object_class_install_property(g_object_class, + PROP_PARENT, + g_param_spec_object( + "parent", + "Parent", + "The CookieManager parent instance", + COOKIE_MANAGER_TYPE, + G_PARAM_WRITABLE)); g_type_class_add_private(klass, sizeof(CookieManagerPagePrivate)); } @@ -346,13 +338,7 @@ static void cm_delete_cookie(CookieManagerPage *cmp, GtkTreeModel *model, GtkTre gtk_tree_model_get(model, child, COOKIE_MANAGER_COL_COOKIE, &cookie, -1); - if (cookie != NULL) - { - priv->ignore_changed_count++; - - soup_cookie_jar_delete_cookie(priv->jar, cookie); - /* the SoupCookie object is freed when the whole list gets updated */ - } + cookie_manager_delete_cookie(priv->parent, cookie); } @@ -670,11 +656,17 @@ static void cm_filter_tree(CookieManagerPage *cmp, const gchar *filter_text) static void cm_filter_entry_changed_cb(GtkEditable *editable, CookieManagerPage *cmp) { - const gchar *text = gtk_entry_get_text(GTK_ENTRY(editable)); + const gchar *text; CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(cmp); + if (priv->ignore_changed_filter) + return; + + text = gtk_entry_get_text(GTK_ENTRY(editable)); cm_filter_tree(cmp, text); + cookie_manager_update_filter(priv->parent, text); + if (*text != '\0') gtk_tree_view_expand_all(GTK_TREE_VIEW(priv->treeview)); else @@ -830,20 +822,6 @@ static GtkWidget *cm_tree_prepare(CookieManagerPage *cmp) sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); - /* create the main store */ - priv->store = gtk_tree_store_new(COOKIE_MANAGER_N_COLUMNS, - G_TYPE_STRING, SOUP_TYPE_COOKIE, G_TYPE_BOOLEAN); - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(priv->store), - COOKIE_MANAGER_COL_NAME, GTK_SORT_ASCENDING); - - /* setting filter and model */ - priv->filter = gtk_tree_model_filter_new(GTK_TREE_MODEL(priv->store), NULL); - gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(priv->filter), - COOKIE_MANAGER_COL_VISIBLE); - gtk_tree_view_set_model(GTK_TREE_VIEW(priv->treeview), GTK_TREE_MODEL(priv->filter)); - g_object_unref(priv->store); - g_object_unref(priv->filter); - /* signals */ g_signal_connect(sel, "changed", G_CALLBACK(cm_tree_selection_changed_cb), cmp); g_signal_connect(treeview, "button-press-event", G_CALLBACK(cm_tree_button_press_event_cb), cmp); @@ -909,9 +887,12 @@ static void cookie_manager_page_init(CookieManagerPage *self) GtkWidget *filter_hbox; GtkWidget *filter_label; GtkWidget *treeview; - SoupSession *session; CookieManagerPagePrivate *priv = COOKIE_MANAGER_PAGE_GET_PRIVATE(self); + priv->parent = NULL; + priv->store = NULL; + priv->ignore_changed_filter = FALSE; + cm_create_toolbar(self); priv->desc_label = gtk_label_new(CM_EMPTY_LABEL_TEXT); @@ -968,18 +949,19 @@ static void cookie_manager_page_init(CookieManagerPage *self) gtk_box_pack_start(GTK_BOX(self), filter_hbox, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(self), paned, TRUE, TRUE, 0); - - /* setup soup */ - session = webkit_get_default_session(); - priv->jar = SOUP_COOKIE_JAR(soup_session_get_feature(session, soup_cookie_jar_get_type())); - g_signal_connect(priv->jar, "changed", G_CALLBACK(cm_jar_changed_cb), self); - - cm_refresh_store(self); } -GtkWidget *cookie_manager_page_new(void) +GtkWidget *cookie_manager_page_new(CookieManager *parent, GtkTreeStore *store, + const gchar *filter_text) { - return g_object_new(COOKIE_MANAGER_PAGE_TYPE, NULL); + GtkWidget *cmp; + + cmp = g_object_new(COOKIE_MANAGER_PAGE_TYPE, "parent", parent, "store", store, NULL); + + if (filter_text != NULL) + cookie_manager_page_filter_changed_cb(parent, filter_text, COOKIE_MANAGER_PAGE(cmp)); + + return cmp; } diff --git a/extensions/cookie-manager/cookie-manager-page.h b/extensions/cookie-manager/cookie-manager-page.h index 37e02c0d..7c307d1e 100644 --- a/extensions/cookie-manager/cookie-manager-page.h +++ b/extensions/cookie-manager/cookie-manager-page.h @@ -38,7 +38,9 @@ struct _CookieManagerPageClass }; GType cookie_manager_page_get_type (void); -GtkWidget* cookie_manager_page_new (void); +GtkWidget* cookie_manager_page_new (CookieManager *parent, + GtkTreeStore *store, + const gchar *filter_text); G_END_DECLS diff --git a/extensions/cookie-manager/cookie-manager.c b/extensions/cookie-manager/cookie-manager.c index 38d557a6..dc256722 100644 --- a/extensions/cookie-manager/cookie-manager.c +++ b/extensions/cookie-manager/cookie-manager.c @@ -16,115 +16,324 @@ #include "cookie-manager.h" #include "cookie-manager-page.h" +typedef struct _CookieManagerPrivate CookieManagerPrivate; +#define COOKIE_MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj),\ + COOKIE_MANAGER_TYPE, CookieManagerPrivate)) -typedef struct +struct _CookieManager +{ + GObject parent; +}; + +struct _CookieManagerClass +{ + GObjectClass parent_class; +}; + +struct _CookieManagerPrivate { MidoriApp *app; - MidoriBrowser *browser; MidoriExtension *extension; - GtkWidget *panel_page; -} CMData; -static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext); -static void cm_deactivate_cb(MidoriExtension *extension, CMData *cmdata); + GSList *panel_pages; + GtkTreeStore *store; + GSList *cookies; + SoupCookieJar *jar; + guint timer_id; + gint ignore_changed_count; + gchar *filter_text; +}; -static void cm_browser_close_cb(GtkObject *browser, CMData *cmdata) +static void cookie_manager_finalize(GObject *object); +static void cookie_manager_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, + CookieManager *cm); + +enum { - g_signal_handlers_disconnect_by_func(cmdata->extension, cm_deactivate_cb, cmdata); - g_signal_handlers_disconnect_by_func(cmdata->browser, cm_browser_close_cb, cmdata); + COOKIES_CHANGED, + PRE_COOKIES_CHANGE, + FILTER_CHANGED, - /* the panel_page widget gets destroyed automatically when a browser is closed but not - * when the extension is deactivated */ - if (cmdata->panel_page != NULL && IS_COOKIE_MANAGER_PAGE(cmdata->panel_page)) - gtk_widget_destroy(cmdata->panel_page); + LAST_SIGNAL +}; +static guint signals[LAST_SIGNAL]; - g_free(cmdata); + +G_DEFINE_TYPE(CookieManager, cookie_manager, G_TYPE_OBJECT); + + +static void cookie_manager_class_init(CookieManagerClass *klass) +{ + GObjectClass *g_object_class; + + g_object_class = G_OBJECT_CLASS(klass); + + g_object_class->finalize = cookie_manager_finalize; + + signals[COOKIES_CHANGED] = g_signal_new( + "cookies-changed", + G_TYPE_FROM_CLASS(klass), + (GSignalFlags) 0, + 0, + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + signals[PRE_COOKIES_CHANGE] = g_signal_new( + "pre-cookies-change", + G_TYPE_FROM_CLASS(klass), + (GSignalFlags) 0, + 0, + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + signals[FILTER_CHANGED] = g_signal_new( + "filter-changed", + G_TYPE_FROM_CLASS(klass), + (GSignalFlags) 0, + 0, + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); + + g_type_class_add_private(klass, sizeof(CookieManagerPrivate)); } -static void cm_deactivate_cb(MidoriExtension *extension, CMData *cmdata) +static void cookie_manager_panel_pages_foreach(gpointer ptr, gpointer data) { - g_signal_handlers_disconnect_by_func(cmdata->app, cm_app_add_browser_cb, extension); - cm_browser_close_cb(NULL, cmdata); + if (ptr != NULL && GTK_IS_WIDGET(ptr)) + gtk_widget_destroy(GTK_WIDGET(ptr)); } -static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext) +static void cookie_manager_page_destroy_cb(GtkObject *page, CookieManager *cm) { - GtkWidget *panel; + CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + + priv->panel_pages = g_slist_remove(priv->panel_pages, page); +} + + +static void cookie_manager_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, + CookieManager *cm) +{ + MidoriPanel *panel; GtkWidget *page; - CMData *cmdata; + CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); panel = katze_object_get_object(browser, "panel"); - page = cookie_manager_page_new(); + page = cookie_manager_page_new(cm, priv->store, priv->filter_text); gtk_widget_show(page); - midori_panel_append_page(MIDORI_PANEL(panel), MIDORI_VIEWABLE(page)); + midori_panel_append_page(panel, MIDORI_VIEWABLE(page)); + g_signal_connect(page, "destroy", G_CALLBACK(cookie_manager_page_destroy_cb), cm); - cmdata = g_new0(CMData, 1); - cmdata->app = app; - cmdata->browser = browser; - cmdata->extension = ext; - cmdata->panel_page = page; - - g_signal_connect(browser, "destroy", G_CALLBACK(cm_browser_close_cb), cmdata); - g_signal_connect(ext, "deactivate", G_CALLBACK(cm_deactivate_cb), cmdata); + priv->panel_pages = g_slist_append(priv->panel_pages, page); g_object_unref(panel); } -static void cm_activate_cb(MidoriExtension *extension, MidoriApp *app, gpointer data) +static void cookie_manager_free_cookie_list(CookieManager *cm) { + CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + + if (priv->cookies != NULL) + { + GSList *l; + + for (l = priv->cookies; l != NULL; l = g_slist_next(l)) + soup_cookie_free(l->data); + g_slist_free(priv->cookies); + priv->cookies = NULL; + } +} + + +static void cookie_manager_refresh_store(CookieManager *cm) +{ + GSList *l; + GHashTable *parents; + GtkTreeIter iter; + GtkTreeIter *parent_iter; + SoupCookie *cookie; + CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + + g_signal_emit(cm, signals[PRE_COOKIES_CHANGE], 0); + + gtk_tree_store_clear(priv->store); + + /* free the old list */ + cookie_manager_free_cookie_list(cm); + + priv->cookies = soup_cookie_jar_all_cookies(priv->jar); + + /* Hashtable holds domain names as keys, the corresponding tree iters as values */ + parents = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); + + for (l = priv->cookies; l != NULL; l = g_slist_next(l)) + { + cookie = l->data; + + /* look for the parent item for the current domain name and create it if it doesn't exist */ + if ((parent_iter = (GtkTreeIter*) g_hash_table_lookup(parents, cookie->domain)) == NULL) + { + parent_iter = g_new0(GtkTreeIter, 1); + + gtk_tree_store_append(priv->store, parent_iter, NULL); + gtk_tree_store_set(priv->store, parent_iter, + COOKIE_MANAGER_COL_NAME, cookie->domain, + COOKIE_MANAGER_COL_COOKIE, NULL, + COOKIE_MANAGER_COL_VISIBLE, TRUE, + -1); + + g_hash_table_insert(parents, g_strdup(cookie->domain), parent_iter); + } + + gtk_tree_store_append(priv->store, &iter, parent_iter); + gtk_tree_store_set(priv->store, &iter, + COOKIE_MANAGER_COL_NAME, cookie->name, + COOKIE_MANAGER_COL_COOKIE, cookie, + COOKIE_MANAGER_COL_VISIBLE, TRUE, + -1); + } + g_hash_table_destroy(parents); + + g_signal_emit(cm, signals[COOKIES_CHANGED], 0); +} + + +static gboolean cookie_manager_delayed_refresh(CookieManager *cm) +{ + CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + + cookie_manager_refresh_store(cm); + priv->timer_id = 0; + + return FALSE; +} + + +static void cookie_manager_jar_changed_cb(SoupCookieJar *jar, SoupCookie *old, SoupCookie *new, + CookieManager *cm) +{ + CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + + if (priv->ignore_changed_count > 0) + { + priv->ignore_changed_count--; + return; + } + + /* We delay these events a little bit to avoid too many rebuilds of the tree. + * Some websites (like Flyspray bugtrackers sent a whole bunch of cookies at once. */ + if (priv->timer_id == 0) + priv->timer_id = g_timeout_add_seconds(1, (GSourceFunc) cookie_manager_delayed_refresh, cm); +} + + +static void cookie_manager_finalize(GObject *object) +{ + CookieManager *cm = COOKIE_MANAGER(object); + CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + + g_signal_handlers_disconnect_by_func(priv->app, cookie_manager_app_add_browser_cb, cm); + g_signal_handlers_disconnect_by_func(priv->jar, cookie_manager_jar_changed_cb, cm); + + /* remove all panel pages from open windows */ + g_slist_foreach(priv->panel_pages, cookie_manager_panel_pages_foreach, NULL); + g_slist_free(priv->panel_pages); + + /* clean cookies */ + if (priv->timer_id > 0) + g_source_remove(priv->timer_id); + + cookie_manager_free_cookie_list(cm); + + g_object_unref(priv->store); + g_free(priv->filter_text); + + G_OBJECT_CLASS(cookie_manager_parent_class)->finalize(object); +} + + +static void cookie_manager_init(CookieManager *self) +{ + CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(self); + SoupSession *session; + + priv->filter_text = NULL; + priv->panel_pages = NULL; + /* create the main store */ + priv->store = gtk_tree_store_new(COOKIE_MANAGER_N_COLUMNS, + G_TYPE_STRING, SOUP_TYPE_COOKIE, G_TYPE_BOOLEAN); + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(priv->store), + COOKIE_MANAGER_COL_NAME, GTK_SORT_ASCENDING); + + /* setup soup */ + session = webkit_get_default_session(); + priv->jar = SOUP_COOKIE_JAR(soup_session_get_feature(session, soup_cookie_jar_get_type())); + g_signal_connect(priv->jar, "changed", G_CALLBACK(cookie_manager_jar_changed_cb), self); + + cookie_manager_refresh_store(self); +} + + +void cookie_manager_update_filter(CookieManager *cm, const gchar *text) +{ + CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + + katze_assign(priv->filter_text, g_strdup(text)); + + g_signal_emit(cm, signals[FILTER_CHANGED], 0, text); +} + + +void cookie_manager_delete_cookie(CookieManager *cm, SoupCookie *cookie) +{ + CookieManagerPrivate *priv = COOKIE_MANAGER_GET_PRIVATE(cm); + + if (cookie != NULL) + { + priv->ignore_changed_count++; + + soup_cookie_jar_delete_cookie(priv->jar, cookie); + /* the SoupCookie object is freed when the whole list gets updated */ + } +} + + +CookieManager *cookie_manager_new(MidoriExtension *extension, MidoriApp *app) +{ + CookieManager *cm; + CookieManagerPrivate *priv; guint i; KatzeArray *browsers; MidoriBrowser *browser; + cm = g_object_new(COOKIE_MANAGER_TYPE, NULL); + + priv = COOKIE_MANAGER_GET_PRIVATE(cm); + priv->app = app; + priv->extension = extension; + /* add the cookie manager panel page to existing browsers */ browsers = katze_object_get_object(app, "browsers"); i = 0; while ((browser = katze_array_get_nth_item(browsers, i++))) - cm_app_add_browser_cb(app, browser, extension); + cookie_manager_app_add_browser_cb(app, browser, cm); g_object_unref(browsers); - g_signal_connect(app, "add-browser", G_CALLBACK(cm_app_add_browser_cb), extension); + g_signal_connect(app, "add-browser", G_CALLBACK(cookie_manager_app_add_browser_cb), cm); + + return cm; } - -MidoriExtension *extension_init(void) -{ - MidoriExtension *extension; - GtkIconFactory *factory; - GtkIconSource *icon_source; - GtkIconSet *icon_set; - static GtkStockItem items[] = - { - { STOCK_COOKIE_MANAGER, N_("_Cookie Manager"), 0, 0, NULL } - }; - - factory = gtk_icon_factory_new(); - gtk_stock_add(items, G_N_ELEMENTS(items)); - icon_set = gtk_icon_set_new(); - icon_source = gtk_icon_source_new(); - gtk_icon_source_set_icon_name(icon_source, GTK_STOCK_DIALOG_AUTHENTICATION); - gtk_icon_set_add_source(icon_set, icon_source); - gtk_icon_source_free(icon_source); - gtk_icon_factory_add(factory, STOCK_COOKIE_MANAGER, icon_set); - gtk_icon_set_unref(icon_set); - gtk_icon_factory_add_default(factory); - g_object_unref(factory); - - extension = g_object_new(MIDORI_TYPE_EXTENSION, - "name", _("Cookie Manager"), - "description", _("List, view and delete cookies"), - "version", "0.2", - "authors", "Enrico Tröger ", - NULL); - - g_signal_connect(extension, "activate", G_CALLBACK(cm_activate_cb), NULL); - - return extension; -} diff --git a/extensions/cookie-manager/cookie-manager.h b/extensions/cookie-manager/cookie-manager.h index 9f6a3996..4e2ba32b 100644 --- a/extensions/cookie-manager/cookie-manager.h +++ b/extensions/cookie-manager/cookie-manager.h @@ -13,8 +13,38 @@ #ifndef __COOKIE_MANAGER_H__ #define __COOKIE_MANAGER_H__ +G_BEGIN_DECLS #define STOCK_COOKIE_MANAGER "cookie-manager" +enum +{ + COOKIE_MANAGER_COL_NAME, + COOKIE_MANAGER_COL_COOKIE, + COOKIE_MANAGER_COL_VISIBLE, + COOKIE_MANAGER_N_COLUMNS +}; -#endif /* __COOKIE_MANAGER_H__ */ + +#define COOKIE_MANAGER_TYPE (cookie_manager_get_type()) +#define COOKIE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\ + COOKIE_MANAGER_TYPE, CookieManager)) +#define COOKIE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),\ + COOKIE_MANAGER_TYPE, CookieManagerClass)) +#define IS_COOKIE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),\ + COOKIE_MANAGER_TYPE)) +#define IS_COOKIE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),\ + COOKIE_MANAGER_TYPE)) + +typedef struct _CookieManager CookieManager; +typedef struct _CookieManagerClass CookieManagerClass; + +GType cookie_manager_get_type (void); +CookieManager* cookie_manager_new (MidoriExtension *extension, MidoriApp *app); + +void cookie_manager_delete_cookie(CookieManager *cm, SoupCookie *cookie); +void cookie_manager_update_filter(CookieManager *cm, const gchar *text); + +G_END_DECLS + +#endif /* __COOKIE-MANAGER_H__ */ diff --git a/extensions/cookie-manager/main.c b/extensions/cookie-manager/main.c new file mode 100644 index 00000000..39d058e9 --- /dev/null +++ b/extensions/cookie-manager/main.c @@ -0,0 +1,66 @@ +/* + Copyright (C) 2009 Enrico Tröger + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "config.h" +#include + +#include "cookie-manager.h" + +CookieManager *cm = NULL; + + +static void cm_deactivate_cb(MidoriExtension *extension, gpointer data) +{ + g_object_unref(cm); +} + + +static void cm_activate_cb(MidoriExtension *extension, MidoriApp *app, gpointer data) +{ + cm = cookie_manager_new(extension, app); +} + + +MidoriExtension *extension_init(void) +{ + MidoriExtension *extension; + GtkIconFactory *factory; + GtkIconSource *icon_source; + GtkIconSet *icon_set; + static GtkStockItem items[] = + { + { STOCK_COOKIE_MANAGER, N_("_Cookie Manager"), 0, 0, NULL } + }; + + factory = gtk_icon_factory_new(); + gtk_stock_add(items, G_N_ELEMENTS(items)); + icon_set = gtk_icon_set_new(); + icon_source = gtk_icon_source_new(); + gtk_icon_source_set_icon_name(icon_source, GTK_STOCK_DIALOG_AUTHENTICATION); + gtk_icon_set_add_source(icon_set, icon_source); + gtk_icon_source_free(icon_source); + gtk_icon_factory_add(factory, STOCK_COOKIE_MANAGER, icon_set); + gtk_icon_set_unref(icon_set); + gtk_icon_factory_add_default(factory); + g_object_unref(factory); + + extension = g_object_new(MIDORI_TYPE_EXTENSION, + "name", _("Cookie Manager"), + "description", _("List, view and delete cookies"), + "version", "0.2", + "authors", "Enrico Tröger ", + NULL); + + g_signal_connect(extension, "activate", G_CALLBACK(cm_activate_cb), NULL); + g_signal_connect(extension, "deactivate", G_CALLBACK(cm_deactivate_cb), NULL); + + return extension; +} diff --git a/extensions/mouse-gestures/main.c b/extensions/mouse-gestures/main.c index b7e2b251..1e8707b7 100644 --- a/extensions/mouse-gestures/main.c +++ b/extensions/mouse-gestures/main.c @@ -44,7 +44,7 @@ static gboolean mouse_gestures_handle_events (GtkWidget *widget, MidoriBrowser *browser) { /* A button was pressed */ - if (event->type == GDK_BUTTON_PRESS) + if (event->type == GDK_BUTTON_PRESS && event->button.button == 2) { /* If the gesture was previously cleaned, start a new gesture and coordinates */ if (gesture->last == MOUSE_BUTTON_UNSET) @@ -75,7 +75,7 @@ static gboolean mouse_gestures_handle_events (GtkWidget *widget, (gesture->middle.y - y < DEVIANCE && gesture->middle.y - y > -DEVIANCE)) { gesture->end.x = x; - gesture->end.y = y; + gesture->end.y = y; } } @@ -91,9 +91,9 @@ static gboolean mouse_gestures_handle_events (GtkWidget *widget, (gesture->middle.x - gesture->start.x > -DEVIANCE)) { /* We initially moved down more than MINLENGTH pixels */ - if (gesture->middle.y > gesture->start.y + MINLENGTH) - { - /* Then we the final vertical move is between the bounds and + if (gesture->middle.y > gesture->start.y + MINLENGTH) + { + /* Then we the final vertical move is between the bounds and we moved right more than MINLENGTH pixels */ if ((gesture->middle.y - gesture->end.y < DEVIANCE) && (gesture->middle.y - gesture->end.y > -DEVIANCE) && @@ -119,8 +119,8 @@ static gboolean mouse_gestures_handle_events (GtkWidget *widget, } } /* We initially moved up more than MINLENGTH pixels */ - else if (gesture->middle.y + MINLENGTH < gesture->start.y) - { + else if (gesture->middle.y + MINLENGTH < gesture->start.y) + { /* The end node was never updated, we only did a vertical move */ if (gesture->end.y == 0 && gesture->end.x == 0) { @@ -145,7 +145,7 @@ static gboolean mouse_gestures_handle_events (GtkWidget *widget, } /* We initially moved left more than MINLENGTH pixels */ else if (gesture->middle.x + MINLENGTH < gesture->start.x) - { + { /* The end node was never updated, we only did an horizontal move */ if (gesture->end.x == 0 && gesture->end.y == 0) { @@ -156,7 +156,7 @@ static gboolean mouse_gestures_handle_events (GtkWidget *widget, } } - mouse_gesture_clear (gesture); + mouse_gesture_clear (gesture); return TRUE; } @@ -177,32 +177,25 @@ static void mouse_gestures_browser_cb (MidoriApp *app, MidoriBrowser *browser) static void mouse_gestures_deactivate (MidoriExtension *extension, MidoriApp *app) { gulong signal_id; - KatzeArray *browsers; + KatzeArray* browsers; + MidoriBrowser* browser; guint i; - gint j; - GtkWidget *notebook; - signal_id = - g_signal_handler_find (app, G_SIGNAL_MATCH_FUNC, - 0, 0, NULL, - mouse_gestures_browser_cb, NULL); + signal_id = g_signal_handler_find (app, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, + mouse_gestures_browser_cb, NULL); - if(signal_id != 0) + if (signal_id != 0) g_signal_handler_disconnect (app, signal_id); browsers = katze_object_get_object (app, "browsers"); - - for (i = 0; i < katze_array_get_length (browsers); i++) + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) { - MidoriBrowser *browser; - - browser = katze_array_get_nth_item (browsers, i); - - signal_id = - g_signal_handler_find (browser, G_SIGNAL_MATCH_FUNC, - 0, 0, NULL, - mouse_gestures_tab_cb, NULL); + gint j; + GtkWidget* notebook; + signal_id = g_signal_handler_find (browser, G_SIGNAL_MATCH_FUNC, + 0, 0, NULL, mouse_gestures_tab_cb, NULL); if (signal_id != 0) g_signal_handler_disconnect (browser, signal_id); @@ -212,15 +205,14 @@ static void mouse_gestures_deactivate (MidoriExtension *extension, MidoriApp *ap { GtkWidget *page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), j); - signal_id = - g_signal_handler_find (page, G_SIGNAL_MATCH_FUNC, - 0, 0, NULL, - mouse_gestures_handle_events, NULL); + signal_id = g_signal_handler_find (page, G_SIGNAL_MATCH_FUNC, + 0, 0, NULL, mouse_gestures_handle_events, NULL); if (signal_id != 0) g_signal_handler_disconnect (page, signal_id); } } + g_object_unref (browsers); g_signal_handlers_disconnect_by_func (extension, mouse_gestures_deactivate, app); g_free (gesture); diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c new file mode 100644 index 00000000..741e73aa --- /dev/null +++ b/extensions/shortcuts.c @@ -0,0 +1,305 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include + +#include +#include "config.h" + +static void +shortcuts_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension); + +static void +shortcuts_deactivate_cb (MidoriExtension* extension, + GtkWidget* menuitem) +{ + MidoriApp* app = midori_extension_get_app (extension); + + gtk_widget_destroy (menuitem); + g_signal_handlers_disconnect_by_func ( + extension, shortcuts_deactivate_cb, menuitem); + g_signal_handlers_disconnect_by_func ( + app, shortcuts_app_add_browser_cb, extension); +} + +static void +shortcuts_preferences_render_text (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + MidoriExtension* extension) +{ + GtkAction* action; + gchar* label; + gchar* stripped; + + gtk_tree_model_get (model, iter, 0, &action, -1); + if ((label = katze_object_get_string (action, "label"))) + stripped = katze_strip_mnemonics (label); + else + { + GtkStockItem item; + g_object_get (action, "stock-id", &label, NULL); + if (gtk_stock_lookup (label, &item)) + stripped = katze_strip_mnemonics (item.label); + else + stripped = g_strdup (""); + } + g_free (label); + g_object_set (renderer, "text", stripped, NULL); + g_free (stripped); + g_object_unref (action); +} + +static void +shortcuts_preferences_render_accel (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + MidoriExtension* extension) +{ + GtkAction* action; + const gchar* accel_path; + GtkAccelKey key; + + gtk_tree_model_get (model, iter, 0, &action, -1); + accel_path = gtk_action_get_accel_path (action); + if (accel_path) + { + if (gtk_accel_map_lookup_entry (accel_path, &key)) + { + if (key.accel_key) + g_object_set (renderer, + "accel-key", key.accel_key, + "accel-mods", key.accel_mods, + NULL); + else + g_object_set (renderer, "text", _("None"), NULL); + } + g_object_set (renderer, "sensitive", TRUE, "editable", TRUE, NULL); + } + else + g_object_set (renderer, "text", "", "sensitive", FALSE, NULL); + g_object_unref (action); +} + +static void +shortcuts_accel_edited_cb (GtkCellRenderer* renderer, + const gchar* tree_path, + guint accel_key, + GdkModifierType accel_mods, + guint keycode, + GtkTreeModel* model) +{ + GtkTreeIter iter; + + if (gtk_tree_model_get_iter_from_string (model, &iter, tree_path)) + { + GtkAction* action; + const gchar* accel_path; + + gtk_tree_model_get (model, &iter, 0, &action, -1); + accel_path = gtk_action_get_accel_path (action); + gtk_accel_map_change_entry (accel_path, accel_key, accel_mods, TRUE); + + g_object_unref (action); + } +} + +static void +shortcuts_accel_cleared_cb (GtkCellRenderer* renderer, + const gchar* tree_path, + GtkTreeModel* model) +{ + GtkTreeIter iter; + + if (gtk_tree_model_get_iter_from_string (model, &iter, tree_path)) + { + GtkAction* action; + const gchar* accel_path; + + gtk_tree_model_get (model, &iter, 0, &action, -1); + accel_path = gtk_action_get_accel_path (action); + gtk_accel_map_change_entry (accel_path, 0, 0, FALSE); + + g_object_unref (action); + } +} + +static GtkWidget* +shortcuts_get_preferences_dialog (MidoriExtension* extension) +{ + MidoriApp* app; + GtkWidget* browser; + const gchar* dialog_title; + GtkWidget* dialog; + gint width, height; + GtkWidget* xfce_heading; + GtkWidget* hbox; + GtkListStore* liststore; + GtkWidget* treeview; + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_text; + GtkCellRenderer* renderer_accel; + GtkWidget* scrolled; + GtkActionGroup* action_group; + GList* actions; + guint i; + GtkAction* action; + #if HAVE_OSX + GtkWidget* icon; + #endif + + app = midori_extension_get_app (extension); + browser = katze_object_get_object (app, "browser"); + + dialog_title = _("Configure 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 + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, + #endif + NULL); + g_signal_connect (dialog, "destroy", + G_CALLBACK (gtk_widget_destroyed), &dialog); + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); + sokoke_widget_get_text_size (dialog, "M", &width, &height); + gtk_window_set_default_size (GTK_WINDOW (dialog), width * 52, height * 24); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); + if ((xfce_heading = sokoke_xfce_header_new ( + gtk_window_get_icon_name (GTK_WINDOW (dialog)), dialog_title))) + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + xfce_heading, FALSE, FALSE, 0); + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, + TRUE, TRUE, 12); + liststore = gtk_list_store_new (1, GTK_TYPE_ACTION); + treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)shortcuts_preferences_render_text, + extension, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + column = gtk_tree_view_column_new (); + renderer_accel = gtk_cell_renderer_accel_new (); + gtk_tree_view_column_pack_start (column, renderer_accel, TRUE); + gtk_tree_view_column_set_cell_data_func (column, renderer_accel, + (GtkTreeCellDataFunc)shortcuts_preferences_render_accel, + extension, NULL); + g_signal_connect (renderer_accel, "accel-edited", + G_CALLBACK (shortcuts_accel_edited_cb), liststore); + g_signal_connect (renderer_accel, "accel-cleared", + G_CALLBACK (shortcuts_accel_cleared_cb), liststore); + gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + scrolled = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_container_add (GTK_CONTAINER (scrolled), treeview); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), + GTK_SHADOW_IN); + gtk_box_pack_start (GTK_BOX (hbox), scrolled, TRUE, TRUE, 5); + + action_group = midori_browser_get_action_group (MIDORI_BROWSER (browser)); + actions = gtk_action_group_list_actions (action_group); + i = 0; + /* FIXME: Catch added and removed actions */ + while ((action = g_list_nth_data (actions, i++))) + gtk_list_store_insert_with_values (GTK_LIST_STORE (liststore), + NULL, G_MAXINT, 0, action, -1); + g_list_free (actions); + + g_object_unref (liststore); + + gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); + + g_object_unref (browser); + + return dialog; +} + +static void +shortcuts_menu_configure_shortcuts_activate_cb (GtkWidget* menuitem, + MidoriExtension* extension) +{ + static GtkWidget* dialog = NULL; + + if (!dialog) + { + dialog = shortcuts_get_preferences_dialog (extension); + g_signal_connect (dialog, "destroy", + G_CALLBACK (gtk_widget_destroyed), &dialog); + gtk_widget_show (dialog); + } + else + gtk_window_present (GTK_WINDOW (dialog)); +} + +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 (extension, "deactivate", + G_CALLBACK (shortcuts_deactivate_cb), menuitem); +} + +static void +shortcuts_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + KatzeArray* browsers; + MidoriBrowser* browser; + guint i; + + browsers = katze_object_get_object (app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) + shortcuts_app_add_browser_cb (app, browser, extension); + g_signal_connect (app, "add-browser", + G_CALLBACK (shortcuts_app_add_browser_cb), extension); + g_object_unref (browsers); +} + +MidoriExtension* +extension_init (void) +{ + MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", _("Shortcuts"), + "description", _("View and edit keyboard shortcuts"), + "version", "0.1", + "authors", "Christian Dywan ", + NULL); + + g_signal_connect (extension, "activate", + G_CALLBACK (shortcuts_activate_cb), NULL); + + return extension; +} diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index ede0798a..58b99fa4 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,13 +16,45 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, MidoriExtension* extension); +static void +statusbar_features_toolbar_notify_toolbar_style_cb (GtkWidget* toolbar, + GParamSpec* pspec, + GtkWidget* button) +{ + GtkToolbarStyle style = katze_object_get_enum (toolbar, "toolbar-style"); + const gchar* text = g_object_get_data (G_OBJECT (button), "feature-label"); + switch (style) + { + case GTK_TOOLBAR_BOTH: + case GTK_TOOLBAR_BOTH_HORIZ: + gtk_button_set_label (GTK_BUTTON (button), text); + gtk_widget_show (gtk_button_get_image (GTK_BUTTON (button))); + break; + case GTK_TOOLBAR_TEXT: + gtk_button_set_label (GTK_BUTTON (button), text); + gtk_widget_hide (gtk_button_get_image (GTK_BUTTON (button))); + break; + case GTK_TOOLBAR_ICONS: + gtk_button_set_label (GTK_BUTTON (button), ""); + gtk_widget_show (gtk_button_get_image (GTK_BUTTON (button))); + break; + default: + g_assert_not_reached (); + } +} + static void statusbar_features_deactivate_cb (MidoriExtension* extension, GtkWidget* bbox) { MidoriApp* app = midori_extension_get_app (extension); + MidoriBrowser* browser = midori_browser_get_for_widget (bbox); + GtkWidget* toolbar = katze_object_get_object (browser, "navigationbar"); gtk_widget_destroy (bbox); + g_signal_handlers_disconnect_matched (toolbar, G_SIGNAL_MATCH_FUNC, + 0, -1, NULL, statusbar_features_toolbar_notify_toolbar_style_cb, NULL); + g_object_unref (toolbar); g_signal_handlers_disconnect_by_func ( extension, statusbar_features_deactivate_cb, bbox); g_signal_handlers_disconnect_by_func ( @@ -37,6 +69,7 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, GtkWidget* statusbar; GtkWidget* bbox; MidoriWebSettings* settings; + GtkWidget* toolbar; GtkWidget* button; GtkWidget* image; @@ -46,36 +79,47 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, statusbar = katze_object_get_object (browser, "statusbar"); bbox = gtk_hbox_new (FALSE, 0); settings = katze_object_get_object (browser, "settings"); + toolbar = katze_object_get_object (browser, "navigationbar"); button = katze_property_proxy (settings, "auto-load-images", "toggle"); + g_object_set_data (G_OBJECT (button), "feature-label", _("Images")); image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU); - gtk_widget_show (image); - gtk_container_add (GTK_CONTAINER (button), image); + gtk_button_set_image (GTK_BUTTON (button), image); #if GTK_CHECK_VERSION(2, 12, 0) gtk_widget_set_tooltip_text (button, _("Load images automatically")); #endif + statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button); + g_signal_connect (toolbar, "notify::toolbar-style", + G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); gtk_widget_show (button); button = katze_property_proxy (settings, "enable-scripts", "toggle"); + g_object_set_data (G_OBJECT (button), "feature-label", _("Scripts")); image = gtk_image_new_from_stock (STOCK_SCRIPTS, GTK_ICON_SIZE_MENU); - gtk_widget_show (image); - gtk_container_add (GTK_CONTAINER (button), image); + gtk_button_set_image (GTK_BUTTON (button), image); #if GTK_CHECK_VERSION(2, 12, 0) gtk_widget_set_tooltip_text (button, _("Enable scripts")); #endif + statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button); + g_signal_connect (toolbar, "notify::toolbar-style", + G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); gtk_widget_show (button); button = katze_property_proxy (settings, "enable-plugins", "toggle"); + g_object_set_data (G_OBJECT (button), "feature-label", _("Netscape plugins")); image = gtk_image_new_from_stock (STOCK_PLUGINS, GTK_ICON_SIZE_MENU); - gtk_widget_show (image); - gtk_container_add (GTK_CONTAINER (button), image); + gtk_button_set_image (GTK_BUTTON (button), image); #if GTK_CHECK_VERSION(2, 12, 0) gtk_widget_set_tooltip_text (button, _("Enable Netscape plugins")); #endif + statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button); + g_signal_connect (toolbar, "notify::toolbar-style", + G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); gtk_widget_show (button); gtk_widget_show (bbox); gtk_box_pack_start (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3); g_object_unref (settings); + g_object_unref (statusbar); g_signal_connect (extension, "deactivate", G_CALLBACK (statusbar_features_deactivate_cb), bbox); @@ -95,6 +139,7 @@ statusbar_features_activate_cb (MidoriExtension* extension, statusbar_features_app_add_browser_cb (app, browser, extension); g_signal_connect (app, "add-browser", G_CALLBACK (statusbar_features_app_add_browser_cb), extension); + g_object_unref (browsers); } MidoriExtension* diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c new file mode 100644 index 00000000..d2a4025e --- /dev/null +++ b/extensions/tab-panel.c @@ -0,0 +1,362 @@ +/* + Copyright (C) 2008-2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include +#include + +#define STOCK_TAB_PANEL "tab-panel" + +static void +tab_panel_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension); + +static void +tab_panel_deactivate_cb (MidoriExtension* extension, + GtkWidget* panel) +{ + MidoriApp* app = midori_extension_get_app (extension); + GtkTreeModel* model; + MidoriBrowser* browser; + + model = g_object_get_data (G_OBJECT (extension), "treemodel"); + g_object_unref (model); + browser = midori_browser_get_for_widget (panel); + g_object_set (browser, "show-tabs", TRUE, NULL); + + gtk_widget_destroy (panel); + g_signal_handlers_disconnect_by_func ( + extension, tab_panel_deactivate_cb, panel); + g_signal_handlers_disconnect_by_func ( + app, tab_panel_app_add_browser_cb, extension); +} + +static void +midori_extension_cursor_or_row_changed_cb (GtkTreeView* treeview, + MidoriExtension* extension) +{ + /* Nothing to do */ +} + +static void +midori_extension_treeview_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + MidoriView* view; + GdkPixbuf* pixbuf; + + gtk_tree_model_get (model, iter, 0, &view, -1); + + if ((pixbuf = midori_view_get_icon (view))) + g_object_set (renderer, "pixbuf", pixbuf, NULL); + + g_object_unref (view); +} + +static void +midori_extension_treeview_render_text_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + MidoriView* view; + + gtk_tree_model_get (model, iter, 0, &view, -1); + + g_object_set (renderer, "text", midori_view_get_display_title (view), NULL); + + g_object_unref (view); +} + +static void +midori_extension_row_activated_cb (GtkTreeView* treeview, + GtkTreePath* path, + GtkTreeViewColumn* column, + MidoriExtension* extension) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + model = gtk_tree_view_get_model (treeview); + + if (gtk_tree_model_get_iter (model, &iter, path)) + { + GtkWidget* view; + MidoriBrowser* browser; + + gtk_tree_model_get (model, &iter, 0, &view, -1); + browser = midori_browser_get_for_widget (GTK_WIDGET (treeview)); + midori_browser_set_current_tab (browser, view); + + g_object_unref (view); + } +} + +static void +midori_extension_popup (GtkWidget* widget, + GdkEventButton* event, + GtkWidget* view, + MidoriExtension* extension) +{ + GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (view)); + + sokoke_widget_popup (widget, GTK_MENU (menu), + event, SOKOKE_MENU_POSITION_CURSOR); +} + +static gboolean +midori_extension_button_release_event_cb (GtkWidget* widget, + GdkEventButton* event, + MidoriExtension* extension) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (event->button < 1 || event->button > 3) + return FALSE; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + GtkWidget* view; + + gtk_tree_model_get (model, &iter, 0, &view, -1); + + if (event->button == 1) + { + MidoriBrowser* browser = midori_browser_get_for_widget (widget); + midori_browser_set_current_tab (browser, view); + } + else if (event->button == 2) + gtk_widget_destroy (view); + else + midori_extension_popup (widget, event, view, extension); + + g_object_unref (view); + return TRUE; + } + return FALSE; +} + +static gboolean +midori_extension_key_release_event_cb (GtkWidget* widget, + GdkEventKey* event, + MidoriExtension* extension) +{ + /* Nothing to do */ + + return FALSE; +} + +static void +midori_extension_popup_menu_cb (GtkWidget* widget, + MidoriExtension* extension) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + GtkWidget* view; + + gtk_tree_model_get (model, &iter, 0, &view, -1); + midori_extension_popup (widget, NULL, view, extension); + g_object_unref (view); + } +} + +static void +tab_panel_browser_add_tab_cb (MidoriBrowser* browser, + GtkWidget* view, + MidoriExtension* extension) +{ + GtkTreeModel* model = g_object_get_data (G_OBJECT (extension), "treemodel"); + GtkTreeIter iter; + GtkWidget* notebook = katze_object_get_object (browser, "notebook"); + gint page = gtk_notebook_page_num (GTK_NOTEBOOK (notebook), view); + g_object_unref (notebook); + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), + &iter, NULL, page, 0, view, -1); +} + +static void +tab_panel_browser_foreach_cb (GtkWidget* view, + MidoriExtension* extension) +{ + tab_panel_browser_add_tab_cb (midori_browser_get_for_widget (view), + view, extension); +} + +static void +tab_panel_browser_remove_tab_cb (MidoriBrowser* browser, + MidoriView* view, + MidoriExtension* extension) +{ + GtkTreeModel* model = g_object_get_data (G_OBJECT (extension), "treemodel"); + guint i; + GtkTreeIter iter; + + i = 0; + while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i)) + { + MidoriView* view_; + + gtk_tree_model_get (model, &iter, 0, &view_, -1); + + if (view == view_) + { + gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); + g_object_unref (view_); + break; + } + + g_object_unref (view_); + i++; + } +} + +static void +tab_panel_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + GtkTreeStore* model; + GtkWidget* treeview; + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_pixbuf; + GtkCellRenderer* renderer_text; + GtkWidget* panel; + GtkWidget* toolbar; + /* GtkToolItem* toolitem; */ + + g_object_set (browser, "show-tabs", FALSE, NULL); + + panel = katze_object_get_object (browser, "panel"); + + 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); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_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_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_extension_treeview_render_text_cb, + treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + g_object_connect (treeview, + "signal::row-activated", + midori_extension_row_activated_cb, extension, + "signal::cursor-changed", + midori_extension_cursor_or_row_changed_cb, extension, + "signal::columns-changed", + midori_extension_cursor_or_row_changed_cb, extension, + "signal::button-release-event", + midori_extension_button_release_event_cb, extension, + "signal::key-release-event", + midori_extension_key_release_event_cb, extension, + "signal::popup-menu", + midori_extension_popup_menu_cb, extension, + NULL); + gtk_widget_show (treeview); + + toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + gtk_widget_show (toolbar); + + /* + TODO: Implement optional thumbnail images + toolitem = gtk_toggle_tool_button_new_from_stock (STOCK_IMAGE); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "toggled", + G_CALLBACK (tab_panel_button_thumbnail_toggled_cb), notebook); + gtk_widget_show (GTK_WIDGET (toolitem)); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); */ + + midori_panel_append_widget (MIDORI_PANEL (panel), treeview, + STOCK_TAB_PANEL, _("Tab Panel"), toolbar); + g_object_unref (panel); + + midori_browser_foreach (browser, + (GtkCallback)tab_panel_browser_foreach_cb, treeview); + + g_signal_connect_after (browser, "add-tab", + G_CALLBACK (tab_panel_browser_add_tab_cb), extension); + g_signal_connect (browser, "remove-tab", + G_CALLBACK (tab_panel_browser_remove_tab_cb), extension); + g_signal_connect (extension, "deactivate", + G_CALLBACK (tab_panel_deactivate_cb), treeview); +} + +static void +tab_panel_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + GtkTreeStore* model; + KatzeArray* browsers; + MidoriBrowser* browser; + guint i; + + model = gtk_tree_store_new (1, MIDORI_TYPE_VIEW); + g_object_set_data (G_OBJECT (extension), "treemodel", model); + + browsers = katze_object_get_object (app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) + tab_panel_app_add_browser_cb (app, browser, extension); + g_object_unref (browsers); + g_signal_connect (app, "add-browser", + G_CALLBACK (tab_panel_app_add_browser_cb), extension); +} + +MidoriExtension* +extension_init (void) +{ + GtkIconFactory* factory; + GtkIconSource* icon_source; + GtkIconSet* icon_set; + static GtkStockItem items[] = + { + { STOCK_TAB_PANEL, N_("T_ab Panel"), 0, 0, NULL }, + }; + + factory = gtk_icon_factory_new (); + gtk_stock_add (items, G_N_ELEMENTS (items)); + icon_set = gtk_icon_set_new (); + icon_source = gtk_icon_source_new (); + gtk_icon_source_set_icon_name (icon_source, GTK_STOCK_INDEX); + gtk_icon_set_add_source (icon_set, icon_source); + gtk_icon_source_free (icon_source); + gtk_icon_factory_add (factory, STOCK_TAB_PANEL, icon_set); + gtk_icon_set_unref (icon_set); + gtk_icon_factory_add_default (factory); + g_object_unref (factory); + + MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", _("Tab Panel"), + "description", _("Show tabs in a vertical panel"), + "version", "0.1", + "authors", "Christian Dywan ", + NULL); + + g_signal_connect (extension, "activate", + G_CALLBACK (tab_panel_activate_cb), NULL); + + return extension; +} diff --git a/extensions/tab-panel/main.c b/extensions/tab-panel/main.c deleted file mode 100644 index bcaf07d7..00000000 --- a/extensions/tab-panel/main.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "tab-panel-extension.h" - -#include - -#define STOCK_TAB_PANEL "tab-panel" - -static void -tab_panel_app_add_browser_cb (MidoriApp* app, - MidoriBrowser* browser) -{ - GtkWidget* panel; - GtkWidget* child; - - /* FIXME: Actually provide a tree view listing all views. */ - - panel = katze_object_get_object (browser, "panel"); - child = midori_view_new (NULL); - gtk_widget_show (child); - midori_panel_append_widget (MIDORI_PANEL (panel), child, - STOCK_TAB_PANEL, _("Tab Panel"), NULL); -} - -static void -tab_panel_activate_cb (MidoriExtension* extension, - MidoriApp* app) -{ - g_signal_connect (app, "add-browser", - G_CALLBACK (tab_panel_app_add_browser_cb), NULL); -} - -MidoriExtension* -extension_init (void) -{ - MidoriExtension* extension; - GtkIconFactory* factory; - GtkIconSource* icon_source; - GtkIconSet* icon_set; - static GtkStockItem items[] = - { - { STOCK_TAB_PANEL, N_("T_ab Panel"), 0, 0, NULL }, - }; - - factory = gtk_icon_factory_new (); - gtk_stock_add (items, G_N_ELEMENTS (items)); - icon_set = gtk_icon_set_new (); - icon_source = gtk_icon_source_new (); - gtk_icon_source_set_icon_name (icon_source, GTK_STOCK_INDEX); - gtk_icon_set_add_source (icon_set, icon_source); - gtk_icon_source_free (icon_source); - gtk_icon_factory_add (factory, STOCK_TAB_PANEL, icon_set); - gtk_icon_set_unref (icon_set); - gtk_icon_factory_add_default (factory); - g_object_unref (factory); - - extension = g_object_new (TAB_PANEL_TYPE_EXTENSION, - "name", _("Tab Panel"), - "description", "", - "version", "0.1", - "authors", "Christian Dywan ", - NULL); - - g_signal_connect (extension, "activate", - G_CALLBACK (tab_panel_activate_cb), NULL); - - return extension; -} diff --git a/extensions/tab-panel/tab-panel-extension.c b/extensions/tab-panel/tab-panel-extension.c deleted file mode 100644 index 417c1359..00000000 --- a/extensions/tab-panel/tab-panel-extension.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "tab-panel-extension.h" - -#include - -struct _TabPanelExtension -{ - MidoriExtension parent_instance; -}; - -struct _TabPanelExtensionClass -{ - MidoriExtensionClass parent_class; -}; - -G_DEFINE_TYPE (TabPanelExtension, tab_panel_extension, MIDORI_TYPE_EXTENSION); - -static void -tab_panel_extension_class_init (TabPanelExtensionClass* class) -{ - /* Nothing to do. */ -} - -static void -tab_panel_extension_init (TabPanelExtension* extension) -{ - /* Nothing to do. */ -} diff --git a/extensions/tab-panel/tab-panel-extension.h b/extensions/tab-panel/tab-panel-extension.h deleted file mode 100644 index 583998b4..00000000 --- a/extensions/tab-panel/tab-panel-extension.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __TAB_PANEL_EXTENSION_H__ -#define __TAB_PANEL_EXTENSION_H__ - -#include - -G_BEGIN_DECLS - -#define TAB_PANEL_TYPE_EXTENSION \ - (midori_extension_get_type ()) -#define TAB_PANEL_EXTENSION(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), TAB_PANEL_TYPE_EXTENSION, TabPanelExtension)) -#define TAB_PANEL_EXTENSION_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), TAB_PANEL_TYPE_EXTENSION, TabPanelExtensionClass)) -#define TAB_PANEL_IS_EXTENSION(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TAB_PANEL_TYPE_EXTENSION)) -#define TAB_PANEL_IS_EXTENSION_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), TAB_PANEL_TYPE_EXTENSION)) -#define TAB_PANEL_EXTENSION_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), TAB_PANEL_TYPE_EXTENSION, TabPanelExtensionClass)) - -typedef struct _TabPanelExtension TabPanelExtension; -typedef struct _TabPanelExtensionClass TabPanelExtensionClass; - -GType -tab_panel_extension_get_type (void); - -/* There is no API for TabPanelExtension. Please use the - available properties and signals. */ - -G_END_DECLS - -#endif /* __TAB_PANEL_EXTENSION_H__ */ diff --git a/extensions/toolbar-editor.c b/extensions/toolbar-editor.c new file mode 100644 index 00000000..5e6f96eb --- /dev/null +++ b/extensions/toolbar-editor.c @@ -0,0 +1,625 @@ +/* + Copyright (C) 2009 Enrico Tröger + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include + +#include "config.h" + +#if !HAVE_HILDON + +typedef struct +{ + GtkWidget *dialog; + + GtkTreeView *tree_available; + GtkTreeView *tree_used; + + GtkListStore *store_available; + GtkListStore *store_used; + + GtkTreePath *last_drag_path; + GtkTreeViewDropPosition last_drag_pos; + + GtkWidget *drag_source; + + GtkActionGroup *action_group; + MidoriBrowser *browser; +} TBEditorWidget; + +enum +{ + TB_EDITOR_COL_ACTION, + TB_EDITOR_COL_LABEL, + TB_EDITOR_COL_ICON, + TB_EDITOR_COLS_MAX +}; + +static const GtkTargetEntry tb_editor_dnd_targets[] = +{ + { "MIDORI_TB_EDITOR_ROW", 0, 0 } +}; +static const gint tb_editor_dnd_targets_len = G_N_ELEMENTS(tb_editor_dnd_targets); + + +static void tb_editor_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext); + + +static void tb_editor_deactivate_cb(MidoriExtension *extension, GtkWidget *menuitem) +{ + 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(app, tb_editor_app_add_browser_cb, extension); +} + + +static void tb_editor_set_item_values(TBEditorWidget *tbw, const gchar *action_name, + GtkListStore *store, GtkTreeIter *iter) +{ + gchar *icon = NULL; + gchar *label = NULL; + gchar *label_clean = NULL; + GtkAction *action; + + action = gtk_action_group_get_action(tbw->action_group, action_name); + if (action != NULL) + { + icon = katze_object_get_string(action, "icon-name"); + if (icon == NULL) + { + icon = katze_object_get_string(action, "stock-id"); + } + + label = katze_object_get_string(action, "label"); + if (label != NULL) + label_clean = katze_strip_mnemonics(label); + } + + gtk_list_store_set(store, iter, + TB_EDITOR_COL_ACTION, action_name, + TB_EDITOR_COL_LABEL, label_clean, + TB_EDITOR_COL_ICON, icon, + -1); + + g_free(icon); + g_free(label); + g_free(label_clean); +} + + +static GSList *tb_editor_array_to_list(const gchar **items) +{ + const gchar **name; + GSList *list = NULL; + + name = items; + while (*name != NULL) + { + if (*name[0] != '\0') + list = g_slist_append(list, g_strdup(*name)); + name++; + } + + return list; +} + + +static GSList *tb_editor_parse_active_items(MidoriBrowser *browser) +{ + gchar *items; + gchar **names; + GSList *list = NULL; + MidoriWebSettings *settings; + + settings = katze_object_get_object(browser, "settings"); + g_object_get(settings, "toolbar-items", &items, NULL); + g_object_unref(settings); + + names = g_strsplit(items ? items : "", ",", 0); + list = tb_editor_array_to_list((const gchar **) names); + + g_strfreev(names); + g_free(items); + + return list; +} + + +static GSList *tb_editor_get_available_actions(MidoriBrowser *browser) +{ + GSList *list = NULL; + + list = tb_editor_array_to_list(midori_browser_get_toolbar_actions(browser)); + + return list; +} + + +static void tb_editor_scroll_to_iter(GtkTreeView *treeview, GtkTreeIter *iter) +{ + GtkTreePath *path = gtk_tree_model_get_path(gtk_tree_view_get_model(treeview), iter); + gtk_tree_view_scroll_to_cell(treeview, path, NULL, TRUE, 0.5, 0.0); + gtk_tree_path_free(path); +} + + +static void tb_editor_free_path(TBEditorWidget *tbw) +{ + if (tbw->last_drag_path != NULL) + { + gtk_tree_path_free(tbw->last_drag_path); + tbw->last_drag_path = NULL; + } +} + + +static void tb_editor_btn_remove_clicked_cb(GtkWidget *button, TBEditorWidget *tbw) +{ + GtkTreeModel *model_used; + GtkTreeSelection *selection_used; + GtkTreeIter iter_used, iter_new; + gchar *action_name; + + selection_used = gtk_tree_view_get_selection(tbw->tree_used); + if (gtk_tree_selection_get_selected(selection_used, &model_used, &iter_used)) + { + gtk_tree_model_get(model_used, &iter_used, TB_EDITOR_COL_ACTION, &action_name, -1); + if (g_strcmp0(action_name, "Location") != 0) + { + if (gtk_list_store_remove(tbw->store_used, &iter_used)) + gtk_tree_selection_select_iter(selection_used, &iter_used); + + if (g_strcmp0(action_name, "Separator") != 0) + { + gtk_list_store_append(tbw->store_available, &iter_new); + tb_editor_set_item_values(tbw, action_name, tbw->store_available, &iter_new); + tb_editor_scroll_to_iter(tbw->tree_available, &iter_new); + } + } + g_free(action_name); + } +} + + +static void tb_editor_btn_add_clicked_cb(GtkWidget *button, TBEditorWidget *tbw) +{ + GtkTreeModel *model_available; + GtkTreeSelection *selection_available, *selection_used; + GtkTreeIter iter_available, iter_new, iter_selected; + gchar *action_name; + + selection_available = gtk_tree_view_get_selection(tbw->tree_available); + if (gtk_tree_selection_get_selected(selection_available, &model_available, &iter_available)) + { + gtk_tree_model_get(model_available, &iter_available, TB_EDITOR_COL_ACTION, &action_name, -1); + if (g_strcmp0(action_name, "Separator") != 0) + { + if (gtk_list_store_remove(tbw->store_available, &iter_available)) + gtk_tree_selection_select_iter(selection_available, &iter_available); + } + + selection_used = gtk_tree_view_get_selection(tbw->tree_used); + if (gtk_tree_selection_get_selected(selection_used, NULL, &iter_selected)) + { + gtk_list_store_insert_before(tbw->store_used, &iter_new, &iter_selected); + tb_editor_set_item_values(tbw, action_name, tbw->store_used, &iter_new); + } + else + { + gtk_list_store_append(tbw->store_used, &iter_new); + tb_editor_set_item_values(tbw, action_name, tbw->store_used, &iter_new); + } + + tb_editor_scroll_to_iter(tbw->tree_used, &iter_new); + + g_free(action_name); + } +} + + +static gboolean tb_editor_drag_motion_cb(GtkWidget *widget, GdkDragContext *drag_context, + gint x, gint y, guint ltime, TBEditorWidget *tbw) +{ + if (tbw->last_drag_path != NULL) + gtk_tree_path_free(tbw->last_drag_path); + gtk_tree_view_get_drag_dest_row(GTK_TREE_VIEW(widget), + &(tbw->last_drag_path), &(tbw->last_drag_pos)); + + return FALSE; +} + + +static void tb_editor_drag_data_get_cb(GtkWidget *widget, GdkDragContext *context, + GtkSelectionData *data, guint info, guint ltime, + TBEditorWidget *tbw) +{ + GtkTreeIter iter; + GtkTreeSelection *selection; + GtkTreeModel *model; + GdkAtom atom; + gchar *name; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + if (! gtk_tree_selection_get_selected(selection, &model, &iter)) + return; + + gtk_tree_model_get(model, &iter, TB_EDITOR_COL_ACTION, &name, -1); + if (name == NULL || *name == '\0') + { + g_free(name); + return; + } + + atom = gdk_atom_intern(tb_editor_dnd_targets[0].target, FALSE); + gtk_selection_data_set(data, atom, 8, (guchar*) name, strlen(name)); + + g_free(name); + + tbw->drag_source = widget; +} + + +static void tb_editor_drag_data_rcvd_cb(GtkWidget *widget, GdkDragContext *context, + gint x, gint y, GtkSelectionData *data, guint info, + guint ltime, TBEditorWidget *tbw) +{ + GtkTreeView *tree = GTK_TREE_VIEW(widget); + gboolean del = FALSE; + + if (data->length >= 0 && data->format == 8) + { + gboolean is_sep; + gchar *text = NULL; + + text = (gchar*) data->data; + + /* We allow re-ordering the Location item but not removing it from the list. */ + if (g_strcmp0(text, "Location") == 0 && widget != tbw->drag_source) + return; + + is_sep = (g_strcmp0(text, "Separator") == 0); + /* If the source of the action is equal to the target, we do just re-order and so need + * to delete the separator to get it moved, not just copied. */ + if (is_sep && widget == tbw->drag_source) + is_sep = FALSE; + + if (tree != tbw->tree_available || ! is_sep) + { + GtkTreeIter iter, iter_before, *iter_before_ptr; + GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(tree)); + + if (tbw->last_drag_path != NULL) + { + gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter_before, tbw->last_drag_path); + + if (gtk_list_store_iter_is_valid(store, &iter_before)) + iter_before_ptr = &iter_before; + else + iter_before_ptr = NULL; + + if (tbw->last_drag_pos == GTK_TREE_VIEW_DROP_BEFORE || + tbw->last_drag_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE) + gtk_list_store_insert_before(store, &iter, iter_before_ptr); + else + gtk_list_store_insert_after(store, &iter, iter_before_ptr); + + tb_editor_set_item_values(tbw, text, store, &iter); + } + else + { + gtk_list_store_append(store, &iter); + tb_editor_set_item_values(tbw, text, store, &iter); + } + + tb_editor_scroll_to_iter(tree, &iter); + } + if (tree != tbw->tree_used || ! is_sep) + del = TRUE; + } + + tbw->drag_source = NULL; /* reset the value just to be sure */ + tb_editor_free_path(tbw); + gtk_drag_finish(context, TRUE, del, ltime); +} + + +static gboolean tb_editor_foreach_used(GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer data) +{ + gchar *action_name; + + gtk_tree_model_get(model, iter, TB_EDITOR_COL_ACTION, &action_name, -1); + + if (action_name != NULL && *action_name != '\0') + { + g_string_append(data, action_name); + g_string_append_c(data, ','); + } + + g_free(action_name); + return FALSE; +} + + +static void tb_editor_update_toolbar(TBEditorWidget *tbw) +{ + MidoriWebSettings *settings; + GString *str = g_string_new(NULL); + + gtk_tree_model_foreach(GTK_TREE_MODEL(tbw->store_used), tb_editor_foreach_used, str); + + settings = katze_object_get_object(tbw->browser, "settings"); + g_object_set(settings, "toolbar-items", str->str, NULL); + g_object_unref(settings); + + g_string_free(str, TRUE); +} + + +static void tb_editor_available_items_changed_cb(GtkTreeModel *model, GtkTreePath *arg1, + GtkTreeIter *arg2, TBEditorWidget *tbw) +{ + tb_editor_update_toolbar(tbw); +} + + +static void tb_editor_available_items_deleted_cb(GtkTreeModel *model, GtkTreePath *arg1, + TBEditorWidget *tbw) +{ + tb_editor_update_toolbar(tbw); +} + + +static TBEditorWidget *tb_editor_create_dialog(MidoriBrowser *parent) +{ + GtkWidget *dialog, *vbox, *hbox, *vbox_buttons, *button_add, *button_remove; + GtkWidget *swin_available, *swin_used, *tree_available, *tree_used, *label; + GtkCellRenderer *text_renderer, *icon_renderer; + GtkTreeViewColumn *column; + TBEditorWidget *tbw = g_new(TBEditorWidget, 1); + + dialog = gtk_dialog_new_with_buttons(_("Customize Toolbar"), + GTK_WINDOW(parent), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); + vbox = (GTK_DIALOG(dialog))->vbox; + gtk_box_set_spacing(GTK_BOX(vbox), 6); + gtk_widget_set_name(dialog, "GeanyDialog"); + gtk_window_set_default_size(GTK_WINDOW(dialog), -1, 400); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); + + tbw->store_available = gtk_list_store_new(TB_EDITOR_COLS_MAX, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + tbw->store_used = gtk_list_store_new(TB_EDITOR_COLS_MAX, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + + label = gtk_label_new( + _("Select items to be displayed on the toolbar. Items can be reodered by drag and drop.")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + + tree_available = gtk_tree_view_new(); + gtk_tree_view_set_model(GTK_TREE_VIEW(tree_available), GTK_TREE_MODEL(tbw->store_available)); + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree_available), TRUE); + gtk_tree_sortable_set_sort_column_id( + GTK_TREE_SORTABLE(tbw->store_available), TB_EDITOR_COL_LABEL, GTK_SORT_ASCENDING); + + icon_renderer = gtk_cell_renderer_pixbuf_new(); + column = gtk_tree_view_column_new_with_attributes( + NULL, icon_renderer, "stock-id", TB_EDITOR_COL_ICON, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree_available), column); + + text_renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes( + _("Available Items"), text_renderer, "text", TB_EDITOR_COL_LABEL, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree_available), column); + + swin_available = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin_available), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_available), GTK_SHADOW_ETCHED_IN); + gtk_container_add(GTK_CONTAINER(swin_available), tree_available); + + tree_used = gtk_tree_view_new(); + gtk_tree_view_set_model(GTK_TREE_VIEW(tree_used), GTK_TREE_MODEL(tbw->store_used)); + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree_used), TRUE); + gtk_tree_view_set_reorderable(GTK_TREE_VIEW(tree_used), TRUE); + + icon_renderer = gtk_cell_renderer_pixbuf_new(); + column = gtk_tree_view_column_new_with_attributes( + NULL, icon_renderer, "stock-id", TB_EDITOR_COL_ICON, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree_used), column); + + text_renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes( + _("Displayed Items"), text_renderer, "text", TB_EDITOR_COL_LABEL, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree_used), column); + + swin_used = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin_used), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_used), GTK_SHADOW_ETCHED_IN); + gtk_container_add(GTK_CONTAINER(swin_used), tree_used); + + /* drag'n'drop */ + gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(tree_available), GDK_BUTTON1_MASK, + tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE); + gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(tree_available), + tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE); + g_signal_connect(tree_available, "drag-data-get", + G_CALLBACK(tb_editor_drag_data_get_cb), tbw); + g_signal_connect(tree_available, "drag-data-received", + G_CALLBACK(tb_editor_drag_data_rcvd_cb), tbw); + g_signal_connect(tree_available, "drag-motion", + G_CALLBACK(tb_editor_drag_motion_cb), tbw); + + gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(tree_used), GDK_BUTTON1_MASK, + tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE); + gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(tree_used), + tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE); + g_signal_connect(tree_used, "drag-data-get", + G_CALLBACK(tb_editor_drag_data_get_cb), tbw); + g_signal_connect(tree_used, "drag-data-received", + G_CALLBACK(tb_editor_drag_data_rcvd_cb), tbw); + g_signal_connect(tree_used, "drag-motion", + G_CALLBACK(tb_editor_drag_motion_cb), tbw); + + + button_add = gtk_button_new(); + gtk_button_set_image(GTK_BUTTON(button_add), + gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON)); + button_remove = gtk_button_new(); + g_signal_connect(button_add, "clicked", G_CALLBACK(tb_editor_btn_add_clicked_cb), tbw); + gtk_button_set_image(GTK_BUTTON(button_remove), + gtk_image_new_from_stock(GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON)); + g_signal_connect(button_remove, "clicked", G_CALLBACK(tb_editor_btn_remove_clicked_cb), tbw); + + vbox_buttons = gtk_vbox_new(FALSE, 6); + /* FIXME this is a little hack'ish, any better ideas? */ + gtk_box_pack_start(GTK_BOX(vbox_buttons), gtk_label_new(""), TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox_buttons), button_add, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox_buttons), button_remove, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox_buttons), gtk_label_new(""), TRUE, TRUE, 0); + + hbox = gtk_hbox_new(FALSE, 6); + gtk_box_pack_start(GTK_BOX(hbox), swin_available, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), vbox_buttons, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), swin_used, TRUE, TRUE, 0); + + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 6); + gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); + + gtk_widget_show_all(vbox); + + g_object_unref(tbw->store_available); + g_object_unref(tbw->store_used); + + tbw->dialog = dialog; + tbw->tree_available = GTK_TREE_VIEW(tree_available); + tbw->tree_used = GTK_TREE_VIEW(tree_used); + + tbw->last_drag_path = NULL; + + return tbw; +} + + +static void tb_editor_menu_configure_toolbar_activate_cb(GtkWidget *menuitem, MidoriBrowser *browser) +{ + GSList *node, *used_items, *all_items; + GtkTreeIter iter; + GtkTreePath *path; + TBEditorWidget *tbw; + + /* read the current active toolbar items */ + used_items = tb_editor_parse_active_items(browser); + + /* get all available actions */ + all_items = tb_editor_get_available_actions(browser); + + /* create the GUI */ + tbw = tb_editor_create_dialog(browser); + + /* cache some pointers, this is safe enough since the dialog is run modally */ + tbw->action_group = midori_browser_get_action_group(browser); + tbw->browser = browser; + + /* fill the stores */ + for (node = all_items; node != NULL; node = node->next) + { + if (strcmp(node->data, "Separator") == 0 || + g_slist_find_custom(used_items, node->data, (GCompareFunc) strcmp) == NULL) + { + gtk_list_store_append(tbw->store_available, &iter); + tb_editor_set_item_values(tbw, node->data, tbw->store_available, &iter); + } + } + for (node = used_items; node != NULL; node = node->next) + { + gtk_list_store_append(tbw->store_used, &iter); + tb_editor_set_item_values(tbw, node->data, tbw->store_used, &iter); + } + /* select first item */ + path = gtk_tree_path_new_from_string("0"); + gtk_tree_selection_select_path(gtk_tree_view_get_selection(tbw->tree_used), path); + gtk_tree_path_free(path); + + /* connect the changed signals after populating the store */ + g_signal_connect(tbw->store_used, "row-changed", + G_CALLBACK(tb_editor_available_items_changed_cb), tbw); + g_signal_connect(tbw->store_used, "row-deleted", + G_CALLBACK(tb_editor_available_items_deleted_cb), tbw); + + /* run it */ + gtk_dialog_run(GTK_DIALOG(tbw->dialog)); + + gtk_widget_destroy(tbw->dialog); + + g_slist_foreach(used_items, (GFunc) g_free, NULL); + g_slist_foreach(all_items, (GFunc) g_free, NULL); + g_slist_free(used_items); + g_slist_free(all_items); + tb_editor_free_path(tbw); + g_free(tbw); +} + + +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); +} + + +static void tb_editor_activate_cb(MidoriExtension *extension, MidoriApp *app) +{ + KatzeArray *browsers; + MidoriBrowser *browser; + guint i; + + browsers = katze_object_get_object(app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item(browsers, i++))) + tb_editor_app_add_browser_cb(app, browser, extension); + g_signal_connect(app, "add-browser", G_CALLBACK(tb_editor_app_add_browser_cb), extension); + g_object_unref(browsers); +} + + +MidoriExtension *extension_init(void) +{ + MidoriExtension* extension = g_object_new(MIDORI_TYPE_EXTENSION, + "name", _("Toolbar Editor"), + "description", _("Easily edit the toolbar layout"), + "version", "0.1", + "authors", "Enrico Tröger ", + NULL); + + g_signal_connect(extension, "activate", G_CALLBACK(tb_editor_activate_cb), NULL); + + return extension; +} + + +#endif diff --git a/extensions/wscript_build b/extensions/wscript_build index 2efe559d..751162ad 100644 --- a/extensions/wscript_build +++ b/extensions/wscript_build @@ -2,11 +2,10 @@ # WAF build script for midori # This file is licensed under the terms of the expat license, see the file EXPAT. +import os + extensions = os.listdir ('extensions') for extension in extensions: - # Tab Panel isn't useful at this point - if extension == 'tab-panel': - continue # Adblock is incomplete and not ready for release if extension == 'adblock.c': continue diff --git a/icons/wscript_build b/icons/wscript_build index 0687a70c..04053068 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -3,6 +3,7 @@ # This file is licensed under the terms of the expat license, see the file EXPAT. import Utils +import os def add_image (bld, category, name): @@ -14,10 +15,10 @@ def add_image (bld, category, name): if rsvg_convert: Utils.check_dir (blddir + '/icons') - for size in [16, 22, 32, 48]: + for size in [16, 22, 24, 32, 48]: format = str (size) + 'x' + str (size) if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK): - bld.install_files ('${DATADIR}/icons/hicolor/' + format + '/' + category, + bld.install_files ('${MDATADIR}/icons/hicolor/' + format + '/' + category, srcdir + '/icons/' + format + '/' + name + '.png') elif not rsvg_convert: pass @@ -28,7 +29,7 @@ def add_image (bld, category, name): ' -o ' + blddir + '/icons/' + format + '/' + name + '.png' + \ ' ' + srcdir + '/icons/scalable/' + name + '.svg' if not Utils.exec_command (command): - bld.install_files ('${DATADIR}/icons/hicolor/' + format + '/' + category, + bld.install_files ('${MDATADIR}/icons/hicolor/' + format + '/' + category, blddir + '/icons/' + format + '/' + name + '.png') else: Utils.pprint ('BLUE', "Optimized icons could not be created.") diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index cc887bc5..96c25cb1 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -559,7 +559,7 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); label = gtk_label_new (NULL); /* FIXME: Should text direction be respected here? */ - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_label_set_max_width_chars (GTK_LABEL (label), 25); gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE); gtk_widget_show (label); diff --git a/katze/katze-item.c b/katze/katze-item.c index 006adc4b..d96490cb 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -147,7 +147,8 @@ katze_item_class_init (KatzeItemClass* class) static void katze_item_init (KatzeItem* item) { - /* Nothing to do here */ + item->metadata = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, g_free); } static void @@ -161,6 +162,8 @@ katze_item_finalize (GObject* object) g_free (item->icon); g_free (item->token); + g_hash_table_unref (item->metadata); + G_OBJECT_CLASS (katze_item_parent_class)->finalize (object); } @@ -451,6 +454,151 @@ katze_item_set_added (KatzeItem* item, g_object_notify (G_OBJECT (item), "added"); } +/** + * katze_item_get_meta_keys: + * @item: a #KatzeItem + * + * Retrieves a list of all meta keys. + * + * Return value: a newly allocated #GList of constant strings + * + * Since: 0.1.8 + **/ +GList* +katze_item_get_meta_keys (KatzeItem* item) +{ + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + return g_hash_table_get_keys (item->metadata); +} + +static void +katze_item_set_meta_data_value (KatzeItem* item, + const gchar* key, + gchar* value) +{ + /* FIXME: Make the default namespace configurable */ + if (g_str_has_prefix (key, "midori:")) + 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 */ +} + +/** + * katze_item_get_meta_string: + * @item: a #KatzeItem + * @key: the name of an integer value + * + * Retrieves a string value by the specified key from the + * meta data of the item. + * + * Specify "namespace:key" or "key" to use the default namespace. + * + * Return value: a string, or %NULL + * + * Since: 0.1.8 + **/ +const gchar* +katze_item_get_meta_string (KatzeItem* item, + const gchar* key) +{ + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + g_return_val_if_fail (key != NULL, NULL); + + if (g_str_has_prefix (key, "midori:")) + key = &key[7]; + return g_hash_table_lookup (item->metadata, key); +} + +/** + * katze_item_set_meta_string: + * @item: a #KatzeItem + * @key: the name of a string value + * @value: the value as a string + * + * Saves the specified string value in the meta data of + * the item under the specified key. + * + * Specify "namespace:key" or "key" to use the default namespace. + * + * Since: 0.1.8 + **/ +void +katze_item_set_meta_string (KatzeItem* item, + const gchar* key, + const gchar* value) +{ + g_return_if_fail (KATZE_IS_ITEM (item)); + g_return_if_fail (key != NULL); + + katze_item_set_meta_data_value (item, key, g_strdup (value)); +} + +/** + * katze_item_get_meta_integer: + * @item: a #KatzeItem + * @key: the name of an integer value + * + * Retrieves an integer value by the specified key from the + * meta data of the item. + * + * If the key is present but not representable as an + * integer, -1 is returned. + * + * Return value: an integer value, or -1 + * + * Since: 0.1.8 + **/ +gint64 +katze_item_get_meta_integer (KatzeItem* item, + const gchar* key) +{ + gpointer value; + + g_return_val_if_fail (KATZE_IS_ITEM (item), -1); + g_return_val_if_fail (key != NULL, -1); + + if (g_str_has_prefix (key, "midori:")) + key = &key[7]; + if (g_hash_table_lookup_extended (item->metadata, key, NULL, &value)) + return g_ascii_strtoll (value, NULL, 0); + return -1; +} + +/** + * katze_item_set_meta_integer: + * @item: a #KatzeItem + * @key: the name of an integer value + * + * Saves the specified integer value in the meta data of + * the item under the specified key. + * + * A value of -1 is intepreted as unset. + * + * Since: 0.1.8 + **/ +void +katze_item_set_meta_integer (KatzeItem* item, + const gchar* key, + gint64 value) +{ + g_return_if_fail (KATZE_IS_ITEM (item)); + g_return_if_fail (key != NULL); + + if (value == -1) + katze_item_set_meta_data_value (item, key, NULL); + else + { + katze_item_set_meta_data_value (item, key, + #ifdef G_GINT64_FORMAT + g_strdup_printf ("%" G_GINT64_FORMAT, value)); + #else + g_strdup_printf ("%li", value)); + #endif + } +} + /** * katze_item_get_parent: * @item: a #KatzeItem diff --git a/katze/katze-item.h b/katze/katze-item.h index 8e40110a..eaf74002 100644 --- a/katze/katze-item.h +++ b/katze/katze-item.h @@ -42,6 +42,7 @@ struct _KatzeItem gchar* icon; gchar* token; gint64 added; + GHashTable* metadata; KatzeItem* parent; }; @@ -102,6 +103,27 @@ void katze_item_set_added (KatzeItem* item, gint64 added); +GList* +katze_item_get_meta_keys (KatzeItem* item); + +const gchar* +katze_item_get_meta_string (KatzeItem* item, + const gchar* key); + +void +katze_item_set_meta_string (KatzeItem* item, + const gchar* key, + const gchar* value); + +gint64 +katze_item_get_meta_integer (KatzeItem* item, + const gchar* key); + +void +katze_item_set_meta_integer (KatzeItem* item, + const gchar* key, + gint64 value); + gpointer katze_item_get_parent (KatzeItem* item); diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 721b3ab2..253d8955 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -129,6 +129,22 @@ proxy_object_notify_string_cb (GObject* object, g_free (value); } +static void +proxy_widget_boolean_destroy_cb (GtkWidget* proxy, + GObject* object) +{ + g_signal_handlers_disconnect_by_func (object, + proxy_object_notify_boolean_cb, proxy); +} + +static void +proxy_widget_string_destroy_cb (GtkWidget* proxy, + GObject* object) +{ + g_signal_handlers_disconnect_by_func (object, + proxy_object_notify_string_cb, proxy); +} + /** * katze_property_proxy: * @object: a #GObject @@ -153,6 +169,7 @@ proxy_object_notify_string_cb (GObject* object, * Since 0.1.6 the following hints are also supported: * "toggle": the widget created will be an empty toggle button. This * is only supported with boolean properties. + * Since 0.1.8 "toggle" creates GtkCheckButton widgets without checkmarks. * * Any other values for @hint are silently ignored. * @@ -196,16 +213,19 @@ katze_property_proxy (gpointer object, gchar* notify_property; gboolean toggled = katze_object_get_boolean (object, property); + widget = gtk_check_button_new (); if (_hint == g_intern_string ("toggle")) - widget = gtk_toggle_button_new (); + gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (widget), FALSE); else - widget = gtk_check_button_new_with_label (gettext (nick)); + gtk_button_set_label (GTK_BUTTON (widget), gettext (nick)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled); g_signal_connect (widget, "toggled", G_CALLBACK (proxy_toggle_button_toggled_cb), object); notify_property = g_strdup_printf ("notify::%s", property); g_signal_connect (object, notify_property, G_CALLBACK (proxy_object_notify_boolean_cb), widget); + g_signal_connect (widget, "destroy", + G_CALLBACK (proxy_widget_boolean_destroy_cb), object); g_free (notify_property); } else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("file")) @@ -298,6 +318,8 @@ katze_property_proxy (gpointer object, notify_property = g_strdup_printf ("notify::%s", property); g_signal_connect (object, notify_property, G_CALLBACK (proxy_object_notify_string_cb), widget); + g_signal_connect (widget, "destroy", + G_CALLBACK (proxy_widget_string_destroy_cb), object); g_free (notify_property); } else if (type == G_TYPE_PARAM_FLOAT) @@ -602,6 +624,64 @@ katze_tree_view_get_selected_iter (GtkTreeView* treeview, return FALSE; } +/** + * katze_strip_mnemonics: + * @original: a string with mnemonics + * + * Parses the given string for mnemonics in the form + * "B_utton" or "Button (_U)" and returns a string + * without any mnemonics. + * + * Return value: a newly allocated string without mnemonics + * + * Since: 0.1.8 + **/ +gchar* +katze_strip_mnemonics (const gchar* original) +{ + /* A copy of _gtk_toolbar_elide_underscores + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Copied from GTK+ 2.17.1 */ + gchar *q, *result; + const gchar *p, *end; + gsize len; + gboolean last_underscore; + + if (!original) + return NULL; + + len = strlen (original); + q = result = g_malloc (len + 1); + last_underscore = FALSE; + + end = original + len; + for (p = original; p < end; p++) + { + if (!last_underscore && *p == '_') + last_underscore = TRUE; + else + { + last_underscore = FALSE; + if (original + 2 <= p && p + 1 <= end && + p[-2] == '(' && p[-1] == '_' && p[0] != '_' && p[1] == ')') + { + q--; + *q = '\0'; + p++; + } + else + *q++ = *p; + } + } + + if (last_underscore) + *q++ = '_'; + + *q = '\0'; + + return result; +} + /** * katze_object_has_property: * @object: a #GObject diff --git a/katze/katze-utils.h b/katze/katze-utils.h index 77c104e4..5d237d16 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -106,6 +106,9 @@ katze_tree_view_get_selected_iter (GtkTreeView* treeview, GtkTreeModel** model, GtkTreeIter* iter); +gchar* +katze_strip_mnemonics (const gchar* original); + gboolean katze_object_has_property (gpointer object, const gchar* property); diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c index 6bb7e869..8c28c77f 100644 --- a/midori/gtkiconentry.c +++ b/midori/gtkiconentry.c @@ -27,10 +27,13 @@ gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry, GtkEntryIconPosition position, GdkPixbuf* pixbuf) { + gboolean activatable; + /* Without this ugly hack pixbuf icons don't work */ - gtk_widget_hide (GTK_WIDGET (entry)); + activatable = gtk_entry_get_icon_activatable (entry, position); gtk_entry_set_icon_from_pixbuf (entry, position, pixbuf); - gtk_widget_show (GTK_WIDGET (entry)); + gtk_entry_set_icon_activatable (entry, position, !activatable); + gtk_entry_set_icon_activatable (entry, position, activatable); } #else diff --git a/midori/main.c b/midori/main.c index b2b6d917..6ed70b6a 100644 --- a/midori/main.c +++ b/midori/main.c @@ -220,9 +220,9 @@ settings_save_to_file (MidoriWebSettings* settings, } else if (type == G_TYPE_PARAM_BOOLEAN) { - gboolean boolean; - g_object_get (settings, property, &boolean, NULL); - g_key_file_set_boolean (key_file, "settings", property, boolean); + gboolean truth; + g_object_get (settings, property, &truth, NULL); + g_key_file_set_boolean (key_file, "settings", property, truth); } else if (type == G_TYPE_PARAM_ENUM) { @@ -744,6 +744,15 @@ settings_notify_cb (MidoriWebSettings* settings, g_free (config_file); } +static void +extension_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + MidoriWebSettings* settings = katze_object_get_object (app, "settings"); + settings_notify_cb (settings, NULL, app); + g_object_unref (settings); +} + static void accel_map_changed_cb (GtkAccelMap* accel_map, gchar* accel_path, @@ -1185,6 +1194,8 @@ midori_load_extensions (gpointer data) if (extension_dir != NULL) { const gchar* filename; + gchar* config_file = build_config_filename ("config"); + gboolean is_writable = is_writable (config_file); while ((filename = g_dir_read_name (extension_dir))) { @@ -1228,9 +1239,17 @@ midori_load_extensions (gpointer data) if (!g_strcmp0 (filename, name)) g_signal_emit_by_name (extension, "activate", app); } + if (is_writable) + { + g_signal_connect_after (extension, "activate", + G_CALLBACK (extension_activate_cb), app); + g_signal_connect_after (extension, "deactivate", + G_CALLBACK (extension_activate_cb), app); + } g_object_unref (extension); } g_dir_close (extension_dir); + g_free (config_file); } g_free (extension_path); } @@ -1250,6 +1269,8 @@ midori_load_session (gpointer data) KatzeArray* session; KatzeItem* item; guint i; + gint64 current; + gchar** command = g_object_get_data (G_OBJECT (app), "execute-command"); browser = midori_app_create_browser (app); midori_app_add_browser (app, browser); @@ -1285,8 +1306,12 @@ midori_load_session (gpointer data) i = 0; while ((item = katze_array_get_nth_item (_session, i++))) midori_browser_add_item (browser, item); - /* FIXME: Switch to the last active page */ - item = katze_array_get_nth_item (_session, 0); + current = katze_item_get_meta_integer (KATZE_ITEM (_session), "current"); + if (current < 0) + current = 0; + midori_browser_set_current_page (browser, current); + if (!(item = katze_array_get_nth_item (_session, current))) + item = katze_array_get_nth_item (_session, 0); if (!strcmp (katze_item_get_uri (item), "")) midori_browser_activate_action (browser, "Location"); g_object_unref (_session); @@ -1304,9 +1329,13 @@ midori_load_session (gpointer data) (GWeakNotify)(midori_browser_weak_notify_cb), browser); } + if (command) + midori_app_send_command (app, command); + return FALSE; } +#ifdef HAVE_JSCORE static gint midori_run_script (const gchar* filename) { @@ -1344,6 +1373,7 @@ 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 @@ -1372,6 +1402,19 @@ snapshot_load_finished_cb (GtkWidget* web_view, } #endif +static void +midori_web_app_browser_notify_load_status_cb (MidoriBrowser* browser, + GParamSpec* pspec, + gpointer data) +{ + if (katze_object_get_enum (browser, "load-status") != MIDORI_LOAD_PROVISIONAL) + { + GtkWidget* view = midori_browser_get_current_tab (browser); + GdkPixbuf* icon = midori_view_get_icon (MIDORI_VIEW (view)); + gtk_window_set_icon (GTK_WINDOW (browser), icon); + } +} + int main (int argc, char** argv) @@ -1380,6 +1423,7 @@ main (int argc, gchar* config; gboolean run; gchar* snapshot; + gboolean execute; gboolean version; gchar** uris; MidoriApp* app; @@ -1391,12 +1435,16 @@ 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 }, #endif + { "execute", 'e', 0, G_OPTION_ARG_NONE, &execute, + N_("Execute the specified command"), NULL }, { "version", 'V', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris, @@ -1430,7 +1478,15 @@ main (int argc, if (g_getenv ("NLSPATH")) bindtextdomain (GETTEXT_PACKAGE, g_getenv ("NLSPATH")); else + #ifdef G_OS_WIN32 + { + gchar* path = sokoke_find_data_filename ("locale"); + bindtextdomain (GETTEXT_PACKAGE, path); + g_free (path); + } + #else bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + #endif bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); #endif @@ -1440,6 +1496,7 @@ main (int argc, config = NULL; run = FALSE; snapshot = NULL; + execute = FALSE; version = FALSE; uris = NULL; error = NULL; @@ -1515,10 +1572,13 @@ main (int argc, "show-menubar", FALSE, "show-navigationbar", TRUE, "toolbar-items", "Back,Forward,ReloadStop,Location", + "homepage", NULL, "show-statusbar", TRUE, NULL); g_object_unref (settings); g_object_set (browser, "settings", settings, NULL); + g_signal_connect (browser, "notify::load-status", + G_CALLBACK (midori_web_app_browser_notify_load_status_cb), NULL); midori_browser_add_uri (browser, webapp); g_object_set_data (G_OBJECT (browser), "locked", (void*)1); g_signal_connect (browser, "destroy", @@ -1529,9 +1589,11 @@ 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); @@ -1569,8 +1631,9 @@ main (int argc, { GtkWidget* dialog; - /* TODO: Open as many tabs as we have uris, seperated by pipes */ - if (uris) + if (execute) + result = midori_app_send_command (app, uris); + else if (uris) /* TODO: Open a tab per URI, seperated by pipes */ result = midori_app_instance_send_uris (app, uris); else result = midori_app_instance_send_new_browser (app); @@ -1606,6 +1669,15 @@ main (int argc, } if (!error && katze_array_is_empty (search_engines)) { + #ifdef G_OS_WIN32 + gchar* dir; + + dir = g_win32_get_package_installation_directory_of_module (NULL); + katze_assign (config_file, + g_build_filename (dir, "etc", "xdg", PACKAGE_NAME, "search", NULL)); + g_free (dir); + search_engines = search_engines_new_from_file (config_file, NULL); + #else const gchar* const * config_dirs = g_get_system_config_dirs (); i = 0; while (config_dirs[i]) @@ -1625,6 +1697,7 @@ main (int argc, g_build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, "search", NULL)); search_engines = search_engines_new_from_file (config_file, NULL); } + #endif } else if (error) { @@ -1730,6 +1803,9 @@ main (int argc, } g_string_free (error_messages, TRUE); + /* If -e or --execute was specified, "uris" refers to the command. */ + if (!execute) + { /* Open as many tabs as we have uris, seperated by pipes */ i = 0; while (uris && uris[i]) @@ -1747,6 +1823,7 @@ main (int argc, g_free (uri); i++; } + } katze_assign (config_file, build_config_filename ("config")); if (is_writable (config_file)) @@ -1845,6 +1922,9 @@ main (int argc, katze_item_set_parent (KATZE_ITEM (_session), app); g_idle_add (midori_load_session, _session); + if (execute) + g_object_set_data (G_OBJECT (app), "execute-command", uris); + gtk_main (); #if HAVE_HILDON diff --git a/midori/midori-app.c b/midori/midori-app.c index f9a430c0..e71f4b08 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,14 @@ #include #if HAVE_UNIQUE + typedef gpointer MidoriAppInstance; + #define MidoriAppInstanceNull NULL #include + #define MIDORI_UNIQUE_COMMAND 1 +#else + typedef gint MidoriAppInstance; + #define MidoriAppInstanceNull -1 + #include "socket.h" #endif typedef struct _NotifyNotification NotifyNotification; @@ -54,7 +61,7 @@ struct _MidoriApp KatzeArray* extensions; KatzeArray* browsers; - gpointer instance; + MidoriAppInstance instance; /* libnotify handling */ gchar* program_notify_send; @@ -197,6 +204,7 @@ _midori_app_add_browser (MidoriApp* app, katze_array_add_item (app->browsers, browser); + app->browser = browser; #if HAVE_UNIQUE if (app->instance) unique_app_watch_window (app->instance, GTK_WINDOW (browser)); @@ -383,6 +391,89 @@ midori_app_class_init (MidoriAppClass* class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } +static gboolean +midori_app_command_received (MidoriApp* app, + const gchar* command, + gchar** uris, + GdkScreen* screen) +{ + if (!screen) + { + if (app->browser && gtk_widget_has_screen (GTK_WIDGET (app->browser))) + screen = gtk_widget_get_screen (GTK_WIDGET (app->browser)); + else + screen = gdk_screen_get_default (); + } + + if (g_str_equal (command, "activate")) + { + gtk_window_set_screen (GTK_WINDOW (app->browser), screen); + gtk_window_present (GTK_WINDOW (app->browser)); + return TRUE; + } + else if (g_str_equal (command, "new")) + { + MidoriBrowser* browser = midori_app_create_browser (app); + midori_app_add_browser (app, browser); + /* FIXME: Should open the homepage according to settings */ + midori_browser_add_uri (browser, ""); + midori_browser_activate_action (browser, "Location"); + gtk_window_set_screen (GTK_WINDOW (app->browser), screen); + gtk_widget_show (GTK_WIDGET (browser)); + return TRUE; + } + else if (g_str_equal (command, "open")) + { + gtk_window_set_screen (GTK_WINDOW (app->browser), screen); + gtk_window_present (GTK_WINDOW (app->browser)); + if (!uris) + return FALSE; + else + { + MidoriBrowser* browser; + MidoriNewPage open_external_pages_in; + gboolean first; + + g_object_get (app->settings, "open-external-pages-in", + &open_external_pages_in, NULL); + if (open_external_pages_in == MIDORI_NEW_PAGE_WINDOW) + { + browser = midori_app_create_browser (app); + midori_app_add_browser (app, browser); + gtk_window_set_screen (GTK_WINDOW (app->browser), screen); + gtk_widget_show (GTK_WIDGET (browser)); + } + else + browser = app->browser; + first = (open_external_pages_in == MIDORI_NEW_PAGE_CURRENT); + while (*uris) + { + gchar* fixed_uri = sokoke_magic_uri (*uris, NULL); + if (first) + { + midori_browser_set_current_uri (browser, fixed_uri); + first = FALSE; + } + else + midori_browser_set_current_page (browser, + midori_browser_add_uri (browser, fixed_uri)); + g_free (fixed_uri); + uris++; + } + return TRUE; + } + } + else if (g_str_equal (command, "command")) + { + if (!uris || !app->browser) + return FALSE; + midori_browser_activate_action (app->browser, *uris); + return TRUE; + } + + return FALSE; +} + #if HAVE_UNIQUE static UniqueResponse midori_browser_message_received_cb (UniqueApp* instance, @@ -391,98 +482,115 @@ midori_browser_message_received_cb (UniqueApp* instance, guint timestamp, MidoriApp* app) { - UniqueResponse response; - MidoriBrowser* browser; - gchar** uris; - MidoriNewPage open_external_pages_in; - gboolean first; + gboolean success; + GdkScreen* screen = unique_message_data_get_screen (message); switch (command) { case UNIQUE_ACTIVATE: - gtk_window_set_screen (GTK_WINDOW (app->browser), - unique_message_data_get_screen (message)); - gtk_window_present (GTK_WINDOW (app->browser)); - response = UNIQUE_RESPONSE_OK; + success = midori_app_command_received (app, "activate", NULL, screen); break; case UNIQUE_NEW: - browser = midori_app_create_browser (app); - midori_app_add_browser (app, browser); - /* FIXME: Should open the homepage according to settings */ - midori_browser_add_uri (browser, ""); - midori_browser_activate_action (browser, "Location"); - gtk_window_set_screen (GTK_WINDOW (app->browser), - unique_message_data_get_screen (message)); - gtk_widget_show (GTK_WIDGET (browser)); - response = UNIQUE_RESPONSE_OK; + success = midori_app_command_received (app, "new", NULL, screen); break; case UNIQUE_OPEN: - gtk_window_set_screen (GTK_WINDOW (app->browser), - unique_message_data_get_screen (message)); - gtk_window_present (GTK_WINDOW (app->browser)); - uris = unique_message_data_get_uris (message); - if (!uris) - response = UNIQUE_RESPONSE_FAIL; - else - { - g_object_get (app->settings, "open-external-pages-in", - &open_external_pages_in, NULL); - if (open_external_pages_in == MIDORI_NEW_PAGE_WINDOW) - { - browser = midori_app_create_browser (app); - midori_app_add_browser (app, browser); - gtk_window_set_screen (GTK_WINDOW (app->browser), - unique_message_data_get_screen (message)); - gtk_widget_show (GTK_WIDGET (browser)); - } - else - browser = app->browser; - first = (open_external_pages_in == MIDORI_NEW_PAGE_CURRENT); - while (*uris) - { - gchar* fixed_uri = sokoke_magic_uri (*uris, NULL); - if (first) - { - midori_browser_set_current_uri (browser, fixed_uri); - first = FALSE; - } - else - midori_browser_set_current_page (browser, - midori_browser_add_uri (browser, fixed_uri)); - g_free (fixed_uri); - uris++; - } - /* g_strfreev (uris); */ - response = UNIQUE_RESPONSE_OK; - } + { + gchar** uris = unique_message_data_get_uris (message); + success = midori_app_command_received (app, "open", uris, screen); + /* g_strfreev (uris); */ break; + } + case MIDORI_UNIQUE_COMMAND: + { + gchar** uris = unique_message_data_get_uris (message); + success = midori_app_command_received (app, "command", uris, screen); + /* g_strfreev (uris); */ + break; + } default: - response = UNIQUE_RESPONSE_FAIL; + success = FALSE; break; } - return response; + return success ? UNIQUE_RESPONSE_OK : UNIQUE_RESPONSE_FAIL; +} +#else +static gboolean +midori_app_io_channel_watch_cb (GIOChannel* channel, + GIOCondition condition, + MidoriApp* app) +{ + GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (app->browser)); + gint fd, sock; + gchar buf[4096]; + struct sockaddr_in caddr; + guint caddr_len = sizeof(caddr); + + fd = app->instance; + sock = accept (fd, (struct sockaddr *)&caddr, &caddr_len); + + while (fd_gets (sock, buf, sizeof (buf)) != -1) + { + if (strncmp (buf, "activate", 8) == 0) + { + midori_app_command_received (app, "open", NULL, screen); + } + else if (strncmp (buf, "new", 3) == 0) + { + midori_app_command_received (app, "new", NULL, screen); + } + else if (strncmp (buf, "open", 4) == 0) + { + while (fd_gets (sock, buf, sizeof (buf)) != -1 && *buf != '.') + { + gchar** uris = g_strsplit (g_strstrip (buf), "\n", 2); + midori_app_command_received (app, "open", uris, screen); + g_strfreev (uris); + } + } + else if (strncmp (buf, "command", 7) == 0) + { + guint i = 0; + gchar** uris = g_new (gchar*, 100); + while (fd_gets (sock, buf, sizeof (buf)) != -1 && *buf != '.') + { + uris[i++] = g_strdup (g_strstrip (buf)); + if (i == 99) + break; + } + uris[i] = NULL; + midori_app_command_received (app, "command", uris, screen); + g_strfreev (uris); + } + } + + gtk_window_present (GTK_WINDOW (app->browser)); + + fd_close (sock); + + return TRUE; } #endif -static gpointer +static MidoriAppInstance midori_app_create_instance (MidoriApp* app, const gchar* name) { - #if HAVE_UNIQUE - gpointer instance; + MidoriAppInstance instance; GdkDisplay* display; gchar* display_name; gchar* instance_name; guint i, n; + #if !HAVE_UNIQUE + gboolean exists; + GIOChannel* channel; #endif if (!name) name = "midori"; - #if HAVE_UNIQUE if (!(display = gdk_display_get_default ())) - return NULL; + return MidoriAppInstanceNull; display_name = g_strdup (gdk_display_get_name (display)); n = strlen (display_name); @@ -490,15 +598,25 @@ midori_app_create_instance (MidoriApp* app, if (display_name[i] == ':' || display_name[i] == '.') display_name[i] = '_'; instance_name = g_strdup_printf ("de.twotoasts.%s_%s", name, display_name); + + #if HAVE_UNIQUE instance = unique_app_new (instance_name, NULL); - g_free (instance_name); - g_free (display_name); + unique_app_add_command (instance, "midori-command", MIDORI_UNIQUE_COMMAND); g_signal_connect (instance, "message-received", G_CALLBACK (midori_browser_message_received_cb), app); - return instance; #else - return NULL; + instance = socket_init (instance_name, sokoke_set_config_dir (NULL), &exists); + g_object_set_data (G_OBJECT (app), "sock-exists", + exists ? (gpointer)0xdeadbeef : NULL); + channel = g_io_channel_unix_new (instance); + g_io_add_watch (channel, G_IO_IN | G_IO_PRI | G_IO_ERR, + (GIOFunc)midori_app_io_channel_watch_cb, app); #endif + + g_free (instance_name); + g_free (display_name); + + return instance; } static void @@ -514,7 +632,7 @@ midori_app_init (MidoriApp* app) app->extensions = NULL; app->browsers = katze_array_new (MIDORI_TYPE_BROWSER); - app->instance = NULL; + app->instance = MidoriAppInstanceNull; midori_app_init_libnotify (app); } @@ -535,7 +653,11 @@ midori_app_finalize (GObject* object) katze_object_assign (app->extensions, NULL); katze_object_assign (app->browsers, NULL); + #if HAVE_UNIQUE katze_object_assign (app->instance, NULL); + #else + sock_cleanup (); + #endif if (app->libnotify_module) { @@ -663,9 +785,6 @@ midori_app_new (void) * Use the "name" property if you want to run more * than one instance. * - * If Midori was built without single instance support - * this function will always return %FALSE. - * * Return value: %TRUE if an instance is already running **/ gboolean @@ -673,11 +792,13 @@ midori_app_instance_is_running (MidoriApp* app) { g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); - #if HAVE_UNIQUE - if (!app->instance) + if (app->instance == MidoriAppInstanceNull) app->instance = midori_app_create_instance (app, app->name); + #if HAVE_UNIQUE if (app->instance) return unique_app_is_running (app->instance); + #else + return g_object_get_data (G_OBJECT (app), "sock-exists") != NULL; #endif return FALSE; } @@ -710,6 +831,12 @@ midori_app_instance_send_activate (MidoriApp* app) if (response == UNIQUE_RESPONSE_OK) return TRUE; } + #else + if (app->instance > -1) + { + send_open_command (app->instance, "activate", NULL); + return TRUE; + } #endif return FALSE; } @@ -740,6 +867,12 @@ midori_app_instance_send_new_browser (MidoriApp* app) if (response == UNIQUE_RESPONSE_OK) return TRUE; } + #else + if (app->instance > -1) + { + send_open_command (app->instance, "new", NULL); + return TRUE; + } #endif return FALSE; } @@ -779,6 +912,63 @@ midori_app_instance_send_uris (MidoriApp* app, if (response == UNIQUE_RESPONSE_OK) return TRUE; } + #else + if (app->instance > -1) + { + send_open_command (app->instance, "open", uris); + return TRUE; + } + #endif + return FALSE; +} + +/** + * midori_app_send_command: + * @app: a #MidoriApp + * @command: a string vector of a command to execute + * + * Sends a command to an instance of Midori, which + * is either the current process or an already running + * instance with the same name on the default display. + * + * Names of GtkAction objects of MidoriBrowser are recognized as commands. + * + * Return value: %TRUE if the message was sent successfully + * + * Since: 0.1.8 + **/ +gboolean +midori_app_send_command (MidoriApp* app, + gchar** command) +{ + #if HAVE_UNIQUE + UniqueMessageData* message; + UniqueResponse response; + #endif + + /* g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); */ + g_return_val_if_fail (command != NULL, FALSE); + + if (!midori_app_instance_is_running (app)) + return midori_app_command_received (app, "command", command, NULL); + + #if HAVE_UNIQUE + if (app->instance) + { + message = unique_message_data_new (); + unique_message_data_set_uris (message, command); + response = unique_app_send_message (app->instance, + MIDORI_UNIQUE_COMMAND, message); + unique_message_data_free (message); + if (response == UNIQUE_RESPONSE_OK) + return TRUE; + } + #else + if (app->instance > -1) + { + send_open_command (app->instance, "command", command); + return TRUE; + } #endif return FALSE; } diff --git a/midori/midori-app.h b/midori/midori-app.h index 7b06ba30..1bdc00ef 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -54,6 +54,10 @@ gboolean midori_app_instance_send_uris (MidoriApp* app, gchar** uris); +gboolean +midori_app_send_command (MidoriApp* app, + gchar** command); + void midori_app_add_browser (MidoriApp* app, MidoriBrowser* browser); diff --git a/midori/midori-array.c b/midori/midori-array.c index af53f003..93195366 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -22,6 +22,13 @@ #include #endif +static void +katze_xbel_parse_info (KatzeItem* item, + xmlNodePtr cur); + +static gchar* +katze_item_metadata_to_xbel (KatzeItem* item); + #if HAVE_LIBXML static KatzeItem* katze_item_from_xmlNodePtr (xmlNodePtr cur) @@ -49,6 +56,8 @@ katze_item_from_xmlNodePtr (xmlNodePtr cur) katze_item_set_text (item, g_strstrip ((gchar*)key)); g_free (key); } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"info")) + katze_xbel_parse_info (item, cur); cur = cur->next; } return item; @@ -109,6 +118,52 @@ katze_array_from_xmlNodePtr (xmlNodePtr cur) return array; } +static void +katze_xbel_parse_info (KatzeItem* item, + xmlNodePtr cur) +{ + cur = cur->xmlChildrenNode; + while (cur) + { + if (!xmlStrcmp (cur->name, (const xmlChar*)"metadata")) + { + xmlChar* owner = xmlGetProp (cur, (xmlChar*)"owner"); + g_strstrip ((gchar*)owner); + /* FIXME: Save metadata from unknown owners */ + if (!g_strcmp0 ((gchar*)owner, "http://www.twotoasts.de")) + { + xmlAttrPtr properties = cur->properties; + while (properties) + { + if (!xmlStrcmp (properties->name, (xmlChar*)"owner")) + { + properties = properties->next; + continue; + } + xmlChar* value = xmlGetProp (cur, properties->name); + if (properties->ns && properties->ns->prefix) + { + gchar* ns_value = g_strdup_printf ("%s:%s", + properties->ns->prefix, properties->name); + katze_item_set_meta_string (item, + (gchar*)ns_value, (gchar*)value); + g_free (ns_value); + } + else + katze_item_set_meta_string (item, + (gchar*)properties->name, (gchar*)value); + xmlFree (value); + properties = properties->next; + } + } + xmlFree (owner); + } + else if (g_strcmp0 ((gchar*)cur->name, "text")) + g_critical ("Unexpected element <%s> in .", cur->name); + cur = cur->next; + } +} + /* Loads the contents from an xmlNodePtr into an array. */ static gboolean katze_array_from_xmlDocPtr (KatzeArray* array, @@ -153,8 +208,8 @@ katze_array_from_xmlDocPtr (KatzeArray* array, item = katze_item_from_xmlNodePtr (cur); else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) item = katze_item_new (); - /*else if (!xmlStrcmp (cur->name, (const xmlChar*)"info")) - item = katze_xbel_parse_info (xbel, cur);*/ + else if (!xmlStrcmp (cur->name, (const xmlChar*)"info")) + katze_xbel_parse_info (KATZE_ITEM (array), cur); if (item) katze_array_add_item (array, item); cur = cur->next; @@ -236,10 +291,12 @@ static gchar* katze_item_to_data (KatzeItem* item) { gchar* markup; + gchar* metadata; g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); markup = NULL; + metadata = katze_item_metadata_to_xbel (item); if (KATZE_IS_ARRAY (item)) { GString* _markup = g_string_new (NULL); @@ -254,10 +311,11 @@ katze_item_to_data (KatzeItem* item) /* gchar* folded = item->folded ? NULL : g_strdup_printf (" folded=\"no\""); */ gchar* title = _simple_xml_element ("title", katze_item_get_name (item)); gchar* desc = _simple_xml_element ("desc", katze_item_get_text (item)); - markup = g_strdup_printf ("\n%s%s%s\n", + markup = g_strdup_printf ("\n%s%s%s%s\n", "" /* folded ? folded : "" */, title, desc, - _markup->str); + _markup->str, + metadata); g_string_free (_markup, TRUE); /* g_free (folded); */ g_free (title); @@ -273,16 +331,42 @@ katze_item_to_data (KatzeItem* item) markup = g_strdup_printf ("\n%s%s%s\n", href, title, desc, - ""); + metadata); g_free (href); g_free (title); g_free (desc); } else markup = g_strdup ("\n"); + g_free (metadata); return markup; } +static gchar* +katze_item_metadata_to_xbel (KatzeItem* item) +{ + GList* keys = katze_item_get_meta_keys (item); + GString* markup; + /* FIXME: Allow specifying an alternative namespace/ URI */ + const gchar* namespace_uri = "http://www.twotoasts.de"; + const gchar* namespace = "midori"; + gsize i; + const gchar* key; + + if (!keys) + return g_strdup (""); + + markup = g_string_new ("\n\n\n"); + return g_string_free (markup, FALSE); +} + static gchar* katze_array_to_xbel (KatzeArray* array, GError** error) @@ -291,8 +375,10 @@ katze_array_to_xbel (KatzeArray* array, guint i; KatzeItem* item; gchar* item_xml; + const gchar* namespacing; gchar* title; gchar* desc; + gchar* metadata; gchar* outer_markup; inner_markup = g_string_new (NULL); @@ -304,20 +390,25 @@ katze_array_to_xbel (KatzeArray* array, g_free (item_xml); } + namespacing = " xmlns:midori=\"http://www.twotoasts.de\""; title = _simple_xml_element ("title", katze_item_get_name (KATZE_ITEM (array))); desc = _simple_xml_element ("desc", katze_item_get_text (KATZE_ITEM (array))); + metadata = katze_item_metadata_to_xbel (KATZE_ITEM (array)); outer_markup = g_strdup_printf ( - "%s%s\n%s%s%s\n", + "%s%s\n%s%s%s%s\n", "\n", "\n", + namespacing, title, desc, + metadata, inner_markup->str); g_string_free (inner_markup, TRUE); g_free (title); g_free (desc); + g_free (metadata); return outer_markup; } diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5cc4c829..f03a525f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -50,8 +50,9 @@ struct _MidoriBrowser GtkWidget* menu_tools; GtkWidget* throbber; GtkWidget* navigationbar; - GtkWidget* button_fullscreen; + GtkWidget* bookmark_popup; GtkWidget* bookmarkbar; + GtkToolItem* homepage; GtkWidget* panel; GtkWidget* notebook; @@ -83,6 +84,7 @@ struct _MidoriBrowser KatzeArray* trash; KatzeArray* search_engines; KatzeArray* history; + gboolean show_tabs; KatzeNet* net; @@ -118,7 +120,8 @@ enum PROP_BOOKMARKS, PROP_TRASH, PROP_SEARCH_ENGINES, - PROP_HISTORY + PROP_HISTORY, + PROP_SHOW_TABS, }; enum @@ -169,6 +172,10 @@ static void midori_browser_new_history_item (MidoriBrowser* browser, KatzeItem* item); +static void +_midori_browser_set_toolbar_style (MidoriBrowser* browser, + MidoriToolbarStyle toolbar_style); + static GtkAction* _action_by_name (MidoriBrowser* browser, const gchar* name) @@ -199,6 +206,9 @@ _toggle_tabbar_smartly (MidoriBrowser* browser) guint n; gboolean always_show_tabbar; + if (!browser->show_tabs) + return; + n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); if (n < 2 && browser->settings) { @@ -208,6 +218,7 @@ _toggle_tabbar_smartly (MidoriBrowser* browser) n++; } gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), n > 1); + gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), n > 1); } static void @@ -322,13 +333,12 @@ _midori_browser_update_interface (MidoriBrowser* browser) katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); action = _action_by_name (browser, "Location"); - if (browser->news_aggregator && *browser->news_aggregator - && g_object_get_data (G_OBJECT (view), "news-feeds")) + if (g_object_get_data (G_OBJECT (view), "news-feeds")) midori_location_action_set_secondary_icon ( MIDORI_LOCATION_ACTION (action), STOCK_NEWS_FEED); else midori_location_action_set_secondary_icon ( - MIDORI_LOCATION_ACTION (action), NULL); + MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); } static void @@ -336,9 +346,43 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser, const gchar* text) { katze_assign (browser->statusbar_text, g_strdup (text)); - gtk_statusbar_pop (GTK_STATUSBAR (browser->statusbar), 1); - gtk_statusbar_push (GTK_STATUSBAR (browser->statusbar), 1, - browser->statusbar_text ? browser->statusbar_text : ""); + + if (!GTK_WIDGET_VISIBLE (browser->statusbar)) + { + GtkAction* action = _action_by_name (browser, "Location"); + 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_secondary_icon (location_action, NULL); + } + else + { + GtkWidget* view = midori_browser_get_current_tab (browser); + if (G_LIKELY (view)) + { + if (g_object_get_data (G_OBJECT (view), "news-feeds")) + midori_location_action_set_secondary_icon ( + location_action, STOCK_NEWS_FEED); + else + midori_location_action_set_secondary_icon ( + location_action, GTK_STOCK_JUMP_TO); + midori_location_action_set_uri (location_action, + midori_view_get_display_uri (MIDORI_VIEW (view))); + } + } + } + else + { + gtk_statusbar_pop (GTK_STATUSBAR (browser->statusbar), 1); + gtk_statusbar_push (GTK_STATUSBAR (browser->statusbar), 1, + browser->statusbar_text ? browser->statusbar_text : ""); + } } static void @@ -436,7 +480,7 @@ midori_view_notify_load_status_cb (GtkWidget* view, midori_location_action_set_uri ( MIDORI_LOCATION_ACTION (action), uri); midori_location_action_set_secondary_icon ( - MIDORI_LOCATION_ACTION (action), NULL); + MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); g_object_notify (G_OBJECT (browser), "uri"); } @@ -859,13 +903,16 @@ midori_browser_speed_dial_get_next_free_slot (void) if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) { - if (g_file_get_contents (DATADIR "/midori/res/speeddial.json", - &speed_dial_body, NULL, NULL)) + gchar* filename = g_build_filename ("midori", "res", "speeddial.json", NULL); + gchar* filepath = sokoke_find_data_filename (filename); + g_free (filename); + if (g_file_get_contents (filepath, &speed_dial_body, NULL, NULL)) { g_file_set_contents (body_fname, speed_dial_body, -1, NULL); g_free (speed_dial_body); } + g_free (filepath); g_free (body_fname); return g_strdup ("s1"); } @@ -969,6 +1016,8 @@ midori_browser_add_speed_dial (MidoriBrowser* browser) if (g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL)) { + gint i; + gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); encoded = g_base64_encode ((guchar *)file_content, sz); @@ -985,6 +1034,12 @@ midori_browser_add_speed_dial (MidoriBrowser* browser) g_file_set_contents (body_fname, replace, -1, NULL); + i = 0; + while ((view = gtk_notebook_get_nth_page (GTK_NOTEBOOK ( + browser->notebook), i++))) + if (midori_view_is_blank (MIDORI_VIEW (view))) + midori_view_reload (MIDORI_VIEW (view), FALSE); + g_object_unref (img); g_regex_unref (regex); g_free (encoded); @@ -1114,9 +1169,12 @@ midori_browser_download_notify_status_cb (WebKitDownload* download, if (browser->settings && katze_object_get_boolean ( browser->settings, "notify-transfer-completed")) { + const gchar* uri = webkit_download_get_destination_uri (download); + gchar* path = soup_uri_decode (uri); + gchar* filename = g_strrstr (path, "/") + 1; gchar* msg = g_strdup_printf ( - _("The file %s has been downloaded."), - webkit_download_get_suggested_filename (download)); + _("The file %s has been downloaded."), filename); + g_free (path); g_signal_emit (browser, signals[SEND_NOTIFICATION], 0, _("Transfer completed"), msg); @@ -1181,6 +1239,7 @@ midori_browser_add_download_item (MidoriBrowser* browser, GtkWidget* icon; GtkWidget* button; GtkWidget* progress; + const gchar* uri; gint width; box = gtk_hbox_new (FALSE, 0); @@ -1189,8 +1248,16 @@ midori_browser_add_download_item (MidoriBrowser* browser, progress = gtk_progress_bar_new (); gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (progress), PANGO_ELLIPSIZE_MIDDLE); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), - webkit_download_get_suggested_filename (download)); + if ((uri = webkit_download_get_destination_uri (download))) + { + gchar* path = soup_uri_decode (uri); + gchar* filename = g_strrstr (path, "/") + 1; + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), filename); + g_free (path); + } + else + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), + webkit_download_get_suggested_filename (download)); sokoke_widget_get_text_size (progress, "M", &width, NULL); gtk_widget_set_size_request (progress, width * 10, -1); /* Avoid a bug in WebKit */ @@ -1216,6 +1283,25 @@ midori_browser_add_download_item (MidoriBrowser* browser, G_CALLBACK (midori_browser_download_button_clicked_cb), download); } +static void +midori_view_download_save_as_response_cb (GtkWidget* dialog, + gint response, + MidoriBrowser* browser) +{ + WebKitDownload* download = g_object_get_data (G_OBJECT (dialog), "download"); + if (response == GTK_RESPONSE_ACCEPT) + { + gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); + webkit_download_set_destination_uri (download, uri); + midori_browser_add_download_item (browser, download); + g_free (uri); + webkit_download_start (download); + } + else + g_object_unref (download); + gtk_widget_hide (dialog); +} + static gboolean midori_view_download_requested_cb (GtkWidget* view, WebKitDownload* download, @@ -1225,22 +1311,51 @@ midori_view_download_requested_cb (GtkWidget* view, if (!webkit_download_get_destination_uri (download)) { gchar* folder; - gchar* filename; - gchar* uri; + if (g_object_get_data (G_OBJECT (download), "save-as-download")) + { + static GtkWidget* dialog = NULL; - if (g_object_get_data (G_OBJECT (download), "open-download")) - folder = g_strdup (g_get_tmp_dir ()); + if (!dialog) + { + dialog = gtk_file_chooser_dialog_new ( + _("Save file"), GTK_WINDOW (browser), + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_SAVE); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (browser)); + gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); + folder = katze_object_get_string (browser->settings, "download-folder"); + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), folder); + g_free (folder); + g_signal_connect (dialog, "response", + G_CALLBACK (midori_view_download_save_as_response_cb), browser); + } + g_object_set_data (G_OBJECT (dialog), "download", download); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), + webkit_download_get_suggested_filename (download)); + gtk_widget_show (dialog); + } else - folder = katze_object_get_string (browser->settings, "download-folder"); - filename = g_build_filename (folder, - webkit_download_get_suggested_filename (download), NULL); - g_free (folder); - uri = g_filename_to_uri (filename, NULL, NULL); - g_free (filename); - webkit_download_set_destination_uri (download, uri); - g_free (uri); + { + gchar* filename; + gchar* uri; + + if (g_object_get_data (G_OBJECT (download), "open-download")) + folder = g_strdup (g_get_tmp_dir ()); + else + folder = katze_object_get_string (browser->settings, "download-folder"); + filename = g_build_filename (folder, + webkit_download_get_suggested_filename (download), NULL); + g_free (folder); + uri = g_filename_to_uri (filename, NULL, NULL); + g_free (filename); + webkit_download_set_destination_uri (download, uri); + g_free (uri); + midori_browser_add_download_item (browser, download); + } } - midori_browser_add_download_item (browser, download); return TRUE; } #endif @@ -1789,6 +1904,25 @@ midori_browser_class_init (MidoriBrowserClass* class) KATZE_TYPE_ARRAY, flags)); + /** + * MidoriBrowser:show-tabs: + * + * Whether or not to show tabs. + * + * If disabled, no tab labels are shown. This is intended for + * extensions that want to provide alternative tab labels. + * + * Since 0.1.8 + */ + g_object_class_install_property (gobject_class, + PROP_SHOW_TABS, + g_param_spec_boolean ( + "show-tabs", + "Show Tabs", + "Whether or not to show tabs", + TRUE, + flags)); + /* Add 2px space between tool buttons */ gtk_rc_parse_string ( "style \"tool-button-style\"\n {\n" @@ -2159,16 +2293,9 @@ midori_browser_navigationbar_notify_style_cb (GObject* object, MidoriBrowser* browser) { MidoriToolbarStyle toolbar_style; - GtkToolbarStyle gtk_toolbar_style; g_object_get (browser->settings, "toolbar-style", &toolbar_style, NULL); - if (toolbar_style == MIDORI_TOOLBAR_DEFAULT) - { - g_object_get (browser->settings, - "gtk-toolbar-style", >k_toolbar_style, NULL); - gtk_toolbar_set_style (GTK_TOOLBAR (browser->navigationbar), - gtk_toolbar_style); - } + _midori_browser_set_toolbar_style (browser, toolbar_style); } static gboolean @@ -2191,7 +2318,7 @@ _midori_browser_save_toolbar_items (MidoriBrowser* browser) GtkAction* action = gtk_widget_get_action (GTK_WIDGET (children->data)); /* If a widget has no action that is actually a bug, so warn about it */ g_warn_if_fail (action != NULL); - if (action && strcmp (gtk_action_get_name (action), "Fullscreen")) + if (action) { g_string_append (toolbar_items, gtk_action_get_name (action)); g_string_append (toolbar_items, ","); @@ -2201,50 +2328,30 @@ _midori_browser_save_toolbar_items (MidoriBrowser* browser) g_object_set (browser->settings, "toolbar-items", items, NULL); g_free (items); } - -static void -midori_browser_toolbar_add_item_cb (GtkWidget* menuitem, - MidoriBrowser* browser) -{ - GtkWidget* widget = g_object_get_data (G_OBJECT (menuitem), "widget"); - GtkAction* widget_action = g_object_get_data (G_OBJECT (menuitem), "action"); - GtkWidget* toolitem = gtk_action_create_tool_item (widget_action); - if (widget) - { - gint i = gtk_toolbar_get_item_index (GTK_TOOLBAR (browser->navigationbar), - GTK_TOOL_ITEM (widget)); - gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), - GTK_TOOL_ITEM (toolitem), i ? i : 0); - } - else - gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), - GTK_TOOL_ITEM (toolitem), 0); - if (gtk_bin_get_child (GTK_BIN (toolitem))) - g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), - "button-press-event", - G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), - browser); - else - { - gtk_tool_item_set_use_drag_window (GTK_TOOL_ITEM (toolitem), TRUE); - g_signal_connect (toolitem, - "button-press-event", - G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), - browser); - } - _midori_browser_save_toolbar_items (browser); -} - -static void -midori_browser_toolbar_remove_item_cb (GtkWidget* menuitem, - MidoriBrowser* browser) -{ - GtkWidget* widget = g_object_get_data (G_OBJECT (menuitem), "widget"); - gtk_container_remove (GTK_CONTAINER (browser->navigationbar), widget); - _midori_browser_save_toolbar_items (browser); -} #endif +/** + * midori_browser_get_toolbar_actions: + * + * Retrieves a list of actions which are suitable for use in a toolbar. + * + * Return value: a NULL-terminated array of strings with actions + * + * Since: 0.1.8 + **/ +const gchar** +midori_browser_get_toolbar_actions (MidoriBrowser* browser) +{ + static const gchar* actions[] = { + "WindowNew", "TabNew", "Open", "SaveAs", "Print", "Find", + "Fullscreen", "Preferences", "Window", "Bookmarks", + "RecentlyVisited", "ReloadStop", "ZoomIn", + "ZoomOut", "Separator", "Back", "Forward", "Homepage", + "Panel", "Trash", "Search", NULL }; + + return actions; +} + static gboolean midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, gint x, @@ -2276,68 +2383,6 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, _action_by_name (browser, "Statusbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - #if !HAVE_HILDON - if (widget == browser->navigationbar || - gtk_widget_is_ancestor (widget, browser->navigationbar)) - { - GtkAction* widget_action = gtk_widget_get_action (widget); - const gchar* actions[] = { "TabNew", "Open", "SaveAs", "Print", "Find", - "Preferences", "Window", "Bookmarks", "RecentlyVisited", "AddSpeedDial", - "ReloadStop", "ZoomIn", "Separator", "ZoomOut", "Back", "Forward", - "Homepage", "Panel", "Trash", "Search" }; - GtkWidget* submenu; - gsize i; - - menuitem = gtk_separator_menu_item_new (); - gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - submenu = gtk_menu_new (); - menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_ADD, NULL); - gtk_widget_show (menuitem); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_REMOVE, NULL); - gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - if (widget_action && - strcmp (gtk_action_get_name (widget_action), "Location")) - { - g_object_set_data (G_OBJECT (menuitem), "widget", widget); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_toolbar_remove_item_cb), browser); - } - else - gtk_widget_set_sensitive (menuitem, FALSE); - - for (i = 0; i < G_N_ELEMENTS (actions); i++) - { - GtkAction* action = _action_by_name (browser, actions[i]); - gchar* stock_id = katze_object_get_string (action, "stock-id"); - gchar* label = katze_object_get_string (action, "label"); - - if (stock_id && label) - { - GtkWidget* icon; - - menuitem = gtk_image_menu_item_new_with_mnemonic (label); - icon = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - } - else if (stock_id) - menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); - else - menuitem = gtk_image_menu_item_new_with_mnemonic (label); - gtk_menu_shell_append (GTK_MENU_SHELL (submenu), menuitem); - if (widget_action) - g_object_set_data (G_OBJECT (menuitem), "widget", widget); - g_object_set_data (G_OBJECT (menuitem), "action", action); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_toolbar_add_item_cb), browser); - } - sokoke_container_show_children (GTK_CONTAINER (submenu)); - } - #endif - katze_widget_popup (widget, GTK_MENU (menu), NULL, button == -1 ? KATZE_MENU_POSITION_LEFT : KATZE_MENU_POSITION_CURSOR); return TRUE; @@ -2492,6 +2537,42 @@ _action_window_activate_item (GtkAction* action, } } +static void +_action_compact_menu_populate_popup (GtkAction* action, + GtkMenu* menu, + MidoriBrowser* browser) +{ + static const GtkActionEntry actions[] = { + { "TabNew" }, + { "WindowNew" }, + { "Open" }, + { "PrivateBrowsing" }, + { "Print" }, + { NULL }, + { "Bookmarkbar" }, + { "Panel" }, + { "Statusbar" }, + { NULL }, + { "Fullscreen" }, + { "Preferences" }, + { "ClearPrivateData" }, + }; + guint i; + + for (i = 0; i < G_N_ELEMENTS (actions); i++) + { + GtkWidget* menuitem; + if (actions[i].name != NULL) + 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_all (GTK_WIDGET (menu)); +} + static void midori_preferences_response_help_cb (GtkWidget* preferences, gint response, @@ -2533,6 +2614,39 @@ _action_menubar_activate (GtkToggleAction* action, g_object_set (browser->settings, "show-menubar", active, NULL); #if !HAVE_HILDON sokoke_widget_set_visible (browser->menubar, active); + if (browser->settings) + { + if (active) + { + GtkContainer* navigationbar = GTK_CONTAINER (browser->navigationbar); + GList* children = gtk_container_get_children (navigationbar); + GtkAction* menu_action = _action_by_name (browser, "CompactMenu"); + for (; children != NULL; children = g_list_next (children)) + { + GtkAction* action_; + action_ = gtk_widget_get_action (GTK_WIDGET (children->data)); + if (action_ == menu_action) + { + gtk_container_remove (navigationbar, + GTK_WIDGET (children->data)); + _midori_browser_save_toolbar_items (browser); + break; + } + } + } + else + { + GtkAction* widget_action = _action_by_name (browser, "CompactMenu"); + GtkWidget* toolitem = gtk_action_create_tool_item (widget_action); + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), + GTK_TOOL_ITEM (toolitem), -1); + g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), + "button-press-event", + G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), + browser); + _midori_browser_save_toolbar_items (browser); + } + } #endif } @@ -2636,6 +2750,7 @@ _action_zoom_normal_activate (GtkAction* action, static void _action_view_encoding_activate (GtkAction* action, + GtkAction* current, MidoriBrowser* browser) { GtkWidget* view = midori_browser_get_current_tab (browser); @@ -2644,7 +2759,7 @@ _action_view_encoding_activate (GtkAction* action, const gchar* name; GtkWidget* web_view; - name = gtk_action_get_name (action); + name = gtk_action_get_name (current); web_view = gtk_bin_get_child (GTK_BIN (view)); if (!strcmp (name, "EncodingAutomatic")) g_object_set (web_view, "custom-encoding", NULL, NULL); @@ -2898,12 +3013,121 @@ _action_location_active_changed (GtkAction* action, } } +static void +midori_browser_bookmark_homepage_clicked_cb (GtkToolItem* button, + MidoriBrowser* browser) +{ + gchar* homepage; + g_object_get (browser->settings, "homepage", &homepage, NULL); + midori_browser_set_current_uri (browser, homepage); + g_free (homepage); + 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, + GtkWidget* toolbar); + +static void +_action_location_focus_in (GtkAction* action, + MidoriBrowser* browser) +{ + 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 _action_location_focus_out (GtkAction* action, MidoriBrowser* browser) { + 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); + + if (g_object_get_data (G_OBJECT (view), "news-feeds")) + midori_location_action_set_secondary_icon ( + MIDORI_LOCATION_ACTION (action), STOCK_NEWS_FEED); + else + midori_location_action_set_secondary_icon ( + MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); } static void @@ -2922,12 +3146,16 @@ _action_location_submit_uri (GtkAction* action, gboolean new_tab, MidoriBrowser* browser) { + gchar* stripped_uri; gchar* new_uri; gint n; - new_uri = sokoke_magic_uri (uri, browser->search_engines); + stripped_uri = g_strdup (uri); + g_strstrip (stripped_uri); + new_uri = sokoke_magic_uri (stripped_uri, browser->search_engines); if (!new_uri) - new_uri = sokoke_search_uri (browser->location_entry_search, uri); + new_uri = sokoke_search_uri (browser->location_entry_search, stripped_uri); + g_free (stripped_uri); if (new_tab) { @@ -2950,8 +3178,12 @@ _action_location_secondary_icon_released (GtkAction* action, if ((view = midori_browser_get_current_tab (browser))) { const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); - if (browser->news_aggregator && *browser->news_aggregator) + if (gtk_window_get_focus (GTK_WINDOW (browser)) == widget) + _action_location_submit_uri (action, uri, FALSE, browser); + else if (g_object_get_data (G_OBJECT (view), "news-feeds")) sokoke_spawn_program (browser->news_aggregator, uri, TRUE); + else + _action_location_submit_uri (action, uri, FALSE, browser); } } @@ -3709,6 +3941,16 @@ midori_panel_notify_position_cb (GObject* hpaned, (GSourceFunc)midori_browser_panel_timeout, hpaned, NULL); } +static void +midori_panel_notify_page_cb (MidoriPanel* panel, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + gint page = katze_object_get_boolean (panel, "page"); + if (browser->settings && page > -1) + g_object_set (browser->settings, "last-panel-page", page, NULL); +} + static void midori_panel_notify_right_aligned_cb (MidoriPanel* panel, GParamSpec* pspec, @@ -3717,6 +3959,8 @@ midori_panel_notify_right_aligned_cb (MidoriPanel* panel, gboolean right_aligned = katze_object_get_boolean (panel, "right-aligned"); GtkWidget* hpaned = gtk_widget_get_parent (browser->panel); GtkWidget* vpaned = gtk_widget_get_parent (browser->notebook); + gint paned_position = gtk_paned_get_position (GTK_PANED (hpaned)); + gint paned_size = hpaned->allocation.width; if (browser->settings) g_object_set (browser->settings, "right-align-sidepanel", @@ -3736,6 +3980,7 @@ midori_panel_notify_right_aligned_cb (MidoriPanel* panel, gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, FALSE, FALSE); } + gtk_paned_set_position (GTK_PANED (hpaned), paned_size - paned_position); g_object_unref (browser->panel); g_object_unref (vpaned); } @@ -3774,6 +4019,9 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, gtk_window_set_title (GTK_WINDOW (browser), window_title); g_free (window_title); + if (browser->proxy_array) + katze_item_set_meta_integer (KATZE_ITEM (browser->proxy_array), "current", + midori_browser_get_current_page (browser)); g_object_notify (G_OBJECT (browser), "uri"); _midori_browser_set_statusbar_text (browser, NULL); @@ -3794,14 +4042,18 @@ midori_browser_notebook_page_reordered_cb (GtkNotebook* notebook, } static gboolean -gtk_notebook_button_press_event_cb (GtkNotebook* notebook, - GdkEventButton* event, - MidoriBrowser* browser) +midori_browser_notebook_button_press_event_after_cb (GtkNotebook* notebook, + GdkEventButton* event, + MidoriBrowser* browser) { + if (event->window != notebook->event_window) + return FALSE; + + /* FIXME: Handle double click only when it wasn't handled by GtkNotebook */ + /* Open a new tab on double click or middle mouse click */ - if (event->window == notebook->event_window - && ((event->type == GDK_2BUTTON_PRESS && event->button == 1) - || (event->type == GDK_BUTTON_PRESS && event->button == 2))) + if (/*(event->type == GDK_2BUTTON_PRESS && event->button == 1) + || */(event->type == GDK_BUTTON_PRESS && event->button == 2)) { gint n; GtkWidget* view; @@ -3939,29 +4191,8 @@ static const GtkActionEntry entries[] = { NULL, "0", N_("Reset the zoom level"), G_CALLBACK (_action_zoom_normal_activate) }, { "Encoding", NULL, N_("_Encoding") }, - { "EncodingAutomatic", NULL, - N_("_Automatic"), "", - NULL, G_CALLBACK (_action_view_encoding_activate) }, - { "EncodingChinese", NULL, - N_("Chinese (BIG5)"), "", - NULL, G_CALLBACK (_action_view_encoding_activate) }, - { "EncodingJapanese", NULL, - N_("Japanese (SHIFT_JIS)"), "", - NULL, G_CALLBACK (_action_view_encoding_activate) }, - { "EncodingRussian", NULL, - N_("Russian (KOI8-R)"), "", - NULL, G_CALLBACK (_action_view_encoding_activate) }, - { "EncodingUnicode", NULL, - N_("Unicode (UTF-8)"), "", - NULL, G_CALLBACK (_action_view_encoding_activate) }, - { "EncodingWestern", NULL, - N_("Western (ISO-8859-1)"), "", - NULL, G_CALLBACK (_action_view_encoding_activate) }, - { "EncodingCustom", NULL, - N_("Custom..."), "", - NULL, G_CALLBACK (_action_view_encoding_activate) }, { "SourceView", NULL, - N_("View _Source"), "U", + N_("View So_urce"), "U", N_("View the source code of the page"), G_CALLBACK (_action_source_view_activate) }, { "SelectionSourceView", NULL, N_("View Selection Source"), "", @@ -3985,14 +4216,14 @@ static const GtkActionEntry entries[] = { N_("Empty Trash"), "", N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) }, { "UndoTabClose", GTK_STOCK_UNDELETE, - N_("Undo Close Tab"), "t", + N_("Undo _Close Tab"), "t", N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) }, { "BookmarkAdd", STOCK_BOOKMARK_ADD, NULL, "d", N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) }, { "BookmarkFolderAdd", GTK_STOCK_DIRECTORY, - N_("Add a new folder"), "", + 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, @@ -4062,6 +4293,32 @@ static const GtkToggleActionEntry toggle_entries[] = { }; static const guint toggle_entries_n = G_N_ELEMENTS (toggle_entries); +static const GtkRadioActionEntry encoding_entries[] = { +{ "EncodingAutomatic", NULL, + N_("_Automatic"), "", + NULL, 1 }, + { "EncodingChinese", NULL, + N_("Chinese (BIG5)"), "", + NULL, 1 }, + { "EncodingJapanese", NULL, + /* i18n: A double underscore "__" is used to prevent an unwanted mnemonic */ + N_("Japanese (SHIFT__JIS)"), "", + NULL, 1 }, + { "EncodingRussian", NULL, + N_("Russian (KOI8-R)"), "", + NULL, 1 }, + { "EncodingUnicode", NULL, + N_("Unicode (UTF-8)"), "", + NULL, 1 }, + { "EncodingWestern", NULL, + N_("Western (ISO-8859-1)"), "", + NULL, 1 }, + { "EncodingCustom", NULL, + N_("Custom..."), "", + NULL, 1 }, + }; + static const guint encoding_entries_n = G_N_ELEMENTS (encoding_entries); + static void midori_browser_window_state_event_cb (MidoriBrowser* browser, GdkEventWindowState* event) @@ -4080,17 +4337,11 @@ midori_browser_window_state_event_cb (MidoriBrowser* browser, if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) { gtk_widget_hide (browser->menubar); - g_object_set (browser->button_fullscreen, - "stock-id", GTK_STOCK_LEAVE_FULLSCREEN, NULL); - gtk_widget_show (browser->button_fullscreen); } else { if (katze_object_get_boolean (browser->settings, "show-menubar")) gtk_widget_show (browser->menubar); - gtk_widget_hide (browser->button_fullscreen); - g_object_set (browser->button_fullscreen, - "stock-id", GTK_STOCK_FULLSCREEN, NULL); } } } @@ -4119,7 +4370,16 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser, if (GTK_WIDGET_REALIZED (widget)) { + gpointer last_page; GdkWindowState state = gdk_window_get_state (widget->window); + + if ((last_page = g_object_get_data (G_OBJECT (browser), "last-page"))) + { + midori_panel_set_current_page (MIDORI_PANEL (browser->panel), + GPOINTER_TO_INT (last_page)); + g_object_set_data (G_OBJECT (browser), "last-page", NULL); + } + if (!(state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) && !browser->alloc_timeout) @@ -4175,8 +4435,10 @@ static const gchar* ui_markup = "" "" "" + #ifndef G_OS_WIN32 "" "" + #endif "" "" "" @@ -4221,6 +4483,10 @@ static const gchar* ui_markup = "" "" /* Panel items shall be appended here */ + #ifdef G_OS_WIN32 + "" + "" + #endif "" "" "" @@ -4319,51 +4585,11 @@ midori_browser_history_remove_item_cb (KatzeArray* folder, KatzeItem* item, MidoriBrowser* browser) { - GtkAction* action; - - action = _action_by_name (browser, "Location"); - midori_location_action_delete_item_from_uri ( - MIDORI_LOCATION_ACTION (action), katze_item_get_uri (item)); - g_signal_handlers_disconnect_by_func (folder, - midori_browser_history_remove_item_cb, - browser); - - action = _action_by_name (browser, "RecentlyVisited"); + GtkAction* action = _action_by_name (browser, "RecentlyVisited"); if ((KatzeArray*)item == katze_array_action_get_array (KATZE_ARRAY_ACTION (action))) g_object_set (action, "array", NULL, NULL); } -static void -_location_action_insert_history_item (MidoriLocationAction* action, - MidoriBrowser* browser, - KatzeItem* item) -{ - KatzeItem* child; - guint i; - const gchar* uri; - GdkPixbuf* pixbuf = NULL; - - if (KATZE_IS_ARRAY (item)) - { - for (i = katze_array_get_length (KATZE_ARRAY (item)); i > 0; i--) - { - child = katze_array_get_nth_item (KATZE_ARRAY (item), i - 1); - _location_action_insert_history_item (action, browser, child); - } - } - else - { - uri = katze_item_get_uri (item); - pixbuf = katze_net_load_icon (browser->net, katze_item_get_uri (item), - NULL, GTK_WIDGET (browser), NULL); - midori_location_action_add_item (action, uri, - pixbuf, katze_item_get_name (item)); - g_object_unref (pixbuf); - g_signal_connect (katze_item_get_parent (item), "remove-item", - G_CALLBACK (midori_browser_history_remove_item_cb), browser); - } -} - static void midori_browser_history_clear_cb (KatzeArray* history, MidoriBrowser* browser) @@ -4379,7 +4605,6 @@ midori_browser_set_history (MidoriBrowser* browser, KatzeArray* history) { KatzeItem* recently_visited; - GtkAction* action; time_t now; gint64 day; @@ -4407,17 +4632,40 @@ midori_browser_set_history (MidoriBrowser* browser, if (!history) return; + g_signal_connect (browser->history, "remove-item", + G_CALLBACK (midori_browser_history_remove_item_cb), browser); g_signal_connect (browser->history, "clear", G_CALLBACK (midori_browser_history_clear_cb), browser); now = time (NULL); day = sokoke_time_t_to_julian (&now); - action = _action_by_name (browser, "Location"); - midori_location_action_freeze (MIDORI_LOCATION_ACTION (action)); - _location_action_insert_history_item (MIDORI_LOCATION_ACTION (action), - browser, KATZE_ITEM (browser->history)); - midori_location_action_thaw (MIDORI_LOCATION_ACTION (action)); + g_object_set (_action_by_name (browser, "Location"), "history", + browser->history, NULL); +} + +static void +midori_browser_accel_switch_tab_activate_cb (GtkAccelGroup* accel_group, + GObject* acceleratable, + guint keyval, + GdkModifierType modifiers) +{ + GtkAccelGroupEntry* entry; + + if ((entry = gtk_accel_group_query (accel_group, keyval, modifiers, NULL))) + { + gint n; + MidoriBrowser* browser; + GtkWidget* view; + + n = keyval - GDK_0; + if (n == 0) + n = 10; + browser = g_object_get_data (G_OBJECT (accel_group), "midori-browser"); + if ((view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), + n - 1))) + midori_browser_set_current_tab (browser, view); + } } static void @@ -4425,6 +4673,8 @@ midori_browser_init (MidoriBrowser* browser) { GtkWidget* vbox; GtkUIManager* ui_manager; + GtkAccelGroup* accel_group; + guint i; GError* error; GtkAction* action; GtkWidget* menuitem; @@ -4445,6 +4695,7 @@ 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; @@ -4460,6 +4711,7 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (midori_browser_size_allocate_cb), NULL); g_signal_connect (browser, "destroy", G_CALLBACK (midori_browser_destroy_cb), NULL); + gtk_window_set_role (GTK_WINDOW (browser), "browser"); gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser"); gtk_window_set_title (GTK_WINDOW (browser), g_get_application_name ()); vbox = gtk_vbox_new (FALSE, 0); @@ -4473,10 +4725,25 @@ midori_browser_init (MidoriBrowser* browser) entries, entries_n, browser); gtk_action_group_add_toggle_actions (browser->action_group, toggle_entries, toggle_entries_n, browser); + gtk_action_group_add_radio_actions (browser->action_group, + encoding_entries, encoding_entries_n, 0, + G_CALLBACK (_action_view_encoding_activate), browser); ui_manager = gtk_ui_manager_new (); gtk_ui_manager_insert_action_group (ui_manager, browser->action_group, 0); - gtk_window_add_accel_group (GTK_WINDOW (browser), - gtk_ui_manager_get_accel_group (ui_manager)); + accel_group = gtk_ui_manager_get_accel_group (ui_manager); + gtk_window_add_accel_group (GTK_WINDOW (browser), accel_group); + + g_object_set_data (G_OBJECT (accel_group), "midori-browser", browser); + for (i = 0; i < 10; i++) + { + gchar* accel_path = g_strdup_printf ("/Browser/SwitchTab%d", i); + GClosure* closure = g_cclosure_new ( + G_CALLBACK (midori_browser_accel_switch_tab_activate_cb), + browser, NULL); + gtk_accel_map_add_entry (accel_path, GDK_0 + i, GDK_MOD1_MASK); + gtk_accel_group_connect_by_path (accel_group, accel_path, closure); + g_free (accel_path); + } error = NULL; if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_markup, -1, &error)) @@ -4507,6 +4774,8 @@ midori_browser_init (MidoriBrowser* browser) _action_location_activate, browser, "signal::active-changed", _action_location_active_changed, browser, + "signal::focus-in", + _action_location_focus_in, browser, "signal::focus-out", _action_location_focus_out, browser, "signal::reset-uri", @@ -4608,6 +4877,20 @@ 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", "CompactMenu", + "label", _("_Menu"), + "stock-id", STOCK_WEB_BROWSER, + "tooltip", _("Menu"), + "array", katze_array_new (KATZE_TYPE_ITEM), + NULL); + g_object_connect (action, + "signal::populate-popup", + _action_compact_menu_populate_popup, browser, + NULL); + gtk_action_group_add_action (browser->action_group, action); + g_object_unref (action); + /* Create the menubar */ browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); #if HAVE_HILDON @@ -4643,7 +4926,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_ui_manager_get_widget (ui_manager, "/menubar/Tools"))); menuitem = gtk_separator_menu_item_new (); gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_tools), menuitem); + gtk_menu_shell_insert (GTK_MENU_SHELL (browser->menu_tools), menuitem, 3); homepage = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Homepage"); g_signal_connect (homepage, "button-press-event", @@ -4696,6 +4979,12 @@ midori_browser_init (MidoriBrowser* browser) GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (browser->bookmarkbar), GTK_TOOLBAR_BOTH_HORIZ); + browser->homepage = gtk_tool_button_new_from_stock (STOCK_HOMEPAGE); + gtk_tool_item_set_is_important (browser->homepage, TRUE); + gtk_widget_show (GTK_WIDGET (browser->homepage)); + g_signal_connect (browser->homepage, "clicked", + G_CALLBACK (midori_browser_bookmark_homepage_clicked_cb), browser); + gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), browser->homepage, -1); #if HAVE_HILDON hildon_window_add_toolbar (HILDON_WINDOW (browser), GTK_TOOLBAR (browser->bookmarkbar)); @@ -4715,6 +5004,8 @@ 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", @@ -4739,8 +5030,8 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect (browser->notebook, "page-reordered", G_CALLBACK (midori_browser_notebook_page_reordered_cb), browser); - g_signal_connect (browser->notebook, "button-press-event", - G_CALLBACK (gtk_notebook_button_press_event_cb), + g_signal_connect_after (browser->notebook, "button-press-event", + G_CALLBACK (midori_browser_notebook_button_press_event_after_cb), browser); gtk_widget_show (browser->notebook); @@ -4913,7 +5204,11 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser, GtkToolbarStyle gtk_toolbar_style; GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); if (toolbar_style == MIDORI_TOOLBAR_DEFAULT && gtk_settings) + #ifdef G_OS_WIN32 + gtk_toolbar_style = GTK_TOOLBAR_ICONS; + #else g_object_get (gtk_settings, "gtk-toolbar-style", >k_toolbar_style, NULL); + #endif else { switch (toolbar_style) @@ -5004,14 +5299,6 @@ _midori_browser_set_toolbar_items (MidoriBrowser* browser, name++; } g_strfreev (names); - - action = gtk_action_group_get_action (browser->action_group, "Fullscreen"); - browser->button_fullscreen = gtk_action_create_tool_item (action); - gtk_widget_hide (browser->button_fullscreen); - g_signal_connect (browser->button_fullscreen, "clicked", - G_CALLBACK (_action_fullscreen_activate), browser); - gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), - GTK_TOOL_ITEM (browser->button_fullscreen), -1); } static void @@ -5024,6 +5311,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) gint last_panel_position, last_panel_page; gboolean show_menubar, show_bookmarkbar; gboolean show_panel, show_transferbar; + gchar* homepage; MidoriToolbarStyle toolbar_style; gchar* toolbar_items; gint last_web_search; @@ -5049,6 +5337,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "show-panel", &show_panel, "show-transferbar", &show_transferbar, "show-statusbar", &browser->show_statusbar, + "homepage", &homepage, "speed-dial-in-new-tabs", &browser->speed_dial_in_new_tabs, "toolbar-style", &toolbar_style, "toolbar-items", &toolbar_items, @@ -5117,7 +5406,13 @@ _midori_browser_update_settings (MidoriBrowser* browser) right_align_sidepanel); gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)), last_panel_position); - midori_panel_set_current_page (MIDORI_PANEL (browser->panel), last_panel_page); + /* The browser may not yet be visible, which means that we can't set the + page. So we set it in midori_browser_size_allocate_cb */ + if (GTK_WIDGET_VISIBLE (browser)) + midori_panel_set_current_page (MIDORI_PANEL (browser->panel), last_panel_page); + else + g_object_set_data (G_OBJECT (browser), "last-page", + GINT_TO_POINTER (last_panel_page)); _action_set_active (browser, "Menubar", show_menubar); _action_set_active (browser, "Navigationbar", browser->show_navigationbar); @@ -5128,6 +5423,10 @@ _midori_browser_update_settings (MidoriBrowser* browser) #endif _action_set_active (browser, "Statusbar", browser->show_statusbar); + sokoke_widget_set_visible (GTK_WIDGET (browser->homepage), + homepage && *homepage); + + g_free (homepage); g_free (toolbar_items); } @@ -5160,6 +5459,9 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, browser->speed_dial_in_new_tabs = g_value_get_boolean (&value); else if (name == g_intern_string ("progress-in-location")) browser->progress_in_location = g_value_get_boolean (&value); + else if (name == g_intern_string ("homepage")) + sokoke_widget_set_visible (GTK_WIDGET (browser->homepage), + g_value_get_string (&value) && *g_value_get_string (&value)); else if (name == g_intern_string ("search-engines-in-completion")) { if (g_value_get_boolean (&value)) @@ -5186,10 +5488,11 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, } static void -browser_bookmarks_add_item_cb (KatzeArray* array, - KatzeItem* item, - MidoriBrowser* browser) +browser_bookmarks_add_item_cb (KatzeArray* array, + KatzeItem* item, + GtkWidget* toolbar) { + MidoriBrowser* browser = midori_browser_get_for_widget (toolbar); GtkToolItem* toolitem; toolitem = katze_array_action_create_tool_item_for ( @@ -5219,7 +5522,7 @@ browser_bookmarks_add_item_cb (KatzeArray* array, g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); } gtk_widget_show (GTK_WIDGET (toolitem)); - gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), toolitem, -1); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); } static void @@ -5267,9 +5570,9 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, i = 0; while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) - browser_bookmarks_add_item_cb (browser->bookmarks, item, browser); + browser_bookmarks_add_item_cb (browser->bookmarks, item, browser->bookmarkbar); g_signal_connect (browser->bookmarks, "add-item", - G_CALLBACK (browser_bookmarks_add_item_cb), browser); + G_CALLBACK (browser_bookmarks_add_item_cb), browser->bookmarkbar); g_signal_connect (browser->bookmarks, "remove-item", G_CALLBACK (browser_bookmarks_remove_item_cb), browser); @@ -5364,6 +5667,16 @@ midori_browser_set_property (GObject* object, case PROP_HISTORY: midori_browser_set_history (browser, g_value_get_object (value)); break; + case PROP_SHOW_TABS: + browser->show_tabs = g_value_get_boolean (value); + if (browser->show_tabs) + _toggle_tabbar_smartly (browser); + else + { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), FALSE); + gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), FALSE); + } + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -5429,6 +5742,9 @@ midori_browser_get_property (GObject* object, case PROP_HISTORY: g_value_set_object (value, browser->history); break; + case PROP_SHOW_TABS: + g_value_set_boolean (value, browser->show_tabs); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -5509,6 +5825,9 @@ midori_browser_add_item (MidoriBrowser* browser, const gchar* uri; const gchar* title; GtkWidget* view; + gint page; + KatzeItem* proxy_item; + GList* keys; g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); g_return_val_if_fail (KATZE_IS_ITEM (item), -1); @@ -5523,7 +5842,18 @@ midori_browser_add_item (MidoriBrowser* browser, midori_view_set_uri (MIDORI_VIEW (view), uri); gtk_widget_show (view); - return midori_browser_add_tab (browser, view); + page = midori_browser_add_tab (browser, view); + proxy_item = midori_view_get_proxy_item (MIDORI_VIEW (view)); + if ((keys = katze_item_get_meta_keys (item))) + { + guint i = 0; + const gchar* key; + while ((key = g_list_nth_data (keys, i++))) + katze_item_set_meta_string (proxy_item, key, + katze_item_get_meta_string (item, key)); + g_list_free (keys); + } + return page; } /** @@ -5658,7 +5988,7 @@ midori_browser_set_current_page (MidoriBrowser* browser, view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n); if (view && midori_view_is_blank (MIDORI_VIEW (view))) gtk_action_activate (_action_by_name (browser, "Location")); - else + else if (view) gtk_widget_grab_focus (view); } diff --git a/midori/midori-browser.h b/midori/midori-browser.h index f0d2ffd7..49d475d6 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -138,6 +138,9 @@ midori_browser_get_for_widget (GtkWidget* widget); void midori_browser_quit (MidoriBrowser* browser); +const gchar** +midori_browser_get_toolbar_actions (MidoriBrowser* browser); + G_END_DECLS #endif /* __MIDORI_BROWSER_H__ */ diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 9950a0bb..ece419fd 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -28,6 +28,7 @@ struct _MidoriExtensionPrivate gchar* description; gchar* version; gchar* authors; + gchar* website; MidoriApp* app; gint active; @@ -129,7 +130,8 @@ enum PROP_NAME, PROP_DESCRIPTION, PROP_VERSION, - PROP_AUTHORS + PROP_AUTHORS, + PROP_WEBSITE }; enum { @@ -227,6 +229,22 @@ midori_extension_class_init (MidoriExtensionClass* class) NULL, flags)); + /** + * MidoriExtension:website: + * + * The website of the extension. + * + * Since: 0.1.8 + */ + g_object_class_install_property (gobject_class, + PROP_WEBSITE, + g_param_spec_string ( + "website", + "Website", + "The website of the extension", + NULL, + flags)); + g_type_class_add_private (class, sizeof (MidoriExtensionPrivate)); } @@ -346,6 +364,7 @@ midori_extension_finalize (GObject* object) katze_assign (extension->priv->description, NULL); katze_assign (extension->priv->version, NULL); katze_assign (extension->priv->authors, NULL); + katze_assign (extension->priv->website, NULL); katze_assign (extension->priv->config_dir, NULL); g_list_free (extension->priv->lsettings); @@ -376,6 +395,9 @@ midori_extension_set_property (GObject* object, case PROP_AUTHORS: katze_assign (extension->priv->authors, g_value_dup_string (value)); break; + case PROP_WEBSITE: + katze_assign (extension->priv->website, g_value_dup_string (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -404,6 +426,9 @@ midori_extension_get_property (GObject* object, case PROP_AUTHORS: g_value_set_string (value, extension->priv->authors); break; + case PROP_WEBSITE: + g_value_set_string (value, extension->priv->website); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 588f7171..3d630fd1 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -36,6 +36,8 @@ struct _MidoriLocationAction GtkTreeModel* sort_model; GdkPixbuf* default_icon; GHashTable* items; + KatzeNet* net; + KatzeArray* history; }; struct _MidoriLocationActionClass @@ -50,12 +52,14 @@ enum PROP_0, PROP_PROGRESS, - PROP_SECONDARY_ICON + PROP_SECONDARY_ICON, + PROP_HISTORY }; enum { ACTIVE_CHANGED, + FOCUS_IN, FOCUS_OUT, SECONDARY_ICON_RELEASED, RESET_URI, @@ -72,6 +76,7 @@ enum TITLE_COL, VISITS_COL, VISIBLE_COL, + YALIGN_COL, N_COLS }; @@ -104,6 +109,10 @@ static void midori_location_action_disconnect_proxy (GtkAction* action, GtkWidget* proxy); +static void +midori_location_action_completion_init (MidoriLocationAction* location_action, + GtkEntry* entry); + static void midori_location_action_class_init (MidoriLocationActionClass* class) { @@ -120,6 +129,22 @@ midori_location_action_class_init (MidoriLocationActionClass* class) G_TYPE_NONE, 1, G_TYPE_INT); + /** + * MidoriLocationAction:focus-in: + * + * The focus-in signal is emitted when the entry obtains the focus. + * + * Since 0.1.8 + */ + signals[FOCUS_IN] = g_signal_new ("focus-in", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + signals[FOCUS_OUT] = g_signal_new ("focus-out", G_TYPE_FROM_CLASS (class), (GSignalFlags) (G_SIGNAL_RUN_LAST), @@ -187,6 +212,24 @@ midori_location_action_class_init (MidoriLocationActionClass* class) "The stock ID of the secondary icon", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + /** + * MidoriLocationAction:history: + * + * The list of history items. + * + * This is actually a reference to a history instance. + * + * Since 0.1.8 + */ + g_object_class_install_property (gobject_class, + PROP_HISTORY, + g_param_spec_object ( + "history", + "History", + "The list of history items", + KATZE_TYPE_ARRAY, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } /* Allow this to be used in tests, it's otherwise private */ @@ -194,10 +237,7 @@ midori_location_action_class_init (MidoriLocationActionClass* class) midori_location_action_entry_for_proxy (GtkWidget* proxy) { GtkWidget* alignment = gtk_bin_get_child (GTK_BIN (proxy)); - GtkWidget* hbox = gtk_bin_get_child (GTK_BIN (alignment)); - GList* children = gtk_container_get_children (GTK_CONTAINER (hbox)); - GtkWidget* entry = g_list_nth_data (children, 0); - g_list_free (children); + GtkWidget* entry = gtk_bin_get_child (GTK_BIN (alignment)); return entry; } @@ -218,9 +258,7 @@ midori_location_action_set_model (MidoriLocationAction* location_action, entry = gtk_bin_get_child (GTK_BIN (location_entry)); g_object_set (location_entry, "model", model, NULL); - gtk_entry_completion_set_model ( - gtk_entry_get_completion (GTK_ENTRY (entry)), - model ? location_action->filter_model : NULL); + midori_location_action_completion_init (location_action, GTK_ENTRY (entry)); } } @@ -285,10 +323,10 @@ midori_location_action_thaw (MidoriLocationAction* location_action) filter_model = gtk_tree_model_filter_new (sort_model, NULL); gtk_tree_model_filter_set_visible_column ( GTK_TREE_MODEL_FILTER (filter_model), VISIBLE_COL); - midori_location_action_set_model (location_action, location_action->model); location_action->filter_model = filter_model; location_action->sort_model = sort_model; + midori_location_action_set_model (location_action, location_action->model); i = MAX_ITEMS; while (gtk_tree_model_iter_nth_child (sort_model, &iter, NULL, i++)) @@ -300,6 +338,15 @@ midori_location_action_thaw (MidoriLocationAction* location_action) } } +static GtkTreeModel* +midori_location_action_create_model (void) +{ + GtkTreeModel* model = (GtkTreeModel*)gtk_list_store_new (N_COLS, + GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_FLOAT); + return model; +} + static void midori_location_action_init (MidoriLocationAction* location_action) { @@ -309,9 +356,7 @@ midori_location_action_init (MidoriLocationAction* location_action) location_action->secondary_icon = NULL; location_action->default_icon = NULL; - location_action->model = (GtkTreeModel*)gtk_list_store_new (N_COLS, - GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_INT, G_TYPE_BOOLEAN); + location_action->model = midori_location_action_create_model (); location_action->filter_model = NULL; location_action->sort_model = NULL; @@ -319,6 +364,8 @@ midori_location_action_init (MidoriLocationAction* location_action) location_action->items = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + location_action->net = katze_net_new (); + location_action->history = NULL; } static void @@ -335,10 +382,55 @@ midori_location_action_finalize (GObject* object) katze_object_assign (location_action->default_icon, NULL); g_hash_table_destroy (location_action->items); + katze_object_assign (location_action->net, NULL); + katze_object_assign (location_action->history, NULL); G_OBJECT_CLASS (midori_location_action_parent_class)->finalize (object); } +static void +midori_location_action_history_remove_item_cb (KatzeArray* folder, + KatzeItem* item, + MidoriLocationAction* action) +{ + midori_location_action_delete_item_from_uri (action, katze_item_get_uri (item)); + if (KATZE_IS_ARRAY (item)) + g_signal_handlers_disconnect_by_func (item, + midori_location_action_history_remove_item_cb, action); +} + +static void +midori_location_action_insert_history_item (MidoriLocationAction* action, + KatzeItem* item) +{ + KatzeItem* child; + guint i; + const gchar* uri; + GdkPixbuf* pixbuf = NULL; + + if (KATZE_IS_ARRAY (item)) + { + for (i = katze_array_get_length (KATZE_ARRAY (item)); i > 0; i--) + { + child = katze_array_get_nth_item (KATZE_ARRAY (item), i - 1); + midori_location_action_insert_history_item (action, child); + } + } + else + { + uri = katze_item_get_uri (item); + pixbuf = katze_net_load_icon (action->net, katze_item_get_uri (item), + NULL, NULL, NULL); + if (!pixbuf) + pixbuf = action->default_icon; + midori_location_action_add_item (action, uri, + pixbuf, katze_item_get_name (item)); + g_object_unref (pixbuf); + g_signal_connect (katze_item_get_parent (item), "remove-item", + G_CALLBACK (midori_location_action_history_remove_item_cb), action); + } +} + static void midori_location_action_set_property (GObject* object, guint prop_id, @@ -357,6 +449,35 @@ midori_location_action_set_property (GObject* object, midori_location_action_set_secondary_icon (location_action, g_value_get_string (value)); break; + case PROP_HISTORY: + { + KatzeArray* history; + GtkTreeModel* model; + + history = g_value_dup_object (value); + katze_assign (location_action->history, g_object_ref (history)); + model = g_object_get_data (G_OBJECT (history), "midori-location-model"); + if (model != NULL) + { + katze_object_assign (location_action->model, g_object_ref (model)); + location_action->filter_model = NULL; + midori_location_action_thaw (location_action); + } + else + { + g_object_unref (location_action->model); + location_action->model = midori_location_action_create_model (); + midori_location_action_freeze (location_action); + /* FIXME: MidoriBrowser is essentially making up for the lack + of synchronicity of newly added items. */ + midori_location_action_insert_history_item (location_action, + KATZE_ITEM (g_value_get_object (value))); + midori_location_action_thaw (location_action); + g_object_set_data (G_OBJECT (history), + "midori-location-model", location_action->model); + } + break; + } default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -379,6 +500,9 @@ midori_location_action_get_property (GObject* object, case PROP_SECONDARY_ICON: g_value_set_string (value, location_action->secondary_icon); break; + case PROP_HISTORY: + g_value_set_object (value, location_action->history); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -407,29 +531,12 @@ midori_location_action_activate (GtkAction* action) GTK_ACTION_CLASS (midori_location_action_parent_class)->activate (action); } -static void -midori_location_action_go_clicked_cb (GtkWidget* button, - GtkAction* action) -{ - GtkWidget* hbox = gtk_widget_get_parent (button); - GList* children = gtk_container_get_children (GTK_CONTAINER (hbox)); - GtkWidget* location_entry = g_list_nth_data (children, 0); - g_list_free (children); - GtkWidget* entry = gtk_bin_get_child (GTK_BIN (location_entry)); - const gchar* uri = gtk_entry_get_text (GTK_ENTRY (entry)); - if (uri && *uri) - g_signal_emit (action, signals[SUBMIT_URI], 0, uri, FALSE); -} - static GtkWidget* midori_location_action_create_tool_item (GtkAction* action) { GtkWidget* toolitem; GtkWidget* alignment; - GtkWidget* hbox; GtkWidget* location_entry; - GtkWidget* go_button; - GtkWidget* go_icon; toolitem = GTK_WIDGET (gtk_tool_item_new ()); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); @@ -437,21 +544,9 @@ midori_location_action_create_tool_item (GtkAction* action) alignment = gtk_alignment_new (0.0f, 0.5f, 1.0f, 0.1f); gtk_widget_show (alignment); gtk_container_add (GTK_CONTAINER (toolitem), alignment); - hbox = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox); - gtk_container_add (GTK_CONTAINER (alignment), hbox); location_entry = midori_location_entry_new (); gtk_widget_show (location_entry); - gtk_box_pack_start (GTK_BOX (hbox), location_entry, TRUE, TRUE, 0); - go_button = gtk_button_new (); - gtk_button_set_focus_on_click (GTK_BUTTON (go_button), FALSE); - gtk_button_set_relief (GTK_BUTTON (go_button), GTK_RELIEF_NONE); - go_icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_MENU); - gtk_button_set_image (GTK_BUTTON (go_button), go_icon); - gtk_widget_show (go_button); - gtk_box_pack_start (GTK_BOX (hbox), go_button, FALSE, FALSE, 0); - g_signal_connect (go_button, "clicked", - G_CALLBACK (midori_location_action_go_clicked_cb), action); + gtk_container_add (GTK_CONTAINER (alignment), location_entry); return toolitem; } @@ -485,6 +580,15 @@ midori_location_action_key_press_event_cb (GtkWidget* widget, return FALSE; } +static gboolean +midori_location_action_focus_in_event_cb (GtkWidget* widget, + GdkEventKey* event, + GtkAction* action) +{ + g_signal_emit (action, signals[FOCUS_IN], 0); + return FALSE; +} + static gboolean midori_location_action_focus_out_event_cb (GtkWidget* widget, GdkEventKey* event, @@ -504,23 +608,6 @@ midori_location_action_icon_released_cb (GtkWidget* widget, g_signal_emit (action, signals[SECONDARY_ICON_RELEASED], 0, widget); } -static void -midori_location_entry_render_pixbuf_cb (GtkCellLayout* layout, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - gpointer data) -{ - GdkPixbuf* pixbuf; - - gtk_tree_model_get (model, iter, FAVICON_COL, &pixbuf, -1); - if (pixbuf) - { - g_object_set (renderer, "pixbuf", pixbuf, "yalign", 0.25, NULL); - g_object_unref (pixbuf); - } -} - static void midori_location_entry_render_text_cb (GtkCellLayout* layout, GtkCellRenderer* renderer, @@ -662,7 +749,7 @@ midori_location_action_set_item (MidoriLocationAction* location_action, gtk_tree_model_get (location_action->model, iter, TITLE_COL, &item->title, -1); gtk_list_store_set (GTK_LIST_STORE (location_action->model), iter, - URI_COL, item->uri, TITLE_COL, item->title, -1); + URI_COL, item->uri, TITLE_COL, item->title, YALIGN_COL, 0.25, -1); gtk_tree_model_get (location_action->model, iter, FAVICON_COL, &icon, -1); if (item->favicon) @@ -820,16 +907,26 @@ midori_location_action_add_actions (GtkEntryCompletion* completion, static void midori_location_action_completion_init (MidoriLocationAction* location_action, - GtkWidget* location_entry) + GtkEntry* entry) { - GtkWidget* entry; GtkEntryCompletion* completion; GtkCellRenderer* renderer; - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - completion = gtk_entry_completion_new (); + if ((completion = gtk_entry_get_completion (entry))) + { + gtk_entry_completion_set_model (completion, + midori_location_action_is_frozen (location_action) + ? NULL : location_action->filter_model); + return; + } + + completion = gtk_entry_completion_new (); + gtk_entry_set_completion (entry, completion); + g_object_unref (completion); + gtk_entry_completion_set_model (completion, + midori_location_action_is_frozen (location_action) + ? NULL : location_action->filter_model); - gtk_entry_completion_set_model (completion, location_action->sort_model); gtk_entry_completion_set_text_column (completion, URI_COL); #if GTK_CHECK_VERSION (2, 12, 0) gtk_entry_completion_set_inline_selection (completion, TRUE); @@ -838,10 +935,12 @@ midori_location_action_completion_init (MidoriLocationAction* location_action, renderer = gtk_cell_renderer_pixbuf_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, FALSE); - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), renderer, - midori_location_entry_render_pixbuf_cb, - NULL, NULL); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (completion), renderer, + "pixbuf", FAVICON_COL, "yalign", YALIGN_COL, NULL); renderer = gtk_cell_renderer_text_new (); + gtk_cell_renderer_set_fixed_size (renderer, 1, -1); + gtk_cell_renderer_text_set_fixed_height_from_font ( + GTK_CELL_RENDERER_TEXT (renderer), 2); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, TRUE); gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), renderer, midori_location_entry_render_text_cb, @@ -849,7 +948,7 @@ midori_location_action_completion_init (MidoriLocationAction* location_action, gtk_entry_completion_set_match_func (completion, midori_location_entry_completion_match_cb, NULL, NULL); - gtk_entry_set_completion (GTK_ENTRY (entry), completion); + g_signal_connect (completion, "match-selected", G_CALLBACK (midori_location_entry_match_selected_cb), location_action); @@ -857,8 +956,6 @@ midori_location_action_completion_init (MidoriLocationAction* location_action, location_action->search_engines); g_signal_connect (completion, "action-activated", G_CALLBACK (midori_location_entry_action_activated_cb), location_action); - - g_object_unref (completion); } static void @@ -923,21 +1020,24 @@ midori_location_action_connect_proxy (GtkAction* action, /* Setup the renderer for the favicon */ renderer = gtk_cell_renderer_pixbuf_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (entry), renderer, FALSE); - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (entry), - renderer, midori_location_entry_render_pixbuf_cb, NULL, NULL); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (entry), renderer, + "pixbuf", FAVICON_COL, "yalign", YALIGN_COL, NULL); renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (entry), renderer, TRUE); gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (entry), renderer, midori_location_entry_render_text_cb, NULL, NULL); gtk_combo_box_set_active (GTK_COMBO_BOX (entry), -1); - midori_location_action_completion_init (location_action, entry); + midori_location_action_completion_init (location_action, + GTK_ENTRY (gtk_bin_get_child (GTK_BIN (entry)))); g_signal_connect (entry, "changed", G_CALLBACK (midori_location_action_entry_changed_cb), action); g_object_connect (gtk_bin_get_child (GTK_BIN (entry)), "signal::key-press-event", midori_location_action_key_press_event_cb, action, + "signal::focus-in-event", + midori_location_action_focus_in_event_cb, action, "signal::focus-out-event", midori_location_action_focus_out_event_cb, action, "signal::icon-release", @@ -1271,6 +1371,7 @@ midori_location_action_set_search_engines (MidoriLocationAction* location_action entry = midori_location_action_entry_for_proxy (proxies->data); child = gtk_bin_get_child (GTK_BIN (entry)); + midori_location_action_completion_init (location_action, GTK_ENTRY (child)); completion = gtk_entry_get_completion (GTK_ENTRY (child)); i = 0; if (location_action->search_engines) @@ -1342,7 +1443,7 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action } /** - * midori_location_action_set_item_from_uri: + * midori_location_action_delete_item_from_uri: * @location_action: a #MidoriLocationAction * @uri: a string * diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 5e19a327..c299a9f4 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -231,7 +231,6 @@ static void midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, MidoriPanel* panel) { - /* FIXME: Use stock icon for window */ /* FIXME: What happens when the browser is destroyed? */ /* FIXME: What about multiple browsers? */ /* FIXME: Should we remember if the child was detached? */ @@ -248,6 +247,7 @@ midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, GtkWidget* vbox = gtk_vbox_new (FALSE, 0); g_object_set_data (G_OBJECT (window), "scrolled", scrolled); gtk_window_set_title (GTK_WINDOW (window), title); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window), TRUE); gtk_window_set_default_size (GTK_WINDOW (window), 250, 400); gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (gtk_widget_get_toplevel (panel->notebook))); @@ -329,10 +329,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), - _("Whether to detach the chosen panel from the window")); + _("Detach chosen panel from the window")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_panel_button_detach_clicked_cb), panel); #if HAVE_OSX @@ -341,10 +339,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 on the right")); gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), - _("Whether to align the sidepanel on the right")); + _("Align sidepanel to the right")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_panel_button_align_clicked_cb), panel); #if HAVE_OSX @@ -488,7 +484,7 @@ midori_panel_set_compact (MidoriPanel* panel, /** * midori_panel_set_right_aligned: - * @compact: %TRUE if the panel should be aligned to the right + * @right_aligned: %TRUE if the panel should be aligned to the right * * Determines if the panel should be right aligned. * @@ -508,6 +504,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_item_set_tooltip_text (GTK_TOOL_ITEM (panel->button_align), + !panel->right_aligned ? _("Align sidepanel to the right") + : _("Align sidepanel to the left")); g_object_notify (G_OBJECT (panel), "right-aligned"); } @@ -662,7 +661,7 @@ midori_panel_append_page (MidoriPanel* panel, g_signal_connect (menuitem, "activate", G_CALLBACK (midori_panel_menu_item_activate_cb), panel); - gtk_menu_shell_append (GTK_MENU_SHELL (panel->menu), menuitem); + 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); @@ -798,6 +797,8 @@ midori_panel_page_num (MidoriPanel* panel, * * The child must be visible, otherwise the underlying GtkNotebook will * silently ignore the attempt to switch the page. + * + * Since 0.1.8 the "page" property is notifying changes. **/ void midori_panel_set_current_page (MidoriPanel* panel, @@ -807,15 +808,15 @@ midori_panel_set_current_page (MidoriPanel* panel, g_return_if_fail (MIDORI_IS_PANEL (panel)); - gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->toolbook), n); - gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->notebook), n); - if ((viewable = midori_panel_get_nth_page (panel, n))) { const gchar* label; + gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->toolbook), n); + gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->notebook), n); label = midori_viewable_get_label (MIDORI_VIEWABLE (viewable)); g_object_set (panel->toolbar_label, "label", label, NULL); + g_object_notify (G_OBJECT (panel), "page"); } } diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index b3f22e43..50ee3871 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -452,9 +452,14 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (hbox, 1, 2, 0, 1); label = gtk_label_new (_("Fixed-width Font Family")); INDENTED_ADD (label, 0, 1, 1, 2); + hbox = gtk_hbox_new (FALSE, 4); button = katze_property_proxy (settings, "monospace-font-family", "font"); gtk_widget_set_tooltip_text (button, _("The font family used to display fixed-width text")); - INDENTED_ADD (button, 1, 2, 1, 2); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); + entry = katze_property_proxy (settings, "default-monospace-font-size", NULL); + gtk_widget_set_tooltip_text (entry, _("The font size used to display fixed-width text")); + gtk_box_pack_end (GTK_BOX (hbox), entry, FALSE, FALSE, 4); + INDENTED_ADD (hbox, 1, 2, 1, 2); label = gtk_label_new (_("Minimum Font Size")); INDENTED_ADD (label, 0, 1, 2, 3); entry = katze_property_proxy (settings, "minimum-font-size", NULL); @@ -546,12 +551,10 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "open-new-pages-in", NULL); FILLED_ADD (button, 1, 2, 0, 1); - #if HAVE_UNIQUE label = katze_property_label (settings, "open-external-pages-in"); INDENTED_ADD (label, 0, 1, 1, 2); button = katze_property_proxy (settings, "open-external-pages-in", NULL); FILLED_ADD (button, 1, 2, 1, 2); - #endif button = katze_property_proxy (settings, "always-show-tabbar", NULL); INDENTED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL); diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 22790ff8..e5196249 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -1016,6 +1016,20 @@ midori_search_action_get_editor (MidoriSearchAction* search_action, gtk_widget_destroy (dialog); } +static void +midori_search_action_activate_edit_cb (GtkTreeView *treeview, + GtkTreePath *path, + GtkTreeViewColumn *column, + MidoriSearchAction* search_action) +{ + GtkTreeSelection* selection; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + if (gtk_tree_selection_get_selected (selection, NULL, NULL)) + midori_search_action_get_editor (search_action, FALSE); +} + + static void midori_search_action_dialog_add_cb (GtkWidget* widget, MidoriSearchAction* search_action) @@ -1228,6 +1242,8 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), "changed", G_CALLBACK (midori_search_action_treeview_selection_cb), search_action); + g_signal_connect (treeview, "row-activated", + G_CALLBACK (midori_search_action_activate_edit_cb), search_action); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); g_object_set_data (G_OBJECT (treeview), "search-action", search_action); column = gtk_tree_view_column_new (); diff --git a/midori/midori-stock.h b/midori/midori-stock.h index 3b8436e8..2ee090d0 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -25,6 +25,7 @@ #define STOCK_EXTENSION "extension" #define STOCK_EXTENSIONS "extension" #define STOCK_HISTORY "document-open-recent" +#define STOCK_WEB_BROWSER "web-browser" #define STOCK_NEWS_FEED "news-feed" #define STOCK_STYLE "gnome-settings-theme" #define STOCK_STYLES "gnome-settings-theme" diff --git a/midori/midori-view.c b/midori/midori-view.c index 51216d41..a8886d43 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -16,6 +16,7 @@ #include "midori-view.h" #include "midori-stock.h" +#include "midori-browser.h" #include "compat.h" #include "marshal.h" @@ -26,6 +27,7 @@ #include #include #include +#include #include /* This is unstable API, so we need to declare it */ @@ -45,6 +47,11 @@ midori_search_action_get_icon (KatzeNet* net, static void midori_view_construct_web_view (MidoriView* view); +GdkPixbuf* +midori_view_get_snapshot (MidoriView* view, + gint width, + gint height); + struct _MidoriView { GtkScrolledWindow parent_instance; @@ -74,6 +81,7 @@ struct _MidoriView GtkWidget* menu_item; GtkWidget* tab_label; + /* GtkWidget* tooltip_image; */ GtkWidget* tab_icon; GtkWidget* tab_title; GtkWidget* tab_close; @@ -514,6 +522,7 @@ midori_view_class_init (MidoriViewClass* class) static void midori_view_update_title (MidoriView* view) { + #ifndef G_OS_WIN32 /* If left-to-right text is combined with right-to-left text the default behaviour of Pango can result in awkwardly aligned text. For example "‪بستيان نوصر (hadess) | An era comes to an end - Midori" becomes @@ -525,6 +534,7 @@ midori_view_update_title (MidoriView* view) gchar* new_title = g_strconcat ("‪", view->title, NULL); katze_assign (view->title, new_title); } + #endif #define title midori_view_get_display_title (view) if (view->tab_label) { @@ -547,7 +557,9 @@ midori_view_update_title (MidoriView* view) soup_uri_free (uri); } gtk_label_set_text (GTK_LABEL (view->tab_title), title); + #if 1 gtk_widget_set_tooltip_text (view->tab_title, title); + #endif } if (view->menu_item) gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( @@ -720,10 +732,12 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view, GError* error, MidoriView* view) { - const gchar* template_file = DATADIR "/midori/res/error.html"; + gchar* template_file = g_build_filename ("midori", "res", "error.html", NULL); + gchar* path = sokoke_find_data_filename (template_file); gchar* template; - if (g_file_get_contents (template_file, &template, NULL, NULL)) + g_free (template_file); + if (g_file_get_contents (path, &template, NULL, NULL)) { SoupServer* res_server; guint port; @@ -754,9 +768,11 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view, g_free (res_root); g_free (stock_root); g_free (result); + g_free (path); return TRUE; } + g_free (path); return FALSE; } @@ -777,7 +793,7 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, data = g_strdup_printf ( "%s" "

%s

" - "" "

The page you were opening doesn't exist." "

Try to load the page again, " @@ -817,12 +833,13 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view, "f.push (l[i].href + '|' + l[i].title); } return f; }" "feeds (document.getElementsByTagName ('link'))", NULL); gchar** items = g_strsplit (value, ",", 0); - gchar** iter; + guint i = 0; katze_array_clear (view->news_feeds); - for (iter = items; iter && *iter; iter++) + if (items != NULL) + while (items[i] != NULL) { - gchar** parts = g_strsplit (*iter, "|", 2); + gchar** parts = g_strsplit (items[i], "|", 2); KatzeItem* item = g_object_new (KATZE_TYPE_ITEM, "uri", parts ? *parts : "", "name", parts && *parts ? parts[1] : NULL, @@ -830,6 +847,7 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view, katze_array_add_item (view->news_feeds, item); g_object_unref (item); g_strfreev (parts); + i++; } g_strfreev (items); g_object_set_data (G_OBJECT (view), "news-feeds", @@ -1007,6 +1025,9 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, return TRUE; } + /* We propagate the event, since it may otherwise be stuck in WebKit */ + g_signal_emit_by_name (view, "event", event, &background); + return FALSE; } @@ -1016,15 +1037,16 @@ gtk_widget_key_press_event_cb (WebKitWebView* web_view, MidoriView* view) { guint character = gdk_unicode_to_keyval (event->keyval); - /* Skip control characters */ - if (character == (event->keyval | 0x01000000)) - return FALSE; - if (character == '.' || character == '/') + if (event->keyval == '.' || event->keyval == '/' || event->keyval == GDK_KP_Divide) character = '\0'; else if (!view->find_while_typing) return FALSE; + /* Skip control characters */ + if (character == (event->keyval | 0x01000000)) + return FALSE; + if (!webkit_web_view_can_cut_clipboard (web_view) && !webkit_web_view_can_paste_clipboard (web_view)) { @@ -1070,13 +1092,6 @@ midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, view->open_tabs_in_the_background); } -static void -midori_web_view_menu_action_add_speed_dial_cb (GtkWidget* widget, - MidoriView* view) -{ - g_signal_emit (view, signals[ADD_SPEED_DIAL], 0, view->link_uri); -} - static void midori_web_view_menu_search_web_activate_cb (GtkWidget* widget, MidoriView* view) @@ -1121,19 +1136,13 @@ midori_web_view_menu_add_bookmark_activate_cb (GtkWidget* widget, g_signal_emit (view, signals[ADD_BOOKMARK], 0, view->link_uri); } -static void -midori_web_view_menu_action_activate_cb (GtkWidget* widget, - MidoriView* view) -{ - const gchar* action = g_object_get_data (G_OBJECT (widget), "action"); - g_signal_emit (view, signals[ACTIVATE_ACTION], 0, action); -} - static void webkit_web_view_populate_popup_cb (WebKitWebView* web_view, GtkWidget* menu, MidoriView* view) { + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view)); + GtkActionGroup* actions = midori_browser_get_action_group (browser); GtkWidget* menuitem; GtkWidget* icon; gchar* stock_id; @@ -1301,63 +1310,74 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, } } g_list_free (items); - menuitem = gtk_image_menu_item_new_with_mnemonic (_("Undo Close Tab")); - icon = gtk_image_new_from_stock (GTK_STOCK_UNDELETE, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "UndoTabClose")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "action", "UndoTabClose"); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_action_activate_cb), view); - /* FIXME: Make this sensitive only when there is a tab to undo */ - gtk_widget_show (menuitem); menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); - menuitem = gtk_image_menu_item_new_from_stock (STOCK_BOOKMARK_ADD, NULL); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "ZoomIn")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "ZoomOut")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "Encoding")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + if (GTK_WIDGET_IS_SENSITIVE (menuitem)) + { + GtkWidget* sub_menu; + static const GtkActionEntry encodings[] = { + { "EncodingAutomatic" }, + { "EncodingChinese" }, + { "EncodingJapanese" }, + { "EncodingRussian" }, + { "EncodingUnicode" }, + { "EncodingWestern" }, + { "EncodingCustom" }, + }; + guint i; + + sub_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), sub_menu); + + for (i = 0; i < G_N_ELEMENTS (encodings); i++) + { + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, encodings[i].name)); + gtk_menu_shell_append (GTK_MENU_SHELL (sub_menu), menuitem); + } + } + + menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "action", "BookmarkAdd"); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_action_activate_cb), view); gtk_widget_show (menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "BookmarkAdd")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + if (view->speed_dial_in_new_tabs && !midori_view_is_blank (view)) { - menuitem = gtk_image_menu_item_new_with_mnemonic (_("Add to Speed _dial")); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "AddSpeedDial")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "action", "AddSpeedDial"); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_action_add_speed_dial_cb), view); - gtk_widget_show (menuitem); } - menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_SAVE_AS, NULL); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "SaveAs")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "action", "SaveAs"); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_action_activate_cb), view); - gtk_widget_show (menuitem); /* Currently views that don't support source, don't support saving either. If that changes, we need to think of something. */ if (!midori_view_can_view_source (view)) gtk_widget_set_sensitive (menuitem, FALSE); - - menuitem = gtk_image_menu_item_new_with_mnemonic (_("View _Source")); + menuitem = sokoke_action_create_popup_menu_item ( + gtk_action_group_get_action (actions, "SourceView")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "action", "SourceView"); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_action_activate_cb), view); - gtk_widget_show (menuitem); - if (!midori_view_can_view_source (view)) - gtk_widget_set_sensitive (menuitem, FALSE); - - menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_PRINT, NULL); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "action", "Print"); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_action_activate_cb), view); - gtk_widget_show (menuitem); } } @@ -1479,6 +1499,7 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, } gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_SAVE, 1, + GTK_STOCK_SAVE_AS, 4, GTK_STOCK_CANCEL, 2, GTK_STOCK_OPEN, 3, NULL); @@ -1487,6 +1508,11 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, g_object_set_data (G_OBJECT (view), "open-download", (gpointer)0); switch (response) { + case 4: + g_object_set_data (G_OBJECT (view), "save-as-download", (gpointer)1); + webkit_web_policy_decision_download (decision); + webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (view->web_view)); + return TRUE; case 3: g_object_set_data (G_OBJECT (view), "open-download", (gpointer)1); case 1: @@ -1525,7 +1551,10 @@ webkit_web_view_download_requested_cb (GtkWidget* web_view, gboolean handled; g_object_set_data (G_OBJECT (download), "open-download", g_object_get_data (G_OBJECT (view), "open-download")); + g_object_set_data (G_OBJECT (download), "save-as-download", + g_object_get_data (G_OBJECT (view), "save-as-download")); g_object_set_data (G_OBJECT (view), "open-download", (gpointer)0); + g_object_set_data (G_OBJECT (view), "save-as-download", (gpointer)0); g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled); return handled; } @@ -2038,7 +2067,7 @@ midori_view_set_uri (MidoriView* view, katze_assign (view->uri, g_strdup ("")); - g_file_get_contents (DATADIR "/midori/res/speeddial-head.html", + g_file_get_contents (MDATADIR "/midori/res/speeddial-head.html", &speed_dial_head, NULL, NULL); res_server = sokoke_get_res_server (); @@ -2050,7 +2079,7 @@ midori_view_set_uri (MidoriView* view, if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) { - if (g_file_get_contents (DATADIR "/midori/res/speeddial.json", + if (g_file_get_contents (MDATADIR "/midori/res/speeddial.json", &speed_dial_body, NULL, NULL)) g_file_set_contents (body_fname, speed_dial_body, -1, NULL); else @@ -2101,7 +2130,7 @@ midori_view_set_uri (MidoriView* view, data = g_strdup_printf ( "%s" "

%s

" - "" "

The document %s of type '%s' cannot be displayed." "", @@ -2118,7 +2147,7 @@ midori_view_set_uri (MidoriView* view, data = g_strdup_printf ( "%s" "

%s

" - "" "

There is no documentation installed at %s." "You may want to ask your distribution or " @@ -2178,6 +2207,8 @@ midori_view_is_blank (MidoriView* view) * * Retrieves the icon of the view. * + * The returned icon is owned by the @view and must not be modified. + * * Return value: a #GdkPixbuf **/ GdkPixbuf* @@ -2396,6 +2427,84 @@ midori_view_get_proxy_menu_item (MidoriView* view) return view->menu_item; } +static void +midori_view_tab_label_menu_open_cb (GtkWidget* menuitem, + GtkWidget* view) +{ + MidoriBrowser* browser = midori_browser_get_for_widget (view); + midori_browser_set_current_tab (browser, view); +} + +static void +midori_view_tab_label_menu_window_new_cb (GtkWidget* menuitem, + GtkWidget* view) +{ + g_signal_emit (view, signals[NEW_WINDOW], 0, + midori_view_get_display_uri (MIDORI_VIEW (view))); +} + +static void +midori_view_tab_label_menu_duplicate_tab_cb (GtkWidget* menuitem, + MidoriView* view) +{ + MidoriNewView where = MIDORI_NEW_VIEW_TAB; + GtkWidget* new_view = g_object_new (MIDORI_TYPE_VIEW, + "net", view->net, "settings", view->settings, NULL); + midori_view_set_uri (MIDORI_VIEW (new_view), + midori_view_get_display_uri (view)); + g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where); +} + +static void +midori_view_tab_label_menu_close_cb (GtkWidget* menuitem, + GtkWidget* view) +{ + gtk_widget_destroy (view); +} + +/** + * midori_view_get_tab_menu: + * @view: a #MidoriView + * + * Retrieves a menu that is typically shown when right-clicking + * a tab label or equivalent representation. + * + * Return value: a #GtkMenu + * + * Since: 0.1.8 + **/ +GtkWidget* +midori_view_get_tab_menu (MidoriView* view) +{ + GtkWidget* menu; + GtkWidget* menuitem; + + g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + + menu = gtk_menu_new (); + 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", + G_CALLBACK (midori_view_tab_label_menu_open_cb), view); + menuitem = gtk_image_menu_item_new_from_stock (STOCK_WINDOW_NEW, NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_view_tab_label_menu_window_new_cb), view); + menuitem = gtk_menu_item_new_with_mnemonic (_("_Duplicate Tab")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_view_tab_label_menu_duplicate_tab_cb), view); + menuitem = gtk_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); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_view_tab_label_menu_close_cb), view); + gtk_widget_show_all (menu); + + return menu; +} + static gboolean midori_view_tab_label_button_release_event (GtkWidget* tab_label, GdkEventButton* event, @@ -2407,6 +2516,15 @@ midori_view_tab_label_button_release_event (GtkWidget* tab_label, gtk_widget_destroy (widget); return TRUE; } + else if (event->button == 3) + { + /* Show a context menu on right click */ + GtkWidget* menu = midori_view_get_tab_menu (MIDORI_VIEW (widget)); + + katze_widget_popup (widget, GTK_MENU (menu), + event, SOKOKE_MENU_POSITION_CURSOR); + return TRUE; + } return FALSE; } @@ -2533,6 +2651,23 @@ midori_view_tab_label_parent_set (GtkWidget* tab_label, } } +#if 0 +static gboolean +midori_view_tab_label_query_tooltip_cb (GtkWidget* tab_label, + gint x, + gint y, + gboolean keyboard, + GtkTooltip* tooltip, + MidoriView* view) +{ + if (view->speed_dial_in_new_tabs) + gtk_tooltip_set_icon (tooltip, midori_view_get_snapshot (view, -160, -107)); + else + gtk_tooltip_set_text (tooltip, midori_view_get_display_title (view)); + return TRUE; +} +#endif + /** * midori_view_get_proxy_tab_label: * @view: a #MidoriView @@ -2609,6 +2744,11 @@ midori_view_get_proxy_tab_label (MidoriView* view) G_CALLBACK (midori_view_tab_close_clicked), view); view->tab_label = event_box; + #if 0 + gtk_widget_set_has_tooltip (view->tab_label, TRUE); + g_signal_connect (view->tab_label, "query-tooltip", + G_CALLBACK (midori_view_tab_label_query_tooltip_cb), view); + #endif g_signal_connect (view->tab_icon, "destroy", G_CALLBACK (gtk_widget_destroyed), &view->tab_icon); @@ -2768,6 +2908,8 @@ midori_view_reload (MidoriView* view, #endif if (view->title && strstr (title, view->title)) webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), view->uri); + else if (midori_view_is_blank (view)) + midori_view_set_uri (view, view->uri); else if (from_cache) webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view)); else @@ -2978,10 +3120,12 @@ midori_view_execute_script (MidoriView* view, /* For now this is private API */ GdkPixbuf* midori_view_get_snapshot (MidoriView* view, - guint width, - guint height) + gint width, + gint height) { GtkWidget* web_view; + gboolean fast; + gint x, y, w, h; GdkRectangle rect; GdkPixmap* pixmap; GdkEvent event; @@ -2993,13 +3137,30 @@ midori_view_get_snapshot (MidoriView* view, web_view = gtk_bin_get_child (GTK_BIN (view)); g_return_val_if_fail (web_view->window, NULL); - rect.x = web_view->allocation.x; - rect.y = web_view->allocation.y; - rect.width = web_view->allocation.width; - rect.height = web_view->allocation.height; + x = web_view->allocation.x; + y = web_view->allocation.y; + w = web_view->allocation.width; + h = web_view->allocation.height; - pixmap = gdk_pixmap_new (web_view->window, - web_view->allocation.width, web_view->allocation.height, + /* If width and height are both negative, we try to render faster at + the cost of correctness or beauty. Only a part of the page is + rendered which makes it a lot faster and scaling isn't as nice. */ + fast = FALSE; + if (width < 0 && height < 0) + { + width *= -1; + height *= -1; + w = w > 320 ? 320 : w; + h = h > 240 ? 240 : h; + fast = TRUE; + } + + rect.x = x; + rect.y = y; + rect.width = w; + rect.height = h; + + pixmap = gdk_pixmap_new (web_view->window, w, h, gdk_drawable_get_depth (web_view->window)); event.expose.type = GDK_EXPOSE; event.expose.window = pixmap; @@ -3025,8 +3186,9 @@ midori_view_get_snapshot (MidoriView* view, width = rect.width; if (!height) height = rect.height; + scaled = gdk_pixbuf_scale_simple (pixbuf, width, height, - GDK_INTERP_TILES); + fast ? GDK_INTERP_NEAREST : GDK_INTERP_TILES); g_object_unref (pixbuf); return scaled; } diff --git a/midori/midori-view.h b/midori/midori-view.h index 74fa2834..017499a6 100644 --- a/midori/midori-view.h +++ b/midori/midori-view.h @@ -113,6 +113,9 @@ midori_view_can_paste_clipboard (MidoriView* view); GtkWidget* midori_view_get_proxy_menu_item (MidoriView* view); +GtkWidget* +midori_view_get_tab_menu (MidoriView* view); + GtkWidget* midori_view_get_proxy_tab_label (MidoriView* view); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 2a92d2aa..db35ba50 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -20,6 +20,10 @@ #include #endif +#if defined (G_OS_UNIX) + #include +#endif + struct _MidoriWebSettings { WebKitWebSettings parent_instance; @@ -513,7 +517,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) "toolbar-items", _("Toolbar Items"), _("The items to show on the toolbar"), - "Back,Forward,ReloadStop,Location,Panel,Trash,Search", + "Back,Forward,ReloadStop,Location,Panel,Search,Trash", flags)); g_object_class_install_property (gobject_class, @@ -592,11 +596,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Show speed dial in new tabs"), _("Show speed dial in newly opened tabs"), TRUE, - #if GTK_CHECK_VERSION (2, 14, 0) flags)); - #else - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - #endif g_object_class_install_property (gobject_class, PROP_DOWNLOAD_FOLDER, @@ -741,11 +741,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Where to open externally opened pages"), MIDORI_TYPE_NEW_PAGE, MIDORI_NEW_PAGE_TAB, - #if HAVE_UNIQUE G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - #else - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - #endif g_object_class_install_property (gobject_class, PROP_MIDDLE_CLICK_OPENS_SELECTION, @@ -1033,6 +1029,24 @@ midori_web_settings_finalize (GObject* object) G_OBJECT_CLASS (midori_web_settings_parent_class)->finalize (object); } +#if defined (G_OS_UNIX) +static gchar* +get_sys_name (void) +{ + static gchar* sys_name = NULL; + + if (!sys_name) + { + struct utsname name; + if (uname (&name) != -1) + sys_name = g_strdup_printf ("%s %s", name.sysname, name.machine); + else + sys_name = "Unix"; + } + return sys_name; +} +#endif + static gchar* generate_ident_string (MidoriIdentity identify_as) { @@ -1057,12 +1071,7 @@ generate_ident_string (MidoriIdentity identify_as) "PPC Mac OS X"; #endif */ #elif defined (G_OS_UNIX) - /* struct utsname name; - if (uname (&name) != -1) - String::format ("%s %s", name.sysname, name.machine); - else - "Unknown";*/ - "Linux"; + get_sys_name (); #elif defined (G_OS_WIN32) // FIXME: Windows NT version "Windows"; @@ -1296,7 +1305,8 @@ midori_web_settings_set_property (GObject* object, } break; case PROP_IDENT_STRING: - katze_assign (web_settings->ident_string, g_value_dup_string (value)); + if (web_settings->identify_as == MIDORI_IDENT_CUSTOM) + katze_assign (web_settings->ident_string, g_value_dup_string (value)); break; case PROP_CACHE_SIZE: web_settings->cache_size = g_value_get_int (value); diff --git a/midori/socket.c b/midori/socket.c new file mode 100644 index 00000000..a5729935 --- /dev/null +++ b/midori/socket.c @@ -0,0 +1,1766 @@ +/* + Copyright 1999-2008 Hiroyuki Yamamoto + Copyright 2006-2009 Enrico Tröger + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +/* + This file is based on socket.c in libSylph. + socket_init(), remove_socket_link_full() and send_open_command() were + relicensed and taken from Geany and adjusted to be more generic. +*/ + +#if HAVE_CONFIG_H +# include "config.h" +#endif + +#if !HAVE_UNIQUE + +#include +#include +#include +#include +#ifdef G_OS_WIN32 +# include +# include +#else +# if HAVE_SYS_WAIT_H +# include +# endif +# include +# include +# include +# include +# include +#endif /* G_OS_WIN32 */ +#if HAVE_UNISTD_H +# include +#endif +#include +#include +#include +#include +#include +#include +#include +#if HAVE_SYS_SELECT_H +# include +#endif + +#include "socket.h" +#if USE_SSL +# include +#endif + +#ifdef G_ENABLE_DEBUG +# define debug_print g_debug +#else +# define debug_print(...) ; +#endif + +#define BUFFSIZE 8192 + +#ifdef G_OS_WIN32 +#define SockDesc SOCKET +#define SOCKET_IS_VALID(s) ((s) != INVALID_SOCKET) +#else +#define SockDesc gint +#define SOCKET_IS_VALID(s) ((s) >= 0) +#define INVALID_SOCKET (-1) +#endif + +typedef gint (*SockAddrFunc) (GList *addr_list, + gpointer data); + +typedef struct _SockConnectData SockConnectData; +typedef struct _SockLookupData SockLookupData; +typedef struct _SockAddrData SockAddrData; +typedef struct _SockSource SockSource; + +struct _SockConnectData { + gint id; + gchar *hostname; + gushort port; + GList *addr_list; + GList *cur_addr; + SockLookupData *lookup_data; + GIOChannel *channel; + guint io_tag; + SockConnectFunc func; + gpointer data; +}; + +struct _SockLookupData { + gchar *hostname; + pid_t child_pid; + GIOChannel *channel; + guint io_tag; + SockAddrFunc func; + gpointer data; +}; + +struct _SockAddrData { + gint family; + gint socktype; + gint protocol; + gint addr_len; + struct sockaddr *addr; +}; + +struct _SockSource { + GSource parent; + SockInfo *sock; +}; + +static guint io_timeout = 60; + +static GList *sock_list = NULL; + +#ifdef G_OS_UNIX +static GList *sock_connect_data_list = NULL; + +static gchar *socket_filename = NULL; +#endif + +static gboolean sock_prepare (GSource *source, + gint *timeout); +static gboolean sock_check (GSource *source); +static gboolean sock_dispatch (GSource *source, + GSourceFunc callback, + gpointer user_data); + +GSourceFuncs sock_watch_funcs = { + sock_prepare, + sock_check, + sock_dispatch, + NULL +}; + +#ifdef G_OS_WIN32 +static SockInfo *sock_find_from_fd (gint fd); +#endif + +static gint sock_connect_with_timeout (gint sock, + const struct sockaddr *serv_addr, + gint addrlen, + guint timeout_secs); + +#ifndef INET6 +static gint sock_connect_by_hostname (gint sock, + const gchar *hostname, + gushort port); +#else +static SockDesc sock_connect_by_getaddrinfo (const gchar *hostname, + gushort port); +#endif + +#ifdef G_OS_UNIX +static void sock_address_list_free (GList *addr_list); + +static gboolean sock_connect_async_cb (GIOChannel *source, + GIOCondition condition, + gpointer data); +static gint sock_connect_async_get_address_info_cb + (GList *addr_list, + gpointer data); + +static gint sock_connect_address_list_async (SockConnectData *conn_data); + +static gboolean sock_get_address_info_async_cb (GIOChannel *source, + GIOCondition condition, + gpointer data); +static SockLookupData *sock_get_address_info_async + (const gchar *hostname, + gushort port, + SockAddrFunc func, + gpointer data); +static gint sock_get_address_info_async_cancel (SockLookupData *lookup_data); +#endif /* G_OS_UNIX */ + +void send_open_command(gint sock, const gchar* command, gchar **args) +{ + gsize i; + + g_return_if_fail(sock > -1); + g_return_if_fail(command != NULL); + + fd_write_all(sock, command, strlen(command)); + fd_write_all(sock, "\n", 1); + + if(!args) + return; + + for (i = 0; args[i] != NULL; i++) + { + fd_write_all(sock, args[i], strlen(args[i])); + fd_write_all(sock, "\n", 1); + } + fd_write_all(sock, ".\n", 2); +} + +#ifndef G_OS_WIN32 +static void remove_socket_link_full(void) +{ + gchar real_path[512]; + gsize len; + + real_path[0] = '\0'; + + /* read the contents of the symbolic link socket_info.file_name and delete it + * readlink should return something like "/tmp/appname_socket.499602d2" */ + len = readlink(socket_filename, real_path, sizeof(real_path) - 1); + if ((gint) len > 0) + { + real_path[len] = '\0'; + g_unlink(real_path); + } + g_unlink(socket_filename); +} +#endif + +/* (Unix domain) socket support to replace the old FIFO code + * Returns created socket, -1 if an error occurred */ +gint socket_init(const gchar *instance_name, const gchar *config_dir, gboolean *exists) +{ + gint sock; +#ifdef G_OS_WIN32 + HANDLE hmutex; + WSADATA wsadata; + gint result; + + *exists = FALSE; + result = WSAStartup(MAKEWORD(2, 2), &wsadata); + if (result != NO_ERROR) { + g_warning("WSAStartup() failed\n"); + return -1; + } + + hmutex = CreateMutexA(NULL, FALSE, instance_name); + if (! hmutex) + { + debug_print("cannot create Mutex\n"); + return -1; + } + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + /* To support multiple instances with different configuration directories (as we do on + * non-Windows systems) we would need to use different port number s but it might be + * difficult to get a port number which is unique for a configuration directory (path) + * and which is unused. This port number has to be guessed by the first and new instance + * and the only data is the configuration directory path. + * For now we use one port number, that is we support only one instance at all. */ + sock = fd_open_inet(49876); + if (sock < 0) + return 0; + return sock; + } + + sock = fd_connect_inet(49876); + if (sock < 0) + return -1; +#else + *exists = FALSE; + if (socket_filename == NULL) + socket_filename = g_strdup_printf("%s%cmidori_socket_%s_%s", + config_dir, G_DIR_SEPARATOR, g_get_host_name(), instance_name); + + sock = fd_connect_unix(socket_filename); + if (sock < 0) + { + remove_socket_link_full(); /* deletes the socket file and the symlink */ + return fd_open_unix(socket_filename); + } +#endif + *exists = TRUE; + return sock; +} + +gint sock_cleanup(void) +{ +#ifdef G_OS_WIN32 + WSACleanup(); +#else + if (socket_filename != NULL) + { + remove_socket_link_full(); /* deletes the socket file and the symlink */ + g_free(socket_filename); + } +#endif + return 0; +} + +gint sock_set_io_timeout(guint sec) +{ + io_timeout = sec; + return 0; +} + +gint fd_connect_inet(gushort port) +{ + SockDesc sock; + struct sockaddr_in addr; + + sock = socket(AF_INET, SOCK_STREAM, 0); + if (!SOCKET_IS_VALID(sock)) { +#ifdef G_OS_WIN32 + g_warning("fd_connect_inet(): socket() failed: %d\n", + WSAGetLastError()); +#else + perror("fd_connect_inet(): socket"); +#endif + return -1; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_port = htons(port); + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + + if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + fd_close(sock); + return -1; + } + + return sock; +} + +gint fd_open_inet(gushort port) +{ + SockDesc sock; + struct sockaddr_in addr; + gint val; + + sock = socket(AF_INET, SOCK_STREAM, 0); + if (!SOCKET_IS_VALID(sock)) { +#ifdef G_OS_WIN32 + g_warning("fd_open_inet(): socket() failed: %d\n", + WSAGetLastError()); +#else + perror("fd_open_inet(): socket"); +#endif + return -1; + } + + val = 1; + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) { + perror("setsockopt"); + fd_close(sock); + return -1; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_port = htons(port); + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + + if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + perror("bind"); + fd_close(sock); + return -1; + } + + if (listen(sock, 1) < 0) { + perror("listen"); + fd_close(sock); + return -1; + } + + return sock; +} + +gint fd_connect_unix(const gchar *path) +{ +#ifdef G_OS_UNIX + gint sock; + struct sockaddr_un addr; + + sock = socket(PF_UNIX, SOCK_STREAM, 0); + if (sock < 0) { + perror("fd_connect_unix(): socket"); + return -1; + } + + memset(&addr, 0, sizeof(addr)); + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1); + + if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + fd_close(sock); + return -1; + } + + return sock; +#else + return -1; +#endif +} + +gint fd_open_unix(const gchar *path) +{ +#ifdef G_OS_UNIX + gint sock; + struct sockaddr_un addr; + gint val; + + sock = socket(PF_UNIX, SOCK_STREAM, 0); + + if (sock < 0) { + perror("sock_open_unix(): socket"); + return -1; + } + + val = 1; + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) { + perror("setsockopt"); + fd_close(sock); + return -1; + } + + memset(&addr, 0, sizeof(addr)); + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1); + + if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + perror("bind"); + fd_close(sock); + return -1; + } + + if (listen(sock, 1) < 0) { + perror("listen"); + fd_close(sock); + return -1; + } + + return sock; +#else + return -1; +#endif +} + +gint fd_accept(gint sock) +{ + struct sockaddr_in caddr; + guint caddr_len; + + caddr_len = sizeof(caddr); + return accept(sock, (struct sockaddr *)&caddr, &caddr_len); +} + +#ifdef G_OS_WIN32 +static SockInfo *sock_find_from_fd(gint fd) +{ + GList *cur; + + for (cur = sock_list; cur != NULL; cur = cur->next) { + if (((SockInfo *)cur->data)->sock == fd) + return (SockInfo *)cur->data; + } + + return NULL; +} +#endif + +static gint set_nonblocking_mode(gint fd, gboolean nonblock) +{ +#ifdef G_OS_WIN32 + gulong val = nonblock ? 1 : 0; + SockInfo *sock; + + if (!nonblock) + WSAEventSelect(fd, NULL, 0); + if (ioctlsocket(fd, FIONBIO, &val) == SOCKET_ERROR) { + g_warning("set_nonblocking_mode(): ioctlsocket() failed: %d\n", + WSAGetLastError()); + return -1; + } + + sock = sock_find_from_fd(fd); + if (sock) + sock->nonblock = nonblock; + debug_print("set nonblocking mode to %d\n", nonblock); + + return 0; +#else + gint flags; + + flags = fcntl(fd, F_GETFL, 0); + if (flags < 0) { + perror("fcntl"); + return -1; + } + + if (nonblock) + flags |= O_NONBLOCK; + else + flags &= ~O_NONBLOCK; + + return fcntl(fd, F_SETFL, flags); +#endif +} + +gint sock_set_nonblocking_mode(SockInfo *sock, gboolean nonblock) +{ + gint ret; + + g_return_val_if_fail(sock != NULL, -1); + + ret = set_nonblocking_mode(sock->sock, nonblock); + if (ret == 0) + sock->nonblock = nonblock; + + return ret; +} + +static gboolean is_nonblocking_mode(gint fd) +{ +#ifdef G_OS_WIN32 + SockInfo *sock; + + sock = sock_find_from_fd(fd); + if (sock) + return sock->nonblock; + + return FALSE; +#else + gint flags; + + flags = fcntl(fd, F_GETFL, 0); + if (flags < 0) { + perror("fcntl"); + return FALSE; + } + + return ((flags & O_NONBLOCK) != 0); +#endif +} + +gboolean sock_is_nonblocking_mode(SockInfo *sock) +{ + g_return_val_if_fail(sock != NULL, FALSE); + +#ifdef G_OS_WIN32 + return sock->nonblock; +#else + return is_nonblocking_mode(sock->sock); +#endif +} + +gboolean sock_has_read_data(SockInfo *sock) +{ +#ifdef G_OS_WIN32 + gulong val; + +#if USE_SSL + if (sock->ssl) + return TRUE; +#endif + if (ioctlsocket(sock->sock, FIONREAD, &val) < 0) { + g_warning("sock_has_read_data(): ioctlsocket() failed: %d\n", + WSAGetLastError()); + return TRUE; + } + + if (val == 0) + return FALSE; + else + return TRUE; +#else + return TRUE; +#endif +} + + +static gboolean sock_prepare(GSource *source, gint *timeout) +{ + *timeout = 1; + return FALSE; +} + +static gboolean sock_check(GSource *source) +{ + SockInfo *sock = ((SockSource *)source)->sock; + struct timeval timeout = {0, 0}; + fd_set fds; + GIOCondition condition = sock->condition; + +#if USE_SSL + if (sock->ssl) { + if (condition & G_IO_IN) { + if (SSL_pending(sock->ssl) > 0) + return TRUE; + if (SSL_want_write(sock->ssl)) + condition |= G_IO_OUT; + } + + if (condition & G_IO_OUT) { + if (SSL_want_read(sock->ssl)) + condition |= G_IO_IN; + } + } +#endif + + FD_ZERO(&fds); + FD_SET(sock->sock, &fds); + + select(sock->sock + 1, + (condition & G_IO_IN) ? &fds : NULL, + (condition & G_IO_OUT) ? &fds : NULL, + NULL, &timeout); + + return FD_ISSET(sock->sock, &fds) != 0; +} + +static gboolean sock_dispatch(GSource *source, GSourceFunc callback, + gpointer user_data) +{ + SockInfo *sock = ((SockSource *)source)->sock; + + return sock->callback(sock, sock->condition, sock->data); +} + +static gboolean sock_watch_cb(GIOChannel *source, GIOCondition condition, + gpointer data) +{ + SockInfo *sock = (SockInfo *)data; + + if ((condition & sock->condition) == 0) + return TRUE; + + return sock->callback(sock, sock->condition, sock->data); +} + +guint sock_add_watch(SockInfo *sock, GIOCondition condition, SockFunc func, + gpointer data) +{ + sock->callback = func; + sock->condition = condition; + sock->data = data; + +#if USE_SSL + if (sock->ssl) { + GSource *source; + + source = g_source_new(&sock_watch_funcs, sizeof(SockSource)); + ((SockSource *)source)->sock = sock; + g_source_set_priority(source, G_PRIORITY_DEFAULT); + g_source_set_can_recurse(source, FALSE); + return g_source_attach(source, NULL); + } +#endif + + return g_io_add_watch(sock->sock_ch, condition, sock_watch_cb, sock); +} + +static gint fd_check_io(gint fd, GIOCondition cond) +{ + struct timeval timeout; + fd_set fds; + + if (is_nonblocking_mode(fd)) + return 0; + + timeout.tv_sec = io_timeout; + timeout.tv_usec = 0; + + FD_ZERO(&fds); + FD_SET(fd, &fds); + + if (cond == G_IO_IN) { + select(fd + 1, &fds, NULL, NULL, + io_timeout > 0 ? &timeout : NULL); + } else { + select(fd + 1, NULL, &fds, NULL, + io_timeout > 0 ? &timeout : NULL); + } + + if (FD_ISSET(fd, &fds)) { + return 0; + } else { + g_warning("Socket IO timeout\n"); + return -1; + } +} + +#ifdef G_OS_UNIX +static sigjmp_buf jmpenv; + +static void G_GNUC_NORETURN timeout_handler(gint sig) +{ + siglongjmp(jmpenv, 1); +} +#endif + +static gint sock_connect_with_timeout(gint sock, + const struct sockaddr *serv_addr, + gint addrlen, + guint timeout_secs) +{ + gint ret; +#ifdef G_OS_UNIX + void (*prev_handler)(gint); + + alarm(0); + prev_handler = signal(SIGALRM, timeout_handler); + if (sigsetjmp(jmpenv, 1)) { + alarm(0); + signal(SIGALRM, prev_handler); + errno = ETIMEDOUT; + return -1; + } + alarm(timeout_secs); +#endif + + ret = connect(sock, serv_addr, addrlen); + +#ifdef G_OS_UNIX + alarm(0); + signal(SIGALRM, prev_handler); +#endif + + return ret; +} + +struct hostent *my_gethostbyname(const gchar *hostname) +{ + struct hostent *hp; +#ifdef G_OS_UNIX + void (*prev_handler)(gint); + + alarm(0); + prev_handler = signal(SIGALRM, timeout_handler); + if (sigsetjmp(jmpenv, 1)) { + alarm(0); + signal(SIGALRM, prev_handler); + fprintf(stderr, "%s: host lookup timed out.\n", hostname); + errno = 0; + return NULL; + } + alarm(io_timeout); +#endif + + if ((hp = gethostbyname(hostname)) == NULL) { +#ifdef G_OS_UNIX + alarm(0); + signal(SIGALRM, prev_handler); +#endif + fprintf(stderr, "%s: unknown host.\n", hostname); + errno = 0; + return NULL; + } + +#ifdef G_OS_UNIX + alarm(0); + signal(SIGALRM, prev_handler); +#endif + + return hp; +} + +#ifndef INET6 +static gint my_inet_aton(const gchar *hostname, struct in_addr *inp) +{ +#ifdef HAVE_INET_ATON + return inet_aton(hostname, inp); +#else +#ifdef HAVE_INET_ADDR + guint32 inaddr; + + inaddr = inet_addr(hostname); + if (inaddr != -1) { + memcpy(inp, &inaddr, sizeof(inaddr)); + return 1; + } else + return 0; +#else + return 0; +#endif +#endif /* HAVE_INET_ATON */ +} + +static gint sock_connect_by_hostname(gint sock, const gchar *hostname, + gushort port) +{ + struct hostent *hp; + struct sockaddr_in ad; + + memset(&ad, 0, sizeof(ad)); + ad.sin_family = AF_INET; + ad.sin_port = htons(port); + + if (!my_inet_aton(hostname, &ad.sin_addr)) { + if ((hp = my_gethostbyname(hostname)) == NULL) { + fprintf(stderr, "%s: unknown host.\n", hostname); + errno = 0; + return -1; + } + + if (hp->h_length != 4 && hp->h_length != 8) { + fprintf(stderr, "illegal address length received for host %s\n", hostname); + errno = 0; + return -1; + } + + memcpy(&ad.sin_addr, hp->h_addr, hp->h_length); + } + + return sock_connect_with_timeout(sock, (struct sockaddr *)&ad, + sizeof(ad), io_timeout); +} + +#else /* INET6 */ + +#ifdef G_OS_WIN32 +/* MinGW defines gai_strerror() in ws2tcpip.h, but it is not implemented. */ +#undef gai_strerror +const gchar *gai_strerror(gint errcode) +{ + static gchar str[32]; + + g_snprintf(str, sizeof(str), "gai errcode: (%d)", errcode); + return str; +} +#endif + +static SockDesc sock_connect_by_getaddrinfo(const gchar *hostname, gushort port) +{ + SockDesc sock = INVALID_SOCKET; + gint gai_error; + struct addrinfo hints, *res, *ai; + gchar port_str[6]; + + memset(&hints, 0, sizeof(hints)); + /* hints.ai_flags = AI_CANONNAME; */ + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = IPPROTO_TCP; + + /* convert port from integer to string. */ + g_snprintf(port_str, sizeof(port_str), "%d", port); + + if ((gai_error = getaddrinfo(hostname, port_str, &hints, &res)) != 0) { + fprintf(stderr, "getaddrinfo for %s:%s failed: %s\n", + hostname, port_str, gai_strerror(gai_error)); + return INVALID_SOCKET; + } + + for (ai = res; ai != NULL; ai = ai->ai_next) { + sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); + if (!SOCKET_IS_VALID(sock)) + continue; + + if (sock_connect_with_timeout + (sock, ai->ai_addr, ai->ai_addrlen, io_timeout) == 0) + break; + + fd_close(sock); + } + + if (res != NULL) + freeaddrinfo(res); + + if (ai == NULL) + return INVALID_SOCKET; + + return sock; +} +#endif /* !INET6 */ + +SockInfo *sock_connect(const gchar *hostname, gushort port) +{ + SockDesc sock; + SockInfo *sockinfo; + +#ifdef INET6 + sock = sock_connect_by_getaddrinfo(hostname, port); + if (!SOCKET_IS_VALID(sock)) + return NULL; +#else + sock = socket(AF_INET, SOCK_STREAM, 0); + if (!SOCKET_IS_VALID(sock)) { +#ifdef G_OS_WIN32 + g_warning("socket() failed: %d\n", WSAGetLastError()); +#else + perror("socket"); +#endif /* G_OS_WIN32 */ + return NULL; + } + + if (sock_connect_by_hostname(sock, hostname, port) < 0) { + if (errno != 0) perror("connect"); + fd_close(sock); + return NULL; + } +#endif /* INET6 */ + + sockinfo = g_new0(SockInfo, 1); + sockinfo->sock = sock; + sockinfo->sock_ch = g_io_channel_unix_new(sock); + sockinfo->hostname = g_strdup(hostname); + sockinfo->port = port; + sockinfo->state = CONN_ESTABLISHED; + sockinfo->nonblock = FALSE; + + sock_list = g_list_prepend(sock_list, sockinfo); + + g_usleep(100000); + + return sockinfo; +} + +#ifdef G_OS_UNIX +static void sock_address_list_free(GList *addr_list) +{ + GList *cur; + + for (cur = addr_list; cur != NULL; cur = cur->next) { + SockAddrData *addr_data = (SockAddrData *)cur->data; + g_free(addr_data->addr); + g_free(addr_data); + } + + g_list_free(addr_list); +} + +/* asynchronous TCP connection */ + +static gboolean sock_connect_async_cb(GIOChannel *source, + GIOCondition condition, gpointer data) +{ + SockConnectData *conn_data = (SockConnectData *)data; + gint fd; + gint val; + guint len; + SockInfo *sockinfo; + + fd = g_io_channel_unix_get_fd(source); + + conn_data->io_tag = 0; + conn_data->channel = NULL; + g_io_channel_unref(source); + + if (condition & (G_IO_ERR | G_IO_HUP)) { + debug_print("sock_connect_async_cb: condition = %d\n", + condition); + fd_close(fd); + sock_connect_address_list_async(conn_data); + return FALSE; + } + + len = sizeof(val); + if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &val, &len) < 0) { + perror("getsockopt"); + fd_close(fd); + sock_connect_address_list_async(conn_data); + return FALSE; + } + + if (val != 0) { + fd_close(fd); + sock_connect_address_list_async(conn_data); + return FALSE; + } + + sockinfo = g_new0(SockInfo, 1); + sockinfo->sock = fd; + sockinfo->sock_ch = g_io_channel_unix_new(fd); + sockinfo->hostname = g_strdup(conn_data->hostname); + sockinfo->port = conn_data->port; + sockinfo->state = CONN_ESTABLISHED; + sockinfo->nonblock = TRUE; + + sock_list = g_list_prepend(sock_list, sockinfo); + + conn_data->func(sockinfo, conn_data->data); + + sock_connect_async_cancel(conn_data->id); + + return FALSE; +} + +static gint sock_connect_async_get_address_info_cb(GList *addr_list, + gpointer data) +{ + SockConnectData *conn_data = (SockConnectData *)data; + + conn_data->addr_list = addr_list; + conn_data->cur_addr = addr_list; + conn_data->lookup_data = NULL; + + return sock_connect_address_list_async(conn_data); +} + +gint sock_connect_async(const gchar *hostname, gushort port, + SockConnectFunc func, gpointer data) +{ + static gint id = 1; + SockConnectData *conn_data; + + conn_data = g_new0(SockConnectData, 1); + conn_data->id = id++; + conn_data->hostname = g_strdup(hostname); + conn_data->port = port; + conn_data->addr_list = NULL; + conn_data->cur_addr = NULL; + conn_data->io_tag = 0; + conn_data->func = func; + conn_data->data = data; + + conn_data->lookup_data = sock_get_address_info_async + (hostname, port, sock_connect_async_get_address_info_cb, + conn_data); + + if (conn_data->lookup_data == NULL) { + g_free(conn_data->hostname); + g_free(conn_data); + return -1; + } + + sock_connect_data_list = g_list_append(sock_connect_data_list, + conn_data); + + return conn_data->id; +} + +gint sock_connect_async_cancel(gint id) +{ + SockConnectData *conn_data = NULL; + GList *cur; + + for (cur = sock_connect_data_list; cur != NULL; cur = cur->next) { + if (((SockConnectData *)cur->data)->id == id) { + conn_data = (SockConnectData *)cur->data; + break; + } + } + + if (conn_data) { + sock_connect_data_list = g_list_remove(sock_connect_data_list, + conn_data); + + if (conn_data->lookup_data) + sock_get_address_info_async_cancel + (conn_data->lookup_data); + + if (conn_data->io_tag > 0) + g_source_remove(conn_data->io_tag); + if (conn_data->channel) { + g_io_channel_shutdown(conn_data->channel, FALSE, NULL); + g_io_channel_unref(conn_data->channel); + } + + sock_address_list_free(conn_data->addr_list); + g_free(conn_data->hostname); + g_free(conn_data); + } else { + g_warning("sock_connect_async_cancel: id %d not found.\n", id); + return -1; + } + + return 0; +} + +static gint sock_connect_address_list_async(SockConnectData *conn_data) +{ + SockAddrData *addr_data; + gint sock = -1; + + for (; conn_data->cur_addr != NULL; + conn_data->cur_addr = conn_data->cur_addr->next) { + addr_data = (SockAddrData *)conn_data->cur_addr->data; + + if ((sock = socket(addr_data->family, addr_data->socktype, + addr_data->protocol)) < 0) { + perror("socket"); + continue; + } + + set_nonblocking_mode(sock, TRUE); + + if (connect(sock, addr_data->addr, addr_data->addr_len) < 0) { + if (EINPROGRESS == errno) { + break; + } else { + perror("connect"); + fd_close(sock); + } + } else + break; + } + + if (conn_data->cur_addr == NULL) { + g_warning("sock_connect_address_list_async: " + "connection to %s:%d failed\n", + conn_data->hostname, conn_data->port); + conn_data->func(NULL, conn_data->data); + sock_connect_async_cancel(conn_data->id); + return -1; + } + + debug_print("sock_connect_address_list_async: waiting for connect\n"); + + conn_data->cur_addr = conn_data->cur_addr->next; + + conn_data->channel = g_io_channel_unix_new(sock); + conn_data->io_tag = g_io_add_watch(conn_data->channel, + G_IO_OUT | G_IO_ERR | G_IO_HUP, + sock_connect_async_cb, conn_data); + + return 0; +} + +static gint sock_kill_process(pid_t pid) +{ + pid_t ret = (pid_t)-1; + + kill(pid, SIGKILL); + + while (ret == (pid_t)-1) { + if ((ret = waitpid(pid, NULL, 0)) != pid) { + perror("sock_kill_process(): waitpid"); + if (ret == (pid_t)-1 && errno != EINTR) + break; + } + } + + return (gint)pid; +} + +/* asynchronous DNS lookup */ + +static gboolean sock_get_address_info_async_cb(GIOChannel *source, + GIOCondition condition, + gpointer data) +{ + SockLookupData *lookup_data = (SockLookupData *)data; + GList *addr_list = NULL; + SockAddrData *addr_data; + gsize bytes_read; + gint ai_member[4]; + struct sockaddr *addr; + + for (;;) { + if (g_io_channel_read(source, (gchar *)ai_member, + sizeof(ai_member), &bytes_read) + != G_IO_ERROR_NONE) { + g_warning("sock_get_address_info_async_cb: " + "address length read error\n"); + break; + } + + if (bytes_read == 0 || bytes_read != sizeof(ai_member)) + break; + + if (ai_member[0] == AF_UNSPEC) { + g_warning("DNS lookup failed\n"); + break; + } + + addr = g_malloc(ai_member[3]); + if (g_io_channel_read(source, (gchar *)addr, ai_member[3], + &bytes_read) + != G_IO_ERROR_NONE) { + g_warning("sock_get_address_info_async_cb: " + "address data read error\n"); + g_free(addr); + break; + } + + if (bytes_read != (gsize)ai_member[3]) { + g_warning("sock_get_address_info_async_cb: " + "incomplete address data\n"); + g_free(addr); + break; + } + + addr_data = g_new0(SockAddrData, 1); + addr_data->family = ai_member[0]; + addr_data->socktype = ai_member[1]; + addr_data->protocol = ai_member[2]; + addr_data->addr_len = ai_member[3]; + addr_data->addr = addr; + + addr_list = g_list_append(addr_list, addr_data); + } + + g_io_channel_shutdown(source, FALSE, NULL); + g_io_channel_unref(source); + + sock_kill_process(lookup_data->child_pid); + + lookup_data->func(addr_list, lookup_data->data); + + g_free(lookup_data->hostname); + g_free(lookup_data); + + return FALSE; +} + +static SockLookupData *sock_get_address_info_async(const gchar *hostname, + gushort port, + SockAddrFunc func, + gpointer data) +{ + SockLookupData *lookup_data = NULL; + gint pipe_fds[2]; + pid_t pid; + + if (pipe(pipe_fds) < 0) { + perror("pipe"); + func(NULL, data); + return NULL; + } + + if ((pid = fork()) < 0) { + perror("fork"); + func(NULL, data); + return NULL; + } + + /* child process */ + if (pid == 0) { +#ifdef INET6 + gint gai_err; + struct addrinfo hints, *res, *ai; + gchar port_str[6]; +#else /* !INET6 */ + struct hostent *hp; + gchar **addr_list_p; + struct sockaddr_in ad; +#endif /* INET6 */ + gint ai_member[4] = {AF_UNSPEC, 0, 0, 0}; + + close(pipe_fds[0]); + +#ifdef INET6 + memset(&hints, 0, sizeof(hints)); + /* hints.ai_flags = AI_CANONNAME; */ + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = IPPROTO_TCP; + + g_snprintf(port_str, sizeof(port_str), "%d", port); + + gai_err = getaddrinfo(hostname, port_str, &hints, &res); + if (gai_err != 0) { + g_warning("getaddrinfo for %s:%s failed: %s\n", + hostname, port_str, gai_strerror(gai_err)); + fd_write_all(pipe_fds[1], (gchar *)ai_member, + sizeof(ai_member)); + close(pipe_fds[1]); + _exit(1); + } + + for (ai = res; ai != NULL; ai = ai->ai_next) { + ai_member[0] = ai->ai_family; + ai_member[1] = ai->ai_socktype; + ai_member[2] = ai->ai_protocol; + ai_member[3] = ai->ai_addrlen; + + fd_write_all(pipe_fds[1], (gchar *)ai_member, + sizeof(ai_member)); + fd_write_all(pipe_fds[1], (gchar *)ai->ai_addr, + ai->ai_addrlen); + } + + if (res != NULL) + freeaddrinfo(res); +#else /* !INET6 */ + hp = my_gethostbyname(hostname); + if (hp == NULL || hp->h_addrtype != AF_INET) { + fd_write_all(pipe_fds[1], (gchar *)ai_member, + sizeof(ai_member)); + close(pipe_fds[1]); + _exit(1); + } + + ai_member[0] = AF_INET; + ai_member[1] = SOCK_STREAM; + ai_member[2] = IPPROTO_TCP; + ai_member[3] = sizeof(ad); + + memset(&ad, 0, sizeof(ad)); + ad.sin_family = AF_INET; + ad.sin_port = htons(port); + + for (addr_list_p = hp->h_addr_list; *addr_list_p != NULL; + addr_list_p++) { + memcpy(&ad.sin_addr, *addr_list_p, hp->h_length); + fd_write_all(pipe_fds[1], (gchar *)ai_member, + sizeof(ai_member)); + fd_write_all(pipe_fds[1], (gchar *)&ad, sizeof(ad)); + } +#endif /* INET6 */ + + close(pipe_fds[1]); + + _exit(0); + } else { + close(pipe_fds[1]); + + lookup_data = g_new0(SockLookupData, 1); + lookup_data->hostname = g_strdup(hostname); + lookup_data->child_pid = pid; + lookup_data->func = func; + lookup_data->data = data; + + lookup_data->channel = g_io_channel_unix_new(pipe_fds[0]); + lookup_data->io_tag = g_io_add_watch + (lookup_data->channel, G_IO_IN, + sock_get_address_info_async_cb, lookup_data); + } + + return lookup_data; +} + +static gint sock_get_address_info_async_cancel(SockLookupData *lookup_data) +{ + if (lookup_data->io_tag > 0) + g_source_remove(lookup_data->io_tag); + if (lookup_data->channel) { + g_io_channel_shutdown(lookup_data->channel, FALSE, NULL); + g_io_channel_unref(lookup_data->channel); + } + + if (lookup_data->child_pid > 0) + sock_kill_process(lookup_data->child_pid); + + g_free(lookup_data->hostname); + g_free(lookup_data); + + return 0; +} +#endif /* G_OS_UNIX */ + + +gint sock_printf(SockInfo *sock, const gchar *format, ...) +{ + va_list args; + gchar buf[BUFFSIZE]; + + va_start(args, format); + g_vsnprintf(buf, sizeof(buf), format, args); + va_end(args); + + return sock_write_all(sock, buf, strlen(buf)); +} + +#ifdef G_OS_WIN32 +static void sock_set_errno_from_last_error(gint error) +{ + switch (error) { + case WSAEWOULDBLOCK: + errno = EAGAIN; + break; + default: + debug_print("last error = %d\n", error); + errno = 0; + break; + } +} +#endif + +gint sock_read(SockInfo *sock, gchar *buf, gint len) +{ + g_return_val_if_fail(sock != NULL, -1); + +#if USE_SSL + if (sock->ssl) + return ssl_read(sock->ssl, buf, len); +#endif + return fd_read(sock->sock, buf, len); +} + +gint fd_read(gint fd, gchar *buf, gint len) +{ +#ifdef G_OS_WIN32 + return fd_recv(fd, buf, len, 0); +#else + if (fd_check_io(fd, G_IO_IN) < 0) + return -1; + + return read(fd, buf, len); +#endif +} + +#if USE_SSL +gint ssl_read(SSL *ssl, gchar *buf, gint len) +{ + gint err, ret; + + if (SSL_pending(ssl) == 0) { + if (fd_check_io(SSL_get_rfd(ssl), G_IO_IN) < 0) + return -1; + } + + ret = SSL_read(ssl, buf, len); + + switch ((err = SSL_get_error(ssl, ret))) { + case SSL_ERROR_NONE: + return ret; + case SSL_ERROR_WANT_READ: + case SSL_ERROR_WANT_WRITE: + errno = EAGAIN; + return -1; + case SSL_ERROR_ZERO_RETURN: + return 0; + default: + g_warning("SSL_read() returned error %d, ret = %d\n", err, ret); + if (ret == 0) + return 0; + return -1; + } +} +#endif + +gint sock_write(SockInfo *sock, const gchar *buf, gint len) +{ + g_return_val_if_fail(sock != NULL, -1); + +#if USE_SSL + if (sock->ssl) + return ssl_write(sock->ssl, buf, len); +#endif + return fd_write(sock->sock, buf, len); +} + +gint fd_write(gint fd, const gchar *buf, gint len) +{ +#ifdef G_OS_WIN32 + gint ret; +#endif + if (fd_check_io(fd, G_IO_OUT) < 0) + return -1; + +#ifdef G_OS_WIN32 + ret = send(fd, buf, len, 0); + if (ret == SOCKET_ERROR) { + gint err; + err = WSAGetLastError(); + sock_set_errno_from_last_error(err); + if (err != WSAEWOULDBLOCK) + g_warning("fd_write() failed with %d (errno = %d)\n", + err, errno); + } + return ret; +#else + return write(fd, buf, len); +#endif +} + +#if USE_SSL +gint ssl_write(SSL *ssl, const gchar *buf, gint len) +{ + gint ret; + + ret = SSL_write(ssl, buf, len); + + switch (SSL_get_error(ssl, ret)) { + case SSL_ERROR_NONE: + return ret; + case SSL_ERROR_WANT_READ: + case SSL_ERROR_WANT_WRITE: + errno = EAGAIN; + return -1; + default: + return -1; + } +} +#endif + +gint sock_write_all(SockInfo *sock, const gchar *buf, gint len) +{ + g_return_val_if_fail(sock != NULL, -1); + +#if USE_SSL + if (sock->ssl) + return ssl_write_all(sock->ssl, buf, len); +#endif + return fd_write_all(sock->sock, buf, len); +} + +gint fd_write_all(gint fd, const gchar *buf, gint len) +{ + gint n, wrlen = 0; + + while (len) { + n = fd_write(fd, buf, len); + if (n <= 0) + return -1; + len -= n; + wrlen += n; + buf += n; + } + + return wrlen; +} + +#if USE_SSL +gint ssl_write_all(SSL *ssl, const gchar *buf, gint len) +{ + gint n, wrlen = 0; + + while (len) { + n = ssl_write(ssl, buf, len); + if (n <= 0) + return -1; + len -= n; + wrlen += n; + buf += n; + } + + return wrlen; +} +#endif + +gint fd_recv(gint fd, gchar *buf, gint len, gint flags) +{ +#ifdef G_OS_WIN32 + gint ret; +#endif + if (fd_check_io(fd, G_IO_IN) < 0) + return -1; + +#ifdef G_OS_WIN32 + ret = recv(fd, buf, len, flags); + if (ret == SOCKET_ERROR) { + gint err; + err = WSAGetLastError(); + sock_set_errno_from_last_error(err); + if (err != WSAEWOULDBLOCK) + g_warning("fd_recv(): failed with %d (errno = %d)\n", + err, errno); + } + return ret; +#else + return recv(fd, buf, len, flags); +#endif +} + +gint fd_gets(gint fd, gchar *buf, gint len) +{ + gchar *newline, *bp = buf; + gint n; + + if (--len < 1) + return -1; + do { + if ((n = fd_recv(fd, bp, len, MSG_PEEK)) <= 0) + return -1; + if ((newline = memchr(bp, '\n', n)) != NULL) + n = newline - bp + 1; + if ((n = fd_read(fd, bp, n)) < 0) + return -1; + bp += n; + len -= n; + } while (!newline && len); + + *bp = '\0'; + return bp - buf; +} + +#if USE_SSL +gint ssl_gets(SSL *ssl, gchar *buf, gint len) +{ + gchar *newline, *bp = buf; + gint n; + + if (--len < 1) + return -1; + do { + if ((n = ssl_peek(ssl, bp, len)) <= 0) + return -1; + if ((newline = memchr(bp, '\n', n)) != NULL) + n = newline - bp + 1; + if ((n = ssl_read(ssl, bp, n)) < 0) + return -1; + bp += n; + len -= n; + } while (!newline && len); + + *bp = '\0'; + return bp - buf; +} +#endif + +gint sock_gets(SockInfo *sock, gchar *buf, gint len) +{ + g_return_val_if_fail(sock != NULL, -1); + +#if USE_SSL + if (sock->ssl) + return ssl_gets(sock->ssl, buf, len); +#endif + return fd_gets(sock->sock, buf, len); +} + +gint fd_getline(gint fd, gchar **line) +{ + gchar buf[BUFFSIZE]; + gchar *str = NULL; + gint len; + gulong size = 0; + gulong cur_offset = 0; + + while ((len = fd_gets(fd, buf, sizeof(buf))) > 0) { + size += len; + str = g_realloc(str, size + 1); + memcpy(str + cur_offset, buf, len + 1); + cur_offset += len; + if (buf[len - 1] == '\n') + break; + } + + *line = str; + + if (!str) + return -1; + else + return (gint)size; +} + +#if USE_SSL +gint ssl_getline(SSL *ssl, gchar **line) +{ + gchar buf[BUFFSIZE]; + gchar *str = NULL; + gint len; + gulong size = 0; + gulong cur_offset = 0; + + while ((len = ssl_gets(ssl, buf, sizeof(buf))) > 0) { + size += len; + str = g_realloc(str, size + 1); + memcpy(str + cur_offset, buf, len + 1); + cur_offset += len; + if (buf[len - 1] == '\n') + break; + } + + *line = str; + + if (!str) + return -1; + else + return (gint)size; +} +#endif + +gint sock_getline(SockInfo *sock, gchar **line) +{ + g_return_val_if_fail(sock != NULL, -1); + g_return_val_if_fail(line != NULL, -1); + +#if USE_SSL + if (sock->ssl) + return ssl_getline(sock->ssl, line); +#endif + return fd_getline(sock->sock, line); +} + +gint sock_puts(SockInfo *sock, const gchar *buf) +{ + gint ret; + + if ((ret = sock_write_all(sock, buf, strlen(buf))) < 0) + return ret; + return sock_write_all(sock, "\r\n", 2); +} + +/* peek at the socket data without actually reading it */ +#if USE_SSL +gint ssl_peek(SSL *ssl, gchar *buf, gint len) +{ + gint err, ret; + + if (SSL_pending(ssl) == 0) { + if (fd_check_io(SSL_get_rfd(ssl), G_IO_IN) < 0) + return -1; + } + + ret = SSL_peek(ssl, buf, len); + + switch ((err = SSL_get_error(ssl, ret))) { + case SSL_ERROR_NONE: + return ret; + case SSL_ERROR_WANT_READ: + case SSL_ERROR_WANT_WRITE: + errno = EAGAIN; + return -1; + case SSL_ERROR_ZERO_RETURN: + return 0; + default: + g_warning("SSL_peek() returned error %d, ret = %d\n", err, ret); + if (ret == 0) + return 0; + return -1; + } +} +#endif + +gint sock_peek(SockInfo *sock, gchar *buf, gint len) +{ + g_return_val_if_fail(sock != NULL, -1); + +#if USE_SSL + if (sock->ssl) + return ssl_peek(sock->ssl, buf, len); +#endif + return fd_recv(sock->sock, buf, len, MSG_PEEK); +} + +gint sock_close(SockInfo *sock) +{ + GList *cur; + + if (!sock) + return 0; + +#if USE_SSL + if (sock->ssl) + ssl_done_socket(sock); +#endif + + if (sock->sock_ch) { + g_io_channel_shutdown(sock->sock_ch, FALSE, NULL); + g_io_channel_unref(sock->sock_ch); + } + + for (cur = sock_list; cur != NULL; cur = cur->next) { + if ((SockInfo *)cur->data == sock) { + sock_list = g_list_remove(sock_list, sock); + break; + } + } + + g_free(sock->hostname); + g_free(sock); + + return 0; +} + +gint fd_close(gint fd) +{ +#ifdef G_OS_WIN32 + return closesocket(fd); +#else + return close(fd); +#endif +} + +#if USE_SSL +void ssl_done_socket(SockInfo *sockinfo) +{ + if (sockinfo->ssl) { + SSL_free(sockinfo->ssl); + } +} +#endif + +#endif diff --git a/midori/socket.h b/midori/socket.h new file mode 100644 index 00000000..e7f175dc --- /dev/null +++ b/midori/socket.h @@ -0,0 +1,128 @@ +/* + Copyright 1999-2008 Hiroyuki Yamamoto + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __SYLPH_SOCKET_H__ +#define __SYLPH_SOCKET_H__ + +#if HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#if HAVE_NETDB_H +# include +#endif + +typedef struct _SockInfo SockInfo; + +#if USE_SSL +# include +#endif + +typedef enum +{ + CONN_READY, + CONN_LOOKUPSUCCESS, + CONN_ESTABLISHED, + CONN_LOOKUPFAILED, + CONN_FAILED +} ConnectionState; + +typedef gint (*SockConnectFunc) (SockInfo *sock, + gpointer data); +typedef gboolean (*SockFunc) (SockInfo *sock, + GIOCondition condition, + gpointer data); + +struct _SockInfo +{ + gint sock; +#if USE_SSL + SSL *ssl; +#else + gpointer ssl; +#endif + GIOChannel *sock_ch; + + gchar *hostname; + gushort port; + ConnectionState state; + gboolean nonblock; + gpointer data; + + SockFunc callback; + GIOCondition condition; +}; + +void send_open_command (gint sock, const gchar *command, + gchar **args); +gint socket_init (const gchar *instance_name, + const gchar *config_dir, gboolean *exists); + +gint sock_cleanup (void); + +gint sock_set_io_timeout (guint sec); + +gint sock_set_nonblocking_mode (SockInfo *sock, gboolean nonblock); +gboolean sock_is_nonblocking_mode (SockInfo *sock); + +gboolean sock_has_read_data (SockInfo *sock); + +guint sock_add_watch (SockInfo *sock, GIOCondition condition, + SockFunc func, gpointer data); + +struct hostent *my_gethostbyname (const gchar *hostname); + +SockInfo *sock_connect (const gchar *hostname, gushort port); +#ifdef G_OS_UNIX +gint sock_connect_async (const gchar *hostname, gushort port, + SockConnectFunc func, gpointer data); +gint sock_connect_async_cancel (gint id); +#endif + +/* Basic I/O functions */ +gint sock_printf (SockInfo *sock, const gchar *format, ...) + G_GNUC_PRINTF(2, 3); +gint sock_read (SockInfo *sock, gchar *buf, gint len); +gint sock_write (SockInfo *sock, const gchar *buf, gint len); +gint sock_write_all (SockInfo *sock, const gchar *buf, gint len); +gint sock_gets (SockInfo *sock, gchar *buf, gint len); +gint sock_getline (SockInfo *sock, gchar **line); +gint sock_puts (SockInfo *sock, const gchar *buf); +gint sock_peek (SockInfo *sock, gchar *buf, gint len); +gint sock_close (SockInfo *sock); + +/* Functions to directly work on FD. They are needed for pipes */ +gint fd_connect_inet (gushort port); +gint fd_open_inet (gushort port); +gint fd_connect_unix (const gchar *path); +gint fd_open_unix (const gchar *path); +gint fd_accept (gint sock); + +gint fd_read (gint sock, gchar *buf, gint len); +gint fd_write (gint sock, const gchar *buf, gint len); +gint fd_write_all (gint sock, const gchar *buf, gint len); +gint fd_gets (gint sock, gchar *buf, gint len); +gint fd_getline (gint sock, gchar **line); +gint fd_close (gint sock); + +/* Functions for SSL */ +#if USE_SSL +gint ssl_read (SSL *ssl, gchar *buf, gint len); +gint ssl_write (SSL *ssl, const gchar *buf, gint len); +gint ssl_write_all (SSL *ssl, const gchar *buf, gint len); +gint ssl_gets (SSL *ssl, gchar *buf, gint len); +gint ssl_getline (SSL *ssl, gchar **line); +gint ssl_peek (SSL *ssl, gchar *buf, gint len); +void ssl_done_socket (SockInfo *sockinfo); +#endif + +#endif /* __SYLPH_SOCKET_H__ */ diff --git a/midori/sokoke.c b/midori/sokoke.c index 5bee98b4..97d932f2 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -36,6 +36,7 @@ #include #endif +#ifdef HAVE_JSCORE static gchar* sokoke_js_string_utf8 (JSStringRef js_string) { @@ -49,18 +50,22 @@ 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, @@ -79,6 +84,9 @@ 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 @@ -92,8 +100,6 @@ error_dialog (const gchar* short_message, gtk_widget_show (dialog); g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); - - } /** @@ -355,11 +361,11 @@ sokoke_magic_uri (const gchar* uri, search_uri = NULL; /* Do we have a keyword and a string? */ parts = g_strsplit (uri, " ", 2); - if (parts[0] && parts[1]) + if (parts[0]) if ((item = katze_array_find_token (search_engines, parts[0]))) { search_uri = katze_item_get_uri (item); - search = sokoke_search_uri (search_uri, parts[1]); + search = sokoke_search_uri (search_uri, parts[1] ? parts[1] : ""); } g_strfreev (parts); return search; @@ -511,12 +517,16 @@ sokoke_hig_frame_new (const gchar* title) { /* Create a frame with no actual frame but a bold label and indentation */ GtkWidget* frame = gtk_frame_new (NULL); + #ifdef G_OS_WIN32 + gtk_frame_set_label (GTK_FRAME (frame), title); + #else gchar* title_bold = g_strdup_printf ("%s", title); GtkWidget* label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), title_bold); g_free (title_bold); gtk_frame_set_label_widget (GTK_FRAME (frame), label); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); + #endif return frame; } @@ -735,6 +745,9 @@ sokoke_action_create_popup_menu_item (GtkAction* action) g_return_val_if_fail (GTK_IS_ACTION (action), NULL); + if (KATZE_IS_ARRAY_ACTION (action)) + return gtk_action_create_menu_item (action); + g_object_get (action, "label", &label, "stock-id", &stock_id, @@ -747,6 +760,9 @@ sokoke_action_create_popup_menu_item (GtkAction* action) menuitem = gtk_check_menu_item_new_with_mnemonic (label); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + if (GTK_IS_RADIO_ACTION (action)) + gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (menuitem), + TRUE); } else if (stock_id) { @@ -839,6 +855,7 @@ sokoke_register_stock_items (void) { { STOCK_EXTENSION, NULL, 0, 0, GTK_STOCK_CONVERT }, { STOCK_IMAGE, NULL, 0, 0, GTK_STOCK_ORIENTATION_PORTRAIT }, + { STOCK_WEB_BROWSER, NULL, 0, 0, "gnome-web-browser" }, { STOCK_NEWS_FEED, NULL, 0, 0, GTK_STOCK_INDEX }, { STOCK_SCRIPT, NULL, 0, 0, GTK_STOCK_EXECUTE }, { STOCK_STYLE, NULL, 0, 0, GTK_STOCK_SELECT_COLOR }, @@ -846,7 +863,7 @@ sokoke_register_stock_items (void) { STOCK_BOOKMARK, N_("_Bookmark"), 0, 0, GTK_STOCK_FILE }, { STOCK_BOOKMARKS, N_("_Bookmarks"), 0, 0, GTK_STOCK_DIRECTORY }, - { STOCK_BOOKMARK_ADD, N_("_Add Bookmark"), 0, 0, GTK_STOCK_ADD }, + { STOCK_BOOKMARK_ADD, N_("Add Boo_kmark"), 0, 0, GTK_STOCK_ADD }, { STOCK_CONSOLE, N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING }, { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, { STOCK_HISTORY, N_("_History"), 0, 0, GTK_STOCK_SORT_ASCENDING }, @@ -948,6 +965,32 @@ sokoke_remove_path (const gchar* path, return TRUE; } +/** + * sokoke_find_data_filename: + * @filename: a filename or relative path + * + * Looks for the specified filename in the system data + * directories, depending on the platform. + * + * Return value: a full path + **/ +gchar* +sokoke_find_data_filename (const gchar* filename) +{ + const gchar* const* data_dirs = g_get_system_data_dirs (); + guint i = 0; + const gchar* data_dir; + + while ((data_dir = data_dirs[i++])) + { + gchar* path = g_build_filename (data_dir, filename, NULL); + if (g_file_test (path, G_FILE_TEST_EXISTS)) + return path; + g_free (path); + } + return g_build_filename (MDATADIR, filename, NULL); +} + static void res_server_handler_cb (SoupServer* res_server, SoupMessage* msg, @@ -958,13 +1001,15 @@ res_server_handler_cb (SoupServer* res_server, { if (g_str_has_prefix (path, "/res")) { - gchar* filename = g_strconcat (DATADIR "/midori", path, NULL); + gchar* filename = g_build_filename ("midori", path, NULL); + gchar* filepath = sokoke_find_data_filename (filename); gchar* contents; gsize length; - if (g_file_get_contents (filename, &contents, &length, NULL)) + g_free (filename); + if (g_file_get_contents (filepath, &contents, &length, NULL)) { - gchar* content_type = g_content_type_guess (filename, (guchar*)contents, + gchar* content_type = g_content_type_guess (filepath, (guchar*)contents, length, NULL); gchar* mime_type = g_content_type_get_mime_type (content_type); g_free (content_type); @@ -975,7 +1020,7 @@ res_server_handler_cb (SoupServer* res_server, } else soup_message_set_status (msg, 404); - g_free (filename); + g_free (filepath); } else if (g_str_has_prefix (path, "/stock/")) { diff --git a/midori/sokoke.h b/midori/sokoke.h index d656410e..a39b3e6f 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -151,6 +151,9 @@ gboolean sokoke_remove_path (const gchar* path, gboolean ignore_errors); +gchar* +sokoke_find_data_filename (const gchar* filename); + SoupServer* sokoke_get_res_server (void); diff --git a/midori/wscript_build b/midori/wscript_build index 87eba0ea..2d1ae2c9 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -5,12 +5,12 @@ import platform obj = bld.new_task_gen ('cc', 'staticlib') -obj.name = 'midori' +obj.name = 'midori-core' obj.target = 'midori' obj.includes = '. ..' obj.find_sources_in_dirs ('.', excludes=['main.c']) obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') -obj.uselib = 'UNIQUE LIBSOUP LIBIDN GIO GTK SQLITE WEBKIT LIBXML HILDON' +obj.uselib = 'UNIQUE LIBSOUP LIBIDN GIO GTK SQLITE WEBKIT LIBXML WS2_32 OPENSSL HILDON' obj.uselib_local = 'katze' obj.install_path = None @@ -20,12 +20,14 @@ obj.target = 'panels' obj.includes = '. ..' obj.find_sources_in_dirs ('../panels') obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML' -obj.uselib_local = 'midori' +obj.uselib_local = 'midori-core' obj.install_path = None obj = bld.new_task_gen ('cc', 'program') obj.target = 'midori' obj.includes = '. .. ../panels' obj.source = 'main.c' +if bld.env['WINRC']: + obj.source += ' ../data/midori.rc' obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML' obj.uselib_local = 'panels' diff --git a/panels/midori-addons.c b/panels/midori-addons.c index 8fa52a18..cd2d057a 100644 --- a/panels/midori-addons.c +++ b/panels/midori-addons.c @@ -306,49 +306,6 @@ _addons_get_files (MidoriAddons* addons) return files; } -static GtkTreePath* -_treeview_first_selected_path (GtkTreeView *treeview) -{ - GtkTreeSelection* selection; - GList* tree_paths; - - selection = gtk_tree_view_get_selection (treeview); - if (!selection) - return NULL; - - if (gtk_tree_selection_get_selected (selection, NULL, NULL)) - { - GtkTreePath* result; - tree_paths = gtk_tree_selection_get_selected_rows (selection, NULL); - result = gtk_tree_path_copy (g_list_nth_data (tree_paths, 0)); - g_list_foreach (tree_paths, (GFunc)gtk_tree_path_free, NULL); - g_list_free (tree_paths); - return result; - } - else - return NULL; -} - -static void -_addons_toggle_enable_button (MidoriAddons* addons, - gboolean sensitive) -{ - GtkToolItem* button; - - button = gtk_toolbar_get_nth_item (GTK_TOOLBAR (addons->toolbar), 1); - gtk_widget_set_sensitive (GTK_WIDGET (button), sensitive); -} - -static void -_addons_toggle_disable_button (MidoriAddons* addons, - gboolean sensitive) -{ - GtkToolItem* button; - - button = gtk_toolbar_get_nth_item (GTK_TOOLBAR (addons->toolbar), 2); - gtk_widget_set_sensitive (GTK_WIDGET (button), sensitive); -} - static void midori_addons_directory_monitor_changed (GFileMonitor* monitor, GFile* child, @@ -359,67 +316,6 @@ midori_addons_directory_monitor_changed (GFileMonitor* monitor, midori_addons_update_elements (addons); } -static void -midori_addons_treeview_cursor_changed (GtkTreeView* treeview, - MidoriAddons* addons) -{ - struct AddonElement* element; - GtkTreeModel* model; - GtkTreeIter iter; - GtkTreePath *path; - - path = _treeview_first_selected_path (treeview); - - model = gtk_tree_view_get_model (treeview); - if (path && gtk_tree_model_get_iter (model, &iter, path)) - { - gtk_tree_model_get (model, &iter, 0, &element, -1); - if (element->broken) - { - _addons_toggle_enable_button (addons, FALSE); - _addons_toggle_disable_button (addons, FALSE); - } else - { - _addons_toggle_enable_button (addons, !element->enabled); - _addons_toggle_disable_button (addons, element->enabled); - } - } -} - -static void -midori_addons_button_status_clicked_cb (GtkToolItem* toolitem, - MidoriAddons* addons) -{ - GtkTreeView* treeview; - struct AddonElement* element; - GtkTreeModel* model; - GtkTreeIter iter; - GtkTreePath* path; - - treeview = GTK_TREE_VIEW (addons->treeview); - - path = _treeview_first_selected_path (treeview); - model = gtk_tree_view_get_model (treeview); - if (gtk_tree_model_get_iter (model, &iter, path)) - { - gtk_tree_model_get (model, &iter, 0, &element, -1); - if (toolitem == gtk_toolbar_get_nth_item ( - GTK_TOOLBAR (addons->toolbar), 2)) /* disable button */ - element->enabled = FALSE; - else if (toolitem == gtk_toolbar_get_nth_item ( - GTK_TOOLBAR (addons->toolbar), 1)) /* enable button */ - element->enabled = TRUE; - - _addons_toggle_enable_button (addons, !element->enabled); - _addons_toggle_disable_button (addons, element->enabled); - - /* After enabling or disabling an element, the tree view - is not updated automatically; we need to notify tree model - in order to take the modification into account */ - gtk_tree_model_row_changed (model, path, &iter); - } -} - static void midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, MidoriAddons* addons) @@ -435,7 +331,7 @@ midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, } static void -midori_addons_treeview_render_icon_cb (GtkTreeViewColumn* column, +midori_addons_treeview_render_tick_cb (GtkTreeViewColumn* column, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter, @@ -445,10 +341,10 @@ midori_addons_treeview_render_icon_cb (GtkTreeViewColumn* column, gtk_tree_model_get (model, iter, 0, &element, -1); - if (element->broken) - g_object_set (renderer, "stock-id", GTK_STOCK_STOP, NULL); - else - g_object_set (renderer, "stock-id", GTK_STOCK_FILE, NULL); + g_object_set (renderer, + "active", element->enabled, + "sensitive", !element->broken, + NULL); } static void @@ -475,14 +371,48 @@ midori_addons_treeview_row_activated_cb (GtkTreeView* treeview, GtkTreeViewColumn* column, MidoriAddons* addons) { - /*GtkTreeModel* model = gtk_tree_view_get_model (treeview); + GtkTreeModel* model = gtk_tree_view_get_model (treeview); GtkTreeIter iter; if (gtk_tree_model_get_iter (model, &iter, path)) { - gchar* b; - gtk_tree_model_get (model, &iter, 2, &b, -1); - g_free (b); - }*/ + struct AddonElement *element; + + gtk_tree_model_get (model, &iter, 0, &element, -1); + + element->enabled = !element->enabled; + + /* After enabling or disabling an element, the tree view + is not updated automatically; we need to notify tree model + in order to take the modification into account */ + gtk_tree_model_row_changed (model, path, &iter); + } +} + +static void +midori_addons_cell_renderer_toggled_cb (GtkCellRendererToggle* renderer, + const gchar* path, + MidoriAddons* addons) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (addons->treeview)); + if (gtk_tree_model_get_iter_from_string (model, &iter, path)) + { + struct AddonElement *element; + GtkTreePath* tree_path; + + gtk_tree_model_get (model, &iter, 0, &element, -1); + + element->enabled = !element->enabled; + + /* After enabling or disabling an element, the tree view + is not updated automatically; we need to notify tree model + in order to take the modification into account */ + tree_path = gtk_tree_path_new_from_string (path); + gtk_tree_model_row_changed (model, tree_path, &iter); + gtk_tree_path_free (tree_path); + } } static void @@ -490,7 +420,7 @@ midori_addons_init (MidoriAddons* addons) { GtkTreeViewColumn* column; GtkCellRenderer* renderer_text; - GtkCellRenderer* renderer_pixbuf; + GtkCellRenderer* renderer_toggle; addons->web_widget = NULL; addons->elements = NULL; @@ -498,11 +428,15 @@ midori_addons_init (MidoriAddons* addons) addons->treeview = gtk_tree_view_new (); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (addons->treeview), FALSE); column = gtk_tree_view_column_new (); - renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); - gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, - (GtkTreeCellDataFunc)midori_addons_treeview_render_icon_cb, + renderer_toggle = gtk_cell_renderer_toggle_new (); + gtk_tree_view_column_pack_start (column, renderer_toggle, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_toggle, + (GtkTreeCellDataFunc)midori_addons_treeview_render_tick_cb, addons->treeview, NULL); + g_signal_connect (renderer_toggle, "toggled", + G_CALLBACK (midori_addons_cell_renderer_toggled_cb), addons); + gtk_tree_view_append_column (GTK_TREE_VIEW (addons->treeview), column); + column = gtk_tree_view_column_new (); renderer_text = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer_text, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_text, @@ -1026,26 +960,6 @@ midori_addons_get_toolbar (MidoriViewable* addons) gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); - /* enable button */ - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_YES); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Enable")); - gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Enable")); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_addons_button_status_clicked_cb), addons); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_set_sensitive (GTK_WIDGET (toolitem), FALSE); - gtk_widget_show (GTK_WIDGET (toolitem)); - - /* disable button */ - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_NO); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Disable")); - gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Disable")); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_addons_button_status_clicked_cb), addons); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_set_sensitive (GTK_WIDGET (toolitem), FALSE); - gtk_widget_show (GTK_WIDGET (toolitem)); - /* separator */ toolitem = gtk_separator_tool_item_new (); gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), @@ -1063,10 +977,6 @@ midori_addons_get_toolbar (MidoriViewable* addons) gtk_widget_show (GTK_WIDGET (toolitem)); MIDORI_ADDONS (addons)->toolbar = toolbar; - g_signal_connect (MIDORI_ADDONS (addons)->treeview, "cursor-changed", - G_CALLBACK (midori_addons_treeview_cursor_changed), - addons); - g_signal_connect (toolbar, "destroy", G_CALLBACK (gtk_widget_destroyed), &MIDORI_ADDONS (addons)->toolbar); @@ -1179,12 +1089,5 @@ midori_addons_update_elements (MidoriAddons* addons) gtk_tree_view_set_model (GTK_TREE_VIEW (addons->treeview), GTK_TREE_MODEL (liststore)); - /* In case a row was selected, that selection will be cancelled - when calling gtk_tree_view_set_model. So, we need to make sure - that the buttons are insensitive. */ - if (addons->toolbar) - { - _addons_toggle_enable_button (addons, FALSE); - _addons_toggle_disable_button (addons, FALSE); - } + gtk_widget_queue_draw (GTK_WIDGET (addons->treeview)); } diff --git a/panels/midori-bookmark-store.c b/panels/midori-bookmark-store.c new file mode 100644 index 00000000..b8e03f23 --- /dev/null +++ b/panels/midori-bookmark-store.c @@ -0,0 +1,110 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-bookmark-store.h" + +struct _MidoriBookmarkStore +{ + GtkTreeStore parent_instance; +}; + +struct _MidoriBookmarkStoreClass +{ + GtkTreeStoreClass parent_class; +}; + +static void +midori_bookmark_store_drag_source_iface_init (GtkTreeDragSourceIface* iface); + +static void +midori_bookmark_store_drag_dest_iface_init (GtkTreeDragDestIface* iface); + +G_DEFINE_TYPE_WITH_CODE (MidoriBookmarkStore, midori_bookmark_store, GTK_TYPE_TREE_STORE, + G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE, + midori_bookmark_store_drag_source_iface_init) + G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_DEST, + midori_bookmark_store_drag_dest_iface_init)); + +static void +midori_bookmark_store_finalize (GObject* object); + +static void +midori_bookmark_store_class_init (MidoriBookmarkStoreClass* class) +{ + GObjectClass* gobject_class; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_bookmark_store_finalize; +} + +static void +midori_bookmark_store_init (MidoriBookmarkStore* bookmark_store) +{ + /* Nothing to do */ +} + +static void +midori_bookmark_store_finalize (GObject* object) +{ + /* Nothing to do */ +} + +static void +midori_bookmark_store_drag_source_iface_init (GtkTreeDragSourceIface* iface) +{ + /*iface->row_draggable = real_gtk_tree_store_row_draggable; + iface->drag_data_delete = gtk_tree_store_drag_data_delete; + iface->drag_data_get = gtk_tree_store_drag_data_get;*/ +} + +static void +midori_bookmark_store_drag_dest_iface_init (GtkTreeDragDestIface* iface) +{ + /*iface->drag_data_received = gtk_tree_store_drag_data_received; + iface->row_drop_possible = gtk_tree_store_row_drop_possible;*/ +} + +/** + * midori_bookmark_store_new: + * + * Creates a new empty bookmark_store. + * + * Return value: a new #MidoriBookmarkStore + * + * Since: 0.1.8 + **/ +GtkTreeStore* +midori_bookmark_store_new (gint n_columns, + ...) +{ + GtkTreeStore* treestore; + va_list args; + gint i; + GType* types; + + g_return_val_if_fail (n_columns > 0, NULL); + + treestore = g_object_new (MIDORI_TYPE_BOOKMARK_STORE, NULL); + + va_start (args, n_columns); + + types = g_new (GType, n_columns); + for (i = 0; i < n_columns; i++) + { + GType type = va_arg (args, GType); + types[i] = type; + } + va_end (args); + + gtk_tree_store_set_column_types (treestore, i, types); + + return treestore; +} diff --git a/panels/midori-bookmark-store.h b/panels/midori-bookmark-store.h new file mode 100644 index 00000000..ee6a3d54 --- /dev/null +++ b/panels/midori-bookmark-store.h @@ -0,0 +1,44 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_BOOKMARK_STORE_H__ +#define __MIDORI_BOOKMARK_STORE_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_BOOKMARK_STORE \ + (midori_bookmark_store_get_type ()) +#define MIDORI_BOOKMARK_STORE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_BOOKMARK_STORE, MidoriBookmarkStore)) +#define MIDORI_BOOKMARK_STORE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_BOOKMARK_STORE, MidoriBookmarkStoreClass)) +#define MIDORI_IS_BOOKMARK_STORE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_BOOKMARK_STORE)) +#define MIDORI_IS_BOOKMARK_STORE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_BOOKMARK_STORE)) +#define MIDORI_BOOKMARK_STORE_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_BOOKMARK_STORE, MidoriBookmarkStoreClass)) + +typedef struct _MidoriBookmarkStore MidoriBookmarkStore; +typedef struct _MidoriBookmarkStoreClass MidoriBookmarkStoreClass; + +GType +midori_bookmark_store_get_type (void); + +GtkTreeStore* +midori_bookmark_store_new (gint n_columns, + ...); + +G_END_DECLS + +#endif /* __MIDORI_BOOKMARK_STORE_H__ */ diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index a6658b9a..93f1c81c 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -16,6 +16,7 @@ #include "midori-stock.h" #include "midori-view.h" #include "midori-viewable.h" +#include "midori-bookmark-store.h" #include "sokoke.h" @@ -725,8 +726,10 @@ midori_bookmarks_open_in_window_activate_cb (GtkWidget* menuitem, if (uri && *uri) { - MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); - g_signal_emit_by_name (browser, "new-window", uri); + MidoriBrowser* new_browser = midori_app_create_browser (bookmarks->app); + midori_app_add_browser (bookmarks->app, new_browser); + gtk_widget_show (GTK_WIDGET (new_browser)); + midori_browser_add_uri (new_browser, uri); } } @@ -892,7 +895,7 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks) bookmarks->net = katze_net_new (); /* Create the treeview */ - model = gtk_tree_store_new (1, KATZE_TYPE_ITEM); + model = midori_bookmark_store_new (1, KATZE_TYPE_ITEM); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); column = gtk_tree_view_column_new (); diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c index 1b06a72b..1dec4d1b 100644 --- a/panels/midori-extensions.c +++ b/panels/midori-extensions.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -59,6 +59,9 @@ midori_extensions_get_property (GObject* object, GValue* value, GParamSpec* pspec); +static void +midori_extensions_finalize (GObject* object); + static void midori_extensions_class_init (MidoriExtensionsClass* class) { @@ -68,6 +71,7 @@ midori_extensions_class_init (MidoriExtensionsClass* class) gobject_class = G_OBJECT_CLASS (class); gobject_class->set_property = midori_extensions_set_property; gobject_class->get_property = midori_extensions_get_property; + gobject_class->finalize = midori_extensions_finalize; flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; @@ -93,37 +97,6 @@ midori_extensions_get_stock_id (MidoriViewable* viewable) return STOCK_EXTENSIONS; } -static void -midori_extensions_button_status_clicked_cb (GtkToolItem* toolitem, - MidoriExtensions* extensions) -{ - GtkTreeView* treeview; - GtkTreeModel* model; - GtkTreeIter iter; - MidoriExtension* extension; - - treeview = GTK_TREE_VIEW (extensions->treeview); - - if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) - { - GtkToolItem* button_enable = gtk_toolbar_get_nth_item ( - GTK_TOOLBAR (extensions->toolbar), 1); - GtkToolItem* button_disable = gtk_toolbar_get_nth_item ( - GTK_TOOLBAR (extensions->toolbar), 2); - - gtk_tree_model_get (model, &iter, 0, &extension, -1); - if (toolitem == button_enable) - g_signal_emit_by_name (extension, "activate", extensions->app); - else if (toolitem == button_disable) - midori_extension_deactivate (extension); - - gtk_widget_set_sensitive (GTK_WIDGET (button_enable), - !midori_extension_is_active (extension)); - gtk_widget_set_sensitive (GTK_WIDGET (button_disable), - midori_extension_is_active (extension)); - } -} - static GtkWidget* midori_extensions_get_toolbar (MidoriViewable* extensions) { @@ -139,26 +112,6 @@ midori_extensions_get_toolbar (MidoriViewable* extensions) gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); - /* enable button */ - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_YES); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Enable")); - gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Enable")); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_extensions_button_status_clicked_cb), extensions); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_set_sensitive (GTK_WIDGET (toolitem), FALSE); - gtk_widget_show (GTK_WIDGET (toolitem)); - - /* disable button */ - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_NO); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Disable")); - gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Disable")); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_extensions_button_status_clicked_cb), extensions); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_set_sensitive (GTK_WIDGET (toolitem), FALSE); - gtk_widget_show (GTK_WIDGET (toolitem)); - MIDORI_EXTENSIONS (extensions)->toolbar = toolbar; } @@ -173,6 +126,21 @@ midori_extensions_viewable_iface_init (MidoriViewableIface* iface) iface->get_toolbar = midori_extensions_get_toolbar; } +static void +midori_extensions_extension_activate_cb (MidoriExtension* extension, + MidoriApp* app, + MidoriExtensions* extensions) +{ + gtk_widget_queue_draw (GTK_WIDGET (extensions->treeview)); +} + +static void +midori_extensions_extension_deactivate_cb (MidoriExtension* extension, + MidoriExtensions* extensions) +{ + gtk_widget_queue_draw (GTK_WIDGET (extensions->treeview)); +} + static void midori_extensions_add_item_cb (KatzeArray* array, MidoriExtension* extension, @@ -184,6 +152,10 @@ midori_extensions_add_item_cb (KatzeArray* array, model = gtk_tree_view_get_model (GTK_TREE_VIEW (extensions->treeview)); gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, extension, -1); + g_signal_connect (extension, "activate", + G_CALLBACK (midori_extensions_extension_activate_cb), extensions); + g_signal_connect (extension, "deactivate", + G_CALLBACK (midori_extensions_extension_deactivate_cb), extensions); } static void @@ -239,13 +211,19 @@ midori_extensions_get_property (GObject* object, } static void -midori_extensions_treeview_render_icon_cb (GtkTreeViewColumn* column, +midori_extensions_treeview_render_tick_cb (GtkTreeViewColumn* column, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter, GtkWidget* treeview) { - g_object_set (renderer, "stock-id", GTK_STOCK_EXECUTE, NULL); + MidoriExtension* extension; + + gtk_tree_model_get (model, iter, 0, &extension, -1); + + g_object_set (renderer, "active", midori_extension_is_active (extension), NULL); + + g_object_unref (extension); } static void @@ -266,13 +244,13 @@ midori_extensions_treeview_render_text_cb (GtkTreeViewColumn* column, name = katze_object_get_string (extension, "name"); version = katze_object_get_string (extension, "version"); desc = katze_object_get_string (extension, "description"); - text = g_strdup_printf ("%s %s\n%s", name, version, desc); + text = g_markup_printf_escaped ("%s %s\n%s", name, version, desc); g_free (name); g_free (version); g_free (desc); - g_object_set (renderer, "text", text, - "sensitive", midori_extension_is_active (extension), - NULL); + + g_object_set (renderer, "markup", text, NULL); + g_free (text); g_object_unref (extension); } @@ -283,16 +261,10 @@ midori_extensions_treeview_row_activated_cb (GtkTreeView* treeview, GtkTreeViewColumn* column, MidoriExtensions* extensions) { - GtkToolItem* button_enable; - GtkToolItem* button_disable; GtkTreeModel* model; GtkTreeIter iter; model = gtk_tree_view_get_model (treeview); - button_enable = gtk_toolbar_get_nth_item ( - GTK_TOOLBAR (extensions->toolbar), 1); - button_disable = gtk_toolbar_get_nth_item ( - GTK_TOOLBAR (extensions->toolbar), 2); if (gtk_tree_model_get_iter (model, &iter, path)) { MidoriExtension* extension; @@ -302,45 +274,198 @@ midori_extensions_treeview_row_activated_cb (GtkTreeView* treeview, midori_extension_deactivate (extension); else g_signal_emit_by_name (extension, "activate", extensions->app); - gtk_widget_set_sensitive (GTK_WIDGET (button_enable), - !midori_extension_is_active (extension)); - gtk_widget_set_sensitive (GTK_WIDGET (button_disable), - midori_extension_is_active (extension)); - /* FIXME: Update only the appropriate row */ - gtk_widget_queue_draw (GTK_WIDGET (treeview)); + + g_object_unref (extension); } } static void -midori_extensions_treeview_cursor_changed_cb (GtkTreeView* treeview, - MidoriExtensions* extensions) +midori_extensions_preferences_activate_cb (GtkWidget* menuitem, + MidoriExtensions* extensions) +{ + MidoriExtension* extension; + + extension = g_object_get_data (G_OBJECT (menuitem), "MidoriExtension"); + g_return_if_fail (extension != NULL); +} + +static void +midori_extensions_website_activate_cb (GtkWidget* menuitem, + MidoriExtensions* extensions) +{ + gchar* uri; + gint n; + MidoriBrowser* browser; + + MidoriExtension* extension; + + extension = g_object_get_data (G_OBJECT (menuitem), "MidoriExtension"); + g_return_if_fail (extension != NULL); + uri = katze_object_get_string (extension, "website"); + + browser = midori_browser_get_for_widget (GTK_WIDGET (extensions)); + n = midori_browser_add_uri (browser, uri); + midori_browser_set_current_page (browser, n); + + g_free (uri); +} + +static void +midori_extensions_about_activate_cb (GtkWidget* menuitem, + MidoriExtensions* extensions) +{ + MidoriExtension* extension; + + extension = g_object_get_data (G_OBJECT (menuitem), "MidoriExtension"); + g_return_if_fail (extension != NULL); +} + +static GtkWidget* +midori_extensions_popup_menu_item (GtkMenu* menu, + const gchar* stock_id, + const gchar* label, + MidoriExtension* extension, + gpointer callback, + gboolean enabled, + MidoriExtensions* extensions) +{ + GtkWidget* menuitem; + + menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); + if (label) + gtk_label_set_text_with_mnemonic (GTK_LABEL (gtk_bin_get_child ( + GTK_BIN (menuitem))), label); + + if (!enabled) + gtk_widget_set_sensitive (menuitem, FALSE); + + g_object_set_data (G_OBJECT (menuitem), "MidoriExtension", extension); + + if (callback) + g_signal_connect (menuitem, "activate", G_CALLBACK (callback), extensions); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + + return menuitem; +} + +static void +midori_extensions_popup (GtkWidget* widget, + GdkEventButton* event, + MidoriExtension* extension, + MidoriExtensions* extensions) +{ + GtkWidget* menu; + gchar* website; + + website = katze_object_get_string (extension, "website"); + + menu = gtk_menu_new (); + midori_extensions_popup_menu_item (GTK_MENU (menu), GTK_STOCK_PREFERENCES, NULL, extension, + midori_extensions_preferences_activate_cb, FALSE, + extensions); + midori_extensions_popup_menu_item (GTK_MENU (menu), GTK_STOCK_HOME, NULL, extension, + midori_extensions_website_activate_cb, website != NULL, + extensions); + midori_extensions_popup_menu_item (GTK_MENU (menu), GTK_STOCK_ABOUT, NULL, extension, + midori_extensions_about_activate_cb, FALSE, + extensions); + + sokoke_widget_popup (widget, GTK_MENU (menu), + event, SOKOKE_MENU_POSITION_CURSOR); + + g_free (website); +} + +static gboolean +midori_extensions_popup_menu_cb (GtkWidget* widget, + MidoriExtensions* extensions) { GtkTreeModel* model; - GtkTreePath* path; GtkTreeIter iter; - GtkToolItem* button_enable; - GtkToolItem* button_disable; - gtk_tree_view_get_cursor (treeview, &path, NULL); - model = gtk_tree_view_get_model (treeview); - button_enable = gtk_toolbar_get_nth_item ( - GTK_TOOLBAR (extensions->toolbar), 1); - button_disable = gtk_toolbar_get_nth_item ( - GTK_TOOLBAR (extensions->toolbar), 2); - if (gtk_tree_model_get_iter (model, &iter, path)) + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { - MidoriExtension* extension; + MidoriExtension *extension; - if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &extension, -1); - gtk_widget_set_sensitive (GTK_WIDGET (button_enable), - !midori_extension_is_active (extension)); - gtk_widget_set_sensitive (GTK_WIDGET (button_disable), - midori_extension_is_active (extension)); - } + gtk_tree_model_get (model, &iter, 0, &extension, -1); + + midori_extensions_popup (widget, NULL, extension, extensions); + g_object_unref (extension); + return TRUE; } - return; + return FALSE; +} + +static gboolean +midori_extensions_button_release_event_cb (GtkWidget* widget, + GdkEventButton* event, + MidoriExtensions* extensions) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (event->button != 3) + return FALSE; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + MidoriExtension *extension; + + gtk_tree_model_get (model, &iter, 0, &extension, -1); + + midori_extensions_popup (widget, event, extension, extensions); + g_object_unref (extension); + return TRUE; + } + return FALSE; +} + +static void +midori_extensions_cell_renderer_toggled_cb (GtkCellRendererToggle* renderer, + const gchar* path, + MidoriExtensions* extensions) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (extensions->treeview)); + if (gtk_tree_model_get_iter_from_string (model, &iter, path)) + { + MidoriExtension *extension; + + gtk_tree_model_get (model, &iter, 0, &extension, -1); + if (midori_extension_is_active (extension)) + midori_extension_deactivate (extension); + else + g_signal_emit_by_name (extension, "activate", extensions->app); + + g_object_unref (extension); + } +} + +static gint +midori_extensions_tree_sort_func (GtkTreeModel* model, + GtkTreeIter* a, + GtkTreeIter* b, + gpointer data) +{ + MidoriExtension* e1, *e2; + gchar* name1, *name2; + gint result = 0; + + gtk_tree_model_get (model, a, 0, &e1, -1); + gtk_tree_model_get (model, b, 0, &e2, -1); + + name1 = katze_object_get_string (e1, "name"); + name2 = katze_object_get_string (e2, "name"); + + result = g_strcmp0 (name1, name2); + + g_free (name1); + g_free (name2); + + return result; } static void @@ -349,16 +474,24 @@ midori_extensions_init (MidoriExtensions* extensions) /* Create the treeview */ GtkTreeViewColumn* column; GtkCellRenderer* renderer_text; - GtkCellRenderer* renderer_pixbuf; + GtkCellRenderer* renderer_toggle; GtkListStore* liststore = gtk_list_store_new (1, G_TYPE_OBJECT); extensions->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (liststore), + 0, GTK_SORT_ASCENDING); + gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (liststore), + 0, midori_extensions_tree_sort_func, NULL, NULL); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (extensions->treeview), FALSE); column = gtk_tree_view_column_new (); - renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); - gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, - (GtkTreeCellDataFunc)midori_extensions_treeview_render_icon_cb, + renderer_toggle = gtk_cell_renderer_toggle_new (); + gtk_tree_view_column_pack_start (column, renderer_toggle, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_toggle, + (GtkTreeCellDataFunc)midori_extensions_treeview_render_tick_cb, extensions->treeview, NULL); + g_signal_connect (renderer_toggle, "toggled", + G_CALLBACK (midori_extensions_cell_renderer_toggled_cb), extensions); + gtk_tree_view_append_column (GTK_TREE_VIEW (extensions->treeview), column); + column = gtk_tree_view_column_new (); renderer_text = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer_text, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_text, @@ -366,16 +499,39 @@ midori_extensions_init (MidoriExtensions* extensions) extensions->treeview, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (extensions->treeview), column); g_object_unref (liststore); - g_signal_connect (extensions->treeview, "row-activated", - G_CALLBACK (midori_extensions_treeview_row_activated_cb), - extensions); - g_signal_connect (extensions->treeview, "cursor-changed", - G_CALLBACK (midori_extensions_treeview_cursor_changed_cb), - extensions); + g_object_connect (extensions->treeview, + "signal::row-activated", + midori_extensions_treeview_row_activated_cb, extensions, + "signal::button-release-event", + midori_extensions_button_release_event_cb, extensions, + "signal::popup-menu", + midori_extensions_popup_menu_cb, extensions, + NULL); gtk_widget_show (extensions->treeview); gtk_box_pack_start (GTK_BOX (extensions), extensions->treeview, TRUE, TRUE, 0); } +static void +midori_extensions_finalize (GObject* object) +{ + MidoriExtensions* extensions = MIDORI_EXTENSIONS (object); + KatzeArray* array = katze_object_get_object (extensions->app, "extensions"); + guint i = 0; + MidoriExtension* extension; + + while ((extension = katze_array_get_nth_item (array, i++))) + { + g_signal_handlers_disconnect_by_func (extension, + midori_extensions_extension_activate_cb, extensions); + g_signal_handlers_disconnect_by_func (extension, + midori_extensions_extension_deactivate_cb, extensions); + } + g_signal_handlers_disconnect_by_func (array, + midori_extensions_add_item_cb, extensions); + + g_object_unref (array); +} + /** * midori_extensions_new: * diff --git a/panels/midori-history.c b/panels/midori-history.c index 83aa3086..80f5a695 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -757,8 +757,10 @@ midori_history_open_in_window_activate_cb (GtkWidget* menuitem, if (uri && *uri) { - MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (history)); - g_signal_emit_by_name (browser, "new-window", uri); + MidoriBrowser* new_browser = midori_app_create_browser (history->app); + midori_app_add_browser (history->app, new_browser); + gtk_widget_show (GTK_WIDGET (new_browser)); + midori_browser_add_uri (new_browser, uri); } } diff --git a/panels/midori-plugins.c b/panels/midori-plugins.c index f8099299..11236762 100644 --- a/panels/midori-plugins.c +++ b/panels/midori-plugins.c @@ -224,6 +224,7 @@ midori_plugins_init (MidoriPlugins* plugins) GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; GtkListStore* liststore = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); + plugins->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (plugins->treeview), FALSE); column = gtk_tree_view_column_new (); @@ -242,76 +243,34 @@ midori_plugins_init (MidoriPlugins* plugins) gtk_widget_show (plugins->treeview); gtk_box_pack_start (GTK_BOX (plugins), plugins->treeview, TRUE, TRUE, 0); - /* FIXME: Monitor folders for newly added and removes files */ - if (g_module_supported ()) + if (1) { - /* FIXME: WebKit is also looking in legacy folders, - we should have API to obtain that same list. */ - gchar** plugin_dirs; - gsize i = 0; + /* FIXME: WebKit should have API to obtain the list of plugins. */ + /* FIXME: Monitor folders for newly added and removes files */ + GtkWidget* web_view = webkit_web_view_new (); + WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); + JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); + /* This snippet joins the available plugins into a string like this: + URI1|title1,URI2|title2 + FIXME: Ensure separators contained in the string can't break it */ + gchar* value = sokoke_js_script_eval (js_context, + "function plugins (l) { var f = new Array (); for (i in l) " + "{ var t = l[i].name; " + "f.push (l[i].name + '|' + l[i].filename); } return f; }" + "plugins (navigator.plugins)", NULL); + gchar** items = g_strsplit (value, ",", 0); + guint i = 0; - if (g_getenv ("MOZ_PLUGIN_PATH")) - plugin_dirs = g_strsplit (g_getenv ("MOZ_PLUGIN_PATH"), ":", 0); - else - plugin_dirs = g_strsplit ("/usr/lib/mozilla/plugins", ":", 0); - - while (plugin_dirs[i]) + if (items != NULL) + while (items[i] != NULL) { - gchar* plugin_path; - GDir* plugin_dir; - - plugin_path = g_build_filename (plugin_dirs[i], NULL); - plugin_dir = g_dir_open (plugin_path, 0, NULL); - if (plugin_dir != 0) - { - const gchar* filename; - - while ((filename = g_dir_read_name (plugin_dir))) - { - gchar* fullname; - GModule* module; - typedef int (*NP_GetValue_func)(void* instance, - int variable, - void* value); - NP_GetValue_func NP_GetValue; - const gchar* plugin_name; - const gchar* plugin_description; - - /* Ignore files which don't have the correct suffix */ - if (!g_str_has_suffix (filename, G_MODULE_SUFFIX)) - continue; - - fullname = g_build_filename (plugin_path, filename, NULL); - module = g_module_open (fullname, G_MODULE_BIND_LOCAL); - g_free (fullname); - - if (module && g_module_symbol (module, "NP_GetValue", - (gpointer) &NP_GetValue)) - { - typedef const gchar* (*NP_GetMIMEDescription_func)(void); - NP_GetMIMEDescription_func NP_GetMIMEDescription; - - NP_GetValue (NULL, 2, &plugin_name); - if (g_module_symbol (module, "NP_GetMIMEDescription", - (gpointer) &NP_GetMIMEDescription)) - plugin_description = NP_GetMIMEDescription (); - else - plugin_description = g_module_error (); - } - else - { - plugin_name = filename; - plugin_description = g_module_error (); - } - - midori_plugins_add_item (plugins, plugin_name, plugin_description); - } - g_dir_close (plugin_dir); - } - g_free (plugin_path); + gchar** parts = g_strsplit (items[i], "|", 2); + if (parts && *parts && !g_str_equal (parts[1], "undefined")) + midori_plugins_add_item (plugins, *parts, parts[1]); + g_strfreev (parts); i++; } - g_strfreev (plugin_dirs); + g_strfreev (items); } } diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c index d2ea03fe..742738fb 100644 --- a/panels/midori-transfers.c +++ b/panels/midori-transfers.c @@ -372,6 +372,169 @@ midori_transfers_hierarchy_changed_cb (MidoriTransfers* transfers, #endif } +#if WEBKIT_CHECK_VERSION (1, 1, 3) +static GtkWidget* +midori_transfers_popup_menu_item (GtkMenu* menu, + const gchar* stock_id, + const gchar* label, + WebKitDownload* download, + gpointer callback, + gboolean enabled, + MidoriTransfers* transfers) +{ + GtkWidget* menuitem; + + menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); + if (label) + gtk_label_set_text_with_mnemonic (GTK_LABEL (gtk_bin_get_child ( + GTK_BIN (menuitem))), label); + + if (!enabled) + gtk_widget_set_sensitive (menuitem, FALSE); + + g_object_set_data (G_OBJECT (menuitem), "WebKitDownload", download); + + if (callback) + g_signal_connect (menuitem, "activate", G_CALLBACK (callback), transfers); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + + return menuitem; +} + +static void +midori_transfers_open_activate_cb (GtkWidget* menuitem, + MidoriTransfers* transfers) +{ + WebKitDownload* download; + const gchar* uri; + + download = g_object_get_data (G_OBJECT (menuitem), "WebKitDownload"); + g_return_if_fail (download != NULL); + + uri = webkit_download_get_destination_uri (download); + sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (transfers->treeview)), + uri, gtk_get_current_event_time (), NULL); +} + +static void +midori_transfers_open_folder_activate_cb (GtkWidget* menuitem, + MidoriTransfers* transfers) +{ + WebKitDownload* download; + const gchar* uri; + GFile* file; + GFile* folder; + + download = g_object_get_data (G_OBJECT (menuitem), "WebKitDownload"); + g_return_if_fail (download != NULL); + + uri = webkit_download_get_destination_uri (download); + file = g_file_new_for_uri (uri); + if ((folder = g_file_get_parent (file))) + { + gchar* folder_uri = g_file_get_uri (folder); + sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (transfers->treeview)), + folder_uri, gtk_get_current_event_time (), NULL); + g_free (folder_uri); + g_object_unref (folder); + } + g_object_unref (file); +} + +static void +midori_transfers_copy_address_activate_cb (GtkWidget* menuitem, + MidoriTransfers* transfers) +{ + WebKitDownload* download; + const gchar* uri; + GtkClipboard* clipboard; + + download = g_object_get_data (G_OBJECT (menuitem), "WebKitDownload"); + g_return_if_fail (download != NULL); + + uri = webkit_download_get_destination_uri (download); + clipboard = gtk_clipboard_get_for_display ( + gtk_widget_get_display (GTK_WIDGET (menuitem)), + GDK_SELECTION_CLIPBOARD); + gtk_clipboard_set_text (clipboard, uri, -1); +} + +static void +midori_transfers_popup (GtkWidget* widget, + GdkEventButton* event, + WebKitDownload* download, + MidoriTransfers* transfers) +{ + GtkWidget* menu; + gboolean finished = FALSE; + + if (webkit_download_get_status (download) == WEBKIT_DOWNLOAD_STATUS_FINISHED) + finished = TRUE; + + menu = gtk_menu_new (); + midori_transfers_popup_menu_item (GTK_MENU (menu), GTK_STOCK_OPEN, NULL, download, + midori_transfers_open_activate_cb, finished, transfers); + midori_transfers_popup_menu_item (GTK_MENU (menu), GTK_STOCK_DIRECTORY, + _("Open Destination _Folder"), download, + midori_transfers_open_folder_activate_cb, TRUE, transfers); + midori_transfers_popup_menu_item (GTK_MENU (menu), GTK_STOCK_COPY, + _("Copy Link Loc_ation"), download, + midori_transfers_copy_address_activate_cb, FALSE, transfers); + + sokoke_widget_popup (widget, GTK_MENU (menu), + event, SOKOKE_MENU_POSITION_CURSOR); +} +#endif + +static gboolean +midori_transfers_popup_menu_cb (GtkWidget* widget, + MidoriTransfers* transfers) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + #if WEBKIT_CHECK_VERSION (1, 1, 3) + WebKitDownload* download; + + gtk_tree_model_get (model, &iter, 1, &download, -1); + + midori_transfers_popup (widget, NULL, download, transfers); + g_object_unref (download); + return TRUE; + #endif + } + return FALSE; +} + +static gboolean +midori_transfers_button_release_event_cb (GtkWidget* widget, + GdkEventButton* event, + MidoriTransfers* transfers) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (event->button != 3) + return FALSE; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + #if WEBKIT_CHECK_VERSION (1, 1, 3) + WebKitDownload* download; + + gtk_tree_model_get (model, &iter, 1, &download, -1); + + midori_transfers_popup (widget, NULL, download, transfers); + g_object_unref (download); + return TRUE; + #endif + } + return FALSE; +} + static void midori_transfers_init (MidoriTransfers* transfers) { @@ -400,9 +563,14 @@ midori_transfers_init (MidoriTransfers* transfers) transfers->treeview, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (transfers->treeview), column); g_object_unref (treestore); - g_signal_connect (transfers->treeview, "row-activated", - G_CALLBACK (midori_transfers_treeview_row_activated_cb), - transfers); + g_object_connect (transfers->treeview, + "signal::row-activated", + midori_transfers_treeview_row_activated_cb, transfers, + "signal::button-release-event", + midori_transfers_button_release_event_cb, transfers, + "signal::popup-menu", + midori_transfers_popup_menu_cb, transfers, + NULL); gtk_widget_show (transfers->treeview); gtk_box_pack_start (GTK_BOX (transfers), transfers->treeview, TRUE, TRUE, 0); diff --git a/po/LINGUAS b/po/LINGUAS index 5828681d..90508bdc 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -cs da de el en_GB es et fi fr gl he hu id it ja nl pl pt ro ru sk sv tr uk zh_CN zh_TW +cs da de el en_GB es et fi fr gl he hu id it ja nl pl pt ro ru sk sr sr@latin sv tr uk zh_CN zh_TW diff --git a/po/POTFILES.in b/po/POTFILES.in index 0b12586e..9a87c5d4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,6 +5,8 @@ midori/main.c midori/midori-app.c midori/midori-array.c midori/midori-browser.c +midori/midori-locationaction.c +midori/midori-locationentry.c midori/midori-panel.c midori/midori-websettings.c midori/midori-view.c @@ -28,6 +30,7 @@ extensions/adblock.c extensions/colorful-tabs.c extensions/cookie-manager/cookie-manager.c extensions/cookie-manager/cookie-manager-page.c +extensions/cookie-manager/main.c extensions/feed-panel/feed-atom.c extensions/feed-panel/feed-panel.c extensions/feed-panel/feed-parse.c @@ -35,4 +38,7 @@ extensions/feed-panel/feed-rss.c extensions/feed-panel/main.c extensions/mouse-gestures/main.c extensions/page-holder.c +extensions/shortcuts.c extensions/statusbar-features.c +extensions/tab-panel.c +extensions/toolbar-editor.c diff --git a/po/da.po b/po/da.po index add74e6b..b330c8ea 100644 --- a/po/da.po +++ b/po/da.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.6\n" +"Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-19 16:44+0200\n" -"PO-Revision-Date: 2009-05-02 14:35+0100\n" +"POT-Creation-Date: 2009-05-10 16:06+0200\n" +"PO-Revision-Date: 2009-06-15 13:12+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -20,11 +20,11 @@ msgid "Lightweight web browser" msgstr "Letvægtig webbrowser" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1288 -#: ../midori/main.c:1388 -#: ../midori/main.c:1396 -#: ../midori/main.c:1407 -#: ../midori/midori-websettings.c:273 +#: ../midori/main.c:1315 +#: ../midori/main.c:1449 +#: ../midori/main.c:1457 +#: ../midori/main.c:1468 +#: ../midori/midori-websettings.c:277 msgid "Midori" msgstr "Midori" @@ -32,186 +32,195 @@ msgstr "Midori" msgid "Web Browser" msgstr "Webbrowser" -#: ../midori/main.c:94 +#: ../midori/main.c:96 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Indstillingen kunne ikke indlæses: %s\n" -#: ../midori/main.c:149 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Værdien '%s' er ikke gyldig til %s" -#: ../midori/main.c:156 -#: ../midori/main.c:228 +#: ../midori/main.c:158 +#: ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ugyldig indstillingsværdi '%s'" -#: ../midori/main.c:332 +#: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" msgstr "Kunne ikke åbne databasen: %s\n" -#: ../midori/main.c:364 +#: ../midori/main.c:382 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Kunne ikke køre databaseudtryk: %s\n" -#: ../midori/main.c:418 +#: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Kunne ikke fjerne historikelementet: %s\n" -#: ../midori/main.c:442 +#: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" msgstr "Kunne ikke rydde historikken: %s\n" -#: ../midori/main.c:465 -#: ../midori/main.c:499 -#: ../midori/main.c:515 +#: ../midori/main.c:483 +#: ../midori/main.c:517 +#: ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" msgstr "Kunne ikke tilføje historikelementet: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:694 +#: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Kunne ikke fjerne gamle historikelementer: %s\n" -#: ../midori/main.c:722 +#: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Indstillingen kunne ikke gemmes. %s" -#: ../midori/main.c:751 +#: ../midori/main.c:770 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Søgemaskinerne kunne ikke gemmes. %s" -#: ../midori/main.c:770 -#: ../midori/main.c:798 -#: ../midori/main.c:827 +#: ../midori/main.c:789 +#: ../midori/main.c:817 +#: ../midori/main.c:846 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Bogmærkerne kunne ikke gemmes. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:850 -#: ../midori/main.c:873 +#: ../midori/main.c:869 +#: ../midori/main.c:892 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Papirkurven kunne ikke fyldes. %s" -#: ../midori/main.c:946 +#: ../midori/main.c:965 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sessionen kunne ikke gemmes. %s" -#: ../midori/main.c:1073 +#: ../midori/main.c:1092 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette er sket gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet." -#: ../midori/main.c:1088 +#: ../midori/main.c:1107 msgid "Modify _preferences" msgstr "Ændre _indstillinger" -#: ../midori/main.c:1092 +#: ../midori/main.c:1111 msgid "Reset the last _session" msgstr "Nulstil den sidste _session" -#: ../midori/main.c:1097 +#: ../midori/main.c:1116 msgid "Disable all _extensions" msgstr "Slå alle _udvidelser fra" -#: ../midori/main.c:1288 +#: ../midori/main.c:1315 msgid "No filename specified" msgstr "Intet filnavn angivet" -#: ../midori/main.c:1311 +#: ../midori/main.c:1338 msgid "An unknown error occured." msgstr "En ukendt fejl opstod." -#: ../midori/main.c:1336 +#: ../midori/main.c:1370 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Øjebliksbillede gem til: %s\n" + +#: ../midori/main.c:1391 msgid "Run ADDRESS as a web application" msgstr "Kør ADRESSE som et webprogram" -#: ../midori/main.c:1336 +#: ../midori/main.c:1391 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1338 +#: ../midori/main.c:1393 msgid "Use FOLDER as configuration folder" msgstr "Brug MAPPE som en indstillingsmappe" -#: ../midori/main.c:1338 +#: ../midori/main.c:1393 msgid "FOLDER" msgstr "MAPPE" -#: ../midori/main.c:1340 +#: ../midori/main.c:1395 msgid "Run the specified filename as javascript" msgstr "Kør det angivne filnavn som javascript" -#: ../midori/main.c:1342 +#: ../midori/main.c:1398 +msgid "Take a snapshot of the specified URI" +msgstr "Tag et øjebliksbillede at det angivne URI" + +#: ../midori/main.c:1401 msgid "Display program version" msgstr "Vis programversion" -#: ../midori/main.c:1344 +#: ../midori/main.c:1403 msgid "Addresses" msgstr "Adresser" -#: ../midori/main.c:1385 +#: ../midori/main.c:1446 msgid "[Addresses]" msgstr "[Adresser]" -#: ../midori/main.c:1408 +#: ../midori/main.c:1469 msgid "Please report comments, suggestions and bugs to:" msgstr "Rapportér venligst kommentarer, forslag og fejl til:" -#: ../midori/main.c:1410 +#: ../midori/main.c:1471 msgid "Check for new versions at:" msgstr "Tjek for nye versioner hos:" -#: ../midori/main.c:1454 +#: ../midori/main.c:1548 msgid "The specified configuration folder is invalid." msgstr "Den angivne indstillingsmappe er ikke gyldig." -#: ../midori/main.c:1489 +#: ../midori/main.c:1583 msgid "An instance of Midori is already running but not responding.\n" msgstr "En instans af Midori kører allerede men reagerer ikke.\n" -#: ../midori/main.c:1539 +#: ../midori/main.c:1633 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Søgemaskinerne kunne ikke indlæses. %s\n" -#: ../midori/main.c:1551 +#: ../midori/main.c:1645 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Bogmærkerne kunne ikke indlæses: %s\n" -#: ../midori/main.c:1566 +#: ../midori/main.c:1660 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sessionen kunne ikke indlæses: %s\n" -#: ../midori/main.c:1579 +#: ../midori/main.c:1673 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Papirkurven kunne ikke indlæses: %s\n" -#: ../midori/main.c:1592 +#: ../midori/main.c:1686 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historikken kunne ikke indlæses: %s\n" -#: ../midori/main.c:1604 +#: ../midori/main.c:1698 msgid "The following errors occured:" msgstr "De følgende fejl opstod:" -#: ../midori/main.c:1620 +#: ../midori/main.c:1714 msgid "_Ignore" msgstr "_Ignorér" @@ -225,132 +234,144 @@ msgid "Malformed document." msgstr "Misdannet dokument." #: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:625 +#: ../midori/sokoke.c:716 #, c-format msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/midori-browser.c:280 -#: ../midori/midori-browser.c:3368 -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:287 +#: ../midori/midori-browser.c:3819 +#: ../midori/midori-browser.c:3825 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:291 -#: ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:298 +#: ../midori/midori-browser.c:3822 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:353 +#: ../midori/midori-browser.c:360 #, c-format msgid "%d%% loaded" msgstr "%d%% indlæst" -#: ../midori/midori-browser.c:378 +#: ../midori/midori-browser.c:385 #, c-format msgid "Unexpected action '%s'." msgstr "Uventet handling '%s'." -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:603 msgid "New folder" msgstr "Ny mappe" -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:603 msgid "Edit folder" msgstr "Redigér mappe" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:605 msgid "New bookmark" msgstr "Nyt bogmærke" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:605 msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: ../midori/midori-browser.c:573 +#: ../midori/midori-browser.c:635 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:586 +#: ../midori/midori-browser.c:648 #: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Beskrivelse:" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:667 #: ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:624 +#: ../midori/midori-browser.c:686 msgid "_Folder:" msgstr "_Mappe:" -#: ../midori/midori-browser.c:629 -#: ../midori/midori-browser.c:670 +#: ../midori/midori-browser.c:691 +#: ../midori/midori-browser.c:732 msgid "Toplevel folder" msgstr "Øverste mappe" -#: ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:808 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1523 +#: ../midori/midori-browser.c:1119 +#, c-format +msgid "The file %s has been downloaded." +msgstr "Filen %s er blevet hentet." + +#: ../midori/midori-browser.c:1123 +msgid "Transfer completed" +msgstr "Overførsel gennemført" + +#: ../midori/midori-browser.c:1820 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2803 -#: ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:809 +#: ../midori/midori-browser.c:3152 +#: ../panels/midori-bookmarks.c:778 +#: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:2810 -#: ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:815 +#: ../midori/midori-browser.c:3159 +#: ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 +#: ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:2813 -#: ../panels/midori-bookmarks.c:790 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:3162 +#: ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:816 +#: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:2974 +#: ../midori/midori-browser.c:3425 msgid "Clear Private Data" msgstr "Ryd private data" -#: ../midori/midori-browser.c:2977 +#: ../midori/midori-browser.c:3428 msgid "_Clear private data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3441 msgid "Clear the following data:" msgstr "Ryd de følgende data:" -#: ../midori/midori-browser.c:2998 -#: ../midori/midori-preferences.c:640 +#: ../midori/midori-browser.c:3449 +#: ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "Historik" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3452 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3455 msgid "'Flash' Cookies" msgstr "'Flash' cookies" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3458 msgid "Website icons" msgstr "Webstedikoner" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3538 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3546 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -358,990 +379,1068 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3750 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3753 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3756 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3759 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3762 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:3316 +#: ../midori/midori-browser.c:3764 +#: ../midori/midori-view.c:1256 +msgid "Add to Speed _dial" +msgstr "Tilføj til hurtig_opkald" + +#: ../midori/midori-browser.c:3765 +msgid "Add shortcut to speed dial" +msgstr "Tilføj genvej til hurtigopkald" + +#: ../midori/midori-browser.c:3767 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3768 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:3319 +#: ../midori/midori-browser.c:3770 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3771 msgid "Close this window" msgstr "Luk dette vindue" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3774 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3777 msgid "Quit the application" msgstr "Afslut programmet" -#: ../midori/midori-browser.c:3328 +#: ../midori/midori-browser.c:3779 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3782 msgid "Cut the selected text" msgstr "Udklip markeret tekst" -#: ../midori/midori-browser.c:3334 -#: ../midori/midori-browser.c:3337 +#: ../midori/midori-browser.c:3785 +#: ../midori/midori-browser.c:3788 msgid "Copy the selected text" msgstr "Kopiér markeret tekst" -#: ../midori/midori-browser.c:3340 +#: ../midori/midori-browser.c:3791 msgid "Paste text from the clipboard" msgstr "Indsæt tekst fra klippebordet" -#: ../midori/midori-browser.c:3343 +#: ../midori/midori-browser.c:3794 msgid "Delete the selected text" msgstr "Slet markeret tekst" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3797 msgid "Select all text" msgstr "Markér hele teksten" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3800 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:3351 +#: ../midori/midori-browser.c:3802 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3803 msgid "Find the next occurrence of a word or phrase" msgstr "Find næste forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:3805 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:3355 +#: ../midori/midori-browser.c:3806 msgid "Find the previous occurrence of a word or phrase" msgstr "Find forrige forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:3358 +#: ../midori/midori-browser.c:3809 msgid "_Quick Find" msgstr "_Find hurtigt" -#: ../midori/midori-browser.c:3359 +#: ../midori/midori-browser.c:3810 msgid "Quickly jump to a word or phrase" msgstr "Hop hurtigt til et ord eller sætning" -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:3813 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3815 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3816 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3828 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:3380 +#: ../midori/midori-browser.c:3831 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:3383 +#: ../midori/midori-browser.c:3834 msgid "Reset the zoom level" msgstr "Nulstil forstørrelsesniveauet" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3835 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3837 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:3389 -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3840 +#: ../midori/midori-websettings.c:204 msgid "Chinese (BIG5)" msgstr "Kinesisk (BIG5)" -#: ../midori/midori-browser.c:3392 -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3843 +#: ../midori/midori-websettings.c:205 msgid "Japanese (SHIFT_JIS)" msgstr "Japansk (SHIFT_JIS)" -#: ../midori/midori-browser.c:3395 -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3846 +#: ../midori/midori-websettings.c:206 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:3398 -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3849 +#: ../midori/midori-websettings.c:207 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3401 -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3852 +#: ../midori/midori-websettings.c:208 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:3404 -#: ../midori/midori-websettings.c:205 -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-browser.c:3855 +#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:281 msgid "Custom..." msgstr "Tilpasset..." -#: ../midori/midori-browser.c:3407 -#: ../midori/midori-view.c:1138 +#: ../midori/midori-browser.c:3858 +#: ../midori/midori-view.c:1275 msgid "View _Source" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:3859 msgid "View the source code of the page" msgstr "Vis kildekode for siden" -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:3861 msgid "View Selection Source" msgstr "Vis kilde for markerede" -#: ../midori/midori-browser.c:3411 +#: ../midori/midori-browser.c:3862 msgid "View the source code of the selection" msgstr "Vis kildekode for markering" -#: ../midori/midori-browser.c:3415 +#: ../midori/midori-browser.c:3866 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:3868 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:3420 +#: ../midori/midori-browser.c:3871 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:3423 +#: ../midori/midori-browser.c:3874 msgid "Go forward to the next page" msgstr "Gå til næste side" -#: ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:3877 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3879 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:3880 msgid "Delete the contents of the trash" msgstr "Slet indhold af papirkurven" -#: ../midori/midori-browser.c:3431 -#: ../midori/midori-view.c:1110 +#: ../midori/midori-browser.c:3882 +#: ../midori/midori-view.c:1233 msgid "Undo Close Tab" msgstr "Fortryd luk faneblad" -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:3883 msgid "Open the last closed tab" msgstr "Åbn sidste lukkede faneblad" -#: ../midori/midori-browser.c:3436 -#: ../panels/midori-bookmarks.c:232 +#: ../midori/midori-browser.c:3887 +#: ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:3438 -#: ../panels/midori-bookmarks.c:261 +#: ../midori/midori-browser.c:3889 +#: ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "Tilføj en ny mappe" -#: ../midori/midori-browser.c:3439 +#: ../midori/midori-browser.c:3890 msgid "Add a new bookmark folder" msgstr "Tilføj en ny bogmærkemappe" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:3891 msgid "_Tools" msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:3442 +#: ../midori/midori-browser.c:3893 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3894 msgid "Add, edit and remove search engines..." msgstr "Tilføj, redigér og fjern søgemaskiner..." -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:3897 msgid "_Clear Private Data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:3447 +#: ../midori/midori-browser.c:3898 msgid "Clear private data..." msgstr "Ryd private data..." -#: ../midori/midori-browser.c:3451 +#: ../midori/midori-browser.c:3902 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3903 msgid "Switch to the previous tab" msgstr "Skift til det forrige faneblad" -#: ../midori/midori-browser.c:3454 +#: ../midori/midori-browser.c:3905 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3906 msgid "Switch to the next tab" msgstr "Skift til det næste faneblad" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:3908 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:3459 +#: ../midori/midori-browser.c:3910 msgid "_Contents" msgstr "_Indhold" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3911 msgid "Show the documentation" msgstr "Vis dokumentationen" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3913 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:3463 +#: ../midori/midori-browser.c:3914 msgid "Show the Frequently Asked Questions" msgstr "Vis ofte stillede spørgsmål" -#: ../midori/midori-browser.c:3465 +#: ../midori/midori-browser.c:3916 msgid "_Report a Bug" msgstr "_Rapportér en fejl" -#: ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3917 msgid "Open Midori's bug tracker" msgstr "Åbn Midoris fejlsystem" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3920 msgid "Show information about the program" msgstr "Vis information om dette program" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3927 msgid "P_rivate Browsing" msgstr "P_rivat browsing" -#: ../midori/midori-browser.c:3477 +#: ../midori/midori-browser.c:3928 msgid "Don't save any private data while browsing" msgstr "Undlad at gemme private data under browsing" -#: ../midori/midori-browser.c:3482 +#: ../midori/midori-browser.c:3933 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:3934 msgid "Show menubar" msgstr "Vis menubjælke" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3937 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3938 msgid "Show navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3941 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3942 msgid "Show sidepanel" msgstr "Vis sidepanel" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3945 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:3495 +#: ../midori/midori-browser.c:3946 msgid "Show bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-browser.c:3498 +#: ../midori/midori-browser.c:3949 msgid "_Transferbar" msgstr "_Overførselsstatus" -#: ../midori/midori-browser.c:3499 +#: ../midori/midori-browser.c:3950 msgid "Show transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-browser.c:3502 +#: ../midori/midori-browser.c:3953 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3954 msgid "Show statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4389 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:4396 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4398 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:3970 +#: ../midori/midori-browser.c:4420 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4422 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4443 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:4006 +#: ../midori/midori-browser.c:4458 msgid "_Recently visited pages" msgstr "_Nyligt besøgte sider" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4460 msgid "Reopen pages that you visited earlier" msgstr "Genåbn sider som du tidligere har besøgt" -#: ../midori/midori-browser.c:4021 -#: ../midori/sokoke.c:781 +#: ../midori/midori-browser.c:4475 +#: ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "_Bogmærker" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:4477 msgid "Show the saved bookmarks" msgstr "Vis de gemte bogmærker" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4492 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:4494 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4205 +#: ../midori/midori-browser.c:4674 msgid "_Inline Find:" msgstr "_Indlejret søgning:" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4699 msgid "Previous" msgstr "Forrige" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4704 msgid "Next" msgstr "Næste" -#: ../midori/midori-browser.c:4240 +#: ../midori/midori-browser.c:4709 msgid "Match Case" msgstr "Versalfølsom" -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4717 msgid "Highlight Matches" msgstr "Fremhæv fundne" -#: ../midori/midori-browser.c:4258 +#: ../midori/midori-browser.c:4727 msgid "Close Findbar" msgstr "Luk søgebjælke" -#: ../midori/midori-browser.c:4598 +#: ../midori/midori-browser.c:4762 +#: ../extensions/cookie-manager.c:821 +msgid "Delete All" +msgstr "Slet alle" + +#: ../midori/midori-browser.c:5084 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" -#: ../midori/midori-panel.c:309 +#: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "Frigør valgte panel fra vinduet" -#: ../midori/midori-panel.c:311 +#: ../midori/midori-panel.c:335 msgid "Whether to detach the chosen panel from the window" msgstr "Om det valgte panel skal frigøres fra vinduet" -#: ../midori/midori-panel.c:321 -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-panel.c:345 +#: ../midori/midori-websettings.c:535 msgid "Align sidepanel on the right" msgstr "Opstil sidepanel til højre" -#: ../midori/midori-panel.c:323 -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-panel.c:347 +#: ../midori/midori-websettings.c:536 msgid "Whether to align the sidepanel on the right" msgstr "Om sidepanelet skal være opstilles til højre" -#: ../midori/midori-panel.c:333 -#: ../midori/midori-panel.c:334 +#: ../midori/midori-panel.c:357 +#: ../midori/midori-panel.c:358 msgid "Close panel" msgstr "Luk panel" -#: ../midori/midori-websettings.c:183 -#: ../midori/midori-view.c:1949 +#: ../midori/midori-websettings.c:187 +#: ../midori/midori-view.c:1999 +#: ../midori/midori-view.c:2176 msgid "Blank page" msgstr "Blank side" -#: ../midori/midori-websettings.c:184 -#: ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:555 msgid "Homepage" msgstr "Hjemmeside" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:189 msgid "Last open pages" msgstr "Sidste åbne sider" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:224 msgid "New tab" msgstr "Nyt faneblad" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:225 msgid "New window" msgstr "Nyt vindue" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:226 msgid "Current tab" msgstr "Nuværende faneblad" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:242 msgid "Icons" msgstr "Ikoner" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:243 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:244 msgid "Both" msgstr "Begge" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:245 msgid "Both horizontal" msgstr "Begge vandrette" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:260 msgid "All cookies" msgstr "Alle cookies" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:261 msgid "Session cookies" msgstr "Session-cookies" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:262 #: ../panels/midori-addons.c:94 msgid "None" msgstr "Ingen" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:278 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:279 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:280 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:333 msgid "Remember last window size" msgstr "Husk sidste vinduesstørrelse" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:334 msgid "Whether to save the last window size" msgstr "Skal sidste vinduesstørrelse gemmes" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:342 msgid "Last window width" msgstr "Sidste vinduesbredde" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:343 msgid "The last saved window width" msgstr "Sidste gemte vinduesbredde" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:351 msgid "Last window height" msgstr "Sidste vindueshøjde" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:352 msgid "The last saved window height" msgstr "Sidste gemte vindueshøjde" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:377 msgid "Last panel position" msgstr "Sidste panelplacering" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:378 msgid "The last saved panel position" msgstr "Sidste gemte panelplacering" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:387 msgid "Last panel page" msgstr "Sidste panelside" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel page" msgstr "Sidste gemte panelside" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:396 msgid "Last Web search" msgstr "Sidste websøgning" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:397 msgid "The last saved Web search" msgstr "Den sidste gemte websøgning" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:406 msgid "Show Menubar" msgstr "Vis menubjælke" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:407 msgid "Whether to show the menubar" msgstr "Om menubjælke vises" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:415 msgid "Show Navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:416 msgid "Whether to show the navigationbar" msgstr "Om navigeringsbjælke vises" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:424 msgid "Show Bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:425 msgid "Whether to show the bookmarkbar" msgstr "Om bogmærkebjælke vises" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:433 msgid "Show Panel" msgstr "Vis panel" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the panel" msgstr "Om panel vises" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:449 msgid "Show Transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the transferbar" msgstr "Om overførselsstatus skal vises" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:458 msgid "Show Statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the statusbar" msgstr "Om statusbjælke vises" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:468 msgid "Toolbar Style" msgstr "Værktøjsbjælkestil" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:469 msgid "The style of the toolbar" msgstr "Stilen for værktøjsbjælke" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:485 msgid "Show progress in location entry" msgstr "Vis fremgang i placeringindgang" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:486 msgid "Whether to show loading progress in the location entry" msgstr "Om visning af indlæsningsfremgang i placeringsindgang" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:501 msgid "Search engines in location completion" msgstr "Vis søgemaskiner i adresseudfyldelse" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:502 msgid "Whether to show search engines in the location completion" msgstr "Om søgemaskiner skal vises i adresseudfyldelsen" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:510 msgid "Toolbar Items" msgstr "Værktøjsbjælkes elementer" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:511 msgid "The items to show on the toolbar" msgstr "Elementer der vises på værktøjsbjælken" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:519 msgid "Compact Sidepanel" msgstr "Kompakt sidepanel" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:520 msgid "Whether to make the sidepanel compact" msgstr "Om sidepanelet skal være kompakt" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:545 msgid "Load on Startup" msgstr "Indlæs ved opstart" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:546 msgid "What to load on startup" msgstr "Hvad der skal indlæses under opstart" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:556 msgid "The homepage" msgstr "Hjemmesiden" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:571 msgid "Show crash dialog" msgstr "Vis nedbrudsdialog" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:572 msgid "Show a dialog after Midori crashed" msgstr "Vis en dialog efter nedbrud af Midori" -#: ../midori/midori-websettings.c:576 +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:588 +msgid "Show speed dial in new tabs" +msgstr "Vis hurtigopkald i nye faneblade" + +#: ../midori/midori-websettings.c:589 +msgid "Show speed dial in newly opened tabs" +msgstr "Vis hurtigopkald i nyligt åbnede faneblade" + +#: ../midori/midori-websettings.c:597 msgid "Download Folder" msgstr "Nedhentning-mappen" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:598 msgid "The folder downloaded files are saved to" msgstr "Mappen hvor nedhentede filer skal gemmes" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:617 +msgid "Ask for the destination folder" +msgstr "Spørg om målmappen" + +#: ../midori/midori-websettings.c:618 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "Om der skal spørges om målmappen ved hentning af fil" + +#: ../midori/midori-websettings.c:637 +msgid "Notify when a transfer has been completed" +msgstr "Påmindelse når en overførsel er gennemført" + +#: ../midori/midori-websettings.c:638 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "Om der skal vises en påmindelse, når en overførsel er gennemført" + +#: ../midori/midori-websettings.c:650 msgid "Download Manager" msgstr "Håndtering af hentning" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:651 msgid "An external download manager" msgstr "En ekstern håndtering for nedhentning" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:659 msgid "Text Editor" msgstr "Tekstbehandler" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:660 msgid "An external text editor" msgstr "En ekstern tekstbehandler" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:675 msgid "News Aggregator" msgstr "Nyhedssamler" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:676 msgid "An external news aggregator" msgstr "En ekstern nyhedssamler" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:684 msgid "Location entry Search" msgstr "Søg for stedindgang" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:685 msgid "The search to perform inside the location entry" msgstr "Søgningen som skal foretages i placeringsindgang" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:693 msgid "Preferred Encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:694 msgid "The preferred character encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:704 msgid "Always Show Tabbar" msgstr "Vis altid fanebladsbjælke" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:705 msgid "Always show the tabbar" msgstr "Vis altid fanebladsbjælken" -#: ../midori/midori-websettings.c:652 +#: ../midori/midori-websettings.c:713 msgid "Close Buttons on Tabs" msgstr "Lukkeknapper på faneblade" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:714 msgid "Whether tabs have close buttons" msgstr "Om faneblade har lukkeknapper" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:722 msgid "Open new pages in" msgstr "Åbn nye vinduer i" -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:723 msgid "Where to open new pages" msgstr "Hvor skal nye sider åbnes" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:732 msgid "Open external pages in" msgstr "Åbn eksterne sider i" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:733 msgid "Where to open externally opened pages" msgstr "Hvor skal eksterne sider åbnes" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:746 msgid "Middle click opens Selection" msgstr "Midterklik åbner for markering" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:747 msgid "Load an address from the selection via middle click" msgstr "Indlæs en adresse fra markeringen med midterklik" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:755 msgid "Open tabs in the background" msgstr "Åbn faneblade i baggrunden" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:756 msgid "Whether to open new tabs in the background" msgstr "Om nye faneblade skal åbnes i baggrunden" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:764 msgid "Open Tabs next to Current" msgstr "Åbn faneblad ved siden af nuværende" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:765 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Om åbning af faneblade skal ske ved siden af nuværende eller efter sidste faneblad" -#: ../midori/midori-websettings.c:712 +#: ../midori/midori-websettings.c:773 msgid "Open popups in tabs" msgstr "Åbn pop op i faneblade" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:774 msgid "Whether to open popup windows in tabs" msgstr "Om pop op-vinduer skal åbnes i faneblade" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:790 msgid "Zoom Text and Images" msgstr "Zoom tekst og billeder" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:791 msgid "Whether to zoom text and images" msgstr "Om zoom af tekst og billeder" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:806 msgid "Find inline while typing" msgstr "Find indlejret mens du taster" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:807 msgid "Whether to automatically find inline while typing" msgstr "Om indlejret skal findes automatisk, mens du taster" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:815 msgid "Accept cookies" msgstr "Tillad cookies" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:816 msgid "What type of cookies to accept" msgstr "Hvilke typer af cookes skal tillades" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:825 msgid "Original cookies only" msgstr "Kun for originale cookies" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:826 msgid "Accept cookies from the original website only" msgstr "Tillad kun cookies fra original websted" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:834 msgid "Maximum cookie age" msgstr "Maksimal cookie-levetid" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:835 msgid "The maximum number of days to save cookies for" msgstr "Maksimal antal dage cookies skal gemmes" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:845 msgid "Remember last visited pages" msgstr "Husk sidste besøgte sider" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:846 msgid "Whether the last visited pages are saved" msgstr "Om sidste besøgte sider skal gemmes" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:854 msgid "Maximum history age" msgstr "Maksimal historik-levetid" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:855 msgid "The maximum number of days to save the history for" msgstr "Maksimale antal dage som historik skal gemmes" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:863 msgid "Remember last form inputs" msgstr "Husk sidste formularindtastninger" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:864 msgid "Whether the last form inputs are saved" msgstr "Om sidste formularindtastninger skal gemmes" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:872 msgid "Remember last downloaded files" msgstr "Husk sidste hentede filer" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:873 msgid "Whether the last downloaded files are saved" msgstr "Om sidste hentede filer skal gemmes" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:883 msgid "Proxy Server" msgstr "Proxyserver" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:884 msgid "The proxy server used for HTTP connections" msgstr "Proxyserveren som bruges til HTTP-forbindelser" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:899 msgid "Detect proxy server automatically" msgstr "Genkend automatisk proxyserver" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:900 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Om proxyserveren genkendes automatisk fra miljøet" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:916 msgid "Identify as" msgstr "Identificér som" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:917 msgid "What to identify as to web pages" msgstr "Hvad skal genkendes som web-sider" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:933 msgid "Identification string" msgstr "Identifikationsstreng" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:934 msgid "The application identification string" msgstr "Programmets identifikationsstreng" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:942 msgid "Cache size" msgstr "Størrelse af mellemlager" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:943 msgid "The allowed size of the cache" msgstr "Den tilladte størrelse af mellemlager" +#: ../midori/midori-view.c:686 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Siden '%s' kunne ikke indlæses." + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#: ../midori/midori-view.c:688 +#: ../midori/midori-view.c:2701 +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Fejl" + +#: ../midori/midori-view.c:691 +msgid "Try again" +msgstr "Prøv igen" + #. 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:637 -#: ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:721 +#: ../midori/midori-view.c:2705 #, c-format msgid "Not found - %s" msgstr "Ikke fundet - %s" -#: ../midori/midori-view.c:976 +#: ../midori/midori-view.c:1095 msgid "Open _Link" msgstr "Åbn _henvisning" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:1097 msgid "Open Link in New _Tab" msgstr "Åbn henvisning i nyt _faneblad" -#: ../midori/midori-view.c:995 +#: ../midori/midori-view.c:1114 msgid "Open Link in New _Window" msgstr "Åbn henvisning i nyt _vindue" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:1123 msgid "_Download Link destination" msgstr "_Hent henvisningsadressen" -#: ../midori/midori-view.c:1010 +#: ../midori/midori-view.c:1129 msgid "_Save Link destination" msgstr "_Gem henvisningsadresse" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1138 msgid "Download with Download _Manager" msgstr "Hent med nedhentnings_håndtering" -#: ../midori/midori-view.c:1048 +#: ../midori/midori-view.c:1167 msgid "Search _with" msgstr "Søg _med" -#: ../midori/midori-view.c:1076 +#: ../midori/midori-view.c:1195 msgid "_Search the Web" msgstr "_Søg internettet" -#: ../midori/midori-view.c:1086 +#: ../midori/midori-view.c:1205 msgid "Open Address in New _Tab" msgstr "Åbn adresse i nyt _faneblad" -#: ../midori/midori-view.c:1234 +#: ../midori/midori-view.c:1372 msgid "Open or download file" msgstr "Åbn eller hent fil" -#: ../midori/midori-view.c:1251 +#: ../midori/midori-view.c:1389 #, c-format msgid "File Type: '%s'" msgstr "Filtype: '%s'" -#: ../midori/midori-view.c:1254 +#: ../midori/midori-view.c:1392 #, c-format msgid "File Type: %s ('%s')" msgstr "Filtype: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1396 #, c-format msgid "Open %s" msgstr "Åbn %s" -#: ../midori/midori-view.c:1661 +#: ../midori/midori-view.c:1816 #, c-format msgid "Inspect page - %s" msgstr "Undersøg side - %s" -#: ../midori/midori-view.c:1806 +#: ../midori/midori-view.c:2001 +#: ../midori/midori-view.c:2002 +msgid "Search" +msgstr "Søg" + +#: ../midori/midori-view.c:2003 +msgid "Click to add a shortcut" +msgstr "Klik for at tilføje en genvej" + +#: ../midori/midori-view.c:2004 +msgid "Enter shortcut address" +msgstr "Tast genvejsadresse" + +#: ../midori/midori-view.c:2005 +msgid "Enter shortcut title" +msgstr "Tast en genvejstitel" + +#: ../midori/midori-view.c:2006 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Er du sikker på, at du ønsker at fjerne denne genvej?" + +#: ../midori/midori-view.c:2038 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kan ikke vises" -#: ../midori/midori-view.c:1822 +#: ../midori/midori-view.c:2055 #, c-format msgid "No documentation installed" msgstr "Ingen dokumentation installeret" @@ -1364,159 +1463,196 @@ msgstr "Opstart" msgid "Use current page as homepage" msgstr "Brug nuværende side som hjemmeside" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:425 #: ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Overførsler" #. Page "Appearance" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Udseende" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Indstillinger for skrifttype" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Standard for skrifttypefamilie" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "Standard skrifttype til visning af tekst" + +#: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" msgstr "Størrelse af standardskriftstype er brugt til at vise tekst" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "Fastbredde skrifttype" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "Skrifttypen til visning af fastbredde tekst" + +#: ../midori/midori-preferences.c:458 msgid "Minimum Font Size" msgstr "Minimal skriftstørrelse" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:461 msgid "The minimum font size used to display text" msgstr "Minimum størrelse af skrifttype til at vise tekst" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:468 msgid "Encoding" msgstr "Tegnsæt" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:471 msgid "The character encoding to use by default" msgstr "Tegnsæt som bruges standard" #. Page "Behavior" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:478 msgid "Behavior" msgstr "Opførsel" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:479 msgid "Features" msgstr "Funktionalitet" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:482 #: ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Indlæs billeder automatisk" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:483 msgid "Load and display images automatically" msgstr "Indlæs og vis billeder automatisk" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:486 msgid "Shrink images automatically" msgstr "Formindsk billeder automatisk" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:487 msgid "Automatically shrink standalone images to fit" msgstr "Minimér enkeltstående billeder til at passe" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:490 msgid "Print background images" msgstr "Udskriv baggrundsbilleder" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:491 msgid "Whether background images should be printed" msgstr "Om baggrundsbilleder skal udskrives" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:494 msgid "Resizable text areas" msgstr "Justerbare tekstområder" -#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:495 msgid "Whether text areas are resizable" msgstr "Om tekstområder kan ændre størrelse" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:498 #: ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Brug skripter" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:499 msgid "Enable embedded scripting languages" msgstr "Slå indlejret skriptsprog til" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:502 #: ../extensions/statusbar-features.c:72 -msgid "Enable plugins" -msgstr "Slå udvidelsesmoduler til" +msgid "Enable Netscape plugins" +msgstr "Slå Netscape-udvidelsesmoduler til" -#: ../midori/midori-preferences.c:532 -msgid "Enable embedded plugin objects" -msgstr "Slå indlejrede udvidelsesobjekter til" +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" +msgstr "Slå indlejrede Netscape-udvidelsesobjekter til" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:506 msgid "Enforce 96 dots per inch" msgstr "Gennemtving 96 dots per tomme" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:507 msgid "Enforce a video dot density of 96 DPI" msgstr "Gennemtving tæthed af videopunkt på 96 DPI" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:510 msgid "Enable developer tools" msgstr "Brug udvikler-værktøjer" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:511 msgid "Enable special extensions for developers" msgstr "Slå specielle udvidelser til udviklere til" +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "Stavekontrol" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "Slå stavekontrol til" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "Slå stavekontrol til mens du taster" + +#: ../midori/midori-preferences.c:525 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "En kommaadskilt liste over sprog til at blive brugt til stavekontrol eksempelvis \"en_GB,de_DE\"" + #. Page "Interface" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:530 msgid "Interface" msgstr "Grænseflade" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:531 msgid "Navigationbar" msgstr "Navigeringsbjælke" -#: ../midori/midori-preferences.c:560 +#: ../midori/midori-preferences.c:542 msgid "Browsing" msgstr "Browsing" +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "Programmer" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "Eksterne programmer" + #. Page "Network" -#: ../midori/midori-preferences.c:590 -#: ../midori/midori-preferences.c:591 +#: ../midori/midori-preferences.c:619 +#: ../midori/midori-preferences.c:620 msgid "Network" msgstr "Netværk" -#: ../midori/midori-preferences.c:618 +#: ../midori/midori-preferences.c:647 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:652 msgid "Privacy" msgstr "Beskyttelse af privatliv" -#: ../midori/midori-preferences.c:624 +#: ../midori/midori-preferences.c:653 msgid "Web Cookies" msgstr "Web-cookies" -#: ../midori/midori-preferences.c:637 -#: ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:666 +#: ../midori/midori-preferences.c:676 msgid "days" msgstr "dage" #: ../midori/midori-searchaction.c:484 -#: ../katze/katze-arrayaction.c:277 +#: ../katze/katze-arrayaction.c:314 msgid "Empty" msgstr "Tom" @@ -1548,65 +1684,65 @@ msgstr "Håndtér søgemaskiner" msgid "Use as _default" msgstr "Brug som _standard" -#: ../midori/sokoke.c:117 -#: ../midori/sokoke.c:129 +#: ../midori/sokoke.c:162 +#: ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "Kunne ikke køre eksternt program." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:448 +#: ../midori/sokoke.c:520 msgid "Warning: You are using a superuser account!" msgstr "Advarsel: Du bruger en superbruger-konto!" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:871 msgid "_Bookmark" msgstr "_Bogmærke" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:873 msgid "_Add Bookmark" msgstr "_Tilføj bogmærke" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:874 msgid "_Console" msgstr "_Konsol" -#: ../midori/sokoke.c:784 +#: ../midori/sokoke.c:875 msgid "_Extensions" msgstr "_Udvidelser" -#: ../midori/sokoke.c:785 +#: ../midori/sokoke.c:876 msgid "_History" msgstr "Hi_storik" -#: ../midori/sokoke.c:786 +#: ../midori/sokoke.c:877 msgid "_Homepage" msgstr "_Hjemmeside" -#: ../midori/sokoke.c:787 +#: ../midori/sokoke.c:878 msgid "_Userscripts" msgstr "Brugerskri_pter" -#: ../midori/sokoke.c:788 +#: ../midori/sokoke.c:879 msgid "User_styles" msgstr "Bruger_grænseflader" -#: ../midori/sokoke.c:789 +#: ../midori/sokoke.c:880 msgid "New _Tab" msgstr "Nyt _faneblad" -#: ../midori/sokoke.c:790 +#: ../midori/sokoke.c:881 msgid "_Transfers" msgstr "_Overførsler" -#: ../midori/sokoke.c:791 -msgid "P_lugins" -msgstr "Udvidelses_moduler" +#: ../midori/sokoke.c:882 +msgid "Netscape p_lugins" +msgstr "Netscape-u_dvidelsesmoduler" -#: ../midori/sokoke.c:792 +#: ../midori/sokoke.c:883 msgid "_Closed Tabs and Windows" msgstr "_Lukkede faneblade og vinduer" -#: ../midori/sokoke.c:793 +#: ../midori/sokoke.c:884 msgid "New _Window" msgstr "Nyt _vindue" @@ -1644,15 +1780,15 @@ msgstr "Slå fra" msgid "Bookmarks" msgstr "Bogmærker" -#: ../panels/midori-bookmarks.c:240 +#: ../panels/midori-bookmarks.c:238 msgid "Edit the selected bookmark" msgstr "Redigér det valgte bogmærke" -#: ../panels/midori-bookmarks.c:248 +#: ../panels/midori-bookmarks.c:246 msgid "Delete the selected bookmark" msgstr "Slet det valgte bogmærke" -#: ../panels/midori-bookmarks.c:593 +#: ../panels/midori-bookmarks.c:591 msgid "Separator" msgstr "Separator" @@ -1664,43 +1800,47 @@ msgstr "Konsol" msgid "Extensions" msgstr "Udvidelser" -#: ../panels/midori-history.c:163 +#: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" msgstr "Er du sikker på, at du ønsker at fjerne alle historikelementer?" -#: ../panels/midori-history.c:218 +#: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" msgstr "Bogmærk det valgte historikelement" -#: ../panels/midori-history.c:227 +#: ../panels/midori-history.c:226 msgid "Delete the selected history item" msgstr "Slet det valgte historikelement" -#: ../panels/midori-history.c:235 +#: ../panels/midori-history.c:234 msgid "Clear the entire history" msgstr "Ryd hele historikken" -#: ../panels/midori-history.c:600 -#, c-format +#: ../panels/midori-history.c:599 msgid "A week ago" msgstr "For en uge siden" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:604 +#, c-format +msgid "%d day ago" +msgstr "For %d dage siden" + +#: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" msgstr "For %d dage siden" -#: ../panels/midori-history.c:613 +#: ../panels/midori-history.c:612 msgid "Today" msgstr "I dag" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:614 msgid "Yesterday" msgstr "I går" #: ../panels/midori-plugins.c:87 -msgid "Plugins" -msgstr "Udvidelsesmoduler" +msgid "Netscape plugins" +msgstr "Netscape-udvidelsesmoduler" #: ../panels/midori-transfers.c:256 #, c-format @@ -1742,29 +1882,29 @@ msgid "Animation frames are broken" msgstr "Animeringsrammer er ødelagt" #: ../katze/katze-utils.c:183 -#: ../katze/katze-utils.c:395 +#: ../katze/katze-utils.c:385 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Egenskab '%s' er ikke gyldig for %s" #: ../katze/katze-utils.c:215 -#: ../katze/katze-utils.c:254 +#: ../katze/katze-utils.c:244 msgid "Choose file" msgstr "Vælg fil" -#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:230 msgid "Choose folder" msgstr "Vælg mappe" -#: ../extensions/colorful-tabs.c:104 +#: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "Ton faneblade tydeligt" -#: ../extensions/colorful-tabs.c:140 +#: ../extensions/colorful-tabs.c:151 msgid "Colorful Tabs" msgstr "Farvefulde faneblade" -#: ../extensions/colorful-tabs.c:141 +#: ../extensions/colorful-tabs.c:152 msgid "Tint each tab distinctly" msgstr "Ton hvert faneblad tydeligt" @@ -1797,67 +1937,147 @@ msgstr "Ja" msgid "No" msgstr "Nej" -#: ../extensions/cookie-manager.c:491 +#: ../extensions/cookie-manager.c:493 msgid "Do you really want to delete all cookies?" msgstr "Er du sikker på, at du ønsker at fjerne alle cookies?" -#: ../extensions/cookie-manager.c:493 +#: ../extensions/cookie-manager.c:495 msgid "Question" msgstr "Spørgsmål" -#: ../extensions/cookie-manager.c:501 -msgid "Only the visible cookies are deleted which match the entered filter string." -msgstr "Kun de synlige cookies, som passer med den indtastede filterstreng, er slettet." +#: ../extensions/cookie-manager.c:504 +msgid "Only cookies which match the filter will be deleted." +msgstr "Kun cookies, som passer med den indtastede filterstreng, bliver slettet." -#: ../extensions/cookie-manager.c:679 +#: ../extensions/cookie-manager.c:682 msgid "Name" msgstr "Navn" -#: ../extensions/cookie-manager.c:739 +#: ../extensions/cookie-manager.c:742 msgid "_Expand All" msgstr "_Udfold alle" -#: ../extensions/cookie-manager.c:747 +#: ../extensions/cookie-manager.c:750 msgid "_Collapse All" msgstr "_Fold alle" -#: ../extensions/cookie-manager.c:818 -msgid "Delete All" -msgstr "Slet alle" - -#: ../extensions/cookie-manager.c:820 +#: ../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 "Slet alle viste cookies. Hvis filter er indstillet, vil kun de cookies, som passer til filteret, blive slettet." -#: ../extensions/cookie-manager.c:835 +#: ../extensions/cookie-manager.c:838 msgid "Expand All" msgstr "Udfold alle" -#: ../extensions/cookie-manager.c:842 +#: ../extensions/cookie-manager.c:845 msgid "Collapse All" msgstr "Fold alle" -#: ../extensions/cookie-manager.c:873 +#: ../extensions/cookie-manager.c:876 msgid "Filter:" msgstr "Filter:" -#: ../extensions/cookie-manager.c:878 +#: ../extensions/cookie-manager.c:881 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Indtast en filterstreng for at vise kun cookies hvis navn eller domænefelt passer til det indtastede filter" -#: ../extensions/cookie-manager.c:913 -#: ../extensions/cookie-manager.c:961 +#: ../extensions/cookie-manager.c:916 +#: ../extensions/cookie-manager.c:964 msgid "Cookie Manager" msgstr "Cookiehåndtering" -#: ../extensions/cookie-manager.c:945 +#: ../extensions/cookie-manager.c:948 msgid "_Cookie Manager" msgstr "_Cookiehåndtering" -#: ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:965 msgid "List, view and delete cookies" msgstr "Vis, gennemse og slet cookies" +#: ../extensions/feed-panel/feed-atom.c:242 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "Kunne ikke finde anmodede Atom \"post\"-elementerne i XML-data." + +#: ../extensions/feed-panel/feed-atom.c:348 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "Kunne ikke finde anmodede Atom \"feed\"-elementerne i XML-data." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Sidst opdateret: %s." + +#: ../extensions/feed-panel/feed-panel.c:664 +msgid "Feeds" +msgstr "Feeds" + +#: ../extensions/feed-panel/feed-panel.c:717 +msgid "Add new feed" +msgstr "Tilføj nyt feed" + +#: ../extensions/feed-panel/feed-panel.c:724 +msgid "Delete feed" +msgstr "Slet feed" + +#: ../extensions/feed-panel/feed-panel.c:807 +msgid "_Feeds" +msgstr "_Feeds" + +#: ../extensions/feed-panel/feed-parse.c:175 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Kunne ikke finde rodelement i feed XML-data." + +#: ../extensions/feed-panel/feed-parse.c:215 +#, c-format +msgid "Unsupported feed format." +msgstr "Ikke understøttet feed-format." + +#: ../extensions/feed-panel/feed-parse.c:245 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Kunne ikke fortolke XML-feed: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "Kunne ikke finde \"kanal\"-element i RSS-XML-data." + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Ikke understøttet RSS-version fundet." + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "Kunne ikke finde anmodede RSS \"punkt\"elementer i XML-data." + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "Kunne ikke finde anmodede RSS \"kanal\"-elemterne i XML-data." + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Feed '%s' findes allerede" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Fejl ved indlæsning af feed '%s'" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "Nyt feed" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Feed-panel" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "Læs Atom-/ RSS-feeds" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "Musebevægelser" @@ -1876,6 +2096,18 @@ msgstr "Sideholder" msgid "_Pageholder" msgstr "_Sideholder" +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "Status funktioner" + +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "Slå nemt netsiders funktioner til/fra" + +#~ msgid "P_lugins" +#~ msgstr "Udvidelses_moduler" +#~ msgid "Plugins" +#~ msgstr "Udvidelsesmoduler" #~ msgid "%s has no property '%s'" #~ msgstr "%s har ingen egenskab '%s'" #~ msgid "%s cannot be assigned to %s.%s" @@ -1888,3 +2120,4 @@ msgstr "_Sideholder" #~ msgstr "Skripter" #~ msgid "Source" #~ msgstr "Kilde" + diff --git a/po/de.po b/po/de.po index b77bdf8d..709fbe66 100644 --- a/po/de.po +++ b/po/de.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.6\n" +"Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-25 18:05+0200\n" +"POT-Creation-Date: 2009-07-20 01:57+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:1315 ../midori/main.c:1449 -#: ../midori/main.c:1457 ../midori/main.c:1468 -#: ../midori/midori-websettings.c:281 +#: ../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 msgid "Midori" msgstr "Midori" @@ -82,28 +82,28 @@ msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/main.c:770 +#: ../midori/main.c:779 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %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 "Die Lesezeichen konnten nicht geladen werden. %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 "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:965 +#: ../midori/main.c:974 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %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." @@ -111,935 +111,966 @@ msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:1107 +#: ../midori/main.c:1116 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:1111 +#: ../midori/main.c:1120 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:1116 +#: ../midori/main.c:1125 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1315 +#: ../midori/main.c:1344 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1338 +#: ../midori/main.c:1367 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1370 +#: ../midori/main.c:1400 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Schnappschuss gespeichert: %s\n" -#: ../midori/main.c:1391 +#: ../midori/main.c:1435 msgid "Run ADDRESS as a web application" msgstr "ADRESSE als Internetanwendung starten" -#: ../midori/main.c:1391 +#: ../midori/main.c:1435 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1393 +#: ../midori/main.c:1437 msgid "Use FOLDER as configuration folder" msgstr "ORDNER als Konfigurationsordner benutzen" -#: ../midori/main.c:1393 +#: ../midori/main.c:1437 msgid "FOLDER" msgstr "ORDNER" -#: ../midori/main.c:1395 +#: ../midori/main.c:1440 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1398 +#: ../midori/main.c:1444 msgid "Take a snapshot of the specified URI" msgstr "Schnappschuss der angegebenen URI aufnehmen" -#: ../midori/main.c:1401 +#: ../midori/main.c:1447 +msgid "Execute the specified command" +msgstr "Den angegebenen Befehl ausführen" + +#: ../midori/main.c:1449 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1403 +#: ../midori/main.c:1451 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1446 +#: ../midori/main.c:1495 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1469 +#: ../midori/main.c:1518 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1471 +#: ../midori/main.c:1520 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1548 +#: ../midori/main.c:1602 msgid "The specified configuration folder is invalid." msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." -#: ../midori/main.c:1583 +#: ../midori/main.c:1638 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:1633 +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1645 +#: ../midori/main.c:1700 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1660 +#: ../midori/main.c:1715 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1673 +#: ../midori/main.c:1728 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1686 +#: ../midori/main.c:1741 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1698 +#: ../midori/main.c:1753 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1714 +#: ../midori/main.c:1769 msgid "_Ignore" msgstr "_Ignorieren" -#: ../midori/midori-array.c:195 +#: ../midori/midori-array.c:250 msgid "File not found." msgstr "Datei nicht gefunden." -#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +#: ../midori/midori-array.c:258 ../midori/midori-array.c:267 msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/midori-array.c:338 ../midori/sokoke.c:692 +#: ../midori/midori-array.c:429 ../midori/sokoke.c:700 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:297 ../midori/midori-browser.c:3965 -#: ../midori/midori-browser.c:3971 +#: ../midori/midori-browser.c:304 ../midori/midori-browser.c:4177 +#: ../midori/midori-browser.c:4183 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:308 ../midori/midori-browser.c:3968 +#: ../midori/midori-browser.c:315 ../midori/midori-browser.c:4180 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:370 +#: ../midori/midori-browser.c:410 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:395 +#: ../midori/midori-browser.c:435 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:617 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:617 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:639 +#: ../midori/midori-browser.c:619 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:639 +#: ../midori/midori-browser.c:619 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:669 +#: ../midori/midori-browser.c:649 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:682 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:701 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:681 ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:720 +#: ../midori/midori-browser.c:700 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:725 ../midori/midori-browser.c:766 +#: ../midori/midori-browser.c:705 ../midori/midori-browser.c:746 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:842 +#: ../midori/midori-browser.c:822 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1174 +#: ../midori/midori-browser.c:1169 #, c-format msgid "The file %s has been downloaded." msgstr "Die Datei %s wurde heruntergeladen." -#: ../midori/midori-browser.c:1178 +#: ../midori/midori-browser.c:1173 msgid "Transfer completed" msgstr "Übertragung abgeschlossen" -#: ../midori/midori-browser.c:1888 +#: ../midori/midori-browser.c:1314 +msgid "Save file" +msgstr "Datei speichern" + +#: ../midori/midori-browser.c:1960 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:3242 ../panels/midori-bookmarks.c:778 -#: ../panels/midori-history.c:811 +#: ../midori/midori-browser.c:3429 ../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:3249 ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:817 ../extensions/feed-panel/feed-panel.c:542 +#: ../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 "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:3252 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:819 ../extensions/feed-panel/feed-panel.c:544 +#: ../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 "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:3551 +#: ../midori/midori-browser.c:3739 msgid "Clear Private Data" msgstr "Private Daten löschen" -#: ../midori/midori-browser.c:3554 +#: ../midori/midori-browser.c:3743 msgid "_Clear private data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:3567 +#: ../midori/midori-browser.c:3756 msgid "Clear the following data:" msgstr "Folgende Daten löschen:" -#: ../midori/midori-browser.c:3575 ../midori/midori-preferences.c:670 +#: ../midori/midori-browser.c:3766 ../midori/midori-preferences.c:675 #: ../panels/midori-history.c:108 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:3580 +#: ../midori/midori-browser.c:3771 msgid "Cookies" msgstr "Benutzerprofile/ Cookies" -#: ../midori/midori-browser.c:3585 +#: ../midori/midori-browser.c:3776 msgid "'Flash' Cookies" msgstr "«Flash» Cookies" -#: ../midori/midori-browser.c:3590 +#: ../midori/midori-browser.c:3781 msgid "Website icons" msgstr "Symbole von Internetseiten" -#: ../midori/midori-browser.c:3596 ../midori/sokoke.c:859 +#: ../midori/midori-browser.c:3786 ../midori/sokoke.c:874 msgid "_Closed Tabs and Windows" msgstr "_Geschlossene Reiter und Fenster" -#: ../midori/midori-browser.c:3677 +#: ../midori/midori-browser.c:3869 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:3685 +#: ../midori/midori-browser.c:3877 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:4111 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3902 +#: ../midori/midori-browser.c:4114 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4117 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3908 +#: ../midori/midori-browser.c:4120 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3911 +#: ../midori/midori-browser.c:4123 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3913 ../midori/midori-view.c:1337 +#: ../midori/midori-browser.c:4125 msgid "Add to Speed _dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:3914 +#: ../midori/midori-browser.c:4126 msgid "Add shortcut to speed dial" msgstr "Eine Verknüpfung zur Schnellwahl hinzufügen" -#: ../midori/midori-browser.c:3916 +#: ../midori/midori-browser.c:4128 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4129 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3919 +#: ../midori/midori-browser.c:4131 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4132 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3923 +#: ../midori/midori-browser.c:4135 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3926 +#: ../midori/midori-browser.c:4138 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3928 +#: ../midori/midori-browser.c:4140 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4143 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3934 ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4146 ../midori/midori-browser.c:4149 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3940 +#: ../midori/midori-browser.c:4152 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3943 +#: ../midori/midori-browser.c:4155 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4158 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:4161 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3951 +#: ../midori/midori-browser.c:4163 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3952 +#: ../midori/midori-browser.c:4164 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3954 +#: ../midori/midori-browser.c:4166 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3955 +#: ../midori/midori-browser.c:4167 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4171 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3961 +#: ../midori/midori-browser.c:4173 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3962 +#: ../midori/midori-browser.c:4174 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3974 +#: ../midori/midori-browser.c:4186 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3977 +#: ../midori/midori-browser.c:4189 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3980 +#: ../midori/midori-browser.c:4192 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3981 +#: ../midori/midori-browser.c:4193 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:3983 -msgid "_Automatic" -msgstr "_Automatisch" - -#: ../midori/midori-browser.c:3986 ../midori/midori-websettings.c:208 -msgid "Chinese (BIG5)" -msgstr "Chinesisch (BIG5)" - -#: ../midori/midori-browser.c:3989 ../midori/midori-websettings.c:209 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japanisch (SHIFT_JIS)" - -#: ../midori/midori-browser.c:3992 ../midori/midori-websettings.c:210 -msgid "Russian (KOI8-R)" -msgstr "Russisch (KOI8-R)" - -#: ../midori/midori-browser.c:3995 ../midori/midori-websettings.c:211 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-browser.c:3998 ../midori/midori-websettings.c:212 -msgid "Western (ISO-8859-1)" -msgstr "Westlich (ISO-8859-1)" - -#: ../midori/midori-browser.c:4001 ../midori/midori-websettings.c:213 -#: ../midori/midori-websettings.c:285 -msgid "Custom..." -msgstr "Benutzerdefiniert…" - -#: ../midori/midori-browser.c:4004 ../midori/midori-view.c:1356 -msgid "View _Source" +#: ../midori/midori-browser.c:4195 +msgid "View So_urce" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:4005 +#: ../midori/midori-browser.c:4196 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:4007 +#: ../midori/midori-browser.c:4198 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4199 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:4012 +#: ../midori/midori-browser.c:4203 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:4014 +#: ../midori/midori-browser.c:4205 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:4017 +#: ../midori/midori-browser.c:4208 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:4020 +#: ../midori/midori-browser.c:4211 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:4214 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:4025 +#: ../midori/midori-browser.c:4216 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:4026 +#: ../midori/midori-browser.c:4217 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:4028 ../midori/midori-view.c:1314 -msgid "Undo Close Tab" -msgstr "Reiter zurückholen" +#: ../midori/midori-browser.c:4219 +msgid "Undo _Close Tab" +msgstr "Reiter _zurückholen" -#: ../midori/midori-browser.c:4029 +#: ../midori/midori-browser.c:4220 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:4033 ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:4224 ../panels/midori-bookmarks.c:231 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:4035 ../panels/midori-bookmarks.c:259 -msgid "Add a new folder" -msgstr "Einen neuen Ordner hinzufügen" +#: ../midori/midori-browser.c:4226 +msgid "Add a new _folder" +msgstr "Einen neuen _Ordner hinzufügen" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4227 msgid "Add a new bookmark folder" msgstr "Einen neuen Lesezeichenordner hinzufügen" -#: ../midori/midori-browser.c:4037 +#: ../midori/midori-browser.c:4228 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:4039 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4230 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:4040 +#: ../midori/midori-browser.c:4231 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:4043 +#: ../midori/midori-browser.c:4234 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:4044 +#: ../midori/midori-browser.c:4235 msgid "Clear private data..." msgstr "Private Daten löschen..." -#: ../midori/midori-browser.c:4048 +#: ../midori/midori-browser.c:4239 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:4049 +#: ../midori/midori-browser.c:4240 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:4051 +#: ../midori/midori-browser.c:4242 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:4052 +#: ../midori/midori-browser.c:4243 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:4054 +#: ../midori/midori-browser.c:4245 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:4247 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:4057 +#: ../midori/midori-browser.c:4248 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:4059 +#: ../midori/midori-browser.c:4250 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:4060 +#: ../midori/midori-browser.c:4251 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:4062 +#: ../midori/midori-browser.c:4253 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:4063 +#: ../midori/midori-browser.c:4254 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:4066 +#: ../midori/midori-browser.c:4257 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:4073 +#: ../midori/midori-browser.c:4264 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:4074 +#: ../midori/midori-browser.c:4265 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:4079 +#: ../midori/midori-browser.c:4270 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:4080 +#: ../midori/midori-browser.c:4271 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:4083 +#: ../midori/midori-browser.c:4274 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:4084 +#: ../midori/midori-browser.c:4275 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:4087 +#: ../midori/midori-browser.c:4278 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:4088 +#: ../midori/midori-browser.c:4279 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:4091 +#: ../midori/midori-browser.c:4282 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:4092 +#: ../midori/midori-browser.c:4283 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:4095 +#: ../midori/midori-browser.c:4286 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:4096 +#: ../midori/midori-browser.c:4287 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:4099 +#: ../midori/midori-browser.c:4290 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:4100 +#: ../midori/midori-browser.c:4291 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:4534 +#: ../midori/midori-browser.c:4298 +msgid "_Automatic" +msgstr "_Automatisch" + +#: ../midori/midori-browser.c:4301 ../midori/midori-websettings.c:212 +msgid "Chinese (BIG5)" +msgstr "Chinesisch (BIG5)" + +#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic +#: ../midori/midori-browser.c:4305 +msgid "Japanese (SHIFT__JIS)" +msgstr "Japanisch (SHIFT__JIS)" + +#: ../midori/midori-browser.c:4308 ../midori/midori-websettings.c:214 +msgid "Russian (KOI8-R)" +msgstr "Russisch (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 "Westlich (ISO-8859-1)" + +#: ../midori/midori-browser.c:4317 ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:289 +msgid "Custom..." +msgstr "Benutzerdefiniert…" + +#: ../midori/midori-browser.c:4755 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:4541 +#: ../midori/midori-browser.c:4762 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:4543 +#: ../midori/midori-browser.c:4764 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:4565 +#: ../midori/midori-browser.c:4788 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:4567 +#: ../midori/midori-browser.c:4790 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:4588 +#: ../midori/midori-browser.c:4811 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:4603 +#: ../midori/midori-browser.c:4826 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:4605 +#: ../midori/midori-browser.c:4828 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:4620 ../midori/sokoke.c:848 +#: ../midori/midori-browser.c:4843 ../midori/sokoke.c:863 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4845 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:4637 +#: ../midori/midori-browser.c:4860 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:4639 +#: ../midori/midori-browser.c:4862 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" +#: ../midori/midori-browser.c:4876 +msgid "_Menu" +msgstr "_Menü" + +#: ../midori/midori-browser.c:4878 +msgid "Menu" +msgstr "Menü" + #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4814 +#: ../midori/midori-browser.c:5059 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5084 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5089 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:5094 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:4857 +#: ../midori/midori-browser.c:5102 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:4867 +#: ../midori/midori-browser.c:5112 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4902 -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../midori/midori-browser.c:5147 +#: ../extensions/cookie-manager/cookie-manager-page.c:109 msgid "Delete All" msgstr "Alle löschen" -#: ../midori/midori-browser.c:5224 +#: ../midori/midori-browser.c:5476 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" +#: ../midori/midori-locationaction.c:901 +#, c-format +msgid "Search with %s" +msgstr "Suchen mit %s" + #: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "Gewählte Leiste vom Fenster ablösen" -#: ../midori/midori-panel.c:335 -msgid "Whether to detach the chosen panel from the window" -msgstr "Die gewählte Seitenleiste vom Fenster ablösen" - -#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:539 -msgid "Align sidepanel on the right" +#: ../midori/midori-panel.c:343 ../midori/midori-panel.c:508 +msgid "Align sidepanel to the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:540 -msgid "Whether to align the sidepanel on the right" -msgstr "Die Seitenleiste auf der rechten Seite anordnen" - -#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 +#: ../midori/midori-panel.c:353 ../midori/midori-panel.c:354 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:191 ../midori/midori-view.c:2250 +#: ../midori/midori-panel.c:509 +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-websettings.c:192 ../midori/midori-websettings.c:559 +#: ../midori/midori-websettings.c:196 ../midori/midori-websettings.c:563 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:193 +#: ../midori/midori-websettings.c:197 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:228 +#: ../midori/midori-websettings.c:213 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japanisch (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:232 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:233 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:234 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:249 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:250 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:251 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:252 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:253 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:268 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:269 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:266 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:270 ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:87 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:286 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:287 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:288 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:341 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:342 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:346 +#: ../midori/midori-websettings.c:350 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:351 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:359 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:360 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:385 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:395 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:396 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:404 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:405 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:414 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:415 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:423 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:424 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:432 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:433 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:437 +#: ../midori/midori-websettings.c:441 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:457 msgid "Show Transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the transferbar" msgstr "Die Übertragungsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:466 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:493 msgid "Show progress in location entry" msgstr "Fortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:494 msgid "Whether to show loading progress in the location entry" msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:509 msgid "Search engines in location completion" msgstr "Suchmaschinen in Vervollständigung" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:510 msgid "Whether to show search engines in the location completion" msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:518 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:519 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:527 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:528 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:543 +msgid "Align sidepanel on the right" +msgstr "Seitenleiste rechts anordnen" + +#: ../midori/midori-websettings.c:544 +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:550 +#: ../midori/midori-websettings.c:554 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:560 +#: ../midori/midori-websettings.c:564 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:579 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:580 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:592 +#: ../midori/midori-websettings.c:596 msgid "Show speed dial in new tabs" msgstr "Schnellwahl in neuen Reitern anzeigen" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:597 msgid "Show speed dial in newly opened tabs" msgstr "Schnellwahl in neu geöffneten Reitern anzeigen" @@ -1061,7 +1092,7 @@ msgstr "Beim Herunterladen einer Datei nach dem Zielordner fragen" #: ../midori/midori-websettings.c:645 msgid "Notify when a transfer has been completed" -msgstr "Benachrichtigen bei Abschluss einer Übertragung" +msgstr "Benachrichtigen bei Abschluss der Übertragung" #: ../midori/midori-websettings.c:646 msgid "Whether to show a notification when a transfer has been completed" @@ -1293,121 +1324,125 @@ msgstr "Private Daten löschen" msgid "The private data selected for deletion" msgstr "Zum Löschen ausgewählte private Daten" -#: ../midori/midori-view.c:740 +#: ../midori/midori-view.c:750 #, 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:742 ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:752 ../midori/midori-view.c:2897 #: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "Fehler" -#: ../midori/midori-view.c:745 +#: ../midori/midori-view.c:755 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:775 ../midori/midori-view.c:2777 +#: ../midori/midori-view.c:785 ../midori/midori-view.c:2901 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:1176 +#: ../midori/midori-view.c:1172 msgid "Open _Link" msgstr "Verweis ö_ffnen" -#: ../midori/midori-view.c:1178 +#: ../midori/midori-view.c:1174 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1191 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:1204 +#: ../midori/midori-view.c:1197 msgid "_Download Link destination" msgstr "Verweisziel herunter_laden" -#: ../midori/midori-view.c:1210 +#: ../midori/midori-view.c:1203 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:1219 +#: ../midori/midori-view.c:1212 msgid "Download with Download _Manager" msgstr "Mit Übertragungs_manager herunterladen" -#: ../midori/midori-view.c:1248 +#: ../midori/midori-view.c:1241 msgid "Search _with" msgstr "Suchen _mit" -#: ../midori/midori-view.c:1276 +#: ../midori/midori-view.c:1269 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:1286 +#: ../midori/midori-view.c:1279 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1453 +#: ../midori/midori-view.c:1457 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:1470 +#: ../midori/midori-view.c:1474 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: «%s»" -#: ../midori/midori-view.c:1473 +#: ../midori/midori-view.c:1477 #, 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:1477 +#: ../midori/midori-view.c:1481 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:1886 +#: ../midori/midori-view.c:1899 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:2076 +#: ../midori/midori-view.c:2089 msgid "Speed dial" msgstr "Schnellwahl" -#: ../midori/midori-view.c:2077 +#: ../midori/midori-view.c:2090 msgid "Click to add a shortcut" msgstr "Klicken um eine Verknüpfung hinzuzufügen" -#: ../midori/midori-view.c:2078 +#: ../midori/midori-view.c:2091 msgid "Enter shortcut address" msgstr "Ziel der Verknüpfung eingeben" -#: ../midori/midori-view.c:2079 +#: ../midori/midori-view.c:2092 msgid "Enter shortcut title" msgstr "Titel der Verknüpfung eingeben" -#: ../midori/midori-view.c:2080 +#: ../midori/midori-view.c:2093 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:2110 +#: ../midori/midori-view.c:2123 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2140 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" +#: ../midori/midori-view.c:2487 +msgid "_Duplicate Tab" +msgstr "Reiter _verdoppeln" + #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" @@ -1455,113 +1490,117 @@ msgstr "Die Standardschriftgröße, in der Text angezeigt wird" msgid "Fixed-width Font Family" msgstr "Dicktengleiche Schriftart" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:457 msgid "The font family used to display fixed-width text" msgstr "Die Schriftart, in der dicktengleicher Text angezeigt wird" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "Die Schriftgröße, in der dicktengleicher Text angezeigt wird" + +#: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" msgstr "Mindestschriftgröße" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:473 msgid "Encoding" msgstr "Zeichensatz" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" msgstr "Der voreingestellte Zeichensatz" #. Page "Behavior" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:484 msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:72 +#: ../midori/midori-preferences.c:487 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Bilder automatisch laden" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:488 msgid "Load and display images automatically" msgstr "Bilder automatisch laden und anzeigen" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:491 msgid "Shrink images automatically" msgstr "Bilder automatisch verkleinern" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:492 msgid "Automatically shrink standalone images to fit" msgstr "Einzelne Bilder automatisch angemessen verkleinern" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:495 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:496 msgid "Whether background images should be printed" msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:499 msgid "Resizable text areas" msgstr "Vergrößerbare Textfelder" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:500 msgid "Whether text areas are resizable" msgstr "Sollen Textfelder vergrößerbar sein oder nicht" -#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:84 +#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:504 msgid "Enable embedded scripting languages" msgstr "Eingebettete Skriptsprachen einschalten" -#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:96 +#: ../midori/midori-preferences.c:507 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Netscape-Module einschalten" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:508 msgid "Enable embedded Netscape plugin objects" msgstr "Eingebettete Netscape-Module einschalten" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:511 msgid "Enforce 96 dots per inch" msgstr "Erzwinge 96 Punkte pro Zoll" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:512 msgid "Enforce a video dot density of 96 DPI" msgstr "Erzwinge eine Punktdichte von 96 DPI" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:515 msgid "Enable developer tools" msgstr "Entwicklerwerkzeuge einschalten" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:516 msgid "Enable special extensions for developers" msgstr "Besondere Erweiterungen für Entwickler einschalten" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:523 msgid "Spell Checking" msgstr "Rechtschreibprüfung" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:526 msgid "Enable Spell Checking" msgstr "Rechtschreibprüfung einschalten" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:527 msgid "Enable spell checking while typing" msgstr "Rechtschreibprüfung beim Eintippen einschalten" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:531 msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" @@ -1570,46 +1609,46 @@ msgstr "" "Rechtschreibprüfung benutzt werden sollen, zum Beispiel «en_GB,de_DE»" #. Page "Interface" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:536 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:532 +#: ../midori/midori-preferences.c:537 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:548 msgid "Browsing" msgstr "Navigation" #. Page "Applications" -#: ../midori/midori-preferences.c:573 +#: ../midori/midori-preferences.c:578 msgid "Applications" msgstr "Anwendungen" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:579 msgid "External applications" msgstr "Externe Anwendungen" #. Page "Network" -#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:621 +#: ../midori/midori-preferences.c:625 ../midori/midori-preferences.c:626 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:648 +#: ../midori/midori-preferences.c:653 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:658 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:654 +#: ../midori/midori-preferences.c:659 msgid "Web Cookies" msgstr "Benutzerprofile" -#: ../midori/midori-preferences.c:667 ../midori/midori-preferences.c:677 +#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682 msgid "days" msgstr "Tage" @@ -1637,63 +1676,63 @@ msgstr "_Symbol:" msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1195 +#: ../midori/midori-searchaction.c:1209 msgid "Manage Search Engines" msgstr "Suchmaschinen verwalten" -#: ../midori/midori-searchaction.c:1292 +#: ../midori/midori-searchaction.c:1308 msgid "Use as _default" msgstr "Als _Standard" -#: ../midori/sokoke.c:164 ../midori/sokoke.c:176 +#: ../midori/sokoke.c:172 ../midori/sokoke.c:184 msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." -#: ../midori/sokoke.c:847 +#: ../midori/sokoke.c:862 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/sokoke.c:849 -msgid "_Add Bookmark" +#: ../midori/sokoke.c:864 +msgid "Add Boo_kmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/sokoke.c:850 +#: ../midori/sokoke.c:865 msgid "_Console" msgstr "_Konsole" -#: ../midori/sokoke.c:851 +#: ../midori/sokoke.c:866 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/sokoke.c:852 +#: ../midori/sokoke.c:867 msgid "_History" msgstr "_Verlauf" -#: ../midori/sokoke.c:853 +#: ../midori/sokoke.c:868 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/sokoke.c:854 +#: ../midori/sokoke.c:869 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/sokoke.c:855 +#: ../midori/sokoke.c:870 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/sokoke.c:856 +#: ../midori/sokoke.c:871 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/sokoke.c:857 +#: ../midori/sokoke.c:872 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/sokoke.c:858 +#: ../midori/sokoke.c:873 msgid "Netscape p_lugins" msgstr "Netscape-Module" -#: ../midori/sokoke.c:860 +#: ../midori/sokoke.c:875 msgid "New _Window" msgstr "Neues _Fenster" @@ -1705,35 +1744,23 @@ msgstr "Benutzerskripte" msgid "Userstyles" msgstr "Benutzerstile" -#: ../panels/midori-addons.c:1031 ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "_Einschalten" - -#: ../panels/midori-addons.c:1032 ../panels/midori-extensions.c:145 -msgid "Enable" -msgstr "_Einschalten" - -#: ../panels/midori-addons.c:1041 ../panels/midori-extensions.c:154 -msgid "_Disable" -msgstr "_Auschalten" - -#: ../panels/midori-addons.c:1042 ../panels/midori-extensions.c:155 -msgid "Disable" -msgstr "_Auschalten" - -#: ../panels/midori-bookmarks.c:107 +#: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../panels/midori-bookmarks.c:238 +#: ../panels/midori-bookmarks.c:239 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../panels/midori-bookmarks.c:591 +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "Einen neuen Ordner hinzufügen" + +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Trennlinie" @@ -1741,7 +1768,7 @@ msgstr "Trennlinie" msgid "Console" msgstr "Konsole" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Erweiterungen" @@ -1761,26 +1788,26 @@ msgstr "Ausgewählten Verlaufseintrag löschen" msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../panels/midori-history.c:602 +#: ../panels/midori-history.c:601 msgid "A week ago" msgstr "Vor einer Woche" -#: ../panels/midori-history.c:607 +#: ../panels/midori-history.c:606 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Vor %d Tag" msgstr[1] "Vor %d Tagen" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:614 msgid "Today" msgstr "Heute" -#: ../panels/midori-history.c:617 +#: ../panels/midori-history.c:616 msgid "Yesterday" msgstr "Gestern" -#: ../panels/midori-plugins.c:87 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "Netscape-Module" @@ -1789,6 +1816,14 @@ msgstr "Netscape-Module" msgid "%s of %s" msgstr "%s von %s" +#: ../panels/midori-transfers.c:479 +msgid "Open Destination _Folder" +msgstr "Zielordner ö_ffnen" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "Verweisziel ko_pieren" + #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "Authentifizierung erforderlich" @@ -1823,32 +1858,32 @@ msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../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 "Eigenschaft »%s« ist ungültig für %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 "Datei wählen" -#: ../katze/katze-utils.c:230 +#: ../katze/katze-utils.c:250 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" -#: ../extensions/adblock.c:78 +#: ../extensions/adblock.c:128 msgid "Configure Advertisement filters" msgstr "Werbefilter einstellen" -#: ../extensions/adblock.c:214 +#: ../extensions/adblock.c:269 msgid "Configure _Advertisement filters..." msgstr "Werbefilter einstellen..." -#: ../extensions/adblock.c:374 +#: ../extensions/adblock.c:526 msgid "Advertisement blocker" msgstr "Werbeblocker" -#: ../extensions/adblock.c:375 +#: ../extensions/adblock.c:527 msgid "Block advertisements according to a filter list" msgstr "Werbung an Hand einer Filterliste blockieren" @@ -1864,20 +1899,12 @@ msgstr "Farbige Reiter" msgid "Tint each tab distinctly" msgstr "Alle Reiter unterschiedlich einfärben" -#: ../extensions/cookie-manager/cookie-manager.c:105 -msgid "_Cookie Manager" -msgstr "_Cookieverwaltung" - -#: ../extensions/cookie-manager/cookie-manager.c:121 -#: ../extensions/cookie-manager/cookie-manager-page.c:83 +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 msgid "Cookie Manager" msgstr "Cookieverwaltung" -#: ../extensions/cookie-manager/cookie-manager.c:122 -msgid "List, view and delete cookies" -msgstr "Profildateien auflisten, anzeigen und löschen" - -#: ../extensions/cookie-manager/cookie-manager-page.c:131 +#: ../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." @@ -1885,32 +1912,32 @@ msgstr "" "Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene " "Einträge gelöscht, die auf den Filter passen" -#: ../extensions/cookie-manager/cookie-manager-page.c:146 +#: ../extensions/cookie-manager/cookie-manager-page.c:126 msgid "Expand All" msgstr "Alle ausklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:153 +#: ../extensions/cookie-manager/cookie-manager-page.c:133 msgid "Collapse All" msgstr "Alle einklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:474 +#: ../extensions/cookie-manager/cookie-manager-page.c:460 msgid "Do you really want to delete all cookies?" msgstr "Sind Sie sicher, dass alle Profildateien entfernt werden sollen?" -#: ../extensions/cookie-manager/cookie-manager-page.c:476 +#: ../extensions/cookie-manager/cookie-manager-page.c:462 msgid "Question" msgstr "Frage" -#: ../extensions/cookie-manager/cookie-manager-page.c:485 +#: ../extensions/cookie-manager/cookie-manager-page.c:471 msgid "Only cookies which match the filter will be deleted." msgstr "" "Nur Profildateien, die auf den eigegebenen Filter passen, werden gelöscht." -#: ../extensions/cookie-manager/cookie-manager-page.c:553 +#: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" msgstr "Am Ende der Sitzung" -#: ../extensions/cookie-manager/cookie-manager-page.c:556 +#: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format msgid "" "Host: %s\n" @@ -1927,31 +1954,31 @@ msgstr "" "Sicher: %s\n" "Verfällt: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:562 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" msgstr "Ja" -#: ../extensions/cookie-manager/cookie-manager-page.c:562 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" msgstr "Nein" -#: ../extensions/cookie-manager/cookie-manager-page.c:819 +#: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" msgstr "Name" -#: ../extensions/cookie-manager/cookie-manager-page.c:884 +#: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" msgstr "Alle _ausklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:892 +#: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" msgstr "Alle _einklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:942 +#: ../extensions/cookie-manager/cookie-manager-page.c:923 msgid "Filter:" msgstr "Filter:" -#: ../extensions/cookie-manager/cookie-manager-page.c:947 +#: ../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" @@ -1959,6 +1986,14 @@ msgstr "" "Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder " "Domöne auf den eingegebenen Filter passt." +#: ../extensions/cookie-manager/main.c:40 +msgid "_Cookie Manager" +msgstr "_Cookieverwaltung" + +#: ../extensions/cookie-manager/main.c:57 +msgid "List, view and delete cookies" +msgstr "Profildateien auflisten, anzeigen und löschen" + #: ../extensions/feed-panel/feed-atom.c:242 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" @@ -2047,11 +2082,11 @@ msgstr "Nachrichtenquellenleiste" msgid "Read Atom/ RSS feeds" msgstr "Atom-/ RSS-Quellen (Feeds) lesen" -#: ../extensions/mouse-gestures/main.c:244 +#: ../extensions/mouse-gestures/main.c:236 msgid "Mouse Gestures" msgstr "Mausgesten" -#: ../extensions/mouse-gestures/main.c:245 +#: ../extensions/mouse-gestures/main.c:237 msgid "Control Midori by moving the mouse" msgstr "Steuere Midori durch Bewegen der Maus" @@ -2064,14 +2099,96 @@ msgstr "Seitenhalter" msgid "_Pageholder" msgstr "_Seitenhalter" -#: ../extensions/statusbar-features.c:130 +#: ../extensions/shortcuts.c:166 +msgid "Configure Keyboard shortcuts" +msgstr "Tastaturkürzel einstellen" + +#: ../extensions/shortcuts.c:263 +msgid "Configure Sh_ortcuts..." +msgstr "Tastaturkürzel einstellen..." + +#: ../extensions/shortcuts.c:295 +msgid "Shortcuts" +msgstr "Tastaturkürzel" + +#: ../extensions/shortcuts.c:296 +msgid "View and edit keyboard shortcuts" +msgstr "Tastaturkürzel ansehen und bearbeiten" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "Bilder" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "Skripte" + +#: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" msgstr "Funktionen in der Statusleiste" -#: ../extensions/statusbar-features.c:131 +#: ../extensions/statusbar-features.c:150 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 +msgid "Tab Panel" +msgstr "Reiterleiste" + +#: ../extensions/tab-panel.c:336 +msgid "T_ab Panel" +msgstr "_Reiterleiste" + +#: ../extensions/tab-panel.c:353 +msgid "Show tabs in a vertical panel" +msgstr "Reiter in einer senkrechten Leiste anzeigen" + +#: ../extensions/toolbar-editor.c:390 +msgid "Customize Toolbar" +msgstr "Werkzeugleiste anpassen" + +#: ../extensions/toolbar-editor.c:406 +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." + +#: ../extensions/toolbar-editor.c:422 +msgid "Available Items" +msgstr "Verfügbare Elemente" + +#: ../extensions/toolbar-editor.c:443 +msgid "Displayed Items" +msgstr "Angezeigte Elemente" + +#: ../extensions/toolbar-editor.c:584 +msgid "Configure _Toolbar..." +msgstr "Werkzeugleiste anpassen..." + +#: ../extensions/toolbar-editor.c:613 +msgid "Toolbar Editor" +msgstr "Werkzeugleisteneditor" + +#: ../extensions/toolbar-editor.c:614 +msgid "Easily edit the toolbar layout" +msgstr "Werkzeugleisten leicht anpassen" + +#~ msgid "Whether to detach the chosen panel from the window" +#~ msgstr "Die gewählte Seitenleiste vom Fenster ablösen" + +#~ msgid "_Enable" +#~ msgstr "_Einschalten" + +#~ msgid "Enable" +#~ msgstr "_Einschalten" + +#~ msgid "_Disable" +#~ msgstr "_Auschalten" + +#~ msgid "Disable" +#~ msgstr "_Auschalten" + #~ msgid "_Quick Find" #~ msgstr "_Schnellsuche" diff --git a/po/el.po b/po/el.po index 2594c862..f6ada54a 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.6\n" +"Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-10 16:06+0200\n" -"PO-Revision-Date: 2009-05-26 22:23+0200\n" +"POT-Creation-Date: 2009-06-17 18:56+0300\n" +"PO-Revision-Date: 2009-06-17 19:28+0200\n" "Last-Translator: Evaggelos Balaskas \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgid "Lightweight web browser" msgstr "Ελαφρύς περιηγητής ιστού" #: ../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:1339 +#: ../midori/main.c:1480 +#: ../midori/main.c:1488 +#: ../midori/main.c:1499 +#: ../midori/midori-websettings.c:285 msgid "Midori" msgstr "Μιντόρι" @@ -87,141 +87,145 @@ msgstr "Αποτυχία στην διαγραφή των παλιών αντι msgid "The configuration couldn't be saved. %s" msgstr "Οι ρυθμίσεις δεν μπορούν να αποθηκευτούν. %s" -#: ../midori/main.c:770 +#: ../midori/main.c:779 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Οι μηχανές αναζήτησης δεν μπορούν να αποθηκευτούν. %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 "Οι σελιδοδείκτες δεν μπορούν να αποθηκευτούν. %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 "Τα απορρίμματα δεν μπορούν να αποθηκευτούν. %s" -#: ../midori/main.c:965 +#: ../midori/main.c:974 #, c-format msgid "The session couldn't be saved. %s" msgstr "Η συνεδρία δεν μπορεί να αποθηκευτεί. %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 "Το μιντόρι φαίνεται ότι κρέμασε την τελευταία φορά που άνοιξε. Εάν αυτό συνεχίζει επανειλημμένα δοκιμάστε μία από τις παρακάτω επιλογές για να επιλύσετε το πρόβλημα." -#: ../midori/main.c:1107 +#: ../midori/main.c:1116 msgid "Modify _preferences" msgstr "Τροποποίηση _προτιμήσεων" -#: ../midori/main.c:1111 +#: ../midori/main.c:1120 msgid "Reset the last _session" msgstr "Επαναφορά της τελευταίας σ_υνεδρίας" -#: ../midori/main.c:1116 +#: ../midori/main.c:1125 msgid "Disable all _extensions" msgstr "Απενεργοποίηση όλων των επ_εκτάσεων" -#: ../midori/main.c:1315 +#: ../midori/main.c:1339 msgid "No filename specified" msgstr "Δεν ορίστηκε όνομα αρχείου" -#: ../midori/main.c:1338 +#: ../midori/main.c:1362 msgid "An unknown error occured." msgstr "Συνέβει ένα άγνωστο σφάλμα." -#: ../midori/main.c:1370 +#: ../midori/main.c:1395 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Το στιγμιότυπο αποθηκεύτηκε στο: %s\n" -#: ../midori/main.c:1391 +#: ../midori/main.c:1417 msgid "Run ADDRESS as a web application" msgstr "Άνοιγμα της διεύθυνσης ως διαδικτυακή εφαρμογή" -#: ../midori/main.c:1391 +#: ../midori/main.c:1417 msgid "ADDRESS" msgstr "Διεύθυνση" -#: ../midori/main.c:1393 +#: ../midori/main.c:1419 msgid "Use FOLDER as configuration folder" msgstr "Χρήση φακέλου ως φάκελος ρύθμισης" -#: ../midori/main.c:1393 +#: ../midori/main.c:1419 msgid "FOLDER" msgstr "ΦΑΚΕΛΟΣ" -#: ../midori/main.c:1395 +#: ../midori/main.c:1422 msgid "Run the specified filename as javascript" msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript" -#: ../midori/main.c:1398 +#: ../midori/main.c:1426 msgid "Take a snapshot of the specified URI" msgstr "Αποθήκευση του συγκεκριμένου URI" -#: ../midori/main.c:1401 +#: ../midori/main.c:1429 +msgid "Execute the specified command" +msgstr "Εκτέλεση συγκεκριμένης εντολής" + +#: ../midori/main.c:1431 msgid "Display program version" msgstr "Προβολή έκδοσης προγράμματος" -#: ../midori/main.c:1403 +#: ../midori/main.c:1433 msgid "Addresses" msgstr "Διευθύνσεις" -#: ../midori/main.c:1446 +#: ../midori/main.c:1477 msgid "[Addresses]" msgstr "[Διευθύνσεις" -#: ../midori/main.c:1469 +#: ../midori/main.c:1500 msgid "Please report comments, suggestions and bugs to:" msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:" -#: ../midori/main.c:1471 +#: ../midori/main.c:1502 msgid "Check for new versions at:" msgstr "Έλεγχος για νέα έκδοση στο:" -#: ../midori/main.c:1548 +#: ../midori/main.c:1581 msgid "The specified configuration folder is invalid." msgstr "Η συγκεκριμένη ρύθμιση φακέλου είναι άκυρη." -#: ../midori/main.c:1583 +#: ../midori/main.c:1617 msgid "An instance of Midori is already running but not responding.\n" msgstr "Όλα τα στιγμιότυπα του Μιντόρι τρέχουν ήδη αλλά δεν ανταποκρίνονται.\n" -#: ../midori/main.c:1633 +#: ../midori/main.c:1667 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Οι μηχανές αναζήτησης δεν μπορούν να φορτωθούν. %s\n" -#: ../midori/main.c:1645 +#: ../midori/main.c:1679 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:1660 +#: ../midori/main.c:1694 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n" -#: ../midori/main.c:1673 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Τα απορρίμματα δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:1686 +#: ../midori/main.c:1720 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Το ιστορικό δεν μπορεί να φορτωθεί: %s\n" -#: ../midori/main.c:1698 +#: ../midori/main.c:1732 msgid "The following errors occured:" msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:" -#: ../midori/main.c:1714 +#: ../midori/main.c:1748 msgid "_Ignore" msgstr "Α_γνόησε" @@ -235,1209 +239,1227 @@ msgid "Malformed document." msgstr "Κακοσχηματισμένο έγγραφο." #: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:716 +#: ../midori/sokoke.c:700 #, c-format msgid "Writing failed." msgstr "Αποτυχία εγγραφής." -#: ../midori/midori-browser.c:287 -#: ../midori/midori-browser.c:3819 -#: ../midori/midori-browser.c:3825 +#: ../midori/midori-browser.c:296 +#: ../midori/midori-browser.c:4021 +#: ../midori/midori-browser.c:4027 msgid "Reload the current page" msgstr "Ανανέωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:298 -#: ../midori/midori-browser.c:3822 +#: ../midori/midori-browser.c:307 +#: ../midori/midori-browser.c:4024 msgid "Stop loading the current page" msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:360 +#: ../midori/midori-browser.c:368 #, c-format msgid "%d%% loaded" msgstr "%d%% φορτώθηκε" -#: ../midori/midori-browser.c:385 +#: ../midori/midori-browser.c:393 #, c-format msgid "Unexpected action '%s'." msgstr "Αναπάντεχη ενέργεια '%s'." -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:575 msgid "New folder" msgstr "Νέος φάκελος" -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:575 msgid "Edit folder" msgstr "Επεξεργασία φακέλου" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:577 msgid "New bookmark" msgstr "Νέος σελιδοδείκτης" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:577 msgid "Edit bookmark" msgstr "Επεξεργασία σελιδοδείκτη" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:607 msgid "_Title:" msgstr "_Τίτλος:" -#: ../midori/midori-browser.c:648 +#: ../midori/midori-browser.c:620 #: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Περιγραφή:" -#: ../midori/midori-browser.c:667 +#: ../midori/midori-browser.c:639 #: ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Διεύθυνση:" -#: ../midori/midori-browser.c:686 +#: ../midori/midori-browser.c:658 msgid "_Folder:" msgstr "_Φάκελος:" -#: ../midori/midori-browser.c:691 -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:663 +#: ../midori/midori-browser.c:704 msgid "Toplevel folder" msgstr "Αρχικός φάκελος" -#: ../midori/midori-browser.c:808 +#: ../midori/midori-browser.c:780 msgid "Save file as" msgstr "Αποθήκευση αρχείου ως" -#: ../midori/midori-browser.c:1119 +#: ../midori/midori-browser.c:1127 #, c-format msgid "The file %s has been downloaded." msgstr "Το αρχείο %s έχει κατέβει." -#: ../midori/midori-browser.c:1123 +#: ../midori/midori-browser.c:1131 msgid "Transfer completed" msgstr "Η μεταφορά ολοκληρώθηκε" -#: ../midori/midori-browser.c:1820 +#: ../midori/midori-browser.c:1272 +msgid "Save file" +msgstr "Αποθήκευση αρχείου" + +#: ../midori/midori-browser.c:1899 msgid "Open file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:3152 -#: ../panels/midori-bookmarks.c:778 -#: ../panels/midori-history.c:808 +#: ../midori/midori-browser.c:3290 +#: ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:812 msgid "Open all in _Tabs" msgstr "Άνοιγμα όλων σε _καρτέλες" -#: ../midori/midori-browser.c:3159 -#: ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:814 +#: ../midori/midori-browser.c:3297 +#: ../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:3162 -#: ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:816 +#: ../midori/midori-browser.c:3300 +#: ../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:3425 +#: ../midori/midori-browser.c:3600 msgid "Clear Private Data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3604 msgid "_Clear private data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:3441 +#: ../midori/midori-browser.c:3617 msgid "Clear the following data:" msgstr "Καθαρισμός των παρακάτω δεδομένων:" -#: ../midori/midori-browser.c:3449 -#: ../midori/midori-preferences.c:669 +#: ../midori/midori-browser.c:3627 +#: ../midori/midori-preferences.c:675 #: ../panels/midori-history.c:108 msgid "History" msgstr "Ιστορικό" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3632 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3637 msgid "'Flash' Cookies" msgstr "Άδειασμα των cookies" -#: ../midori/midori-browser.c:3458 +#: ../midori/midori-browser.c:3642 msgid "Website icons" msgstr "Εικονίδια ιστότοπων" -#: ../midori/midori-browser.c:3538 +#: ../midori/midori-browser.c:3647 +#: ../midori/sokoke.c:867 +msgid "_Closed Tabs and Windows" +msgstr "_Κλείσιμο των καρτέλων και των παραθύρων" + +#: ../midori/midori-browser.c:3730 msgid "A lightweight web browser." msgstr "Ένας ελαφρύς περιηγητής ιστού" -#: ../midori/midori-browser.c:3546 +#: ../midori/midori-browser.c:3738 msgid "translator-credits" msgstr "Ευάγγελος Μπαλάσκας 2008" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:3955 msgid "_File" msgstr "_Αρχείο" -#: ../midori/midori-browser.c:3753 +#: ../midori/midori-browser.c:3958 msgid "Open a new window" msgstr "Άνοιγμα ενός νέου παραθύρου" -#: ../midori/midori-browser.c:3756 +#: ../midori/midori-browser.c:3961 msgid "Open a new tab" msgstr "Άνοιγμα μίας νέας καρτέλας" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3964 msgid "Open a file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:3762 +#: ../midori/midori-browser.c:3967 msgid "Save to a file" msgstr "Αποθήκευση σε αρχείου" -#: ../midori/midori-browser.c:3764 -#: ../midori/midori-view.c:1256 +#: ../midori/midori-browser.c:3969 +#: ../midori/midori-view.c:1340 msgid "Add to Speed _dial" msgstr "Προσθήκη σε γρήγορη σ_ύνδεση" -#: ../midori/midori-browser.c:3765 +#: ../midori/midori-browser.c:3970 msgid "Add shortcut to speed dial" msgstr "Προσθήκη συντόμευσης σε γρήγορη σύνδεση" -#: ../midori/midori-browser.c:3767 +#: ../midori/midori-browser.c:3972 msgid "_Close Tab" msgstr "_Κλείσιμο καρτέλας" -#: ../midori/midori-browser.c:3768 +#: ../midori/midori-browser.c:3973 msgid "Close the current tab" msgstr "Κλείσιμο της τρέχουσας καρτέλας" -#: ../midori/midori-browser.c:3770 +#: ../midori/midori-browser.c:3975 msgid "C_lose Window" msgstr "Κ_λείσιμο παραθύρου" -#: ../midori/midori-browser.c:3771 +#: ../midori/midori-browser.c:3976 msgid "Close this window" msgstr "Κλείσιμο αυτού του παραθύρου" -#: ../midori/midori-browser.c:3774 +#: ../midori/midori-browser.c:3979 msgid "Print the current page" msgstr "Εκτύπωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:3777 +#: ../midori/midori-browser.c:3982 msgid "Quit the application" msgstr "Έξοδος από την εφαρμογή" -#: ../midori/midori-browser.c:3779 +#: ../midori/midori-browser.c:3984 msgid "_Edit" msgstr "_Επεξεργασία" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:3987 msgid "Cut the selected text" msgstr "Αποκοπή επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:3785 -#: ../midori/midori-browser.c:3788 +#: ../midori/midori-browser.c:3990 +#: ../midori/midori-browser.c:3993 msgid "Copy the selected text" msgstr "Αντιγραφή επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:3791 +#: ../midori/midori-browser.c:3996 msgid "Paste text from the clipboard" msgstr "Επικόλληση κειμένου από το πρόχειρο" -#: ../midori/midori-browser.c:3794 +#: ../midori/midori-browser.c:3999 msgid "Delete the selected text" msgstr "Διαγραφή του επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:3797 +#: ../midori/midori-browser.c:4002 msgid "Select all text" msgstr "Επιλογή όλου του κειμένου" -#: ../midori/midori-browser.c:3800 +#: ../midori/midori-browser.c:4005 msgid "Find a word or phrase in the page" msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:4007 msgid "Find _Next" msgstr "Εύρεση επ_όμενο" -#: ../midori/midori-browser.c:3803 +#: ../midori/midori-browser.c:4008 msgid "Find the next occurrence of a word or phrase" msgstr "Εύρεση της επόμενης ύπαρξης της λέξης ή της φράσης" -#: ../midori/midori-browser.c:3805 +#: ../midori/midori-browser.c:4010 msgid "Find _Previous" msgstr "Εύρεση _προηγούμενο" -#: ../midori/midori-browser.c:3806 +#: ../midori/midori-browser.c:4011 msgid "Find the previous occurrence of a word or phrase" msgstr "Εύρεση της προηγούμενης ύπαρξης της λέξης ή της φράσης" -#: ../midori/midori-browser.c:3809 -msgid "_Quick Find" -msgstr "_Έξοδος αναζήτησης" - -#: ../midori/midori-browser.c:3810 -msgid "Quickly jump to a word or phrase" -msgstr "Γρήγορα μεταπήδησε στον λέξη ή στην φράση" - -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:4015 msgid "Configure the application preferences" msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:4017 msgid "_View" msgstr "_Εμφάνιση" -#: ../midori/midori-browser.c:3816 +#: ../midori/midori-browser.c:4018 msgid "_Toolbars" msgstr "_Εργαλειοθήκες" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:4030 msgid "Increase the zoom level" msgstr "Αύξηση του επίπεδου εστίασης" -#: ../midori/midori-browser.c:3831 +#: ../midori/midori-browser.c:4033 msgid "Decrease the zoom level" msgstr "Μείωση του επιπέδου εστίασης" -#: ../midori/midori-browser.c:3834 +#: ../midori/midori-browser.c:4036 msgid "Reset the zoom level" msgstr "Επαναφορά του επιπέδου εστίασης" -#: ../midori/midori-browser.c:3835 +#: ../midori/midori-browser.c:4037 msgid "_Encoding" msgstr "_Κωδικοποίηση" -#: ../midori/midori-browser.c:3837 +#: ../midori/midori-browser.c:4039 msgid "_Automatic" msgstr "_Αυτόματα" -#: ../midori/midori-browser.c:3840 -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:4042 +#: ../midori/midori-websettings.c:212 msgid "Chinese (BIG5)" msgstr "Κινέζικα (BIG5)" -#: ../midori/midori-browser.c:3843 -#: ../midori/midori-websettings.c:205 -msgid "Japanese (SHIFT_JIS)" -msgstr "Ιαπωνικά (SHIFT_JIS)" +#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic +#: ../midori/midori-browser.c:4046 +msgid "Japanese (SHIFT__JIS)" +msgstr "Ιαπωνικά (SHIFT__JIS)" -#: ../midori/midori-browser.c:3846 -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-browser.c:4049 +#: ../midori/midori-websettings.c:214 msgid "Russian (KOI8-R)" msgstr "Ρωσικά (KOI8-R)" -#: ../midori/midori-browser.c:3849 -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-browser.c:4052 +#: ../midori/midori-websettings.c:215 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3852 -#: ../midori/midori-websettings.c:208 +#: ../midori/midori-browser.c:4055 +#: ../midori/midori-websettings.c:216 msgid "Western (ISO-8859-1)" msgstr "Δυτικά (ISO-8859-1)" -#: ../midori/midori-browser.c:3855 -#: ../midori/midori-websettings.c:209 -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-browser.c:4058 +#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:289 msgid "Custom..." msgstr "Προσαρμογή..." -#: ../midori/midori-browser.c:3858 -#: ../midori/midori-view.c:1275 -msgid "View _Source" -msgstr "Προβολή _κώδικα" +#: ../midori/midori-browser.c:4061 +#: ../midori/midori-view.c:1359 +msgid "View So_urce" +msgstr "Προβολή κ_ώδικα" -#: ../midori/midori-browser.c:3859 +#: ../midori/midori-browser.c:4062 msgid "View the source code of the page" msgstr "Προβολή του πηγαίου κώδικα αυτής της σελίδας" -#: ../midori/midori-browser.c:3861 +#: ../midori/midori-browser.c:4064 msgid "View Selection Source" msgstr "Προβολή του επιλεγμένου κώδικα" -#: ../midori/midori-browser.c:3862 +#: ../midori/midori-browser.c:4065 msgid "View the source code of the selection" msgstr "Προβολή του πηγαίου κώδικα του επιλεγμένου" -#: ../midori/midori-browser.c:3866 +#: ../midori/midori-browser.c:4069 msgid "Toggle fullscreen view" msgstr "Εναλλαγή σε πλήρη οθόνη" -#: ../midori/midori-browser.c:3868 +#: ../midori/midori-browser.c:4071 msgid "_Go" msgstr "_Μετάβαση" -#: ../midori/midori-browser.c:3871 +#: ../midori/midori-browser.c:4074 msgid "Go back to the previous page" msgstr "Μετάβαση στην προηγούμενη σελίδα" -#: ../midori/midori-browser.c:3874 +#: ../midori/midori-browser.c:4077 msgid "Go forward to the next page" msgstr "Μετάβαση στην επόμενη σελίδα" -#: ../midori/midori-browser.c:3877 +#: ../midori/midori-browser.c:4080 msgid "Go to your homepage" msgstr "Μετάβαση στην αρχική σελίδα" -#: ../midori/midori-browser.c:3879 +#: ../midori/midori-browser.c:4082 msgid "Empty Trash" msgstr "Άδειασμα αποριμμάτων" -#: ../midori/midori-browser.c:3880 +#: ../midori/midori-browser.c:4083 msgid "Delete the contents of the trash" msgstr "Διαγραφή των περιεχομένων των απορριμάτων" -#: ../midori/midori-browser.c:3882 -#: ../midori/midori-view.c:1233 -msgid "Undo Close Tab" -msgstr "Αναίρεση κλείσιμο καρτέλας" +#: ../midori/midori-browser.c:4085 +#: ../midori/midori-view.c:1317 +msgid "Undo _Close Tab" +msgstr "Αναίρεση κλ_είσιμο καρτέλας" -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:4086 msgid "Open the last closed tab" msgstr "Άνοιγμα της τελευταίας καρτέλας που έκλεισε" -#: ../midori/midori-browser.c:3887 -#: ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:4090 +#: ../panels/midori-bookmarks.c:231 msgid "Add a new bookmark" msgstr "Προσθήκη ενός νέου σελιδοδείκτη" -#: ../midori/midori-browser.c:3889 -#: ../panels/midori-bookmarks.c:259 -msgid "Add a new folder" -msgstr "Προσθήκη ενός νέου φακέλου" +#: ../midori/midori-browser.c:4092 +msgid "Add a new _folder" +msgstr "Προσθήκη ενός νέου φ_ακέλου" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:4093 msgid "Add a new bookmark folder" msgstr "Προσθήκη ενός νέου φακέλου σελιδοδεικτών" -#: ../midori/midori-browser.c:3891 +#: ../midori/midori-browser.c:4094 msgid "_Tools" msgstr "_Εργαλεία" -#: ../midori/midori-browser.c:3893 +#: ../midori/midori-browser.c:4096 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Διαχείριση των μηχανών αναζήτησης" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:4097 msgid "Add, edit and remove search engines..." msgstr "Προσθήκη, επεξεργασία και διαγραφή των μηχανών αναζήτησης..." -#: ../midori/midori-browser.c:3897 +#: ../midori/midori-browser.c:4100 msgid "_Clear Private Data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:3898 +#: ../midori/midori-browser.c:4101 msgid "Clear private data..." msgstr "Καθαρισμός προσωπικών δεδομένων..." -#: ../midori/midori-browser.c:3902 +#: ../midori/midori-browser.c:4105 msgid "_Previous Tab" msgstr "_Προηγούμενη καρτέλα" -#: ../midori/midori-browser.c:3903 +#: ../midori/midori-browser.c:4106 msgid "Switch to the previous tab" msgstr "Μετάβαση στην προηγούμενη καρτέλα" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4108 msgid "_Next Tab" msgstr "Επόμε_νη καρτέλα" -#: ../midori/midori-browser.c:3906 +#: ../midori/midori-browser.c:4109 msgid "Switch to the next tab" msgstr "Μετάβαση στην επόμενη καρτέλα" -#: ../midori/midori-browser.c:3908 +#: ../midori/midori-browser.c:4111 msgid "_Help" msgstr "_Βοήθεια" -#: ../midori/midori-browser.c:3910 +#: ../midori/midori-browser.c:4113 msgid "_Contents" msgstr "_Περιεχόμενα" -#: ../midori/midori-browser.c:3911 +#: ../midori/midori-browser.c:4114 msgid "Show the documentation" msgstr "Εμφάνιση της τεκμηρίωσης" -#: ../midori/midori-browser.c:3913 +#: ../midori/midori-browser.c:4116 msgid "_Frequent Questions" msgstr "Σ_υχνές ερωτήσεις" -#: ../midori/midori-browser.c:3914 +#: ../midori/midori-browser.c:4117 msgid "Show the Frequently Asked Questions" msgstr "Εμφάνιση των πιο συχνά ερωτηθέντων ερωτήσεων" -#: ../midori/midori-browser.c:3916 +#: ../midori/midori-browser.c:4119 msgid "_Report a Bug" msgstr "Α_ναφορά σφάλματος" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4120 msgid "Open Midori's bug tracker" msgstr "Άνοιγμα καταγραφής σφαλμάτων midori" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4123 msgid "Show information about the program" msgstr "Εμφάνιση πληροφοριών σχετικά με την εφαρμογή" -#: ../midori/midori-browser.c:3927 +#: ../midori/midori-browser.c:4130 msgid "P_rivate Browsing" msgstr "Π_ροσωπική περιήγηση" -#: ../midori/midori-browser.c:3928 +#: ../midori/midori-browser.c:4131 msgid "Don't save any private data while browsing" msgstr "Να μην γίνει αποθήκευση προσωπικών δεδομένων κατά την περιήγηση" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4136 msgid "_Menubar" msgstr "_Μπάρα μενού" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4137 msgid "Show menubar" msgstr "Προβολή μπάρας μενού" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4140 msgid "_Navigationbar" msgstr "_Μπάρα περιήγησης" -#: ../midori/midori-browser.c:3938 +#: ../midori/midori-browser.c:4141 msgid "Show navigationbar" msgstr "Εμφάνιση περιήγησης" -#: ../midori/midori-browser.c:3941 +#: ../midori/midori-browser.c:4144 msgid "Side_panel" msgstr "Πλαϊνό _ταμπλό" -#: ../midori/midori-browser.c:3942 +#: ../midori/midori-browser.c:4145 msgid "Show sidepanel" msgstr "Εμφάνιση πλαϊνού ταμπλό" -#: ../midori/midori-browser.c:3945 +#: ../midori/midori-browser.c:4148 msgid "_Bookmarkbar" msgstr "_Μπάρα σελιδοδείκτη" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4149 msgid "Show bookmarkbar" msgstr "Εμφάνιση μπάρα σελιδοδείκτη" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:4152 msgid "_Transferbar" msgstr "_Μπάρα μεταφορών" -#: ../midori/midori-browser.c:3950 +#: ../midori/midori-browser.c:4153 msgid "Show transferbar" msgstr "Εμφάνιση μπάρα μεταφορών" -#: ../midori/midori-browser.c:3953 +#: ../midori/midori-browser.c:4156 msgid "_Statusbar" msgstr "_Γραμμή κατάστασης" -#: ../midori/midori-browser.c:3954 +#: ../midori/midori-browser.c:4157 msgid "Show statusbar" msgstr "Εμφάνιση γραμμής κατάστασης" -#: ../midori/midori-browser.c:4389 +#: ../midori/midori-browser.c:4581 msgid "_Separator" msgstr "_Διαχωριστής" -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:4588 msgid "_Location..." msgstr "_Τοποθεσία:" -#: ../midori/midori-browser.c:4398 +#: ../midori/midori-browser.c:4590 msgid "Open a particular location" msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4614 msgid "_Web Search..." msgstr "_Αναζήτηση ιστού..." -#: ../midori/midori-browser.c:4422 +#: ../midori/midori-browser.c:4616 msgid "Run a web search" msgstr "Εκκίνηση μίας αναζήτησης ιστού" -#: ../midori/midori-browser.c:4443 +#: ../midori/midori-browser.c:4637 msgid "Reopen a previously closed tab or window" msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει" -#: ../midori/midori-browser.c:4458 +#: ../midori/midori-browser.c:4652 msgid "_Recently visited pages" msgstr "_Πρόσφατες επισκεπτόμενες σελίδες " -#: ../midori/midori-browser.c:4460 +#: ../midori/midori-browser.c:4654 msgid "Reopen pages that you visited earlier" msgstr "Ξανα-άνοιγμα σελίδων που επισκεφτήκατε νωρίτερα" -#: ../midori/midori-browser.c:4475 -#: ../midori/sokoke.c:872 +#: ../midori/midori-browser.c:4669 +#: ../midori/sokoke.c:856 msgid "_Bookmarks" msgstr "_Σελιδοδείκτες" -#: ../midori/midori-browser.c:4477 +#: ../midori/midori-browser.c:4671 msgid "Show the saved bookmarks" msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών" -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4686 msgid "_Window" msgstr "_Παράθυρο" -#: ../midori/midori-browser.c:4494 +#: ../midori/midori-browser.c:4688 msgid "Show a list of all open tabs" msgstr "Εμφάνιση μίας λίστας με όλα τις ανοιχτές καρτέλες" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4674 +#: ../midori/midori-browser.c:4863 msgid "_Inline Find:" msgstr "Ε_νσωματωμένη αναζήτηση:" -#: ../midori/midori-browser.c:4699 +#: ../midori/midori-browser.c:4888 msgid "Previous" msgstr "Προηγούμενο" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4893 msgid "Next" msgstr "Επόμενο" -#: ../midori/midori-browser.c:4709 +#: ../midori/midori-browser.c:4898 msgid "Match Case" msgstr "Ταίριασμα πεζών" -#: ../midori/midori-browser.c:4717 +#: ../midori/midori-browser.c:4906 msgid "Highlight Matches" msgstr "Τονισμός των ταιριασμάτων" -#: ../midori/midori-browser.c:4727 +#: ../midori/midori-browser.c:4916 msgid "Close Findbar" msgstr "Κλείσιμο μπάρας εύρεσης" -#: ../midori/midori-browser.c:4762 -#: ../extensions/cookie-manager.c:821 +#: ../midori/midori-browser.c:4951 +#: ../extensions/cookie-manager/cookie-manager-page.c:109 msgid "Delete All" msgstr "Διαγραφή όλων" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5265 #, c-format msgid "Unexpected setting '%s'" msgstr "Αναπάντεχη ρύθμιση '%s'" +#: ../midori/midori-locationaction.c:915 +#, c-format +msgid "Search with %s" +msgstr "Αναζήτηση με %s" + #: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "Αποσύνδεση επιλεγμένου ταμπλό από το παράθυρο" -#: ../midori/midori-panel.c:335 -msgid "Whether to detach the chosen panel from the window" -msgstr "Εάν θα αποσυνδέεται το επιλεγμένο ταμπλό από το παράθυρο" - -#: ../midori/midori-panel.c:345 -#: ../midori/midori-websettings.c:535 -msgid "Align sidepanel on the right" -msgstr "Ευθυγράμμιση πλαϊνού ταμπλό στα δεξιά" - -#: ../midori/midori-panel.c:347 -#: ../midori/midori-websettings.c:536 -msgid "Whether to align the sidepanel on the right" +#: ../midori/midori-panel.c:343 +#: ../midori/midori-panel.c:508 +msgid "Align sidepanel to the right" msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό ταμπλό στα δεξιά" -#: ../midori/midori-panel.c:357 -#: ../midori/midori-panel.c:358 +#: ../midori/midori-panel.c:353 +#: ../midori/midori-panel.c:354 msgid "Close panel" msgstr "Κλείσιμο ταμπλού" -#: ../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 "Εάν θα ευθυγραμμίζεται το πλαϊνό ταμπλό στα αριστερά" + +#: ../midori/midori-websettings.c:195 +#: ../midori/midori-view.c:2262 msgid "Blank page" msgstr "Κενή σελίδα" -#: ../midori/midori-websettings.c:188 -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:196 +#: ../midori/midori-websettings.c:563 msgid "Homepage" msgstr "Αρχική σελίδα" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:197 msgid "Last open pages" msgstr "Άνοιγμα τελευταίων σελίδων" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:213 +msgid "Japanese (SHIFT_JIS)" +msgstr "Ιαπωνικά (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:232 msgid "New tab" msgstr "Νέα καρτέλα" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:233 msgid "New window" msgstr "Νέο παράθυρο" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:234 msgid "Current tab" msgstr "Τρέχον καρτέλα" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:249 msgid "Default" msgstr "Προκαθορισμένο" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:250 msgid "Icons" msgstr "Εικονίδια" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:251 msgid "Text" msgstr "Κείμενο" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:252 msgid "Both" msgstr "Και τα δύο" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:253 msgid "Both horizontal" msgstr "Και τα δύο οριζόντια" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:268 msgid "All cookies" msgstr "Όλα τα cookies" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:269 msgid "Session cookies" msgstr "Cookies συνεδρίας" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:270 #: ../panels/midori-addons.c:94 msgid "None" msgstr "Κανένα" -#: ../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 "Απομνημόνευση μεγέθους τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:342 msgid "Whether to save the last window size" msgstr "Εάν θα αποθηκεύεται το μέγεθος του τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:350 msgid "Last window width" msgstr "Πλάτος τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:351 msgid "The last saved window width" msgstr "Το τελευταίο αποθηκευμένο πλάτος παραθύρου" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:359 msgid "Last window height" msgstr "Ύψος τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:360 msgid "The last saved window height" msgstr "Το τελευταίο ύψος αποθηκευμένου παραθύρου" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:385 msgid "Last panel position" msgstr "Θέση τελευταίου ταμπλό" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel position" msgstr "Η τελευταία αποθηκευμένη θέση ταμπλό" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:395 msgid "Last panel page" msgstr "Τελευταία σελίδα ταμπλό" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:396 msgid "The last saved panel page" msgstr "Η τελευταία αποθηκευμένη σελίδα ταμπλό" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:404 msgid "Last Web search" msgstr "Τελευταία αναζήτηση ιστού" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:405 msgid "The last saved Web search" msgstr "Η τελευταία αποθηκευμένη αναζήτηση ιστού" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:414 msgid "Show Menubar" msgstr "Εμφάνιση γραμμής μενού" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:415 msgid "Whether to show the menubar" msgstr "Εάν θα φαίνεται η μπάρα του μενού" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:423 msgid "Show Navigationbar" msgstr "Εμφάνιση της γραμμής πλοήγησης" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:424 msgid "Whether to show the navigationbar" msgstr "Εάν θα φαίνεται η γραμμή πλοήγησης" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:432 msgid "Show Bookmarkbar" msgstr "Εμφάνιση μπάρας σελιδοδεικτών" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:433 msgid "Whether to show the bookmarkbar" msgstr "Εάν θα φαίνεται η μπάρα των σελιλοδεικτών" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:441 msgid "Show Panel" msgstr "Εμφάνιση ταμπλό" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the panel" msgstr "Εάν θα φαίνεται το ταμπλό" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:457 msgid "Show Transferbar" msgstr "Εμφάνιση μπάρας μεταφορών" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the transferbar" msgstr "Εάν θα φαίνεται η μπάρα μεταφορών" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:466 msgid "Show Statusbar" msgstr "Εμφάνιση γραμμής κατάστασης" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the statusbar" msgstr "Εάν θα φαίνεται η γραμμή κατάστασης" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style" msgstr "Στυλ εργαλειοθήκης" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "Το στυλ της εργαλειοθήκης" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:493 msgid "Show progress in location entry" msgstr "Να εμφανίζεται η πρόοδος στην τοποθεσίας εισαγωγής" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:494 msgid "Whether to show loading progress in the location entry" msgstr "Εάν θα εμφανίζεται η φόρτωση προόδου στην τοποθεσία εισαγωγής" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:509 msgid "Search engines in location completion" msgstr "Μηχανές αναζήτησης στην τοποθεσία συμπλήρωσης" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:510 msgid "Whether to show search engines in the location completion" msgstr "Εάν θα φαίνονται οι μηχανές αναζήτησης στην τοποθεσία συμπλήρωσης" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:518 msgid "Toolbar Items" msgstr "Αντικείμενα εργαλειοθήκης" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:519 msgid "The items to show on the toolbar" msgstr "Τι αντικείμενα να εμφανίζονται στην εργαλειοθήκη" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:527 msgid "Compact Sidepanel" msgstr "Σύμπτυξη πλαϊνού ταμπλό" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:528 msgid "Whether to make the sidepanel compact" msgstr "Εάν θα γίνει σύμπτυξη του πλαϊνού ταμπλό" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:543 +msgid "Align sidepanel on the right" +msgstr "Ευθυγράμμιση πλαϊνού ταμπλό στα δεξιά" + +#: ../midori/midori-websettings.c:544 +msgid "Whether to align the sidepanel on the right" +msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό ταμπλό στα δεξιά" + +#: ../midori/midori-websettings.c:553 msgid "Load on Startup" msgstr "Να φορτώνεται στην εκκίνηση" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:554 msgid "What to load on startup" msgstr "Τι να φορτώνει κατά την εκκίνηση" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:564 msgid "The homepage" msgstr "Η αρχική σελίδα" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:579 msgid "Show crash dialog" msgstr "Εμφάνιση παραθύρου αποτυχίας" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:580 msgid "Show a dialog after Midori crashed" msgstr "Εμφάνιση διαλόγου μετά από αποτυχία" #. 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 "Εμφάνιση γρήγορης σύνδεσης σε νέες καρτέλες" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:597 msgid "Show speed dial in newly opened tabs" msgstr "Εμφάνιση γρήγορης σύνδεσης στις νέες ανοιχτές καρτέλες" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:605 msgid "Download Folder" msgstr "Φάκελος μεταφορών" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:606 msgid "The folder downloaded files are saved to" msgstr "Ο κατάλογος στον οποίο αποθηκεύονται τα αρχεία που κατεβαίνουν" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:625 msgid "Ask for the destination folder" msgstr "Ερώτηση για τον κατάλογο αποθήκευσης" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:626 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Εάν θα ρωτάει για τον κατάλογο αποθήκευσης όταν κατεβαίνει ένα αρχείο" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:645 msgid "Notify when a transfer has been completed" msgstr "Ειδοποίηση όταν μία μεταφορά έχει ολοκληρωθεί" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:646 msgid "Whether to show a notification when a transfer has been completed" msgstr "Εάν θα εμφανίζεται μία ειδοποίηση όταν ολοκληρωθεί μία μεταφορά" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:658 msgid "Download Manager" msgstr "Διαχειριστής μεταφορών" -#: ../midori/midori-websettings.c:651 +#: ../midori/midori-websettings.c:659 msgid "An external download manager" msgstr "Εξωτερικός διαχειριστής μεταφορών" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:667 msgid "Text Editor" msgstr "Κειμενογράφος" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:668 msgid "An external text editor" msgstr "Εξωτερικός κειμενογράφος" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:683 msgid "News Aggregator" msgstr "Διαχειριστής νέων" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:684 msgid "An external news aggregator" msgstr "Εξωτερικός διαχειριστής νέων" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:692 msgid "Location entry Search" msgstr "Διεύθυνση για αναζήτηση" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:693 msgid "The search to perform inside the location entry" msgstr "Η αναζήτηση να πραγματοποιηθεί εσωτερικά της τοποθεσίας εισαγωγής" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:701 msgid "Preferred Encoding" msgstr "Προτιμώμενη κωδικοποίηση" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:702 msgid "The preferred character encoding" msgstr "Η προτιμώμενη κωδικοποίηση χαρακτήρων" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:712 msgid "Always Show Tabbar" msgstr "Εμφάνιση πάντα της γραμμής καρτέλων" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:713 msgid "Always show the tabbar" msgstr "Εμφάνιση πάντα της μπάρας με τις καρτέλες" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:721 msgid "Close Buttons on Tabs" msgstr "Κουμπιά κλεισίματος στις καρτέλες" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:722 msgid "Whether tabs have close buttons" msgstr "Εάν οι καρτέλες θα έχουν κουμπί κλεισίματος" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:730 msgid "Open new pages in" msgstr "Άνοιγμα νέων σελίδων σε" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:731 msgid "Where to open new pages" msgstr "Που να ανοίγουν οι νέες σελίδες" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:740 msgid "Open external pages in" msgstr "Άνοιγμα εξωτερικών σελίδων σε" -#: ../midori/midori-websettings.c:733 +#: ../midori/midori-websettings.c:741 msgid "Where to open externally opened pages" msgstr "Που να ανοίγουν οι εξωτερικές ανοιγμένες σελίδες" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:754 msgid "Middle click opens Selection" msgstr "Το μεσαίο κλικ ανοίγει την Επιλογή" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:755 msgid "Load an address from the selection via middle click" msgstr "Φόρτωση μίας διεύθυνσης από την επιλογή μέσω του μεσαίου κλικ" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:763 msgid "Open tabs in the background" msgstr "Άνοιγμα των καρτελών στο παρασκήνιο" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:764 msgid "Whether to open new tabs in the background" msgstr "Εάν θα ανοίγονται νέες καρτέλες στο παρασκήνιο" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:772 msgid "Open Tabs next to Current" msgstr "Άνοιγμα των καρτελών δίπλα στο τρέχων" -#: ../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 "Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την τελευταία" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:781 msgid "Open popups in tabs" msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:782 msgid "Whether to open popup windows in tabs" msgstr "Εάν θα ανοίγονται τα αναδυόμενα παράθυρα σε καρτέλες" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:798 msgid "Zoom Text and Images" msgstr "Εστίαση κειμένου και εικόνων" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:799 msgid "Whether to zoom text and images" msgstr "Εάν θα εστιάζεται το κείμενο και οι εικόνες" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:814 msgid "Find inline while typing" msgstr "Ενσωματωμένη εύρεση κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:807 +#: ../midori/midori-websettings.c:815 msgid "Whether to automatically find inline while typing" msgstr "Εάν θα γίνεται αυτόματη ενσωματωμένη αναζήτηση κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:823 msgid "Accept cookies" msgstr "Αποδοχή cookies" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:824 msgid "What type of cookies to accept" msgstr "Τι τύπο cookies να γίνονται αποδεκτά" -#: ../midori/midori-websettings.c:825 +#: ../midori/midori-websettings.c:833 msgid "Original cookies only" msgstr "Μόνο πρωτότυπα cookies" -#: ../midori/midori-websettings.c:826 +#: ../midori/midori-websettings.c:834 msgid "Accept cookies from the original website only" msgstr "Αποδοχή cookies μόνο από πρωτότυπους ιστότοπους" -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:842 msgid "Maximum cookie age" msgstr "Μέγιστος χρόνος cookie" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:843 msgid "The maximum number of days to save cookies for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση των cookies" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:853 msgid "Remember last visited pages" msgstr "Απομνημόνευση των τελευταίων επισκεπτόμενων σελίδων" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:854 msgid "Whether the last visited pages are saved" msgstr "Εάν θα αποθηκεύονται οι τελευταίες επισκεπτόμενες σελίδες" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:862 msgid "Maximum history age" msgstr "Μέγιστο χρόνος ιστορικού" -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:863 msgid "The maximum number of days to save the history for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση του ιστορικού" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:871 msgid "Remember last form inputs" msgstr "Απομνημόνευση των τελευταίων εισαγωγών" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:872 msgid "Whether the last form inputs are saved" msgstr "Εάν θα αποθηκεύονται οι τελευταίες εισαγωγές φορμών" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:880 msgid "Remember last downloaded files" msgstr "Απομνημόνευση των τελευταίων αρχείων που κατέβηκαν" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:881 msgid "Whether the last downloaded files are saved" msgstr "Εάν θα αποθηκεύονται τα τελευταία αρχεία που κατέβηκαν" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:891 msgid "Proxy Server" msgstr "Διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:892 msgid "The proxy server used for HTTP connections" msgstr "Ο μεσολαβητής χρησιμοποιείται για http συνδέσεις" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:907 msgid "Detect proxy server automatically" msgstr "Αυτόματη εύρεση διακομιστή μεσολάβησης" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:908 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:916 +#: ../midori/midori-websettings.c:924 msgid "Identify as" msgstr "Αναγνώριση ως" -#: ../midori/midori-websettings.c:917 +#: ../midori/midori-websettings.c:925 msgid "What to identify as to web pages" msgstr "Με τι να αναγνωρίζεται στις σελίδες ιστού" -#: ../midori/midori-websettings.c:933 +#: ../midori/midori-websettings.c:941 msgid "Identification string" msgstr "Αλφαριθμητικό αναγνώρισης" -#: ../midori/midori-websettings.c:934 +#: ../midori/midori-websettings.c:942 msgid "The application identification string" msgstr "Το αλφαριθμητικό αναγνώρισης της εφαρμογής" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:950 msgid "Cache size" msgstr "Μέγεθος προσωρινής μνήμης" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:951 msgid "The allowed size of the cache" msgstr "Το επιτρεπόμενο μέγεθος της προσωρινής μνήμης" -#: ../midori/midori-view.c:686 +#: ../midori/midori-websettings.c:966 +msgid "Clear private data" +msgstr "Καθαρισμός προσωπικών δεδομένων" + +#: ../midori/midori-websettings.c:967 +msgid "The private data selected for deletion" +msgstr "Τα προσωπικά δεδομένα που επιλέχθηκαν για διαγραφή" + +#: ../midori/midori-view.c:749 #, 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:688 -#: ../midori/midori-view.c:2701 +#: ../midori/midori-view.c:751 +#: ../midori/midori-view.c:2807 #: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "Σφάλμα" -#: ../midori/midori-view.c:691 +#: ../midori/midori-view.c:754 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:721 -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:784 +#: ../midori/midori-view.c:2811 #, c-format msgid "Not found - %s" msgstr "Δεν βρέθηκε - %s" -#: ../midori/midori-view.c:1095 +#: ../midori/midori-view.c:1182 msgid "Open _Link" msgstr "Άνοιγμα _συνδέσμου" -#: ../midori/midori-view.c:1097 +#: ../midori/midori-view.c:1184 msgid "Open Link in New _Tab" msgstr "Άνοιγμα συνδέσμου σε νέα κ_αρτέλα" -#: ../midori/midori-view.c:1114 +#: ../midori/midori-view.c:1201 msgid "Open Link in New _Window" msgstr "Άνοιγμα συνδέσμου σε νέο _παραθύρο" -#: ../midori/midori-view.c:1123 +#: ../midori/midori-view.c:1207 msgid "_Download Link destination" msgstr "Κ_ατέβασμα συνδέσμου προορισμού" -#: ../midori/midori-view.c:1129 +#: ../midori/midori-view.c:1213 msgid "_Save Link destination" msgstr "Απ_οθήκευση συνδέσμου προορισμού" -#: ../midori/midori-view.c:1138 +#: ../midori/midori-view.c:1222 msgid "Download with Download _Manager" msgstr "Κατέβασμα με τον διαχειριστή μεταφορών" -#: ../midori/midori-view.c:1167 +#: ../midori/midori-view.c:1251 msgid "Search _with" msgstr "Αναζήτηση _με" -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1279 msgid "_Search the Web" msgstr "_Αναζήτηση στον ιστό" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1289 msgid "Open Address in New _Tab" msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα" -#: ../midori/midori-view.c:1372 +#: ../midori/midori-view.c:1456 msgid "Open or download file" msgstr "Άνοιγμα ή κατέβασμα αρχείου" -#: ../midori/midori-view.c:1389 +#: ../midori/midori-view.c:1473 #, c-format msgid "File Type: '%s'" msgstr "Τύπος αρχείου: '%s'" -#: ../midori/midori-view.c:1392 +#: ../midori/midori-view.c:1476 #, 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:1396 +#: ../midori/midori-view.c:1480 #, c-format msgid "Open %s" msgstr "Άνοιγμα %s" -#: ../midori/midori-view.c:1816 +#: ../midori/midori-view.c:1898 #, c-format msgid "Inspect page - %s" msgstr "Εξέταση σελίδα -%s" -#: ../midori/midori-view.c:2001 -#: ../midori/midori-view.c:2002 -msgid "Search" -msgstr "Αναζήτηση" +#: ../midori/midori-view.c:2088 +msgid "Speed dial" +msgstr "Γρήγορη σύνδεση" -#: ../midori/midori-view.c:2003 +#: ../midori/midori-view.c:2089 msgid "Click to add a shortcut" msgstr "Κάντε click για προσθήκη συντόμευσης" -#: ../midori/midori-view.c:2004 +#: ../midori/midori-view.c:2090 msgid "Enter shortcut address" msgstr "Εισάγεται διεύθυνση συντόμευσης" -#: ../midori/midori-view.c:2005 +#: ../midori/midori-view.c:2091 msgid "Enter shortcut title" msgstr "Εισάγετε τίτλο συντόμευσης" -#: ../midori/midori-view.c:2006 +#: ../midori/midori-view.c:2092 msgid "Are you sure you want to delete this shortcut?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την συντόμευση;" -#: ../midori/midori-view.c:2038 +#: ../midori/midori-view.c:2122 #, c-format msgid "Document cannot be displayed" msgstr "Το αρχείο δεν μπορεί να εμφανιστεί" -#: ../midori/midori-view.c:2055 +#: ../midori/midori-view.c:2139 #, c-format msgid "No documentation installed" msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση" @@ -1490,166 +1512,171 @@ msgstr "Το προκαθορισμένο μέγεθος γραμματοσει msgid "Fixed-width Font Family" msgstr "Σταθερού-μεγέθους οικογένεια γραμματοσειράς" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:457 msgid "The font family used to display fixed-width text" msgstr "Η οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση σταθερού μεγέθους κειμένου" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "Το μέγεθος της γραμματοσειράς που χρησιμοποιείται για την εμφάνιση κειμένου σταθερού μεγέθους" + +#: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" msgstr "Ελάχιστο μέγεθος γραμματοσειράς" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" msgstr "Το ελάχιστο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:473 msgid "Encoding" msgstr "Κωδικοποίηση" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" msgstr "Η προτιμώμενη κωδικοποίηση χαρακτήρων προς χρήση" #. Page "Behavior" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "Συμπεριφορά" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:484 msgid "Features" msgstr "Χαρακτηριστικά" -#: ../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 "Αυτόματη φόρτωση εικόνων" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:488 msgid "Load and display images automatically" msgstr "Αυτόματη φόρτωση και εμφάνιση εικόνων" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:491 msgid "Shrink images automatically" msgstr "Αυτόματη σμίκρυνσης εικόνων" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:492 msgid "Automatically shrink standalone images to fit" msgstr "Αυτόματη σμίκρυνση αυτόνομων εικόνων για ταίριασμα" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:495 msgid "Print background images" msgstr "Εκτύπωση εικόνων παρασκηνίου" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:496 msgid "Whether background images should be printed" msgstr "Εάν θα τυπώνονται οι εικόνες παρασκηνίου" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:499 msgid "Resizable text areas" msgstr "Αυξομείωση περιοχών κειμένου" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:500 msgid "Whether text areas are resizable" msgstr "Εάν οι περιοχές κειμένου μπορούν να αλλάζουν μέγεθος" -#: ../midori/midori-preferences.c:498 -#: ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:503 +#: ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Ενεργοποίηση σεναρίων" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:504 msgid "Enable embedded scripting languages" msgstr "Ενεργοποίηση ενσωματωμένων γλωσσών κειμένου" -#: ../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 "Ενεργοποίηση αρθρωμάτων netscape" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:508 msgid "Enable embedded Netscape plugin objects" msgstr "Ενεργοποίηση ενσωματωμένων αρθρωμάτων netscape" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:511 msgid "Enforce 96 dots per inch" msgstr "Επιβολή 96 dots ανά ίντσα" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:512 msgid "Enforce a video dot density of 96 DPI" msgstr "Επιβολή της πυκνότητας βίντεο dot στα 96DPI" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:515 msgid "Enable developer tools" msgstr "Ενεργοποίηση εργαλείων ανάπτυξης" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:516 msgid "Enable special extensions for developers" msgstr "Ενεργοποίηση συγκεκριμένων επεκτάσεων για προγραμματιστές" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:523 msgid "Spell Checking" msgstr "Ορθογραφία πληκτρολόγησης" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:526 msgid "Enable Spell Checking" msgstr "Ενεργοποίηση ορθογραφίας" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:527 msgid "Enable spell checking while typing" msgstr "Ενεργοποίηση ορθογραφίας κατά την πληκτρολόγηση" -#: ../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 "Μία διαχωρισμένη λίστα με τις γλώσσες που μπορείτε να χρησιμοποιήσετε κατά την ορθογραφία πληκτρολόγησης, για παράδειγμα \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:536 msgid "Interface" msgstr "Διεπαφή" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:537 msgid "Navigationbar" msgstr "Γραμμή πλοήγησης" -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:548 msgid "Browsing" msgstr "Περιήγηση" #. Page "Applications" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:578 msgid "Applications" msgstr "Εφαρμογές" -#: ../midori/midori-preferences.c:573 +#: ../midori/midori-preferences.c:579 msgid "External applications" msgstr "Εξωτερικές εφαρμογές" #. 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 "Δίκτυο" -#: ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:653 msgid "MB" msgstr "ΜΒ" #. Page "Privacy" -#: ../midori/midori-preferences.c:652 +#: ../midori/midori-preferences.c:658 msgid "Privacy" msgstr "Προσωπικό απόρρητο" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:659 msgid "Web Cookies" msgstr "Cookies ιστού" -#: ../midori/midori-preferences.c:666 -#: ../midori/midori-preferences.c:676 +#: ../midori/midori-preferences.c:672 +#: ../midori/midori-preferences.c:682 msgid "days" msgstr "ημέρες" #: ../midori/midori-searchaction.c:484 -#: ../katze/katze-arrayaction.c:314 +#: ../katze/katze-arrayaction.c:331 msgid "Empty" msgstr "Άδειο" @@ -1673,73 +1700,64 @@ msgstr "_Εικονίδιο:" msgid "_Token:" msgstr "_Μορφότυπο:" -#: ../midori/midori-searchaction.c:1195 +#: ../midori/midori-searchaction.c:1209 msgid "Manage Search Engines" msgstr "Διαχείριση των μηχανών αναζήτησης" -#: ../midori/midori-searchaction.c:1292 +#: ../midori/midori-searchaction.c:1308 msgid "Use as _default" msgstr "Χρήση ως _προκαθορισμένο" -#: ../midori/sokoke.c:162 -#: ../midori/sokoke.c:174 +#: ../midori/sokoke.c:172 +#: ../midori/sokoke.c:184 msgid "Could not run external program." msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα." -#. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:520 -msgid "Warning: You are using a superuser account!" -msgstr "Προειδοποίηση: Χρησιμοποιείται λογαριασμό με δικαιώματα διαχειριστή" - -#: ../midori/sokoke.c:871 +#: ../midori/sokoke.c:855 msgid "_Bookmark" msgstr "_Σελιδοδείκτης" -#: ../midori/sokoke.c:873 -msgid "_Add Bookmark" -msgstr "_Προσθήκη σελιδοδείκτη" +#: ../midori/sokoke.c:857 +msgid "Add Boo_kmark" +msgstr "Προσθήκη σ_ελιδοδείκτη" -#: ../midori/sokoke.c:874 +#: ../midori/sokoke.c:858 msgid "_Console" msgstr "_Τερματικό" -#: ../midori/sokoke.c:875 +#: ../midori/sokoke.c:859 msgid "_Extensions" msgstr "_Επεκτάσεις" -#: ../midori/sokoke.c:876 +#: ../midori/sokoke.c:860 msgid "_History" msgstr "_Ιστορικό" -#: ../midori/sokoke.c:877 +#: ../midori/sokoke.c:861 msgid "_Homepage" msgstr "_Αρχική σελίδα" -#: ../midori/sokoke.c:878 +#: ../midori/sokoke.c:862 msgid "_Userscripts" msgstr "_Σενάρια χρήστη" -#: ../midori/sokoke.c:879 +#: ../midori/sokoke.c:863 msgid "User_styles" msgstr "_Θέματα χρήστη" -#: ../midori/sokoke.c:880 +#: ../midori/sokoke.c:864 msgid "New _Tab" msgstr "Νέα _καρτέλα" -#: ../midori/sokoke.c:881 +#: ../midori/sokoke.c:865 msgid "_Transfers" msgstr "_Μεταφορές" -#: ../midori/sokoke.c:882 +#: ../midori/sokoke.c:866 msgid "Netscape p_lugins" msgstr "Α_ρθρωμάτων netscape" -#: ../midori/sokoke.c:883 -msgid "_Closed Tabs and Windows" -msgstr "_Κλείσιμο των καρτέλων και των παραθύρων" - -#: ../midori/sokoke.c:884 +#: ../midori/sokoke.c:868 msgid "New _Window" msgstr "Νέο _παράθυρο" @@ -1753,39 +1771,23 @@ msgstr "Σενάρια χρηστών" msgid "Userstyles" msgstr "Θέματα χρήστη" -#: ../panels/midori-addons.c:927 -#: ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "_Ενεργοποίηση" - -#: ../panels/midori-addons.c:928 -#: ../panels/midori-extensions.c:145 -msgid "Enable" -msgstr "Ενεργοποίηση" - -#: ../panels/midori-addons.c:937 -#: ../panels/midori-extensions.c:154 -msgid "_Disable" -msgstr "_Απενεργοποίηση" - -#: ../panels/midori-addons.c:938 -#: ../panels/midori-extensions.c:155 -msgid "Disable" -msgstr "Απενεργοποίηση" - -#: ../panels/midori-bookmarks.c:107 +#: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: ../panels/midori-bookmarks.c:238 +#: ../panels/midori-bookmarks.c:239 msgid "Edit the selected bookmark" msgstr "Επεξεργασία του επιλεγμένου σελιδοδείκτη" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" msgstr "Διαγραφή του επιλεγμένου σελιδοδείκτη" -#: ../panels/midori-bookmarks.c:591 +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "Προσθήκη ενός νέου φακέλου" + +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Διαχωριστικό" @@ -1793,7 +1795,7 @@ msgstr "Διαχωριστικό" msgid "Console" msgstr "Τερματικό" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Επεκτάσεις" @@ -1813,37 +1815,43 @@ msgstr "Διαγραφή του επιλεγμένου αντικειμένου msgid "Clear the entire history" msgstr "Καθαρισμός ολόκληρου του ιστορικού" -#: ../panels/midori-history.c:599 +#: ../panels/midori-history.c:601 msgid "A week ago" msgstr "Μια βδομάδα πριν" -#: ../panels/midori-history.c:604 +#: ../panels/midori-history.c:606 #, c-format msgid "%d day ago" -msgstr "%d μέρες πριν" +msgid_plural "%d days ago" +msgstr[0] "%d μέρα πριν" +msgstr[1] "%d μέρες πριν" -#: ../panels/midori-history.c:605 -#, c-format -msgid "%d days ago" -msgstr "%d μέρες πριν" - -#: ../panels/midori-history.c:612 +#: ../panels/midori-history.c:614 msgid "Today" msgstr "Σήμερα" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:616 msgid "Yesterday" msgstr "Χθες" #: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "Αρθρωμάτων netscape" -#: ../panels/midori-transfers.c:256 +#: ../panels/midori-transfers.c:271 #, c-format msgid "%s of %s" msgstr "%s από %s" +#: ../panels/midori-transfers.c:479 +msgid "Open Destination _Folder" +msgstr "Άνοιγμα φακέλου προορισμού" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "Αντιγραφή τοποθεσίας σ_υνδέσμου" + #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "Απαιτείται αυθεντικοποίηση" @@ -1878,21 +1886,37 @@ msgstr "Το εικονίδιο Stock '%s' δεν μπορεί να φορτωθ msgid "Animation frames are broken" msgstr "Τα κινούμενα γραφικά πλαίσια δεν λειτουργούν" -#: ../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 "Η ιδιότητα '%s' δεν είναι έγκυρη για το %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 "Επιλογή αρχείου" -#: ../katze/katze-utils.c:230 +#: ../katze/katze-utils.c:250 msgid "Choose folder" msgstr "Επιλογή φακέλου" +#: ../extensions/adblock.c:78 +msgid "Configure Advertisement filters" +msgstr "Ρύθμιση φίλτρων διαφημίσεων" + +#: ../extensions/adblock.c:214 +msgid "Configure _Advertisement filters..." +msgstr "Ρύθμιση φίλτρων δ_ιαφημίσεων..." + +#: ../extensions/adblock.c:374 +msgid "Advertisement blocker" +msgstr "Εμποδιστής διαφημίσεων" + +#: ../extensions/adblock.c:375 +msgid "Block advertisements according to a filter list" +msgstr "Μπλόκαρε διαφημίσεις σύμφωνα με μία λίστα με φίλτρα" + #: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "Ευκρινές αποχρώσεις καρτελών" @@ -1905,11 +1929,40 @@ msgstr "Χρωματιστές καρτέλες" msgid "Tint each tab distinctly" msgstr "Ευκρινές αποχρώσεις σε κάθε καρτέλα" -#: ../extensions/cookie-manager.c:201 +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "Διαχειριστής cookie" + +#: ../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 "Διαγράφει όλα τα cookies που φαίνονται. Εάν ένα φίλτρο έχει δοθεί, μόνο τα cookies που ταιριάζουν στο φίλτρο θα διαγραφούν." + +#: ../extensions/cookie-manager/cookie-manager-page.c:126 +msgid "Expand All" +msgstr "Ανάπτυξη όλων" + +#: ../extensions/cookie-manager/cookie-manager-page.c:133 +msgid "Collapse All" +msgstr "Μάζεμα όλων" + +#: ../extensions/cookie-manager/cookie-manager-page.c:460 +msgid "Do you really want to delete all cookies?" +msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα cookies;" + +#: ../extensions/cookie-manager/cookie-manager-page.c:462 +msgid "Question" +msgstr "Ερώτηση" + +#: ../extensions/cookie-manager/cookie-manager-page.c:471 +msgid "Only cookies which match the filter will be deleted." +msgstr "Μόνο τα cookies που ταιριάζουν στο φίλτρο θα διαγραφούν." + +#: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" msgstr "Στο τέλος της συνεδρίας" -#: ../extensions/cookie-manager.c:204 +#: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format msgid "" "Host: %s\n" @@ -1926,68 +1979,39 @@ msgstr "" "Ασφάλεια: %s\n" "Λήγει: %s" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" msgstr "Ναι" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" msgstr "Όχι" -#: ../extensions/cookie-manager.c:493 -msgid "Do you really want to delete all cookies?" -msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα cookies;" - -#: ../extensions/cookie-manager.c:495 -msgid "Question" -msgstr "Ερώτηση" - -#: ../extensions/cookie-manager.c:504 -msgid "Only cookies which match the filter will be deleted." -msgstr "Μόνο τα cookies που ταιριάζουν στο φίλτρο θα διαγραφούν." - -#: ../extensions/cookie-manager.c:682 +#: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" msgstr "Όνομα" -#: ../extensions/cookie-manager.c:742 +#: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" msgstr "_Ανάπτυξη όλων" -#: ../extensions/cookie-manager.c:750 +#: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" msgstr "_Μάζεμα όλων" -#: ../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 "Διαγράφει όλα τα cookies που φαίνονται. Εάν ένα φίλτρο έχει δοθεί, μόνο τα cookies που ταιριάζουν στο φίλτρο θα διαγραφούν." - -#: ../extensions/cookie-manager.c:838 -msgid "Expand All" -msgstr "Ανάπτυξη όλων" - -#: ../extensions/cookie-manager.c:845 -msgid "Collapse All" -msgstr "Μάζεμα όλων" - -#: ../extensions/cookie-manager.c:876 +#: ../extensions/cookie-manager/cookie-manager-page.c:923 msgid "Filter:" msgstr "Φίλτρο:" -#: ../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 "Εισαγωγή ενός αλφαριθμητικού φίλτρου για να φαίνονται μόνο τα cookies που το όνομα ή το πεδίο τομέα ταιριάζει με το φίλτρο που εισάγεται" -#: ../extensions/cookie-manager.c:916 -#: ../extensions/cookie-manager.c:964 -msgid "Cookie Manager" -msgstr "Διαχειριστής cookie" - -#: ../extensions/cookie-manager.c:948 +#: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" msgstr "_Διαχειριστής cookie" -#: ../extensions/cookie-manager.c:965 +#: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" msgstr "Λίστα, εμφάνιση και διαγραφή cookies" @@ -2022,17 +2046,17 @@ msgstr "Διαγραφή ροής" msgid "_Feeds" msgstr "_Ροές" -#: ../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 "Αποτυχία εύρεσης root στοιχείου στα δεδομένα XML ροής." -#: ../extensions/feed-panel/feed-parse.c:215 +#: ../extensions/feed-panel/feed-parse.c:225 #, c-format msgid "Unsupported feed format." msgstr "Μορφή ροής που δεν υποστηρίζεται" -#: ../extensions/feed-panel/feed-parse.c:245 +#: ../extensions/feed-panel/feed-parse.c:255 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Αποτυχία επεξεργασίας της XML ροής: %s" @@ -2045,11 +2069,11 @@ msgstr "Αποτυχία εύρεσης στοιχείου \"channel\" στα δ msgid "Unsupported RSS version found." msgstr "Βρέθηκε έκδοση RSS που δεν υποστηρίζεται." -#: ../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 "Αποτυχία εύρεσης απαιτούμενου στοιχείου RSS \"item\" στα 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 "Αποτυχία εύρεσης απαιτούμενου στοιχείου RSS \"channel\" στα XML δεδομένα." @@ -2075,11 +2099,11 @@ msgstr "Ταμπλό ροής" msgid "Read Atom/ RSS feeds" msgstr "Ανάγνωση Atom / RSS ροών" -#: ../extensions/mouse-gestures/main.c:216 +#: ../extensions/mouse-gestures/main.c:236 msgid "Mouse Gestures" msgstr "Κινήσεις ποντικιού" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures/main.c:237 msgid "Control Midori by moving the mouse" msgstr "Χειρισμός του midori μετακινώντας το ποντίκι" @@ -2093,14 +2117,58 @@ msgstr "Αποθήκευση Σελίδων" msgid "_Pageholder" msgstr "_Αποθήκευση σελίδων" -#: ../extensions/statusbar-features.c:104 +#: ../extensions/shortcuts.c:156 +msgid "Configure Keyboard shortcuts" +msgstr "Ρύθμιση συντομεύσεων πληκτρολογίου" + +#: ../extensions/shortcuts.c:253 +msgid "Configure Sh_ortcuts..." +msgstr "Ρύθμιση σ_υντομεύσεων ..." + +#: ../extensions/shortcuts.c:285 +msgid "Shortcuts" +msgstr "Συντομεύσεις" + +#: ../extensions/shortcuts.c:286 +msgid "View and edit keyboard shortcuts" +msgstr "Εμφάνιση και επεξεργασία συντομεύσεων πληκτρολογίου" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "Εικόνες" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "Σενάρια" + +#: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" msgstr "Γραμμή κατάστασης χαρακτηριστικών" -#: ../extensions/statusbar-features.c:105 +#: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" msgstr "Εύκολη εναλλαγή χαρακτηριστικών στις ιστοσελίδες ενεργοποίηση και απενεργοποίηση" +#~ msgid "_Quick Find" +#~ msgstr "_Έξοδος αναζήτησης" +#~ msgid "Quickly jump to a word or phrase" +#~ msgstr "Γρήγορα μεταπήδησε στον λέξη ή στην φράση" +#~ msgid "Whether to detach the chosen panel from the window" +#~ msgstr "Εάν θα αποσυνδέεται το επιλεγμένο ταμπλό από το παράθυρο" +#~ msgid "Search" +#~ msgstr "Αναζήτηση" +#~ msgid "Warning: You are using a superuser account!" +#~ msgstr "Προειδοποίηση: Χρησιμοποιείται λογαριασμό με δικαιώματα διαχειριστή" +#~ msgid "_Enable" +#~ msgstr "_Ενεργοποίηση" +#~ msgid "Enable" +#~ msgstr "Ενεργοποίηση" +#~ msgid "_Disable" +#~ msgstr "_Απενεργοποίηση" +#~ msgid "Disable" +#~ msgstr "Απενεργοποίηση" +#~ msgid "%d days ago" +#~ msgstr "%d μέρες πριν" #~ msgid "P_lugins" #~ msgstr "Αρ_θρώματα" #~ msgid "Plugins" @@ -2129,8 +2197,4 @@ msgstr "Εύκολη εναλλαγή χαρακτηριστικών στις ι #~ msgstr "%s δεν μπορεί να οριστεί στο %s.%s" #~ msgid "%s.%s cannot be accessed" #~ msgstr "%s.%s δεν μπορεί να προσπελαστεί" -#~ msgid "Images" -#~ msgstr "Εικόνες" -#~ msgid "Scripts" -#~ msgstr "Σενάρια" diff --git a/po/en_GB.po b/po/en_GB.po index 0a928471..84b14b36 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.2\n" +"Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-01 20:25+0100\n" +"POT-Creation-Date: 2009-07-20 01:57+0200\n" "PO-Revision-Date: 2008-11-29 23:39+0100\n" "Last-Translator: Abigail Brady \n" "Language-Team: British English \n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Lightweight web browser" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1950 ../midori/main.c:2056 -#: ../midori/main.c:2065 ../midori/main.c:2076 -#: ../midori/midori-websettings.c:259 +#: ../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 msgid "Midori" msgstr "Midori" @@ -30,1446 +30,1733 @@ msgstr "Midori" msgid "Web Browser" msgstr "Web Browser" -#: ../midori/main.c:90 -msgid "_Bookmark" -msgstr "_Bookmark" - -#: ../midori/main.c:91 ../midori/midori-browser.c:3830 -msgid "_Bookmarks" -msgstr "_Bookmarks" - -#: ../midori/main.c:92 -msgid "_Add Bookmark" -msgstr "_Add Bookmark" - -#: ../midori/main.c:93 -msgid "_Console" -msgstr "_Console" - -#: ../midori/main.c:94 -msgid "_Extensions" -msgstr "_Extensions" - -#: ../midori/main.c:95 -msgid "_History" -msgstr "_History" - #: ../midori/main.c:96 -msgid "_Homepage" -msgstr "_Homepage" - -#: ../midori/main.c:97 -msgid "_Userscripts" -msgstr "_Userscripts" - -#: ../midori/main.c:98 -msgid "User_styles" -msgstr "User_styles" - -#: ../midori/main.c:99 -msgid "New _Tab" -msgstr "New _Tab" - -#: ../midori/main.c:100 -msgid "_Transfers" -msgstr "_Transfers" - -#: ../midori/main.c:101 -msgid "_Closed Tabs and Windows" -msgstr "_Closed Tabs and Windows" - -#: ../midori/main.c:102 -msgid "New _Window" -msgstr "New _Window" - -#: ../midori/main.c:158 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "The configuration couldn't be loaded: %s\n" -#: ../midori/main.c:213 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Value '%s' is invalid for %s" -#: ../midori/main.c:220 ../midori/main.c:290 +#: ../midori/main.c:158 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Invalid configuration value '%s'" -#: ../midori/main.c:532 -msgid "File not found." -msgstr "File not found." - -#: ../midori/main.c:540 ../midori/main.c:549 -msgid "Malformed document." -msgstr "Malformed document." - -#: ../midori/main.c:571 +#: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" msgstr "Failed to open database: %s\n" -#: ../midori/main.c:603 -#, fuzzy, c-format +#: ../midori/main.c:382 +#, c-format msgid "Failed to execute database statement: %s\n" -msgstr "Failed to open database: %s\n" +msgstr "" -#: ../midori/main.c:657 +#: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Failed to remove history item: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" msgstr "Failed to clear history: %s\n" -#: ../midori/main.c:704 ../midori/main.c:738 ../midori/main.c:754 +#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" msgstr "Failed to add history item: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:934 +#: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Failed to remove old history items: %s\n" -#: ../midori/main.c:962 +#: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "The configuration couldn't be saved. %s" -#: ../midori/main.c:991 +#: ../midori/main.c:779 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "The search engines couldn't be saved. %s" -#: ../midori/main.c:1121 ../midori/sokoke.c:531 -#, c-format -msgid "Writing failed." -msgstr "Writing failed." - -#: ../midori/main.c:1142 ../midori/main.c:1169 ../midori/main.c:1197 +#: ../midori/main.c:798 ../midori/main.c:826 ../midori/main.c:855 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "The bookmarks couldn't be saved. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1221 ../midori/main.c:1245 +#: ../midori/main.c:878 ../midori/main.c:901 #, c-format msgid "The trash couldn't be saved. %s" msgstr "The wastebasket couldn't be saved. %s" -#: ../midori/main.c:1271 ../midori/midori-preferences.c:386 -msgid "Transfers" -msgstr "Transfers" - -#: ../midori/main.c:1312 +#: ../midori/main.c:974 #, c-format msgid "The session couldn't be saved. %s" msgstr "The session couldn't be saved. %s" -#: ../midori/main.c:1636 -msgid "Authentication Required" -msgstr "Authentication Required" - -#: ../midori/main.c:1652 +#: ../midori/main.c:1101 msgid "" -"A username and a password are required\n" -"to open this location:" +"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 "" -"A username and a password are required\n" -"to open this location:" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." -#: ../midori/main.c:1666 -msgid "Username" -msgstr "Username" - -#: ../midori/main.c:1677 -msgid "Password" -msgstr "Password" - -#: ../midori/main.c:1783 -msgid "" -"Midori seems to have crashed the last time it was opened. If this " -"happened repeatedly, try one of the following options to solve the problem." -msgstr "" -"Midori seems to have crashed the last time it was opened. If this " -"happened repeatedly, try one of the following options to solve the problem." - -#: ../midori/main.c:1798 +#: ../midori/main.c:1116 msgid "Modify _preferences" msgstr "Modify _preferences" -#: ../midori/main.c:1802 +#: ../midori/main.c:1120 msgid "Reset the last _session" msgstr "Reset the last _session" -#: ../midori/main.c:1807 +#: ../midori/main.c:1125 msgid "Disable all _extensions" msgstr "Disable all _extensions" -#: ../midori/main.c:1950 +#: ../midori/main.c:1344 msgid "No filename specified" msgstr "No filename specified" -#: ../midori/main.c:1982 ../midori/gjs.c:514 +#: ../midori/main.c:1367 msgid "An unknown error occured." msgstr "An unknown error occured." -#: ../midori/main.c:2005 +#: ../midori/main.c:1400 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "" + +#: ../midori/main.c:1435 +msgid "Run ADDRESS as a web application" +msgstr "" + +#: ../midori/main.c:1435 +msgid "ADDRESS" +msgstr "" + +#: ../midori/main.c:1437 +msgid "Use FOLDER as configuration folder" +msgstr "" + +#: ../midori/main.c:1437 +msgid "FOLDER" +msgstr "" + +#: ../midori/main.c:1440 msgid "Run the specified filename as javascript" msgstr "Run the specified filename as javascript" -#: ../midori/main.c:2007 +#: ../midori/main.c:1444 +msgid "Take a snapshot of the specified URI" +msgstr "" + +#: ../midori/main.c:1447 +msgid "Execute the specified command" +msgstr "" + +#: ../midori/main.c:1449 msgid "Display program version" msgstr "Display program version" -#: ../midori/main.c:2009 +#: ../midori/main.c:1451 msgid "Addresses" msgstr "Addresses" -#: ../midori/main.c:2053 +#: ../midori/main.c:1495 msgid "[Addresses]" msgstr "[Addresses]" -#: ../midori/main.c:2077 +#: ../midori/main.c:1518 msgid "Please report comments, suggestions and bugs to:" msgstr "Please report comments, suggestions and bugs to:" -#: ../midori/main.c:2079 +#: ../midori/main.c:1520 msgid "Check for new versions at:" msgstr "Check for new versions at:" -#: ../midori/main.c:2106 +#: ../midori/main.c:1602 +msgid "The specified configuration folder is invalid." +msgstr "The specified configuration folder is invalid." + +#: ../midori/main.c:1638 msgid "An instance of Midori is already running but not responding.\n" msgstr "An instance of Midori is already running but not responding.\n" -#: ../midori/main.c:2184 -#, fuzzy, c-format +#: ../midori/main.c:1688 +#, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "The search engines couldn't be saved. %s" +msgstr "The search engines couldn't be loaded. %s\n" -#: ../midori/main.c:2196 +#: ../midori/main.c:1700 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "The bookmarks couldn't be loaded: %s\n" -#: ../midori/main.c:2211 +#: ../midori/main.c:1715 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "The session couldn't be loaded: %s\n" -#: ../midori/main.c:2224 +#: ../midori/main.c:1728 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "The wastebasket couldn't be loaded: %s\n" -#: ../midori/main.c:2237 +#: ../midori/main.c:1741 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "The history couldn't be loaded: %s\n" -#: ../midori/main.c:2249 +#: ../midori/main.c:1753 msgid "The following errors occured:" msgstr "The following errors occured:" -#: ../midori/main.c:2265 +#: ../midori/main.c:1769 msgid "_Ignore" msgstr "_Ignore" -#: ../midori/midori-browser.c:258 ../midori/midori-browser.c:3164 -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-array.c:250 +msgid "File not found." +msgstr "File not found." + +#: ../midori/midori-array.c:258 ../midori/midori-array.c:267 +msgid "Malformed document." +msgstr "Malformed document." + +#: ../midori/midori-array.c:429 ../midori/sokoke.c:700 +#, c-format +msgid "Writing failed." +msgstr "Writing failed." + +#: ../midori/midori-browser.c:304 ../midori/midori-browser.c:4177 +#: ../midori/midori-browser.c:4183 msgid "Reload the current page" msgstr "Reload the current page" -#: ../midori/midori-browser.c:270 ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:315 ../midori/midori-browser.c:4180 msgid "Stop loading the current page" msgstr "Stop loading the current page" -#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:410 #, c-format msgid "%d%% loaded" msgstr "%d%% loaded" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:435 #, c-format msgid "Unexpected action '%s'." msgstr "Unexpected action '%s'." -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:617 +msgid "New folder" +msgstr "New folder" + +#: ../midori/midori-browser.c:617 +msgid "Edit folder" +msgstr "" + +#: ../midori/midori-browser.c:619 msgid "New bookmark" msgstr "New bookmark" -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:619 msgid "Edit bookmark" msgstr "Edit bookmark" -#: ../midori/midori-browser.c:546 +#: ../midori/midori-browser.c:649 msgid "_Title:" msgstr "_Title:" -#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:836 +#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Description:" -#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:850 +#: ../midori/midori-browser.c:681 ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Address:" -#: ../midori/midori-browser.c:596 +#: ../midori/midori-browser.c:700 msgid "_Folder:" msgstr "_Folder:" -#: ../midori/midori-browser.c:601 ../midori/midori-browser.c:638 +#: ../midori/midori-browser.c:705 ../midori/midori-browser.c:746 msgid "Toplevel folder" msgstr "Toplevel folder" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:822 msgid "Save file as" msgstr "Save file as" -#: ../midori/midori-browser.c:1302 +#: ../midori/midori-browser.c:1169 +#, c-format +msgid "The file %s has been downloaded." +msgstr "" + +#: ../midori/midori-browser.c:1173 +msgid "Transfer completed" +msgstr "" + +#: ../midori/midori-browser.c:1314 +msgid "Save file" +msgstr "Save file" + +#: ../midori/midori-browser.c:1960 msgid "Open file" msgstr "Open file" -#: ../midori/midori-browser.c:2524 ../panels/midori-bookmarks.c:690 +#: ../midori/midori-browser.c:3429 ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:812 +msgid "Open all in _Tabs" +msgstr "Open all in _Tabs" + +#: ../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 "Open in New _Tab" -#: ../midori/midori-browser.c:2526 ../panels/midori-bookmarks.c:692 +#: ../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 "Open in New _Window" -#: ../midori/midori-browser.c:2788 -#, c-format -msgid "A week ago" -msgstr "A week ago" +#: ../midori/midori-browser.c:3739 +msgid "Clear Private Data" +msgstr "" -#: ../midori/midori-browser.c:2794 -#, c-format -msgid "%d days ago" -msgstr "%d days ago" +#: ../midori/midori-browser.c:3743 +msgid "_Clear private data" +msgstr "" -#: ../midori/midori-browser.c:2801 -msgid "Today" -msgstr "Today" +#: ../midori/midori-browser.c:3756 +msgid "Clear the following data:" +msgstr "" -#: ../midori/midori-browser.c:2803 -msgid "Yesterday" -msgstr "Yesterday" +#: ../midori/midori-browser.c:3766 ../midori/midori-preferences.c:675 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "History" -#: ../midori/midori-browser.c:2892 +#: ../midori/midori-browser.c:3771 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/midori-browser.c:3776 +msgid "'Flash' Cookies" +msgstr "'Flash' Cookies" + +#: ../midori/midori-browser.c:3781 +msgid "Website icons" +msgstr "" + +#: ../midori/midori-browser.c:3786 ../midori/sokoke.c:874 +msgid "_Closed Tabs and Windows" +msgstr "_Closed Tabs and Windows" + +#: ../midori/midori-browser.c:3869 msgid "A lightweight web browser." msgstr "A lightweight web browser." -#: ../midori/midori-browser.c:2900 +#: ../midori/midori-browser.c:3877 msgid "translator-credits" msgstr "" "Bastien Nocera \n" "Abigail Brady " -#: ../midori/midori-browser.c:3044 -msgid "Are you sure you want to remove all history items?" -msgstr "Are you sure you want to remove all history items?" - -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:4111 msgid "_File" msgstr "_File" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:4114 msgid "Open a new window" msgstr "Open a new window" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:4117 msgid "Open a new tab" msgstr "Open a new tab" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:4120 msgid "Open a file" msgstr "Open a file" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:4123 msgid "Save to a file" msgstr "Save to a file" -#: ../midori/midori-browser.c:3112 +#: ../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 "_Close Tab" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:4129 msgid "Close the current tab" msgstr "Close the current tab" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:4131 msgid "C_lose Window" msgstr "C_lose Window" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:4132 msgid "Close this window" msgstr "Close this window" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:4135 msgid "Print the current page" msgstr "Print the current page" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:4138 msgid "Quit the application" msgstr "Quit the application" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:4140 msgid "_Edit" msgstr "_Edit" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:4143 msgid "Cut the selected text" msgstr "Cut the selected text" -#: ../midori/midori-browser.c:3130 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:4146 ../midori/midori-browser.c:4149 msgid "Copy the selected text" msgstr "Copy the selected text" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:4152 msgid "Paste text from the clipboard" msgstr "Paste text from the clipboard" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:4155 msgid "Delete the selected text" msgstr "Delete the selected text" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:4158 msgid "Select all text" msgstr "Select all text" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:4161 msgid "Find a word or phrase in the page" msgstr "Find a word or phrase in the page" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:4163 msgid "Find _Next" msgstr "Find _Next" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:4164 msgid "Find the next occurrence of a word or phrase" msgstr "Find the next occurrence of a word or phrase" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:4166 msgid "Find _Previous" msgstr "Find _Previous" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:4167 msgid "Find the previous occurrence of a word or phrase" msgstr "Find the previous occurrence of a word or phrase" -#: ../midori/midori-browser.c:3154 -msgid "_Quick Find" -msgstr "_Quick Find" - -#: ../midori/midori-browser.c:3155 -msgid "Quickly jump to a word or phrase" -msgstr "Quickly jump to a word or phrase" - -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:4171 msgid "Configure the application preferences" msgstr "Configure the application preferences" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:4173 msgid "_View" msgstr "_View" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:4174 msgid "_Toolbars" msgstr "_Toolbars" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:4186 msgid "Increase the zoom level" msgstr "Increase the zoom level" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:4189 msgid "Decrease the zoom level" msgstr "Decrease the zoom level" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:4192 msgid "Reset the zoom level" msgstr "Reset the zoom level" -#: ../midori/midori-browser.c:3181 ../midori/midori-view.c:984 -msgid "View _Source" -msgstr "View _Source" +#: ../midori/midori-browser.c:4193 +msgid "_Encoding" +msgstr "_Encoding" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:4195 +msgid "View So_urce" +msgstr "View So_urce" + +#: ../midori/midori-browser.c:4196 msgid "View the source code of the page" msgstr "View the source code of the page" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:4198 msgid "View Selection Source" msgstr "View Selection Source" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:4199 msgid "View the source code of the selection" msgstr "View the source code of the selection" -#: ../midori/midori-browser.c:3189 +#: ../midori/midori-browser.c:4203 msgid "Toggle fullscreen view" msgstr "Toggle fullscreen view" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:4205 msgid "_Go" msgstr "_Go" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:4208 msgid "Go back to the previous page" msgstr "Go back to the previous page" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:4211 msgid "Go forward to the next page" msgstr "Go forward to the next page" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:4214 msgid "Go to your homepage" msgstr "Go to your homepage" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:4216 msgid "Empty Trash" msgstr "Empty Wastebasket" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:4217 msgid "Delete the contents of the trash" msgstr "Delete the contents of the wastebasket" -#: ../midori/midori-browser.c:3205 ../midori/midori-view.c:956 -msgid "Undo Close Tab" -msgstr "Undo Close Tab" +#: ../midori/midori-browser.c:4219 +msgid "Undo _Close Tab" +msgstr "Undo _Close Tab" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:4220 msgid "Open the last closed tab" msgstr "Open the last closed tab" -#: ../midori/midori-browser.c:3210 ../panels/midori-bookmarks.c:209 +#: ../midori/midori-browser.c:4224 ../panels/midori-bookmarks.c:231 msgid "Add a new bookmark" msgstr "Add a new bookmark" -#: ../midori/midori-browser.c:3213 -msgid "Delete the selected history item" -msgstr "Delete the selected history item" +#: ../midori/midori-browser.c:4226 +msgid "Add a new _folder" +msgstr "Add a new _folder" -#: ../midori/midori-browser.c:3216 -msgid "Clear the entire history" -msgstr "Clear the entire history" +#: ../midori/midori-browser.c:4227 +msgid "Add a new bookmark folder" +msgstr "Add a new bookmark folder" -#: ../midori/midori-browser.c:3219 -msgid "Bookmark the selected history item" -msgstr "Bookmark the selected history item" - -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:4228 msgid "_Tools" msgstr "_Tools" -#: ../midori/midori-browser.c:3223 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:4230 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Manage Search Engines" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:4231 msgid "Add, edit and remove search engines..." msgstr "Add, edit and remove search engines..." -#: ../midori/midori-browser.c:3228 +#: ../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 "_Previous Tab" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:4240 msgid "Switch to the previous tab" msgstr "Switch to the previous tab" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:4242 msgid "_Next Tab" msgstr "_Next Tab" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:4243 msgid "Switch to the next tab" msgstr "Switch to the next tab" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:4245 msgid "_Help" msgstr "_Help" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:4247 msgid "_Contents" msgstr "_Contents" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:4248 msgid "Show the documentation" msgstr "Show the documentation" -#: ../midori/midori-browser.c:3239 -#, fuzzy +#: ../midori/midori-browser.c:4250 msgid "_Frequent Questions" -msgstr "_Frequent questions" +msgstr "_Frequent Questions" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:4251 msgid "Show the Frequently Asked Questions" msgstr "Show the Frequently Asked Questions" -#: ../midori/midori-browser.c:3242 -#, fuzzy +#: ../midori/midori-browser.c:4253 msgid "_Report a Bug" -msgstr "_Report a bug" +msgstr "_Report a Bug" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:4254 msgid "Open Midori's bug tracker" msgstr "Open Midori's bug tracker" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:4257 msgid "Show information about the program" msgstr "Show information about the program" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:4264 msgid "P_rivate Browsing" msgstr "P_rivate Browsing" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:4265 msgid "Don't save any private data while browsing" msgstr "Don't save any private data while browsing" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:4270 msgid "_Menubar" msgstr "_Menubar" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:4271 msgid "Show menubar" msgstr "Show menubar" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:4274 msgid "_Navigationbar" msgstr "_Navigationbar" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:4275 msgid "Show navigationbar" msgstr "Show navigationbar" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:4278 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:4279 msgid "Show sidepanel" msgstr "Show sidepanel" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:4282 msgid "_Bookmarkbar" msgstr "_Bookmarkbar" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:4283 msgid "Show bookmarkbar" msgstr "Show bookmarkbar" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:4286 msgid "_Transferbar" msgstr "_Transferbar" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:4287 msgid "Show transferbar" msgstr "Show transferbar" -#: ../midori/midori-browser.c:3279 +#: ../midori/midori-browser.c:4290 msgid "_Statusbar" msgstr "_Statusbar" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:4291 msgid "Show statusbar" msgstr "Show statusbar" -#: ../midori/midori-browser.c:3748 -#, fuzzy -msgid "_Separator" -msgstr "Separator" +#: ../midori/midori-browser.c:4298 +msgid "_Automatic" +msgstr "" -#: ../midori/midori-browser.c:3755 +#: ../midori/midori-browser.c:4301 ../midori/midori-websettings.c:212 +msgid "Chinese (BIG5)" +msgstr "Chinese (BIG5)" + +#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic +#: ../midori/midori-browser.c:4305 +msgid "Japanese (SHIFT__JIS)" +msgstr "Japanese (SHIFT__JIS)" + +#: ../midori/midori-browser.c:4308 ../midori/midori-websettings.c:214 +msgid "Russian (KOI8-R)" +msgstr "Russian (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 "Western (ISO-8859-1)" + +#: ../midori/midori-browser.c:4317 ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:289 +msgid "Custom..." +msgstr "Custom..." + +#: ../midori/midori-browser.c:4755 +msgid "_Separator" +msgstr "_Separator" + +#: ../midori/midori-browser.c:4762 msgid "_Location..." msgstr "_Location..." -#: ../midori/midori-browser.c:3757 +#: ../midori/midori-browser.c:4764 msgid "Open a particular location" msgstr "Open a particular location" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:4788 msgid "_Web Search..." msgstr "_Web Search..." -#: ../midori/midori-browser.c:3783 +#: ../midori/midori-browser.c:4790 msgid "Run a web search" msgstr "Run a web search" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:4811 msgid "Reopen a previously closed tab or window" msgstr "Reopen a previously closed tab or window" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:4826 msgid "_Recently visited pages" msgstr "_Recently visited pages" -#: ../midori/midori-browser.c:3817 +#: ../midori/midori-browser.c:4828 msgid "Reopen pages that you visited earlier" msgstr "Reopen pages that you visited earlier" -#: ../midori/midori-browser.c:3832 +#: ../midori/midori-browser.c:4843 ../midori/sokoke.c:863 +msgid "_Bookmarks" +msgstr "_Bookmarks" + +#: ../midori/midori-browser.c:4845 msgid "Show the saved bookmarks" msgstr "Show the saved bookmarks" -#: ../midori/midori-browser.c:3845 +#: ../midori/midori-browser.c:4860 msgid "_Window" msgstr "_Window" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:4862 msgid "Show a list of all open tabs" msgstr "Show a list of all open tabs" -#: ../midori/midori-browser.c:4001 ../midori/midori-preferences.c:597 -msgid "History" -msgstr "History" +#: ../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:4050 -#, fuzzy +#: ../midori/midori-browser.c:5059 msgid "_Inline Find:" -msgstr "_Inline find:" +msgstr "_Inline Find:" -#: ../midori/midori-browser.c:4071 -#, fuzzy +#: ../midori/midori-browser.c:5084 msgid "Previous" -msgstr "_Previous Tab" +msgstr "Previous" -#: ../midori/midori-browser.c:4076 -#, fuzzy +#: ../midori/midori-browser.c:5089 msgid "Next" -msgstr "Text" +msgstr "Next" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:5094 msgid "Match Case" msgstr "Match Case" -#: ../midori/midori-browser.c:4089 +#: ../midori/midori-browser.c:5102 msgid "Highlight Matches" msgstr "Highlight Matches" -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:5112 msgid "Close Findbar" msgstr "Close Findbar" -#: ../midori/midori-browser.c:4379 +#: ../midori/midori-browser.c:5147 +#: ../extensions/cookie-manager/cookie-manager-page.c:109 +msgid "Delete All" +msgstr "" + +#: ../midori/midori-browser.c:5476 #, c-format msgid "Unexpected setting '%s'" msgstr "Unexpected setting '%s'" -#: ../midori/midori-panel.c:199 ../midori/midori-panel.c:200 +#: ../midori/midori-locationaction.c:901 +#, c-format +msgid "Search with %s" +msgstr "" + +#: ../midori/midori-panel.c:333 +msgid "Detach chosen panel from the window" +msgstr "" + +#: ../midori/midori-panel.c:343 ../midori/midori-panel.c:508 +msgid "Align sidepanel to the right" +msgstr "" + +#: ../midori/midori-panel.c:353 ../midori/midori-panel.c:354 msgid "Close panel" msgstr "Close panel" -#: ../midori/midori-websettings.c:169 ../midori/midori-view.c:1719 +#: ../midori/midori-panel.c:509 +msgid "Align sidepanel to the left" +msgstr "" + +#: ../midori/midori-websettings.c:195 ../midori/midori-view.c:2265 msgid "Blank page" msgstr "Blank page" -#: ../midori/midori-websettings.c:170 ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:196 ../midori/midori-websettings.c:563 msgid "Homepage" msgstr "Homepage" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:197 msgid "Last open pages" msgstr "Last open pages" -#: ../midori/midori-websettings.c:186 -msgid "Chinese (BIG5)" -msgstr "Chinese (BIG5)" - -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:213 msgid "Japanese (SHIFT_JIS)" msgstr "Japanese (SHIFT_JIS)" -#: ../midori/midori-websettings.c:188 -msgid "Russian (KOI8-R)" -msgstr "Russian (KOI8-R)" - -#: ../midori/midori-websettings.c:189 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:190 -msgid "Western (ISO-8859-1)" -msgstr "Western (ISO-8859-1)" - -#: ../midori/midori-websettings.c:191 ../midori/midori-websettings.c:263 -msgid "Custom..." -msgstr "Custom..." - -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:232 msgid "New tab" msgstr "New tab" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:233 msgid "New window" msgstr "New window" -#: ../midori/midori-websettings.c:208 +#: ../midori/midori-websettings.c:234 msgid "Current tab" msgstr "Current tab" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:249 msgid "Default" msgstr "Default" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:250 msgid "Icons" msgstr "Icons" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:251 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:252 msgid "Both" msgstr "Both" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:253 msgid "Both horizontal" msgstr "Both horizontal" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:268 msgid "All cookies" msgstr "All cookies" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:269 msgid "Session cookies" msgstr "Session cookies" -#: ../midori/midori-websettings.c:244 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:270 ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:87 msgid "None" msgstr "None" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:286 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:287 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:288 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:341 msgid "Remember last window size" msgstr "Remember last window size" -#: ../midori/midori-websettings.c:304 +#: ../midori/midori-websettings.c:342 msgid "Whether to save the last window size" msgstr "Whether to save the last window size" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:350 msgid "Last window width" msgstr "Last window width" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:351 msgid "The last saved window width" msgstr "The last saved window width" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:359 msgid "Last window height" msgstr "Last window height" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:360 msgid "The last saved window height" msgstr "The last saved window height" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:385 msgid "Last panel position" msgstr "Last panel position" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel position" msgstr "The last saved panel position" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:395 msgid "Last panel page" msgstr "Last panel page" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:396 msgid "The last saved panel page" msgstr "The last saved panel page" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:404 msgid "Last Web search" msgstr "Last Web search" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:405 msgid "The last saved Web search" msgstr "The last saved Web search" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:414 msgid "Show Menubar" msgstr "Show Menubar" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:415 msgid "Whether to show the menubar" msgstr "Whether to show the menubar" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:423 msgid "Show Navigationbar" msgstr "Show Navigationbar" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:424 msgid "Whether to show the navigationbar" msgstr "Whether to show the navigationbar" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:432 msgid "Show Bookmarkbar" msgstr "Show Bookmarkbar" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:433 msgid "Whether to show the bookmarkbar" msgstr "Whether to show the bookmarkbar" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:441 msgid "Show Panel" msgstr "Show Panel" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the panel" msgstr "Whether to show the panel" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:457 +msgid "Show Transferbar" +msgstr "Show Transferbar" + +#: ../midori/midori-websettings.c:458 +msgid "Whether to show the transferbar" +msgstr "Whether to show the transferbar" + +#: ../midori/midori-websettings.c:466 msgid "Show Statusbar" msgstr "Show Statusbar" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the statusbar" msgstr "Whether to show the statusbar" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style" msgstr "Toolbar Style" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "The style of the toolbar" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:493 +msgid "Show progress in location entry" +msgstr "" + +#: ../midori/midori-websettings.c:494 +msgid "Whether to show loading progress in the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:509 +msgid "Search engines in location completion" +msgstr "" + +#: ../midori/midori-websettings.c:510 +msgid "Whether to show search engines in the location completion" +msgstr "" + +#: ../midori/midori-websettings.c:518 msgid "Toolbar Items" msgstr "Toolbar Items" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:519 msgid "The items to show on the toolbar" msgstr "The items to show on the toolbar" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:527 msgid "Compact Sidepanel" msgstr "Compact Sidepanel" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:528 msgid "Whether to make the sidepanel compact" msgstr "Whether to make the sidepanel compact" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:543 +msgid "Align sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:544 +msgid "Whether to align the sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:553 msgid "Load on Startup" msgstr "Load on Startup" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:554 msgid "What to load on startup" msgstr "What to load on startup" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:564 msgid "The homepage" msgstr "The homepage" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:579 msgid "Show crash dialog" msgstr "Show crash dialogue" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:580 msgid "Show a dialog after Midori crashed" msgstr "Show a dialogue after Midori crashed" -#: ../midori/midori-websettings.c:486 +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:596 +msgid "Show speed dial in new tabs" +msgstr "" + +#: ../midori/midori-websettings.c:597 +msgid "Show speed dial in newly opened tabs" +msgstr "" + +#: ../midori/midori-websettings.c:605 msgid "Download Folder" msgstr "Download Folder" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:606 msgid "The folder downloaded files are saved to" msgstr "The folder downloaded files are saved to" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:625 +msgid "Ask for the destination folder" +msgstr "" + +#: ../midori/midori-websettings.c:626 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "" + +#: ../midori/midori-websettings.c:645 +msgid "Notify when a transfer has been completed" +msgstr "" + +#: ../midori/midori-websettings.c:646 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "" + +#: ../midori/midori-websettings.c:658 msgid "Download Manager" msgstr "Download Manager" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:659 msgid "An external download manager" msgstr "An external download manager" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:667 msgid "Text Editor" msgstr "Text Editor" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:668 msgid "An external text editor" msgstr "An external text editor" -#: ../midori/midori-websettings.c:513 +#: ../midori/midori-websettings.c:683 +msgid "News Aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:684 +msgid "An external news aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:692 msgid "Location entry Search" msgstr "Location entry Search" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:693 msgid "The search to perform inside the location entry" msgstr "The search to perform inside the location entry" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:701 msgid "Preferred Encoding" msgstr "Preferred Encoding" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:702 msgid "The preferred character encoding" msgstr "The preferred character encoding" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:712 msgid "Always Show Tabbar" msgstr "Always Show Tabbar" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:713 msgid "Always show the tabbar" msgstr "Always show the tabbar" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:721 msgid "Close Buttons on Tabs" msgstr "Close Buttons on Tabs" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:722 msgid "Whether tabs have close buttons" msgstr "Whether tabs have close buttons" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:730 msgid "Open new pages in" msgstr "Open new pages in" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:731 msgid "Where to open new pages" msgstr "Where to open new pages" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:740 msgid "Open external pages in" msgstr "Open external pages in" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:741 msgid "Where to open externally opened pages" msgstr "Where to open externally opened pages" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:754 msgid "Middle click opens Selection" msgstr "Middle click opens Selection" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:755 msgid "Load an address from the selection via middle click" msgstr "Load an address from the selection via middle click" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:763 msgid "Open tabs in the background" msgstr "Open tabs in the background" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:764 msgid "Whether to open new tabs in the background" msgstr "Whether to open new tabs in the background" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:772 msgid "Open Tabs next to Current" msgstr "Open Tabs next to Current" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:773 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Whether to open new tabs next to the current tab or after the last one" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:781 msgid "Open popups in tabs" msgstr "Open popups in tabs" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:782 msgid "Whether to open popup windows in tabs" msgstr "Whether to open popup windows in tabs" -#: ../midori/midori-websettings.c:656 +#: ../midori/midori-websettings.c:798 msgid "Zoom Text and Images" msgstr "Zoom Text and Images" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:799 msgid "Whether to zoom text and images" msgstr "Whether to zoom text and images" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:814 +msgid "Find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:815 +msgid "Whether to automatically find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:823 msgid "Accept cookies" msgstr "Accept cookies" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:824 msgid "What type of cookies to accept" msgstr "What type of cookies to accept" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:833 msgid "Original cookies only" msgstr "Original cookies only" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:834 msgid "Accept cookies from the original website only" msgstr "Accept cookies from the original website only" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:842 msgid "Maximum cookie age" msgstr "Maximum cookie age" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:843 msgid "The maximum number of days to save cookies for" msgstr "The maximum number of days to save cookies for" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:853 msgid "Remember last visited pages" msgstr "Remember last visited pages" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:854 msgid "Whether the last visited pages are saved" msgstr "Whether the last visited pages are saved" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:862 msgid "Maximum history age" msgstr "Maximum history age" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:863 msgid "The maximum number of days to save the history for" msgstr "The maximum number of days to save the history for" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:871 msgid "Remember last form inputs" msgstr "Remember last form inputs" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:872 msgid "Whether the last form inputs are saved" msgstr "Whether the last form inputs are saved" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:880 msgid "Remember last downloaded files" msgstr "Remember last downloaded files" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:881 msgid "Whether the last downloaded files are saved" msgstr "Whether the last downloaded files are saved" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:891 msgid "Proxy Server" msgstr "Proxy Server" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:892 msgid "The proxy server used for HTTP connections" msgstr "The proxy server used for HTTP connections" +#: ../midori/midori-websettings.c:907 +msgid "Detect proxy server automatically" +msgstr "" + +#: ../midori/midori-websettings.c:908 +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:760 +#: ../midori/midori-websettings.c:924 msgid "Identify as" msgstr "Identify as" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:925 msgid "What to identify as to web pages" msgstr "What to identify as to web pages" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:941 msgid "Identification string" msgstr "Identification string" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:942 msgid "The application identification string" msgstr "The application identification string" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:950 msgid "Cache size" msgstr "Cache size" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:951 msgid "The allowed size of the cache" msgstr "The allowed size of the cache" +#: ../midori/midori-websettings.c:966 +msgid "Clear private data" +msgstr "" + +#: ../midori/midori-websettings.c:967 +msgid "The private data selected for deletion" +msgstr "" + +#: ../midori/midori-view.c:750 +#, 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 +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "" + +#: ../midori/midori-view.c:755 +msgid "Try again" +msgstr "" + #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:608 +#. 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 #, c-format msgid "Not found - %s" msgstr "Not found - %s" -#: ../midori/midori-view.c:888 +#: ../midori/midori-view.c:1172 +msgid "Open _Link" +msgstr "Open _Link" + +#: ../midori/midori-view.c:1174 msgid "Open Link in New _Tab" msgstr "Open Link in New _Tab" -#: ../midori/midori-view.c:911 -msgid "_Save Link destination" -msgstr "_Save Link destination" +#: ../midori/midori-view.c:1191 +msgid "Open Link in New _Window" +msgstr "" -#: ../midori/midori-view.c:919 +#: ../midori/midori-view.c:1197 msgid "_Download Link destination" msgstr "_Download Link destination" -#: ../midori/midori-view.c:941 +#: ../midori/midori-view.c:1203 +msgid "_Save Link destination" +msgstr "_Save Link destination" + +#: ../midori/midori-view.c:1212 +msgid "Download with Download _Manager" +msgstr "" + +#: ../midori/midori-view.c:1241 +msgid "Search _with" +msgstr "" + +#: ../midori/midori-view.c:1269 +msgid "_Search the Web" +msgstr "" + +#: ../midori/midori-view.c:1279 msgid "Open Address in New _Tab" msgstr "Open Address in New _Tab" -#: ../midori/midori-view.c:1411 +#: ../midori/midori-view.c:1457 +msgid "Open or download file" +msgstr "" + +#: ../midori/midori-view.c:1474 +#, c-format +msgid "File Type: '%s'" +msgstr "" + +#: ../midori/midori-view.c:1477 +#, 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 +#, c-format +msgid "Open %s" +msgstr "Open %s" + +#: ../midori/midori-view.c:1899 #, c-format msgid "Inspect page - %s" msgstr "Inspect page - %s" -#: ../midori/midori-view.c:1562 -msgid "Source" -msgstr "Source" +#: ../midori/midori-view.c:2089 +msgid "Speed dial" +msgstr "" -#: ../midori/midori-view.c:1586 +#: ../midori/midori-view.c:2090 +msgid "Click to add a shortcut" +msgstr "" + +#: ../midori/midori-view.c:2091 +msgid "Enter shortcut address" +msgstr "" + +#: ../midori/midori-view.c:2092 +msgid "Enter shortcut title" +msgstr "" + +#: ../midori/midori-view.c:2093 +msgid "Are you sure you want to delete this shortcut?" +msgstr "" + +#: ../midori/midori-view.c:2123 #, c-format msgid "Document cannot be displayed" msgstr "Document cannot be displayed" -#: ../midori/midori-view.c:1602 +#: ../midori/midori-view.c:2140 #, c-format msgid "No documentation installed" msgstr "No documentation installed" +#: ../midori/midori-view.c:2487 +msgid "_Duplicate Tab" +msgstr "" + #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "Preferences for %s" #. Page "General" -#: ../midori/midori-preferences.c:372 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "General" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Startup" +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "" + +#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Transfers" + #. Page "Appearance" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Appearance" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Font settings" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Default Font Family" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" msgstr "The default font size used to display text" -#: ../midori/midori-preferences.c:434 +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:457 +msgid "The font family used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" msgstr "Minimum Font Size" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" msgstr "The minimum font size used to display text" -#: ../midori/midori-preferences.c:444 +#: ../midori/midori-preferences.c:473 msgid "Encoding" msgstr "Encoding" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" msgstr "The character encoding to use by default" #. Page "Behavior" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "Behaviour" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:484 msgid "Features" msgstr "Features" -#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:487 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Load images automatically" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:488 msgid "Load and display images automatically" msgstr "Load and display images automatically" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:491 msgid "Shrink images automatically" msgstr "Shrink images automatically" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:492 msgid "Automatically shrink standalone images to fit" msgstr "Automatically shrink standalone images to fit" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:495 msgid "Print background images" msgstr "Print background images" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:496 msgid "Whether background images should be printed" msgstr "Whether background images should be printed" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:499 msgid "Resizable text areas" msgstr "Resizable text areas" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:500 msgid "Whether text areas are resizable" msgstr "Whether text areas are resizable" -#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Enable scripts" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:504 msgid "Enable embedded scripting languages" msgstr "Enable embedded scripting languages" -#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54 -msgid "Enable plugins" -msgstr "Enable plugins" +#: ../midori/midori-preferences.c:507 ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "" -#: ../midori/midori-preferences.c:479 -msgid "Enable embedded plugin objects" -msgstr "Enable embedded plugin objects" +#: ../midori/midori-preferences.c:508 +msgid "Enable embedded Netscape plugin objects" +msgstr "" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:511 msgid "Enforce 96 dots per inch" msgstr "Enforce 96 dots per inch" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:512 msgid "Enforce a video dot density of 96 DPI" msgstr "Enforce a video dot density of 96 DPI" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:515 msgid "Enable developer tools" msgstr "Enable developer tools" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:516 msgid "Enable special extensions for developers" msgstr "Enable special extensions for developers" +#: ../midori/midori-preferences.c:523 +msgid "Spell Checking" +msgstr "" + +#: ../midori/midori-preferences.c:526 +msgid "Enable Spell Checking" +msgstr "" + +#: ../midori/midori-preferences.c:527 +msgid "Enable spell checking while typing" +msgstr "" + +#. i18n: The example should be adjusted to contain a good local default +#: ../midori/midori-preferences.c:531 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" + #. Page "Interface" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:536 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:537 msgid "Navigationbar" msgstr "Navigationbar" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:548 msgid "Browsing" msgstr "Browsing" -#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543 +#. Page "Applications" +#: ../midori/midori-preferences.c:578 +msgid "Applications" +msgstr "" + +#: ../midori/midori-preferences.c:579 +msgid "External applications" +msgstr "" + +#. Page "Network" +#: ../midori/midori-preferences.c:625 ../midori/midori-preferences.c:626 msgid "Network" msgstr "Network" -#: ../midori/midori-preferences.c:565 +#: ../midori/midori-preferences.c:653 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:658 msgid "Privacy" msgstr "Privacy" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:659 msgid "Web Cookies" msgstr "Web Cookies" -#: ../midori/midori-preferences.c:592 ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682 msgid "days" msgstr "days" -#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:331 msgid "Empty" msgstr "Empty" -#: ../midori/midori-searchaction.c:792 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "Add search engine" -#: ../midori/midori-searchaction.c:792 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "Edit search engine" -#: ../midori/midori-searchaction.c:820 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:864 -msgid "_Icon (name or file):" -msgstr "_Icon (name or file):" +#: ../midori/midori-searchaction.c:976 +msgid "_Icon:" +msgstr "_Icon:" -#: ../midori/midori-searchaction.c:878 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1055 -#, fuzzy +#: ../midori/midori-searchaction.c:1209 msgid "Manage Search Engines" -msgstr "_Manage Search Engines" +msgstr "Manage Search Engines" -#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 +#: ../midori/midori-searchaction.c:1308 +msgid "Use as _default" +msgstr "" + +#: ../midori/sokoke.c:172 ../midori/sokoke.c:184 msgid "Could not run external program." msgstr "Could not run external program." -#. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:354 -msgid "Warning: You are using a superuser account!" -msgstr "Warning: You are using a superuser account!" +#: ../midori/sokoke.c:862 +msgid "_Bookmark" +msgstr "_Bookmark" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s has no property '%s'" +#: ../midori/sokoke.c:864 +msgid "Add Boo_kmark" +msgstr "Add Boo_kmark" -#: ../midori/gjs.c:878 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "%s cannot be assigned to %s.%s" +#: ../midori/sokoke.c:865 +msgid "_Console" +msgstr "_Console" -#: ../midori/gjs.c:888 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "%s.%s cannot be accessed" +#: ../midori/sokoke.c:866 +msgid "_Extensions" +msgstr "_Extensions" -#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 +#: ../midori/sokoke.c:867 +msgid "_History" +msgstr "_History" + +#: ../midori/sokoke.c:868 +msgid "_Homepage" +msgstr "_Homepage" + +#: ../midori/sokoke.c:869 +msgid "_Userscripts" +msgstr "_Userscripts" + +#: ../midori/sokoke.c:870 +msgid "User_styles" +msgstr "User_styles" + +#: ../midori/sokoke.c:871 +msgid "New _Tab" +msgstr "New _Tab" + +#: ../midori/sokoke.c:872 +msgid "_Transfers" +msgstr "_Transfers" + +#: ../midori/sokoke.c:873 +msgid "Netscape p_lugins" +msgstr "Netscape p_lugins" + +#: ../midori/sokoke.c:875 +msgid "New _Window" +msgstr "New _Window" + +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Userscripts" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "Userstyles" -#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "_Enable" - -#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 -msgid "_Disable" -msgstr "_Disable" - -#: ../panels/midori-bookmarks.c:100 +#: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "Bookmarks" -#: ../panels/midori-bookmarks.c:217 +#: ../panels/midori-bookmarks.c:239 msgid "Edit the selected bookmark" msgstr "Edit the selected bookmark" -#: ../panels/midori-bookmarks.c:225 +#: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" msgstr "Delete the selected bookmark" -#: ../panels/midori-bookmarks.c:529 +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "" + +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Separator" @@ -1477,13 +1764,81 @@ msgstr "Separator" msgid "Console" msgstr "Console" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensions" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 -msgid "Plugins" -msgstr "Plugins" +#: ../panels/midori-history.c:162 +msgid "Are you sure you want to remove all history items?" +msgstr "Are you sure you want to remove all history items?" + +#: ../panels/midori-history.c:217 +msgid "Bookmark the selected history item" +msgstr "Bookmark the selected history item" + +#: ../panels/midori-history.c:226 +msgid "Delete the selected history item" +msgstr "Delete the selected history item" + +#: ../panels/midori-history.c:234 +msgid "Clear the entire history" +msgstr "Clear the entire history" + +#: ../panels/midori-history.c:601 +msgid "A week ago" +msgstr "A week ago" + +#: ../panels/midori-history.c:606 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d day ago" +msgstr[1] "%d days ago" + +#: ../panels/midori-history.c:614 +msgid "Today" +msgstr "Today" + +#: ../panels/midori-history.c:616 +msgid "Yesterday" +msgstr "Yesterday" + +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "Netscape plugins" + +#: ../panels/midori-transfers.c:271 +#, c-format +msgid "%s of %s" +msgstr "" + +#: ../panels/midori-transfers.c:479 +msgid "Open Destination _Folder" +msgstr "" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "" + +#: ../katze/katze-http-auth.c:97 +msgid "Authentication Required" +msgstr "Authentication Required" + +#: ../katze/katze-http-auth.c:113 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"A username and a password are required\n" +"to open this location:" + +#: ../katze/katze-http-auth.c:127 +msgid "Username" +msgstr "Username" + +#: ../katze/katze-http-auth.c:138 +msgid "Password" +msgstr "Password" #: ../katze/katze-throbber.c:828 #, c-format @@ -1499,44 +1854,339 @@ msgstr "Stock icon '%s' couldn't be loaded" msgid "Animation frames are broken" msgstr "Animation frames are broken" -#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:200 ../katze/katze-utils.c:407 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Property '%s' is invalid for %s" -#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:235 ../katze/katze-utils.c:264 msgid "Choose file" msgstr "Choose file" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:250 msgid "Choose folder" msgstr "Choose folder" -#: ../extensions/mouse-gestures/main.c:216 +#: ../extensions/adblock.c:128 +msgid "Configure Advertisement filters" +msgstr "" + +#: ../extensions/adblock.c:269 +msgid "Configure _Advertisement filters..." +msgstr "" + +#: ../extensions/adblock.c:526 +msgid "Advertisement blocker" +msgstr "" + +#: ../extensions/adblock.c:527 +msgid "Block advertisements according to a filter list" +msgstr "" + +#: ../extensions/colorful-tabs.c:115 +msgid "Tint tabs distinctly" +msgstr "" + +#: ../extensions/colorful-tabs.c:151 +msgid "Colorful Tabs" +msgstr "Colourful Tabs" + +#: ../extensions/colorful-tabs.c:152 +msgid "Tint each tab distinctly" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "Cookie Manager" + +#: ../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 "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:126 +msgid "Expand All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:133 +msgid "Collapse All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:460 +msgid "Do you really want to delete all cookies?" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:462 +msgid "Question" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:471 +msgid "Only cookies which match the filter will be deleted." +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:539 +msgid "At the end of the session" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:542 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:548 +msgid "Yes" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:548 +msgid "No" +msgstr "No" + +#: ../extensions/cookie-manager/cookie-manager-page.c:811 +msgid "Name" +msgstr "Name" + +#: ../extensions/cookie-manager/cookie-manager-page.c:862 +msgid "_Expand All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:870 +msgid "_Collapse All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:923 +msgid "Filter:" +msgstr "Filter:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:928 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" + +#: ../extensions/cookie-manager/main.c:40 +msgid "_Cookie Manager" +msgstr "_Cookie Manager" + +#: ../extensions/cookie-manager/main.c:57 +msgid "List, view and delete cookies" +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:242 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:348 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "" + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:664 +msgid "Feeds" +msgstr "Feeds" + +#: ../extensions/feed-panel/feed-panel.c:717 +msgid "Add new feed" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:724 +msgid "Delete feed" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:807 +msgid "_Feeds" +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:185 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:225 +#, c-format +msgid "Unsupported feed format." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:255 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Feed Panel" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "" + +#: ../extensions/mouse-gestures/main.c:236 msgid "Mouse Gestures" msgstr "Mouse Gestures" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures/main.c:237 msgid "Control Midori by moving the mouse" msgstr "Control Midori by moving the mouse" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Pageholder" -#: ../extensions/page-holder.c:137 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "_Pageholder" -#: ../extensions/statusbar-features.c:38 +#: ../extensions/shortcuts.c:166 +msgid "Configure Keyboard shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:263 +msgid "Configure Sh_ortcuts..." +msgstr "" + +#: ../extensions/shortcuts.c:295 +msgid "Shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:296 +msgid "View and edit keyboard shortcuts" +msgstr "" + +#: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Images" -#: ../extensions/statusbar-features.c:45 +#: ../extensions/statusbar-features.c:96 msgid "Scripts" msgstr "Scripts" +#: ../extensions/statusbar-features.c:149 +msgid "Statusbar Features" +msgstr "Statusbar Features" + +#: ../extensions/statusbar-features.c:150 +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 "Tab Panel" + +#: ../extensions/tab-panel.c:336 +msgid "T_ab Panel" +msgstr "T_ab Panel" + +#: ../extensions/tab-panel.c:353 +msgid "Show tabs in a vertical panel" +msgstr "" + +#: ../extensions/toolbar-editor.c:390 +msgid "Customize Toolbar" +msgstr "" + +#: ../extensions/toolbar-editor.c:406 +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" + +#: ../extensions/toolbar-editor.c:422 +msgid "Available Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:443 +msgid "Displayed Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:584 +msgid "Configure _Toolbar..." +msgstr "" + +#: ../extensions/toolbar-editor.c:613 +msgid "Toolbar Editor" +msgstr "Toolbar Editor" + +#: ../extensions/toolbar-editor.c:614 +msgid "Easily edit the toolbar layout" +msgstr "" + +#~ msgid "_Quick Find" +#~ msgstr "_Quick Find" + +#~ msgid "Quickly jump to a word or phrase" +#~ msgstr "Quickly jump to a word or phrase" + +#~ msgid "Source" +#~ msgstr "Source" + +#~ msgid "_Icon (name or file):" +#~ msgstr "_Icon (name or file):" + +#~ msgid "Warning: You are using a superuser account!" +#~ msgstr "Warning: You are using a superuser account!" + +#~ msgid "%s has no property '%s'" +#~ msgstr "%s has no property '%s'" + +#~ msgid "%s cannot be assigned to %s.%s" +#~ msgstr "%s cannot be assigned to %s.%s" + +#~ msgid "%s.%s cannot be accessed" +#~ msgstr "%s.%s cannot be accessed" + +#~ msgid "_Enable" +#~ msgstr "_Enable" + +#~ msgid "_Disable" +#~ msgstr "_Disable" + +#~ msgid "Plugins" +#~ msgstr "Plugins" + #~ msgid "Manage search engines" #~ msgstr "Manage search engines" diff --git a/po/es.po b/po/es.po index 8f838988..eb19989f 100644 --- a/po/es.po +++ b/po/es.po @@ -9,9 +9,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.6\n" +"Project-Id-Version: midori 0.1.7\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: 2009-05-20 19:21-0300\n" "Last-Translator: elega \n" "Language-Team: GALPon MiniNo \n" @@ -23,12 +23,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador ligero" -#: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1315 -#: ../midori/main.c:1449 -#: ../midori/main.c:1457 -#: ../midori/main.c:1468 -#: ../midori/midori-websettings.c:277 +#: ../data/midori.desktop.in.h:2 ../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" @@ -46,8 +43,7 @@ msgstr "No se pudo cargar la configuración: %s\n" msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no es válido para %s" -#: ../midori/main.c:158 -#: ../midori/main.c:238 +#: ../midori/main.c:158 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuración inválido «%s»" @@ -72,9 +68,7 @@ msgstr "No se ha podido quitar los elementos del historial: %s\n" msgid "Failed to clear history: %s\n" msgstr "No se ha podido vaciar el historial: %s\n" -#: ../midori/main.c:483 -#: ../midori/main.c:517 -#: ../midori/main.c:533 +#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" msgstr "No se ha podido añadir un elemento al historial: %s\n" @@ -90,292 +84,293 @@ msgstr "No se ha podido quitar elementos antiguos del historial: %s\n" msgid "The configuration couldn't be saved. %s" msgstr "No se pudo guardar la configuración. %s" -#: ../midori/main.c:770 +#: ../midori/main.c:779 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No se pudo guardar los motores de búsqueda. %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 "No se pudieron guardar los marcadores. %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 "No se pudo guardar la papelera. %s" -#: ../midori/main.c:965 +#: ../midori/main.c:974 #, c-format msgid "The session couldn't be saved. %s" msgstr "No se pudo guardar la sesión. %s" -#: ../midori/main.c:1092 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "Parece que Midori se cerró insperadamente la última vez. Si esto sucede repetidamente, pruebe una de las siguientes opciones para resolver el problema." +#: ../midori/main.c: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 "" +"Parece que Midori se cerró insperadamente la última vez. Si esto sucede " +"repetidamente, pruebe una de las siguientes opciones para resolver el " +"problema." -#: ../midori/main.c:1107 +#: ../midori/main.c:1116 msgid "Modify _preferences" msgstr "Modificar _preferencias" -#: ../midori/main.c:1111 +#: ../midori/main.c:1120 msgid "Reset the last _session" msgstr "Restaurar la última _sesión" -#: ../midori/main.c:1116 +#: ../midori/main.c:1125 msgid "Disable all _extensions" msgstr "Deshabilitar todas las _extensiones" -#: ../midori/main.c:1315 +#: ../midori/main.c:1344 msgid "No filename specified" msgstr "No se especificó el nombre del archivo" -#: ../midori/main.c:1338 +#: ../midori/main.c:1367 msgid "An unknown error occured." msgstr "Se produjo un error desconocido." -#: ../midori/main.c:1370 +#: ../midori/main.c:1400 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura guardada en: %s\n" -#: ../midori/main.c:1391 +#: ../midori/main.c:1435 msgid "Run ADDRESS as a web application" msgstr "Ejecutar DIRECCIÓN como una aplicación de internet" -#: ../midori/main.c:1391 +#: ../midori/main.c:1435 msgid "ADDRESS" msgstr "DIRECCIÓN" -#: ../midori/main.c:1393 +#: ../midori/main.c:1437 msgid "Use FOLDER as configuration folder" msgstr "Utilizar CARPETA como carpeta de configuración" -#: ../midori/main.c:1393 +#: ../midori/main.c:1437 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1395 +#: ../midori/main.c:1440 msgid "Run the specified filename as javascript" msgstr "Ejecute el nombre de archivo especificado como javascript" -#: ../midori/main.c:1398 +#: ../midori/main.c:1444 msgid "Take a snapshot of the specified URI" msgstr "Tomar una captura de la URL especificada" -#: ../midori/main.c:1401 +#: ../midori/main.c:1447 +msgid "Execute the specified command" +msgstr "" + +#: ../midori/main.c:1449 msgid "Display program version" msgstr "Mostrar la versión del programa" -#: ../midori/main.c:1403 +#: ../midori/main.c:1451 msgid "Addresses" msgstr "Direcciones" -#: ../midori/main.c:1446 +#: ../midori/main.c:1495 msgid "[Addresses]" msgstr "[Direcciones]" -#: ../midori/main.c:1469 +#: ../midori/main.c:1518 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor envíe comentarios, sugerencias y errores a:" -#: ../midori/main.c:1471 +#: ../midori/main.c:1520 msgid "Check for new versions at:" msgstr "Buscar nuevas versiones en:" -#: ../midori/main.c:1548 +#: ../midori/main.c:1602 msgid "The specified configuration folder is invalid." msgstr "La carpeta de configuración especificada no es válida." -#: ../midori/main.c:1583 +#: ../midori/main.c:1638 msgid "An instance of Midori is already running but not responding.\n" msgstr "Una instancia de Midori ya se está ejecutando pero no responde.\n" -#: ../midori/main.c:1633 +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "No se pudieron cargar los motores de búsqueda. %s\n" -#: ../midori/main.c:1645 +#: ../midori/main.c:1700 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Los marcadores no pudieron ser cargados: %s\n" -#: ../midori/main.c:1660 +#: ../midori/main.c:1715 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No se pudo cargar la sesión: %s\n" -#: ../midori/main.c:1673 +#: ../midori/main.c:1728 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No se pudo cargar la papelera: %s\n" -#: ../midori/main.c:1686 +#: ../midori/main.c:1741 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No se pudo cargar el historial: %s\n" -#: ../midori/main.c:1698 +#: ../midori/main.c:1753 msgid "The following errors occured:" msgstr "Se produjeron los siguientes errores:" -#: ../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 "Archivo no 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 defectuoso." -#: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:716 +#: ../midori/midori-array.c:429 ../midori/sokoke.c:700 #, c-format msgid "Writing failed." msgstr "Falló la escritura." -#: ../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 "Recargar la 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 "Detener la carga de la página" -#: ../midori/midori-browser.c:360 +#: ../midori/midori-browser.c:410 #, c-format msgid "%d%% loaded" msgstr "%d%% cargado" -#: ../midori/midori-browser.c:385 +#: ../midori/midori-browser.c:435 #, c-format msgid "Unexpected action '%s'." msgstr "Acción inesperada «%s»." -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:617 msgid "New folder" msgstr "Nueva carpeta" -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:617 msgid "Edit folder" msgstr "Editar carpeta" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:619 msgid "New bookmark" msgstr "Nuevo 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-searchaction.c:948 +#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Descripción:" -#: ../midori/midori-browser.c:667 -#: ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:681 ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Dirección:" -#: ../midori/midori-browser.c:686 +#: ../midori/midori-browser.c:700 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:691 -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:705 ../midori/midori-browser.c:746 msgid "Toplevel folder" msgstr "Carpeta de nivel superior" -#: ../midori/midori-browser.c:808 +#: ../midori/midori-browser.c:822 msgid "Save file as" msgstr "Guardar archivo como" -#: ../midori/midori-browser.c:1119 +#: ../midori/midori-browser.c:1169 #, c-format msgid "The file %s has been downloaded." msgstr "El archivo %s ha sido descargado." -#: ../midori/midori-browser.c:1123 +#: ../midori/midori-browser.c:1173 msgid "Transfer completed" msgstr "Transferencia completa" -#: ../midori/midori-browser.c:1820 +#: ../midori/midori-browser.c:1314 +msgid "Save file" +msgstr "Guardar archivo" + +#: ../midori/midori-browser.c:1960 msgid "Open file" msgstr "Abrir archivo" -#: ../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 todo en _pestañas" -#: ../midori/midori-browser.c:3159 -#: ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:814 -#: ../extensions/feed-panel/feed-panel.c:542 +#: ../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 en una nueva _pestaña " -#: ../midori/midori-browser.c:3162 -#: ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:816 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../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 en una nueva _ventana" -#: ../midori/midori-browser.c:3425 +#: ../midori/midori-browser.c:3739 msgid "Clear Private Data" msgstr "Borrar datos privados" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3743 msgid "_Clear private data" msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:3441 +#: ../midori/midori-browser.c:3756 msgid "Clear the following data:" msgstr "Borrar los siguientes datos:" -#: ../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 "Historial" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3771 msgid "Cookies" msgstr "Huellas / Cookies" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3776 msgid "'Flash' Cookies" msgstr "'Flash' Huellas" -#: ../midori/midori-browser.c:3458 +#: ../midori/midori-browser.c:3781 msgid "Website icons" msgstr "Íconos de sitios de internet" -#: ../midori/midori-browser.c:3538 +#: ../midori/midori-browser.c:3786 ../midori/sokoke.c:874 +msgid "_Closed Tabs and Windows" +msgstr "_Pestañas y ventanas cerradas" + +#: ../midori/midori-browser.c:3869 msgid "A lightweight web browser." msgstr "Un navegador muy ligero" -#: ../midori/midori-browser.c:3546 +#: ../midori/midori-browser.c:3877 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada \n" @@ -384,1072 +379,1083 @@ msgstr "" "Elega \n" "Guillermo Iguarán " -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:4111 msgid "_File" msgstr "_Archivo" -#: ../midori/midori-browser.c:3753 +#: ../midori/midori-browser.c:4114 msgid "Open a new window" msgstr "Abrir una nueva ventana" -#: ../midori/midori-browser.c:3756 +#: ../midori/midori-browser.c:4117 msgid "Open a new tab" msgstr "Abrir una nueva pestaña" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:4120 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:3762 +#: ../midori/midori-browser.c:4123 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:3764 -#: ../midori/midori-view.c:1256 +#: ../midori/midori-browser.c:4125 msgid "Add to Speed _dial" msgstr "Añadir a marcación rápida" -#: ../midori/midori-browser.c:3765 +#: ../midori/midori-browser.c:4126 msgid "Add shortcut to speed dial" msgstr "Añadir acceso directo a marcación rápida" -#: ../midori/midori-browser.c:3767 +#: ../midori/midori-browser.c:4128 msgid "_Close Tab" msgstr "_Cerrar pestaña" -#: ../midori/midori-browser.c:3768 +#: ../midori/midori-browser.c:4129 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:3770 +#: ../midori/midori-browser.c:4131 msgid "C_lose Window" msgstr "_Cerrar ventana" -#: ../midori/midori-browser.c:3771 +#: ../midori/midori-browser.c:4132 msgid "Close this window" msgstr "Cerrar ésta ventana" -#: ../midori/midori-browser.c:3774 +#: ../midori/midori-browser.c:4135 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:3777 +#: ../midori/midori-browser.c:4138 msgid "Quit the application" msgstr "Salir de la aplicación" -#: ../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 el 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 el texto seleccionado" -#: ../midori/midori-browser.c:3791 +#: ../midori/midori-browser.c:4152 msgid "Paste text from the clipboard" msgstr "Pegar texto del portapapeles" -#: ../midori/midori-browser.c:3794 +#: ../midori/midori-browser.c:4155 msgid "Delete the selected text" msgstr "Borrar el texto seleccionado" -#: ../midori/midori-browser.c:3797 +#: ../midori/midori-browser.c:4158 msgid "Select all text" msgstr "Seleccionar todo el texto" -#: ../midori/midori-browser.c:3800 +#: ../midori/midori-browser.c:4161 msgid "Find a word or phrase in the page" msgstr "Buscar una palabra o frase en la página" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:4163 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:3803 +#: ../midori/midori-browser.c:4164 msgid "Find the next occurrence of a word or phrase" msgstr "Buscar la siguiente aparición de una palabra o una frase" -#: ../midori/midori-browser.c:3805 +#: ../midori/midori-browser.c:4166 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:3806 +#: ../midori/midori-browser.c:4167 msgid "Find the previous occurrence of a word or phrase" msgstr "Buscar la anterior aparición de una palabra o una frase" -#: ../midori/midori-browser.c:3809 -msgid "_Quick Find" -msgstr "Búsqueda _rápida" - -#: ../midori/midori-browser.c:3810 -msgid "Quickly jump to a word or phrase" -msgstr "Saltar rápidamente a una palabra o una frase" - -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:4171 msgid "Configure the application preferences" msgstr "Configurar las preferencias de la aplicación" -#: ../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 herramientas" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:4186 msgid "Increase the zoom level" msgstr "Aumentar el nivel de zoom" -#: ../midori/midori-browser.c:3831 +#: ../midori/midori-browser.c:4189 msgid "Decrease the zoom level" msgstr "Disminuir el nivel de zoom" -#: ../midori/midori-browser.c:3834 +#: ../midori/midori-browser.c:4192 msgid "Reset the zoom level" msgstr "Restablecer el nivel de zoom" -#: ../midori/midori-browser.c:3835 +#: ../midori/midori-browser.c:4193 msgid "_Encoding" msgstr "_Codificación" -#: ../midori/midori-browser.c:3837 -msgid "_Automatic" -msgstr "_Automático" - -#: ../midori/midori-browser.c:3840 -#: ../midori/midori-websettings.c:204 -msgid "Chinese (BIG5)" -msgstr "Chino (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 "Ruso (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 "Occidental (ISO-8859-1)" - -#: ../midori/midori-browser.c:3855 -#: ../midori/midori-websettings.c:209 -#: ../midori/midori-websettings.c:281 -msgid "Custom..." -msgstr "Personalizado..." - -#: ../midori/midori-browser.c:3858 -#: ../midori/midori-view.c:1275 -msgid "View _Source" +#: ../midori/midori-browser.c:4195 +msgid "View So_urce" msgstr "Ver _código fuente" -#: ../midori/midori-browser.c:3859 +#: ../midori/midori-browser.c:4196 msgid "View the source code of the page" msgstr "Ver el código fuente de la página" -#: ../midori/midori-browser.c:3861 +#: ../midori/midori-browser.c:4198 msgid "View Selection Source" msgstr "Ver código fuente de la selección" -#: ../midori/midori-browser.c:3862 +#: ../midori/midori-browser.c:4199 msgid "View the source code of the selection" msgstr "Ver el código fuente de la selección" -#: ../midori/midori-browser.c:3866 +#: ../midori/midori-browser.c:4203 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../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 "Retroceder una página" -#: ../midori/midori-browser.c:3874 +#: ../midori/midori-browser.c:4211 msgid "Go forward to the next page" msgstr "Avanzar una página" -#: ../midori/midori-browser.c:3877 +#: ../midori/midori-browser.c:4214 msgid "Go to your homepage" msgstr "Abrir página de inicio" -#: ../midori/midori-browser.c:3879 +#: ../midori/midori-browser.c:4216 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:3880 +#: ../midori/midori-browser.c:4217 msgid "Delete the contents of the trash" msgstr "Borrar el contenido de la papelera" -#: ../midori/midori-browser.c:3882 -#: ../midori/midori-view.c:1233 -msgid "Undo Close Tab" -msgstr "Deshacer el cierre de pestaña" +#: ../midori/midori-browser.c:4219 +msgid "Undo _Close Tab" +msgstr "Des_hacer el cierre de pestaña" -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:4220 msgid "Open the last closed tab" msgstr "Abrir la última pestaña cerrada" -#: ../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 "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:3889 -#: ../panels/midori-bookmarks.c:259 -msgid "Add a new folder" -msgstr "Añadir una nueva carpeta" +#: ../midori/midori-browser.c:4226 +msgid "Add a new _folder" +msgstr "Añadir una nueva _carpeta" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:4227 msgid "Add a new bookmark folder" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:3891 +#: ../midori/midori-browser.c:4228 msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:3893 -#: ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4230 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Administrar motores de búsqueda" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:4231 msgid "Add, edit and remove search engines..." msgstr "Añadir, editar y quitar motores de búsqueda..." -#: ../midori/midori-browser.c:3897 +#: ../midori/midori-browser.c:4234 msgid "_Clear Private Data" msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:3898 +#: ../midori/midori-browser.c:4235 msgid "Clear private data..." msgstr "Borrar datos privados" -#: ../midori/midori-browser.c:3902 +#: ../midori/midori-browser.c:4239 msgid "_Previous Tab" msgstr "_Pestaña anterior" -#: ../midori/midori-browser.c:3903 +#: ../midori/midori-browser.c:4240 msgid "Switch to the previous tab" msgstr "Cambiar a la pestaña anterior" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4242 msgid "_Next Tab" msgstr "_Pestaña siguiente" -#: ../midori/midori-browser.c:3906 +#: ../midori/midori-browser.c:4243 msgid "Switch to the next tab" msgstr "Cambiar a la pestaña siguiente" -#: ../midori/midori-browser.c:3908 +#: ../midori/midori-browser.c:4245 msgid "_Help" msgstr "_Ayuda" -#: ../midori/midori-browser.c:3910 +#: ../midori/midori-browser.c:4247 msgid "_Contents" msgstr "_Contenido" -#: ../midori/midori-browser.c:3911 +#: ../midori/midori-browser.c:4248 msgid "Show the documentation" msgstr "Mostrar la documentación" -#: ../midori/midori-browser.c:3913 +#: ../midori/midori-browser.c:4250 msgid "_Frequent Questions" msgstr "_Preguntas frecuentes" -#: ../midori/midori-browser.c:3914 +#: ../midori/midori-browser.c:4251 msgid "Show the Frequently Asked Questions" msgstr "Mostrar las preguntas más frecuentes" -#: ../midori/midori-browser.c:3916 +#: ../midori/midori-browser.c:4253 msgid "_Report a Bug" msgstr "_Reportar un error" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4254 msgid "Open Midori's bug tracker" msgstr "Abrir el rastreador de errores de Midori" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4257 msgid "Show information about the program" msgstr "Mostrar información sobre el programa" -#: ../midori/midori-browser.c:3927 +#: ../midori/midori-browser.c:4264 msgid "P_rivate Browsing" msgstr "_Navegación privada" -#: ../midori/midori-browser.c:3928 +#: ../midori/midori-browser.c:4265 msgid "Don't save any private data while browsing" msgstr "No guardar datos durante la navegación privada" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4270 msgid "_Menubar" msgstr "_Barra de menú" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4271 msgid "Show menubar" msgstr "Mostrar la barra de menú" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4274 msgid "_Navigationbar" msgstr "_Barra de navegación" -#: ../midori/midori-browser.c:3938 +#: ../midori/midori-browser.c:4275 msgid "Show navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-browser.c:3941 +#: ../midori/midori-browser.c:4278 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:3942 +#: ../midori/midori-browser.c:4279 msgid "Show sidepanel" msgstr "Mostrar el panel 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 la barra de marcadores" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:4286 msgid "_Transferbar" msgstr "_Barra de transferencias" -#: ../midori/midori-browser.c:3950 +#: ../midori/midori-browser.c:4287 msgid "Show transferbar" msgstr "Mostrar la barra de transferencias" -#: ../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 la 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 "Chino (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 "Ruso (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 "Occidental (ISO-8859-1)" + +#: ../midori/midori-browser.c:4317 ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:289 +msgid "Custom..." +msgstr "Personalizado..." + +#: ../midori/midori-browser.c:4755 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:4762 msgid "_Location..." msgstr "_Ubicación..." -#: ../midori/midori-browser.c:4398 +#: ../midori/midori-browser.c:4764 msgid "Open a particular location" msgstr "Abrir una dirección en particular" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4788 msgid "_Web Search..." msgstr "_Buscar en internet..." -#: ../midori/midori-browser.c:4422 +#: ../midori/midori-browser.c:4790 msgid "Run a web search" msgstr "Realizar una búsqueda en internet" -#: ../midori/midori-browser.c:4443 +#: ../midori/midori-browser.c:4811 msgid "Reopen a previously closed tab or window" msgstr "Abrir ventanas o pestañas cerradas" -#: ../midori/midori-browser.c:4458 +#: ../midori/midori-browser.c:4826 msgid "_Recently visited pages" msgstr "_Últimas páginas visitadas" -#: ../midori/midori-browser.c:4460 +#: ../midori/midori-browser.c:4828 msgid "Reopen pages that you visited earlier" msgstr "Abre las páginas que usted visitó 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 los marcadores guardados." -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4860 msgid "_Window" msgstr "_Ventanas" -#: ../midori/midori-browser.c:4494 +#: ../midori/midori-browser.c:4862 msgid "Show a list of all open tabs" msgstr "Mostrar una lista de todas las pestañas abiertas" +#: ../midori/midori-browser.c:4876 +msgid "_Menu" +msgstr "_Menú" + +#: ../midori/midori-browser.c:4878 +msgid "Menu" +msgstr "_Menú" + #. 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 "_Búsqueda en línea:" -#: ../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 "Siguiente" -#: ../midori/midori-browser.c:4709 +#: ../midori/midori-browser.c:5094 msgid "Match Case" msgstr "Sensible mayúsculas " -#: ../midori/midori-browser.c:4717 +#: ../midori/midori-browser.c:5102 msgid "Highlight Matches" msgstr "Destacar coincidencias" -#: ../midori/midori-browser.c:4727 +#: ../midori/midori-browser.c:5112 msgid "Close Findbar" msgstr "Cerrar la barra de búsqueda" -#: ../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 "Eliminar todo" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5476 #, c-format msgid "Unexpected setting '%s'" msgstr "Ajuste no esperado «%s»" +#: ../midori/midori-locationaction.c:901 +#, c-format +msgid "Search with %s" +msgstr "Buscar con %s" + #: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "Separar el panel elegido de la ventana" -#: ../midori/midori-panel.c:335 -msgid "Whether to detach the chosen panel from the window" -msgstr "Separar el panel de la ventana" - -#: ../midori/midori-panel.c:345 -#: ../midori/midori-websettings.c:535 -msgid "Align sidepanel on the right" +#: ../midori/midori-panel.c:343 ../midori/midori-panel.c:508 +msgid "Align sidepanel to the right" msgstr "Alinear el panel a la derecha" -#: ../midori/midori-panel.c:347 -#: ../midori/midori-websettings.c:536 -msgid "Whether to align the sidepanel on the right" -msgstr "Alinear el panel lateral a la derecha" - -#: ../midori/midori-panel.c:357 -#: ../midori/midori-panel.c:358 +#: ../midori/midori-panel.c:353 ../midori/midori-panel.c:354 msgid "Close panel" msgstr "Cerrar panel" -#: ../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 "Alinear el panel a la izquierda" + +#: ../midori/midori-websettings.c:195 ../midori/midori-view.c:2265 msgid "Blank page" msgstr "Página en blanco" -#: ../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 de inicio" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:197 msgid "Last open pages" msgstr "Últimas páginas visitadas" -#: ../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 "Nueva pestaña" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:233 msgid "New window" msgstr "Nueva ventana" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:234 msgid "Current tab" msgstr "Pestaña actual" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:249 msgid "Default" msgstr "Predeterminado" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:250 msgid "Icons" msgstr "Íconos" -#: ../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 "Ambos" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:253 msgid "Both horizontal" msgstr "Ambos en horizontal" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:268 msgid "All cookies" msgstr "Todas las huellas" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:269 msgid "Session cookies" msgstr "Huellas de la sesión" -#: ../midori/midori-websettings.c:262 -#: ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:270 ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:87 msgid "None" msgstr "Ninguna" -#: ../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 "Recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:342 msgid "Whether to save the last window size" msgstr "Si se desea recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:350 msgid "Last window width" msgstr "Última anchura de la ventana" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:351 msgid "The last saved window width" msgstr "Última anchura de la ventana guardada" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:359 msgid "Last window height" msgstr "Última altura de la ventana" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:360 msgid "The last saved window height" msgstr "Última altura guardada de la ventana " -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:385 msgid "Last panel position" msgstr "Última posición del panel" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel position" msgstr "Ultima posición guardada del panel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:395 msgid "Last panel page" msgstr "Última página del panel" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:396 msgid "The last saved panel page" msgstr "Última página guardada del panel" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:404 msgid "Last Web search" msgstr "Última búsqueda en internet" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:405 msgid "The last saved Web search" msgstr "Última búsqueda de internet guardada" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:414 msgid "Show Menubar" msgstr "Mostrar barra de menú" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:415 msgid "Whether to show the menubar" msgstr "Si se desea mostrar la barra de menú" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:423 msgid "Show Navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:424 msgid "Whether to show the navigationbar" msgstr "Si se desea mostrar la barra de navegación" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:432 msgid "Show Bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:433 msgid "Whether to show the bookmarkbar" msgstr "Si se desea mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:441 msgid "Show Panel" msgstr "Mostrar el panel" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the panel" msgstr "Si se desea mostrar el panel" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:457 msgid "Show Transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the transferbar" msgstr "Si se desea mostrar la barra de transferencias" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:466 msgid "Show Statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the statusbar" msgstr "Si se desea mostrar la barra de estado" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style" msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:493 msgid "Show progress in location entry" msgstr "Mostrar progreso en la barra de direcciones" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:494 msgid "Whether to show loading progress in the location entry" msgstr "Si se desea mostrar el progreso de carga en el lugar de entrada" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:509 msgid "Search engines in location completion" msgstr "Motores de búsqueda en completamiento" -#: ../midori/midori-websettings.c:502 -msgid "Whether to show search engines in the location completion" -msgstr "Si se desea mostrar los motores de búsqueda en completamento de dirección" - #: ../midori/midori-websettings.c:510 +msgid "Whether to show search engines in the location completion" +msgstr "" +"Si se desea mostrar los motores de búsqueda en completamento de dirección" + +#: ../midori/midori-websettings.c:518 msgid "Toolbar Items" msgstr "Elementos de la barra de herramientas" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:519 msgid "The items to show on the toolbar" msgstr "Los elementos a mostrar en la barra de herramientas" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:527 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:528 msgid "Whether to make the sidepanel compact" msgstr "Si se desea hacer compacto el panel lateral" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:543 +msgid "Align sidepanel on the right" +msgstr "Alinear el panel a la derecha" + +#: ../midori/midori-websettings.c:544 +msgid "Whether to align the sidepanel on the right" +msgstr "Alinear el panel lateral a la derecha" + +#: ../midori/midori-websettings.c:553 msgid "Load on Startup" msgstr "Al iniciar Midori cargar:" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:554 msgid "What to load on startup" msgstr "Página que se carga al inicio" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:564 msgid "The homepage" msgstr "Página de inicio" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:579 msgid "Show crash dialog" msgstr "Mostrar diálogo de cuelgue" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:580 msgid "Show a dialog after Midori crashed" msgstr "Mostrar un dialogo despues de que Midori se cuelgue" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:596 msgid "Show speed dial in new tabs" -msgstr "Mostrar marcación rápida en una nueva pestaña" +msgstr "Mostrar marcación rápida en nuevas pestañas" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:597 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar marcación rápida en la pestaña abierta recientemente" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:605 msgid "Download Folder" msgstr "Carpeta de descargas" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:606 msgid "The folder downloaded files are saved to" msgstr "Carpeta donde se guardan los archivos descargados" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:625 msgid "Ask for the destination folder" msgstr "Preguntar por la carpeta 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 "Si se desea seleccionar la carpeta de destino cuando se descarga un archivo" +msgstr "" +"Si se desea seleccionar la carpeta de destino cuando se descarga un archivo" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:645 msgid "Notify when a transfer has been completed" -msgstr "Notificarme cuando una transferencia se ha completado" +msgstr "Notificarme sobre las transferencias completas" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:646 msgid "Whether to show a notification when a transfer has been completed" -msgstr "Si se desea mostrar una notificación cuando se ha completado la transferencia" +msgstr "" +"Si se desea mostrar una notificación cuando se ha completado la transferencia" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:658 msgid "Download Manager" msgstr "Gestor de descargas" -#: ../midori/midori-websettings.c:651 +#: ../midori/midori-websettings.c:659 msgid "An external download manager" msgstr "Gestor de descargas 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 "Editor de textos externo" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:683 msgid "News Aggregator" msgstr "Agregador de noticias" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:684 msgid "An external news aggregator" msgstr "Un agregador de noticias externo" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:692 msgid "Location entry Search" msgstr "Búsqueda en la barra" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:693 msgid "The search to perform inside the location entry" msgstr "Hacer una búsqueda a partir del contenido de la barra de direcciones" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:701 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:702 msgid "The preferred character encoding" msgstr "Codificación de caracteres preferida" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:712 msgid "Always Show Tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:713 msgid "Always show the tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:721 msgid "Close Buttons on Tabs" msgstr "Botón de cerrar en las pestañas" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:722 msgid "Whether tabs have close buttons" msgstr "Si se desea que las pestañas tengan el botón de cerrar" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:730 msgid "Open new pages in" msgstr "Abrir páginas nuevas en" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:731 msgid "Where to open new pages" msgstr "Donde abrir las páginas nuevas" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:740 msgid "Open external pages in" msgstr "Abrir las páginas externas en" -#: ../midori/midori-websettings.c:733 +#: ../midori/midori-websettings.c:741 msgid "Where to open externally opened pages" msgstr "Donde abrir las páginas externas" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:754 msgid "Middle click opens Selection" msgstr "Clic del medio abre la selección" -#: ../midori/midori-websettings.c:747 -msgid "Load an address from the selection via middle click" -msgstr "Cargar una dirección desde la selección a través del botón del medio del ratón" - #: ../midori/midori-websettings.c:755 +msgid "Load an address from the selection via middle click" +msgstr "" +"Cargar una dirección desde la selección a través del botón del medio del " +"ratón" + +#: ../midori/midori-websettings.c:763 msgid "Open tabs in the background" msgstr "Abrir pestañas en segundo plano" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:764 msgid "Whether to open new tabs in the background" msgstr "Si se desea que las nuevas pestañas se abran en segundo plano" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:772 msgid "Open Tabs next to Current" msgstr "Abrir pestañas junto a la actual" -#: ../midori/midori-websettings.c:765 -msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o después de la última" - #: ../midori/midori-websettings.c:773 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" +"Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o " +"después de la última" + +#: ../midori/midori-websettings.c:781 msgid "Open popups in tabs" msgstr "Abrir emergentes en pestañas" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:782 msgid "Whether to open popup windows in tabs" msgstr "Si se desea abrir las ventanas emergentes en pestañas" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:798 msgid "Zoom Text and Images" msgstr "Ampliar textos e imágenes" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:799 msgid "Whether to zoom text and images" msgstr "Si se desea ampliar texto e imágenes" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:814 msgid "Find inline while typing" msgstr "Buscar en el texto al escribir" -#: ../midori/midori-websettings.c:807 +#: ../midori/midori-websettings.c:815 msgid "Whether to automatically find inline while typing" msgstr "Si se desea buscar automáticamente en el texto al comenzar a tipear" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:823 msgid "Accept cookies" msgstr "Aceptar huellas" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:824 msgid "What type of cookies to accept" msgstr "Qué tipos de huellas van a ser aceptadas" -#: ../midori/midori-websettings.c:825 +#: ../midori/midori-websettings.c:833 msgid "Original cookies only" msgstr "Sólo huellas originales" -#: ../midori/midori-websettings.c:826 +#: ../midori/midori-websettings.c:834 msgid "Accept cookies from the original website only" msgstr "Sólo se aceptan las huellas del sitio de internet original" -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:842 msgid "Maximum cookie age" msgstr "Duración máxima de las huellas" -#: ../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 días para conservar las huellas" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:853 msgid "Remember last visited pages" msgstr "Recordar las últimas páginas visitadas" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:854 msgid "Whether the last visited pages are saved" msgstr "Si se desea que las últimas páginas visitadas sean recordadas" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:862 msgid "Maximum history age" msgstr "Duración máxima del historial" -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:863 msgid "The maximum number of days to save the history for" msgstr "Número máximo de días para conservar el historial" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:871 msgid "Remember last form inputs" msgstr "Recordar lo que se haya ingresado en formularios" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:872 msgid "Whether the last form inputs are saved" msgstr "Si se desea que las últimas entradas de formulario sean recordadas" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:880 msgid "Remember last downloaded files" msgstr "Recordar los últimos archivos descargados" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:881 msgid "Whether the last downloaded files are saved" msgstr "Si se desea que los archivos descargados sean recordados" -#: ../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 utilizado para conexiones HTTP" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:907 msgid "Detect proxy server automatically" msgstr "Detectar automáticamente el servidor proxy" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:908 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Si se desea detectar automáticamente el servidor proxy desde el entorno" +msgstr "" +"Si se desea detectar automáticamente el servidor proxy desde el entorno" #. 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 como páginas de internet" -#: ../midori/midori-websettings.c:933 +#: ../midori/midori-websettings.c:941 msgid "Identification string" msgstr "Cadena de identificación" -#: ../midori/midori-websettings.c:934 +#: ../midori/midori-websettings.c:942 msgid "The application identification string" msgstr "Aplicación de identificación de cadenas" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:950 msgid "Cache size" msgstr "Tamaño del caché" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:951 msgid "The allowed size of the cache" msgstr "Tamaño asignado a la memoria caché" -#: ../midori/midori-view.c:686 +#: ../midori/midori-websettings.c:966 +msgid "Clear private data" +msgstr "Borrar datos privados" + +#: ../midori/midori-websettings.c:967 +msgid "The private data selected for deletion" +msgstr "" + +#: ../midori/midori-view.c:750 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No se pudo cargar la página «%s»." #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c: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 "Error" -#: ../midori/midori-view.c:691 +#: ../midori/midori-view.c:755 msgid "Try again" msgstr "Inténtelo nuevamente" #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:721 -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:785 ../midori/midori-view.c:2901 #, c-format msgid "Not found - %s" msgstr "No se ha encontrado - %s" -#: ../midori/midori-view.c:1095 +#: ../midori/midori-view.c:1172 msgid "Open _Link" msgstr "Abrir _enlace" -#: ../midori/midori-view.c:1097 +#: ../midori/midori-view.c:1174 msgid "Open Link in New _Tab" msgstr "Abrir enlace en nueva _pestaña" -#: ../midori/midori-view.c:1114 +#: ../midori/midori-view.c:1191 msgid "Open Link in New _Window" msgstr "Abrir enlace en nueva _ventana" -#: ../midori/midori-view.c:1123 +#: ../midori/midori-view.c:1197 msgid "_Download Link destination" msgstr "_Descargar enlace" -#: ../midori/midori-view.c:1129 +#: ../midori/midori-view.c:1203 msgid "_Save Link destination" msgstr "_Guardar enlace" -#: ../midori/midori-view.c:1138 +#: ../midori/midori-view.c:1212 msgid "Download with Download _Manager" msgstr "Descargar con el gestor de descargas" -#: ../midori/midori-view.c:1167 +#: ../midori/midori-view.c:1241 msgid "Search _with" msgstr "Buscar _con" -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1269 msgid "_Search the Web" msgstr "_Buscar en internet" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1279 msgid "Open Address in New _Tab" msgstr "Abrir dirección en una nueva _pestaña " -#: ../midori/midori-view.c:1372 +#: ../midori/midori-view.c:1457 msgid "Open or download file" msgstr "Abrir o descargar archivo" -#: ../midori/midori-view.c:1389 +#: ../midori/midori-view.c:1474 #, c-format msgid "File Type: '%s'" msgstr "Tipo de archivo: '%s'" -#: ../midori/midori-view.c:1392 +#: ../midori/midori-view.c:1477 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de archivo: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c: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 la página - %s" -#: ../midori/midori-view.c:2001 -#: ../midori/midori-view.c:2002 -msgid "Search" -msgstr "Buscar" +#: ../midori/midori-view.c:2089 +msgid "Speed dial" +msgstr "Marcación rápida" -#: ../midori/midori-view.c:2003 +#: ../midori/midori-view.c:2090 msgid "Click to add a shortcut" msgstr "Haga clic aquí para añadir un acceso directo" -#: ../midori/midori-view.c:2004 +#: ../midori/midori-view.c:2091 msgid "Enter shortcut address" msgstr "Introduzca la dirección del acceso directo" -#: ../midori/midori-view.c:2005 +#: ../midori/midori-view.c:2092 msgid "Enter shortcut title" msgstr "Introduzca el título del acceso directo" -#: ../midori/midori-view.c:2006 +#: ../midori/midori-view.c:2093 msgid "Are you sure you want to delete this shortcut?" msgstr "¿Está seguro que desea eliminar éste acceso directo?" -#: ../midori/midori-view.c:2038 +#: ../midori/midori-view.c:2123 #, c-format msgid "Document cannot be displayed" msgstr "El documento no puede ser mostrado" -#: ../midori/midori-view.c:2055 +#: ../midori/midori-view.c:2140 #, c-format msgid "No documentation installed" msgstr "No se dispone de documentación instalada" +#: ../midori/midori-view.c:2487 +msgid "_Duplicate Tab" +msgstr "_Duplicar pestaña" + #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" @@ -1468,8 +1474,7 @@ msgstr "Inicio" msgid "Use current page as homepage" msgstr "Usar la página actual como página de inicio" -#: ../midori/midori-preferences.c:425 -#: ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Transferencias" @@ -1498,166 +1503,169 @@ msgstr "Tamaño de fuente predeterminado utilizado para mostrar texto" msgid "Fixed-width Font Family" msgstr "Fuente de ancho fijo" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:457 msgid "The font family used to display fixed-width text" msgstr "Fuente utilizada para mostrar el texto de ancho fijo" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "Tamaño de fuente utilizada para mostrar el texto de ancho fijo" + +#: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" msgstr "Tamaño mínimo de fuente" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" msgstr "Mínimo tamaño de fuente utilizado para mostrar texto" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:473 msgid "Encoding" msgstr "Codificación" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" msgstr "Codificación de caracteres a utilizar por defecto" #. Page "Behavior" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "Comportamiento" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:484 msgid "Features" msgstr "Características" -#: ../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 "Cargar imágenes automáticamente" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:488 msgid "Load and display images automatically" msgstr "Cargar y mostrar imágenes automáticamente" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:491 msgid "Shrink images automatically" msgstr "Reducir imágenes automáticamente" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:492 msgid "Automatically shrink standalone images to fit" msgstr "Reducir imágenes automáticamente independientemente si caben" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:495 msgid "Print background images" msgstr "Imprimir imágenes de fondo" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:496 msgid "Whether background images should be printed" msgstr "Si se desea imprimir las imágenes de fondo" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:499 msgid "Resizable text areas" msgstr "Áreas de texto dimensionables" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:500 msgid "Whether text areas are resizable" msgstr "Si se desea que las áreas de texto sean dimensionables" -#: ../midori/midori-preferences.c:498 -#: ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Habilitar scripts" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:504 msgid "Enable embedded scripting languages" msgstr "Habilitar script de lenguajes embebidos" -#: ../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 "Habilitar complementos Netscape" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:508 msgid "Enable embedded Netscape plugin objects" msgstr "Habilitar el complemento de objetos embebidos Netscape" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:511 msgid "Enforce 96 dots per inch" msgstr "Aplicar 96 puntos por pulgada" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:512 msgid "Enforce a video dot density of 96 DPI" msgstr "Aplicar una densidad de puntos de video de 96 DPI" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:515 msgid "Enable developer tools" msgstr "Habilitar herramientas de desarrollo" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:516 msgid "Enable special extensions for developers" msgstr "Habilitar extensiones especiales para desarrolladores" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:523 msgid "Spell Checking" msgstr "Corrector ortográfico" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:526 msgid "Enable Spell Checking" msgstr "Habilitar el corrector ortográfico" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:527 msgid "Enable spell checking while typing" msgstr "Habilitar el corrector ortográfico al escribir" -#: ../midori/midori-preferences.c:525 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Lista de idiomas separados con comas que se utilizarán para la corrección ortográfica, por ejemplo \"en_GB,de_DE\"" +#. 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 "" +"Lista de idiomas separados con comas que se utilizarán para la corrección " +"ortográfica, por ejemplo \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:536 msgid "Interface" msgstr "Interfaz" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:537 msgid "Navigationbar" msgstr "Barra de navegación" -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:548 msgid "Browsing" msgstr "Navegación" #. Page "Applications" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:578 msgid "Applications" msgstr "Aplicaciones" -#: ../midori/midori-preferences.c:573 +#: ../midori/midori-preferences.c:579 msgid "External applications" msgstr "Aplicaciones 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 "Red" -#: ../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 "Privacidad" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:659 msgid "Web Cookies" msgstr "Huellas" -#: ../midori/midori-preferences.c:666 -#: ../midori/midori-preferences.c:676 +#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682 msgid "days" msgstr "días" -#: ../midori/midori-searchaction.c:484 -#: ../katze/katze-arrayaction.c:314 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:331 msgid "Empty" msgstr "Vacío" @@ -1681,119 +1689,91 @@ msgstr "_Ícono" msgid "_Token:" msgstr "_Abreviatura:" -#: ../midori/midori-searchaction.c:1195 +#: ../midori/midori-searchaction.c:1209 msgid "Manage Search Engines" msgstr "Administrar los motores de búsqueda" -#: ../midori/midori-searchaction.c:1292 +#: ../midori/midori-searchaction.c:1308 msgid "Use as _default" -msgstr "Utilizar como _predeterminado" +msgstr "_Predeterminado" -#: ../midori/sokoke.c:162 -#: ../midori/sokoke.c:174 +#: ../midori/sokoke.c:172 ../midori/sokoke.c:184 msgid "Could not run external program." msgstr "No se pudo ejecutar la aplicación externa." -#. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:520 -msgid "Warning: You are using a superuser account!" -msgstr "Advertencia: Usted está utilizando una cuenta de superusuario!" - -#: ../midori/sokoke.c:871 +#: ../midori/sokoke.c:862 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/sokoke.c:873 -msgid "_Add Bookmark" -msgstr "_Añadir a marcadores" +#: ../midori/sokoke.c:864 +msgid "Add Boo_kmark" +msgstr "Añadir _Marcadores" -#: ../midori/sokoke.c:874 +#: ../midori/sokoke.c:865 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:875 +#: ../midori/sokoke.c:866 msgid "_Extensions" msgstr "_Extensiones" -#: ../midori/sokoke.c:876 +#: ../midori/sokoke.c:867 msgid "_History" msgstr "_Historial" -#: ../midori/sokoke.c:877 +#: ../midori/sokoke.c:868 msgid "_Homepage" msgstr "_Página de inicio" -#: ../midori/sokoke.c:878 +#: ../midori/sokoke.c:869 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/sokoke.c:879 +#: ../midori/sokoke.c:870 msgid "User_styles" msgstr "_Estilos de usuario" -#: ../midori/sokoke.c:880 +#: ../midori/sokoke.c:871 msgid "New _Tab" msgstr "Nueva _pestaña" -#: ../midori/sokoke.c:881 +#: ../midori/sokoke.c:872 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/sokoke.c:882 +#: ../midori/sokoke.c:873 msgid "Netscape p_lugins" msgstr "C_omplementos Netscape" -#: ../midori/sokoke.c:883 -msgid "_Closed Tabs and Windows" -msgstr "_Pestañas y ventanas cerradas" - -#: ../midori/sokoke.c:884 +#: ../midori/sokoke.c:875 msgid "New _Window" msgstr "Nueva _ventana" -#: ../panels/midori-addons.c:95 -#: ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../panels/midori-addons.c:96 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "Estilos de usuario" -#: ../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 el marcador seleccionado" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" msgstr "Borrar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:591 +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "Añadir una nueva carpeta" + +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Separador" @@ -1801,7 +1781,7 @@ msgstr "Separador" msgid "Console" msgstr "Consola" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensiones" @@ -1821,37 +1801,42 @@ msgstr "Borrar del historial el elemento seleccionado" msgid "Clear the entire history" msgstr "Vaciar el historial completo" -#: ../panels/midori-history.c:599 +#: ../panels/midori-history.c:601 msgid "A week ago" msgstr "Hace una semana" -#: ../panels/midori-history.c:604 +#: ../panels/midori-history.c:606 #, c-format msgid "%d day ago" -msgstr "Hace %d días" +msgid_plural "%d days ago" +msgstr[0] "Hace %d día" +msgstr[1] "Hace %d días" -#: ../panels/midori-history.c:605 -#, c-format -msgid "%d days ago" -msgstr "Hace %d días" - -#: ../panels/midori-history.c:612 +#: ../panels/midori-history.c:614 msgid "Today" msgstr "Hoy" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:616 msgid "Yesterday" msgstr "Ayer" -#: ../panels/midori-plugins.c:87 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "Complementos 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 "" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "" + #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "Se requiere autentificación" @@ -1886,21 +1871,35 @@ msgstr "No se pudo cargar el ícono stock «%s»" msgid "Animation frames are broken" msgstr "Los cuadros de animación están rotos" -#: ../katze/katze-utils.c: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 "La propiedad «%s» no es vá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 "Elegir archivo" -#: ../katze/katze-utils.c:230 +#: ../katze/katze-utils.c:250 msgid "Choose folder" msgstr "Elegir carpeta" +#: ../extensions/adblock.c:128 +msgid "Configure Advertisement filters" +msgstr "" + +#: ../extensions/adblock.c:269 +msgid "Configure _Advertisement filters..." +msgstr "" + +#: ../extensions/adblock.c:526 +msgid "Advertisement blocker" +msgstr "" + +#: ../extensions/adblock.c:527 +msgid "Block advertisements according to a filter list" +msgstr "" + #: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "Pestañas de distintos colores" @@ -1913,11 +1912,44 @@ msgstr "Pestañas de colores" msgid "Tint each tab distinctly" msgstr "Colorear pestañas de distintos colores" -#: ../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 huellas" + +#: ../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 "" +"Elimina todas las huellas. Si se establece un filtro, sólo se eliminarán las " +"\"huellas\" que coincidan con el filtro." + +#: ../extensions/cookie-manager/cookie-manager-page.c:126 +msgid "Expand All" +msgstr "Expandir todo" + +#: ../extensions/cookie-manager/cookie-manager-page.c:133 +msgid "Collapse All" +msgstr "Contraer todo" + +#: ../extensions/cookie-manager/cookie-manager-page.c:460 +msgid "Do you really want to delete all cookies?" +msgstr "¿Está seguro que desea eliminar todas las huellas?" + +#: ../extensions/cookie-manager/cookie-manager-page.c:462 +msgid "Question" +msgstr "Pregunta" + +#: ../extensions/cookie-manager/cookie-manager-page.c:471 +msgid "Only cookies which match the filter will be deleted." +msgstr "Sólo se eliminarán las huellas visibles que coinciden con el filtro." + +#: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" msgstr "Al final de la sesión" -#: ../extensions/cookie-manager.c:204 +#: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format msgid "" "Host: %s\n" @@ -1934,78 +1966,57 @@ msgstr "" "Seguro: %s\n" "Expira: %s" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" msgstr "Si" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" msgstr "No" -#: ../extensions/cookie-manager.c:493 -msgid "Do you really want to delete all cookies?" -msgstr "¿Está seguro que desea eliminar todas las huellas?" - -#: ../extensions/cookie-manager.c:495 -msgid "Question" -msgstr "Pregunta" - -#: ../extensions/cookie-manager.c:504 -msgid "Only cookies which match the filter will be deleted." -msgstr "Sólo se eliminarán las huellas visibles que coinciden con el filtro." - -#: ../extensions/cookie-manager.c:682 +#: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" msgstr "Nombre" -#: ../extensions/cookie-manager.c:742 +#: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" msgstr "_Expandir todo" -#: ../extensions/cookie-manager.c:750 +#: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" msgstr "_Contraer todo" -#: ../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 "Elimina todas las huellas. Si se establece un filtro, sólo se eliminarán las \"huellas\" que coincidan con el filtro." - -#: ../extensions/cookie-manager.c:838 -msgid "Expand All" -msgstr "Expandir todo" - -#: ../extensions/cookie-manager.c:845 -msgid "Collapse All" -msgstr "Contraer todo" - -#: ../extensions/cookie-manager.c:876 +#: ../extensions/cookie-manager/cookie-manager-page.c:923 msgid "Filter:" msgstr "Filtro:" -#: ../extensions/cookie-manager.c:881 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Introduzca una cadena de filtro para mostrar sólo las huellas cuyo nombre o dominio coincide con el filtro ingresado" +#: ../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 "" +"Introduzca una cadena de filtro para mostrar sólo las huellas cuyo nombre o " +"dominio coincide con el filtro ingresado" -#: ../extensions/cookie-manager.c:916 -#: ../extensions/cookie-manager.c:964 -msgid "Cookie Manager" -msgstr "Gestor de huellas" - -#: ../extensions/cookie-manager.c:948 +#: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" msgstr "_Gestor de huellas" -#: ../extensions/cookie-manager.c:965 +#: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" msgstr "Listar, ver y eliminar huellas" #: ../extensions/feed-panel/feed-atom.c:242 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "No se ha podido encontrar los elementos necesarios Atom \"entry\" en los datos XML." +msgstr "" +"No se ha podido encontrar los elementos necesarios Atom \"entry\" en los " +"datos XML." #: ../extensions/feed-panel/feed-atom.c:348 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "No se ha podido encontrar los elementos necesarios Atom \"feed\" en los datos XML." +msgstr "" +"No se ha podido encontrar los elementos necesarios Atom \"feed\" en los " +"datos XML." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:399 @@ -2030,36 +2041,42 @@ msgstr "Eliminar canal" msgid "_Feeds" msgstr "_Canales" -#: ../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 "No se ha podido encontrar el elemento raíz en el canal de información XML." +msgstr "" +"No se ha podido encontrar el elemento raíz en el canal de información XML." -#: ../extensions/feed-panel/feed-parse.c:215 +#: ../extensions/feed-panel/feed-parse.c:225 #, c-format msgid "Unsupported feed format." msgstr "Formato de canal no soportado." -#: ../extensions/feed-panel/feed-parse.c:245 +#: ../extensions/feed-panel/feed-parse.c:255 #, c-format msgid "Failed to parse XML feed: %s" msgstr "No se ha podido analizar el canal XML: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "No se ha podido encontrar el elemento \"channel\" en lo datos XML del RSS" +msgstr "" +"No se ha podido encontrar el elemento \"channel\" en lo datos XML del RSS" #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." msgstr "Versión de RSS no soportada." -#: ../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 "No se ha podido encontrar los elementos necesarios RSS \"item\" en los datos XML." +msgstr "" +"No se ha podido encontrar los elementos necesarios RSS \"item\" en los datos " +"XML." -#: ../extensions/feed-panel/feed-rss.c:229 +#: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "No se ha podido encontrar los elementos necesarios RSS \"channel\" en los datos XML." +msgstr "" +"No se ha podido encontrar los elementos necesarios RSS \"channel\" en los " +"datos XML." #: ../extensions/feed-panel/main.c:114 #, c-format @@ -2083,17 +2100,16 @@ msgstr "Panel de canales" msgid "Read Atom/ RSS feeds" msgstr "Lector de canales Atom/RSS" -#: ../extensions/mouse-gestures/main.c:216 +#: ../extensions/mouse-gestures/main.c:236 msgid "Mouse Gestures" msgstr "Gestos de ratón" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures/main.c:237 msgid "Control Midori by moving the mouse" msgstr "Controlar Midori moviendo el ratón" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Anclar página" @@ -2101,44 +2117,148 @@ msgstr "Anclar página" msgid "_Pageholder" msgstr "_Anclar página" -#: ../extensions/statusbar-features.c:104 +#: ../extensions/shortcuts.c:166 +msgid "Configure Keyboard shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:263 +msgid "Configure Sh_ortcuts..." +msgstr "" + +#: ../extensions/shortcuts.c:295 +msgid "Shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:296 +msgid "View and edit keyboard shortcuts" +msgstr "" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "Imágenes" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "Scripts" + +#: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" msgstr "Barra de funcionalidades" -#: ../extensions/statusbar-features.c:105 +#: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" msgstr "Alternar fácilmente las características de páginas web dentro y fuera" +#: ../extensions/tab-panel.c:293 ../extensions/tab-panel.c:352 +msgid "Tab Panel" +msgstr "Panel de pestañas" + +#: ../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:390 +msgid "Customize Toolbar" +msgstr "" + +#: ../extensions/toolbar-editor.c:406 +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" + +#: ../extensions/toolbar-editor.c:422 +msgid "Available Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:443 +msgid "Displayed Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:584 +msgid "Configure _Toolbar..." +msgstr "" + +#: ../extensions/toolbar-editor.c:613 +msgid "Toolbar Editor" +msgstr "Editor de la barra de herramientas" + +#: ../extensions/toolbar-editor.c:614 +msgid "Easily edit the toolbar layout" +msgstr "" + +#~ msgid "_Quick Find" +#~ msgstr "Búsqueda _rápida" + +#~ msgid "Quickly jump to a word or phrase" +#~ msgstr "Saltar rápidamente a una palabra o una frase" + +#~ msgid "Whether to detach the chosen panel from the window" +#~ msgstr "Separar el panel de la ventana" + +#~ msgid "Search" +#~ msgstr "Buscar" + +#~ msgid "Warning: You are using a superuser account!" +#~ msgstr "Advertencia: Usted está utilizando una cuenta de superusuario!" + +#~ msgid "_Enable" +#~ msgstr "_Activar" + +#~ msgid "Enable" +#~ msgstr "Activar" + +#~ msgid "_Disable" +#~ msgstr "_Desactivar" + +#~ msgid "Disable" +#~ msgstr "Desactivar" + +#~ msgid "%d days ago" +#~ msgstr "Hace %d días" + #~ msgid "P_lugins" #~ msgstr "C_omplementos" + #~ msgid "Plugins" #~ msgstr "Complementos" + #~ msgid "Source" #~ msgstr "Código fuente" + #~ msgid "_Icon (name or file):" #~ msgstr "_Icono (nombre o archivo):" + #~ msgid "%s has no property '%s'" #~ msgstr "%s no tiene la propiedad «%s»" + #~ msgid "%s cannot be assigned to %s.%s" #~ msgstr "%s no puede ser asignado a %s.%s" + #~ msgid "%s.%s cannot be accessed" #~ msgstr "%s.%s no se puede acceder" -#~ msgid "Images" -#~ msgstr "Imágenes" -#~ msgid "Scripts" -#~ msgstr "Scripts" + #~ msgid "Manage search engines" #~ msgstr "Administrar los motores de búsqueda" + #~ msgid "URIs" #~ msgstr "URIs" + #~ msgid "[URIs]" #~ msgstr "[URIs]" + #~ msgid "_URL:" #~ msgstr "_URL " + #~ msgid "Root" #~ msgstr "Raíz" + #~ msgid "HTTP Proxy" #~ msgstr "HTTP Proxy" + #~ msgid "Open URL in New _Tab" #~ msgstr "Abrir URL en una pestaña _nueva" - diff --git a/po/fr.po b/po/fr.po index 99de58d8..55cada9a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,10 +9,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.6\n" +"Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-24 11:14+0200\n" -"PO-Revision-Date: 2009-05-24 11:15+0200\n" +"POT-Creation-Date: 2009-07-20 01:57+0200\n" +"PO-Revision-Date: 2009-06-12 08:11+0200\n" "Last-Translator: Jérôme Guelfucci \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -24,9 +24,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur Internet léger" -#: ../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:281 +#: ../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 msgid "Midori" msgstr "Midori" @@ -85,29 +85,29 @@ msgstr "Impossible de supprimer les anciens éléments de l'historique : %s\n" msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pas pu être enregistrée. %s" -#: ../midori/main.c:770 +#: ../midori/main.c:779 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pas pu être enregistrés. %s" -#: ../midori/main.c: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 "Les signets n'ont pas pu être enregistrés. %s" # pas très content #. 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 "La corbeille n'a pas pu être enregistrée. %s" -#: ../midori/main.c:965 +#: ../midori/main.c:974 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pas pu être enregistrée. %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." @@ -116,943 +116,975 @@ msgstr "" "utilisation. Si cela se produit de façon répétée, essayez l'une des options " "suivantes pour résoudre le problème." -#: ../midori/main.c:1107 +#: ../midori/main.c:1116 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:1111 +#: ../midori/main.c:1120 msgid "Reset the last _session" msgstr "Réinitialiser la dernière _session" -#: ../midori/main.c:1116 +#: ../midori/main.c:1125 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1315 +#: ../midori/main.c:1344 msgid "No filename specified" msgstr "Aucun nom de fichier spécifié" -#: ../midori/main.c:1338 +#: ../midori/main.c:1367 msgid "An unknown error occured." msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1370 +#: ../midori/main.c:1400 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Capture enregistrée sous: %s\n" -#: ../midori/main.c:1391 +#: ../midori/main.c:1435 msgid "Run ADDRESS as a web application" msgstr "Lancer l'ADRESSE spécifiée comme une application internet" -#: ../midori/main.c:1391 +#: ../midori/main.c:1435 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1393 +#: ../midori/main.c:1437 msgid "Use FOLDER as configuration folder" msgstr "Utiliser DOSSIER comme dossier de configuration" -#: ../midori/main.c:1393 +#: ../midori/main.c:1437 msgid "FOLDER" msgstr "DOSSIER" -#: ../midori/main.c:1395 +#: ../midori/main.c:1440 msgid "Run the specified filename as javascript" msgstr "Lancer le fichier spécifié en tant que javascript" -#: ../midori/main.c:1398 +#: ../midori/main.c:1444 msgid "Take a snapshot of the specified URI" msgstr "Prendre une capture de l'URI spécifiée" -#: ../midori/main.c:1401 +#: ../midori/main.c:1447 +msgid "Execute the specified command" +msgstr "" + +#: ../midori/main.c:1449 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1403 +#: ../midori/main.c:1451 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1446 +#: ../midori/main.c:1495 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1469 +#: ../midori/main.c:1518 msgid "Please report comments, suggestions and bugs to:" msgstr "" "Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :" -#: ../midori/main.c:1471 +#: ../midori/main.c:1520 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1548 +#: ../midori/main.c:1602 msgid "The specified configuration folder is invalid." msgstr "Le dossier de configuration specifié n'est pas valide." -#: ../midori/main.c:1583 +#: ../midori/main.c:1638 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1633 +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pas pu être chargés. %s\n" -#: ../midori/main.c:1645 +#: ../midori/main.c:1700 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pas pu être chargés : %s\n" -#: ../midori/main.c:1660 +#: ../midori/main.c:1715 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pas pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1673 +#: ../midori/main.c:1728 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pas pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1686 +#: ../midori/main.c:1741 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pas pu être chargé : %s\n" -#: ../midori/main.c:1698 +#: ../midori/main.c:1753 msgid "The following errors occured:" msgstr "Les erreurs suivantes sont survenues :" -#: ../midori/main.c:1714 +#: ../midori/main.c:1769 msgid "_Ignore" msgstr "_Ignorer" -#: ../midori/midori-array.c:195 +#: ../midori/midori-array.c:250 msgid "File not found." msgstr "Fichier non trouvé." -#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +#: ../midori/midori-array.c:258 ../midori/midori-array.c:267 msgid "Malformed document." msgstr "Document mal formé." -#: ../midori/midori-array.c:338 ../midori/sokoke.c:692 +#: ../midori/midori-array.c:429 ../midori/sokoke.c:700 #, c-format msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/midori-browser.c:297 ../midori/midori-browser.c:3965 -#: ../midori/midori-browser.c:3971 +#: ../midori/midori-browser.c:304 ../midori/midori-browser.c:4177 +#: ../midori/midori-browser.c:4183 msgid "Reload the current page" msgstr "Actualiser la page courante" -#: ../midori/midori-browser.c:308 ../midori/midori-browser.c:3968 +#: ../midori/midori-browser.c:315 ../midori/midori-browser.c:4180 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page courante" -#: ../midori/midori-browser.c:370 +#: ../midori/midori-browser.c:410 #, c-format msgid "%d%% loaded" msgstr "%d%% chargés" -#: ../midori/midori-browser.c:395 +#: ../midori/midori-browser.c:435 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »." -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:617 msgid "New folder" msgstr "Nouveau répertoire" -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:617 msgid "Edit folder" msgstr "Modifier le répertoire" -#: ../midori/midori-browser.c:639 +#: ../midori/midori-browser.c:619 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:639 +#: ../midori/midori-browser.c:619 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:669 +#: ../midori/midori-browser.c:649 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:682 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:701 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:681 ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:720 +#: ../midori/midori-browser.c:700 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:725 ../midori/midori-browser.c:766 +#: ../midori/midori-browser.c:705 ../midori/midori-browser.c:746 msgid "Toplevel folder" msgstr "Répertoire supérieur" -#: ../midori/midori-browser.c:842 +#: ../midori/midori-browser.c:822 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../midori/midori-browser.c:1174 +#: ../midori/midori-browser.c:1169 #, c-format msgid "The file %s has been downloaded." msgstr "Le fichier %s a été téléchargé." -#: ../midori/midori-browser.c:1178 +#: ../midori/midori-browser.c:1173 msgid "Transfer completed" msgstr "Transfert terminé" -#: ../midori/midori-browser.c:1888 +#: ../midori/midori-browser.c:1314 +msgid "Save file" +msgstr "Enregistrer le fichier" + +#: ../midori/midori-browser.c:1960 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:3242 ../panels/midori-bookmarks.c:778 -#: ../panels/midori-history.c:811 +#: ../midori/midori-browser.c:3429 ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:812 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:3249 ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:817 ../extensions/feed-panel/feed-panel.c:542 +#: ../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 "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:3252 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:819 ../extensions/feed-panel/feed-panel.c:544 +#: ../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 "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:3551 +#: ../midori/midori-browser.c:3739 msgid "Clear Private Data" msgstr "Effacer les informations privées" -#: ../midori/midori-browser.c:3554 +#: ../midori/midori-browser.c:3743 msgid "_Clear private data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:3567 +#: ../midori/midori-browser.c:3756 msgid "Clear the following data:" msgstr "Effacer les informations suivantes :" -#: ../midori/midori-browser.c:3575 ../midori/midori-preferences.c:670 +#: ../midori/midori-browser.c:3766 ../midori/midori-preferences.c:675 #: ../panels/midori-history.c:108 msgid "History" msgstr "Historique" -#: ../midori/midori-browser.c:3580 +#: ../midori/midori-browser.c:3771 msgid "Cookies" msgstr "Fichiers témoins / Cookies" -#: ../midori/midori-browser.c:3585 +#: ../midori/midori-browser.c:3776 msgid "'Flash' Cookies" msgstr "Cookies « Flash »" -#: ../midori/midori-browser.c:3590 +#: ../midori/midori-browser.c:3781 msgid "Website icons" msgstr "Icônes des pages Internet" -#: ../midori/midori-browser.c:3596 ../midori/sokoke.c:859 +#: ../midori/midori-browser.c:3786 ../midori/sokoke.c:874 msgid "_Closed Tabs and Windows" msgstr "Onglets et fenêtres _fermés" -#: ../midori/midori-browser.c:3677 +#: ../midori/midori-browser.c:3869 msgid "A lightweight web browser." msgstr "Un navigateur Internet léger." -#: ../midori/midori-browser.c:3685 +#: ../midori/midori-browser.c:3877 msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader \n" "Robert-André Mauchin \n" -"Pascal Gervais " +"Pascal Gervais \n" +"Jérôme Geulfucci " -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:4111 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:3902 +#: ../midori/midori-browser.c:4114 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4117 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:3908 +#: ../midori/midori-browser.c:4120 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:3911 +#: ../midori/midori-browser.c:4123 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:3913 ../midori/midori-view.c:1337 +#: ../midori/midori-browser.c:4125 msgid "Add to Speed _dial" msgstr "Ajouter à la page d'appel rapi_de" -#: ../midori/midori-browser.c:3914 +#: ../midori/midori-browser.c:4126 msgid "Add shortcut to speed dial" msgstr "Ajouter un raccourci à la page d'appel rapide" -#: ../midori/midori-browser.c:3916 +#: ../midori/midori-browser.c:4128 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4129 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:3919 +#: ../midori/midori-browser.c:4131 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4132 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:3923 +#: ../midori/midori-browser.c:4135 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:3926 +#: ../midori/midori-browser.c:4138 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:3928 +#: ../midori/midori-browser.c:4140 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4143 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:3934 ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4146 ../midori/midori-browser.c:4149 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:3940 +#: ../midori/midori-browser.c:4152 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:3943 +#: ../midori/midori-browser.c:4155 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4158 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:4161 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:3951 +#: ../midori/midori-browser.c:4163 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:3952 +#: ../midori/midori-browser.c:4164 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3954 +#: ../midori/midori-browser.c:4166 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:3955 +#: ../midori/midori-browser.c:4167 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4171 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:3961 +#: ../midori/midori-browser.c:4173 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:3962 +#: ../midori/midori-browser.c:4174 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:3974 +#: ../midori/midori-browser.c:4186 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:3977 +#: ../midori/midori-browser.c:4189 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:3980 +#: ../midori/midori-browser.c:4192 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:3981 +#: ../midori/midori-browser.c:4193 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:3983 -msgid "_Automatic" -msgstr "_Automatique" +#: ../midori/midori-browser.c:4195 +msgid "View So_urce" +msgstr "Afficher le code so_urce" -#: ../midori/midori-browser.c:3986 ../midori/midori-websettings.c:208 -msgid "Chinese (BIG5)" -msgstr "Chinois (BIG5)" - -#: ../midori/midori-browser.c:3989 ../midori/midori-websettings.c:209 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japonais (SHIFT_JIS)" - -#: ../midori/midori-browser.c:3992 ../midori/midori-websettings.c:210 -msgid "Russian (KOI8-R)" -msgstr "Russe (KOI8-R)" - -#: ../midori/midori-browser.c:3995 ../midori/midori-websettings.c:211 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-browser.c:3998 ../midori/midori-websettings.c:212 -msgid "Western (ISO-8859-1)" -msgstr "Occidental (ISO-8859-1)" - -#: ../midori/midori-browser.c:4001 ../midori/midori-websettings.c:213 -#: ../midori/midori-websettings.c:285 -msgid "Custom..." -msgstr "Personnalisé..." - -#: ../midori/midori-browser.c:4004 ../midori/midori-view.c:1356 -msgid "View _Source" -msgstr "Afficher la _source" - -#: ../midori/midori-browser.c:4005 +#: ../midori/midori-browser.c:4196 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:4007 +#: ../midori/midori-browser.c:4198 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4199 msgid "View the source code of the selection" msgstr "Afficher le code source de la sélection" -#: ../midori/midori-browser.c:4012 +#: ../midori/midori-browser.c:4203 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:4014 +#: ../midori/midori-browser.c:4205 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:4017 +#: ../midori/midori-browser.c:4208 msgid "Go back to the previous page" msgstr "Aller à la page précédente" -#: ../midori/midori-browser.c:4020 +#: ../midori/midori-browser.c:4211 msgid "Go forward to the next page" msgstr "Aller à la page suivante" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:4214 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:4025 +#: ../midori/midori-browser.c:4216 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:4026 +#: ../midori/midori-browser.c:4217 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:4028 ../midori/midori-view.c:1314 -msgid "Undo Close Tab" -msgstr "Annuler la fermeture de l'onglet" +#: ../midori/midori-browser.c:4219 +msgid "Undo _Close Tab" +msgstr "Annuler la _fermeture de l'onglet" -#: ../midori/midori-browser.c:4029 +#: ../midori/midori-browser.c:4220 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:4033 ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:4224 ../panels/midori-bookmarks.c:231 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:4035 ../panels/midori-bookmarks.c:259 -msgid "Add a new folder" -msgstr "Ajouter un nouveau répertoire" +#: ../midori/midori-browser.c:4226 +msgid "Add a new _folder" +msgstr "Ajouter un nouveau _répertoire" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4227 msgid "Add a new bookmark folder" msgstr "Ajouter un nouveau dossier de signets" -#: ../midori/midori-browser.c:4037 +#: ../midori/midori-browser.c:4228 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:4039 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4230 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:4040 +#: ../midori/midori-browser.c:4231 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:4043 +#: ../midori/midori-browser.c:4234 msgid "_Clear Private Data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:4044 +#: ../midori/midori-browser.c:4235 msgid "Clear private data..." msgstr "Effacer les informations privées..." -#: ../midori/midori-browser.c:4048 +#: ../midori/midori-browser.c:4239 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:4049 +#: ../midori/midori-browser.c:4240 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:4051 +#: ../midori/midori-browser.c:4242 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:4052 +#: ../midori/midori-browser.c:4243 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:4054 +#: ../midori/midori-browser.c:4245 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:4247 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:4057 +#: ../midori/midori-browser.c:4248 msgid "Show the documentation" msgstr "Afficher la documentation" -#: ../midori/midori-browser.c:4059 +#: ../midori/midori-browser.c:4250 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:4060 +#: ../midori/midori-browser.c:4251 msgid "Show the Frequently Asked Questions" msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:4062 +#: ../midori/midori-browser.c:4253 msgid "_Report a Bug" msgstr "_Signaler une anomalie" -#: ../midori/midori-browser.c:4063 +#: ../midori/midori-browser.c:4254 msgid "Open Midori's bug tracker" msgstr "Ouvrir l'outil de suivi d'anomalies de Midori" -#: ../midori/midori-browser.c:4066 +#: ../midori/midori-browser.c:4257 msgid "Show information about the program" msgstr "Afficher les informations sur le programme" -#: ../midori/midori-browser.c:4073 +#: ../midori/midori-browser.c:4264 msgid "P_rivate Browsing" msgstr "Navigation en mode _privé" -#: ../midori/midori-browser.c:4074 +#: ../midori/midori-browser.c:4265 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:4079 +#: ../midori/midori-browser.c:4270 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:4080 +#: ../midori/midori-browser.c:4271 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:4083 +#: ../midori/midori-browser.c:4274 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:4084 +#: ../midori/midori-browser.c:4275 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:4087 +#: ../midori/midori-browser.c:4278 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:4088 +#: ../midori/midori-browser.c:4279 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:4091 +#: ../midori/midori-browser.c:4282 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:4092 +#: ../midori/midori-browser.c:4283 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:4095 +#: ../midori/midori-browser.c:4286 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:4096 +#: ../midori/midori-browser.c:4287 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:4099 +#: ../midori/midori-browser.c:4290 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:4100 +#: ../midori/midori-browser.c:4291 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:4534 +#: ../midori/midori-browser.c:4298 +msgid "_Automatic" +msgstr "_Automatique" + +#: ../midori/midori-browser.c:4301 ../midori/midori-websettings.c:212 +msgid "Chinese (BIG5)" +msgstr "Chinois (BIG5)" + +#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic +#: ../midori/midori-browser.c:4305 +msgid "Japanese (SHIFT__JIS)" +msgstr "Japonais (SHIFT__JIS)" + +#: ../midori/midori-browser.c:4308 ../midori/midori-websettings.c:214 +msgid "Russian (KOI8-R)" +msgstr "Russe (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 "Occidental (ISO-8859-1)" + +#: ../midori/midori-browser.c:4317 ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:289 +msgid "Custom..." +msgstr "Personnalisé..." + +#: ../midori/midori-browser.c:4755 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:4541 +#: ../midori/midori-browser.c:4762 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:4543 +#: ../midori/midori-browser.c:4764 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:4565 +#: ../midori/midori-browser.c:4788 msgid "_Web Search..." msgstr "Recherche _Internet..." -#: ../midori/midori-browser.c:4567 +#: ../midori/midori-browser.c:4790 msgid "Run a web search" msgstr "Lancer une recherche sur Internet" -#: ../midori/midori-browser.c:4588 +#: ../midori/midori-browser.c:4811 msgid "Reopen a previously closed tab or window" msgstr "Réouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:4603 +#: ../midori/midori-browser.c:4826 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:4605 +#: ../midori/midori-browser.c:4828 msgid "Reopen pages that you visited earlier" msgstr "Réouvrir des pages précédemment visitées" -#: ../midori/midori-browser.c:4620 ../midori/sokoke.c:848 +#: ../midori/midori-browser.c:4843 ../midori/sokoke.c:863 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4845 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:4637 +#: ../midori/midori-browser.c:4860 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:4639 +#: ../midori/midori-browser.c:4862 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" +#: ../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:4814 +#: ../midori/midori-browser.c:5059 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5084 msgid "Previous" msgstr "Précedent" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5089 msgid "Next" msgstr "Suivant" -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:5094 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:4857 +#: ../midori/midori-browser.c:5102 msgid "Highlight Matches" msgstr "Surligner les résultats" -#: ../midori/midori-browser.c:4867 +#: ../midori/midori-browser.c:5112 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4902 -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../midori/midori-browser.c:5147 +#: ../extensions/cookie-manager/cookie-manager-page.c:109 msgid "Delete All" msgstr "Supprimer tous" -#: ../midori/midori-browser.c:5224 +#: ../midori/midori-browser.c:5476 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" +#: ../midori/midori-locationaction.c:901 +#, c-format +msgid "Search with %s" +msgstr "Rechercher avec %s" + #: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "Détacher le panneau choisi de la fenêtre" -#: ../midori/midori-panel.c:335 -msgid "Whether to detach the chosen panel from the window" -msgstr "Indique s'il faut détacher le panneau latéral choisi de la fenêtre" - -#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:539 -msgid "Align sidepanel on the right" +#: ../midori/midori-panel.c:343 ../midori/midori-panel.c:508 +msgid "Align sidepanel to the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:540 -msgid "Whether to align the sidepanel on the right" -msgstr "Indique s'il faut aligner le panneau latéral sur la droite" - -#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 +#: ../midori/midori-panel.c:353 ../midori/midori-panel.c:354 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:191 ../midori/midori-view.c:2250 +#: ../midori/midori-panel.c:509 +msgid "Align sidepanel to the left" +msgstr "Aligner le panneau latéral sur la gauche" + +#: ../midori/midori-websettings.c:195 ../midori/midori-view.c:2265 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:192 ../midori/midori-websettings.c:559 +#: ../midori/midori-websettings.c:196 ../midori/midori-websettings.c:563 msgid "Homepage" msgstr "Page d'accueil" -#: ../midori/midori-websettings.c:193 +#: ../midori/midori-websettings.c:197 msgid "Last open pages" msgstr "Dernières pages ouvertes" -#: ../midori/midori-websettings.c:228 +#: ../midori/midori-websettings.c:213 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japonais (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:232 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:233 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:234 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:249 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:250 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:251 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:252 msgid "Both" msgstr "Les deux" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:253 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:268 msgid "All cookies" msgstr "Tous les fichiers témoins" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:269 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:266 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:270 ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:87 msgid "None" msgstr "Aucun" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:286 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:287 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:288 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:341 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:342 msgid "Whether to save the last window size" msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:346 +#: ../midori/midori-websettings.c:350 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:351 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:359 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:360 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:385 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:395 msgid "Last panel page" msgstr "Dernière page du panneau" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:396 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:404 msgid "Last Web search" msgstr "Dernière recherche sur Internet" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:405 msgid "The last saved Web search" msgstr "La dernière recherche sur Internet enregistrée" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:414 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:415 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:423 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:424 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:432 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:433 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:437 +#: ../midori/midori-websettings.c:441 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:457 msgid "Show Transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the transferbar" msgstr "Indique s'il faut afficher la barre de transferts" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:466 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style" msgstr "Style de la barre d'outils" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:493 msgid "Show progress in location entry" msgstr "Progression dans la barre d'adresse" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:494 msgid "Whether to show loading progress in the location entry" msgstr "Indique s'il faut afficher la progression dans la barre d'adresse" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:509 msgid "Search engines in location completion" msgstr "Moteurs de recherche dans la complétion" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:510 msgid "Whether to show search engines in the location completion" msgstr "" "Indique s'il faut afficher les moteurs de recherche dans les résultats de " "complétion de la barre d'adresse" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:518 msgid "Toolbar Items" msgstr "Éléments de la barre d'outils" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:519 msgid "The items to show on the toolbar" msgstr "Les éléments à afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:527 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:528 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau latéral compact" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:543 +msgid "Align sidepanel on the right" +msgstr "Aligner le panneau latéral sur la droite" + +#: ../midori/midori-websettings.c:544 +msgid "Whether to align the sidepanel on the right" +msgstr "Indique s'il faut aligner le panneau latéral sur la droite" + +#: ../midori/midori-websettings.c:553 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:550 +#: ../midori/midori-websettings.c:554 msgid "What to load on startup" msgstr "Éléments à charger au démarrage" -#: ../midori/midori-websettings.c:560 +#: ../midori/midori-websettings.c:564 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:579 msgid "Show crash dialog" msgstr "Fenêtre de fermeture inattendue" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:580 msgid "Show a dialog after Midori crashed" msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:596 msgid "Show speed dial in new tabs" msgstr "Appel rapide dans les nouveaux onglets" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:597 msgid "Show speed dial in newly opened tabs" msgstr "Afficher une page d'appel rapide dans les nouveaux onglets" @@ -1319,121 +1351,125 @@ msgid "The private data selected for deletion" msgstr "Les informations privées sélectionnées pour suppression" # pas très content -#: ../midori/midori-view.c:740 +#: ../midori/midori-view.c:750 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "La page « %s » n'a pu être chargée." #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c:742 ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:752 ../midori/midori-view.c:2897 #: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "Erreur" -#: ../midori/midori-view.c:745 +#: ../midori/midori-view.c:755 msgid "Try again" msgstr "Essayer une autre fois" #. 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:775 ../midori/midori-view.c:2777 +#: ../midori/midori-view.c:785 ../midori/midori-view.c:2901 #, c-format msgid "Not found - %s" msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:1176 +#: ../midori/midori-view.c:1172 msgid "Open _Link" msgstr "Ouvrir le _lien" -#: ../midori/midori-view.c:1178 +#: ../midori/midori-view.c:1174 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1191 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:1204 +#: ../midori/midori-view.c:1197 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:1210 +#: ../midori/midori-view.c:1203 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:1219 +#: ../midori/midori-view.c:1212 msgid "Download with Download _Manager" msgstr "Télécharger avec le _gestionnaire de téléchargements" -#: ../midori/midori-view.c:1248 +#: ../midori/midori-view.c:1241 msgid "Search _with" -msgstr "Chercher _avec" +msgstr "Rechercher _avec" -#: ../midori/midori-view.c:1276 +#: ../midori/midori-view.c:1269 msgid "_Search the Web" -msgstr "_Chercher sur Internet" +msgstr "_Rechercher sur Internet" -#: ../midori/midori-view.c:1286 +#: ../midori/midori-view.c:1279 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:1453 +#: ../midori/midori-view.c:1457 msgid "Open or download file" msgstr "Ouvrir ou télécharger le fichier" -#: ../midori/midori-view.c:1470 +#: ../midori/midori-view.c:1474 #, c-format msgid "File Type: '%s'" msgstr "Type de fichier : « %s »" -#: ../midori/midori-view.c:1473 +#: ../midori/midori-view.c:1477 #, c-format msgid "File Type: %s ('%s')" msgstr "Type de fichier : %s (« %s »)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1477 +#: ../midori/midori-view.c:1481 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../midori/midori-view.c:1886 +#: ../midori/midori-view.c:1899 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:2076 +#: ../midori/midori-view.c:2089 msgid "Speed dial" msgstr "Appel rapide" -#: ../midori/midori-view.c:2077 +#: ../midori/midori-view.c:2090 msgid "Click to add a shortcut" msgstr "Cliquez pour ajouter un raccourci" -#: ../midori/midori-view.c:2078 +#: ../midori/midori-view.c:2091 msgid "Enter shortcut address" msgstr "Entrez l'adresse du raccourci" -#: ../midori/midori-view.c:2079 +#: ../midori/midori-view.c:2092 msgid "Enter shortcut title" msgstr "Entrez le titre du raccourci" -#: ../midori/midori-view.c:2080 +#: ../midori/midori-view.c:2093 msgid "Are you sure you want to delete this shortcut?" msgstr "Ètes-vous certain de vouloir supprimer ce raccourci ?" -#: ../midori/midori-view.c:2110 +#: ../midori/midori-view.c:2123 #, c-format msgid "Document cannot be displayed" msgstr "Le document ne peut être affiché" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2140 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" +#: ../midori/midori-view.c:2487 +msgid "_Duplicate Tab" +msgstr "_Doubler l'onglet" + #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" @@ -1481,165 +1517,170 @@ msgstr "La taille de la police utilisée par défaut pour afficher les textes" msgid "Fixed-width Font Family" msgstr "Police à largeur fixe" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:457 msgid "The font family used to display fixed-width text" msgstr "" "La taille de la police utilisée par défaut pour afficher les textes à " "largeur fixe" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "" +"La taille de la police utilisée pour afficher les textes à largeur fixe" + +#: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" msgstr "Taille minimale de la police" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" msgstr "La taille minimale de la police utilisée pour afficher les textes" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:473 msgid "Encoding" msgstr "Encodage" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" msgstr "Encodage par défaut des caractères" #. Page "Behavior" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:484 msgid "Features" msgstr "Fonctionnalités" -#: ../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 "Charger les images automatiquement" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:488 msgid "Load and display images automatically" msgstr "Charger et afficher les images automatiquement" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:491 msgid "Shrink images automatically" msgstr "Réduire la taille des images" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:492 msgid "Automatically shrink standalone images to fit" msgstr "" "Réduire automatiquement la taille des images pour les adapter à celle de la " "fenêtre" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:495 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:496 msgid "Whether background images should be printed" msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:499 msgid "Resizable text areas" msgstr "Zones de texte redimensionnables" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:500 msgid "Whether text areas are resizable" msgstr "Indique si les zones de texte peuvent être redimensionnées" -#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Activer les scripts" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:504 msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../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 "Activer les greffons Netscape" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:508 msgid "Enable embedded Netscape plugin objects" msgstr "Active la prise en charge interne des greffons Netscape" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:511 msgid "Enforce 96 dots per inch" msgstr "Forcer 96 points par pouce" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:512 msgid "Enforce a video dot density of 96 DPI" msgstr "Force une densité visuelle de 96 DPI" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:515 msgid "Enable developer tools" msgstr "Activer les outils de développement" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:516 msgid "Enable special extensions for developers" msgstr "Activer les extensions spécifiques pour les développeurs" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:523 msgid "Spell Checking" msgstr "Vérificateur d'orthographe" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:526 msgid "Enable Spell Checking" msgstr "Activer la vérification d'orthographe" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:527 msgid "Enable spell checking while typing" msgstr "Activer la vérification d'orthographe lors de la saisie" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:526 +#: ../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 "" -"Une liste de langues séparée par des virgules utilisée pour le correcteur " +"Une liste de langues séparée par des virgules utilisée par le vérificateur " "d'ortographe, par example « fr_FR,de_DE »" #. Page "Interface" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:536 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:532 +#: ../midori/midori-preferences.c:537 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:548 msgid "Browsing" msgstr "Navigation" #. Page "Applications" -#: ../midori/midori-preferences.c:573 +#: ../midori/midori-preferences.c:578 msgid "Applications" msgstr "Applications" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:579 msgid "External applications" msgstr "Applications externes" #. Page "Network" -#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:621 +#: ../midori/midori-preferences.c:625 ../midori/midori-preferences.c:626 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:648 +#: ../midori/midori-preferences.c:653 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:658 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:654 +#: ../midori/midori-preferences.c:659 msgid "Web Cookies" msgstr "Fichiers témoins" -#: ../midori/midori-preferences.c:667 ../midori/midori-preferences.c:677 +#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682 msgid "days" msgstr "jours" @@ -1667,63 +1708,63 @@ msgstr "_Icône :" msgid "_Token:" msgstr "_Identifiant :" -#: ../midori/midori-searchaction.c:1195 +#: ../midori/midori-searchaction.c:1209 msgid "Manage Search Engines" msgstr "Gestion des moteurs de recherche" -#: ../midori/midori-searchaction.c:1292 +#: ../midori/midori-searchaction.c:1308 msgid "Use as _default" msgstr "Par dé_faut" -#: ../midori/sokoke.c:164 ../midori/sokoke.c:176 +#: ../midori/sokoke.c:172 ../midori/sokoke.c:184 msgid "Could not run external program." msgstr "Impossible de lancer le programme externe." -#: ../midori/sokoke.c:847 +#: ../midori/sokoke.c:862 msgid "_Bookmark" msgstr "_Signet" -#: ../midori/sokoke.c:849 -msgid "_Add Bookmark" -msgstr "_Ajouter un signet" +#: ../midori/sokoke.c:864 +msgid "Add Boo_kmark" +msgstr "Ajouter un _signet" -#: ../midori/sokoke.c:850 +#: ../midori/sokoke.c:865 msgid "_Console" msgstr "_Console" -#: ../midori/sokoke.c:851 +#: ../midori/sokoke.c:866 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/sokoke.c:852 +#: ../midori/sokoke.c:867 msgid "_History" msgstr "_Historique" -#: ../midori/sokoke.c:853 +#: ../midori/sokoke.c:868 msgid "_Homepage" msgstr "_Page d'accueil" -#: ../midori/sokoke.c:854 +#: ../midori/sokoke.c:869 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/sokoke.c:855 +#: ../midori/sokoke.c:870 msgid "User_styles" msgstr "_Styles utilisateur" -#: ../midori/sokoke.c:856 +#: ../midori/sokoke.c:871 msgid "New _Tab" msgstr "Nouvel _onglet" -#: ../midori/sokoke.c:857 +#: ../midori/sokoke.c:872 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/sokoke.c:858 +#: ../midori/sokoke.c:873 msgid "Netscape p_lugins" -msgstr "_Greffons Netscape" +msgstr "Greffons _Netscape" -#: ../midori/sokoke.c:860 +#: ../midori/sokoke.c:875 msgid "New _Window" msgstr "Nouvelle _fenêtre" @@ -1735,35 +1776,23 @@ msgstr "Scripts utilisateur" msgid "Userstyles" msgstr "Styles utilisateur" -#: ../panels/midori-addons.c:1031 ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "_Activer" - -#: ../panels/midori-addons.c:1032 ../panels/midori-extensions.c:145 -msgid "Enable" -msgstr "Activer" - -#: ../panels/midori-addons.c:1041 ../panels/midori-extensions.c:154 -msgid "_Disable" -msgstr "_Désactiver" - -#: ../panels/midori-addons.c:1042 ../panels/midori-extensions.c:155 -msgid "Disable" -msgstr "Désactiver" - -#: ../panels/midori-bookmarks.c:107 +#: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "Signets" -#: ../panels/midori-bookmarks.c:238 +#: ../panels/midori-bookmarks.c:239 msgid "Edit the selected bookmark" msgstr "Modifier le signet sélectionné" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../panels/midori-bookmarks.c:591 +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "Ajouter un nouveau répertoire" + +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Séparateur" @@ -1771,7 +1800,7 @@ msgstr "Séparateur" msgid "Console" msgstr "Console" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensions" @@ -1791,29 +1820,26 @@ msgstr "Supprimer l'élément sélectionné dans l'historique" msgid "Clear the entire history" msgstr "Vider l'historique tout entier" -#: ../panels/midori-history.c:602 +#: ../panels/midori-history.c:601 msgid "A week ago" msgstr "Il y a une semaine" -#: ../panels/midori-history.c:607 +#: ../panels/midori-history.c:606 #, c-format msgid "%d day ago" -msgstr "Il y a %d jours" +msgid_plural "%d days ago" +msgstr[0] "Il y a %d jour" +msgstr[1] "Il y a %d jours" -#: ../panels/midori-history.c:608 -#, c-format -msgid "%d days ago" -msgstr "Il y a %d jours" - -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:614 msgid "Today" msgstr "Aujourd'hui" -#: ../panels/midori-history.c:617 +#: ../panels/midori-history.c:616 msgid "Yesterday" msgstr "Hier" -#: ../panels/midori-plugins.c:87 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "Greffons Netscape" @@ -1822,6 +1848,14 @@ msgstr "Greffons Netscape" msgid "%s of %s" msgstr "%s de %s" +#: ../panels/midori-transfers.c:479 +msgid "Open Destination _Folder" +msgstr "Ouvrir le _dossier de destination" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "Copier l'_adresse du lien" + #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "Authentification requise" @@ -1856,32 +1890,32 @@ msgstr "L'icône prédéfinie « %s » n'a pu être chargée." msgid "Animation frames are broken" msgstr "Les trames d'animation sont corrompues" -#: ../katze/katze-utils.c: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 "La propriété « %s » n'est pas valide pour %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 "Choisissez un fichier" -#: ../katze/katze-utils.c:230 +#: ../katze/katze-utils.c:250 msgid "Choose folder" msgstr "Choisissez un répertoire" -#: ../extensions/adblock.c:78 +#: ../extensions/adblock.c:128 msgid "Configure Advertisement filters" msgstr "Configurer les filtres de publicité" -#: ../extensions/adblock.c:214 +#: ../extensions/adblock.c:269 msgid "Configure _Advertisement filters..." msgstr "Configurer les filtres de _publicité" -#: ../extensions/adblock.c:374 +#: ../extensions/adblock.c:526 msgid "Advertisement blocker" msgstr "Bloqueur de publicités" -#: ../extensions/adblock.c:375 +#: ../extensions/adblock.c:527 msgid "Block advertisements according to a filter list" msgstr "Bloquer les publicités en fonction d'une liste de filtres" @@ -1897,20 +1931,12 @@ msgstr "Onglets colorés" msgid "Tint each tab distinctly" msgstr "Donner une couleur distincte à chaque onglet" -#: ../extensions/cookie-manager/cookie-manager.c:105 -msgid "_Cookie Manager" -msgstr "Gestionnaire de _cookies" - -#: ../extensions/cookie-manager/cookie-manager.c:121 -#: ../extensions/cookie-manager/cookie-manager-page.c:83 +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 msgid "Cookie Manager" msgstr "Gestionnaire de cookies" -#: ../extensions/cookie-manager/cookie-manager.c:122 -msgid "List, view and delete cookies" -msgstr "Lister, afficher et supprimer les fichiers témoins" - -#: ../extensions/cookie-manager/cookie-manager-page.c:131 +#: ../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." @@ -1918,31 +1944,31 @@ msgstr "" "Effacer tous les fichiers témoins. S'il y a un filtre, seulement les fichies " "témoins sont effacé que correspandent au filtre." -#: ../extensions/cookie-manager/cookie-manager-page.c:146 +#: ../extensions/cookie-manager/cookie-manager-page.c:126 msgid "Expand All" msgstr "Afficher tous" -#: ../extensions/cookie-manager/cookie-manager-page.c:153 +#: ../extensions/cookie-manager/cookie-manager-page.c:133 msgid "Collapse All" msgstr "Masquer tous" -#: ../extensions/cookie-manager/cookie-manager-page.c:474 +#: ../extensions/cookie-manager/cookie-manager-page.c:460 msgid "Do you really want to delete all cookies?" msgstr "Ètes-vous certain de vouloir effacer tout les cookies ?" -#: ../extensions/cookie-manager/cookie-manager-page.c:476 +#: ../extensions/cookie-manager/cookie-manager-page.c:462 msgid "Question" msgstr "Question" -#: ../extensions/cookie-manager/cookie-manager-page.c:485 +#: ../extensions/cookie-manager/cookie-manager-page.c:471 msgid "Only cookies which match the filter will be deleted." msgstr "Seuls les fichiers témoins qui correspondent au filtre seront effacés." -#: ../extensions/cookie-manager/cookie-manager-page.c:553 +#: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" msgstr "À la fin de la session" -#: ../extensions/cookie-manager/cookie-manager-page.c:556 +#: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format msgid "" "Host: %s\n" @@ -1959,32 +1985,32 @@ msgstr "" "Sécuritaire : %s\n" "Expire : %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:562 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" msgstr "Oui" -#: ../extensions/cookie-manager/cookie-manager-page.c:562 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" msgstr "Non" -#: ../extensions/cookie-manager/cookie-manager-page.c:819 +#: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" msgstr "Nom" -#: ../extensions/cookie-manager/cookie-manager-page.c:884 +#: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" msgstr "_Afficher tous" -#: ../extensions/cookie-manager/cookie-manager-page.c:892 +#: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" msgstr "_Masquer tous" # manque un raccourcis Alt+X -#: ../extensions/cookie-manager/cookie-manager-page.c:942 +#: ../extensions/cookie-manager/cookie-manager-page.c:923 msgid "Filter:" msgstr "Filtre :" -#: ../extensions/cookie-manager/cookie-manager-page.c:947 +#: ../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" @@ -1992,6 +2018,14 @@ msgstr "" "Entrer un filtre pour afficher seulement les cookies dont le nom ou le " "domaine correspond au filtre entré." +#: ../extensions/cookie-manager/main.c:40 +msgid "_Cookie Manager" +msgstr "Gestionnaire de _cookies" + +#: ../extensions/cookie-manager/main.c:57 +msgid "List, view and delete cookies" +msgstr "Lister, afficher et supprimer les fichiers témoins" + #: ../extensions/feed-panel/feed-atom.c:242 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" @@ -2081,11 +2115,11 @@ msgstr "Panneau de flux" msgid "Read Atom/ RSS feeds" msgstr "Lire des flux Atom et RSS" -#: ../extensions/mouse-gestures/main.c:244 +#: ../extensions/mouse-gestures/main.c:236 msgid "Mouse Gestures" msgstr "Mouvements de souris" -#: ../extensions/mouse-gestures/main.c:245 +#: ../extensions/mouse-gestures/main.c:237 msgid "Control Midori by moving the mouse" msgstr "Contrôler Midori par des mouvements de la souris" @@ -2098,12 +2132,78 @@ msgstr "Cadre de pages" msgid "_Pageholder" msgstr "Cadre de _pages" -#: ../extensions/statusbar-features.c:104 +#: ../extensions/shortcuts.c:166 +msgid "Configure Keyboard shortcuts" +msgstr "Configurer les raccourcis clavier" + +#: ../extensions/shortcuts.c:263 +msgid "Configure Sh_ortcuts..." +msgstr "Configurer les racc_ourcis..." + +#: ../extensions/shortcuts.c:295 +msgid "Shortcuts" +msgstr "Raccourcis" + +#: ../extensions/shortcuts.c:296 +msgid "View and edit keyboard shortcuts" +msgstr "Afficher et modifier les raccourcis clavier" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "Images" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "Scripts" + +#: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" msgstr "Fonctionnalités dans la barre d'état" -#: ../extensions/statusbar-features.c:105 +#: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" msgstr "" "Permet de facilement activer et désactiver des fonctionnalités sur les pages " "Internet" + +#: ../extensions/tab-panel.c:293 ../extensions/tab-panel.c:352 +msgid "Tab Panel" +msgstr "Panneau d'onglets" + +#: ../extensions/tab-panel.c:336 +msgid "T_ab Panel" +msgstr "P_anneau d'onglets" + +#: ../extensions/tab-panel.c:353 +msgid "Show tabs in a vertical panel" +msgstr "" + +#: ../extensions/toolbar-editor.c:390 +msgid "Customize Toolbar" +msgstr "" + +#: ../extensions/toolbar-editor.c:406 +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" + +#: ../extensions/toolbar-editor.c:422 +msgid "Available Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:443 +msgid "Displayed Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:584 +msgid "Configure _Toolbar..." +msgstr "Configurer la barre d'outi_ls..." + +#: ../extensions/toolbar-editor.c:613 +msgid "Toolbar Editor" +msgstr "Editeur de la barre d'outils" + +#: ../extensions/toolbar-editor.c:614 +msgid "Easily edit the toolbar layout" +msgstr "Personnaliser la barre d'outils à l'aise" diff --git a/po/it.po b/po/it.po index 7248ca8b..1b778444 100644 --- a/po/it.po +++ b/po/it.po @@ -2,17 +2,18 @@ # Copyright (C) YEAR THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Sergio Durzu 2009 +# Luca Perri 2009 # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.4\n" +"Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-03 09:50+0100\n" -"PO-Revision-Date: 2009-03-03 10:06+0100\n" -"Last-Translator: Sergio Durzu \n" +"POT-Creation-Date: 2009-05-10 16:06+0200\n" +"PO-Revision-Date: 2009-06-27 16:33+0100\n" +"Last-Translator: Luca Perri \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../data/midori.desktop.in.h:1 @@ -20,11 +21,11 @@ msgid "Lightweight web browser" msgstr "Browser web leggero" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1596 -#: ../midori/main.c:1702 -#: ../midori/main.c:1711 -#: ../midori/main.c:1722 -#: ../midori/midori-websettings.c:267 +#: ../midori/main.c:1315 +#: ../midori/main.c:1449 +#: ../midori/main.c:1457 +#: ../midori/main.c:1468 +#: ../midori/midori-websettings.c:277 msgid "Midori" msgstr "Midori" @@ -32,1210 +33,1440 @@ msgstr "Midori" msgid "Web Browser" msgstr "Browser web" -#: ../midori/main.c:106 +#: ../midori/main.c:96 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Le impostazioni non possono essere caricate: %s\n" -#: ../midori/main.c:161 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Il valore «%s» non è valido per %s" -#: ../midori/main.c:168 +#: ../midori/main.c:158 #: ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valore di configurazione «%s» non valido" -#: ../midori/main.c:480 -msgid "File not found." -msgstr "File non trovato." - -#: ../midori/main.c:488 -#: ../midori/main.c:497 -msgid "Malformed document." -msgstr "Documento corrotto." - -#: ../midori/main.c:519 +#: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" msgstr "Errore nella connessione al database: %s\n" -#: ../midori/main.c:551 +#: ../midori/main.c:382 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Errore nell'esecuzione della richiesta al database: %s\n" -#: ../midori/main.c:605 +#: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Errore nell'eliminazione dell'elemento della cronologia: %s\n" -#: ../midori/main.c:629 +#: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" msgstr "Errore nella cancellazione della cronologia: %s\n" -#: ../midori/main.c:652 -#: ../midori/main.c:686 -#: ../midori/main.c:702 +#: ../midori/main.c:483 +#: ../midori/main.c:517 +#: ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" msgstr "Errore nell'inserimento dell'elemento nella cronologia: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:882 +#: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Errore nella cancellazione dei vecchi elementi della cronologia: %s\n" -#: ../midori/main.c:910 +#: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Le impostazioni non possono essere salvate. %s" -#: ../midori/main.c:939 +#: ../midori/main.c:770 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "I motori di ricerca non possono essere salvati. %s" -#: ../midori/main.c:1069 -#: ../midori/sokoke.c:617 -#, c-format -msgid "Writing failed." -msgstr "Errore di scrittura." - -#: ../midori/main.c:1090 -#: ../midori/main.c:1117 -#: ../midori/main.c:1145 +#: ../midori/main.c:789 +#: ../midori/main.c:817 +#: ../midori/main.c:846 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "I segnalibri non possono essere salvati. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1169 -#: ../midori/main.c:1193 +#: ../midori/main.c:869 +#: ../midori/main.c:892 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Il cestino non può essere salvato. %s" -#: ../midori/main.c:1224 -#: ../midori/midori-preferences.c:404 -msgid "Transfers" -msgstr "Download" - -#: ../midori/main.c:1265 +#: ../midori/main.c:965 #, c-format msgid "The session couldn't be saved. %s" msgstr "La sessione non può essere salvata. %s" -#: ../midori/main.c:1398 +#: ../midori/main.c:1092 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori sembra essersi chiuso inaspettatamente l'ultima volta che è stato usato. Se dovesse capitare spesso, provare una delle seguenti opzioni per risolvere il problema." -#: ../midori/main.c:1413 +#: ../midori/main.c:1107 msgid "Modify _preferences" msgstr "Modifica _preferenze" -#: ../midori/main.c:1417 +#: ../midori/main.c:1111 msgid "Reset the last _session" msgstr "Reimposta l'ultima _sessione" -#: ../midori/main.c:1422 +#: ../midori/main.c:1116 msgid "Disable all _extensions" msgstr "Disabilita tutte le _estensioni" -#: ../midori/main.c:1596 +#: ../midori/main.c:1315 msgid "No filename specified" msgstr "Nessun file specificato" -#: ../midori/main.c:1628 -#: ../midori/gjs.c:514 +#: ../midori/main.c:1338 msgid "An unknown error occured." msgstr "Si è presentato un errore sconosciuto" -#: ../midori/main.c:1651 +#: ../midori/main.c:1370 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Istantanea salvata in: %s\n" + +#: ../midori/main.c:1391 +msgid "Run ADDRESS as a web application" +msgstr "Esegui INDIRIZZO come applicazione web" + +#: ../midori/main.c:1391 +msgid "ADDRESS" +msgstr "INDIRIZZO" + +#: ../midori/main.c:1393 +msgid "Use FOLDER as configuration folder" +msgstr "Usa CARTELLA come cartella di configurazione" + +#: ../midori/main.c:1393 +msgid "FOLDER" +msgstr "CARTELLA" + +#: ../midori/main.c:1395 msgid "Run the specified filename as javascript" msgstr "Esegue il file specificato come javascript" -#: ../midori/main.c:1653 +#: ../midori/main.c:1398 +msgid "Take a snapshot of the specified URI" +msgstr "Scatta istantanea dell'URL specificato" + +#: ../midori/main.c:1401 msgid "Display program version" msgstr "Visualizza la versione dell'applicazione" -#: ../midori/main.c:1655 +#: ../midori/main.c:1403 msgid "Addresses" msgstr "Indirizzi" -#: ../midori/main.c:1699 +#: ../midori/main.c:1446 msgid "[Addresses]" msgstr "[Indirizzi]" -#: ../midori/main.c:1723 +#: ../midori/main.c:1469 msgid "Please report comments, suggestions and bugs to:" msgstr "Segnalare commenti, suggerimenti e bug su:" -#: ../midori/main.c:1725 +#: ../midori/main.c:1471 msgid "Check for new versions at:" msgstr "Controlla nuove versioni su:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1548 +msgid "The specified configuration folder is invalid." +msgstr "La cartella di configurazione specificata non è accettabile. %s" + +#: ../midori/main.c:1583 msgid "An instance of Midori is already running but not responding.\n" msgstr "Un'istanza di Midori è già in esecuzione, ma non risponde.\n" -#: ../midori/main.c:1820 +#: ../midori/main.c:1633 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "I motori di ricerca non possono essere caricati. %s\n" -#: ../midori/main.c:1832 +#: ../midori/main.c:1645 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "I segnalibri non possono essere caricati: %s\n" -#: ../midori/main.c:1847 +#: ../midori/main.c:1660 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La sessione non può essere caricata: %s\n" -#: ../midori/main.c:1860 +#: ../midori/main.c:1673 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Il cestino non può essere caricato: %s\n" -#: ../midori/main.c:1873 +#: ../midori/main.c:1686 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "La cronologia non può essere caricata: %s\n" -#: ../midori/main.c:1885 +#: ../midori/main.c:1698 msgid "The following errors occured:" msgstr "Si sono presentati i seguenti errori:" -#: ../midori/main.c:1901 +#: ../midori/main.c:1714 msgid "_Ignore" msgstr "_Ignora" -#: ../midori/midori-browser.c:277 -#: ../midori/midori-browser.c:3055 -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "File non trovato." + +#: ../midori/midori-array.c:203 +#: ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Documento corrotto." + +#: ../midori/midori-array.c:338 +#: ../midori/sokoke.c:716 +#, c-format +msgid "Writing failed." +msgstr "Errore di scrittura." + +#: ../midori/midori-browser.c:287 +#: ../midori/midori-browser.c:3819 +#: ../midori/midori-browser.c:3825 msgid "Reload the current page" msgstr "Ricarica la pagina corrente" -#: ../midori/midori-browser.c:288 -#: ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:298 +#: ../midori/midori-browser.c:3822 msgid "Stop loading the current page" msgstr "Interrompe il caricamento della pagina corrente" -#: ../midori/midori-browser.c:350 +#: ../midori/midori-browser.c:360 #, c-format msgid "%d%% loaded" msgstr "%d%% caricato" -#: ../midori/midori-browser.c:375 +#: ../midori/midori-browser.c:385 #, c-format msgid "Unexpected action '%s'." msgstr "Azione inaspettata: '%s'" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:603 msgid "New folder" msgstr "Nuova cartella" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:603 msgid "Edit folder" msgstr "Modifica cartella" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:605 msgid "New bookmark" msgstr "Nuovo segnalibro" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:605 msgid "Edit bookmark" msgstr "Modifica segnalibro" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:635 msgid "_Title:" msgstr "_Titolo:" -#: ../midori/midori-browser.c:597 -#: ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:648 +#: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Descrizione:" -#: ../midori/midori-browser.c:616 -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:667 +#: ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Indirizzo:" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:686 msgid "_Folder:" msgstr "_Cartella:" -#: ../midori/midori-browser.c:640 -#: ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:691 +#: ../midori/midori-browser.c:732 msgid "Toplevel folder" msgstr "Livello principale" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:808 msgid "Save file as" msgstr "Salva come" -#: ../midori/midori-browser.c:1372 +#: ../midori/midori-browser.c:1119 +#, c-format +msgid "The file %s has been downloaded." +msgstr "Il file %s è stato scaricato." + +#: ../midori/midori-browser.c:1123 +msgid "Transfer completed" +msgstr "Trasferimento completato" + +#: ../midori/midori-browser.c:1820 msgid "Open file" msgstr "Apri file" -#: ../midori/midori-browser.c:2634 -#: ../panels/midori-bookmarks.c:776 -#: ../panels/midori-history.c:810 +#: ../midori/midori-browser.c:3152 +#: ../panels/midori-bookmarks.c:778 +#: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Apri _tutti in nuove schede" -#: ../midori/midori-browser.c:2641 -#: ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:816 +#: ../midori/midori-browser.c:3159 +#: ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 +#: ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Apri in una nuova sc_heda" -#: ../midori/midori-browser.c:2644 -#: ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:818 +#: ../midori/midori-browser.c:3162 +#: ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:816 +#: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Apri in una nuova _finestra" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:3425 +msgid "Clear Private Data" +msgstr "Pulizia dati personali" + +#: ../midori/midori-browser.c:3428 +msgid "_Clear private data" +msgstr "_Pulizia dati personali" + +#: ../midori/midori-browser.c:3441 +msgid "Clear the following data:" +msgstr "Rimuovi i seguenti dati:" + +#: ../midori/midori-browser.c:3449 +#: ../midori/midori-preferences.c:669 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Cronologia" + +#: ../midori/midori-browser.c:3452 +msgid "Cookies" +msgstr "Cookie" + +#: ../midori/midori-browser.c:3455 +msgid "'Flash' Cookies" +msgstr "Cookie 'Flash'" + +#: ../midori/midori-browser.c:3458 +msgid "Website icons" +msgstr "Icone del sito" + +#: ../midori/midori-browser.c:3538 msgid "A lightweight web browser." msgstr "Un browser web leggero" -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:3546 msgid "translator-credits" -msgstr "Sergio Durzu " +msgstr "" +"Sergio Durzu \n" +"Luca Perri " -#: ../midori/midori-browser.c:2989 +#: ../midori/midori-browser.c:3750 msgid "_File" msgstr "_File" -#: ../midori/midori-browser.c:2992 +#: ../midori/midori-browser.c:3753 msgid "Open a new window" msgstr "Apre una nuova finestra" -#: ../midori/midori-browser.c:2995 +#: ../midori/midori-browser.c:3756 msgid "Open a new tab" msgstr "Apre una nuova scheda" -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:3759 msgid "Open a file" msgstr "Apre un file" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3762 msgid "Save to a file" msgstr "Salva un file" -#: ../midori/midori-browser.c:3003 +#: ../midori/midori-browser.c:3764 +#: ../midori/midori-view.c:1256 +msgid "Add to Speed _dial" +msgstr "Aggiungi a Selezione_veloce" + +#: ../midori/midori-browser.c:3765 +msgid "Add shortcut to speed dial" +msgstr "Aggiungi collegamento a selezione veloce" + +#: ../midori/midori-browser.c:3767 msgid "_Close Tab" msgstr "_Chiudi scheda" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3768 msgid "Close the current tab" msgstr "Chiude la scheda corrente" -#: ../midori/midori-browser.c:3006 +#: ../midori/midori-browser.c:3770 msgid "C_lose Window" -msgstr "Chiudi _finestra" +msgstr "C_hiudi finestra" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3771 msgid "Close this window" msgstr "Chiude la finestra" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3774 msgid "Print the current page" msgstr "Stampa la pagina corrente" -#: ../midori/midori-browser.c:3013 +#: ../midori/midori-browser.c:3777 msgid "Quit the application" msgstr "Esce dall'applicazione" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3779 msgid "_Edit" msgstr "_Modifica" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3782 msgid "Cut the selected text" msgstr "Taglia il testo selezionato" -#: ../midori/midori-browser.c:3021 -#: ../midori/midori-browser.c:3024 +#: ../midori/midori-browser.c:3785 +#: ../midori/midori-browser.c:3788 msgid "Copy the selected text" msgstr "Copia il testo selezionato" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3791 msgid "Paste text from the clipboard" msgstr "Incolla il testo dagli appunti" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3794 msgid "Delete the selected text" msgstr "Elimina il testo selezionato" -#: ../midori/midori-browser.c:3033 +#: ../midori/midori-browser.c:3797 msgid "Select all text" msgstr "Seleziona tutto" -#: ../midori/midori-browser.c:3036 +#: ../midori/midori-browser.c:3800 msgid "Find a word or phrase in the page" msgstr "Cerca una parola o una frase nella pagina" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3802 msgid "Find _Next" msgstr "Trova _successivo" -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3803 msgid "Find the next occurrence of a word or phrase" msgstr "Trova la parola o frase successiva" -#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3805 msgid "Find _Previous" msgstr "Trova _precedente" -#: ../midori/midori-browser.c:3042 +#: ../midori/midori-browser.c:3806 msgid "Find the previous occurrence of a word or phrase" msgstr "Trova la parola o frase precedente" -#: ../midori/midori-browser.c:3045 +#: ../midori/midori-browser.c:3809 msgid "_Quick Find" msgstr "Ricerca _veloce" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3810 msgid "Quickly jump to a word or phrase" msgstr "Salta velocemente a una parola o frase" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3813 msgid "Configure the application preferences" msgstr "Imposta le preferenze dell'applicazione" -#: ../midori/midori-browser.c:3051 +#: ../midori/midori-browser.c:3815 msgid "_View" msgstr "_Visualizza" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3816 msgid "_Toolbars" msgstr "_Barre degli strumenti" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3828 msgid "Increase the zoom level" msgstr "Aumenta il livello di ingrandimento" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3831 msgid "Decrease the zoom level" msgstr "Diminuisce il livello di ingrandimento" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3834 msgid "Reset the zoom level" msgstr "Azzera il livello di ingrandimento" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3835 msgid "_Encoding" msgstr "_Codifica" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3837 msgid "_Automatic" msgstr "_Automatico" -#: ../midori/midori-browser.c:3076 -#: ../midori/midori-websettings.c:194 +#: ../midori/midori-browser.c:3840 +#: ../midori/midori-websettings.c:204 msgid "Chinese (BIG5)" msgstr "Cinese (BIGS)" -#: ../midori/midori-browser.c:3079 -#: ../midori/midori-websettings.c:195 +#: ../midori/midori-browser.c:3843 +#: ../midori/midori-websettings.c:205 msgid "Japanese (SHIFT_JIS)" msgstr "Giapponese (SHIFT_JIS)" -#: ../midori/midori-browser.c:3082 -#: ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3846 +#: ../midori/midori-websettings.c:206 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:3085 -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3849 +#: ../midori/midori-websettings.c:207 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3088 -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3852 +#: ../midori/midori-websettings.c:208 msgid "Western (ISO-8859-1)" msgstr "Occidentale (ISO-8859-1)" -#: ../midori/midori-browser.c:3091 -#: ../midori/midori-websettings.c:199 -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-browser.c:3855 +#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:281 msgid "Custom..." msgstr "Personalizzato..." -#: ../midori/midori-browser.c:3094 -#: ../midori/midori-view.c:1077 +#: ../midori/midori-browser.c:3858 +#: ../midori/midori-view.c:1275 msgid "View _Source" msgstr "Visualizza _sorgente" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3859 msgid "View the source code of the page" msgstr "Visualizza il codice sorgente della pagina" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3861 msgid "View Selection Source" msgstr "Visualizza sorgente selezione" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3862 msgid "View the source code of the selection" msgstr "Visualizza il codice sorgente della selezione" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3866 msgid "Toggle fullscreen view" msgstr "Schermo intero" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3868 msgid "_Go" msgstr "_Vai" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3871 msgid "Go back to the previous page" msgstr "Va alla pagina precedente" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3874 msgid "Go forward to the next page" msgstr "Va alla pagina successiva" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3877 msgid "Go to your homepage" msgstr "Va alla pagina iniziale" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3879 msgid "Empty Trash" msgstr "Svuota cestino" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3880 msgid "Delete the contents of the trash" msgstr "Elimina il contenuto del cestino" -#: ../midori/midori-browser.c:3118 -#: ../midori/midori-view.c:1049 +#: ../midori/midori-browser.c:3882 +#: ../midori/midori-view.c:1233 msgid "Undo Close Tab" msgstr "Annulla chiusura scheda" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3883 msgid "Open the last closed tab" msgstr "Apre l'ultima scheda chiusa" -#: ../midori/midori-browser.c:3123 -#: ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3887 +#: ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Aggiunge un nuovo segnalibro" -#: ../midori/midori-browser.c:3124 -msgid "_Tools" -msgstr "S_trumenti" +#: ../midori/midori-browser.c:3889 +#: ../panels/midori-bookmarks.c:259 +msgid "Add a new folder" +msgstr "Aggiungi una nuova cartella" -#: ../midori/midori-browser.c:3126 -#: ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3890 +msgid "Add a new bookmark folder" +msgstr "Aggiunge un nuova cartella di preferiti" + +#: ../midori/midori-browser.c:3891 +msgid "_Tools" +msgstr "_Strumenti" + +#: ../midori/midori-browser.c:3893 +#: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gestisci _motori di ricerca" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3894 msgid "Add, edit and remove search engines..." msgstr "Aggiunge, modifica e elimina motori di ricerca..." -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3897 +msgid "_Clear Private Data" +msgstr "_Rimuovi dati privati" + +#: ../midori/midori-browser.c:3898 +msgid "Clear private data..." +msgstr "Rimozione dati privati..." + +#: ../midori/midori-browser.c:3902 msgid "_Previous Tab" msgstr "Scheda _precedente" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3903 msgid "Switch to the previous tab" msgstr "Passa alla scheda precedente" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3905 msgid "_Next Tab" msgstr "Scheda _successiva" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3906 msgid "Switch to the next tab" msgstr "Passa alla scheda successiva" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3908 msgid "_Help" msgstr "_Aiuto" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3910 msgid "_Contents" msgstr "_Sommario" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3911 msgid "Show the documentation" msgstr "Mostra la documentazione" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3913 msgid "_Frequent Questions" msgstr "Domande _frequenti" -#: ../midori/midori-browser.c:3143 +#: ../midori/midori-browser.c:3914 msgid "Show the Frequently Asked Questions" msgstr "Mostra le domande e risposte frequenti (F.A.Q.)" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3916 msgid "_Report a Bug" msgstr "Segnala un _bug" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3917 msgid "Open Midori's bug tracker" msgstr "Apre lo strumento di segnalazione bug di Midori" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3920 msgid "Show information about the program" msgstr "Mostra le informazioni sull'applicazione" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3927 msgid "P_rivate Browsing" -msgstr "Navigazione _privata" +msgstr "N_avigazione privata" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3928 msgid "Don't save any private data while browsing" msgstr "Non memorizza i dati personali durante la navigazione" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3933 msgid "_Menubar" msgstr "Barra dei _menù" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3934 msgid "Show menubar" msgstr "Mostra la barra dei menù" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3937 msgid "_Navigationbar" msgstr "Barra di _navigazione" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3938 msgid "Show navigationbar" msgstr "Mostra la barra di navigazione" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3941 msgid "Side_panel" -msgstr "_Pannello laterale" +msgstr "Pannello_laterale" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3942 msgid "Show sidepanel" msgstr "Mostra il pannello laterale" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3945 msgid "_Bookmarkbar" msgstr "_Barra dei segnalibri" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3946 msgid "Show bookmarkbar" msgstr "Mostra la barra dei segnalibri" -#: ../midori/midori-browser.c:3178 +#: ../midori/midori-browser.c:3949 msgid "_Transferbar" msgstr "Barra dei _download" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3950 msgid "Show transferbar" msgstr "Mostra la barra dei download" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3953 msgid "_Statusbar" msgstr "Barra di _stato" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3954 msgid "Show statusbar" msgstr "Mostra la barra di stato" -#: ../midori/midori-browser.c:3602 +#: ../midori/midori-browser.c:4389 msgid "_Separator" -msgstr "Sep_aratore" +msgstr "_Separatore" -#: ../midori/midori-browser.c:3609 +#: ../midori/midori-browser.c:4396 msgid "_Location..." msgstr "_Indirizzo..." -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:4398 msgid "Open a particular location" msgstr "Apre un indirizzo specifico" -#: ../midori/midori-browser.c:3635 +#: ../midori/midori-browser.c:4420 msgid "_Web Search..." msgstr "Ricerca sul _web..." -#: ../midori/midori-browser.c:3637 +#: ../midori/midori-browser.c:4422 msgid "Run a web search" msgstr "Esegue una ricerca sul web" -#: ../midori/midori-browser.c:3656 +#: ../midori/midori-browser.c:4443 msgid "Reopen a previously closed tab or window" msgstr "Riapre una scheda o una finestra chiusa precedentemente" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:4458 msgid "_Recently visited pages" msgstr "Pagine visitate _recentemente" -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:4460 msgid "Reopen pages that you visited earlier" msgstr "Riapre le pagine visitate recentemente" -#: ../midori/midori-browser.c:3684 -#: ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:4475 +#: ../midori/sokoke.c:872 msgid "_Bookmarks" -msgstr "S_egnalibri" +msgstr "_Segnalibri" -#: ../midori/midori-browser.c:3686 +#: ../midori/midori-browser.c:4477 msgid "Show the saved bookmarks" msgstr "Mostra i segnalibri salvati" -#: ../midori/midori-browser.c:3699 +#: ../midori/midori-browser.c:4492 msgid "_Window" msgstr "_Finestra" -#: ../midori/midori-browser.c:3701 +#: ../midori/midori-browser.c:4494 msgid "Show a list of all open tabs" msgstr "Mostra un elenco delle schede aperte" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3864 +#: ../midori/midori-browser.c:4674 msgid "_Inline Find:" msgstr "Cerca nel _testo:" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:4699 msgid "Previous" msgstr "Successivo" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:4704 msgid "Next" msgstr "Precedente" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:4709 msgid "Match Case" msgstr "Maiuscole/minuscole" -#: ../midori/midori-browser.c:3907 +#: ../midori/midori-browser.c:4717 msgid "Highlight Matches" msgstr "Evidenzia risultati" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4727 msgid "Close Findbar" msgstr "Chiudi barra ricerca" -#: ../midori/midori-browser.c:4211 +#: ../midori/midori-browser.c:4762 +#: ../extensions/cookie-manager.c:821 +msgid "Delete All" +msgstr "Rimuovi tutto" + +#: ../midori/midori-browser.c:5084 #, c-format msgid "Unexpected setting '%s'" msgstr "Impostazione «%s» non prevista" -#: ../midori/midori-panel.c:229 -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-panel.c:333 +msgid "Detach chosen panel from the window" +msgstr "Stacca il pannello selezionato dalla finestra" + +#: ../midori/midori-panel.c:335 +msgid "Whether to detach the chosen panel from the window" +msgstr "Abilitare per staccare il pannello selezionato dalla finestra" + +#: ../midori/midori-panel.c:345 +#: ../midori/midori-websettings.c:535 msgid "Align sidepanel on the right" msgstr "Allinea a destra il pannello laterale" -#: ../midori/midori-panel.c:231 -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-panel.c:347 +#: ../midori/midori-websettings.c:536 msgid "Whether to align the sidepanel on the right" msgstr "Abilitare per allineare il pannello laterale a destra" -#: ../midori/midori-panel.c:241 -#: ../midori/midori-panel.c:242 +#: ../midori/midori-panel.c:357 +#: ../midori/midori-panel.c:358 msgid "Close panel" msgstr "Chiudi pannello" -#: ../midori/midori-websettings.c:177 -#: ../midori/midori-view.c:1821 +#: ../midori/midori-websettings.c:187 +#: ../midori/midori-view.c:1999 +#: ../midori/midori-view.c:2176 msgid "Blank page" msgstr "Pagina vuota" -#: ../midori/midori-websettings.c:178 -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:555 msgid "Homepage" msgstr "Pagina iniziale" -#: ../midori/midori-websettings.c:179 +#: ../midori/midori-websettings.c:189 msgid "Last open pages" msgstr "Ultime pagine visitate" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:224 msgid "New tab" msgstr "Nuova scheda" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:225 msgid "New window" msgstr "Nuova finestra" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:226 msgid "Current tab" msgstr "Scheda corrente" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:241 msgid "Default" msgstr "Predefinito" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:242 msgid "Icons" msgstr "Icone" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:243 msgid "Text" msgstr "Testo" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:244 msgid "Both" msgstr "Entrambi" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:245 msgid "Both horizontal" msgstr "Entrambi orizzontalmente" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:260 msgid "All cookies" msgstr "Tutti i cookie" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:261 msgid "Session cookies" msgstr "Cookie di sessione" -#: ../midori/midori-websettings.c:252 -#: ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:262 +#: ../panels/midori-addons.c:94 msgid "None" msgstr "Nessuno" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:278 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:279 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:280 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:333 msgid "Remember last window size" msgstr "Ricorda la dimensione dell'ultima finestra" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:334 msgid "Whether to save the last window size" msgstr "Salva le dimensioni dell'ultima finestra" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:342 msgid "Last window width" msgstr "Larghezza dell'ultima finestra" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:343 msgid "The last saved window width" msgstr "L'ultima larghezza salvata per la finestra" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:351 msgid "Last window height" msgstr "Altezza dell'ultima finestra" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:352 msgid "The last saved window height" msgstr "L'ultima altezza salvata per la finestra" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:377 msgid "Last panel position" msgstr "Posizione del pannello" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:378 msgid "The last saved panel position" msgstr "L'ultima posizione salvata per il pannello" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:387 msgid "Last panel page" msgstr "Pagina dell'ultimo pannello" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel page" msgstr "L'ultima pagina salvata per il pannello" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:396 msgid "Last Web search" msgstr "Ultima ricerca web" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:397 msgid "The last saved Web search" msgstr "L'ultima ricerca web salvata" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:406 msgid "Show Menubar" msgstr "Mostra barra dei menù" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:407 msgid "Whether to show the menubar" msgstr "Abilitare per mostrare la barra dei menù" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:415 msgid "Show Navigationbar" msgstr "Mostra barra di navigazione" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:416 msgid "Whether to show the navigationbar" msgstr "Abilitare per mostrare la barra di navigazione" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:424 msgid "Show Bookmarkbar" msgstr "Mostra barra dei segnalibri" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:425 msgid "Whether to show the bookmarkbar" msgstr "Abilitare per mostrare la barra dei segnalibri" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:433 msgid "Show Panel" msgstr "Mostra pannello" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the panel" msgstr "Abilitare per mostrare il pannello" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:449 +msgid "Show Transferbar" +msgstr "Mostra la barra dei trasferimenti" + +#: ../midori/midori-websettings.c:450 +msgid "Whether to show the transferbar" +msgstr "Abilitare per mostrare la barra dei trasferimenti" + +#: ../midori/midori-websettings.c:458 msgid "Show Statusbar" msgstr "Mostra barra di stato" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the statusbar" msgstr "Abilitare per mostrare la barra di stato" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:468 msgid "Toolbar Style" msgstr "Stile della barra degli strumenti" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:469 msgid "The style of the toolbar" msgstr "Scegliere lo stile della barra degli strumenti" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:485 msgid "Show progress in location entry" msgstr "Mostra caricamento nella barra degli indirizzi" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:486 msgid "Whether to show loading progress in the location entry" msgstr "Abilitare per mostrare la percentuale di caricamento della pagina nella barra degli indirizzi" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:501 +msgid "Search engines in location completion" +msgstr "Motori di ricerca nell'autocompletamento" + +#: ../midori/midori-websettings.c:502 +msgid "Whether to show search engines in the location completion" +msgstr "Decidi se mostrare i risultati dei motori di ricerca nel completamento della barra degli indirizzi" + +#: ../midori/midori-websettings.c:510 msgid "Toolbar Items" msgstr "Elementi barra degli strumenti" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:511 msgid "The items to show on the toolbar" msgstr "Indicare gli elementi da mostrare nella barra degli strumenti" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:519 msgid "Compact Sidepanel" msgstr "Pannello compatto" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:520 msgid "Whether to make the sidepanel compact" msgstr "Abilitare per la visualizzazione compatta del pannello" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:545 msgid "Load on Startup" msgstr "Carica all'avvio" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:546 msgid "What to load on startup" msgstr "Scegliere cosa deve essere caricato all'avvio dell'applicazione" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:556 msgid "The homepage" msgstr "Pagina iniziale" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:571 msgid "Show crash dialog" msgstr "Mostra finestra di errore" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:572 msgid "Show a dialog after Midori crashed" msgstr "Mostra una finestra dopo che Midori si è chiuso inaspettatamente" -#: ../midori/midori-websettings.c:526 +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:588 +msgid "Show speed dial in new tabs" +msgstr "Visualizza " + +#: ../midori/midori-websettings.c:589 +msgid "Show speed dial in newly opened tabs" +msgstr "Mostro selezione veloce nelle nuove tab" + +#: ../midori/midori-websettings.c:597 msgid "Download Folder" msgstr "Cartella download" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:598 msgid "The folder downloaded files are saved to" msgstr "Scegliere la cartella dove devono essere salvati i file scaricati" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:617 +msgid "Ask for the destination folder" +msgstr "Richiedi cartella di destinazione" + +#: ../midori/midori-websettings.c:618 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "D" + +#: ../midori/midori-websettings.c:637 +msgid "Notify when a transfer has been completed" +msgstr "Notifica quando un trasferimento è stato completato" + +#: ../midori/midori-websettings.c:638 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "Abilitare per mostrare una notifica quando viene completato un trasferimento" + +#: ../midori/midori-websettings.c:650 msgid "Download Manager" msgstr "Gestione download" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:651 msgid "An external download manager" msgstr "Inserire un gestore download esterno" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:659 msgid "Text Editor" msgstr "Editor di testo" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:660 msgid "An external text editor" msgstr "Inserire un editor di testo esterno" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:675 +msgid "News Aggregator" +msgstr "Aggregatore di novità" + +#: ../midori/midori-websettings.c:676 +msgid "An external news aggregator" +msgstr "Aggregatore di notizie esterno" + +#: ../midori/midori-websettings.c:684 msgid "Location entry Search" msgstr "Motore di ricerca predefinito" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:685 msgid "The search to perform inside the location entry" msgstr "Inserire il motore di ricerca predefinito da utilizzare dalla barra degli indirizzi" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:693 msgid "Preferred Encoding" msgstr "Codifica preferita" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:694 msgid "The preferred character encoding" msgstr "Scegliere la codifica dei caratteri preferita" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:704 msgid "Always Show Tabbar" msgstr "Mostra sempre le schede" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:705 msgid "Always show the tabbar" msgstr "Abilitare per mostrare sempre le etichette delle schede" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:713 msgid "Close Buttons on Tabs" msgstr "Pulsante di chiusura schede" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:714 msgid "Whether tabs have close buttons" msgstr "Abilitare per visualizzare il pulsante di chiusura nelle schede" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:722 msgid "Open new pages in" msgstr "Apri nuove pagine in" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:723 msgid "Where to open new pages" msgstr "Scegliere dove aprire le nuove pagine" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:732 msgid "Open external pages in" msgstr "Apri pagine esterne in" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:733 msgid "Where to open externally opened pages" msgstr "Scegliere dove aprire le pagine aperte da applicazioni esterne" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:746 msgid "Middle click opens Selection" msgstr "Tasto centrale apre la selezione" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:747 msgid "Load an address from the selection via middle click" msgstr "Abilitare per caricare un indirizzo da una selezione tramite il clic col tasto centrale" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:755 msgid "Open tabs in the background" msgstr "Apri schede sullo sfondo" -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:756 msgid "Whether to open new tabs in the background" msgstr "Abilitare per aprire le nuove schede sullo sfondo" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:764 msgid "Open Tabs next to Current" msgstr "Apri schede dopo quella corrente" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:765 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Abilitare per aprire le nuove schede dopo la scheda attuale o dopo l'ultima" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:773 msgid "Open popups in tabs" msgstr "Apri popup in schede" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:774 msgid "Whether to open popup windows in tabs" msgstr "Abilitare per aprire le finestre popup in schede" -#: ../midori/midori-websettings.c:696 +#: ../midori/midori-websettings.c:790 msgid "Zoom Text and Images" msgstr "Ingrandimento testo e immagini" -#: ../midori/midori-websettings.c:697 +#: ../midori/midori-websettings.c:791 msgid "Whether to zoom text and images" msgstr "Abilitare per ingrandire il testo e le immagini" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:806 msgid "Find inline while typing" msgstr "Cerco direttamente nella pagina mentre si scrive" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:807 msgid "Whether to automatically find inline while typing" msgstr "Abilitare per per cercare automaticamente nella pagina quando si scrive" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:815 msgid "Accept cookies" msgstr "Accetta cookie" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:816 msgid "What type of cookies to accept" msgstr "Indicare che tipo di cookie devono essere accettati" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:825 msgid "Original cookies only" msgstr "Cookie originali" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:826 msgid "Accept cookies from the original website only" msgstr "Accetta cookie solo dai siti visitati" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:834 msgid "Maximum cookie age" msgstr "Durata massima dei cookie" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:835 msgid "The maximum number of days to save cookies for" msgstr "Numero di giorni massimo per cui possono essere validi i cookie" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:845 msgid "Remember last visited pages" msgstr "Ricorda ultime pagine visitate" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:846 msgid "Whether the last visited pages are saved" msgstr "Abilitare per salvare l'elenco delle ultime pagine visitate" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:854 msgid "Maximum history age" msgstr "Durata cronologia" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:855 msgid "The maximum number of days to save the history for" msgstr "Numero massimo di giorni per cui deve essere salvata la cronologia" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:863 msgid "Remember last form inputs" msgstr "Ricorda i moduli compilati" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:864 msgid "Whether the last form inputs are saved" msgstr "Abilitare per salvare le informazioni inserite nei moduli." -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:872 msgid "Remember last downloaded files" msgstr "Ricorda gli ultimi download" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:873 msgid "Whether the last downloaded files are saved" msgstr "Abilitare per salvare l'elenco degli ultimi file scaricati" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:883 msgid "Proxy Server" msgstr "Server proxy" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:884 msgid "The proxy server used for HTTP connections" msgstr "Inserire il server proxy usato per le connessioni HTTP" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:899 msgid "Detect proxy server automatically" msgstr "Riconosci automaticamente il server proxy" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:900 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Abilitare per riconoscere automaticamente il server proxy di sistema" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:916 msgid "Identify as" msgstr "Identifica come" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:917 msgid "What to identify as to web pages" msgstr "Come essere identificati sul web" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:933 msgid "Identification string" msgstr "Stringa di identificazione" -#: ../midori/midori-websettings.c:858 +#: ../midori/midori-websettings.c:934 msgid "The application identification string" msgstr "Inserire la stringa di identificazione dell'applicazione" -#: ../midori/midori-websettings.c:870 +#: ../midori/midori-websettings.c:942 msgid "Cache size" msgstr "File temporanei" -#: ../midori/midori-websettings.c:871 +#: ../midori/midori-websettings.c:943 msgid "The allowed size of the cache" msgstr "Dimensione massima consentita per i file temporanei" +#: ../midori/midori-view.c:686 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "La pagina '%s' non può essere caricata." + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#: ../midori/midori-view.c:688 +#: ../midori/midori-view.c:2701 +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Errore" + +#: ../midori/midori-view.c:691 +msgid "Try again" +msgstr "Riprova" + #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:630 +#. 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 #, c-format msgid "Not found - %s" msgstr "Non trovato - %s" -#: ../midori/midori-view.c:960 +#: ../midori/midori-view.c:1095 msgid "Open _Link" msgstr "Apri co_llegamento" -#: ../midori/midori-view.c:962 +#: ../midori/midori-view.c:1097 msgid "Open Link in New _Tab" msgstr "Apri collegamento in una nuova _scheda" -#: ../midori/midori-view.c:979 +#: ../midori/midori-view.c:1114 msgid "Open Link in New _Window" msgstr "Apri collegamento in una nuova _finestra" -#: ../midori/midori-view.c:989 -msgid "_Save Link destination" -msgstr "_Salva indirizzo collegamento" - -#: ../midori/midori-view.c:997 +#: ../midori/midori-view.c:1123 msgid "_Download Link destination" msgstr "Scarica _indirizzo collegamento" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1129 +msgid "_Save Link destination" +msgstr "_Salva indirizzo collegamento" + +#: ../midori/midori-view.c:1138 +msgid "Download with Download _Manager" +msgstr "Scarica con Gestore_trasferimenti" + +#: ../midori/midori-view.c:1167 +msgid "Search _with" +msgstr "Cerca _con" + +#: ../midori/midori-view.c:1195 msgid "_Search the Web" msgstr "_Cerca nel web" -#: ../midori/midori-view.c:1028 +#: ../midori/midori-view.c:1205 msgid "Open Address in New _Tab" msgstr "Apri indirizzi in una nuova _scheda" -#: ../midori/midori-view.c:1507 +#: ../midori/midori-view.c:1372 +msgid "Open or download file" +msgstr "Apri o scarica file" + +#: ../midori/midori-view.c:1389 +#, c-format +msgid "File Type: '%s'" +msgstr "Tipo di file: '%s'" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Tipo di file: %s ('%s')" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1396 +#, c-format +msgid "Open %s" +msgstr "Apri %s" + +#: ../midori/midori-view.c:1816 #, c-format msgid "Inspect page - %s" msgstr "Controlla pagina - %s" -#: ../midori/midori-view.c:1664 -msgid "Source" -msgstr "Sorgente" +#: ../midori/midori-view.c:2001 +#: ../midori/midori-view.c:2002 +msgid "Search" +msgstr "Cerca" -#: ../midori/midori-view.c:1688 +#: ../midori/midori-view.c:2003 +msgid "Click to add a shortcut" +msgstr "Clicca per aggiungere un collegamento" + +#: ../midori/midori-view.c:2004 +msgid "Enter shortcut address" +msgstr "Inserisci indirizzo del collegamento" + +#: ../midori/midori-view.c:2005 +msgid "Enter shortcut title" +msgstr "Inserisci titolo del collegamento" + +#: ../midori/midori-view.c:2006 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Sicuro di voler eliminare questo collegamento?" + +#: ../midori/midori-view.c:2038 #, c-format msgid "Document cannot be displayed" msgstr "Il documento non può essere visualizzato" -#: ../midori/midori-view.c:1704 +#: ../midori/midori-view.c:2055 #, c-format msgid "No documentation installed" msgstr "La documentazione non è installata" -#: ../midori/midori-preferences.c:93 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "Preferenze per %s" #. Page "General" -#: ../midori/midori-preferences.c:390 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Generale" -#: ../midori/midori-preferences.c:391 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Avvio" +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "Usa la pagina corrente come homepage" + +#: ../midori/midori-preferences.c:425 +#: ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Download" + #. Page "Appearance" #: ../midori/midori-preferences.c:440 msgid "Appearance" @@ -1249,283 +1480,314 @@ msgstr "Impostazioni caratteri" msgid "Default Font Family" msgstr "Famiglia di caratteri predefinita" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "Scegliere la famiglia predefinita dei caratteri per visualizzare il testo" + +#: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" msgstr "Scegliere la dimensione predefinita dei caratteri per visualizzare il testo" -#: ../midori/midori-preferences.c:452 +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "Caratteri con altezza fissa" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "Dimensione dei caratteri del testo per visualizzare testi di altezza predefinita" + +#: ../midori/midori-preferences.c:458 msgid "Minimum Font Size" msgstr "Dimensione minima caratteri" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:461 msgid "The minimum font size used to display text" msgstr "Scegliere la dimensione minima dei caratteri per visualizzare il testo" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:468 msgid "Encoding" msgstr "Codifica" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:471 msgid "The character encoding to use by default" msgstr "Scegliere la codifica predefinita dei caratteri" #. Page "Behavior" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:478 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:473 +#: ../midori/midori-preferences.c:479 msgid "Features" msgstr "Opzioni" -#: ../midori/midori-preferences.c:476 -#: ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:482 +#: ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Carica immagini" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:483 msgid "Load and display images automatically" msgstr "Abilitare per caricare e visualizzare automaticamente le immagini" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:486 msgid "Shrink images automatically" msgstr "Ridimensiona immagini" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:487 msgid "Automatically shrink standalone images to fit" msgstr "Abilitare per ridimensionare automaticamente le immagini caricate da sole" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:490 msgid "Print background images" msgstr "Stampa immagini di sfondo" -#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:491 msgid "Whether background images should be printed" msgstr "Abilitare per stampare le immagini di sfondo" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:494 msgid "Resizable text areas" msgstr "Aree di testo ridimensionabili" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:495 msgid "Whether text areas are resizable" msgstr "Abilitare per rendere le aree di testo ridimensionabili" -#: ../midori/midori-preferences.c:492 -#: ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:498 +#: ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Abilita script" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:499 msgid "Enable embedded scripting languages" msgstr "Abilita linguaggi di scripting integrati" -#: ../midori/midori-preferences.c:496 -#: ../extensions/statusbar-features.c:56 -msgid "Enable plugins" -msgstr "Abilita plugin" +#: ../midori/midori-preferences.c:502 +#: ../extensions/statusbar-features.c:72 +msgid "Enable Netscape plugins" +msgstr "Abilita plugin del navigatore" -#: ../midori/midori-preferences.c:497 -msgid "Enable embedded plugin objects" -msgstr "Abilita oggetti integrati con plugin" +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" +msgstr "Abilita oggetti integrati con i plugin del navigatore" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:506 msgid "Enforce 96 dots per inch" msgstr "Forza 96 punti per pollice" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:507 msgid "Enforce a video dot density of 96 DPI" msgstr "Abilitare per forzare la densità dei punti a 96 DPI" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:510 msgid "Enable developer tools" msgstr "Abilita strumenti di sviluppo" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:511 msgid "Enable special extensions for developers" msgstr "Abilitare per utilizzare estensioni particolari per gli sviluppatori" +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "Controllo dell'ortografia" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "Abilita controllo ortografico" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "Abilita controllo ortografico durante la digitazione" + +#: ../midori/midori-preferences.c:525 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Una virgola deve separare le lingue in lista da usare nel controllo ortografico, per esempio \"en_GB,de_DE\"" + #. Page "Interface" -#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:530 msgid "Interface" msgstr "Interfaccia" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:531 msgid "Navigationbar" msgstr "Barra di navigazione" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:542 msgid "Browsing" msgstr "Navigazione" -#: ../midori/midori-preferences.c:564 -#: ../midori/midori-preferences.c:565 +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "Applicazioni" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "Applicazioni esterne" + +#. Page "Network" +#: ../midori/midori-preferences.c:619 +#: ../midori/midori-preferences.c:620 msgid "Network" msgstr "Rete" -#: ../midori/midori-preferences.c:592 +#: ../midori/midori-preferences.c:647 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:599 +#: ../midori/midori-preferences.c:652 msgid "Privacy" msgstr "Privacy" -#: ../midori/midori-preferences.c:606 +#: ../midori/midori-preferences.c:653 msgid "Web Cookies" msgstr "Cookie" -#: ../midori/midori-preferences.c:619 -#: ../midori/midori-preferences.c:631 +#: ../midori/midori-preferences.c:666 +#: ../midori/midori-preferences.c:676 msgid "days" msgstr "giorni" -#: ../midori/midori-preferences.c:624 -#: ../panels/midori-history.c:104 -msgid "History" -msgstr "Cronologia" - -#: ../midori/midori-searchaction.c:455 -#: ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:484 +#: ../katze/katze-arrayaction.c:314 msgid "Empty" msgstr "Vuoto" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "Aggiungi motore di ricerca" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "Modifica motore di ricerca" -#: ../midori/midori-searchaction.c:839 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:976 msgid "_Icon:" msgstr "I_cona:" -#: ../midori/midori-searchaction.c:897 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "Parame_tro:" -#: ../midori/midori-searchaction.c:1077 +#: ../midori/midori-searchaction.c:1195 msgid "Manage Search Engines" msgstr "Gestisci motori di ricerca" -#: ../midori/sokoke.c:109 -#: ../midori/sokoke.c:121 +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "Usa come _predefinito" + +#: ../midori/sokoke.c:162 +#: ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "Non è possibile eseguire l'applicazione esterna." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:440 +#: ../midori/sokoke.c:520 msgid "Warning: You are using a superuser account!" msgstr "Attenzione: si sta eseguendo l'applicazione come amministratore." -#: ../midori/sokoke.c:771 +#: ../midori/sokoke.c:871 msgid "_Bookmark" msgstr "S_egnalibro" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:873 msgid "_Add Bookmark" msgstr "A_ggiungi segnalibro" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:874 msgid "_Console" msgstr "_Console" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:875 msgid "_Extensions" msgstr "_Estensioni" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:876 msgid "_History" msgstr "C_ronologia" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:877 msgid "_Homepage" msgstr "_Pagina iniziale" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:878 msgid "_Userscripts" msgstr "Script dell'_utente" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:879 msgid "User_styles" msgstr "_Stili dell'utente" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:880 msgid "New _Tab" msgstr "N_uova scheda" -#: ../midori/sokoke.c:781 +#: ../midori/sokoke.c:881 msgid "_Transfers" msgstr "_Download" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:882 +msgid "Netscape p_lugins" +msgstr "Plugins n_avigatore" + +#: ../midori/sokoke.c:883 msgid "_Closed Tabs and Windows" msgstr "_Finestre e schede chiuse" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:884 msgid "New _Window" msgstr "_Nuova finestra" -#: ../midori/gjs.c:742 -#: ../midori/gjs.c:832 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s non ha la proprietà «%s»" - -#: ../midori/gjs.c:878 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "%s non può essere assegnato a %s.%s" - -#: ../midori/gjs.c:888 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "%s.%s non è accessibile" - -#: ../panels/midori-addons.c:97 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Script dell'utente" -#: ../panels/midori-addons.c:98 -#: ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "Stili dell'utente" -#: ../panels/midori-addons.c:1005 +#: ../panels/midori-addons.c:927 #: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Abilita" -#: ../panels/midori-addons.c:1014 -#: ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:928 +#: ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "Abilita" + +#: ../panels/midori-addons.c:937 +#: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Disabilita" -#: ../panels/midori-bookmarks.c:103 +#: ../panels/midori-addons.c:938 +#: ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "Disabilita" + +#: ../panels/midori-bookmarks.c:107 msgid "Bookmarks" msgstr "Segnalibri" -#: ../panels/midori-bookmarks.c:236 +#: ../panels/midori-bookmarks.c:238 msgid "Edit the selected bookmark" msgstr "Modifica il segnalibro selezionato" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:246 msgid "Delete the selected bookmark" msgstr "Elimina il segnalibro selezionato" -#: ../panels/midori-bookmarks.c:257 -msgid "Add a new folder" -msgstr "Aggiungi una nuova cartella" - -#: ../panels/midori-bookmarks.c:589 +#: ../panels/midori-bookmarks.c:591 msgid "Separator" msgstr "Separatore" @@ -1537,50 +1799,58 @@ msgstr "Console" msgid "Extensions" msgstr "Estensioni" -#: ../panels/midori-history.c:159 +#: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" msgstr "Cancellare completamente la cronologia?" -#: ../panels/midori-history.c:216 +#: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" msgstr "Crea un segnalibro dall'elemento della cronologia selezionato" -#: ../panels/midori-history.c:225 +#: ../panels/midori-history.c:226 msgid "Delete the selected history item" msgstr "Elimina l'elemento selezionato dalla cronologia" -#: ../panels/midori-history.c:233 +#: ../panels/midori-history.c:234 msgid "Clear the entire history" msgstr "Cancella l'intera cronologia" -#: ../panels/midori-history.c:603 -#, c-format +#: ../panels/midori-history.c:599 msgid "A week ago" msgstr "Una settimana fa" -#: ../panels/midori-history.c:609 +#: ../panels/midori-history.c:604 +#, c-format +msgid "%d day ago" +msgstr "%d giorni fa" + +#: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" msgstr "%d giorni fa" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:612 msgid "Today" msgstr "Oggi" -#: ../panels/midori-history.c:618 +#: ../panels/midori-history.c:614 msgid "Yesterday" msgstr "Ieri" #: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:54 -msgid "Plugins" -msgstr "Plugin" +msgid "Netscape plugins" +msgstr "Plugins netscape" -#: ../katze/katze-http-auth.c:101 +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s su %s" + +#: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "Autenticazione richiesta" -#: ../katze/katze-http-auth.c:117 +#: ../katze/katze-http-auth.c:113 msgid "" "A username and a password are required\n" "to open this location:" @@ -1588,11 +1858,11 @@ msgstr "" "Sono necessari un nome utente e una password\n" "per aprire questo indirizzo:" -#: ../katze/katze-http-auth.c:131 +#: ../katze/katze-http-auth.c:127 msgid "Username" msgstr "Nome utente" -#: ../katze/katze-http-auth.c:142 +#: ../katze/katze-http-auth.c:138 msgid "Password" msgstr "Password" @@ -1610,21 +1880,203 @@ msgstr "L'icona «%s» dello stock non può essere caricata" msgid "Animation frames are broken" msgstr "I fotogrammi dell'animazione sono danneggiati" -#: ../katze/katze-utils.c:180 -#: ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:183 +#: ../katze/katze-utils.c:385 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La proprietà «%s» non è valida per %s" -#: ../katze/katze-utils.c:209 -#: ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:215 +#: ../katze/katze-utils.c:244 msgid "Choose file" msgstr "Scegli un file" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:230 msgid "Choose folder" msgstr "Scegli una cartella" +#: ../extensions/colorful-tabs.c:115 +msgid "Tint tabs distinctly" +msgstr "Colora le etichette in modo distinto" + +#: ../extensions/colorful-tabs.c:151 +msgid "Colorful Tabs" +msgstr "Tab colorate" + +#: ../extensions/colorful-tabs.c:152 +msgid "Tint each tab distinctly" +msgstr "Colora ogni etichetta in modo differente" + +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "Alla fine della sessione" + +#: ../extensions/cookie-manager.c:204 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Host: %s\n" +"Nome: %s\n" +"Valore: %s\n" +"Percorso: %s\n" +"Protezione: %s\n" +"Scadenza: %s" + +#: ../extensions/cookie-manager.c:210 +msgid "Yes" +msgstr "Si" + +#: ../extensions/cookie-manager.c:210 +msgid "No" +msgstr "No" + +#: ../extensions/cookie-manager.c:493 +msgid "Do you really want to delete all cookies?" +msgstr "Vuoi davvero cancellare tutti i cookie?" + +#: ../extensions/cookie-manager.c:495 +msgid "Question" +msgstr "Domanda" + +#: ../extensions/cookie-manager.c:504 +msgid "Only cookies which match the filter will be deleted." +msgstr "Solo i cookie che combaciano col filtro verranno eliminati." + +#: ../extensions/cookie-manager.c:682 +msgid "Name" +msgstr "Nome:" + +#: ../extensions/cookie-manager.c:742 +msgid "_Expand All" +msgstr "_Espandi tutto" + +#: ../extensions/cookie-manager.c:750 +msgid "_Collapse All" +msgstr "_Riduci tutto" + +#: ../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 "Elimina tutti i cookie mostrati. Se è stato impostato un filtro, verranno eliminati solo quelli risultanti dalla filtrazione." + +#: ../extensions/cookie-manager.c:838 +msgid "Expand All" +msgstr "Espandi tutto" + +#: ../extensions/cookie-manager.c:845 +msgid "Collapse All" +msgstr "Riduci tutto" + +#: ../extensions/cookie-manager.c:876 +msgid "Filter:" +msgstr "Filtro:" + +#: ../extensions/cookie-manager.c:881 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Inserisci una stringa filtro per mostrare i soli cookie il cui nome o dominio corrisponda a quello del filtro inserito" + +#: ../extensions/cookie-manager.c:916 +#: ../extensions/cookie-manager.c:964 +msgid "Cookie Manager" +msgstr "Gestiore download" + +#: ../extensions/cookie-manager.c:948 +msgid "_Cookie Manager" +msgstr "Gestore Cookie" + +#: ../extensions/cookie-manager.c:965 +msgid "List, view and delete cookies" +msgstr "Elenca, mostra o elimina cookie" + +#: ../extensions/feed-panel/feed-atom.c:242 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "Fallita la ricerca degli " + +#: ../extensions/feed-panel/feed-atom.c:348 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "Impossibile trovare l'elemento Atom \"feed\" nell'XML indicato." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Ultimo aggiornato: %s." + +#: ../extensions/feed-panel/feed-panel.c:664 +msgid "Feeds" +msgstr "Feed" + +#: ../extensions/feed-panel/feed-panel.c:717 +msgid "Add new feed" +msgstr "Aggiungi nuovo feed" + +#: ../extensions/feed-panel/feed-panel.c:724 +msgid "Delete feed" +msgstr "Elimina feed" + +#: ../extensions/feed-panel/feed-panel.c:807 +msgid "_Feeds" +msgstr "_Feeds" + +#: ../extensions/feed-panel/feed-parse.c:175 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Impossibile trovare elemento root nel file XML del feed." + +#: ../extensions/feed-panel/feed-parse.c:215 +#, c-format +msgid "Unsupported feed format." +msgstr "Format del feed non supportato." + +#: ../extensions/feed-panel/feed-parse.c:245 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Errore nell'analisi del file XML del feed : %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "Impossibile trovare l'emento \"channel\" nell'XML del flusso RSS." + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Rilevata versione di RSS non supportata." + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "Impossibile trovare l'elemento RSS \"item\" nell'XML indicato." + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "Impossibile trovare l'elemento RSS \"channel\" nell'XML indicato." + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Il Feed '%s' già esiste." + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Errore nel caricare feed '%s'" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "Nuovo feed" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Pannello Feed" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "Leggi feed Atom/RSS" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "Gesti del mouse" @@ -1634,23 +2086,37 @@ msgid "Control Midori by moving the mouse" msgstr "Controllare Midori con i movimenti del mouse" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 -#: ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" -msgstr "" +msgstr "Cornice della pagina" -#: ../extensions/page-holder.c:137 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" -msgstr "" +msgstr "_Cornice della pagina" -#: ../extensions/statusbar-features.c:40 -msgid "Images" -msgstr "Immagini" +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "Proprietà della barra di stato" -#: ../extensions/statusbar-features.c:47 -msgid "Scripts" -msgstr "Script" +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "Permette di attivare o disattivare facilmente determinate funzionalità sulle pagine internet" +#~ msgid "Source" +#~ msgstr "Sorgente" +#~ msgid "%s has no property '%s'" +#~ msgstr "%s non ha la proprietà «%s»" +#~ msgid "%s cannot be assigned to %s.%s" +#~ msgstr "%s non può essere assegnato a %s.%s" +#~ msgid "%s.%s cannot be accessed" +#~ msgstr "%s.%s non è accessibile" +#~ msgid "Plugins" +#~ msgstr "Plugin" +#~ msgid "Images" +#~ msgstr "Immagini" +#~ msgid "Scripts" +#~ msgstr "Script" #~ msgid "_Icon (name or file):" #~ msgstr "_Icona (nome o file):" diff --git a/po/ja.po b/po/ja.po index 6271c10f..34be08e0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,27 +5,24 @@ # msgid "" msgstr "" -"Project-Id-Version: Midori 0.1.5\n" +"Project-Id-Version: Midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-11 00:57+0900\n" -"PO-Revision-Date: 2009-05-11 00:59+0900\n" +"POT-Creation-Date: 2009-07-12 23:57+0900\n" +"PO-Revision-Date: 2009-07-12 16:16+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=0;\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1315 -#: ../midori/main.c:1449 -#: ../midori/main.c:1457 -#: ../midori/main.c:1468 -#: ../midori/midori-websettings.c:277 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1343 ../midori/main.c:1484 +#: ../midori/main.c:1492 ../midori/main.c:1503 +#: ../midori/midori-websettings.c:285 msgid "Midori" msgstr "Midori" @@ -43,8 +40,7 @@ msgstr "設定を読み込めませんでした: %s\n" msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:158 -#: ../midori/main.c:238 +#: ../midori/main.c:158 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" @@ -69,9 +65,7 @@ msgstr "履歴アイテムの削除に失敗しました: %s\n" msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:483 -#: ../midori/main.c:517 -#: ../midori/main.c:533 +#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" @@ -87,1365 +81,1371 @@ msgstr "古い履歴アイテムの削除に失敗しました: %s\n" msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:770 +#: ../midori/main.c:779 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%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 "ブックマークを保存できませんでした。%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 "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:965 +#: ../midori/main.c:974 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1092 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生するようであれば、問題解決のために以下のオプションのいずれかを試してみてください。" +#: ../midori/main.c:1101 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" +"ようであれば、問題解決のために以下のオプションのいずれかを試してみてくださ" +"い。" -#: ../midori/main.c:1107 +#: ../midori/main.c:1116 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1111 +#: ../midori/main.c:1120 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:1116 +#: ../midori/main.c:1125 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1315 +#: ../midori/main.c:1343 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1338 +#: ../midori/main.c:1366 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" -#: ../midori/main.c:1370 +#: ../midori/main.c:1399 #, c-format msgid "Snapshot saved to: %s\n" msgstr "スナップショットを取得しました: %s\n" -#: ../midori/main.c:1391 +#: ../midori/main.c:1421 msgid "Run ADDRESS as a web application" msgstr "ADDRESS をウェブアプリケーションとして実行する" -#: ../midori/main.c:1391 +#: ../midori/main.c:1421 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1393 +#: ../midori/main.c:1423 msgid "Use FOLDER as configuration folder" msgstr "設定フォルダとして FOLDER を使用する" -#: ../midori/main.c:1393 +#: ../midori/main.c:1423 msgid "FOLDER" msgstr "FOLDER" # CLI --help -#: ../midori/main.c:1395 +#: ../midori/main.c:1426 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" -#: ../midori/main.c:1398 +#: ../midori/main.c:1430 msgid "Take a snapshot of the specified URI" msgstr "指定された URI のスナップショットを取得する" +#: ../midori/main.c:1433 +msgid "Execute the specified command" +msgstr "指定されたコマンドを実行する" + # CLI --help -#: ../midori/main.c:1401 +#: ../midori/main.c:1435 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1403 +#: ../midori/main.c:1437 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1446 +#: ../midori/main.c:1481 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1469 +#: ../midori/main.c:1504 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1471 +#: ../midori/main.c:1506 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1548 +#: ../midori/main.c:1585 msgid "The specified configuration folder is invalid." msgstr "指定された設定フォルダが正しくありません。" -#: ../midori/main.c:1583 +#: ../midori/main.c:1621 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1633 +#: ../midori/main.c:1671 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:1645 +#: ../midori/main.c:1683 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1660 +#: ../midori/main.c:1698 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1673 +#: ../midori/main.c:1711 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1686 +#: ../midori/main.c:1724 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1698 +#: ../midori/main.c:1736 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:1714 +#: ../midori/main.c:1752 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-array.c:195 +#: ../midori/midori-array.c:236 msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/midori-array.c:203 -#: ../midori/midori-array.c:212 +#: ../midori/midori-array.c:244 ../midori/midori-array.c:253 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:716 +#: ../midori/midori-array.c:410 ../midori/sokoke.c:700 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/midori-browser.c:287 -#: ../midori/midori-browser.c:3819 -#: ../midori/midori-browser.c:3825 +#: ../midori/midori-browser.c:301 ../midori/midori-browser.c:4046 +#: ../midori/midori-browser.c:4052 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:298 -#: ../midori/midori-browser.c:3822 +#: ../midori/midori-browser.c:312 ../midori/midori-browser.c:4049 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:360 +#: ../midori/midori-browser.c:373 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:385 +#: ../midori/midori-browser.c:398 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:580 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:580 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:582 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:582 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:612 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:648 -#: ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:625 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:667 -#: ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:644 ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:686 +#: ../midori/midori-browser.c:663 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:691 -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:668 ../midori/midori-browser.c:709 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:808 +#: ../midori/midori-browser.c:785 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1119 +#: ../midori/midori-browser.c:1132 #, c-format msgid "The file %s has been downloaded." msgstr "ファイル %s をダウンロードしました。" -#: ../midori/midori-browser.c:1123 +#: ../midori/midori-browser.c:1136 msgid "Transfer completed" msgstr "転送完了" -#: ../midori/midori-browser.c:1820 +#: ../midori/midori-browser.c:1277 +msgid "Save file" +msgstr "ファイルの保存" + +#: ../midori/midori-browser.c:1923 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:3152 -#: ../panels/midori-bookmarks.c:778 -#: ../panels/midori-history.c:808 +#: ../midori/midori-browser.c:3299 ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:812 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:3159 -#: ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:814 -#: ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:3306 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:3162 -#: ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:816 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3309 ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:820 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" # Dialog title -#: ../midori/midori-browser.c:3425 +#: ../midori/midori-browser.c:3609 msgid "Clear Private Data" msgstr "プライベートデータのクリア" # Button title -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3613 msgid "_Clear private data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:3441 +#: ../midori/midori-browser.c:3626 msgid "Clear the following data:" msgstr "以下のデータをクリアします:" -#: ../midori/midori-browser.c:3449 -#: ../midori/midori-preferences.c:669 +#: ../midori/midori-browser.c:3636 ../midori/midori-preferences.c:675 #: ../panels/midori-history.c:108 msgid "History" msgstr "履歴" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3641 msgid "Cookies" msgstr "Cookie" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3646 msgid "'Flash' Cookies" msgstr "'Flash' Cookie" -#: ../midori/midori-browser.c:3458 +#: ../midori/midori-browser.c:3651 msgid "Website icons" msgstr "ウェブサイトアイコン" -#: ../midori/midori-browser.c:3538 +#: ../midori/midori-browser.c:3656 ../midori/sokoke.c:874 +msgid "_Closed Tabs and Windows" +msgstr "閉じたタブとウィンドウ(_C)" + +#: ../midori/midori-browser.c:3739 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:3546 +#: ../midori/midori-browser.c:3747 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:3980 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:3753 +#: ../midori/midori-browser.c:3983 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:3756 +#: ../midori/midori-browser.c:3986 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3989 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3762 +#: ../midori/midori-browser.c:3992 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3764 -#: ../midori/midori-view.c:1256 +#: ../midori/midori-browser.c:3994 msgid "Add to Speed _dial" msgstr "スピードダイアルに追加(_D)" -#: ../midori/midori-browser.c:3765 +#: ../midori/midori-browser.c:3995 msgid "Add shortcut to speed dial" msgstr "ショートカットをスピードダイアルに追加します" -#: ../midori/midori-browser.c:3767 +#: ../midori/midori-browser.c:3997 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3768 +#: ../midori/midori-browser.c:3998 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3770 +#: ../midori/midori-browser.c:4000 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3771 +#: ../midori/midori-browser.c:4001 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3774 +#: ../midori/midori-browser.c:4004 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3777 +#: ../midori/midori-browser.c:4007 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3779 +#: ../midori/midori-browser.c:4009 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:4012 msgid "Cut the selected text" msgstr "選択した文字を切り取ります" -#: ../midori/midori-browser.c:3785 -#: ../midori/midori-browser.c:3788 +#: ../midori/midori-browser.c:4015 ../midori/midori-browser.c:4018 msgid "Copy the selected text" msgstr "選択した文字をコピーします" -#: ../midori/midori-browser.c:3791 +#: ../midori/midori-browser.c:4021 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3794 +#: ../midori/midori-browser.c:4024 msgid "Delete the selected text" msgstr "選択した文字を削除します" -#: ../midori/midori-browser.c:3797 +#: ../midori/midori-browser.c:4027 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3800 +#: ../midori/midori-browser.c:4030 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:4032 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3803 +#: ../midori/midori-browser.c:4033 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3805 +#: ../midori/midori-browser.c:4035 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3806 +#: ../midori/midori-browser.c:4036 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3809 -msgid "_Quick Find" -msgstr "クイック検索(_Q)" - -#: ../midori/midori-browser.c:3810 -msgid "Quickly jump to a word or phrase" -msgstr "単語やフレーズにすぐに移動します" - -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:4040 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:4042 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3816 +#: ../midori/midori-browser.c:4043 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:4055 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3831 +#: ../midori/midori-browser.c:4058 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3834 +#: ../midori/midori-browser.c:4061 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3835 +#: ../midori/midori-browser.c:4062 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:3837 -msgid "_Automatic" -msgstr "自動(_A)" +#: ../midori/midori-browser.c:4064 +msgid "View So_urce" +msgstr "ソースを表示(_U)" -#: ../midori/midori-browser.c:3840 -#: ../midori/midori-websettings.c:204 -msgid "Chinese (BIG5)" -msgstr "中国語 (BIG5)" - -#: ../midori/midori-browser.c:3843 -#: ../midori/midori-websettings.c:205 -msgid "Japanese (SHIFT_JIS)" -msgstr "日本語 (SHIFT_JIS)" - -#: ../midori/midori-browser.c:3846 -#: ../midori/midori-websettings.c:206 -msgid "Russian (KOI8-R)" -msgstr "ロシア語 (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 "西欧 (ISO-8859-1)" - -#: ../midori/midori-browser.c:3855 -#: ../midori/midori-websettings.c:209 -#: ../midori/midori-websettings.c:281 -msgid "Custom..." -msgstr "カスタム..." - -#: ../midori/midori-browser.c:3858 -#: ../midori/midori-view.c:1275 -msgid "View _Source" -msgstr "ソースを表示(_S)" - -#: ../midori/midori-browser.c:3859 +#: ../midori/midori-browser.c:4065 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3861 +#: ../midori/midori-browser.c:4067 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3862 +#: ../midori/midori-browser.c:4068 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3866 +#: ../midori/midori-browser.c:4072 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3868 +#: ../midori/midori-browser.c:4074 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3871 +#: ../midori/midori-browser.c:4077 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3874 +#: ../midori/midori-browser.c:4080 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3877 +#: ../midori/midori-browser.c:4083 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3879 +#: ../midori/midori-browser.c:4085 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3880 +#: ../midori/midori-browser.c:4086 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3882 -#: ../midori/midori-view.c:1233 -msgid "Undo Close Tab" -msgstr "閉じたタブを元に戻す" +#: ../midori/midori-browser.c:4088 +msgid "Undo _Close Tab" +msgstr "閉じたタブを元に戻す(_C)" -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:4089 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3887 -#: ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:4093 ../panels/midori-bookmarks.c:231 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3889 -#: ../panels/midori-bookmarks.c:259 -msgid "Add a new folder" -msgstr "新しいフォルダの追加" +#: ../midori/midori-browser.c:4095 +msgid "Add a new _folder" +msgstr "新しいフォルダの追加(_F)" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:4096 msgid "Add a new bookmark folder" msgstr "新しいブックマークフォルダを追加します" -#: ../midori/midori-browser.c:3891 +#: ../midori/midori-browser.c:4097 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3893 -#: ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4099 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:4100 msgid "Add, edit and remove search engines..." msgstr "検索エンジンを追加、編集、または削除します..." -#: ../midori/midori-browser.c:3897 +#: ../midori/midori-browser.c:4103 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:3898 +#: ../midori/midori-browser.c:4104 msgid "Clear private data..." msgstr "プライベートデータをクリアします..." -#: ../midori/midori-browser.c:3902 +#: ../midori/midori-browser.c:4108 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3903 +#: ../midori/midori-browser.c:4109 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4111 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3906 +#: ../midori/midori-browser.c:4112 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3908 +#: ../midori/midori-browser.c:4114 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3910 +#: ../midori/midori-browser.c:4116 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3911 +#: ../midori/midori-browser.c:4117 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3913 +#: ../midori/midori-browser.c:4119 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3914 +#: ../midori/midori-browser.c:4120 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3916 +#: ../midori/midori-browser.c:4122 msgid "_Report a Bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4123 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4126 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3927 +#: ../midori/midori-browser.c:4133 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3928 +#: ../midori/midori-browser.c:4134 msgid "Don't save any private data while browsing" -msgstr "閲覧する中で個人データを保存しません" +msgstr "閲覧中に個人データを保存しません" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4139 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4140 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4143 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3938 +#: ../midori/midori-browser.c:4144 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3941 +#: ../midori/midori-browser.c:4147 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3942 +#: ../midori/midori-browser.c:4148 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3945 +#: ../midori/midori-browser.c:4151 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4152 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:4155 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3950 +#: ../midori/midori-browser.c:4156 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3953 +#: ../midori/midori-browser.c:4159 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3954 +#: ../midori/midori-browser.c:4160 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:4389 +#: ../midori/midori-browser.c:4167 +msgid "_Automatic" +msgstr "自動(_A)" + +#: ../midori/midori-browser.c:4170 ../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:4174 +msgid "Japanese (SHIFT__JIS)" +msgstr "日本語 (SHIFT__JIS)" + +#: ../midori/midori-browser.c:4177 ../midori/midori-websettings.c:214 +msgid "Russian (KOI8-R)" +msgstr "ロシア語 (KOI8-R)" + +#: ../midori/midori-browser.c:4180 ../midori/midori-websettings.c:215 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:4183 ../midori/midori-websettings.c:216 +msgid "Western (ISO-8859-1)" +msgstr "西欧 (ISO-8859-1)" + +#: ../midori/midori-browser.c:4186 ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:289 +msgid "Custom..." +msgstr "カスタム..." + +#: ../midori/midori-browser.c:4622 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:4629 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:4398 +#: ../midori/midori-browser.c:4631 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4655 msgid "_Web Search..." msgstr "ウェブ検索(_W)..." -#: ../midori/midori-browser.c:4422 +#: ../midori/midori-browser.c:4657 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:4443 +#: ../midori/midori-browser.c:4678 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:4458 +#: ../midori/midori-browser.c:4693 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:4460 +#: ../midori/midori-browser.c:4695 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:4475 -#: ../midori/sokoke.c:872 +#: ../midori/midori-browser.c:4710 ../midori/sokoke.c:863 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/midori-browser.c:4477 +#: ../midori/midori-browser.c:4712 msgid "Show the saved bookmarks" msgstr "ブックマークを表示します" -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4727 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:4494 +#: ../midori/midori-browser.c:4729 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" +#: ../midori/midori-browser.c:4743 +msgid "_Menu" +msgstr "メニュー(_M)" + +#: ../midori/midori-browser.c:4745 +msgid "Menu" +msgstr "メニュー" + #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4674 +#: ../midori/midori-browser.c:4920 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:4699 +#: ../midori/midori-browser.c:4945 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4950 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:4709 +#: ../midori/midori-browser.c:4955 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:4717 +#: ../midori/midori-browser.c:4963 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:4727 +#: ../midori/midori-browser.c:4973 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4762 -#: ../extensions/cookie-manager.c:821 +#: ../midori/midori-browser.c:5008 +#: ../extensions/cookie-manager/cookie-manager-page.c:109 msgid "Delete All" msgstr "すべて削除" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5328 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" +#: ../midori/midori-locationaction.c:900 +#, c-format +msgid "Search with %s" +msgstr "%s で検索" + #: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "選択したパネルをウィンドウから切り離す" -#: ../midori/midori-panel.c:335 -msgid "Whether to detach the chosen panel from the window" -msgstr "選択したパネルをウィンドウから切り離します" - -#: ../midori/midori-panel.c:345 -#: ../midori/midori-websettings.c:535 -msgid "Align sidepanel on the right" +#: ../midori/midori-panel.c:343 ../midori/midori-panel.c:508 +msgid "Align sidepanel to the right" msgstr "サイドパネルを右側に配置する" -#: ../midori/midori-panel.c:347 -#: ../midori/midori-websettings.c:536 -msgid "Whether to align the sidepanel on the right" -msgstr "サイドパネルを右側に表示します" - -#: ../midori/midori-panel.c:357 -#: ../midori/midori-panel.c:358 +#: ../midori/midori-panel.c:353 ../midori/midori-panel.c:354 msgid "Close panel" msgstr "パネルを閉じます" -#: ../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 "サイドパネルを左側に配置する" + +#: ../midori/midori-websettings.c:195 ../midori/midori-view.c:2271 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:188 -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:196 ../midori/midori-websettings.c:563 msgid "Homepage" msgstr "ホームページ" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:197 msgid "Last open pages" msgstr "最後に開いたページ" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:213 +msgid "Japanese (SHIFT_JIS)" +msgstr "日本語 (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:232 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:233 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:234 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:249 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:250 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:251 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:252 msgid "Both" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:253 msgid "Both horizontal" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:268 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:269 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:262 -#: ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:270 ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:133 msgid "None" msgstr "なし" -#: ../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 "最後のウィンドウサイズを記憶する" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:342 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:350 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:351 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:359 msgid "Last window height" msgstr "最後のウィンドウの高さ" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:360 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:385 msgid "Last panel position" msgstr "最後のパネルの位置" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:395 msgid "Last panel page" msgstr "最後のパネルページ" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:396 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:404 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:405 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:414 msgid "Show Menubar" msgstr "メニューバーを表示する" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:415 msgid "Whether to show the menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:423 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:424 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:432 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:433 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:441 msgid "Show Panel" msgstr "パネルを表示する" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the panel" msgstr "パネルを表示します" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:457 msgid "Show Transferbar" msgstr "転送バーを表示する" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:466 msgid "Show Statusbar" msgstr "ステータスバーを表示する" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style" msgstr "ツールバー方式" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:493 msgid "Show progress in location entry" msgstr "ロケーションエントリに進捗を表示する" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:494 msgid "Whether to show loading progress in the location entry" msgstr "ロケーションエントリ内に読み込みの進捗状況を表示します" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:509 msgid "Search engines in location completion" msgstr "場所の補完に検索エンジンを使用する" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:510 msgid "Whether to show search engines in the location completion" msgstr "場所の補完候補内から検索エンジンを使用できるようにします" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:518 msgid "Toolbar Items" msgstr "ツールバーアイテム" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:519 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:527 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:528 msgid "Whether to make the sidepanel compact" msgstr "サイドパネルの表示をコンパクトにします" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:543 +msgid "Align sidepanel on the right" +msgstr "サイドパネルを右側に配置する" + +#: ../midori/midori-websettings.c:544 +msgid "Whether to align the sidepanel on the right" +msgstr "サイドパネルを右側に表示します" + +#: ../midori/midori-websettings.c:553 msgid "Load on Startup" msgstr "起動時に読み込む" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:554 msgid "What to load on startup" msgstr "起動時に読み込むページを指定します" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:564 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:579 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:580 msgid "Show a dialog after Midori crashed" msgstr "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 "新しいタブにスピードダイアルを表示する" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:597 msgid "Show speed dial in newly opened tabs" msgstr "新しく開かれたタブにスピードダイアルを表示します" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:605 msgid "Download Folder" msgstr "ダウンロードフォルダ" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:606 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:625 msgid "Ask for the destination folder" msgstr "保存先フォルダを問い合わせる" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:626 msgid "Whether to ask for the destination folder when downloading a file" msgstr "ファイルをダウンロードする時に保存先フォルダを問い合わせます" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:645 msgid "Notify when a transfer has been completed" msgstr "転送が完了したら通知する" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:646 msgid "Whether to show a notification when a transfer has been completed" msgstr "転送が完了したら通知します" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:658 msgid "Download Manager" msgstr "ダウンロードマネージャ" -#: ../midori/midori-websettings.c:651 +#: ../midori/midori-websettings.c:659 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:667 msgid "Text Editor" msgstr "テキストエディタ" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:668 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:683 msgid "News Aggregator" msgstr "フィードリーダ" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:684 msgid "An external news aggregator" msgstr "外部フィードリーダを指定します" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:692 msgid "Location entry Search" msgstr "ロケーションエントリの検索" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:693 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:701 msgid "Preferred Encoding" msgstr "文字のエンコーディング" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:702 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:712 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:713 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:721 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:722 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:730 msgid "Open new pages in" msgstr "新しくページを開くとき" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:731 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:740 msgid "Open external pages in" msgstr "外部ページを開くとき" -#: ../midori/midori-websettings.c:733 +#: ../midori/midori-websettings.c:741 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:754 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:755 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:763 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:764 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:772 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" -#: ../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 "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:781 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:782 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:798 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:799 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:814 msgid "Find inline while typing" msgstr "キー入力中に自動的に検索する" -#: ../midori/midori-websettings.c:807 +#: ../midori/midori-websettings.c:815 msgid "Whether to automatically find inline while typing" msgstr "インライン検索において、キー入力に従い自動的に検索します" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:823 msgid "Accept cookies" msgstr "Cookie の受け入れ" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:824 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択します" -#: ../midori/midori-websettings.c:825 +#: ../midori/midori-websettings.c:833 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" -#: ../midori/midori-websettings.c:826 -msgid "Accept cookies from the original website only" -msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れる" - #: ../midori/midori-websettings.c:834 +msgid "Accept cookies from the original website only" +msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" + +#: ../midori/midori-websettings.c:842 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:843 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:853 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:854 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:862 msgid "Maximum history age" msgstr "履歴の最大保存日数" -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:863 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:871 msgid "Remember last form inputs" msgstr "最後のフォーム入力を記憶する" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:872 msgid "Whether the last form inputs are saved" msgstr "最後にフォーム入力した内容を記憶します" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:880 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:881 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:891 msgid "Proxy Server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:892 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:907 msgid "Detect proxy server automatically" msgstr "プロキシサーバを自動検出する" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:908 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:916 +#: ../midori/midori-websettings.c:924 msgid "Identify as" msgstr "識別名" -#: ../midori/midori-websettings.c:917 +#: ../midori/midori-websettings.c:925 msgid "What to identify as to web pages" msgstr "ウェブページに報告するユーザエージェントの識別名を指定します" -#: ../midori/midori-websettings.c:933 +#: ../midori/midori-websettings.c:941 msgid "Identification string" msgstr "識別文字列" -#: ../midori/midori-websettings.c:934 +#: ../midori/midori-websettings.c:942 msgid "The application identification string" msgstr "アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:950 msgid "Cache size" msgstr "キャッシュサイズ" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:951 msgid "The allowed size of the cache" msgstr "キャッシュのサイズを指定します" -#: ../midori/midori-view.c:686 +# Button title +#: ../midori/midori-websettings.c:966 +msgid "Clear private data" +msgstr "プライベートデータのクリア" + +# FIXME: +#: ../midori/midori-websettings.c:967 +msgid "The private data selected for deletion" +msgstr "選択されているプライベートデータを削除します" + +#: ../midori/midori-view.c:750 #, 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:688 -#: ../midori/midori-view.c:2701 +#: ../midori/midori-view.c:752 ../midori/midori-view.c:2903 #: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "エラー" -#: ../midori/midori-view.c:691 +#: ../midori/midori-view.c:755 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:721 -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:785 ../midori/midori-view.c:2907 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:1095 +#: ../midori/midori-view.c:1172 msgid "Open _Link" msgstr "リンクを開く(_L)" -#: ../midori/midori-view.c:1097 +#: ../midori/midori-view.c:1174 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1114 +#: ../midori/midori-view.c:1191 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:1123 +#: ../midori/midori-view.c:1197 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:1129 +#: ../midori/midori-view.c:1203 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:1138 +#: ../midori/midori-view.c:1212 msgid "Download with Download _Manager" msgstr "ダウンロードマネージャでダウンロード(_M)" -#: ../midori/midori-view.c:1167 +#: ../midori/midori-view.c:1241 msgid "Search _with" msgstr "検索(_W)" -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1269 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1279 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1372 +#: ../midori/midori-view.c:1463 msgid "Open or download file" msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:1389 +#: ../midori/midori-view.c:1480 #, c-format msgid "File Type: '%s'" msgstr "ファイルタイプ: '%s'" -#: ../midori/midori-view.c:1392 +#: ../midori/midori-view.c:1483 #, 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:1396 +#: ../midori/midori-view.c:1487 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:1816 +#: ../midori/midori-view.c:1905 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:2001 -#: ../midori/midori-view.c:2002 -msgid "Search" -msgstr "検索" +#: ../midori/midori-view.c:2095 +msgid "Speed dial" +msgstr "スピードダイアル" -#: ../midori/midori-view.c:2003 +#: ../midori/midori-view.c:2096 msgid "Click to add a shortcut" msgstr "クリックするとショートカットを追加できます" -#: ../midori/midori-view.c:2004 +#: ../midori/midori-view.c:2097 msgid "Enter shortcut address" msgstr "ショートカットのアドレスを入力してください" -#: ../midori/midori-view.c:2005 +#: ../midori/midori-view.c:2098 msgid "Enter shortcut title" msgstr "ショートカットの名前を入力してください" -#: ../midori/midori-view.c:2006 +#: ../midori/midori-view.c:2099 msgid "Are you sure you want to delete this shortcut?" msgstr "このショートカットを削除してもよろしいですか?" -#: ../midori/midori-view.c:2038 +#: ../midori/midori-view.c:2129 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:2055 +#: ../midori/midori-view.c:2146 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" +#: ../midori/midori-view.c:2493 +msgid "_Duplicate Tab" +msgstr "タブの複製(_D)" + #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" @@ -1464,8 +1464,7 @@ msgstr "起動" msgid "Use current page as homepage" msgstr "現在のページをホームページにします" -#: ../midori/midori-preferences.c:425 -#: ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "転送" @@ -1494,166 +1493,167 @@ msgstr "文字表示で使用するデフォルトのフォントサイズを指 msgid "Fixed-width Font Family" msgstr "等幅フォントファミリ" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:457 msgid "The font family used to display fixed-width text" msgstr "等幅文字表示で使用するフォントファミリを指定します" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "等幅文字表示で使用するフォントのサイズを指定します" + +#: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" msgstr "最小フォントサイズ" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" msgstr "文字表示で使用する最小のフォントサイズを指定します" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:473 msgid "Encoding" msgstr "エンコーディング" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" msgstr "デフォルトで使用する文字エンコーディングです" #. Page "Behavior" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:484 msgid "Features" msgstr "機能" -#: ../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 "画像を自動的に読み込む" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:488 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:491 msgid "Shrink images automatically" msgstr "画像を自動的に縮小する" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:492 msgid "Automatically shrink standalone images to fit" msgstr "画像を単独表示するときに自動的に縮小します" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:495 msgid "Print background images" msgstr "背景画像を印刷する" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:496 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:499 msgid "Resizable text areas" msgstr "可変サイズのテキストエリアにする" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:500 msgid "Whether text areas are resizable" msgstr "テキストエリアのサイズ変更を可能にします" -#: ../midori/midori-preferences.c:498 -#: ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "スクリプトを有効にする" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:504 msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../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 "Netscape プラグインを有効にする" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:508 msgid "Enable embedded Netscape plugin objects" msgstr "組み込み Netscape プラグインオブジェクトを有効にします" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:511 msgid "Enforce 96 dots per inch" msgstr "強制的に 96DPI にする" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:512 msgid "Enforce a video dot density of 96 DPI" msgstr "ドット密度を強制的に 96DPI にします" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:515 msgid "Enable developer tools" msgstr "開発ツールを有効にする" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:516 msgid "Enable special extensions for developers" msgstr "開発者用特殊エクステンションを有効にします" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:523 msgid "Spell Checking" msgstr "スペルチェック" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:526 msgid "Enable Spell Checking" msgstr "スペルチェックを有効にする" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:527 msgid "Enable spell checking while typing" msgstr "キー入力中のスペルチェックを有効にします" -#: ../midori/midori-preferences.c:525 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "スペルチェックを行う言語をカンマで区切って指定します。例 \"en_GB,de_DE\"" +#. i18n: The example should be adjusted to contain a good local default +#: ../midori/midori-preferences.c:531 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "スペルチェックを行う言語をカンマで区切って指定します。例 \"en,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:536 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:537 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:548 msgid "Browsing" msgstr "ブラウジング" #. Page "Applications" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:578 msgid "Applications" msgstr "アプリケーション" -#: ../midori/midori-preferences.c:573 +#: ../midori/midori-preferences.c:579 msgid "External applications" msgstr "外部アプリケーション" #. 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 "ネットワーク" -#: ../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 "プライバシー" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:659 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:666 -#: ../midori/midori-preferences.c:676 +#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682 msgid "days" msgstr "日" -#: ../midori/midori-searchaction.c:484 -#: ../katze/katze-arrayaction.c:314 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:331 msgid "Empty" msgstr "空です" @@ -1677,121 +1677,91 @@ msgstr "アイコン(_I):" msgid "_Token:" msgstr "トークン(_T):" -#: ../midori/midori-searchaction.c:1195 +#: ../midori/midori-searchaction.c:1209 msgid "Manage Search Engines" msgstr "検索エンジンの管理" -#: ../midori/midori-searchaction.c:1292 +#: ../midori/midori-searchaction.c:1308 msgid "Use as _default" msgstr "デフォルトで使う(_D)" -#: ../midori/sokoke.c:162 -#: ../midori/sokoke.c:174 +#: ../midori/sokoke.c:172 ../midori/sokoke.c:184 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" -#. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:520 -msgid "Warning: You are using a superuser account!" -msgstr "警告: あなたはスーパーユーザアカウントを使用しています!" - -#: ../midori/sokoke.c:871 +#: ../midori/sokoke.c:862 msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/sokoke.c:873 -msgid "_Add Bookmark" -msgstr "ブックマークに追加(_A)" +#: ../midori/sokoke.c:864 +msgid "Add Boo_kmark" +msgstr "ブックマークに追加(_K)" -#: ../midori/sokoke.c:874 +#: ../midori/sokoke.c:865 msgid "_Console" msgstr "コンソール(_C)" -#: ../midori/sokoke.c:875 +#: ../midori/sokoke.c:866 msgid "_Extensions" msgstr "エクステンション(_E)" -#: ../midori/sokoke.c:876 +#: ../midori/sokoke.c:867 msgid "_History" msgstr "履歴(_H)" -#: ../midori/sokoke.c:877 +#: ../midori/sokoke.c:868 msgid "_Homepage" msgstr "ホームページ(_H)" -#: ../midori/sokoke.c:878 +#: ../midori/sokoke.c:869 msgid "_Userscripts" msgstr "ユーザスクリプト(_U)" -#: ../midori/sokoke.c:879 +#: ../midori/sokoke.c:870 msgid "User_styles" msgstr "ユーザスタイル(_S)" -#: ../midori/sokoke.c:880 +#: ../midori/sokoke.c:871 msgid "New _Tab" msgstr "新しいタブ(_T)" -#: ../midori/sokoke.c:881 +#: ../midori/sokoke.c:872 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/sokoke.c:882 +#: ../midori/sokoke.c:873 msgid "Netscape p_lugins" msgstr "Netscape プラグイン(_L)" -#: ../midori/sokoke.c:883 -msgid "_Closed Tabs and Windows" -msgstr "閉じたタブとウィンドウ(_C)" - -#: ../midori/sokoke.c:884 +#: ../midori/sokoke.c:875 msgid "New _Window" msgstr "新しいウィンドウ(_W)" -#: ../panels/midori-addons.c:95 -#: ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "ユーザスクリプト" -#: ../panels/midori-addons.c:96 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "ユーザスタイル" -#: ../panels/midori-addons.c:927 -#: ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "有効(_E)" - -# tooltip -#: ../panels/midori-addons.c:928 -#: ../panels/midori-extensions.c:145 -msgid "Enable" -msgstr "有効にします" - -#: ../panels/midori-addons.c:937 -#: ../panels/midori-extensions.c:154 -msgid "_Disable" -msgstr "無効(_D)" - -# tooltip -#: ../panels/midori-addons.c:938 -#: ../panels/midori-extensions.c:155 -msgid "Disable" -msgstr "無効にします" - -#: ../panels/midori-bookmarks.c:107 +#: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "ブックマーク" -#: ../panels/midori-bookmarks.c:238 +#: ../panels/midori-bookmarks.c:239 msgid "Edit the selected bookmark" msgstr "選択したブックマークを編集します" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" msgstr "選択したブックマークを削除します" -#: ../panels/midori-bookmarks.c:591 +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "新しいフォルダの追加" + +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "セパレータ" @@ -1799,7 +1769,7 @@ msgstr "セパレータ" msgid "Console" msgstr "コンソール" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "エクステンション" @@ -1819,37 +1789,42 @@ msgstr "選択した履歴アイテムを削除します" msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../panels/midori-history.c:599 +#: ../panels/midori-history.c:601 msgid "A week ago" msgstr "一週間前" -#: ../panels/midori-history.c:604 +#: ../panels/midori-history.c:606 #, c-format msgid "%d day ago" -msgstr "%d 日前" +msgid_plural "%d days ago" +msgstr[0] "%d 日前" +msgstr[1] "%d 日前" -#: ../panels/midori-history.c:605 -#, c-format -msgid "%d days ago" -msgstr "%d 日前" - -#: ../panels/midori-history.c:612 +#: ../panels/midori-history.c:614 msgid "Today" msgstr "今日" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:616 msgid "Yesterday" msgstr "昨日" -#: ../panels/midori-plugins.c:87 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "Netscape プラグイン" -#: ../panels/midori-transfers.c:256 +#: ../panels/midori-transfers.c:271 #, c-format msgid "%s of %s" msgstr "%s / %s" +#: ../panels/midori-transfers.c:479 +msgid "Open Destination _Folder" +msgstr "保存先フォルダを開く(_F)" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "リンクの場所のコピー(_A)" + #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "認証が要求されました" @@ -1884,21 +1859,35 @@ msgstr "ストックアイコン '%s' を読み込めませんでした" msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../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 "'%s' は %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 "ファイルの選択" -#: ../katze/katze-utils.c:230 +#: ../katze/katze-utils.c:250 msgid "Choose folder" msgstr "フォルダの選択" +#: ../extensions/adblock.c:78 +msgid "Configure Advertisement filters" +msgstr "広告フィルタの設定" + +#: ../extensions/adblock.c:214 +msgid "Configure _Advertisement filters..." +msgstr "広告フィルタの設定(_A)..." + +#: ../extensions/adblock.c:374 +msgid "Advertisement blocker" +msgstr "広告ブロッカ" + +#: ../extensions/adblock.c:375 +msgid "Block advertisements according to a filter list" +msgstr "フィルタリストに登録された広告をブロックします" + #: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "タブの色分け" @@ -1911,11 +1900,47 @@ msgstr "カラフルタブ" msgid "Tint each tab distinctly" msgstr "各タブにそれぞれを区別する色をつけます" -#: ../extensions/cookie-manager.c:201 +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "Cookie マネージャ" + +#: ../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 "" +"表示されているすべての cookie を削除します。フィルタが設定されていれば、フィ" +"ルタにマッチした cookie のみ削除されます。" + +# tooltip +#: ../extensions/cookie-manager/cookie-manager-page.c:126 +msgid "Expand All" +msgstr "すべて展開します" + +# tooltip +#: ../extensions/cookie-manager/cookie-manager-page.c:133 +msgid "Collapse All" +msgstr "すべて折り畳みます" + +#: ../extensions/cookie-manager/cookie-manager-page.c:460 +msgid "Do you really want to delete all cookies?" +msgstr "本当にすべての cookie を削除してよろしいですか?" + +# Dialog title +#: ../extensions/cookie-manager/cookie-manager-page.c:462 +msgid "Question" +msgstr "確認" + +#: ../extensions/cookie-manager/cookie-manager-page.c:471 +msgid "Only cookies which match the filter will be deleted." +msgstr "フィルタに入力された文字列にマッチした cookie のみ削除されます。" + +#: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" msgstr "セッションの終わりまで" -#: ../extensions/cookie-manager.c:204 +#: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format msgid "" "Host: %s\n" @@ -1933,73 +1958,45 @@ msgstr "" "有効期限: %s" # cookie: Secure flag is set. -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" msgstr "あり" # cookie: Secure flag isn't set. -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" msgstr "なし" -#: ../extensions/cookie-manager.c:493 -msgid "Do you really want to delete all cookies?" -msgstr "本当にすべての cookie を削除してよろしいですか?" - -# Dialog title -#: ../extensions/cookie-manager.c:495 -msgid "Question" -msgstr "確認" - -#: ../extensions/cookie-manager.c:504 -msgid "Only cookies which match the filter will be deleted." -msgstr "フィルタに入力された文字列にマッチした cookie のみ削除されます。" - # Column name of cookie browser -#: ../extensions/cookie-manager.c:682 +#: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" msgstr "名前" -#: ../extensions/cookie-manager.c:742 +#: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" msgstr "すべて展開する(_E)" -#: ../extensions/cookie-manager.c:750 +#: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" msgstr "すべて折り畳む(_C)" -#: ../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 "表示されているすべての cookie を削除します。フィルタが設定されていれば、フィルタにマッチした cookie のみ削除されます。" - -# tooltip -#: ../extensions/cookie-manager.c:838 -msgid "Expand All" -msgstr "すべて展開します" - -# tooltip -#: ../extensions/cookie-manager.c:845 -msgid "Collapse All" -msgstr "すべて折り畳みます" - -#: ../extensions/cookie-manager.c:876 +#: ../extensions/cookie-manager/cookie-manager-page.c:923 msgid "Filter:" msgstr "フィルタ:" -#: ../extensions/cookie-manager.c:881 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "フィルタに入力された文字列と、名前またはドメインフィールドがマッチした cookie のみ表示します。" +#: ../extensions/cookie-manager/cookie-manager-page.c:928 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"フィルタに入力された文字列と、名前またはドメインフィールドがマッチした " +"cookie のみ表示します。" -#: ../extensions/cookie-manager.c:916 -#: ../extensions/cookie-manager.c:964 -msgid "Cookie Manager" -msgstr "Cookie マネージャ" - -#: ../extensions/cookie-manager.c:948 +#: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" msgstr "Cookie マネージャ(_C)" -#: ../extensions/cookie-manager.c:965 +#: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" msgstr "Cookie の一覧や内容の表示および削除を行います" @@ -2034,17 +2031,17 @@ msgstr "フィードの削除" msgid "_Feeds" msgstr "フィード(_F)" -#: ../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 "フィード XML データ内にルート要素が見つかりませんでした。" -#: ../extensions/feed-panel/feed-parse.c:215 +#: ../extensions/feed-panel/feed-parse.c:225 #, c-format msgid "Unsupported feed format." msgstr "サポートされていないフィード形式です。" -#: ../extensions/feed-panel/feed-parse.c:245 +#: ../extensions/feed-panel/feed-parse.c:255 #, c-format msgid "Failed to parse XML feed: %s" msgstr "XML フィードの解析に失敗しました: %s" @@ -2057,11 +2054,11 @@ msgstr "RSS XML データ内に \"channel\" 要素が見つかりませんでし msgid "Unsupported RSS version found." msgstr "サポートされていない RSS バージョンが見つかりました。" -#: ../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 "XML データ内に要求された RSS \"item\" 要素が見つかりませんでした。" -#: ../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 "XML データ内に要求された RSS \"channel\" 要素が見つかりませんでした。" @@ -2087,17 +2084,16 @@ msgstr "フィードパネル" msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS フィードを購読します" -#: ../extensions/mouse-gestures/main.c:216 +#: ../extensions/mouse-gestures/main.c:236 msgid "Mouse Gestures" msgstr "マウスジェスチャ" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures/main.c:237 msgid "Control Midori by moving the mouse" msgstr "マウスの操作で Midori を制御します" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "ページホルダ" @@ -2105,24 +2101,82 @@ msgstr "ページホルダ" msgid "_Pageholder" msgstr "ページホルダ(_P)" -#: ../extensions/statusbar-features.c:104 +#: ../extensions/shortcuts.c:212 +msgid "Configure Keyboard shortcuts" +msgstr "キーボードショートカットの設定" + +#: ../extensions/shortcuts.c:309 +msgid "Configure Sh_ortcuts..." +msgstr "ショートカットの設定(_O)..." + +#: ../extensions/shortcuts.c:341 +msgid "Shortcuts" +msgstr "ショートカット" + +#: ../extensions/shortcuts.c:342 +msgid "View and edit keyboard shortcuts" +msgstr "キーボードショートカットの表示および編集を行います" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "画像" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "スクリプト" + +#: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" msgstr "ステータスバー機能" -#: ../extensions/statusbar-features.c:105 +#: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" msgstr "ウェブページへの機能のオン/オフを簡単に切り換えます" -#~ msgid "Add to customize _homepage" -#~ msgstr "カスタムホームページに追加(_H)" -#~ msgid "Add to customized _homepage" -#~ msgstr "カスタムホームページに追加(_H)" -#~ msgid "P_lugins" -#~ msgstr "プラグイン(_L)" -#~ msgid "Plugins" -#~ msgstr "プラグイン" -#~ msgid "Images" -#~ msgstr "画像" -#~ msgid "Scripts" -#~ 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 "タブパネル(_A)" + +# FIXME: +#: ../extensions/tab-panel.c:353 +msgid "Show tabs in a vertical panel" +msgstr "タブを垂直パネルに表示します" + +#: ../extensions/toolbar-editor.c:292 +msgid "Customize Toolbar" +msgstr "ツールバーのカスタマイズ" + +#: ../extensions/toolbar-editor.c:308 +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" +"ツールバーに表示するアイテムを選択してください。表示順はドラッグアンドドロッ" +"プで変更できます。" + +#: ../extensions/toolbar-editor.c:319 +msgid "Available Items" +msgstr "利用可能なアイテム" + +#: ../extensions/toolbar-editor.c:335 +msgid "Displayed Items" +msgstr "表示するアイテム" + +#: ../extensions/toolbar-editor.c:502 +msgid "Configure _Toolbar..." +msgstr "ツールバーの設定(_T)..." + +#: ../extensions/toolbar-editor.c:531 +msgid "Toolbar Editor" +msgstr "ツールバーエディタ" + +#: ../extensions/toolbar-editor.c:532 +msgid "Easily edit the toolbar layout" +msgstr "ツールバーのレイアウトを簡単に編集できます" + +#~ msgid "_Enable" +#~ msgstr "有効(_E)" diff --git a/po/midori.pot b/po/midori.pot index 685cee8b..dd28db9d 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,21 +8,22 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1449 -#: ../midori/main.c:1457 ../midori/main.c:1468 -#: ../midori/midori-websettings.c:277 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1344 ../midori/main.c:1498 +#: ../midori/main.c:1506 ../midori/main.c:1517 +#: ../midori/midori-websettings.c:285 msgid "Midori" msgstr "" @@ -81,1323 +82,1362 @@ msgstr "" msgid "The configuration couldn't be saved. %s" msgstr "" -#: ../midori/main.c:770 +#: ../midori/main.c:779 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../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 "" #. 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 "" -#: ../midori/main.c:965 +#: ../midori/main.c:974 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../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 "" -#: ../midori/main.c:1107 +#: ../midori/main.c:1116 msgid "Modify _preferences" msgstr "" -#: ../midori/main.c:1111 +#: ../midori/main.c:1120 msgid "Reset the last _session" msgstr "" -#: ../midori/main.c:1116 +#: ../midori/main.c:1125 msgid "Disable all _extensions" msgstr "" -#: ../midori/main.c:1315 +#: ../midori/main.c:1344 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1338 +#: ../midori/main.c:1367 msgid "An unknown error occured." msgstr "" -#: ../midori/main.c:1370 +#: ../midori/main.c:1400 #, c-format msgid "Snapshot saved to: %s\n" msgstr "" -#: ../midori/main.c:1391 +#: ../midori/main.c:1435 msgid "Run ADDRESS as a web application" msgstr "" -#: ../midori/main.c:1391 +#: ../midori/main.c:1435 msgid "ADDRESS" msgstr "" -#: ../midori/main.c:1393 +#: ../midori/main.c:1437 msgid "Use FOLDER as configuration folder" msgstr "" -#: ../midori/main.c:1393 +#: ../midori/main.c:1437 msgid "FOLDER" msgstr "" -#: ../midori/main.c:1395 +#: ../midori/main.c:1440 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1398 +#: ../midori/main.c:1444 msgid "Take a snapshot of the specified URI" msgstr "" -#: ../midori/main.c:1401 +#: ../midori/main.c:1447 +msgid "Execute the specified command" +msgstr "" + +#: ../midori/main.c:1449 msgid "Display program version" msgstr "" -#: ../midori/main.c:1403 +#: ../midori/main.c:1451 msgid "Addresses" msgstr "" -#: ../midori/main.c:1446 +#: ../midori/main.c:1495 msgid "[Addresses]" msgstr "" -#: ../midori/main.c:1469 +#: ../midori/main.c:1518 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:1471 +#: ../midori/main.c:1520 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:1548 +#: ../midori/main.c:1602 msgid "The specified configuration folder is invalid." msgstr "" -#: ../midori/main.c:1583 +#: ../midori/main.c:1638 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1633 +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "" -#: ../midori/main.c:1645 +#: ../midori/main.c:1700 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1660 +#: ../midori/main.c:1715 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1673 +#: ../midori/main.c:1728 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1686 +#: ../midori/main.c:1741 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1698 +#: ../midori/main.c:1753 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:1714 +#: ../midori/main.c:1769 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:716 +#: ../midori/midori-array.c:429 ../midori/sokoke.c:700 #, c-format msgid "Writing failed." msgstr "" -#: ../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 "" -#: ../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 "" -#: ../midori/midori-browser.c:360 +#: ../midori/midori-browser.c:410 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:385 +#: ../midori/midori-browser.c:435 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:617 msgid "New folder" msgstr "" -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:617 msgid "Edit folder" msgstr "" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:619 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:619 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:649 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:648 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:667 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:681 ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "" -#: ../midori/midori-browser.c:686 +#: ../midori/midori-browser.c:700 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:691 ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:705 ../midori/midori-browser.c:746 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:808 +#: ../midori/midori-browser.c:822 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1119 +#: ../midori/midori-browser.c:1169 #, c-format msgid "The file %s has been downloaded." msgstr "" -#: ../midori/midori-browser.c:1123 +#: ../midori/midori-browser.c:1173 msgid "Transfer completed" msgstr "" -#: ../midori/midori-browser.c:1820 +#: ../midori/midori-browser.c:1314 +msgid "Save file" +msgstr "" + +#: ../midori/midori-browser.c:1960 msgid "Open file" msgstr "" -#: ../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 "" -#: ../midori/midori-browser.c:3159 ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:542 +#: ../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 "" -#: ../midori/midori-browser.c:3162 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:544 +#: ../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 "" -#: ../midori/midori-browser.c:3425 +#: ../midori/midori-browser.c:3739 msgid "Clear Private Data" msgstr "" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3743 msgid "_Clear private data" msgstr "" -#: ../midori/midori-browser.c:3441 +#: ../midori/midori-browser.c:3756 msgid "Clear the following data:" msgstr "" -#: ../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 "" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3771 msgid "Cookies" msgstr "" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3776 msgid "'Flash' Cookies" msgstr "" -#: ../midori/midori-browser.c:3458 +#: ../midori/midori-browser.c:3781 msgid "Website icons" msgstr "" -#: ../midori/midori-browser.c:3538 +#: ../midori/midori-browser.c:3786 ../midori/sokoke.c:874 +msgid "_Closed Tabs and Windows" +msgstr "" + +#: ../midori/midori-browser.c:3869 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:3546 +#: ../midori/midori-browser.c:3877 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:4111 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:3753 +#: ../midori/midori-browser.c:4114 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:3756 +#: ../midori/midori-browser.c:4117 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:4120 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:3762 +#: ../midori/midori-browser.c:4123 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:3764 ../midori/midori-view.c:1256 +#: ../midori/midori-browser.c:4125 msgid "Add to Speed _dial" msgstr "" -#: ../midori/midori-browser.c:3765 +#: ../midori/midori-browser.c:4126 msgid "Add shortcut to speed dial" msgstr "" -#: ../midori/midori-browser.c:3767 +#: ../midori/midori-browser.c:4128 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:3768 +#: ../midori/midori-browser.c:4129 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:3770 +#: ../midori/midori-browser.c:4131 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:3771 +#: ../midori/midori-browser.c:4132 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:3774 +#: ../midori/midori-browser.c:4135 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:3777 +#: ../midori/midori-browser.c:4138 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:3779 +#: ../midori/midori-browser.c:4140 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:4143 msgid "Cut the selected text" msgstr "" -#: ../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 "" -#: ../midori/midori-browser.c:3791 +#: ../midori/midori-browser.c:4152 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:3794 +#: ../midori/midori-browser.c:4155 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:3797 +#: ../midori/midori-browser.c:4158 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:3800 +#: ../midori/midori-browser.c:4161 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:4163 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:3803 +#: ../midori/midori-browser.c:4164 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3805 +#: ../midori/midori-browser.c:4166 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:3806 +#: ../midori/midori-browser.c:4167 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3809 -msgid "_Quick Find" -msgstr "" - -#: ../midori/midori-browser.c:3810 -msgid "Quickly jump to a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:4171 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:4173 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:3816 +#: ../midori/midori-browser.c:4174 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:4186 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3831 +#: ../midori/midori-browser.c:4189 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3834 +#: ../midori/midori-browser.c:4192 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3835 +#: ../midori/midori-browser.c:4193 msgid "_Encoding" msgstr "" -#: ../midori/midori-browser.c:3837 -msgid "_Automatic" +#: ../midori/midori-browser.c:4195 +msgid "View So_urce" msgstr "" -#: ../midori/midori-browser.c:3840 ../midori/midori-websettings.c:204 -msgid "Chinese (BIG5)" -msgstr "" - -#: ../midori/midori-browser.c:3843 ../midori/midori-websettings.c:205 -msgid "Japanese (SHIFT_JIS)" -msgstr "" - -#: ../midori/midori-browser.c:3846 ../midori/midori-websettings.c:206 -msgid "Russian (KOI8-R)" -msgstr "" - -#: ../midori/midori-browser.c:3849 ../midori/midori-websettings.c:207 -msgid "Unicode (UTF-8)" -msgstr "" - -#: ../midori/midori-browser.c:3852 ../midori/midori-websettings.c:208 -msgid "Western (ISO-8859-1)" -msgstr "" - -#: ../midori/midori-browser.c:3855 ../midori/midori-websettings.c:209 -#: ../midori/midori-websettings.c:281 -msgid "Custom..." -msgstr "" - -#: ../midori/midori-browser.c:3858 ../midori/midori-view.c:1275 -msgid "View _Source" -msgstr "" - -#: ../midori/midori-browser.c:3859 +#: ../midori/midori-browser.c:4196 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:3861 +#: ../midori/midori-browser.c:4198 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:3862 +#: ../midori/midori-browser.c:4199 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:3866 +#: ../midori/midori-browser.c:4203 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:3868 +#: ../midori/midori-browser.c:4205 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:3871 +#: ../midori/midori-browser.c:4208 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:3874 +#: ../midori/midori-browser.c:4211 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:3877 +#: ../midori/midori-browser.c:4214 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:3879 +#: ../midori/midori-browser.c:4216 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:3880 +#: ../midori/midori-browser.c:4217 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3882 ../midori/midori-view.c:1233 -msgid "Undo Close Tab" +#: ../midori/midori-browser.c:4219 +msgid "Undo _Close Tab" msgstr "" -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:4220 msgid "Open the last closed tab" msgstr "" -#: ../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 "" -#: ../midori/midori-browser.c:3889 ../panels/midori-bookmarks.c:259 -msgid "Add a new folder" +#: ../midori/midori-browser.c:4226 +msgid "Add a new _folder" msgstr "" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:4227 msgid "Add a new bookmark folder" msgstr "" -#: ../midori/midori-browser.c:3891 +#: ../midori/midori-browser.c:4228 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:3893 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4230 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:4231 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:3897 +#: ../midori/midori-browser.c:4234 msgid "_Clear Private Data" msgstr "" -#: ../midori/midori-browser.c:3898 +#: ../midori/midori-browser.c:4235 msgid "Clear private data..." msgstr "" -#: ../midori/midori-browser.c:3902 +#: ../midori/midori-browser.c:4239 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:3903 +#: ../midori/midori-browser.c:4240 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4242 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:3906 +#: ../midori/midori-browser.c:4243 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:3908 +#: ../midori/midori-browser.c:4245 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:3910 +#: ../midori/midori-browser.c:4247 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:3911 +#: ../midori/midori-browser.c:4248 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:3913 +#: ../midori/midori-browser.c:4250 msgid "_Frequent Questions" msgstr "" -#: ../midori/midori-browser.c:3914 +#: ../midori/midori-browser.c:4251 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:3916 +#: ../midori/midori-browser.c:4253 msgid "_Report a Bug" msgstr "" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4254 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4257 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:3927 +#: ../midori/midori-browser.c:4264 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:3928 +#: ../midori/midori-browser.c:4265 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4270 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4271 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4274 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:3938 +#: ../midori/midori-browser.c:4275 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3941 +#: ../midori/midori-browser.c:4278 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:3942 +#: ../midori/midori-browser.c:4279 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3945 +#: ../midori/midori-browser.c:4282 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4283 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:4286 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3950 +#: ../midori/midori-browser.c:4287 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3953 +#: ../midori/midori-browser.c:4290 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3954 +#: ../midori/midori-browser.c:4291 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:4389 +#: ../midori/midori-browser.c:4298 +msgid "_Automatic" +msgstr "" + +#: ../midori/midori-browser.c:4301 ../midori/midori-websettings.c:212 +msgid "Chinese (BIG5)" +msgstr "" + +#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic +#: ../midori/midori-browser.c:4305 +msgid "Japanese (SHIFT__JIS)" +msgstr "" + +#: ../midori/midori-browser.c:4308 ../midori/midori-websettings.c:214 +msgid "Russian (KOI8-R)" +msgstr "" + +#: ../midori/midori-browser.c:4311 ../midori/midori-websettings.c:215 +msgid "Unicode (UTF-8)" +msgstr "" + +#: ../midori/midori-browser.c:4314 ../midori/midori-websettings.c:216 +msgid "Western (ISO-8859-1)" +msgstr "" + +#: ../midori/midori-browser.c:4317 ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:289 +msgid "Custom..." +msgstr "" + +#: ../midori/midori-browser.c:4755 msgid "_Separator" msgstr "" -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:4762 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:4398 +#: ../midori/midori-browser.c:4764 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4788 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:4422 +#: ../midori/midori-browser.c:4790 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:4443 +#: ../midori/midori-browser.c:4811 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:4458 +#: ../midori/midori-browser.c:4826 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:4460 +#: ../midori/midori-browser.c:4828 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:4475 ../midori/sokoke.c:872 +#: ../midori/midori-browser.c:4843 ../midori/sokoke.c:863 msgid "_Bookmarks" msgstr "" -#: ../midori/midori-browser.c:4477 +#: ../midori/midori-browser.c:4845 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4860 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:4494 +#: ../midori/midori-browser.c:4862 msgid "Show a list of all open tabs" msgstr "" +#: ../midori/midori-browser.c:4876 +msgid "_Menu" +msgstr "" + +#: ../midori/midori-browser.c:4878 +msgid "Menu" +msgstr "" + #. 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 "" -#: ../midori/midori-browser.c:4699 +#: ../midori/midori-browser.c:5084 msgid "Previous" msgstr "" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:5089 msgid "Next" msgstr "" -#: ../midori/midori-browser.c:4709 +#: ../midori/midori-browser.c:5094 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:4717 +#: ../midori/midori-browser.c:5102 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:4727 +#: ../midori/midori-browser.c:5112 msgid "Close Findbar" msgstr "" -#: ../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 "" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5476 #, c-format msgid "Unexpected setting '%s'" msgstr "" +#: ../midori/midori-locationaction.c:901 +#, c-format +msgid "Search with %s" +msgstr "" + #: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "" -#: ../midori/midori-panel.c:335 -msgid "Whether to detach the chosen panel from the window" +#: ../midori/midori-panel.c:343 ../midori/midori-panel.c:508 +msgid "Align sidepanel to the right" msgstr "" -#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:535 -msgid "Align sidepanel on the right" -msgstr "" - -#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:536 -msgid "Whether to align the sidepanel on the right" -msgstr "" - -#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 +#: ../midori/midori-panel.c:353 ../midori/midori-panel.c:354 msgid "Close panel" msgstr "" -#: ../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 "" + +#: ../midori/midori-websettings.c:195 ../midori/midori-view.c:2265 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:188 ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:196 ../midori/midori-websettings.c:563 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:197 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:213 +msgid "Japanese (SHIFT_JIS)" +msgstr "" + +#: ../midori/midori-websettings.c:232 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:233 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:234 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:249 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:250 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:251 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:252 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:253 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:268 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:269 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:262 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:270 ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:87 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:286 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:287 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:288 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:333 +#: ../midori/midori-websettings.c:341 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:342 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:350 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:351 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:359 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:360 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:385 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:395 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:396 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:404 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:405 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:414 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:415 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:423 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:424 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:432 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:433 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:441 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:457 msgid "Show Transferbar" msgstr "" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:466 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:493 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:494 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:509 msgid "Search engines in location completion" msgstr "" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:510 msgid "Whether to show search engines in the location completion" msgstr "" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:518 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:519 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:527 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:528 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:543 +msgid "Align sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:544 +msgid "Whether to align the sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:553 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:554 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:564 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:579 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:580 msgid "Show a dialog after Midori crashed" msgstr "" #. 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 "" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:597 msgid "Show speed dial in newly opened tabs" msgstr "" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:605 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:606 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:625 msgid "Ask for the destination folder" msgstr "" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:626 msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:645 msgid "Notify when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:646 msgid "Whether to show a notification when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:658 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:651 +#: ../midori/midori-websettings.c:659 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:667 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:668 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:683 msgid "News Aggregator" msgstr "" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:684 msgid "An external news aggregator" msgstr "" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:692 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:693 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:701 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:702 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:712 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:713 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:721 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:722 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:730 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:731 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:740 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:733 +#: ../midori/midori-websettings.c:741 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:754 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:755 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:763 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:764 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:772 msgid "Open Tabs next to Current" msgstr "" -#: ../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 "" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:781 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:782 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:798 msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:799 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:814 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:807 +#: ../midori/midori-websettings.c:815 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:823 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:824 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:825 +#: ../midori/midori-websettings.c:833 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:826 +#: ../midori/midori-websettings.c:834 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:842 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:843 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:853 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:854 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:862 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:863 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:871 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:872 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:880 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:881 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:891 msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:892 msgid "The proxy server used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:907 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:908 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:916 +#: ../midori/midori-websettings.c:924 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:917 +#: ../midori/midori-websettings.c:925 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:933 +#: ../midori/midori-websettings.c:941 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:934 +#: ../midori/midori-websettings.c:942 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:950 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:951 msgid "The allowed size of the cache" msgstr "" -#: ../midori/midori-view.c:686 +#: ../midori/midori-websettings.c:966 +msgid "Clear private data" +msgstr "" + +#: ../midori/midori-websettings.c:967 +msgid "The private data selected for deletion" +msgstr "" + +#: ../midori/midori-view.c:750 #, 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: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 "" -#: ../midori/midori-view.c:691 +#: ../midori/midori-view.c:755 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:721 ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:785 ../midori/midori-view.c:2901 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:1095 +#: ../midori/midori-view.c:1172 msgid "Open _Link" msgstr "" -#: ../midori/midori-view.c:1097 +#: ../midori/midori-view.c:1174 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:1114 +#: ../midori/midori-view.c:1191 msgid "Open Link in New _Window" msgstr "" -#: ../midori/midori-view.c:1123 +#: ../midori/midori-view.c:1197 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:1129 +#: ../midori/midori-view.c:1203 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:1138 +#: ../midori/midori-view.c:1212 msgid "Download with Download _Manager" msgstr "" -#: ../midori/midori-view.c:1167 +#: ../midori/midori-view.c:1241 msgid "Search _with" msgstr "" -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1269 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1279 msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1372 +#: ../midori/midori-view.c:1457 msgid "Open or download file" msgstr "" -#: ../midori/midori-view.c:1389 +#: ../midori/midori-view.c:1474 #, c-format msgid "File Type: '%s'" msgstr "" -#: ../midori/midori-view.c:1392 +#: ../midori/midori-view.c:1477 #, 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:1396 +#: ../midori/midori-view.c:1481 #, c-format msgid "Open %s" msgstr "" -#: ../midori/midori-view.c:1816 +#: ../midori/midori-view.c:1899 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:2001 ../midori/midori-view.c:2002 -msgid "Search" +#: ../midori/midori-view.c:2089 +msgid "Speed dial" msgstr "" -#: ../midori/midori-view.c:2003 +#: ../midori/midori-view.c:2090 msgid "Click to add a shortcut" msgstr "" -#: ../midori/midori-view.c:2004 +#: ../midori/midori-view.c:2091 msgid "Enter shortcut address" msgstr "" -#: ../midori/midori-view.c:2005 +#: ../midori/midori-view.c:2092 msgid "Enter shortcut title" msgstr "" -#: ../midori/midori-view.c:2006 +#: ../midori/midori-view.c:2093 msgid "Are you sure you want to delete this shortcut?" msgstr "" -#: ../midori/midori-view.c:2038 +#: ../midori/midori-view.c:2123 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:2055 +#: ../midori/midori-view.c:2140 #, c-format msgid "No documentation installed" msgstr "" +#: ../midori/midori-view.c:2487 +msgid "_Duplicate Tab" +msgstr "" + #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" @@ -1445,162 +1485,167 @@ msgstr "" msgid "Fixed-width Font Family" msgstr "" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:457 msgid "The font family used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" msgstr "" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:473 msgid "Encoding" msgstr "" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" msgstr "" #. Page "Behavior" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:484 msgid "Features" msgstr "" -#: ../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 "" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:488 msgid "Load and display images automatically" msgstr "" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:491 msgid "Shrink images automatically" msgstr "" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:492 msgid "Automatically shrink standalone images to fit" msgstr "" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:495 msgid "Print background images" msgstr "" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:496 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:499 msgid "Resizable text areas" msgstr "" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:500 msgid "Whether text areas are resizable" msgstr "" -#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:504 msgid "Enable embedded scripting languages" msgstr "" -#: ../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 "" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:508 msgid "Enable embedded Netscape plugin objects" msgstr "" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:511 msgid "Enforce 96 dots per inch" msgstr "" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:512 msgid "Enforce a video dot density of 96 DPI" msgstr "" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:515 msgid "Enable developer tools" msgstr "" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:516 msgid "Enable special extensions for developers" msgstr "" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:523 msgid "Spell Checking" msgstr "" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:526 msgid "Enable Spell Checking" msgstr "" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:527 msgid "Enable spell checking while typing" msgstr "" -#: ../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 "" #. Page "Interface" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:536 msgid "Interface" msgstr "" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:537 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:548 msgid "Browsing" msgstr "" #. Page "Applications" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:578 msgid "Applications" msgstr "" -#: ../midori/midori-preferences.c:573 +#: ../midori/midori-preferences.c:579 msgid "External applications" msgstr "" #. 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 "" -#: ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:653 msgid "MB" msgstr "" #. Page "Privacy" -#: ../midori/midori-preferences.c:652 +#: ../midori/midori-preferences.c:658 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:659 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676 +#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682 msgid "days" msgstr "" -#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:314 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:331 msgid "Empty" msgstr "" @@ -1624,72 +1669,63 @@ msgstr "" msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1195 +#: ../midori/midori-searchaction.c:1209 msgid "Manage Search Engines" msgstr "" -#: ../midori/midori-searchaction.c:1292 +#: ../midori/midori-searchaction.c:1308 msgid "Use as _default" msgstr "" -#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 +#: ../midori/sokoke.c:172 ../midori/sokoke.c:184 msgid "Could not run external program." msgstr "" -#. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:520 -msgid "Warning: You are using a superuser account!" -msgstr "" - -#: ../midori/sokoke.c:871 +#: ../midori/sokoke.c:862 msgid "_Bookmark" msgstr "" -#: ../midori/sokoke.c:873 -msgid "_Add Bookmark" +#: ../midori/sokoke.c:864 +msgid "Add Boo_kmark" msgstr "" -#: ../midori/sokoke.c:874 +#: ../midori/sokoke.c:865 msgid "_Console" msgstr "" -#: ../midori/sokoke.c:875 +#: ../midori/sokoke.c:866 msgid "_Extensions" msgstr "" -#: ../midori/sokoke.c:876 +#: ../midori/sokoke.c:867 msgid "_History" msgstr "" -#: ../midori/sokoke.c:877 +#: ../midori/sokoke.c:868 msgid "_Homepage" msgstr "" -#: ../midori/sokoke.c:878 +#: ../midori/sokoke.c:869 msgid "_Userscripts" msgstr "" -#: ../midori/sokoke.c:879 +#: ../midori/sokoke.c:870 msgid "User_styles" msgstr "" -#: ../midori/sokoke.c:880 +#: ../midori/sokoke.c:871 msgid "New _Tab" msgstr "" -#: ../midori/sokoke.c:881 +#: ../midori/sokoke.c:872 msgid "_Transfers" msgstr "" -#: ../midori/sokoke.c:882 +#: ../midori/sokoke.c:873 msgid "Netscape p_lugins" msgstr "" -#: ../midori/sokoke.c:883 -msgid "_Closed Tabs and Windows" -msgstr "" - -#: ../midori/sokoke.c:884 +#: ../midori/sokoke.c:875 msgid "New _Window" msgstr "" @@ -1701,35 +1737,23 @@ msgstr "" msgid "Userstyles" msgstr "" -#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "" - -#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145 -msgid "Enable" -msgstr "" - -#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154 -msgid "_Disable" -msgstr "" - -#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155 -msgid "Disable" -msgstr "" - -#: ../panels/midori-bookmarks.c:107 +#: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "" -#: ../panels/midori-bookmarks.c:238 +#: ../panels/midori-bookmarks.c:239 msgid "Edit the selected bookmark" msgstr "" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" msgstr "" -#: ../panels/midori-bookmarks.c:591 +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "" + +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "" @@ -1737,7 +1761,7 @@ msgstr "" msgid "Console" msgstr "" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "" @@ -1757,37 +1781,42 @@ msgstr "" msgid "Clear the entire history" msgstr "" -#: ../panels/midori-history.c:599 +#: ../panels/midori-history.c:601 msgid "A week ago" msgstr "" -#: ../panels/midori-history.c:604 +#: ../panels/midori-history.c:606 #, c-format msgid "%d day ago" -msgstr "" +msgid_plural "%d days ago" +msgstr[0] "" +msgstr[1] "" -#: ../panels/midori-history.c:605 -#, c-format -msgid "%d days ago" -msgstr "" - -#: ../panels/midori-history.c:612 +#: ../panels/midori-history.c:614 msgid "Today" msgstr "" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:616 msgid "Yesterday" msgstr "" -#: ../panels/midori-plugins.c:87 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "" -#: ../panels/midori-transfers.c:256 +#: ../panels/midori-transfers.c:271 #, c-format msgid "%s of %s" msgstr "" +#: ../panels/midori-transfers.c:479 +msgid "Open Destination _Folder" +msgstr "" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "" + #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "" @@ -1820,19 +1849,35 @@ msgstr "" msgid "Animation frames are broken" msgstr "" -#: ../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 "" -#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:244 +#: ../katze/katze-utils.c:235 ../katze/katze-utils.c:264 msgid "Choose file" msgstr "" -#: ../katze/katze-utils.c:230 +#: ../katze/katze-utils.c:250 msgid "Choose folder" msgstr "" +#: ../extensions/adblock.c:128 +msgid "Configure Advertisement filters" +msgstr "" + +#: ../extensions/adblock.c:269 +msgid "Configure _Advertisement filters..." +msgstr "" + +#: ../extensions/adblock.c:526 +msgid "Advertisement blocker" +msgstr "" + +#: ../extensions/adblock.c:527 +msgid "Block advertisements according to a filter list" +msgstr "" + #: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "" @@ -1845,11 +1890,42 @@ msgstr "" msgid "Tint each tab distinctly" msgstr "" -#: ../extensions/cookie-manager.c:201 +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:111 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:126 +msgid "Expand All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:133 +msgid "Collapse All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:460 +msgid "Do you really want to delete all cookies?" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:462 +msgid "Question" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:471 +msgid "Only cookies which match the filter will be deleted." +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" msgstr "" -#: ../extensions/cookie-manager.c:204 +#: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format msgid "" "Host: %s\n" @@ -1860,71 +1936,41 @@ msgid "" "Expires: %s" msgstr "" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" msgstr "" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" msgstr "" -#: ../extensions/cookie-manager.c:493 -msgid "Do you really want to delete all cookies?" -msgstr "" - -#: ../extensions/cookie-manager.c:495 -msgid "Question" -msgstr "" - -#: ../extensions/cookie-manager.c:504 -msgid "Only cookies which match the filter will be deleted." -msgstr "" - -#: ../extensions/cookie-manager.c:682 +#: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" msgstr "" -#: ../extensions/cookie-manager.c:742 +#: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" msgstr "" -#: ../extensions/cookie-manager.c:750 +#: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" msgstr "" -#: ../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 "" - -#: ../extensions/cookie-manager.c:838 -msgid "Expand All" -msgstr "" - -#: ../extensions/cookie-manager.c:845 -msgid "Collapse All" -msgstr "" - -#: ../extensions/cookie-manager.c:876 +#: ../extensions/cookie-manager/cookie-manager-page.c:923 msgid "Filter:" msgstr "" -#: ../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 "" -#: ../extensions/cookie-manager.c:916 ../extensions/cookie-manager.c:964 -msgid "Cookie Manager" -msgstr "" - -#: ../extensions/cookie-manager.c:948 +#: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" msgstr "" -#: ../extensions/cookie-manager.c:965 +#: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" msgstr "" @@ -1959,17 +2005,17 @@ msgstr "" msgid "_Feeds" msgstr "" -#: ../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 "" -#: ../extensions/feed-panel/feed-parse.c:215 +#: ../extensions/feed-panel/feed-parse.c:225 #, c-format msgid "Unsupported feed format." msgstr "" -#: ../extensions/feed-panel/feed-parse.c:245 +#: ../extensions/feed-panel/feed-parse.c:255 #, c-format msgid "Failed to parse XML feed: %s" msgstr "" @@ -1982,11 +2028,11 @@ msgstr "" msgid "Unsupported RSS version found." msgstr "" -#: ../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 "" -#: ../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 "" @@ -2012,11 +2058,11 @@ msgstr "" msgid "Read Atom/ RSS feeds" msgstr "" -#: ../extensions/mouse-gestures/main.c:216 +#: ../extensions/mouse-gestures/main.c:236 msgid "Mouse Gestures" msgstr "" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures/main.c:237 msgid "Control Midori by moving the mouse" msgstr "" @@ -2029,10 +2075,76 @@ msgstr "" msgid "_Pageholder" msgstr "" -#: ../extensions/statusbar-features.c:104 +#: ../extensions/shortcuts.c:166 +msgid "Configure Keyboard shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:263 +msgid "Configure Sh_ortcuts..." +msgstr "" + +#: ../extensions/shortcuts.c:295 +msgid "Shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:296 +msgid "View and edit keyboard shortcuts" +msgstr "" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "" + +#: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" msgstr "" -#: ../extensions/statusbar-features.c:105 +#: ../extensions/statusbar-features.c:150 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:390 +msgid "Customize Toolbar" +msgstr "" + +#: ../extensions/toolbar-editor.c:406 +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" + +#: ../extensions/toolbar-editor.c:422 +msgid "Available Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:443 +msgid "Displayed Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:584 +msgid "Configure _Toolbar..." +msgstr "" + +#: ../extensions/toolbar-editor.c:613 +msgid "Toolbar Editor" +msgstr "" + +#: ../extensions/toolbar-editor.c:614 +msgid "Easily edit the toolbar layout" +msgstr "" diff --git a/po/pl.po b/po/pl.po index 5e8761f2..20e43937 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,1331 +8,1761 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 05:25+0100\n" +"POT-Creation-Date: 2009-05-29 00:00+0200\n" "PO-Revision-Date: 2008-08-27 00:24+0100\n" -"Last-Translator: Lukasz Romanowicz \n" +"Last-Translator: Przemysław Sitek \n" "Language-Team: pl \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Lekka przeglądarka internetowa" -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1449 +#: ../midori/main.c:1457 ../midori/main.c:1468 +#: ../midori/midori-websettings.c:281 msgid "Midori" msgstr "Midori" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Przeglądarka Internetowa" -#: ../midori/main.c:86 -#, fuzzy -msgid "_Bookmark" -msgstr "_Zakładki" - -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 -msgid "_Bookmarks" -msgstr "_Zakładki" - -#: ../midori/main.c:88 -msgid "_Add Bookmark" -msgstr "_Dodaj zakładkę" - -#: ../midori/main.c:89 -#, fuzzy -msgid "_Console" -msgstr "Konsola" - -#: ../midori/main.c:90 -#, fuzzy -msgid "_Extensions" -msgstr "Rozszerzenia" - -#: ../midori/main.c:91 -#, fuzzy -msgid "_History" -msgstr "Historia" - -#: ../midori/main.c:92 -msgid "_Homepage" -msgstr "_Strona startowa" - -#: ../midori/main.c:93 -#, fuzzy -msgid "_Userscripts" -msgstr "Skrypty użytkownika" - -#: ../midori/main.c:94 -#, fuzzy -msgid "User_styles" -msgstr "Skrypty użytkownika" - -#: ../midori/main.c:95 -msgid "New _Tab" -msgstr "Nowa kar_ta" - #: ../midori/main.c:96 -#, fuzzy -msgid "_Transfers" -msgstr "Pobierania plików" - -#: ../midori/main.c:97 -#, fuzzy -msgid "_Closed Tabs and Windows" -msgstr "Zamknięte karty i okna" - -#: ../midori/main.c:98 -msgid "New _Window" -msgstr "_Nowe okno" - -#: ../midori/main.c:143 -#, fuzzy, c-format +#, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "Ustawienia nie mogą być załadowane. %s\n" +msgstr "Ustawienia nie mogą być załadowane: %s\n" -#: ../midori/main.c:198 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wartość '%s' nie jest poprawna dla %s" -#: ../midori/main.c:205 ../midori/main.c:275 +#: ../midori/main.c:158 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:532 -msgid "File not found." -msgstr "Nie znaleziono dokumentu" - -#: ../midori/main.c:540 ../midori/main.c:549 -msgid "Malformed document." -msgstr "" - -#: ../midori/main.c:571 ../midori/main.c:603 +#: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" -msgstr "" +msgstr "Nie udało się uzyskać dostępu do bazy danych: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:382 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Nie udało się wykonać zapytania: %s\n" + +#: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "" +msgstr "Nie udało się usunąć elementu historii: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" -msgstr "" +msgstr "Nie udało się wyczyścić historii: %s\n" -#: ../midori/main.c:714 ../midori/main.c:728 +#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" -msgstr "" +msgstr "Nie udało się dodać elementu do historii: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:844 +#: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "" +msgstr "Nie udało się usunąć starycz elementów historii: %s\n" -#: ../midori/main.c:976 ../midori/sokoke.c:459 -#, c-format -msgid "Writing failed." -msgstr "Zapis nie powiódł się" - -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Pobierania plików" - -#: ../midori/main.c:1040 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "Sesja nie może zostać zapisana. %s" - -#: ../midori/main.c:1297 -msgid "Run the specified filename as javascript" -msgstr "" - -#: ../midori/main.c:1299 -msgid "Display program version" -msgstr "Wyświetl wersję programu" - -#: ../midori/main.c:1301 -#, fuzzy -msgid "URIs" -msgstr "URI" - -#: ../midori/main.c:1335 -#, fuzzy -msgid "[URIs]" -msgstr "[URL]" - -#: ../midori/main.c:1371 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Prosimy o zgłaszanie uwag, sugestii i błędów:" - -#: ../midori/main.c:1373 -msgid "Check for new versions at:" -msgstr "Sprawdź nową wersję na:" - -#: ../midori/main.c:1394 -msgid "No filename specified" -msgstr "" - -#: ../midori/main.c:1411 -#, c-format -msgid "An instance of Midori is already running but not responding.\n" -msgstr "" - -#: ../midori/main.c:1447 -#, fuzzy, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Zakładki nie mogą być załadowane. %s\n" - -#: ../midori/main.c:1463 -#, fuzzy, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Sesja nie może być załadowana. %s\n" - -#: ../midori/main.c:1477 -#, fuzzy, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "Nie można załadować śmietnika. %s\n" - -#: ../midori/main.c:1491 -#, fuzzy, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "Nie można załadować śmietnika. %s\n" - -#: ../midori/main.c:1504 -msgid "The following errors occured:" -msgstr "Nastąpiły następujące błędy:" - -#: ../midori/main.c:1520 -msgid "_Ignore" -msgstr "" - -#: ../midori/main.c:1688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Wyszukiwarki internetowe nie mogą być zapisane. %s" - -#: ../midori/main.c:1698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Zakładki nie mogą zostać zapisane. %s" - -#: ../midori/main.c:1707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Kosz nie może zostać zapisany. %s" - -#: ../midori/main.c:1715 +#: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Ustawienia nie mogą zostać zapisane. %s" -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3136 +#: ../midori/main.c:770 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Wyszukiwarki internetowe nie mogą być zapisane. %s" + +#: ../midori/main.c:789 ../midori/main.c:817 ../midori/main.c:846 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Zakładki nie mogą zostać zapisane. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:869 ../midori/main.c:892 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Kosz nie może zostać zapisany. %s" + +#: ../midori/main.c:965 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Sesja nie może zostać zapisana. %s" + +#: ../midori/main.c:1092 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Program Midori uległ awarii odkąd został uruchomiony ostatni raz. Jeżeli " +"problem się powtarza, należy spróbować poniższych opcji w celu rozwiązania " +"problemu." + +#: ../midori/main.c:1107 +msgid "Modify _preferences" +msgstr "Zmień _ustawienia" + +#: ../midori/main.c:1111 +msgid "Reset the last _session" +msgstr "Przywróć ostatnią _sesję" + +#: ../midori/main.c:1116 +msgid "Disable all _extensions" +msgstr "Wyłącz wszystkie _rozszerzenia" + +#: ../midori/main.c:1315 +msgid "No filename specified" +msgstr "Nie podano pliku" + +#: ../midori/main.c:1338 +msgid "An unknown error occured." +msgstr "Nastąpił nieznany błąd" + +#: ../midori/main.c:1370 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Kopia strony zapisana jako: %s\n" + +#: ../midori/main.c:1391 +msgid "Run ADDRESS as a web application" +msgstr "Uruchom ADRES jako aplikację internetową" + +#: ../midori/main.c:1391 +msgid "ADDRESS" +msgstr "ADRES" + +#: ../midori/main.c:1393 +msgid "Use FOLDER as configuration folder" +msgstr "Użyj katalogu FOLDER jako katalog konfiguracyjny" + +#: ../midori/main.c:1393 +msgid "FOLDER" +msgstr "" + +#: ../midori/main.c:1395 +msgid "Run the specified filename as javascript" +msgstr "Uruchom podany plik jako skrypt javascript" + +#: ../midori/main.c:1398 +msgid "Take a snapshot of the specified URI" +msgstr "Wykonaj zrzut podanego adresu URI" + +#: ../midori/main.c:1401 +msgid "Display program version" +msgstr "Wyświetl wersję programu" + +#: ../midori/main.c:1403 +msgid "Addresses" +msgstr "Adresy" + +#: ../midori/main.c:1446 +msgid "[Addresses]" +msgstr "[Adresy]" + +#: ../midori/main.c:1469 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Prosimy o zgłaszanie uwag, sugestii i błędów:" + +#: ../midori/main.c:1471 +msgid "Check for new versions at:" +msgstr "Sprawdź nową wersję na:" + +#: ../midori/main.c:1548 +msgid "The specified configuration folder is invalid." +msgstr "Podany katalog konfiguracyjny jest niepoprawny" + +#: ../midori/main.c:1583 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Kopia Midori jest już uruchomiona lecz nie odpowiada.\n" + +#: ../midori/main.c:1633 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Wyszukiwarki internetowe nie mogą być załadowane. %s\n" + +#: ../midori/main.c:1645 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Zakładki nie mogą być załadowane: %s\n" + +#: ../midori/main.c:1660 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sesja nie może być załadowana: %s\n" + +#: ../midori/main.c:1673 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Nie można załadować śmietnika: %s\n" + +#: ../midori/main.c:1686 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Nie można załadować śmietnika: %s\n" + +#: ../midori/main.c:1698 +msgid "The following errors occured:" +msgstr "Nastąpiły następujące błędy:" + +#: ../midori/main.c:1714 +msgid "_Ignore" +msgstr "_Ignoruj" + +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Nie znaleziono dokumentu." + +#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Niepoprawny dokument." + +#: ../midori/midori-array.c:338 ../midori/sokoke.c:692 +#, c-format +msgid "Writing failed." +msgstr "Zapis nie powiódł się" + +#: ../midori/midori-browser.c:297 ../midori/midori-browser.c:3915 +#: ../midori/midori-browser.c:3921 msgid "Reload the current page" msgstr "Odśwież bieżącą stronę" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:308 ../midori/midori-browser.c:3918 msgid "Stop loading the current page" msgstr "Zatrzymaj wczytywanie bieżącej strony" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:370 #, c-format msgid "%d%% loaded" msgstr "%d%% załadowano" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:395 #, c-format msgid "Unexpected action '%s'." msgstr "Niespodziewana akcja '%s'." -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:577 +msgid "New folder" +msgstr "Nowy folder" + +#: ../midori/midori-browser.c:577 +msgid "Edit folder" +msgstr "Edytuj folder" + +#: ../midori/midori-browser.c:579 msgid "New bookmark" msgstr "Nowa zakładka" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:579 msgid "Edit bookmark" msgstr "Edytuj zakładkę" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:609 msgid "_Title:" msgstr "_Tytuł:" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:622 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Opis:" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 -msgid "_URL:" -msgstr "_URL:" +#: ../midori/midori-browser.c:641 ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 +msgid "_Address:" +msgstr "_Adres:" -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:660 msgid "_Folder:" msgstr "_Folder:" -#: ../midori/midori-browser.c:582 -msgid "Root" -msgstr "Korzeń" +#: ../midori/midori-browser.c:665 ../midori/midori-browser.c:706 +msgid "Toplevel folder" +msgstr "Główny folder" -#: ../midori/midori-browser.c:668 -#, fuzzy +#: ../midori/midori-browser.c:782 msgid "Save file as" -msgstr "Zapi_sz stronę jako" +msgstr "Zapisz stronę jako" -#: ../midori/midori-browser.c:1248 -#, fuzzy +#: ../midori/midori-browser.c:1118 +#, c-format +msgid "The file %s has been downloaded." +msgstr "Plik %s został pobrany." + +#: ../midori/midori-browser.c:1122 +msgid "Transfer completed" +msgstr "Transfer zakończony" + +#: ../midori/midori-browser.c:1833 msgid "Open file" -msgstr "_Otwórz plik" +msgstr "Otwórz plik" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:3187 ../panels/midori-bookmarks.c:778 +#: ../panels/midori-history.c:810 +msgid "Open all in _Tabs" +msgstr "Otwórz wszystkie w nowych _kartach" + +#: ../midori/midori-browser.c:3194 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Otwórz odnośnik w nowej _karcie" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:3197 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Otwórz odnośnik w _nowym oknie" -#: ../midori/midori-browser.c:2601 -msgid "Separator" -msgstr "Separator" +#: ../midori/midori-browser.c:3497 +msgid "Clear Private Data" +msgstr "Wyczyść dane prywatne" -#: ../midori/midori-browser.c:2712 -#, c-format -msgid "A week ago" -msgstr "" +#: ../midori/midori-browser.c:3501 +msgid "_Clear private data" +msgstr "_Wyczyść dane prywatne" -#: ../midori/midori-browser.c:2718 -#, c-format -msgid "%d days ago" -msgstr "" +#: ../midori/midori-browser.c:3514 +msgid "Clear the following data:" +msgstr "Wyczyść następujące elementy:" -#: ../midori/midori-browser.c:2725 -#, fuzzy -msgid "Today" -msgstr "dni" +#: ../midori/midori-browser.c:3524 ../midori/midori-preferences.c:670 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Historia" -#: ../midori/midori-browser.c:2727 -msgid "Yesterday" -msgstr "" +#: ../midori/midori-browser.c:3529 +msgid "Cookies" +msgstr "Ciasteczka" -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:3534 +msgid "'Flash' Cookies" +msgstr "Ciasteczka 'Flash'" + +#: ../midori/midori-browser.c:3539 +msgid "Website icons" +msgstr "Ikony serwisów internetowych" + +#: ../midori/midori-browser.c:3544 ../midori/sokoke.c:859 +msgid "_Closed Tabs and Windows" +msgstr "_Zamknięte karty i okna" + +#: ../midori/midori-browser.c:3627 msgid "A lightweight web browser." msgstr "Lekka przeglądarka internetowa" -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:3635 msgid "translator-credits" msgstr "Przemysław Sitek " -#: ../midori/midori-browser.c:2958 -msgid "Are you sure you want to remove all history items?" -msgstr "" - -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3849 msgid "_File" msgstr "_Plik" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3852 msgid "Open a new window" msgstr "_Nowe okno" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3855 msgid "Open a new tab" msgstr "Nowa kar_ta" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3858 msgid "Open a file" -msgstr "_Otwórz plik" +msgstr "Otwórz plik" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:3861 msgid "Save to a file" -msgstr "Zapi_sz stronę jako" +msgstr "Zapisz stronę jako" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3863 ../midori/midori-view.c:1327 +msgid "Add to Speed _dial" +msgstr "_Dodaj do panelu Szybkie wybieranie" + +#: ../midori/midori-browser.c:3864 +msgid "Add shortcut to speed dial" +msgstr "" + +#: ../midori/midori-browser.c:3866 msgid "_Close Tab" msgstr "_Zamknij kartę" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3867 msgid "Close the current tab" msgstr "Zamknij bieżącą kartę" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3869 msgid "C_lose Window" msgstr "Zamknij okno" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3870 msgid "Close this window" msgstr "Zamknij okno" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:3873 msgid "Print the current page" msgstr "Drukuj bieżącą stronę" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3876 msgid "Quit the application" msgstr "Za_kończ" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3878 msgid "_Edit" msgstr "_Edycja" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3881 msgid "Cut the selected text" msgstr "Wytnij zaznaczony tekst" -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3884 ../midori/midori-browser.c:3887 msgid "Copy the selected text" msgstr "Skopiuj" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3890 msgid "Paste text from the clipboard" msgstr "Wklej" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3893 msgid "Delete the selected text" msgstr "Usuń zaznaczony tekst" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3896 msgid "Select all text" msgstr "Zaznacz w_szystko" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3899 msgid "Find a word or phrase in the page" msgstr "Znajdź słowa lub frazy na stronie" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3901 msgid "Find _Next" -msgstr "Znajdź poprzednie" +msgstr "Znajdź _następne" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3902 msgid "Find the next occurrence of a word or phrase" -msgstr "" +msgstr "Znajdź następne wystąpienie słowa lub wyrażenia" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3904 msgid "Find _Previous" -msgstr "Znajdź następne" +msgstr "Znajdź _poprzednie" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3905 msgid "Find the previous occurrence of a word or phrase" -msgstr "" +msgstr "Znajdź poprzednie wystąpienie słowa lub wyrażenia" -#: ../midori/midori-browser.c:3120 -msgid "_Quick Find" -msgstr "Szybkie wyszukiwanie" - -#: ../midori/midori-browser.c:3121 -msgid "Quickly jump to a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3909 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3911 msgid "_View" msgstr "_Widok" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3912 msgid "_Toolbars" msgstr "Paski _narzędziowe" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3924 msgid "Increase the zoom level" msgstr "Powiększ" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3927 msgid "Decrease the zoom level" msgstr "Zmniejsz" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3930 msgid "Reset the zoom level" -msgstr "" +msgstr "Rozmiar pierwotny" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 -#, fuzzy +#: ../midori/midori-browser.c:3931 +msgid "_Encoding" +msgstr "Zestaw zna_ków" + +#: ../midori/midori-browser.c:3933 +msgid "_Automatic" +msgstr "Wybór _automatyczny" + +#: ../midori/midori-browser.c:3936 ../midori/midori-websettings.c:208 +msgid "Chinese (BIG5)" +msgstr "Chiński tradycyjny (BIG5)" + +#: ../midori/midori-browser.c:3939 ../midori/midori-websettings.c:209 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japoński (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3942 ../midori/midori-websettings.c:210 +msgid "Russian (KOI8-R)" +msgstr "Rosyjski (KOI8-R)" + +#: ../midori/midori-browser.c:3945 ../midori/midori-websettings.c:211 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3948 ../midori/midori-websettings.c:212 +msgid "Western (ISO-8859-1)" +msgstr "Zachodni (ISO-8859-1)" + +#: ../midori/midori-browser.c:3951 ../midori/midori-websettings.c:213 +#: ../midori/midori-websettings.c:285 +msgid "Custom..." +msgstr "Dostosuj..." + +#: ../midori/midori-browser.c:3954 ../midori/midori-view.c:1346 msgid "View _Source" msgstr "Ź_ródło strony" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3955 msgid "View the source code of the page" msgstr "Zobacz kod źródłowy strony" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3957 msgid "View Selection Source" msgstr "Pokaż źródło zaznaczenia" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3958 msgid "View the source code of the selection" -msgstr "" +msgstr "Pokaż źródło zaznaczenia" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3962 msgid "Toggle fullscreen view" msgstr "Tryb pełnoekranowy" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3964 msgid "_Go" msgstr "P_rzejdź" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3967 msgid "Go back to the previous page" msgstr "Wróć do poprzedniej strony" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3970 msgid "Go forward to the next page" msgstr "Przejdź do następnej strony" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3973 msgid "Go to your homepage" msgstr "Przejdź do strony startowej" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3975 msgid "Empty Trash" msgstr "Opróżnij kosz" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3976 msgid "Delete the contents of the trash" msgstr "Usuń zawartość kosza" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +#: ../midori/midori-browser.c:3978 ../midori/midori-view.c:1304 msgid "Undo Close Tab" msgstr "Cofnij zamknięcie karty" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3979 msgid "Open the last closed tab" msgstr "Otwórz ostatnio zamkniętą kartę" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3983 ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Dodaj nową zakładkę" -#: ../midori/midori-browser.c:3179 -msgid "Edit the selected bookmark" -msgstr "Edytuj wybraną zakładkę" +#: ../midori/midori-browser.c:3985 ../panels/midori-bookmarks.c:259 +msgid "Add a new folder" +msgstr "Nowy _folder" -#: ../midori/midori-browser.c:3182 -msgid "Delete the selected bookmark" -msgstr "Skasuj wybraną zakładkę" +#: ../midori/midori-browser.c:3986 +msgid "Add a new bookmark folder" +msgstr "Dodaj nowy folder zakładek" -#: ../midori/midori-browser.c:3185 -#, fuzzy -msgid "Delete the selected history item" -msgstr "Usuń zaznaczony tekst" - -#: ../midori/midori-browser.c:3188 -msgid "Clear the entire history" -msgstr "" - -#: ../midori/midori-browser.c:3191 -#, fuzzy -msgid "Bookmark the selected history item" -msgstr "Skopiuj" - -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3987 msgid "_Tools" msgstr "_Narzędzia" -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3989 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" -msgstr "_Zarządzaj wyszukiwarkami" +msgstr "Zarządzaj _wyszukiwarkami" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3990 msgid "Add, edit and remove search engines..." msgstr "Zarządzaj wyszukiwarkami internetowymi..." -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3993 +msgid "_Clear Private Data" +msgstr "Wy_czyść dane prywatne" + +#: ../midori/midori-browser.c:3994 +msgid "Clear private data..." +msgstr "" + +#: ../midori/midori-browser.c:3998 msgid "_Previous Tab" msgstr "_Poprzednia karta" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3999 msgid "Switch to the previous tab" msgstr "Przełącz na poprzednią kartę" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:4001 msgid "_Next Tab" msgstr "_Następna karta" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:4002 msgid "Switch to the next tab" msgstr "Przełącz na następną kartę" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:4004 msgid "_Help" msgstr "Pomo_c" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:4006 msgid "_Contents" msgstr "_Zawartość" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:4007 msgid "Show the documentation" msgstr "Pokaż dokumentację" -#: ../midori/midori-browser.c:3211 -msgid "_Frequent questions" -msgstr "" +#: ../midori/midori-browser.c:4009 +msgid "_Frequent Questions" +msgstr "Często zadawane pytania" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:4010 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:3214 -msgid "_Report a bug" -msgstr "" +#: ../midori/midori-browser.c:4012 +msgid "_Report a Bug" +msgstr "Zgłoś problem" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:4013 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:4016 msgid "Show information about the program" msgstr "Pokaż informacje o programie" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:4023 msgid "P_rivate Browsing" -msgstr "P_rywatne przeglądanie" +msgstr "Tryb p_rywatny" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:4024 msgid "Don't save any private data while browsing" msgstr "Nie zapisuj żadnych prywatnych danych podczas przeglądania" -#: ../midori/midori-browser.c:3231 -#, fuzzy +#: ../midori/midori-browser.c:4029 msgid "_Menubar" -msgstr "Pasek menu" +msgstr "Pasek _menu" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:4030 #, fuzzy msgid "Show menubar" -msgstr "Pasek menu" +msgstr "Pasek _menu" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:4033 msgid "_Navigationbar" msgstr "Pasek _narzędzi nawigacyjnych" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:4034 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:4037 msgid "Side_panel" msgstr "Panel _boczny" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:4038 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:4041 msgid "_Bookmarkbar" msgstr "Pasek _zakładek" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:4042 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:4045 msgid "_Transferbar" msgstr "_Pasek pobierania plików" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:4046 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:4049 msgid "_Statusbar" msgstr "Pasek stanu" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:4050 msgid "Show statusbar" msgstr "Pokaż pasek stanu" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:4484 #, fuzzy +msgid "_Separator" +msgstr "Separator" + +#: ../midori/midori-browser.c:4491 msgid "_Location..." msgstr "_Położenie..." -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:4493 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3695 -#, fuzzy +#: ../midori/midori-browser.c:4515 msgid "_Web Search..." -msgstr "Znajdź w Internecie..." +msgstr "Znajdź w _Internecie..." -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:4517 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:4538 msgid "Reopen a previously closed tab or window" msgstr "Otwórz wcześniej zamkniętą kartę lub okno" -#: ../midori/midori-browser.c:3729 -#, fuzzy +#: ../midori/midori-browser.c:4553 msgid "_Recently visited pages" -msgstr "Przechowuj adresy ostatnio odwiedzonych stron" +msgstr "_Ostatnio odwiedzone strony" -#: ../midori/midori-browser.c:3731 +#: ../midori/midori-browser.c:4555 msgid "Reopen pages that you visited earlier" -msgstr "" +msgstr "Otwórz przeglądane wcześniej strony" -#: ../midori/midori-browser.c:3746 +#: ../midori/midori-browser.c:4570 ../midori/sokoke.c:848 +msgid "_Bookmarks" +msgstr "_Zakładki" + +#: ../midori/midori-browser.c:4572 #, fuzzy msgid "Show the saved bookmarks" msgstr "Otwórz wybraną zakładkę" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:4587 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:3761 +#: ../midori/midori-browser.c:4589 #, fuzzy msgid "Show a list of all open tabs" msgstr "Pokaż wszystkie otwarte karty" -#: ../midori/midori-browser.c:3883 -msgid "Bookmarks" -msgstr "Zakładki" - -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 -msgid "History" -msgstr "Historia" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3969 -msgid "_Inline find:" +#: ../midori/midori-browser.c:4764 +#, fuzzy +msgid "_Inline Find:" msgstr "Wyszukaj:" -#: ../midori/midori-browser.c:4004 +#: ../midori/midori-browser.c:4789 +#, fuzzy +msgid "Previous" +msgstr "_Poprzednia karta" + +#: ../midori/midori-browser.c:4794 +#, fuzzy +msgid "Next" +msgstr "Tylko tekst" + +#: ../midori/midori-browser.c:4799 msgid "Match Case" msgstr "Uwzg_lędniaj wielkość liter" -#: ../midori/midori-browser.c:4012 +#: ../midori/midori-browser.c:4807 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:4021 +#: ../midori/midori-browser.c:4817 msgid "Close Findbar" msgstr "Zamknij" -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4852 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#, fuzzy +msgid "Delete All" +msgstr "Z_aznacz wszystko" + +#: ../midori/midori-browser.c:5174 #, c-format msgid "Unexpected setting '%s'" msgstr "Niespodziewane ustawienie '%s'" -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:333 +msgid "Detach chosen panel from the window" +msgstr "" + +#: ../midori/midori-panel.c:335 +msgid "Whether to detach the chosen panel from the window" +msgstr "" + +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:539 +msgid "Align sidepanel on the right" +msgstr "" + +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:540 +msgid "Whether to align the sidepanel on the right" +msgstr "" + +#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 msgid "Close panel" msgstr "Zamknij panel" -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +#: ../midori/midori-websettings.c:191 ../midori/midori-view.c:2240 msgid "Blank page" msgstr "Pusta strona" -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:192 ../midori/midori-websettings.c:559 msgid "Homepage" msgstr "Strona startowa" -#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:193 msgid "Last open pages" msgstr "Ostatnio otwarte strony" -#: ../midori/midori-websettings.c:148 -msgid "Chinese (BIG5)" -msgstr "Chiński tradycyjny (BIG5)" - -#: ../midori/midori-websettings.c:149 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japoński (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:150 -msgid "Russian (KOI8-R)" -msgstr "Rosyjski (KOI8-R)" - -#: ../midori/midori-websettings.c:151 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:152 -msgid "Western (ISO-8859-1)" -msgstr "Zachodni (ISO-8859-1)" - -#: ../midori/midori-websettings.c:153 -msgid "Custom..." -msgstr "Dostosuj..." - -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:228 msgid "New tab" msgstr "nowej karcie" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:229 msgid "New window" msgstr "nowym oknie" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:230 msgid "Current tab" msgstr "bieżącej karcie" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:245 msgid "Default" msgstr "Domyślnie" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:246 msgid "Icons" msgstr "Tylko ikony" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:247 msgid "Text" msgstr "Tylko tekst" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:248 msgid "Both" msgstr "Tekst pod ikonami" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:249 msgid "Both horizontal" msgstr "Tekst obok ikon" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:264 msgid "All cookies" msgstr "Wszystkie ciasteczka" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:265 msgid "Session cookies" msgstr "Ciasteczka sesji" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:266 ../panels/midori-addons.c:94 msgid "None" msgstr "Żadne" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:282 +msgid "Safari" +msgstr "" + +#: ../midori/midori-websettings.c:283 +msgid "Firefox" +msgstr "" + +#: ../midori/midori-websettings.c:284 +msgid "Internet Explorer" +msgstr "" + +#: ../midori/midori-websettings.c:337 msgid "Remember last window size" msgstr "Pamiętaj ostatni rozmiar okna" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:338 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:346 msgid "Last window width" msgstr "Ostatnia szerokość okna" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:347 msgid "The last saved window width" msgstr "Ostatnia zapisana szerokość okna" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:355 msgid "Last window height" msgstr "Ostatnia wysokość okna" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:356 msgid "The last saved window height" msgstr "Ostatnia zapisana wysokość okna" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:381 msgid "Last panel position" msgstr "Ostatnia pozycja panelu" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:382 msgid "The last saved panel position" msgstr "Ostatnio zapisana pozycja panelu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:391 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:392 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:400 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:401 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:410 #, fuzzy msgid "Show Menubar" msgstr "Pasek menu" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:411 #, fuzzy msgid "Whether to show the menubar" msgstr "Otwieraj nowe karty w tle" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:419 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:420 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:428 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:429 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:437 msgid "Show Panel" msgstr "Pokaż panel" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:438 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:453 +#, fuzzy +msgid "Show Transferbar" +msgstr "_Pasek pobierania plików" + +#: ../midori/midori-websettings.c:454 +#, fuzzy +msgid "Whether to show the transferbar" +msgstr "Otwieraj nowe karty w tle" + +#: ../midori/midori-websettings.c:462 msgid "Show Statusbar" msgstr "Pasek _stanu" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:472 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:473 msgid "The style of the toolbar" msgstr "Styl paska narzędzi" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:489 +msgid "Show progress in location entry" +msgstr "" + +#: ../midori/midori-websettings.c:490 +msgid "Whether to show loading progress in the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:505 +msgid "Search engines in location completion" +msgstr "" + +#: ../midori/midori-websettings.c:506 +msgid "Whether to show search engines in the location completion" +msgstr "" + +#: ../midori/midori-websettings.c:514 #, fuzzy msgid "Toolbar Items" msgstr "Paski _narzędziowe" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:515 #, fuzzy msgid "The items to show on the toolbar" msgstr "Styl paska narzędzi" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:523 #, fuzzy msgid "Compact Sidepanel" msgstr "Panel _boczny" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:524 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:549 msgid "Load on Startup" msgstr "Pokaż przy uruchomieniu" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:550 msgid "What to load on startup" msgstr "Pokaż przy uruchomieniu" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:560 msgid "The homepage" msgstr "Strona startowa" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:575 +msgid "Show crash dialog" +msgstr "Pokazuj okno informujące o awarii" + +#: ../midori/midori-websettings.c:576 +msgid "Show a dialog after Midori crashed" +msgstr "Pokazuj okno po awarii programu Midori" + +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:592 +msgid "Show speed dial in new tabs" +msgstr "Pokazuj panel szybkiego wybierania" + +#: ../midori/midori-websettings.c:593 +msgid "Show speed dial in newly opened tabs" +msgstr "Pokazuj panel szybkiego wybierania w nowo otwieranych kartach" + +#: ../midori/midori-websettings.c:605 msgid "Download Folder" msgstr "Katalog pobierania plików" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:606 msgid "The folder downloaded files are saved to" +msgstr "Katalog w którym są zapisywane pobierane pliki" + +#: ../midori/midori-websettings.c:625 +msgid "Ask for the destination folder" +msgstr "Pytaj o katalog docelowy" + +#: ../midori/midori-websettings.c:626 +msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:405 -#, fuzzy +#: ../midori/midori-websettings.c:645 +msgid "Notify when a transfer has been completed" +msgstr "Powiadamiaj o zakończeniu pobierania plików" + +#: ../midori/midori-websettings.c:646 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "" + +#: ../midori/midori-websettings.c:658 msgid "Download Manager" -msgstr "Katalog pobierania plików" +msgstr "Menedżer pobierania plików" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:659 msgid "An external download manager" -msgstr "" +msgstr "Zewnętrzny menedżer pobierania" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:667 msgid "Text Editor" -msgstr "" +msgstr "Edytor tekstu" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:668 msgid "An external text editor" -msgstr "" +msgstr "Zewnętrzny edytor tekstu" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:683 +msgid "News Aggregator" +msgstr "Czytnik wiadomości" + +#: ../midori/midori-websettings.c:684 +msgid "An external news aggregator" +msgstr "Zewnętrzny czytnik wiadomości" + +#: ../midori/midori-websettings.c:692 msgid "Location entry Search" msgstr "Adres domyślnej wyszukiwarki internetowej" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:693 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:701 msgid "Preferred Encoding" msgstr "Preferowane kodowanie znaków" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:702 msgid "The preferred character encoding" -msgstr "" +msgstr "Preferowane kodowanie znaków" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:712 msgid "Always Show Tabbar" -msgstr "" +msgstr "Zawsze pokazuj pasek kart" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:713 msgid "Always show the tabbar" -msgstr "" +msgstr "Zawsze pokazuj pasek kart" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:721 msgid "Close Buttons on Tabs" msgstr "Pokazuj przyciski zamykania kart" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:722 msgid "Whether tabs have close buttons" -msgstr "" +msgstr "Czy karty powinny mieć przyciski zamykające" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:730 msgid "Open new pages in" msgstr "Otwieraj nowe strony w" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:731 msgid "Where to open new pages" msgstr "Otwieraj nowe strony w" -#: ../midori/midori-websettings.c:473 -#, fuzzy +#: ../midori/midori-websettings.c:740 msgid "Open external pages in" -msgstr "Otwieraj nowe strony w" +msgstr "Otwieraj zewnętrzne strony w" -#: ../midori/midori-websettings.c:474 -#, fuzzy +#: ../midori/midori-websettings.c:741 msgid "Where to open externally opened pages" -msgstr "Otwieraj nowe strony w" +msgstr "Gdzie powinny być otwierane strony otwierane przez zewnętrzne aplikacje" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:754 msgid "Middle click opens Selection" msgstr "Środkowy przycisk myszy otwiera zaznaczoną stronę" -#: ../midori/midori-websettings.c:484 -msgid "Load an URL from the selection via middle click" +#: ../midori/midori-websettings.c:755 +msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:763 msgid "Open tabs in the background" msgstr "Otwieraj nowe karty w tle" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:764 msgid "Whether to open new tabs in the background" msgstr "Otwieraj nowe karty w tle" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:772 msgid "Open Tabs next to Current" -msgstr "" +msgstr "Otwieraj nowe karty za bieżącą kartą" -#: ../midori/midori-websettings.c:502 -#, fuzzy +#: ../midori/midori-websettings.c:773 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Otwieraj nowe karty w tle" +msgstr "Określa czy nowe karty będą umieszczane zaraz za bieżącą kartą czy za ostatnią" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:781 msgid "Open popups in tabs" msgstr "Otwieraj wyskakujące okienka jako karty" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:782 msgid "Whether to open popup windows in tabs" msgstr "Czy otwierać wyskakujące okienka jako karty" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:798 +msgid "Zoom Text and Images" +msgstr "Powiększaj tekst oraz obrazy" + +#: ../midori/midori-websettings.c:799 +msgid "Whether to zoom text and images" +msgstr "Powiększaj tekst oraz obrazy" + +#: ../midori/midori-websettings.c:814 +msgid "Find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:815 +msgid "Whether to automatically find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:823 msgid "Accept cookies" msgstr "Akceptuj ciasteczka" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:824 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:833 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:834 msgid "Accept cookies from the original website only" msgstr "Zezwalaj wyłącznie na ciasteczka z bieżącej strony" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:842 msgid "Maximum cookie age" msgstr "Przechowuj ciasteczka przez:" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:843 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:853 msgid "Remember last visited pages" msgstr "Przechowuj adresy ostatnio odwiedzonych stron" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:854 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:862 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:863 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:871 msgid "Remember last form inputs" msgstr "Przechowuj dane z formularzy" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:872 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:880 msgid "Remember last downloaded files" msgstr "Przechowuj informację o ostatnio pobranych plikach" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:881 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:605 -msgid "HTTP Proxy" -msgstr "Serwer proxy HTTP" +#: ../midori/midori-websettings.c:891 +msgid "Proxy Server" +msgstr "Serwer pośredniczący" -#: ../midori/midori-websettings.c:606 -msgid "The proxy used for HTTP connections" -msgstr "" +#: ../midori/midori-websettings.c:892 +msgid "The proxy server used for HTTP connections" +msgstr "Serwer pośredniczący w połączeniach HTTP" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:907 +msgid "Detect proxy server automatically" +msgstr "Automatycznie wykryj serwer pośredniczący" + +#: ../midori/midori-websettings.c:908 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Przełącza automatyczne wykrywanie serwera pośredniczącego" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:924 +msgid "Identify as" +msgstr "Przedstawiaj się jako" + +#: ../midori/midori-websettings.c:925 +msgid "What to identify as to web pages" +msgstr "Określa jak przeglądarka ma się identyfikować przed stronami internetowymi" + +#: ../midori/midori-websettings.c:941 +msgid "Identification string" +msgstr "Identyfikacja" + +#: ../midori/midori-websettings.c:942 +msgid "The application identification string" +msgstr "Ciąg indentyfikujący przeglądarkę" + +#: ../midori/midori-websettings.c:950 msgid "Cache size" +msgstr "Pamięć podręczna" + +#: ../midori/midori-websettings.c:951 +msgid "The allowed size of the cache" msgstr "Rozmiar pamięci podręcznej" -#: ../midori/midori-websettings.c:615 -msgid "The allowed size of the cache" +#: ../midori/midori-websettings.c:966 +msgid "Clear private data" +msgstr "" + +#: ../midori/midori-websettings.c:967 +msgid "The private data selected for deletion" +msgstr "" + +#: ../midori/midori-view.c:740 +#, fuzzy, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Sesja nie może być załadowana. %s\n" + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#: ../midori/midori-view.c:742 ../midori/midori-view.c:2763 +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "" + +#: ../midori/midori-view.c:745 +msgid "Try again" msgstr "" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#. 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:775 ../midori/midori-view.c:2767 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:902 +#: ../midori/midori-view.c:1169 +#, fuzzy +msgid "Open _Link" +msgstr "Otwórz plik" + +#: ../midori/midori-view.c:1171 msgid "Open Link in New _Tab" msgstr "Otwórz odnośnik w nowej karcie" -#: ../midori/midori-view.c:925 -msgid "_Save Link destination" -msgstr "" +#: ../midori/midori-view.c:1188 +#, fuzzy +msgid "Open Link in New _Window" +msgstr "Otwórz odnośnik w _nowym oknie" -#: ../midori/midori-view.c:933 +#: ../midori/midori-view.c:1194 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:955 -msgid "Open URL in New _Tab" -msgstr "Otwórz URL w nowej karcie" +#: ../midori/midori-view.c:1200 +msgid "_Save Link destination" +msgstr "" -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:1209 +#, fuzzy +msgid "Download with Download _Manager" +msgstr "Katalog pobierania plików" + +#: ../midori/midori-view.c:1238 +#, fuzzy +msgid "Search _with" +msgstr "Wyszukiwarki" + +#: ../midori/midori-view.c:1266 +msgid "_Search the Web" +msgstr "" + +#: ../midori/midori-view.c:1276 +#, fuzzy +msgid "Open Address in New _Tab" +msgstr "Otwórz odnośnik w nowej _karcie" + +#: ../midori/midori-view.c:1443 +#, fuzzy +msgid "Open or download file" +msgstr "Otwórz plik" + +#: ../midori/midori-view.c:1460 +#, c-format +msgid "File Type: '%s'" +msgstr "" + +#: ../midori/midori-view.c:1463 +#, 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:1467 +#, fuzzy, c-format +msgid "Open %s" +msgstr "Otwórz plik" + +#: ../midori/midori-view.c:1876 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1503 -#, fuzzy -msgid "Source" -msgstr "Ź_ródło strony" +#: ../midori/midori-view.c:2066 +msgid "Speed dial" +msgstr "Szybkie wybieranie" -#: ../midori/midori-view.c:1527 +#: ../midori/midori-view.c:2067 +msgid "Click to add a shortcut" +msgstr "" + +#: ../midori/midori-view.c:2068 +msgid "Enter shortcut address" +msgstr "" + +#: ../midori/midori-view.c:2069 +msgid "Enter shortcut title" +msgstr "" + +#: ../midori/midori-view.c:2070 +#, fuzzy +msgid "Are you sure you want to delete this shortcut?" +msgstr "Czy na pewno usunąć wszystkie elementy historii?" + +#: ../midori/midori-view.c:2100 +#, c-format +msgid "Document cannot be displayed" +msgstr "" + +#: ../midori/midori-view.c:2117 #, fuzzy, c-format msgid "No documentation installed" msgstr "Pokaż dokumentację" -#: ../midori/midori-preferences.c:87 +#: ../midori/midori-preferences.c:91 #, fuzzy, c-format msgid "Preferences for %s" msgstr "Preferencje %s" #. Page "General" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Ogólne" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Uruchomienie" +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "" + +#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Pobierania plików" + #. Page "Appearance" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Wygląd" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Ustawienia czcionek" -#: ../midori/midori-preferences.c:389 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:450 +msgid "The default font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:458 msgid "Minimum Font Size" msgstr "" +#: ../midori/midori-preferences.c:461 +msgid "The minimum font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:468 +#, fuzzy +msgid "Encoding" +msgstr "Preferowane kodowanie znaków" + +#: ../midori/midori-preferences.c:471 +msgid "The character encoding to use by default" +msgstr "" + #. Page "Behavior" -#: ../midori/midori-preferences.c:407 +#: ../midori/midori-preferences.c:478 msgid "Behavior" msgstr "Zachowanie" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:479 msgid "Features" msgstr "Treść" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:483 +msgid "Load and display images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:486 msgid "Shrink images automatically" msgstr "" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:487 +msgid "Automatically shrink standalone images to fit" +msgstr "" + +#: ../midori/midori-preferences.c:490 msgid "Print background images" msgstr "" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:491 +msgid "Whether background images should be printed" +msgstr "" + +#: ../midori/midori-preferences.c:494 msgid "Resizable text areas" msgstr "" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:495 +msgid "Whether text areas are resizable" +msgstr "" + +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 #, fuzzy msgid "Enable scripts" msgstr "Skrypty użytkownika" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 -msgid "Enable plugins" +#: ../midori/midori-preferences.c:499 +msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72 +msgid "Enable Netscape plugins" +msgstr "Wtyczki Netscape" + +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" +msgstr "Używaj wtyczek Netscape" + +#: ../midori/midori-preferences.c:506 +msgid "Enforce 96 dots per inch" +msgstr "" + +#: ../midori/midori-preferences.c:507 +msgid "Enforce a video dot density of 96 DPI" +msgstr "" + +#: ../midori/midori-preferences.c:510 msgid "Enable developer tools" msgstr "" +#: ../midori/midori-preferences.c:511 +msgid "Enable special extensions for developers" +msgstr "" + +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "" + +#. i18n: The example should be adjusted to contain a good local default +#: ../midori/midori-preferences.c:526 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" + #. Page "Interface" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:531 msgid "Interface" msgstr "Interfejs" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:532 msgid "Navigationbar" msgstr "Pasek narzędzi nawigacyjnych" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:543 msgid "Browsing" msgstr "Przeglądanie" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#. Page "Applications" +#: ../midori/midori-preferences.c:573 +msgid "Applications" +msgstr "Programy" + +#: ../midori/midori-preferences.c:574 +msgid "External applications" +msgstr "Zewnętrzne aplikacje" + +#. Page "Network" +#: ../midori/midori-preferences.c:620 ../midori/midori-preferences.c:621 msgid "Network" msgstr "Sieć" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:648 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:653 msgid "Privacy" msgstr "Prywatność" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:654 msgid "Web Cookies" msgstr "Ciasteczka" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:667 ../midori/midori-preferences.c:677 msgid "days" msgstr "dni" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:331 msgid "Empty" msgstr "Puste" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "Dodaj wyszukiwarkę internetową" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "Modyfikuj przeglądarkę internetową" -#: ../midori/midori-searchaction.c:825 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "_Nazwa:" -#: ../midori/midori-searchaction.c:869 -msgid "_Icon (name or file):" -msgstr "_Ikona (nazwa albo plik):" +#: ../midori/midori-searchaction.c:976 +#, fuzzy +msgid "_Icon:" +msgstr "Tylko ikony" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1060 -msgid "Manage search engines" +#: ../midori/midori-searchaction.c:1195 +#, fuzzy +msgid "Manage Search Engines" msgstr "_Zarządzaj wyszukiwarkami" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "" + +#: ../midori/sokoke.c:164 ../midori/sokoke.c:176 msgid "Could not run external program." msgstr "" -#: ../midori/sokoke.c:282 -msgid "Warning: You are using a superuser account!" -msgstr "Uwaga: Używasz konta administratora!" +#: ../midori/sokoke.c:847 +msgid "_Bookmark" +msgstr "_Zakładka" -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "" +#: ../midori/sokoke.c:849 +msgid "_Add Bookmark" +msgstr "_Dodaj zakładkę" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 -#, c-format -msgid "%s has no property '%s'" -msgstr "" +#: ../midori/sokoke.c:850 +msgid "_Console" +msgstr "_Konsola" -#: ../midori/gjs.c:878 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "" +#: ../midori/sokoke.c:851 +msgid "_Extensions" +msgstr "_Rozszerzenia" -#: ../midori/gjs.c:888 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "" +#: ../midori/sokoke.c:852 +msgid "_History" +msgstr "_Historia" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +#: ../midori/sokoke.c:853 +msgid "_Homepage" +msgstr "_Strona startowa" + +#: ../midori/sokoke.c:854 +msgid "_Userscripts" +msgstr "Skrypty _użytkownika" + +#: ../midori/sokoke.c:855 +msgid "User_styles" +msgstr "_Style użytkownika" + +#: ../midori/sokoke.c:856 +msgid "New _Tab" +msgstr "Nowa kar_ta" + +#: ../midori/sokoke.c:857 +msgid "_Transfers" +msgstr "_Pobieranie plików" + +#: ../midori/sokoke.c:858 +msgid "Netscape p_lugins" +msgstr "Wtyczki _Netscape" + +#: ../midori/sokoke.c:860 +msgid "New _Window" +msgstr "_Nowe okno" + +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Skrypty użytkownika" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1031 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1032 ../panels/midori-extensions.c:145 +#: ../panels/midori-extensions.c:490 +#, fuzzy +msgid "Enable" +msgstr "Skrypty użytkownika" + +#: ../panels/midori-addons.c:1041 ../panels/midori-extensions.c:154 #, fuzzy msgid "_Disable" msgstr "_Plik" +#: ../panels/midori-addons.c:1042 ../panels/midori-extensions.c:155 +#: ../panels/midori-extensions.c:493 +#, fuzzy +msgid "Disable" +msgstr "_Plik" + +#: ../panels/midori-bookmarks.c:107 +msgid "Bookmarks" +msgstr "Zakładki" + +#: ../panels/midori-bookmarks.c:238 +msgid "Edit the selected bookmark" +msgstr "Edytuj wybraną zakładkę" + +#: ../panels/midori-bookmarks.c:246 +msgid "Delete the selected bookmark" +msgstr "Skasuj wybraną zakładkę" + +#: ../panels/midori-bookmarks.c:591 +msgid "Separator" +msgstr "Separator" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "Konsola" @@ -1341,6 +1771,70 @@ msgstr "Konsola" msgid "Extensions" msgstr "Rozszerzenia" +#: ../panels/midori-history.c:162 +msgid "Are you sure you want to remove all history items?" +msgstr "Czy na pewno usunąć wszystkie elementy historii?" + +#: ../panels/midori-history.c:217 +#, fuzzy +msgid "Bookmark the selected history item" +msgstr "Skopiuj" + +#: ../panels/midori-history.c:226 +#, fuzzy +msgid "Delete the selected history item" +msgstr "Usuń zaznaczony tekst" + +#: ../panels/midori-history.c:234 +msgid "Clear the entire history" +msgstr "" + +#: ../panels/midori-history.c:601 +msgid "A week ago" +msgstr "" + +#: ../panels/midori-history.c:606 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d dzień temu" +msgstr[1] "%d dni temu" + +#: ../panels/midori-history.c:614 +msgid "Today" +msgstr "Dzisiaj" + +#: ../panels/midori-history.c:616 +msgid "Yesterday" +msgstr "Wczoraj" + +#: ../panels/midori-plugins.c:87 +msgid "Netscape plugins" +msgstr "Wtyczki Netscape" + +#: ../panels/midori-transfers.c:271 +#, c-format +msgid "%s of %s" +msgstr "" + +#: ../katze/katze-http-auth.c:97 +msgid "Authentication Required" +msgstr "" + +#: ../katze/katze-http-auth.c:113 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../katze/katze-http-auth.c:127 +msgid "Username" +msgstr "" + +#: ../katze/katze-http-auth.c:138 +msgid "Password" +msgstr "" + #: ../katze/katze-throbber.c:828 #, fuzzy, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1355,51 +1849,296 @@ msgstr "Sesja nie może być załadowana. %s\n" msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:385 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:244 msgid "Choose file" msgstr "Wybierz plik" -#: ../katze/katze-utils.c:198 +#: ../katze/katze-utils.c:230 msgid "Choose folder" msgstr "Wybór katalogu" +#: ../extensions/adblock.c:78 +msgid "Configure Advertisement filters" +msgstr "" + +#: ../extensions/adblock.c:214 +msgid "Configure _Advertisement filters..." +msgstr "" + +#: ../extensions/adblock.c:374 +msgid "Advertisement blocker" +msgstr "" + +#: ../extensions/adblock.c:375 +msgid "Block advertisements according to a filter list" +msgstr "" + +#: ../extensions/colorful-tabs.c:115 +msgid "Tint tabs distinctly" +msgstr "" + +#: ../extensions/colorful-tabs.c:151 +#, fuzzy +msgid "Colorful Tabs" +msgstr "_Zamknij kartę" + +#: ../extensions/colorful-tabs.c:152 +msgid "Tint each tab distinctly" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager.c:105 +#, fuzzy +msgid "_Cookie Manager" +msgstr "Katalog pobierania plików" + +#: ../extensions/cookie-manager/cookie-manager.c:121 +#: ../extensions/cookie-manager/cookie-manager-page.c:83 +#, fuzzy +msgid "Cookie Manager" +msgstr "Katalog pobierania plików" + +#: ../extensions/cookie-manager/cookie-manager.c:122 +msgid "List, view and delete cookies" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:131 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:146 +msgid "Expand All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:153 +msgid "Collapse All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:474 +#, fuzzy +msgid "Do you really want to delete all cookies?" +msgstr "Czy na pewno usunąć wszystkie elementy historii?" + +#: ../extensions/cookie-manager/cookie-manager-page.c:476 +#, fuzzy +msgid "Question" +msgstr "Opis:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:485 +msgid "Only cookies which match the filter will be deleted." +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:553 +#, fuzzy +msgid "At the end of the session" +msgstr "Pokaż źródło zaznaczenia" + +#: ../extensions/cookie-manager/cookie-manager-page.c:556 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:562 +msgid "Yes" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:562 +#, fuzzy +msgid "No" +msgstr "Żadne" + +#: ../extensions/cookie-manager/cookie-manager-page.c:819 +msgid "Name" +msgstr "Nazwa:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:884 +msgid "_Expand All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:892 +msgid "_Collapse All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:942 +#, fuzzy +msgid "Filter:" +msgstr "_Folder:" + +#: ../extensions/cookie-manager/cookie-manager-page.c:947 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:242 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:348 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "" + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:664 +msgid "Feeds" +msgstr "Kanały informacyjne" + +#: ../extensions/feed-panel/feed-panel.c:717 +msgid "Add new feed" +msgstr "Dodaj kanał informacyjny" + +#: ../extensions/feed-panel/feed-panel.c:724 +msgid "Delete feed" +msgstr "Usuń kanał informacyjny" + +#: ../extensions/feed-panel/feed-panel.c:807 +msgid "_Feeds" +msgstr "Kanały _Informacyjne" + +#: ../extensions/feed-panel/feed-parse.c:185 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:225 +#, c-format +msgid "Unsupported feed format." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:255 +#, fuzzy, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Nie udało się uzyskać dostępu do bazy danych: %s\n" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "" + +#: ../extensions/feed-panel/main.c:490 +#, fuzzy +msgid "Feed Panel" +msgstr "Pokaż panel" + +#: ../extensions/feed-panel/main.c:491 +msgid "Read Atom/ RSS feeds" +msgstr "" + +#: ../extensions/mouse-gestures/main.c:244 +msgid "Mouse Gestures" +msgstr "" + +#: ../extensions/mouse-gestures/main.c:245 +msgid "Control Midori by moving the mouse" +msgstr "" + #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "" -#: ../extensions/page-holder.c:128 +#: ../extensions/page-holder.c:161 #, fuzzy msgid "_Pageholder" msgstr "_Folder:" -#: ../extensions/statusbar-features.c:30 -msgid "Images" -msgstr "" - -#: ../extensions/statusbar-features.c:37 +#: ../extensions/statusbar-features.c:104 #, fuzzy -msgid "Scripts" -msgstr "Skrypty użytkownika" +msgid "Statusbar Features" +msgstr "Tekst paska stanu" -#: ../extensions/statusbar-features.c:44 -msgid "Plugins" +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" msgstr "" +#~ msgid "URIs" +#~ msgstr "Adresy URI" + +#, fuzzy +#~ msgid "[URIs]" +#~ msgstr "[URI]" + +#~ msgid "_URL:" +#~ msgstr "_URL:" + +#~ msgid "Root" +#~ msgstr "Korzeń" + +#~ msgid "_Quick Find" +#~ msgstr "Szybkie wyszukiwanie" + +#~ msgid "HTTP Proxy" +#~ msgstr "Serwer proxy HTTP" + +#~ msgid "Open URL in New _Tab" +#~ msgstr "Otwórz URL w nowej karcie" + +#, fuzzy +#~ msgid "Source" +#~ msgstr "Ź_ródło strony" + +#~ msgid "_Icon (name or file):" +#~ msgstr "_Ikona (nazwa albo plik):" + +#~ msgid "Manage search engines" +#~ msgstr "_Zarządzaj wyszukiwarkami" + +#~ msgid "Warning: You are using a superuser account!" +#~ msgstr "Uwaga: Używasz konta administratora!" + +#, fuzzy +#~ msgid "Scripts" +#~ msgstr "Skrypty użytkownika" + #~ msgid "Bookmark" #~ msgstr "Zakładka" #~ msgid "_Form Fill" #~ msgstr "Wypełnij _formularz" -#~ msgid "Select _All" -#~ msgstr "Z_aznacz wszystko" - #~ msgid "_Fullscreen" #~ msgstr "Tryb _pełnoekranowy" @@ -1424,9 +2163,6 @@ msgstr "" #~ msgid "The current browser" #~ msgstr "Obecna przeglądarka" -#~ msgid "Search Engines" -#~ msgstr "Wyszukiwarki" - #~ msgid "The list of search engines" #~ msgstr "Lista wyszukiwarek" @@ -1445,9 +2181,6 @@ msgstr "" #~ msgid "The statusbar" #~ msgstr "Pasek stanu" -#~ msgid "Statusbar Text" -#~ msgstr "Tekst paska stanu" - #~ msgid "The text that is displayed in the statusbar" #~ msgstr "Tekst wyświetlany na pasku stanu" @@ -1460,9 +2193,6 @@ msgstr "" #~ msgid "Undo the last modification" #~ msgstr "Cofnij" -#~ msgid "Redo the last modification" -#~ msgstr "Przywróć" - #~ msgid "_Manage Bookmarks" #~ msgstr "_Modyfikuj zakładki" @@ -1499,17 +2229,8 @@ msgstr "" #~ msgid "Show Web search" #~ msgstr "Pokazuj wyszukiwarki internetowe" -#~ msgid "Show Trash" -#~ msgstr "Pokazuj kosz" - #~ msgid "Show the Trash button in the toolbar" #~ msgstr "Pokaż kosz na pasku narzędzi" #~ msgid "Show a notification window for finished downloads" #~ msgstr "Pokazuj powiadomienie dla zakończonych pobierań" - -#~ msgid "Name" -#~ msgstr "Nazwa:" - -#~ msgid "Description" -#~ msgstr "Opis:" diff --git a/po/ru.po b/po/ru.po index ca9c4665..c9766c06 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,26 +6,27 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.5\n" +"Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-24 14:03+0900\n" -"PO-Revision-Date: 2009-05-24 14:11+0800\n" +"POT-Creation-Date: 2009-07-18 21:11+0900\n" +"PO-Revision-Date: 2009-07-18 21:39+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" #: ../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:281 +#: ../midori/main.c:1343 +#: ../midori/main.c:1497 +#: ../midori/main.c:1505 +#: ../midori/main.c:1516 +#: ../midori/midori-websettings.c:285 msgid "Midori" msgstr "Midori" @@ -87,997 +88,1022 @@ msgstr "Не удалось удалить устаревшие записи и msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:770 +#: ../midori/main.c:779 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %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 "Не удалось сохранить закладки. %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 "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:965 +#: ../midori/main.c:974 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %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 "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:1107 +#: ../midori/main.c:1116 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:1111 +#: ../midori/main.c:1120 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:1116 +#: ../midori/main.c:1125 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1315 +#: ../midori/main.c:1343 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1338 +#: ../midori/main.c:1366 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1370 +#: ../midori/main.c:1399 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимок сохранён в: %s\n" -#: ../midori/main.c:1391 +#: ../midori/main.c:1434 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1391 +#: ../midori/main.c:1434 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1393 +#: ../midori/main.c:1436 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1393 +#: ../midori/main.c:1436 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1395 +#: ../midori/main.c:1439 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1398 +#: ../midori/main.c:1443 msgid "Take a snapshot of the specified URI" msgstr "Создать снимок указанной страницы" -#: ../midori/main.c:1401 +#: ../midori/main.c:1446 +msgid "Execute the specified command" +msgstr "Выполнить указанную команду" + +#: ../midori/main.c:1448 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1403 +#: ../midori/main.c:1450 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1446 +#: ../midori/main.c:1494 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1469 +#: ../midori/main.c:1517 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1471 +#: ../midori/main.c:1519 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1548 +#: ../midori/main.c:1600 msgid "The specified configuration folder is invalid." msgstr "Указана некорректная папка файлов параметров." -#: ../midori/main.c:1583 +#: ../midori/main.c:1636 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1633 +#: ../midori/main.c:1686 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1645 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1660 +#: ../midori/main.c:1713 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1673 +#: ../midori/main.c:1726 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1686 +#: ../midori/main.c:1739 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1698 +#: ../midori/main.c:1751 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:1714 +#: ../midori/main.c:1767 msgid "_Ignore" msgstr "_Игнорировать" -#: ../midori/midori-array.c:195 +#: ../midori/midori-array.c:236 msgid "File not found." msgstr "Файл не найден." -#: ../midori/midori-array.c:203 -#: ../midori/midori-array.c:212 +#: ../midori/midori-array.c:244 +#: ../midori/midori-array.c:253 msgid "Malformed document." msgstr "Плохо сформированный документ." -#: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:692 +#: ../midori/midori-array.c:410 +#: ../midori/sokoke.c:700 #, c-format msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:297 -#: ../midori/midori-browser.c:3965 -#: ../midori/midori-browser.c:3971 +#: ../midori/midori-browser.c:304 +#: ../midori/midori-browser.c:4166 +#: ../midori/midori-browser.c:4172 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:308 -#: ../midori/midori-browser.c:3968 +#: ../midori/midori-browser.c:315 +#: ../midori/midori-browser.c:4169 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:370 +#: ../midori/midori-browser.c:410 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:395 +#: ../midori/midori-browser.c:435 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:617 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:617 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:639 +#: ../midori/midori-browser.c:619 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:639 +#: ../midori/midori-browser.c:619 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:669 +#: ../midori/midori-browser.c:649 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:682 +#: ../midori/midori-browser.c:662 #: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:701 +#: ../midori/midori-browser.c:681 #: ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:720 +#: ../midori/midori-browser.c:700 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:725 -#: ../midori/midori-browser.c:766 +#: ../midori/midori-browser.c:705 +#: ../midori/midori-browser.c:746 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:842 +#: ../midori/midori-browser.c:822 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1174 +#: ../midori/midori-browser.c:1169 #, c-format msgid "The file %s has been downloaded." msgstr "Файл %s загружен." -#: ../midori/midori-browser.c:1178 +#: ../midori/midori-browser.c:1173 msgid "Transfer completed" -msgstr "Передача завершена" +msgstr "Загрузка завершена" -#: ../midori/midori-browser.c:1888 +#: ../midori/midori-browser.c:1314 +msgid "Save file" +msgstr "Сохранить файл" + +#: ../midori/midori-browser.c:1960 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:3242 -#: ../panels/midori-bookmarks.c:778 -#: ../panels/midori-history.c:811 +#: ../midori/midori-browser.c:3419 +#: ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:812 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:3249 -#: ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:3426 +#: ../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:3252 -#: ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:819 +#: ../midori/midori-browser.c:3429 +#: ../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:3551 +#: ../midori/midori-browser.c:3729 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:3554 +#: ../midori/midori-browser.c:3733 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:3567 +#: ../midori/midori-browser.c:3746 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:3575 -#: ../midori/midori-preferences.c:670 +#: ../midori/midori-browser.c:3756 +#: ../midori/midori-preferences.c:675 #: ../panels/midori-history.c:108 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:3580 +#: ../midori/midori-browser.c:3761 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:3585 +#: ../midori/midori-browser.c:3766 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:3590 +#: ../midori/midori-browser.c:3771 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:3596 -#: ../midori/sokoke.c:859 +#: ../midori/midori-browser.c:3776 +#: ../midori/sokoke.c:874 msgid "_Closed Tabs and Windows" msgstr "За_крытые вкладки и окна" -#: ../midori/midori-browser.c:3677 +#: ../midori/midori-browser.c:3859 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:3685 +#: ../midori/midori-browser.c:3867 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov " -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:4100 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:3902 +#: ../midori/midori-browser.c:4103 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4106 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:3908 +#: ../midori/midori-browser.c:4109 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:3911 +#: ../midori/midori-browser.c:4112 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:3913 -#: ../midori/midori-view.c:1337 +#: ../midori/midori-browser.c:4114 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:3914 +#: ../midori/midori-browser.c:4115 msgid "Add shortcut to speed dial" msgstr "Добавить страницу в панель быстрого набора" -#: ../midori/midori-browser.c:3916 +#: ../midori/midori-browser.c:4117 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4118 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:3919 +#: ../midori/midori-browser.c:4120 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4121 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:3923 +#: ../midori/midori-browser.c:4124 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:3926 +#: ../midori/midori-browser.c:4127 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:3928 +#: ../midori/midori-browser.c:4129 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4132 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:3934 -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4135 +#: ../midori/midori-browser.c:4138 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:3940 +#: ../midori/midori-browser.c:4141 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:3943 +#: ../midori/midori-browser.c:4144 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4147 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:4150 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:3951 +#: ../midori/midori-browser.c:4152 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:3952 +#: ../midori/midori-browser.c:4153 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3954 +#: ../midori/midori-browser.c:4155 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:3955 +#: ../midori/midori-browser.c:4156 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4160 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:3961 +#: ../midori/midori-browser.c:4162 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:3962 +#: ../midori/midori-browser.c:4163 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:3974 +#: ../midori/midori-browser.c:4175 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:3977 +#: ../midori/midori-browser.c:4178 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:3980 +#: ../midori/midori-browser.c:4181 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:3981 +#: ../midori/midori-browser.c:4182 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:3983 -msgid "_Automatic" -msgstr "_Автоматически" - -#: ../midori/midori-browser.c:3986 -#: ../midori/midori-websettings.c:208 -msgid "Chinese (BIG5)" -msgstr "Китайская (BIG5)" - -#: ../midori/midori-browser.c:3989 -#: ../midori/midori-websettings.c:209 -msgid "Japanese (SHIFT_JIS)" -msgstr "Японская (SHIFT_JIS)" - -#: ../midori/midori-browser.c:3992 -#: ../midori/midori-websettings.c:210 -msgid "Russian (KOI8-R)" -msgstr "Кириллица (KOI8-R)" - -#: ../midori/midori-browser.c:3995 -#: ../midori/midori-websettings.c:211 -msgid "Unicode (UTF-8)" -msgstr "Юникод (UTF-8)" - -#: ../midori/midori-browser.c:3998 -#: ../midori/midori-websettings.c:212 -msgid "Western (ISO-8859-1)" -msgstr "Западно-европейская (ISO-8859-1)" - -#: ../midori/midori-browser.c:4001 -#: ../midori/midori-websettings.c:213 -#: ../midori/midori-websettings.c:285 -msgid "Custom..." -msgstr "Другая..." - -#: ../midori/midori-browser.c:4004 -#: ../midori/midori-view.c:1356 -msgid "View _Source" +#: ../midori/midori-browser.c:4184 +msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:4005 +#: ../midori/midori-browser.c:4185 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:4007 +#: ../midori/midori-browser.c:4187 msgid "View Selection Source" msgstr "Исходный код выделенного фрагмента" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4188 msgid "View the source code of the selection" msgstr "Просмотр исходного кода выделенного фрагмента" -#: ../midori/midori-browser.c:4012 +#: ../midori/midori-browser.c:4192 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:4014 +#: ../midori/midori-browser.c:4194 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:4017 +#: ../midori/midori-browser.c:4197 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:4020 +#: ../midori/midori-browser.c:4200 msgid "Go forward to the next page" msgstr "На следующую страницу" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:4203 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:4025 +#: ../midori/midori-browser.c:4205 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:4026 +#: ../midori/midori-browser.c:4206 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:4028 -#: ../midori/midori-view.c:1314 -msgid "Undo Close Tab" -msgstr "Отменить закрытие вкладок" +#: ../midori/midori-browser.c:4208 +msgid "Undo _Close Tab" +msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:4029 +#: ../midori/midori-browser.c:4209 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:4033 -#: ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:4213 +#: ../panels/midori-bookmarks.c:231 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:4035 -#: ../panels/midori-bookmarks.c:259 -msgid "Add a new folder" -msgstr "Создать папку" +#: ../midori/midori-browser.c:4215 +msgid "Add a new _folder" +msgstr "_Создать папку" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4216 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:4037 +#: ../midori/midori-browser.c:4217 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:4039 +#: ../midori/midori-browser.c:4219 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:4040 +#: ../midori/midori-browser.c:4220 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:4043 +#: ../midori/midori-browser.c:4223 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:4044 +#: ../midori/midori-browser.c:4224 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:4048 +#: ../midori/midori-browser.c:4228 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:4049 +#: ../midori/midori-browser.c:4229 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:4051 +#: ../midori/midori-browser.c:4231 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:4052 +#: ../midori/midori-browser.c:4232 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:4054 +#: ../midori/midori-browser.c:4234 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:4236 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:4057 +#: ../midori/midori-browser.c:4237 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:4059 +#: ../midori/midori-browser.c:4239 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:4060 +#: ../midori/midori-browser.c:4240 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:4062 +#: ../midori/midori-browser.c:4242 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:4063 +#: ../midori/midori-browser.c:4243 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:4066 +#: ../midori/midori-browser.c:4246 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:4073 +#: ../midori/midori-browser.c:4253 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:4074 +#: ../midori/midori-browser.c:4254 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:4079 +#: ../midori/midori-browser.c:4259 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:4080 +#: ../midori/midori-browser.c:4260 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:4083 +#: ../midori/midori-browser.c:4263 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:4084 +#: ../midori/midori-browser.c:4264 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:4087 +#: ../midori/midori-browser.c:4267 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:4088 +#: ../midori/midori-browser.c:4268 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:4091 +#: ../midori/midori-browser.c:4271 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:4092 +#: ../midori/midori-browser.c:4272 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:4095 +#: ../midori/midori-browser.c:4275 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:4096 +#: ../midori/midori-browser.c:4276 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:4099 +#: ../midori/midori-browser.c:4279 msgid "_Statusbar" msgstr "Панель _состояния" -#: ../midori/midori-browser.c:4100 +#: ../midori/midori-browser.c:4280 msgid "Show statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-browser.c:4534 +#: ../midori/midori-browser.c:4287 +msgid "_Automatic" +msgstr "_Автоматически" + +#: ../midori/midori-browser.c:4290 +#: ../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:4294 +msgid "Japanese (SHIFT__JIS)" +msgstr "Японская (SHIFT__JIS)" + +#: ../midori/midori-browser.c:4297 +#: ../midori/midori-websettings.c:214 +msgid "Russian (KOI8-R)" +msgstr "Кириллица (KOI8-R)" + +#: ../midori/midori-browser.c:4300 +#: ../midori/midori-websettings.c:215 +msgid "Unicode (UTF-8)" +msgstr "Юникод (UTF-8)" + +#: ../midori/midori-browser.c:4303 +#: ../midori/midori-websettings.c:216 +msgid "Western (ISO-8859-1)" +msgstr "Западно-европейская (ISO-8859-1)" + +#: ../midori/midori-browser.c:4306 +#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:289 +msgid "Custom..." +msgstr "Другая..." + +#: ../midori/midori-browser.c:4744 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:4541 +#: ../midori/midori-browser.c:4751 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:4543 +#: ../midori/midori-browser.c:4753 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:4565 +#: ../midori/midori-browser.c:4777 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:4567 +#: ../midori/midori-browser.c:4779 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:4588 +#: ../midori/midori-browser.c:4800 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:4603 +#: ../midori/midori-browser.c:4815 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:4605 +#: ../midori/midori-browser.c:4817 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:4620 -#: ../midori/sokoke.c:848 +#: ../midori/midori-browser.c:4832 +#: ../midori/sokoke.c:863 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4834 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:4637 +#: ../midori/midori-browser.c:4849 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:4639 +#: ../midori/midori-browser.c:4851 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" +#: ../midori/midori-browser.c:4865 +msgid "_Menu" +msgstr "_Меню" + +#: ../midori/midori-browser.c:4867 +msgid "Menu" +msgstr "Меню" + #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4814 +#: ../midori/midori-browser.c:5048 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:5073 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:5078 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:5083 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:4857 +#: ../midori/midori-browser.c:5091 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:4867 +#: ../midori/midori-browser.c:5101 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:4902 -#: ../extensions/cookie-manager/cookie-manager-page.c:129 +#: ../midori/midori-browser.c:5136 +#: ../extensions/cookie-manager/cookie-manager-page.c:109 msgid "Delete All" msgstr "Удалить всё" -#: ../midori/midori-browser.c:5224 +#: ../midori/midori-browser.c:5464 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" +#: ../midori/midori-locationaction.c:901 +#, c-format +msgid "Search with %s" +msgstr "Найти с помощью %s" + #: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "Отсоединить выбранную панель от главного окна" -#: ../midori/midori-panel.c:335 -msgid "Whether to detach the chosen panel from the window" -msgstr "Отсоединить выбранную панель от главного окна" - -#: ../midori/midori-panel.c:345 -#: ../midori/midori-websettings.c:539 -msgid "Align sidepanel on the right" +#: ../midori/midori-panel.c:343 +#: ../midori/midori-panel.c:508 +msgid "Align sidepanel to the right" msgstr "Расположить панель справа" -#: ../midori/midori-panel.c:347 -#: ../midori/midori-websettings.c:540 -msgid "Whether to align the sidepanel on the right" -msgstr "Расположить боковую панель справа" - -#: ../midori/midori-panel.c:357 -#: ../midori/midori-panel.c:358 +#: ../midori/midori-panel.c:353 +#: ../midori/midori-panel.c:354 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-websettings.c:191 -#: ../midori/midori-view.c:2250 +#: ../midori/midori-panel.c:509 +msgid "Align sidepanel to the left" +msgstr "Расположить панель слева" + +#: ../midori/midori-websettings.c:195 +#: ../midori/midori-view.c:2265 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-websettings.c:192 -#: ../midori/midori-websettings.c:559 +#: ../midori/midori-websettings.c:196 +#: ../midori/midori-websettings.c:563 msgid "Homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:193 +#: ../midori/midori-websettings.c:197 msgid "Last open pages" msgstr "Последние открытые страницы" -#: ../midori/midori-websettings.c:228 +#: ../midori/midori-websettings.c:213 +msgid "Japanese (SHIFT_JIS)" +msgstr "Японская (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:232 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:233 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:234 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:249 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:250 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:251 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:252 msgid "Both" msgstr "Значки и текст" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:253 msgid "Both horizontal" msgstr "Значки и текст горизонтально" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:268 msgid "All cookies" msgstr "Все" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:269 msgid "Session cookies" msgstr "С информацией о сеансе" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:270 #: ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:87 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:286 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:287 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:288 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:341 msgid "Remember last window size" msgstr "Запоминать размер последнего окна" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:342 msgid "Whether to save the last window size" msgstr "Запоминать последний размер окна" -#: ../midori/midori-websettings.c:346 +#: ../midori/midori-websettings.c:350 msgid "Last window width" msgstr "Ширина последнего окна" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:351 msgid "The last saved window width" msgstr "Ширина последнего сохранённого окна" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:359 msgid "Last window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:360 msgid "The last saved window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:385 msgid "Last panel position" msgstr "Позиция последней панели" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:395 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:396 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:404 msgid "Last Web search" msgstr "Последний поиск" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:405 msgid "The last saved Web search" msgstr "Последний сохранённый поиск в сети" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:414 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:415 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:423 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:424 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:432 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:433 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:437 +#: ../midori/midori-websettings.c:441 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:457 msgid "Show Transferbar" msgstr "Показать панель передач" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the transferbar" msgstr "Показывать панель передач" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:466 msgid "Show Statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the statusbar" msgstr "Показывать панель состояния" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:493 msgid "Show progress in location entry" msgstr "Показывать прогресс загрузки страницы в адресной строке" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:494 msgid "Whether to show loading progress in the location entry" msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:509 msgid "Search engines in location completion" msgstr "Показывать средства поиска при автодополнении адреса" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:510 msgid "Whether to show search engines in the location completion" msgstr "Показывать средства поиска при вводе текста в адресную строку" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:518 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:519 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:527 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:528 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:543 +msgid "Align sidepanel on the right" +msgstr "Расположить панель справа" + +#: ../midori/midori-websettings.c:544 +msgid "Whether to align the sidepanel on the right" +msgstr "Расположить боковую панель справа" + +#: ../midori/midori-websettings.c:553 msgid "Load on Startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:550 +#: ../midori/midori-websettings.c:554 msgid "What to load on startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:560 +#: ../midori/midori-websettings.c:564 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:579 msgid "Show crash dialog" msgstr "Показывать окно действий после сбоя" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:580 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:596 msgid "Show speed dial in new tabs" msgstr "Показывать панель быстрого набора в новых вкладках" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:597 msgid "Show speed dial in newly opened tabs" msgstr "Показывать панель быстрого набора в только что открытых вкладках" @@ -1330,123 +1356,127 @@ msgstr "Удалить личные данные" msgid "The private data selected for deletion" msgstr "Выбранные для удаления личные данные" -#: ../midori/midori-view.c:740 +#: ../midori/midori-view.c:750 #, 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:742 -#: ../midori/midori-view.c:2773 +#: ../midori/midori-view.c:752 +#: ../midori/midori-view.c:2897 #: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "Ошибка" -#: ../midori/midori-view.c:745 +#: ../midori/midori-view.c:755 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:775 -#: ../midori/midori-view.c:2777 +#: ../midori/midori-view.c:785 +#: ../midori/midori-view.c:2901 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:1176 +#: ../midori/midori-view.c:1172 msgid "Open _Link" msgstr "_Открыть ссылку" -#: ../midori/midori-view.c:1178 +#: ../midori/midori-view.c:1174 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1191 msgid "Open Link in New _Window" -msgstr "Открыть ссылку в новом _окне" +msgstr "Открыть ссылку в _новом окне" -#: ../midori/midori-view.c:1204 +#: ../midori/midori-view.c:1197 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:1210 +#: ../midori/midori-view.c:1203 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:1219 +#: ../midori/midori-view.c:1212 msgid "Download with Download _Manager" msgstr "Загрузить с помощью _менеджера загрузок" -#: ../midori/midori-view.c:1248 +#: ../midori/midori-view.c:1241 msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:1276 +#: ../midori/midori-view.c:1269 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:1286 +#: ../midori/midori-view.c:1279 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1453 +#: ../midori/midori-view.c:1457 msgid "Open or download file" -msgstr "Открыть или загрузить файл" +msgstr "Открыть или сохранить файл" -#: ../midori/midori-view.c:1470 +#: ../midori/midori-view.c:1474 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:1473 +#: ../midori/midori-view.c:1477 #, 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:1477 +#: ../midori/midori-view.c:1481 #, c-format msgid "Open %s" -msgstr "Открыть %s" +msgstr "Файл %s" -#: ../midori/midori-view.c:1886 +#: ../midori/midori-view.c:1899 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:2076 +#: ../midori/midori-view.c:2089 msgid "Speed dial" msgstr "Быстрый набор" -#: ../midori/midori-view.c:2077 +#: ../midori/midori-view.c:2090 msgid "Click to add a shortcut" msgstr "Нажмите, чтобы добавить закладку" -#: ../midori/midori-view.c:2078 +#: ../midori/midori-view.c:2091 msgid "Enter shortcut address" msgstr "Введите адрес страницы" -#: ../midori/midori-view.c:2079 +#: ../midori/midori-view.c:2092 msgid "Enter shortcut title" msgstr "Введите название закладки" -#: ../midori/midori-view.c:2080 +#: ../midori/midori-view.c:2093 msgid "Are you sure you want to delete this shortcut?" msgstr "Удалить визуальную закладку?" -#: ../midori/midori-view.c:2110 +#: ../midori/midori-view.c:2123 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2140 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" +#: ../midori/midori-view.c:2487 +msgid "_Duplicate Tab" +msgstr "_Сделать копию" + #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" @@ -1495,162 +1525,166 @@ msgstr "Размер шрифта для отображения текста п msgid "Fixed-width Font Family" msgstr "Семейство моноширинного шрифта" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:457 msgid "The font family used to display fixed-width text" msgstr "Семейство моноширинного шрифта для отображения текста" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "Размер моноширинного шрифта для отображения текста" + +#: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" msgstr "Минимальный размер шрифта" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" msgstr "Наименьший размер шрифта для отображения текста" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:473 msgid "Encoding" msgstr "Кодировка" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" msgstr "Кодировка символов, которая будет использоваться по умолчанию" #. Page "Behavior" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:484 msgid "Features" msgstr "Возможности" -#: ../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 "Загружать изображения автоматически" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:488 msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:491 msgid "Shrink images automatically" msgstr "Масштабировать изображения автоматически" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:492 msgid "Automatically shrink standalone images to fit" msgstr "Автоматически уменьшать отдельные изображения по размеру экрана" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:495 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:496 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:499 msgid "Resizable text areas" msgstr "Изменяемый размер текстовых полей" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:500 msgid "Whether text areas are resizable" msgstr "Текстовые поля могут изменять размер" -#: ../midori/midori-preferences.c:498 -#: ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:503 +#: ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:504 msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../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 "Использовать модули Netscape" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:508 msgid "Enable embedded Netscape plugin objects" msgstr "Разрешить встроенные объекты модулей Netscape на страницах" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:511 msgid "Enforce 96 dots per inch" msgstr "Всегда использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:512 msgid "Enforce a video dot density of 96 DPI" msgstr "Принудительно использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:515 msgid "Enable developer tools" msgstr "Включить средства разработчика" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:516 msgid "Enable special extensions for developers" msgstr "Включить особые расширения для разработчиков" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:523 msgid "Spell Checking" msgstr "Проверка орфографии" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:526 msgid "Enable Spell Checking" msgstr "Проверять орфографию" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:527 msgid "Enable spell checking while typing" msgstr "Проверять правописание вводимого текста" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:531 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "Список языков для проверки орфографии через запятую, например, «en_US,ru»" #. Page "Interface" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:536 msgid "Interface" msgstr "Интерфейс" -#: ../midori/midori-preferences.c:532 +#: ../midori/midori-preferences.c:537 msgid "Navigationbar" msgstr "Панель навигации" -#: ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:548 msgid "Browsing" msgstr "Навигация" #. Page "Applications" -#: ../midori/midori-preferences.c:573 +#: ../midori/midori-preferences.c:578 msgid "Applications" msgstr "Приложения" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:579 msgid "External applications" msgstr "Внешние приложения" #. Page "Network" -#: ../midori/midori-preferences.c:620 -#: ../midori/midori-preferences.c:621 +#: ../midori/midori-preferences.c:625 +#: ../midori/midori-preferences.c:626 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:648 +#: ../midori/midori-preferences.c:653 msgid "MB" msgstr "МБ" #. Page "Privacy" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:658 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:654 +#: ../midori/midori-preferences.c:659 msgid "Web Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-preferences.c:667 -#: ../midori/midori-preferences.c:677 +#: ../midori/midori-preferences.c:672 +#: ../midori/midori-preferences.c:682 msgid "days" msgstr "дней" @@ -1679,64 +1713,64 @@ msgstr "_Значок:" msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1195 +#: ../midori/midori-searchaction.c:1209 msgid "Manage Search Engines" msgstr "Управление средствами поиска" -#: ../midori/midori-searchaction.c:1292 +#: ../midori/midori-searchaction.c:1308 msgid "Use as _default" msgstr "Использовать _по умолчанию" -#: ../midori/sokoke.c:164 -#: ../midori/sokoke.c:176 +#: ../midori/sokoke.c:172 +#: ../midori/sokoke.c:184 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/sokoke.c:847 +#: ../midori/sokoke.c:862 msgid "_Bookmark" msgstr "_Закладка" -#: ../midori/sokoke.c:849 -msgid "_Add Bookmark" +#: ../midori/sokoke.c:864 +msgid "Add Boo_kmark" msgstr "_Добавить закладку" -#: ../midori/sokoke.c:850 +#: ../midori/sokoke.c:865 msgid "_Console" msgstr "_Консоль" -#: ../midori/sokoke.c:851 +#: ../midori/sokoke.c:866 msgid "_Extensions" msgstr "_Дополнения" -#: ../midori/sokoke.c:852 +#: ../midori/sokoke.c:867 msgid "_History" msgstr "_Журнал" -#: ../midori/sokoke.c:853 +#: ../midori/sokoke.c:868 msgid "_Homepage" -msgstr "Д_омашняя страница" +msgstr "_Домашняя страница" -#: ../midori/sokoke.c:854 +#: ../midori/sokoke.c:869 msgid "_Userscripts" msgstr "_Сценарии пользователя" -#: ../midori/sokoke.c:855 +#: ../midori/sokoke.c:870 msgid "User_styles" msgstr "С_тили пользователя" -#: ../midori/sokoke.c:856 +#: ../midori/sokoke.c:871 msgid "New _Tab" msgstr "Но_вая вкладка" -#: ../midori/sokoke.c:857 +#: ../midori/sokoke.c:872 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/sokoke.c:858 +#: ../midori/sokoke.c:873 msgid "Netscape p_lugins" msgstr "_Модули Netscape" -#: ../midori/sokoke.c:860 +#: ../midori/sokoke.c:875 msgid "New _Window" msgstr "_Новое окно" @@ -1750,39 +1784,23 @@ msgstr "Сценарии" msgid "Userstyles" msgstr "Стили пользователя" -#: ../panels/midori-addons.c:1031 -#: ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "_Включить" - -#: ../panels/midori-addons.c:1032 -#: ../panels/midori-extensions.c:145 -msgid "Enable" -msgstr "Включить" - -#: ../panels/midori-addons.c:1041 -#: ../panels/midori-extensions.c:154 -msgid "_Disable" -msgstr "_Отключить" - -#: ../panels/midori-addons.c:1042 -#: ../panels/midori-extensions.c:155 -msgid "Disable" -msgstr "Отключить" - -#: ../panels/midori-bookmarks.c:107 +#: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:238 +#: ../panels/midori-bookmarks.c:239 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:591 +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "Создать папку" + +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Разделитель" @@ -1790,7 +1808,7 @@ msgstr "Разделитель" msgid "Console" msgstr "Консоль" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Дополнения" @@ -1810,29 +1828,28 @@ msgstr "Удалить запись из журнала" msgid "Clear the entire history" msgstr "Очистить весь журнал" -#: ../panels/midori-history.c:602 +#: ../panels/midori-history.c:601 msgid "A week ago" msgstr "Неделю назад" -#: ../panels/midori-history.c:607 +#: ../panels/midori-history.c:606 #, c-format msgid "%d day ago" -msgstr "%d день назад" +msgid_plural "%d days ago" +msgstr[0] "%d день назад" +msgstr[1] "%d дня назад" +msgstr[2] "%d дней назад" -#: ../panels/midori-history.c:608 -#, c-format -msgid "%d days ago" -msgstr "%d дней назад" - -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:614 msgid "Today" msgstr "Сегодня" -#: ../panels/midori-history.c:617 +#: ../panels/midori-history.c:616 msgid "Yesterday" msgstr "Вчера" #: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "Модули Netscape" @@ -1841,6 +1858,14 @@ msgstr "Модули Netscape" msgid "%s of %s" msgstr "%s из %s" +#: ../panels/midori-transfers.c:479 +msgid "Open Destination _Folder" +msgstr "Открыть _папку загрузок" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "Копировать _адрес ссылки" + #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "Требуется авторизация" @@ -1875,34 +1900,34 @@ msgstr "Не удалось загрузить системный значок msgid "Animation frames are broken" msgstr "Кадры анимации повреждены" -#: ../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 "Свойство «%s» недействительно для %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 "Выберите файл" -#: ../katze/katze-utils.c:230 +#: ../katze/katze-utils.c:250 msgid "Choose folder" msgstr "Выберите папку" -#: ../extensions/adblock.c:78 +#: ../extensions/adblock.c:125 msgid "Configure Advertisement filters" msgstr "Настройка рекламных фильтров" -#: ../extensions/adblock.c:214 +#: ../extensions/adblock.c:266 msgid "Configure _Advertisement filters..." msgstr "_Настроить рекламные фильтры..." -#: ../extensions/adblock.c:374 +#: ../extensions/adblock.c:523 msgid "Advertisement blocker" msgstr "Блокировка рекламы" -#: ../extensions/adblock.c:375 +#: ../extensions/adblock.c:524 msgid "Block advertisements according to a filter list" msgstr "Блокирует рекламу по списку фильтров" @@ -1918,48 +1943,40 @@ msgstr "Цветные вкладки" msgid "Tint each tab distinctly" msgstr "Каждая вкладка имеет свой цвет" -#: ../extensions/cookie-manager/cookie-manager.c:105 -msgid "_Cookie Manager" -msgstr "Менеджер _фрагментов данных" - -#: ../extensions/cookie-manager/cookie-manager.c:121 -#: ../extensions/cookie-manager/cookie-manager-page.c:83 +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 msgid "Cookie Manager" msgstr "Менеджер фрагментов данных" -#: ../extensions/cookie-manager/cookie-manager.c:122 -msgid "List, view and delete cookies" -msgstr "Просмотр и удаление фрагментов данных" - -#: ../extensions/cookie-manager/cookie-manager-page.c:131 +#: ../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 "Будут удалены только видимые фрагменты. Если активен фильтр, будут удалены только те фрагменты, которые удовлетворяют его условиям." -#: ../extensions/cookie-manager/cookie-manager-page.c:146 +#: ../extensions/cookie-manager/cookie-manager-page.c:126 msgid "Expand All" msgstr "Развернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:153 +#: ../extensions/cookie-manager/cookie-manager-page.c:133 msgid "Collapse All" msgstr "Свернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:474 +#: ../extensions/cookie-manager/cookie-manager-page.c:460 msgid "Do you really want to delete all cookies?" msgstr "Удалить все сохранённые фрагменты данных?" -#: ../extensions/cookie-manager/cookie-manager-page.c:476 +#: ../extensions/cookie-manager/cookie-manager-page.c:462 msgid "Question" msgstr "Вопрос" -#: ../extensions/cookie-manager/cookie-manager-page.c:485 +#: ../extensions/cookie-manager/cookie-manager-page.c:471 msgid "Only cookies which match the filter will be deleted." msgstr "Будут удалены только фрагменты, удовлетворяющие условиям фильтра." -#: ../extensions/cookie-manager/cookie-manager-page.c:553 +#: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" msgstr "В конце сеанса" -#: ../extensions/cookie-manager/cookie-manager-page.c:556 +#: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format msgid "" "Host: %s\n" @@ -1976,34 +1993,42 @@ msgstr "" "Защищённый: %s\n" "Срок истекает: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:562 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" msgstr "Да" -#: ../extensions/cookie-manager/cookie-manager-page.c:562 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" msgstr "Нет" -#: ../extensions/cookie-manager/cookie-manager-page.c:819 +#: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" msgstr "Имя" -#: ../extensions/cookie-manager/cookie-manager-page.c:884 +#: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" msgstr "_Развернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:892 +#: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" msgstr "_Свернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:942 +#: ../extensions/cookie-manager/cookie-manager-page.c:923 msgid "Filter:" msgstr "Фильтр:" -#: ../extensions/cookie-manager/cookie-manager-page.c:947 +#: ../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 "Строка для фильтрации по имени фрагмента или адресу веб-сайта" +#: ../extensions/cookie-manager/main.c:40 +msgid "_Cookie Manager" +msgstr "Менеджер _фрагментов данных" + +#: ../extensions/cookie-manager/main.c:57 +msgid "List, view and delete cookies" +msgstr "Просмотр и удаление фрагментов данных" + #: ../extensions/feed-panel/feed-atom.c:242 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Не удалось найти обязательные элементы Atom «entry» в данных XML." @@ -2088,11 +2113,11 @@ msgstr "Панель лент новостей" msgid "Read Atom/ RSS feeds" msgstr "Чтение лент RSS/Atom" -#: ../extensions/mouse-gestures/main.c:244 +#: ../extensions/mouse-gestures/main.c:236 msgid "Mouse Gestures" msgstr "Жесты мышью" -#: ../extensions/mouse-gestures/main.c:245 +#: ../extensions/mouse-gestures/main.c:237 msgid "Control Midori by moving the mouse" msgstr "Управление Midori с помощью движений мыши" @@ -2106,14 +2131,91 @@ msgstr "Контейнер" msgid "_Pageholder" msgstr "К_онтейнер" -#: ../extensions/statusbar-features.c:104 +#: ../extensions/shortcuts.c:166 +msgid "Configure Keyboard shortcuts" +msgstr "Настройка комбинаций клавиш" + +#: ../extensions/shortcuts.c:263 +msgid "Configure Sh_ortcuts..." +msgstr "_Настроить клавиши..." + +#: ../extensions/shortcuts.c:295 +msgid "Shortcuts" +msgstr "Комбинации клавиш" + +#: ../extensions/shortcuts.c:296 +msgid "View and edit keyboard shortcuts" +msgstr "Просмотр и изменение «горячих клавиш»" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "Изображения" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "Сценарии" + +#: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" msgstr "Настройка возможностей" -#: ../extensions/statusbar-features.c:105 +#: ../extensions/statusbar-features.c:150 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:389 +msgid "Customize Toolbar" +msgstr "Настройка панели инструментов" + +#: ../extensions/toolbar-editor.c:403 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Выбрать и изменить порядок элементов можно с помощью мыши." + +#: ../extensions/toolbar-editor.c:414 +msgid "Available Items" +msgstr "Доступные элементы" + +#: ../extensions/toolbar-editor.c:430 +msgid "Displayed Items" +msgstr "Отображаемые элементы" + +#: ../extensions/toolbar-editor.c:582 +msgid "Configure _Toolbar..." +msgstr "Настроить панель _инструментов..." + +#: ../extensions/toolbar-editor.c:611 +msgid "Toolbar Editor" +msgstr "Редактор панели инструментов" + +#: ../extensions/toolbar-editor.c:612 +msgid "Easily edit the toolbar layout" +msgstr "Простой редактор панели инструментов" + +#~ msgid "_Enable" +#~ msgstr "_Включить" +#~ msgid "Enable" +#~ msgstr "Включить" +#~ msgid "_Disable" +#~ msgstr "_Отключить" +#~ msgid "Disable" +#~ msgstr "Отключить" +#~ msgid "Whether to detach the chosen panel from the window" +#~ msgstr "Отсоединить выбранную панель от главного окна" +#~ msgid "%d days ago" +#~ msgstr "%d дней назад" #~ msgid "_Quick Find" #~ msgstr "_Быстрый поиск" #~ msgid "Quickly jump to a word or phrase" @@ -2146,10 +2248,6 @@ msgstr "Быстрая настройка режимов отображения #~ "Защищённый: %s\n" #~ "Имя: %s\n" #~ "Значение: %s" -#~ msgid "Images" -#~ msgstr "Изображения" -#~ msgid "Scripts" -#~ msgstr "Сценарии" #~ msgid "Source" #~ msgstr "Исходный код" #~ msgid "_Icon (name or file):" @@ -2228,8 +2326,6 @@ msgstr "Быстрая настройка режимов отображения #~ msgstr "Тип тени" #~ msgid "Appearance of the shadow around each panel" #~ msgstr "Внешний вид тени вокруг панели" -#~ msgid "Menu" -#~ msgstr "Меню" #~ msgid "Menu to hold panel items" #~ msgstr "Управление содержимым панелей" #~ msgid "Show New Tab" diff --git a/po/sk.po b/po/sk.po index 3d69a6bc..6b47dbc1 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,1346 +1,1445 @@ # Slovak translations for midori package. -# Copyright (C) 2008 THE Midori'S COPYRIGHT HOLDER +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Robert Hartl 2009 msgid "" msgstr "" -"Project-Id-Version: midori 0.1.6\n" +"Project-Id-Version: Midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-19 16:44+0200\n" -"PO-Revision-Date: 2009-04-27 19:01+0100\n" +"POT-Creation-Date: 2009-07-15 12:03+0200\n" +"PO-Revision-Date: 2009-07-15 15:44+0200\n" "Last-Translator: Robert Hartl \n" "Language-Team: slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n>=2 && n<=4 ? 1 : 2;;\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "" +msgstr "Ľahký internetový prehliadač" -#: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1288 -#: ../midori/main.c:1388 -#: ../midori/main.c:1396 -#: ../midori/main.c:1407 -#: ../midori/midori-websettings.c:273 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1343 ../midori/main.c:1484 +#: ../midori/main.c:1492 ../midori/main.c:1503 +#: ../midori/midori-websettings.c:285 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:3 msgid "Web Browser" -msgstr "Webový prehliadač" +msgstr "Internetový prehliadač" -#: ../midori/main.c:94 +#: ../midori/main.c:96 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:149 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:156 -#: ../midori/main.c:228 +#: ../midori/main.c:158 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:332 +#: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:364 +#: ../midori/main.c:382 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../midori/main.c:418 +#: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:442 +#: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:465 -#: ../midori/main.c:499 -#: ../midori/main.c:515 +#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:694 +#: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:722 +#: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "" -#: ../midori/main.c:751 +#: ../midori/main.c:779 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../midori/main.c:770 -#: ../midori/main.c:798 -#: ../midori/main.c:827 +#: ../midori/main.c:798 ../midori/main.c:826 ../midori/main.c:855 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:850 -#: ../midori/main.c:873 +#: ../midori/main.c:878 ../midori/main.c:901 #, c-format msgid "The trash couldn't be saved. %s" msgstr "" -#: ../midori/main.c:946 +#: ../midori/main.c:974 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1073 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +#: ../midori/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 "" +"Zdá sa, če Midori nebolo naposledy riadne ukončené. Ak sa to stáva " +"opakovane, pre odstránenie problému skúste nasledujúce možnosti." -#: ../midori/main.c:1088 +#: ../midori/main.c:1116 msgid "Modify _preferences" msgstr "Zmeniť _nastavenia" -#: ../midori/main.c:1092 +#: ../midori/main.c:1120 msgid "Reset the last _session" -msgstr "" +msgstr "Vymazať posledne _sedenie" -#: ../midori/main.c:1097 +#: ../midori/main.c:1125 msgid "Disable all _extensions" msgstr "Zakázať všetky _rozšírenia" -#: ../midori/main.c:1288 +#: ../midori/main.c:1343 msgid "No filename specified" -msgstr "" +msgstr "Nebol zadaný názov súboru" -#: ../midori/main.c:1311 +#: ../midori/main.c:1366 msgid "An unknown error occured." msgstr "" -#: ../midori/main.c:1336 +#: ../midori/main.c:1399 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Snímok uložený do: %s\n" + +#: ../midori/main.c:1421 msgid "Run ADDRESS as a web application" msgstr "" -#: ../midori/main.c:1336 +#: ../midori/main.c:1421 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1338 +#: ../midori/main.c:1423 msgid "Use FOLDER as configuration folder" msgstr "Použiť PRIEČINOK ako konfiguračný priečinok" -#: ../midori/main.c:1338 +#: ../midori/main.c:1423 msgid "FOLDER" msgstr "PRIEČINOK" -#: ../midori/main.c:1340 +#: ../midori/main.c:1426 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1342 +#: ../midori/main.c:1430 +msgid "Take a snapshot of the specified URI" +msgstr "" + +#: ../midori/main.c:1433 +msgid "Execute the specified command" +msgstr "" + +#: ../midori/main.c:1435 msgid "Display program version" msgstr "Zobraziť verziu programu" -#: ../midori/main.c:1344 +#: ../midori/main.c:1437 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1385 +#: ../midori/main.c:1481 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:1408 +#: ../midori/main.c:1504 msgid "Please report comments, suggestions and bugs to:" -msgstr "" +msgstr "Vaše komentáre, požiadavky a chyby prosím posielajte na:" -#: ../midori/main.c:1410 +#: ../midori/main.c:1506 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:1454 +#: ../midori/main.c:1585 msgid "The specified configuration folder is invalid." msgstr "" -#: ../midori/main.c:1489 +#: ../midori/main.c:1621 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1539 +#: ../midori/main.c:1671 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "" -#: ../midori/main.c:1551 +#: ../midori/main.c:1683 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Záložky nie je možné načítať: %s\n" -#: ../midori/main.c:1566 +#: ../midori/main.c:1698 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sedenie nie je možné načítať: %s\n" -#: ../midori/main.c:1579 +#: ../midori/main.c:1711 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1592 +#: ../midori/main.c:1724 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Históriu nie je možné načítať: %s\n" -#: ../midori/main.c:1604 +#: ../midori/main.c:1736 msgid "The following errors occured:" -msgstr "" +msgstr "Došlo k nasledujúcim chybám:" -#: ../midori/main.c:1620 +#: ../midori/main.c:1752 msgid "_Ignore" msgstr "_Ignorovať" -#: ../midori/midori-array.c:195 +#: ../midori/midori-array.c:236 msgid "File not found." msgstr "Súbor sa nenašiel." -#: ../midori/midori-array.c:203 -#: ../midori/midori-array.c:212 +#: ../midori/midori-array.c:244 ../midori/midori-array.c:253 msgid "Malformed document." -msgstr "" +msgstr "Nesprávny formát dokumentu." -#: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:625 +#: ../midori/midori-array.c:410 ../midori/sokoke.c:700 #, c-format msgid "Writing failed." msgstr "Zapisovanie zlyhalo." -#: ../midori/midori-browser.c:280 -#: ../midori/midori-browser.c:3368 -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:302 ../midori/midori-browser.c:4047 +#: ../midori/midori-browser.c:4053 msgid "Reload the current page" msgstr "Obnoviť aktuálnu stránku" -#: ../midori/midori-browser.c:291 -#: ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:313 ../midori/midori-browser.c:4050 msgid "Stop loading the current page" msgstr "Zastaviť načítanie aktuálnej stránky" -#: ../midori/midori-browser.c:353 +#: ../midori/midori-browser.c:374 #, c-format msgid "%d%% loaded" -msgstr "" +msgstr "%d%% načítaný" -#: ../midori/midori-browser.c:378 +#: ../midori/midori-browser.c:399 #, c-format msgid "Unexpected action '%s'." -msgstr "" +msgstr "Neočakávaná akcia '%s'." -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:581 msgid "New folder" msgstr "Nový priečinok" -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:581 msgid "Edit folder" msgstr "Upraviť priečinok" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:583 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:583 msgid "Edit bookmark" msgstr "Upraviť záložku" -#: ../midori/midori-browser.c:573 +#: ../midori/midori-browser.c:613 msgid "_Title:" msgstr "_Názov:" -#: ../midori/midori-browser.c:586 -#: ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:626 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Poznámka:" -#: ../midori/midori-browser.c:605 -#: ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:645 ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:624 +#: ../midori/midori-browser.c:664 msgid "_Folder:" msgstr "_Priečinok:" -#: ../midori/midori-browser.c:629 -#: ../midori/midori-browser.c:670 +#: ../midori/midori-browser.c:669 ../midori/midori-browser.c:710 msgid "Toplevel folder" msgstr "Priečinok najvyššej úrovne" -#: ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:786 msgid "Save file as" msgstr "Uložiť súbor ako" -#: ../midori/midori-browser.c:1523 +#: ../midori/midori-browser.c:1133 +#, c-format +msgid "The file %s has been downloaded." +msgstr "Súbor %s bol stiahnutý." + +#: ../midori/midori-browser.c:1137 +msgid "Transfer completed" +msgstr "Prenos dokončený" + +#: ../midori/midori-browser.c:1278 +msgid "Save file" +msgstr "Uložiť súbor" + +#: ../midori/midori-browser.c:1924 msgid "Open file" msgstr "Otvoriť súbor" -#: ../midori/midori-browser.c:2803 -#: ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:809 +#: ../midori/midori-browser.c:3300 ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:812 msgid "Open all in _Tabs" -msgstr "" +msgstr "Otvoriť všetky na _kartách" -#: ../midori/midori-browser.c:2810 -#: ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:815 +#: ../midori/midori-browser.c:3307 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Otvoriť na novej _karte" -#: ../midori/midori-browser.c:2813 -#: ../panels/midori-bookmarks.c:790 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:3310 ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:820 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Otvoriť v novom _okne" -#: ../midori/midori-browser.c:2974 +#: ../midori/midori-browser.c:3610 msgid "Clear Private Data" msgstr "Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:2977 +#: ../midori/midori-browser.c:3614 msgid "_Clear private data" msgstr "_Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3627 msgid "Clear the following data:" msgstr "Odstrániť nasledujúce údaje:" -#: ../midori/midori-browser.c:2998 -#: ../midori/midori-preferences.c:640 +#: ../midori/midori-browser.c:3637 ../midori/midori-preferences.c:675 #: ../panels/midori-history.c:108 msgid "History" msgstr "História" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3642 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3647 msgid "'Flash' Cookies" msgstr "'Flash' Cookies" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3652 msgid "Website icons" msgstr "Ikony webových stránok" -#: ../midori/midori-browser.c:3093 -msgid "A lightweight web browser." -msgstr "" +#: ../midori/midori-browser.c:3657 ../midori/sokoke.c:874 +msgid "_Closed Tabs and Windows" +msgstr "_Zatvorené karty a okná" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3740 +msgid "A lightweight web browser." +msgstr "Ľahký internetový prehliadač." + +#: ../midori/midori-browser.c:3748 msgid "translator-credits" msgstr "Robert Hartl 2009" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3981 msgid "_File" msgstr "_Súbor" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3984 msgid "Open a new window" msgstr "Otvoriť nové okno" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3987 msgid "Open a new tab" msgstr "Otvoriť novú kartu" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3990 msgid "Open a file" msgstr "Otvoriť súbor" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3993 msgid "Save to a file" -msgstr "" +msgstr "Uložiť do súboru" -#: ../midori/midori-browser.c:3316 +#: ../midori/midori-browser.c:3995 +msgid "Add to Speed _dial" +msgstr "Pridať do _Rýchleho prístupu" + +#: ../midori/midori-browser.c:3996 +msgid "Add shortcut to speed dial" +msgstr "Pridať odkaz do rýchleho prístupu" + +#: ../midori/midori-browser.c:3998 msgid "_Close Tab" msgstr "_Zatvoriť kartu" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3999 msgid "Close the current tab" -msgstr "" +msgstr "Zatvoriť aktívnu kartu" -#: ../midori/midori-browser.c:3319 +#: ../midori/midori-browser.c:4001 msgid "C_lose Window" -msgstr "Zatvoriť okno" +msgstr "_Zatvoriť okno" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:4002 msgid "Close this window" -msgstr "" +msgstr "Zatvoriť toto okno" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:4005 msgid "Print the current page" -msgstr "" +msgstr "Vytlačiť aktuálnu stránku" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:4008 msgid "Quit the application" -msgstr "" +msgstr "Ukončiť aplikáciu" -#: ../midori/midori-browser.c:3328 +#: ../midori/midori-browser.c:4010 msgid "_Edit" msgstr "_Upraviť" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:4013 msgid "Cut the selected text" -msgstr "" +msgstr "Vystrihnúť vybraný text" -#: ../midori/midori-browser.c:3334 -#: ../midori/midori-browser.c:3337 +#: ../midori/midori-browser.c:4016 ../midori/midori-browser.c:4019 msgid "Copy the selected text" -msgstr "" +msgstr "Kopírovať vybraný text" -#: ../midori/midori-browser.c:3340 +#: ../midori/midori-browser.c:4022 msgid "Paste text from the clipboard" -msgstr "" +msgstr "Prilepiť vybraný text" -#: ../midori/midori-browser.c:3343 +#: ../midori/midori-browser.c:4025 msgid "Delete the selected text" msgstr "Odstrániť označený text" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:4028 msgid "Select all text" msgstr "Vybrať všetok text" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:4031 msgid "Find a word or phrase in the page" -msgstr "" +msgstr "Hľadať slovo alebo frázu na stránke" -#: ../midori/midori-browser.c:3351 +#: ../midori/midori-browser.c:4033 msgid "Find _Next" msgstr "Hľadať _ďalšie" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:4034 msgid "Find the next occurrence of a word or phrase" -msgstr "" +msgstr "Hľadať ďalší výskyt slova alebo frázy" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:4036 msgid "Find _Previous" -msgstr "" +msgstr "Hľadať _predchádzajúce" -#: ../midori/midori-browser.c:3355 +#: ../midori/midori-browser.c:4037 msgid "Find the previous occurrence of a word or phrase" -msgstr "" +msgstr "Hľadať predchádzajúce slovo alebo frázu" -#: ../midori/midori-browser.c:3358 -msgid "_Quick Find" -msgstr "_Rýchle hľadanie" - -#: ../midori/midori-browser.c:3359 -msgid "Quickly jump to a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:4041 msgid "Configure the application preferences" -msgstr "" +msgstr "Nastaviť možnosti aplikácie" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:4043 msgid "_View" msgstr "_Zobraziť" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:4044 msgid "_Toolbars" msgstr "_Panely s nástrojmi" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:4056 msgid "Increase the zoom level" -msgstr "" +msgstr "Priblížiť" -#: ../midori/midori-browser.c:3380 +#: ../midori/midori-browser.c:4059 msgid "Decrease the zoom level" -msgstr "" +msgstr "Oddialiť" -#: ../midori/midori-browser.c:3383 +#: ../midori/midori-browser.c:4062 msgid "Reset the zoom level" -msgstr "" +msgstr "Nastaviť pôvodné priblíženie" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:4063 msgid "_Encoding" msgstr "_Kódovanie" -#: ../midori/midori-browser.c:3386 -msgid "_Automatic" -msgstr "_Automatické" - -#: ../midori/midori-browser.c:3389 -#: ../midori/midori-websettings.c:200 -msgid "Chinese (BIG5)" -msgstr "Čínske (BIG5)" - -#: ../midori/midori-browser.c:3392 -#: ../midori/midori-websettings.c:201 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japonské (SHIFT_JIS)" - -#: ../midori/midori-browser.c:3395 -#: ../midori/midori-websettings.c:202 -msgid "Russian (KOI8-R)" -msgstr "Ruské (KOI8-R)" - -#: ../midori/midori-browser.c:3398 -#: ../midori/midori-websettings.c:203 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-browser.c:3401 -#: ../midori/midori-websettings.c:204 -msgid "Western (ISO-8859-1)" -msgstr "Západné (ISO-8859-1)" - -#: ../midori/midori-browser.c:3404 -#: ../midori/midori-websettings.c:205 -#: ../midori/midori-websettings.c:277 -msgid "Custom..." -msgstr "Vlastné..." - -#: ../midori/midori-browser.c:3407 -#: ../midori/midori-view.c:1138 -msgid "View _Source" +#: ../midori/midori-browser.c:4065 +msgid "View So_urce" msgstr "Zobraziť _zdrojový kód" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:4066 msgid "View the source code of the page" -msgstr "" +msgstr "Zobraziť zdrojový kód stránky" -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:4068 msgid "View Selection Source" -msgstr "" +msgstr "Zobraziť zdrojový kód výberu" -#: ../midori/midori-browser.c:3411 +#: ../midori/midori-browser.c:4069 msgid "View the source code of the selection" -msgstr "" +msgstr "Zobraziť zdrojový kód vybraného textu" -#: ../midori/midori-browser.c:3415 +#: ../midori/midori-browser.c:4073 msgid "Toggle fullscreen view" -msgstr "" +msgstr "Prepnúť zobrazenie na celú obrazovku" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:4075 msgid "_Go" msgstr "_Ísť" -#: ../midori/midori-browser.c:3420 +#: ../midori/midori-browser.c:4078 msgid "Go back to the previous page" msgstr "Späť na predchádzajúcu stránku" -#: ../midori/midori-browser.c:3423 +#: ../midori/midori-browser.c:4081 msgid "Go forward to the next page" msgstr "Dopredu na nasledujúcu stránku" -#: ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:4084 msgid "Go to your homepage" msgstr "Ísť na domovskú stránku" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:4086 msgid "Empty Trash" msgstr "Vysypať kôš" -#: ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:4087 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3431 -#: ../midori/midori-view.c:1110 -msgid "Undo Close Tab" -msgstr "" +#: ../midori/midori-browser.c:4089 +msgid "Undo _Close Tab" +msgstr "Obnoviť _zatvorenú kartu" -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:4090 msgid "Open the last closed tab" msgstr "Otvoriť naposledy zatvorenú kartu" -#: ../midori/midori-browser.c:3436 -#: ../panels/midori-bookmarks.c:232 +#: ../midori/midori-browser.c:4094 ../panels/midori-bookmarks.c:231 msgid "Add a new bookmark" msgstr "Pridať novú záložku" -#: ../midori/midori-browser.c:3438 -#: ../panels/midori-bookmarks.c:261 -msgid "Add a new folder" +#: ../midori/midori-browser.c:4096 +msgid "Add a new _folder" msgstr "Pridať nový priečinok" -#: ../midori/midori-browser.c:3439 +#: ../midori/midori-browser.c:4097 msgid "Add a new bookmark folder" -msgstr "" +msgstr "Pridať nový priečinok do záložiek" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:4098 msgid "_Tools" msgstr "_Nástroje" -#: ../midori/midori-browser.c:3442 -#: ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4100 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Správca vyhľadávacích modulov" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:4101 msgid "Add, edit and remove search engines..." -msgstr "" +msgstr "Pridáva, upravuje a maže vyhľadávacie moduly..." -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:4104 msgid "_Clear Private Data" msgstr "_Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:3447 +#: ../midori/midori-browser.c:4105 msgid "Clear private data..." -msgstr "" +msgstr "Odstráni súkromné údaje..." -#: ../midori/midori-browser.c:3451 +#: ../midori/midori-browser.c:4109 msgid "_Previous Tab" msgstr "_Predchádzajúca karta" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:4110 msgid "Switch to the previous tab" -msgstr "" +msgstr "Prepnúť na predchádzajúcu kartu" -#: ../midori/midori-browser.c:3454 +#: ../midori/midori-browser.c:4112 msgid "_Next Tab" msgstr "_Ďalšia karta" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:4113 msgid "Switch to the next tab" -msgstr "" +msgstr "Prepnúť na nasledujúcu kartu" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:4115 msgid "_Help" msgstr "_Pomocník" -#: ../midori/midori-browser.c:3459 +#: ../midori/midori-browser.c:4117 msgid "_Contents" msgstr "_Obsah pomocníka" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:4118 msgid "Show the documentation" msgstr "Zobraziť dokumentáciu" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:4120 msgid "_Frequent Questions" msgstr "_Časté otázky" -#: ../midori/midori-browser.c:3463 +#: ../midori/midori-browser.c:4121 msgid "Show the Frequently Asked Questions" msgstr "Zobraziť Často kladené otázky" -#: ../midori/midori-browser.c:3465 +#: ../midori/midori-browser.c:4123 msgid "_Report a Bug" msgstr "_Ohlásiť chybu" -#: ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:4124 msgid "Open Midori's bug tracker" -msgstr "" +msgstr "Otvorí stránku pre hlásenie chýb" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:4127 msgid "Show information about the program" -msgstr "" +msgstr "Zobrazí informácie o programe" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:4134 msgid "P_rivate Browsing" msgstr "_Súkromné prehliadanie" -#: ../midori/midori-browser.c:3477 +#: ../midori/midori-browser.c:4135 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3482 +#: ../midori/midori-browser.c:4140 msgid "_Menubar" -msgstr "_Ponukový panel" +msgstr "Panel _ponuky" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:4141 msgid "Show menubar" -msgstr "Zobraziť ponukový panel" +msgstr "Zobraziť panel ponuky" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:4144 msgid "_Navigationbar" msgstr "_Navigačný panel" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:4145 msgid "Show navigationbar" msgstr "Zobraziť navigačný panel" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:4148 msgid "Side_panel" msgstr "_Bočný panel" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:4149 msgid "Show sidepanel" msgstr "Zobraziť bočný panel" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:4152 msgid "_Bookmarkbar" msgstr "Panel _záložiek" -#: ../midori/midori-browser.c:3495 +#: ../midori/midori-browser.c:4153 msgid "Show bookmarkbar" msgstr "Zobraziť panel záložiek" -#: ../midori/midori-browser.c:3498 +#: ../midori/midori-browser.c:4156 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3499 +#: ../midori/midori-browser.c:4157 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3502 +#: ../midori/midori-browser.c:4160 msgid "_Statusbar" msgstr "_Stavový riadok" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:4161 msgid "Show statusbar" msgstr "Zobraziť stavový riadok" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4168 +msgid "_Automatic" +msgstr "_Automatické" + +#: ../midori/midori-browser.c:4171 ../midori/midori-websettings.c:212 +msgid "Chinese (BIG5)" +msgstr "Čínske (BIG5)" + +#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic +#: ../midori/midori-browser.c:4175 +msgid "Japanese (SHIFT__JIS)" +msgstr "Japonské (SHIFT_JIS)" + +#: ../midori/midori-browser.c:4178 ../midori/midori-websettings.c:214 +msgid "Russian (KOI8-R)" +msgstr "Ruské (KOI8-R)" + +#: ../midori/midori-browser.c:4181 ../midori/midori-websettings.c:215 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:4184 ../midori/midori-websettings.c:216 +msgid "Western (ISO-8859-1)" +msgstr "Západné (ISO-8859-1)" + +#: ../midori/midori-browser.c:4187 ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:289 +msgid "Custom..." +msgstr "Vlastné..." + +#: ../midori/midori-browser.c:4623 msgid "_Separator" msgstr "_Oddeľovač" -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:4630 msgid "_Location..." msgstr "_Umiestnenie..." -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4632 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3970 +#: ../midori/midori-browser.c:4656 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4658 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4679 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:4006 +#: ../midori/midori-browser.c:4694 msgid "_Recently visited pages" msgstr "_Nedávno navštívené stránky" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4696 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:4021 -#: ../midori/sokoke.c:781 +#: ../midori/midori-browser.c:4711 ../midori/sokoke.c:863 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:4713 msgid "Show the saved bookmarks" -msgstr "" +msgstr "Zobrazí uložené záložky" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4728 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:4730 msgid "Show a list of all open tabs" msgstr "Zobraziť zoznam všetkých otvorených kariet" +#: ../midori/midori-browser.c:4744 +msgid "_Menu" +msgstr "_Ponuka" + +#: ../midori/midori-browser.c:4746 +msgid "Menu" +msgstr "_Ponuka" + #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4205 +#: ../midori/midori-browser.c:4921 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4946 msgid "Previous" msgstr "Predchádzajúce" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4951 msgid "Next" msgstr "Ďalšie" -#: ../midori/midori-browser.c:4240 +#: ../midori/midori-browser.c:4956 msgid "Match Case" msgstr "Rozlišovať veľkosť písma" -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4964 msgid "Highlight Matches" msgstr "Zvýrazniť" -#: ../midori/midori-browser.c:4258 +#: ../midori/midori-browser.c:4974 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4598 +#: ../midori/midori-browser.c:5009 +#: ../extensions/cookie-manager/cookie-manager-page.c:109 +msgid "Delete All" +msgstr "Odstrániť všetky" + +#: ../midori/midori-browser.c:5329 #, c-format msgid "Unexpected setting '%s'" msgstr "" -#: ../midori/midori-panel.c:309 +#: ../midori/midori-locationaction.c:900 +#, fuzzy, c-format +msgid "Search with %s" +msgstr "Hľadať _pomocou" + +#: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "" -#: ../midori/midori-panel.c:311 -msgid "Whether to detach the chosen panel from the window" +#: ../midori/midori-panel.c:343 ../midori/midori-panel.c:508 +msgid "Align sidepanel to the right" msgstr "" -#: ../midori/midori-panel.c:321 -#: ../midori/midori-websettings.c:531 -msgid "Align sidepanel on the right" -msgstr "" - -#: ../midori/midori-panel.c:323 -#: ../midori/midori-websettings.c:532 -msgid "Whether to align the sidepanel on the right" -msgstr "" - -#: ../midori/midori-panel.c:333 -#: ../midori/midori-panel.c:334 +#: ../midori/midori-panel.c:353 ../midori/midori-panel.c:354 msgid "Close panel" msgstr "Zatvoriť panel" -#: ../midori/midori-websettings.c:183 -#: ../midori/midori-view.c:1949 +#: ../midori/midori-panel.c:509 +msgid "Align sidepanel to the left" +msgstr "" + +#: ../midori/midori-websettings.c:195 ../midori/midori-view.c:2271 msgid "Blank page" msgstr "Prázdnu stránku" -#: ../midori/midori-websettings.c:184 -#: ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:196 ../midori/midori-websettings.c:563 msgid "Homepage" msgstr "Domovskú stránku" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:197 msgid "Last open pages" msgstr "Naposledy otvorené stránky" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:213 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japonské (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:232 msgid "New tab" msgstr "na novú kartu" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:233 msgid "New window" msgstr "v novom okne" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:234 msgid "Current tab" msgstr "na otvorenej karte" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:249 msgid "Default" msgstr "Predvolený" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:250 msgid "Icons" msgstr "Ikony" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:251 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:252 msgid "Both" msgstr "Oboje" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:253 msgid "Both horizontal" msgstr "Oboje vodorovne" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:268 msgid "All cookies" msgstr "Všetky cookies" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:269 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:258 -#: ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:270 ../panels/midori-addons.c:94 +#: ../extensions/shortcuts.c:133 msgid "None" msgstr "Žiadne" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:286 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:287 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:288 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:341 msgid "Remember last window size" msgstr "Zapamätať si poslednú veľkosť okna" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:342 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:350 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:351 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:359 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:360 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:385 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:395 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:396 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:404 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:405 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:414 msgid "Show Menubar" -msgstr "" +msgstr "Zobraziť panel pouky" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:415 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:423 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:424 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:432 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:433 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:441 msgid "Show Panel" msgstr "Zobraziť panel" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:457 msgid "Show Transferbar" msgstr "" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:466 msgid "Show Statusbar" msgstr "Zobraziť stavový riadok" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style" msgstr "Štýl panelu s nástrojmi" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:493 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:494 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:509 msgid "Search engines in location completion" msgstr "" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:510 msgid "Whether to show search engines in the location completion" msgstr "" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:518 msgid "Toolbar Items" -msgstr "" +msgstr "Položky panelu nástrojov" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:519 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:527 msgid "Compact Sidepanel" -msgstr "" +msgstr "Kompaktný bočný panel" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:528 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:543 +msgid "Align sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:544 +msgid "Whether to align the sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:553 msgid "Load on Startup" msgstr "Načítať pri spustení" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:554 msgid "What to load on startup" msgstr "Čo sa načíta pri spustení" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:564 msgid "The homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:579 msgid "Show crash dialog" msgstr "Zobraziť dialóg po spadnutí" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:580 msgid "Show a dialog after Midori crashed" msgstr "Zobrazí dialóg po spadnutí Midori" -#: ../midori/midori-websettings.c:576 +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:596 +msgid "Show speed dial in new tabs" +msgstr "Zobraziť rýchly prístup na nových kartách" + +#: ../midori/midori-websettings.c:597 +#, fuzzy +msgid "Show speed dial in newly opened tabs" +msgstr "Zobraziť zoznam všetkých otvorených kariet" + +#: ../midori/midori-websettings.c:605 msgid "Download Folder" msgstr "Stiahnuť do" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:606 msgid "The folder downloaded files are saved to" msgstr "Priečinok, do ktorého sa búdu ukladať stiahnuté súbory" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:625 +msgid "Ask for the destination folder" +msgstr "Spýtať sa na cieľový priečinok" + +#: ../midori/midori-websettings.c:626 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "" + +#: ../midori/midori-websettings.c:645 +msgid "Notify when a transfer has been completed" +msgstr "Upozorniť po dokončení prenosu" + +#: ../midori/midori-websettings.c:646 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "" + +#: ../midori/midori-websettings.c:658 msgid "Download Manager" msgstr "Správca sťahovania" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:659 msgid "An external download manager" msgstr "Externý správca sťahovania" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:667 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:668 msgid "An external text editor" msgstr "Externý textový editor" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:683 msgid "News Aggregator" -msgstr "" +msgstr "Čítačka RSS" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:684 msgid "An external news aggregator" -msgstr "" +msgstr "Externá čítačka správ RSS" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:692 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:693 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:701 msgid "Preferred Encoding" msgstr "Preferované kódovanie" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:702 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:712 msgid "Always Show Tabbar" -msgstr "" +msgstr "Vždy zobrazovať karty" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:713 msgid "Always show the tabbar" -msgstr "" +msgstr "Vždy zobrazí panel kariet" -#: ../midori/midori-websettings.c:652 +#: ../midori/midori-websettings.c:721 msgid "Close Buttons on Tabs" -msgstr "" +msgstr "Zatváracie tlačidlá na kartách" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:722 msgid "Whether tabs have close buttons" -msgstr "" +msgstr "Zobrazí zatváracie tlačidlá na kartách" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:730 msgid "Open new pages in" msgstr "Otvárať nové stránky" -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:731 msgid "Where to open new pages" -msgstr "" +msgstr "Kde sa budú otvárať nové stránky" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:740 msgid "Open external pages in" -msgstr "" +msgstr "Otvárať externé súbory v" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:741 msgid "Where to open externally opened pages" -msgstr "" +msgstr "Kde sa budú otvárať externé stránky" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:754 msgid "Middle click opens Selection" -msgstr "" +msgstr "Kliknutím prostredného. tlačítka otvoriť vybraný text" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:755 msgid "Load an address from the selection via middle click" -msgstr "" +msgstr "Prostredné tlačítko myši otvorí adresu, ktorá je vo vybranom texte" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:763 msgid "Open tabs in the background" -msgstr "" +msgstr "Otvárať karty na pozadí" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:764 msgid "Whether to open new tabs in the background" -msgstr "" +msgstr "Otvorené karty sa otvárajú na pozadí" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:772 msgid "Open Tabs next to Current" -msgstr "" +msgstr "Otvoriť karty vedľa aktívnej" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:773 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:712 +#: ../midori/midori-websettings.c:781 msgid "Open popups in tabs" msgstr "Otvárať vyskakujúce okná na kartách" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:782 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:798 msgid "Zoom Text and Images" -msgstr "" +msgstr "Zväčšovať text aj obrázky" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:799 msgid "Whether to zoom text and images" -msgstr "" +msgstr "Upravovať text aj obrázky pri menení veľkosti?" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:814 msgid "Find inline while typing" -msgstr "" +msgstr "Hľadať pri písaní" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:815 msgid "Whether to automatically find inline while typing" -msgstr "" +msgstr "Hľadať text pri písaní?" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:823 msgid "Accept cookies" msgstr "Povoliť cookies" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:824 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:833 msgid "Original cookies only" -msgstr "" +msgstr "Len originálne cookies" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:834 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:842 msgid "Maximum cookie age" -msgstr "" +msgstr "Uchovávať cookies maximálne" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:843 msgid "The maximum number of days to save cookies for" -msgstr "" +msgstr "Maximálny počet dní, pre ktoré sú cookies platné" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:853 msgid "Remember last visited pages" -msgstr "Zapamätať si nedávno navštívené stránky" +msgstr "Zapamätať si naposledy navštívené stránky" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:854 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:862 msgid "Maximum history age" -msgstr "" +msgstr "Maximálna dĺžka histórie" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:863 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:871 msgid "Remember last form inputs" -msgstr "" +msgstr "Pamätať si vložený text" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:872 msgid "Whether the last form inputs are saved" -msgstr "" +msgstr "Povoli pamätanie si vloženého textu do vstupných polí" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:880 msgid "Remember last downloaded files" -msgstr "" +msgstr "Pamätať si naposledy stiahnuté súbory" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:881 msgid "Whether the last downloaded files are saved" -msgstr "" +msgstr "Poli pamätanie si zoznam súborov, ktoré boli naposledy stiahnuté" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:891 msgid "Proxy Server" msgstr "Proxy Server" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:892 msgid "The proxy server used for HTTP connections" -msgstr "" +msgstr "Nastavenie proxy serveru pre HTTP spojenie" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:907 msgid "Detect proxy server automatically" -msgstr "Automaticky detegovať proxy server" +msgstr "Zistiť proxy server automaticky" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:908 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "" +msgstr "Povolí automatické zisťovanie proxy servera" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:924 msgid "Identify as" msgstr "Identifikovať sa ako" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:925 msgid "What to identify as to web pages" -msgstr "" +msgstr "Ako sa hlási webovým stránkam" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:941 msgid "Identification string" msgstr "Identifikačný reťazec" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:942 msgid "The application identification string" -msgstr "" +msgstr "Identifikačný reťazec aplikácie" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:950 msgid "Cache size" msgstr "Veľkosť vyrovnávacej pamäte (cache)" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:951 msgid "The allowed size of the cache" +msgstr "Povolená veľkosť vyrovnávacej pamäte" + +#: ../midori/midori-websettings.c:966 +msgid "Clear private data" +msgstr "Odstrániť súkromné údaje" + +#: ../midori/midori-websettings.c:967 +msgid "The private data selected for deletion" msgstr "" +#: ../midori/midori-view.c:750 +#, fuzzy, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Sedenie nie je možné načítať: %s\n" + +#. 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:2903 +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Chyba" + +#: ../midori/midori-view.c:755 +msgid "Try again" +msgstr "Skúsiť znovu" + #. 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:637 -#: ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:785 ../midori/midori-view.c:2907 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:976 +#: ../midori/midori-view.c:1172 msgid "Open _Link" msgstr "Otvoriť _odkaz" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:1174 msgid "Open Link in New _Tab" msgstr "Otvoriť odkaz na novej _karte" -#: ../midori/midori-view.c:995 +#: ../midori/midori-view.c:1191 msgid "Open Link in New _Window" msgstr "Otvoriť odkaz v novom _okne" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:1197 msgid "_Download Link destination" msgstr "_Stiahnuť cieľ odkazu" -#: ../midori/midori-view.c:1010 +#: ../midori/midori-view.c:1203 msgid "_Save Link destination" msgstr "_Uložiť cieľ odkazu" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1212 msgid "Download with Download _Manager" msgstr "Stiahnuť pomocou _správcu sťahovania" -#: ../midori/midori-view.c:1048 +#: ../midori/midori-view.c:1241 msgid "Search _with" msgstr "Hľadať _pomocou" -#: ../midori/midori-view.c:1076 +#: ../midori/midori-view.c:1269 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:1086 +#: ../midori/midori-view.c:1279 msgid "Open Address in New _Tab" msgstr "Otvoriť adresu v novej karte" -#: ../midori/midori-view.c:1234 +#: ../midori/midori-view.c:1463 msgid "Open or download file" msgstr "Otvoriť alebo stiahnuť súbor" -#: ../midori/midori-view.c:1251 +#: ../midori/midori-view.c:1480 #, c-format msgid "File Type: '%s'" msgstr "Typ súboru: '%s'" -#: ../midori/midori-view.c:1254 +#: ../midori/midori-view.c:1483 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ súboru: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1487 #, c-format msgid "Open %s" msgstr "Otvoriť %s" -#: ../midori/midori-view.c:1661 +#: ../midori/midori-view.c:1905 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1806 +#: ../midori/midori-view.c:2095 +msgid "Speed dial" +msgstr "Rýchly prístup" + +#: ../midori/midori-view.c:2096 +msgid "Click to add a shortcut" +msgstr "Kliknite pre pridanie odkazu" + +#: ../midori/midori-view.c:2097 +msgid "Enter shortcut address" +msgstr "" + +#: ../midori/midori-view.c:2098 +msgid "Enter shortcut title" +msgstr "" + +#: ../midori/midori-view.c:2099 +#, fuzzy +msgid "Are you sure you want to delete this shortcut?" +msgstr "Naozaj si prajete odstrániť všetky cookies?" + +#: ../midori/midori-view.c:2129 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:1822 +#: ../midori/midori-view.c:2146 #, c-format msgid "No documentation installed" msgstr "" +#: ../midori/midori-view.c:2493 +msgid "_Duplicate Tab" +msgstr "" + #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" @@ -1359,161 +1458,201 @@ msgstr "Spustenie" msgid "Use current page as homepage" msgstr "Použiť aktuálnu ako domovskú stránku" -#: ../midori/midori-preferences.c:423 -#: ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Prenosy" #. Page "Appearance" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Vzhľad" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Nastavenia písma" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Štandardná rodina písma" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:453 +#, fuzzy +msgid "Fixed-width Font Family" +msgstr "Štandardná rodina písma" + +#: ../midori/midori-preferences.c:457 +msgid "The font family used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" msgstr "Minimálna veľkosť písma" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:473 msgid "Encoding" msgstr "Kódovanie" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" msgstr "" #. Page "Behavior" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "Správanie" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:484 msgid "Features" -msgstr "" +msgstr "Funkcie" -#: ../midori/midori-preferences.c:511 -#: ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:487 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Automaticky načítať obrázky" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:488 msgid "Load and display images automatically" -msgstr "" +msgstr "Načíta a zobrazí obrázky automaticky" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:491 msgid "Shrink images automatically" -msgstr "" +msgstr "Automaticky zmenšovať obrázky" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:492 msgid "Automatically shrink standalone images to fit" -msgstr "" +msgstr "Automaticky zmenší obrázky, aby sa zmestili" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:495 msgid "Print background images" -msgstr "" +msgstr "Tlačiť obrázky na pozadí" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:496 msgid "Whether background images should be printed" -msgstr "" +msgstr "Povolí tlačenie obrázkov na pozadí" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:499 msgid "Resizable text areas" -msgstr "" +msgstr "Roztiahnuteľné oblasti pre text" -#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:500 msgid "Whether text areas are resizable" -msgstr "" +msgstr "Povolí rozťahovanie textových oblastí podľa potreby" -#: ../midori/midori-preferences.c:527 -#: ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Povoliť skripty" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:504 msgid "Enable embedded scripting languages" -msgstr "" +msgstr "Povolí vložené skriptové jazyky" -#: ../midori/midori-preferences.c:531 -#: ../extensions/statusbar-features.c:72 -msgid "Enable plugins" -msgstr "Povoliť pluginy" +#: ../midori/midori-preferences.c:507 ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Povoliť pluginy z Netscape (Mozilly)" -#: ../midori/midori-preferences.c:532 -msgid "Enable embedded plugin objects" -msgstr "" +#: ../midori/midori-preferences.c:508 +msgid "Enable embedded Netscape plugin objects" +msgstr "Povolí pluginové objekty prehliadača Netscape (Mozilla)" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:511 msgid "Enforce 96 dots per inch" msgstr "Vynútiť 96 bodov na palec" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:512 msgid "Enforce a video dot density of 96 DPI" -msgstr "" +msgstr "Vnúti rozlíšenie obrazu 96 bodov na palec" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:515 msgid "Enable developer tools" msgstr "Povoliť vývojárske nástroje" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:516 msgid "Enable special extensions for developers" +msgstr "Povoliť špeciálne rozšírenia pre vývojárov" + +#: ../midori/midori-preferences.c:523 +msgid "Spell Checking" +msgstr "Kontrola pravopisu" + +#: ../midori/midori-preferences.c:526 +msgid "Enable Spell Checking" +msgstr "Povoliť kontrolu pravopisu" + +#: ../midori/midori-preferences.c:527 +msgid "Enable spell checking while typing" +msgstr "Povoliť kontrolu pravopisu pri písaní" + +#. 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 "" +"Čiarkou oddelený zoznam jazykov použitých pre kontrolu pravopisu, napr. " +"\"sk_SK, en_GB\"" #. Page "Interface" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:536 msgid "Interface" msgstr "Rozhranie" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:537 msgid "Navigationbar" -msgstr "" +msgstr "Navigačný panel" -#: ../midori/midori-preferences.c:560 +#: ../midori/midori-preferences.c:548 msgid "Browsing" msgstr "Prehliadanie" +#. Page "Applications" +#: ../midori/midori-preferences.c:578 +msgid "Applications" +msgstr "Aplikácie" + +#: ../midori/midori-preferences.c:579 +msgid "External applications" +msgstr "Externé aplikácie" + #. Page "Network" -#: ../midori/midori-preferences.c:590 -#: ../midori/midori-preferences.c:591 +#: ../midori/midori-preferences.c:625 ../midori/midori-preferences.c:626 msgid "Network" msgstr "Sieť" -#: ../midori/midori-preferences.c:618 +#: ../midori/midori-preferences.c:653 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:658 msgid "Privacy" msgstr "Súkromie" -#: ../midori/midori-preferences.c:624 +#: ../midori/midori-preferences.c:659 msgid "Web Cookies" -msgstr "" +msgstr "Webové Cookies" -#: ../midori/midori-preferences.c:637 -#: ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682 msgid "days" -msgstr "" +msgstr "dní" -#: ../midori/midori-searchaction.c:484 -#: ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:331 msgid "Empty" -msgstr "" +msgstr "Prázdne" #: ../midori/midori-searchaction.c:904 msgid "Add search engine" @@ -1535,182 +1674,164 @@ msgstr "_Ikona:" msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1195 +#: ../midori/midori-searchaction.c:1209 msgid "Manage Search Engines" msgstr "Správca vyhľadávacích modulov" -#: ../midori/midori-searchaction.c:1292 +#: ../midori/midori-searchaction.c:1308 msgid "Use as _default" msgstr "Použiť ako _predvolený" -#: ../midori/sokoke.c:117 -#: ../midori/sokoke.c:129 +#: ../midori/sokoke.c:172 ../midori/sokoke.c:184 msgid "Could not run external program." -msgstr "" +msgstr "Nie je možné spustiť externý program" -#. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:448 -msgid "Warning: You are using a superuser account!" -msgstr "" - -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:862 msgid "_Bookmark" msgstr "_Záložka" -#: ../midori/sokoke.c:782 -msgid "_Add Bookmark" -msgstr "_Pridať záložku" +#: ../midori/sokoke.c:864 +msgid "Add Boo_kmark" +msgstr "Pridať záložku" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:865 msgid "_Console" msgstr "_Konzola" -#: ../midori/sokoke.c:784 +#: ../midori/sokoke.c:866 msgid "_Extensions" msgstr "_Rozšírenia" -#: ../midori/sokoke.c:785 +#: ../midori/sokoke.c:867 msgid "_History" msgstr "_História" -#: ../midori/sokoke.c:786 +#: ../midori/sokoke.c:868 msgid "_Homepage" msgstr "_Domovská stránka" -#: ../midori/sokoke.c:787 +#: ../midori/sokoke.c:869 msgid "_Userscripts" -msgstr "" +msgstr "_Užívateľské skripty" -#: ../midori/sokoke.c:788 +#: ../midori/sokoke.c:870 msgid "User_styles" -msgstr "" +msgstr "_Užívateľské štýly" -#: ../midori/sokoke.c:789 +#: ../midori/sokoke.c:871 msgid "New _Tab" msgstr "Nová _karta" -#: ../midori/sokoke.c:790 +#: ../midori/sokoke.c:872 msgid "_Transfers" msgstr "_Prenosy" -#: ../midori/sokoke.c:791 -msgid "P_lugins" -msgstr "P_luginy" +#: ../midori/sokoke.c:873 +msgid "Netscape p_lugins" +msgstr "Pluginy _Netscape" -#: ../midori/sokoke.c:792 -msgid "_Closed Tabs and Windows" -msgstr "_Zatvorené karty a okná" - -#: ../midori/sokoke.c:793 +#: ../midori/sokoke.c:875 msgid "New _Window" msgstr "Nové _okno" -#: ../panels/midori-addons.c:95 -#: ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" -msgstr "" +msgstr "Užívateľské skripty" -#: ../panels/midori-addons.c:96 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 msgid "Userstyles" -msgstr "" +msgstr "Užívateľské štýly" -#: ../panels/midori-addons.c:927 -#: ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "_Povolené" - -#: ../panels/midori-addons.c:928 -#: ../panels/midori-extensions.c:145 -msgid "Enable" -msgstr "Povolené" - -#: ../panels/midori-addons.c:937 -#: ../panels/midori-extensions.c:154 -msgid "_Disable" -msgstr "_Zakázané" - -#: ../panels/midori-addons.c:938 -#: ../panels/midori-extensions.c:155 -msgid "Disable" -msgstr "Zakázané" - -#: ../panels/midori-bookmarks.c:107 +#: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:240 +#: ../panels/midori-bookmarks.c:239 msgid "Edit the selected bookmark" msgstr "Upraviť vybranú záložku" -#: ../panels/midori-bookmarks.c:248 +#: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" msgstr "Vymazať označenú záložku" -#: ../panels/midori-bookmarks.c:593 +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "Pridať nový priečinok" + +#: ../panels/midori-bookmarks.c:592 msgid "Separator" -msgstr "" +msgstr "Oddeľovač" #: ../panels/midori-console.c:87 msgid "Console" msgstr "Konzola" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Rozšírenia" -#: ../panels/midori-history.c:163 +#: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" -msgstr "" +msgstr "Naozaj si želáte vymazať celú históriu?" -#: ../panels/midori-history.c:218 +#: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" msgstr "" -#: ../panels/midori-history.c:227 +#: ../panels/midori-history.c:226 msgid "Delete the selected history item" msgstr "Odstrániť označenú položku v histórii" -#: ../panels/midori-history.c:235 +#: ../panels/midori-history.c:234 msgid "Clear the entire history" msgstr "Zmazať celú históriu" -#: ../panels/midori-history.c:600 -#, c-format +#: ../panels/midori-history.c:601 msgid "A week ago" msgstr "Pred týždňom" #: ../panels/midori-history.c:606 #, c-format -msgid "%d days ago" -msgstr "Pred %d dňami" +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "Pred %d dňom" +msgstr[1] "Pred %d dňami" +msgstr[2] "Pred %d dňami" -#: ../panels/midori-history.c:613 +#: ../panels/midori-history.c:614 msgid "Today" msgstr "Dnes" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:616 msgid "Yesterday" msgstr "Včera" -#: ../panels/midori-plugins.c:87 -msgid "Plugins" -msgstr "Pluginy" +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "Pluginy Netscape" -#: ../panels/midori-transfers.c:256 +#: ../panels/midori-transfers.c:271 #, c-format msgid "%s of %s" msgstr "%s z %s" +#: ../panels/midori-transfers.c:479 +msgid "Open Destination _Folder" +msgstr "Otvoriť cieľový _priečinok" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "" + #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" -msgstr "" +msgstr "Vyžadovaná autentifikácia" #: ../katze/katze-http-auth.c:113 msgid "" "A username and a password are required\n" "to open this location:" -msgstr "" +msgstr "Pre otvorenie je požadované užívateľské meno a heslo" #: ../katze/katze-http-auth.c:127 msgid "Username" @@ -1732,40 +1853,85 @@ msgstr "" #: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" -msgstr "" +msgstr "Snímky animácie sú porušené" -#: ../katze/katze-utils.c:183 -#: ../katze/katze-utils.c:395 +#: ../katze/katze-utils.c:200 ../katze/katze-utils.c:407 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:215 -#: ../katze/katze-utils.c:254 +#: ../katze/katze-utils.c:235 ../katze/katze-utils.c:264 msgid "Choose file" -msgstr "" +msgstr "Vyberte súbor" -#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:250 msgid "Choose folder" +msgstr "Vyberte priečinok" + +#: ../extensions/adblock.c:78 +msgid "Configure Advertisement filters" +msgstr "Nastaviť filtre na reklamu" + +#: ../extensions/adblock.c:214 +msgid "Configure _Advertisement filters..." msgstr "" -#: ../extensions/colorful-tabs.c:104 +#: ../extensions/adblock.c:374 +msgid "Advertisement blocker" +msgstr "Blokovač reklamy" + +#: ../extensions/adblock.c:375 +msgid "Block advertisements according to a filter list" +msgstr "" + +#: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" -msgstr "" +msgstr "Ofarbiť kartdy" -#: ../extensions/colorful-tabs.c:140 +#: ../extensions/colorful-tabs.c:151 msgid "Colorful Tabs" -msgstr "Farebné karty" +msgstr "Ofarebné karty" -#: ../extensions/colorful-tabs.c:141 +#: ../extensions/colorful-tabs.c:152 msgid "Tint each tab distinctly" +msgstr "Ofarbiť každú kartu samostatne" + +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "Správca 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 "" -#: ../extensions/cookie-manager.c:201 +#: ../extensions/cookie-manager/cookie-manager-page.c:126 +msgid "Expand All" +msgstr "Rozbaliť všetko" + +#: ../extensions/cookie-manager/cookie-manager-page.c:133 +msgid "Collapse All" +msgstr "Zbaliť všetko" + +#: ../extensions/cookie-manager/cookie-manager-page.c:460 +msgid "Do you really want to delete all cookies?" +msgstr "Naozaj si prajete odstrániť všetky cookies?" + +#: ../extensions/cookie-manager/cookie-manager-page.c:462 +msgid "Question" +msgstr "Otázka" + +#: ../extensions/cookie-manager/cookie-manager-page.c:471 +msgid "Only cookies which match the filter will be deleted." +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" msgstr "" -#: ../extensions/cookie-manager.c:204 +#: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format msgid "" "Host: %s\n" @@ -1782,90 +1948,237 @@ msgstr "" "Bezpečný: %s\n" "Vyprší: %s" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" msgstr "Áno" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" msgstr "Nie" -#: ../extensions/cookie-manager.c:491 -msgid "Do you really want to delete all cookies?" -msgstr "Naozaj si prajete odstrániť všetky cookies?" - -#: ../extensions/cookie-manager.c:493 -msgid "Question" -msgstr "Otázka" - -#: ../extensions/cookie-manager.c:501 -msgid "Only the visible cookies are deleted which match the entered filter string." -msgstr "" - -#: ../extensions/cookie-manager.c:679 +#: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" -msgstr "" +msgstr "Názov" -#: ../extensions/cookie-manager.c:739 +#: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" msgstr "_Rozbaliť všetko" -#: ../extensions/cookie-manager.c:747 +#: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" msgstr "_Zbaliť všetko" -#: ../extensions/cookie-manager.c:818 -msgid "Delete All" -msgstr "Odstrániť všetky" - -#: ../extensions/cookie-manager.c:820 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "" - -#: ../extensions/cookie-manager.c:835 -msgid "Expand All" -msgstr "Rozbaliť všetko" - -#: ../extensions/cookie-manager.c:842 -msgid "Collapse All" -msgstr "Zbaliť všetko" - -#: ../extensions/cookie-manager.c:873 +#: ../extensions/cookie-manager/cookie-manager-page.c:923 msgid "Filter:" msgstr "Filter:" -#: ../extensions/cookie-manager.c:878 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +#: ../extensions/cookie-manager/cookie-manager-page.c:928 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" msgstr "" -#: ../extensions/cookie-manager.c:913 -#: ../extensions/cookie-manager.c:961 -msgid "Cookie Manager" -msgstr "Správca cookies" - -#: ../extensions/cookie-manager.c:945 +#: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" msgstr "Správca _cookies" -#: ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" msgstr "" -#: ../extensions/mouse-gestures/main.c:216 -msgid "Mouse Gestures" -msgstr "Mouse Gestures" +#: ../extensions/feed-panel/feed-atom.c:242 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/feed-panel/feed-atom.c:348 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "" + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Posledná aktualizácia: %s" + +#: ../extensions/feed-panel/feed-panel.c:664 +msgid "Feeds" +msgstr "Kanály" + +#: ../extensions/feed-panel/feed-panel.c:717 +msgid "Add new feed" +msgstr "Pridať nový kanál" + +#: ../extensions/feed-panel/feed-panel.c:724 +msgid "Delete feed" +msgstr "Odstrániť kanál" + +#: ../extensions/feed-panel/feed-panel.c:807 +msgid "_Feeds" +msgstr "_Kanály" + +#: ../extensions/feed-panel/feed-parse.c:185 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Chyba pri hľadaní koreňového elementu v XML dátach." + +#: ../extensions/feed-panel/feed-parse.c:225 +#, c-format +msgid "Unsupported feed format." +msgstr "Nepodporovaný formát kanálu." + +#: ../extensions/feed-panel/feed-parse.c:255 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Zlyhalo načítanie XML kanála: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "Nepodarilo sa nájsť element \"channel\" v RSS XML dátach" + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Našla sa nepodporovaná verzia RSS" + +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Kanál \"%s\" je už pridaný" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Chyba pri načítavaní kanálu \"%s\"" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "Nový kanál" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Panel kanálov" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "Čítač Atom/RSS kanálov" + +#: ../extensions/mouse-gestures/main.c:236 +msgid "Mouse Gestures" +msgstr "Gesta myšou" + +#: ../extensions/mouse-gestures/main.c:237 msgid "Control Midori by moving the mouse" msgstr "Ovládanie Midori pomocou myši" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" -msgstr "" +msgstr "Užívateľská stránka" #: ../extensions/page-holder.c:161 msgid "_Pageholder" +msgstr "_Užívateľská stránka" + +#: ../extensions/shortcuts.c:212 +msgid "Configure Keyboard shortcuts" +msgstr "Nastaviť klávesové skratky" + +#: ../extensions/shortcuts.c:309 +msgid "Configure Sh_ortcuts..." +msgstr "Nastaviť _skratky" + +#: ../extensions/shortcuts.c:341 +msgid "Shortcuts" +msgstr "Skratky" + +#: ../extensions/shortcuts.c:342 +msgid "View and edit keyboard shortcuts" +msgstr "Zobraziť a upraviť klávesové skratky" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "Obrázky" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "Skritpy" + +#: ../extensions/statusbar-features.c:149 +msgid "Statusbar Features" +msgstr "Rožšírenie stavového riadka" + +#: ../extensions/statusbar-features.c:150 +msgid "Easily toggle features on web pages on and off" +msgstr "Jednoducho zapína a vypína rozšírenia webových stránok" + +#: ../extensions/tab-panel.c:293 ../extensions/tab-panel.c:352 +msgid "Tab Panel" +msgstr "Panel záložiek" + +#: ../extensions/tab-panel.c:336 +msgid "T_ab Panel" +msgstr "Panel _záložiek" + +#: ../extensions/tab-panel.c:353 +#, fuzzy +msgid "Show tabs in a vertical panel" +msgstr "Zobraziť bočný panel" + +#: ../extensions/toolbar-editor.c:292 +msgid "Customize Toolbar" msgstr "" +#: ../extensions/toolbar-editor.c:308 +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" + +#: ../extensions/toolbar-editor.c:319 +msgid "Available Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:335 +msgid "Displayed Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:502 +msgid "Configure _Toolbar..." +msgstr "" + +#: ../extensions/toolbar-editor.c:531 +msgid "Toolbar Editor" +msgstr "Editor panelu nástrojov" + +#: ../extensions/toolbar-editor.c:532 +msgid "Easily edit the toolbar layout" +msgstr "" + +#~ msgid "_Quick Find" +#~ msgstr "_Rýchle hľadanie" + +#~ msgid "P_lugins" +#~ msgstr "P_luginy" + +#~ msgid "_Enable" +#~ msgstr "_Povolené" + +#~ msgid "Enable" +#~ msgstr "Povolené" + +#~ msgid "_Disable" +#~ msgstr "_Zakázané" + +#~ msgid "Disable" +#~ msgstr "Zakázané" + +#~ msgid "Plugins" +#~ msgstr "Pluginy" diff --git a/po/sr.po b/po/sr.po new file mode 100644 index 00000000..205000c5 --- /dev/null +++ b/po/sr.po @@ -0,0 +1,2063 @@ +# Serbian translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Милош Поповић 2009 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.7\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-06-08 11:15+0000\n" +"PO-Revision-Date: 2009-06-30 00:00+100\n" +"Last-Translator: Милош Поповић \n" +"Language-Team: Serbian (sr) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Једноставан Интернет прегледник" + +#: ../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 +msgid "Midori" +msgstr "Мидори" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Интернет прегледник" + +#: ../midori/main.c:96 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Не могу да учитам подешавања: %s\n" + +#: ../midori/main.c:151 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Вредност „%s“ је неисправна за %s" + +#: ../midori/main.c:158 ../midori/main.c:238 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Неисправна је вредност „%s“ у подешавањима" + +#: ../midori/main.c:350 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Не могу да отворим базу података: %s\n" + +#: ../midori/main.c:382 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Не могу да покренем тврдњу из базе података: %s\n" + +#: ../midori/main.c:436 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Не могу да уклоним ставку из историјата: %s\n" + +#: ../midori/main.c:460 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Не могу да очистим историјат: %s\n" + +#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Не могу да додам ставку у историјат: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:712 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Не могу да уклоним старе ставке из историјата: %s\n" + +#: ../midori/main.c:741 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Не могу да сачувам подешавања. %s" + +#: ../midori/main.c:770 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Не могу да сачувам претраживаче. %s" + +#: ../midori/main.c:789 ../midori/main.c:817 ../midori/main.c:846 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Не могу да сачувам обележиваче. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:869 ../midori/main.c:892 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Не могу да сачувам документ. %s" + +#: ../midori/main.c:965 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Не могу да сачувам сесију. %s" + +#: ../midori/main.c:1092 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Изгледа да је Мидори неисправно завршио рад приликом последњег покретања. " +"Уколико се ово често понавља покушајте неки од понуђених предлога." + +#: ../midori/main.c:1107 +msgid "Modify _preferences" +msgstr "Измени пос_тавке" + +#: ../midori/main.c:1111 +msgid "Reset the last _session" +msgstr "Врати последњу сесију" + +#: ../midori/main.c:1116 +msgid "Disable all _extensions" +msgstr "Искључи сва п_роширења" + +#: ../midori/main.c:1315 +msgid "No filename specified" +msgstr "Није изабрано име датотеке" + +#: ../midori/main.c:1338 +msgid "An unknown error occured." +msgstr "Непозната грешка." + +#: ../midori/main.c:1370 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Снимак је сачуван у: %s\n" + +#: ../midori/main.c:1391 +msgid "Run ADDRESS as a web application" +msgstr "Покреће АДРЕСУ као веб програм" + +#: ../midori/main.c:1391 +msgid "ADDRESS" +msgstr "АДРЕСА" + +#: ../midori/main.c:1393 +msgid "Use FOLDER as configuration folder" +msgstr "Користи ФАСЦИКЛУ за чување подешавања" + +#: ../midori/main.c:1393 +msgid "FOLDER" +msgstr "ФАСЦИКЛА" + +#: ../midori/main.c:1395 +msgid "Run the specified filename as javascript" +msgstr "Покреће изабрану датотеку као јава скрипту" + +#: ../midori/main.c:1398 +msgid "Take a snapshot of the specified URI" +msgstr "Прави снимак изабране адресе" + +#: ../midori/main.c:1401 +msgid "Display program version" +msgstr "Исписује издање програма" + +#: ../midori/main.c:1403 +msgid "Addresses" +msgstr "Адресе" + +#: ../midori/main.c:1446 +msgid "[Addresses]" +msgstr "[Адресе]" + +#: ../midori/main.c:1469 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Пошаљите коментар, преглог и извештај грешке на:" + +#: ../midori/main.c:1471 +msgid "Check for new versions at:" +msgstr "Преузмите новије издање са:" + +#: ../midori/main.c:1548 +msgid "The specified configuration folder is invalid." +msgstr "Изабрана фасцикла са подешавањима је неисправна." + +#: ../midori/main.c:1583 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Већ је покренут један Мидори прозор, али не даје одзив.\n" + +#: ../midori/main.c:1633 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Не могу да учитам претраживаче. %s\n" + +#: ../midori/main.c:1645 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Не могу да учитам обележиваче: %s\n" + +#: ../midori/main.c:1660 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Не могу да учитам сесију: %s\n" + +#: ../midori/main.c:1673 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Не могу да учитам смеће: %s\n" + +#: ../midori/main.c:1686 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Не могу да учитам историјат: %s\n" + +#: ../midori/main.c:1698 +msgid "The following errors occured:" +msgstr "Јавиле су се следеће грешке:" + +#: ../midori/main.c:1714 +msgid "_Ignore" +msgstr "_Занемари" + +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Није нађена датотека." + +#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Документ је лошег форматиран." + +#: ../midori/midori-array.c:338 ../midori/sokoke.c:716 +#, c-format +msgid "Writing failed." +msgstr "Неуспешан упис." + +#: ../midori/midori-browser.c:287 ../midori/midori-browser.c:3819 +#: ../midori/midori-browser.c:3825 +msgid "Reload the current page" +msgstr "Освежава страницу коју сте отворили" + +#: ../midori/midori-browser.c:298 ../midori/midori-browser.c:3822 +msgid "Stop loading the current page" +msgstr "Прекида странице на којој се налазите" + +#: ../midori/midori-browser.c:360 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% учитано" + +#: ../midori/midori-browser.c:385 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Неочекивана радња „%s“." + +#: ../midori/midori-browser.c:603 +msgid "New folder" +msgstr "Нова фасцикла" + +#: ../midori/midori-browser.c:603 +msgid "Edit folder" +msgstr "Уреди фасциклу" + +#: ../midori/midori-browser.c:605 +msgid "New bookmark" +msgstr "Нови обележивач" + +#: ../midori/midori-browser.c:605 +msgid "Edit bookmark" +msgstr "Уреди обележивач" + +#: ../midori/midori-browser.c:635 +msgid "_Title:" +msgstr "_Наслов:" + +#: ../midori/midori-browser.c:648 ../midori/midori-searchaction.c:948 +msgid "_Description:" +msgstr "_Опис:" + +#: ../midori/midori-browser.c:667 ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 +msgid "_Address:" +msgstr "_Адреса:" + +#: ../midori/midori-browser.c:686 +msgid "_Folder:" +msgstr "_Фасцикла:" + +#: ../midori/midori-browser.c:691 ../midori/midori-browser.c:732 +msgid "Toplevel folder" +msgstr "Највиша фасцикла" + +#: ../midori/midori-browser.c:808 +msgid "Save file as" +msgstr "Сачувај датотеку као" + +#: ../midori/midori-browser.c:1119 +#, c-format +msgid "The file %s has been downloaded." +msgstr "Датотека %s је преузета." + +#: ../midori/midori-browser.c:1123 +msgid "Transfer completed" +msgstr "Преузимање је завршено" + +#: ../midori/midori-browser.c:1820 +msgid "Open file" +msgstr "Отвори датотеку" + +#: ../midori/midori-browser.c:3152 ../panels/midori-bookmarks.c:778 +#: ../panels/midori-history.c:808 +msgid "Open all in _Tabs" +msgstr "Отвори с_ве у листовима" + +# bug: no plural-forms +#: ../midori/midori-browser.c:3159 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:542 +msgid "Open in New _Tab" +msgstr "Отвору у новом _листу" + +#: ../midori/midori-browser.c:3162 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:544 +msgid "Open in New _Window" +msgstr "Отвори у _новом прозору" + +#: ../midori/midori-browser.c:3425 +msgid "Clear Private Data" +msgstr "Очисти личне податке" + +#: ../midori/midori-browser.c:3428 +msgid "_Clear private data" +msgstr "О_чисти личне податке" + +#: ../midori/midori-browser.c:3441 +msgid "Clear the following data:" +msgstr "Чишћење следећих података:" + +#: ../midori/midori-browser.c:3449 ../midori/midori-preferences.c:669 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Историјат" + +#: ../midori/midori-browser.c:3452 +msgid "Cookies" +msgstr "Колачићи" + +#: ../midori/midori-browser.c:3455 +msgid "'Flash' Cookies" +msgstr "Флеш колачићи" + +#: ../midori/midori-browser.c:3458 +msgid "Website icons" +msgstr "Иконице веб страница" + +#: ../midori/midori-browser.c:3538 +msgid "A lightweight web browser." +msgstr "Једноставан Интернет прегледник." + +#: ../midori/midori-browser.c:3546 +msgid "translator-credits" +msgstr "" +"Милош Поповић \n" +"\n" +"http://prevod.org — превод на српски језик." + +#: ../midori/midori-browser.c:3750 +msgid "_File" +msgstr "_Датотека" + +#: ../midori/midori-browser.c:3753 +msgid "Open a new window" +msgstr "Отвори нови прозор" + +#: ../midori/midori-browser.c:3756 +msgid "Open a new tab" +msgstr "Отвара нови лист" + +#: ../midori/midori-browser.c:3759 +msgid "Open a file" +msgstr "Отвори датотеку" + +#: ../midori/midori-browser.c:3762 +msgid "Save to a file" +msgstr "Сачувај у датотеку" + +#: ../midori/midori-browser.c:3764 ../midori/midori-view.c:1256 +msgid "Add to Speed _dial" +msgstr "Додај у _брзе посете" + +#: ../midori/midori-browser.c:3765 +msgid "Add shortcut to speed dial" +msgstr "Додаје ову адресу у брзе посете" + +#: ../midori/midori-browser.c:3767 +msgid "_Close Tab" +msgstr "З_атвори лист" + +#: ../midori/midori-browser.c:3768 +msgid "Close the current tab" +msgstr "Затвара овај лист" + +#: ../midori/midori-browser.c:3770 +msgid "C_lose Window" +msgstr "_Затвори прозор" + +#: ../midori/midori-browser.c:3771 +msgid "Close this window" +msgstr "Затвара овај прозор" + +#: ../midori/midori-browser.c:3774 +msgid "Print the current page" +msgstr "Штампај текућу страницу" + +#: ../midori/midori-browser.c:3777 +msgid "Quit the application" +msgstr "Затвори програм" + +#: ../midori/midori-browser.c:3779 +msgid "_Edit" +msgstr "_Уређивање" + +#: ../midori/midori-browser.c:3782 +msgid "Cut the selected text" +msgstr "Исеца изабрани текст и смешта га списак исечака" + +#: ../midori/midori-browser.c:3785 ../midori/midori-browser.c:3788 +msgid "Copy the selected text" +msgstr "Умножава изабрани текст у списак исечака" + +#: ../midori/midori-browser.c:3791 +msgid "Paste text from the clipboard" +msgstr "Убацује текст из списка исечака" + +#: ../midori/midori-browser.c:3794 +msgid "Delete the selected text" +msgstr "Брише изабрани текст" + +#: ../midori/midori-browser.c:3797 +msgid "Select all text" +msgstr "Изабире сав текст" + +#: ../midori/midori-browser.c:3800 +msgid "Find a word or phrase in the page" +msgstr "Тражи жељену реч или израз унутар страници" + +#: ../midori/midori-browser.c:3802 +msgid "Find _Next" +msgstr "Тражи _следеће" + +#: ../midori/midori-browser.c:3803 +msgid "Find the next occurrence of a word or phrase" +msgstr "Проналази следећу појаву речи или израза" + +#: ../midori/midori-browser.c:3805 +msgid "Find _Previous" +msgstr "Тражи _претходно" + +#: ../midori/midori-browser.c:3806 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Проналази претходну појаву речи или израза" + +#: ../midori/midori-browser.c:3809 +msgid "_Quick Find" +msgstr "Брзо _нађи" + +#: ../midori/midori-browser.c:3810 +msgid "Quickly jump to a word or phrase" +msgstr "Брзо проналази реч или израз" + +#: ../midori/midori-browser.c:3813 +msgid "Configure the application preferences" +msgstr "Подесите поставке програма" + +#: ../midori/midori-browser.c:3815 +msgid "_View" +msgstr "П_реглед" + +#: ../midori/midori-browser.c:3816 +msgid "_Toolbars" +msgstr "Палете а_лата" + +#: ../midori/midori-browser.c:3828 +msgid "Increase the zoom level" +msgstr "Увећај приказ" + +#: ../midori/midori-browser.c:3831 +msgid "Decrease the zoom level" +msgstr "Умањи приказ" + +#: ../midori/midori-browser.c:3834 +msgid "Reset the zoom level" +msgstr "Врати величину приказа" + +#: ../midori/midori-browser.c:3835 +msgid "_Encoding" +msgstr "_Кодирање" + +#: ../midori/midori-browser.c:3837 +msgid "_Automatic" +msgstr "_Сам одреди" + +#: ../midori/midori-browser.c:3840 ../midori/midori-websettings.c:204 +msgid "Chinese (BIG5)" +msgstr "Кинески (BIG5)" + +#: ../midori/midori-browser.c:3843 ../midori/midori-websettings.c:205 +msgid "Japanese (SHIFT_JIS)" +msgstr "Јапански (_Shift_JIS)" + +#: ../midori/midori-browser.c:3846 ../midori/midori-websettings.c:206 +msgid "Russian (KOI8-R)" +msgstr "Руски (KOI8-R)" + +#: ../midori/midori-browser.c:3849 ../midori/midori-websettings.c:207 +msgid "Unicode (UTF-8)" +msgstr "Уникод (UTF-_8)" + +#: ../midori/midori-browser.c:3852 ../midori/midori-websettings.c:208 +msgid "Western (ISO-8859-1)" +msgstr "Западни (I_SO-8859-1)" + +#: ../midori/midori-browser.c:3855 ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:281 +msgid "Custom..." +msgstr "Произвољно..." + +#: ../midori/midori-browser.c:3858 ../midori/midori-view.c:1275 +msgid "View _Source" +msgstr "_Изворно издање странице" + +#: ../midori/midori-browser.c:3859 +msgid "View the source code of the page" +msgstr "Приказује изворни код странице" + +#: ../midori/midori-browser.c:3861 +msgid "View Selection Source" +msgstr "И_зворно издање изабраног" + +#: ../midori/midori-browser.c:3862 +msgid "View the source code of the selection" +msgstr "Приказује изворни код изабраног дела странице" + +#: ../midori/midori-browser.c:3866 +msgid "Toggle fullscreen view" +msgstr "Приказује програм преко целог екрана" + +#: ../midori/midori-browser.c:3868 +msgid "_Go" +msgstr "_Иди" + +#: ../midori/midori-browser.c:3871 +msgid "Go back to the previous page" +msgstr "Иде на претходну страницу" + +#: ../midori/midori-browser.c:3874 +msgid "Go forward to the next page" +msgstr "Иде на следећу страницу" + +#: ../midori/midori-browser.c:3877 +msgid "Go to your homepage" +msgstr "Иде на почетну страну" + +#: ../midori/midori-browser.c:3879 +msgid "Empty Trash" +msgstr "Испразни смеће" + +#: ../midori/midori-browser.c:3880 +msgid "Delete the contents of the trash" +msgstr "Брише сав садржај из смећа" + +#: ../midori/midori-browser.c:3882 ../midori/midori-view.c:1233 +msgid "Undo Close Tab" +msgstr "Врати лист" + +#: ../midori/midori-browser.c:3883 +msgid "Open the last closed tab" +msgstr "Отвара лист који сте последњи затворили" + +#: ../midori/midori-browser.c:3887 ../panels/midori-bookmarks.c:230 +msgid "Add a new bookmark" +msgstr "Додај обележивач" + +#: ../midori/midori-browser.c:3889 ../panels/midori-bookmarks.c:259 +msgid "Add a new folder" +msgstr "Додај нову фасциклу" + +#: ../midori/midori-browser.c:3890 +msgid "Add a new bookmark folder" +msgstr "Додаје нову фасциклу за обележиваче" + +#: ../midori/midori-browser.c:3891 +msgid "_Tools" +msgstr "_Алати" + +#: ../midori/midori-browser.c:3893 ../midori/midori-searchaction.c:493 +msgid "_Manage Search Engines" +msgstr "По_деси претраживаче" + +#: ../midori/midori-browser.c:3894 +msgid "Add, edit and remove search engines..." +msgstr "Отвара прозорче за додавање, уређивање или уклањање претраживача." + +#: ../midori/midori-browser.c:3897 +msgid "_Clear Private Data" +msgstr "Очисти _личне податке" + +#: ../midori/midori-browser.c:3898 +msgid "Clear private data..." +msgstr "Брише све личне податке." + +#: ../midori/midori-browser.c:3902 +msgid "_Previous Tab" +msgstr "_Претходни лист" + +#: ../midori/midori-browser.c:3903 +msgid "Switch to the previous tab" +msgstr "Иде на претходни лист" + +#: ../midori/midori-browser.c:3905 +msgid "_Next Tab" +msgstr "_Следећи лист" + +#: ../midori/midori-browser.c:3906 +msgid "Switch to the next tab" +msgstr "Иде на наредни лист" + +#: ../midori/midori-browser.c:3908 +msgid "_Help" +msgstr "_Помоћ" + +#: ../midori/midori-browser.c:3910 +msgid "_Contents" +msgstr "_Садржај" + +#: ../midori/midori-browser.c:3911 +msgid "Show the documentation" +msgstr "Приказује помоћ за употребу програма" + +#: ../midori/midori-browser.c:3913 +msgid "_Frequent Questions" +msgstr "_Честа питања" + +#: ../midori/midori-browser.c:3914 +msgid "Show the Frequently Asked Questions" +msgstr "Приказује често постављена питања" + +#: ../midori/midori-browser.c:3916 +msgid "_Report a Bug" +msgstr "Пријави _грешку" + +#: ../midori/midori-browser.c:3917 +msgid "Open Midori's bug tracker" +msgstr "Отвара Мидоријеву страницу за пријаву грешки" + +#: ../midori/midori-browser.c:3920 +msgid "Show information about the program" +msgstr "Приказује податке о програму" + +#: ../midori/midori-browser.c:3927 +msgid "P_rivate Browsing" +msgstr "Чување прива_тности" + +#: ../midori/midori-browser.c:3928 +msgid "Don't save any private data while browsing" +msgstr "Не чува никакве личне податке током разгледања Интернета" + +#: ../midori/midori-browser.c:3933 +msgid "_Menubar" +msgstr "Трака са _менијем" + +#: ../midori/midori-browser.c:3934 +msgid "Show menubar" +msgstr "Приказује мени програма" + +#: ../midori/midori-browser.c:3937 +msgid "_Navigationbar" +msgstr "_Главна трака" + +#: ../midori/midori-browser.c:3938 +msgid "Show navigationbar" +msgstr "Приказује површ за кретање кроз веб странице" + +#: ../midori/midori-browser.c:3941 +msgid "Side_panel" +msgstr "Бочна _површ" + +#: ../midori/midori-browser.c:3942 +msgid "Show sidepanel" +msgstr "Приказује бочну површ" + +#: ../midori/midori-browser.c:3945 +msgid "_Bookmarkbar" +msgstr "_Обележивачи" + +#: ../midori/midori-browser.c:3946 +msgid "Show bookmarkbar" +msgstr "Приказује површ са обележивачима" + +#: ../midori/midori-browser.c:3949 +msgid "_Transferbar" +msgstr "Преноси" + +#: ../midori/midori-browser.c:3950 +msgid "Show transferbar" +msgstr "Приказује траку са преносима датотека" + +#: ../midori/midori-browser.c:3953 +msgid "_Statusbar" +msgstr "Трака са ста_њем" + +#: ../midori/midori-browser.c:3954 +msgid "Show statusbar" +msgstr "Приказује или сакрива траку са стањем" + +#: ../midori/midori-browser.c:4389 +msgid "_Separator" +msgstr "_Раздвајач" + +#: ../midori/midori-browser.c:4396 +msgid "_Location..." +msgstr "На _адресу..." + +#: ../midori/midori-browser.c:4398 +msgid "Open a particular location" +msgstr "Отвара изабрану адресу" + +#: ../midori/midori-browser.c:4420 +msgid "_Web Search..." +msgstr "П_ретражи Интернет..." + +#: ../midori/midori-browser.c:4422 +msgid "Run a web search" +msgstr "Иде на страницу за претрагу Интернета" + +#: ../midori/midori-browser.c:4443 +msgid "Reopen a previously closed tab or window" +msgstr "Врати претходне прозоре и листове читача" + +#: ../midori/midori-browser.c:4458 +msgid "_Recently visited pages" +msgstr "_Скорашње странице" + +#: ../midori/midori-browser.c:4460 +msgid "Reopen pages that you visited earlier" +msgstr "Отвара странице које сте раније посетили" + +#: ../midori/midori-browser.c:4475 ../midori/sokoke.c:872 +msgid "_Bookmarks" +msgstr "_Обележивачи" + +#: ../midori/midori-browser.c:4477 +msgid "Show the saved bookmarks" +msgstr "Приказује сачуване обележиваче" + +#: ../midori/midori-browser.c:4492 +msgid "_Window" +msgstr "_Прозор" + +#: ../midori/midori-browser.c:4494 +msgid "Show a list of all open tabs" +msgstr "Приказује списак свих отворених листова" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:4674 +msgid "_Inline Find:" +msgstr "_Тражи израз:" + +#: ../midori/midori-browser.c:4699 +msgid "Previous" +msgstr "Претходно" + +#: ../midori/midori-browser.c:4704 +msgid "Next" +msgstr "Следеће" + +#: ../midori/midori-browser.c:4709 +msgid "Match Case" +msgstr "Упореди велчину слова" + +#: ../midori/midori-browser.c:4717 +msgid "Highlight Matches" +msgstr "Истакни нађено" + +#: ../midori/midori-browser.c:4727 +msgid "Close Findbar" +msgstr "Затвара траку за претрагу странице" + +#: ../midori/midori-browser.c:4762 ../extensions/cookie-manager.c:821 +msgid "Delete All" +msgstr "Обриши _све" + +#: ../midori/midori-browser.c:5084 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Неочекивана поставка „%s“" + +#: ../midori/midori-panel.c:333 +msgid "Detach chosen panel from the window" +msgstr "Откачи површ из прозора" + +#: ../midori/midori-panel.c:335 +msgid "Whether to detach the chosen panel from the window" +msgstr "Откачује изабрану површ из прозора" + +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:535 +msgid "Align sidepanel on the right" +msgstr "Постави бочну површ десно" + +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:536 +msgid "Whether to align the sidepanel on the right" +msgstr "Одређује да ли да се бочна површ равна са десном страном" + +#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 +msgid "Close panel" +msgstr "Затвори површ" + +#: ../midori/midori-websettings.c:187 ../midori/midori-view.c:1999 +#: ../midori/midori-view.c:2176 +msgid "Blank page" +msgstr "Празна страна" + +#: ../midori/midori-websettings.c:188 ../midori/midori-websettings.c:555 +msgid "Homepage" +msgstr "Почетна страница" + +#: ../midori/midori-websettings.c:189 +msgid "Last open pages" +msgstr "Последње странице" + +#: ../midori/midori-websettings.c:224 +msgid "New tab" +msgstr "новом листу" + +#: ../midori/midori-websettings.c:225 +msgid "New window" +msgstr "новом прозору" + +#: ../midori/midori-websettings.c:226 +msgid "Current tab" +msgstr "тренутном листу" + +#: ../midori/midori-websettings.c:241 +msgid "Default" +msgstr "Уобичајено" + +#: ../midori/midori-websettings.c:242 +msgid "Icons" +msgstr "Иконице" + +#: ../midori/midori-websettings.c:243 +msgid "Text" +msgstr "Текст" + +#: ../midori/midori-websettings.c:244 +msgid "Both" +msgstr "Текст испод иконица" + +#: ../midori/midori-websettings.c:245 +msgid "Both horizontal" +msgstr "Текст поред иконица" + +#: ../midori/midori-websettings.c:260 +msgid "All cookies" +msgstr "Све колачиће" + +#: ../midori/midori-websettings.c:261 +msgid "Session cookies" +msgstr "Колачиће сесије" + +#: ../midori/midori-websettings.c:262 ../panels/midori-addons.c:94 +msgid "None" +msgstr "Ништа" + +#: ../midori/midori-websettings.c:278 +msgid "Safari" +msgstr "Сафари" + +#: ../midori/midori-websettings.c:279 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:280 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:333 +msgid "Remember last window size" +msgstr "Запамти величину прозора" + +#: ../midori/midori-websettings.c:334 +msgid "Whether to save the last window size" +msgstr "Да ли да сачувам последњу величину прозора" + +#: ../midori/midori-websettings.c:342 +msgid "Last window width" +msgstr "Ширина прозора" + +#: ../midori/midori-websettings.c:343 +msgid "The last saved window width" +msgstr "Последња сачувана ширина прозора" + +#: ../midori/midori-websettings.c:351 +msgid "Last window height" +msgstr "Висина прозора" + +#: ../midori/midori-websettings.c:352 +msgid "The last saved window height" +msgstr "Последња сачувана висина прозора" + +#: ../midori/midori-websettings.c:377 +msgid "Last panel position" +msgstr "Место панела" + +#: ../midori/midori-websettings.c:378 +msgid "The last saved panel position" +msgstr "Последње сачувано место панела" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:387 +msgid "Last panel page" +msgstr "Последња станица панела" + +#: ../midori/midori-websettings.c:388 +msgid "The last saved panel page" +msgstr "Последња сачувана страница у панелу" + +#: ../midori/midori-websettings.c:396 +msgid "Last Web search" +msgstr "Последња претрага" + +#: ../midori/midori-websettings.c:397 +msgid "The last saved Web search" +msgstr "Последња сачувана Интернет претрага" + +#: ../midori/midori-websettings.c:406 +msgid "Show Menubar" +msgstr "Прикажи мени" + +#: ../midori/midori-websettings.c:407 +msgid "Whether to show the menubar" +msgstr "Одређује да ли је приказана трака са менијем" + +#: ../midori/midori-websettings.c:415 +msgid "Show Navigationbar" +msgstr "Прикажи главну траку" + +#: ../midori/midori-websettings.c:416 +msgid "Whether to show the navigationbar" +msgstr "Одређује да ли је приказана главна трака" + +#: ../midori/midori-websettings.c:424 +msgid "Show Bookmarkbar" +msgstr "Прикажи обележиваче" + +#: ../midori/midori-websettings.c:425 +msgid "Whether to show the bookmarkbar" +msgstr "Одређује да ли су приказани обележивачи" + +#: ../midori/midori-websettings.c:433 +msgid "Show Panel" +msgstr "Прикажи бочну површ" + +#: ../midori/midori-websettings.c:434 +msgid "Whether to show the panel" +msgstr "Одређује да ли је приказана бочна површ" + +#: ../midori/midori-websettings.c:449 +msgid "Show Transferbar" +msgstr "Прикажи преносе" + +#: ../midori/midori-websettings.c:450 +msgid "Whether to show the transferbar" +msgstr "Одређује да ли је приказана трака са преносима" + +#: ../midori/midori-websettings.c:458 +msgid "Show Statusbar" +msgstr "Прикажи траку са стањем" + +#: ../midori/midori-websettings.c:459 +msgid "Whether to show the statusbar" +msgstr "Одређује да ли је приказана трака са стањем" + +#: ../midori/midori-websettings.c:468 +msgid "Toolbar Style" +msgstr "Изглед траке са алаткама" + +#: ../midori/midori-websettings.c:469 +msgid "The style of the toolbar" +msgstr "Одређује изглед траке са алаткама" + +#: ../midori/midori-websettings.c:485 +msgid "Show progress in location entry" +msgstr "Прикажи напредак у поље за адресе" + +#: ../midori/midori-websettings.c:486 +msgid "Whether to show loading progress in the location entry" +msgstr "Приказује напредак учитавања странице у поље за унос адреса" + +#: ../midori/midori-websettings.c:501 +msgid "Search engines in location completion" +msgstr "Прикажи претраживаче у поље за адресу" + +#: ../midori/midori-websettings.c:502 +msgid "Whether to show search engines in the location completion" +msgstr "Приказује претраживаче у поље за унос адреса" + +#: ../midori/midori-websettings.c:510 +msgid "Toolbar Items" +msgstr "Ставке у траци са алаткама" + +#: ../midori/midori-websettings.c:511 +msgid "The items to show on the toolbar" +msgstr "Ставке приказане у траци са алаткама" + +#: ../midori/midori-websettings.c:519 +msgid "Compact Sidepanel" +msgstr "Сабиј бочну површ" + +#: ../midori/midori-websettings.c:520 +msgid "Whether to make the sidepanel compact" +msgstr "Збија неке ставке у бочној површи" + +#: ../midori/midori-websettings.c:545 +msgid "Load on Startup" +msgstr "Учитај по покретању" + +#: ../midori/midori-websettings.c:546 +msgid "What to load on startup" +msgstr "Одређује шта се учитава по покретању" + +#: ../midori/midori-websettings.c:556 +msgid "The homepage" +msgstr "Почетна страница" + +#: ../midori/midori-websettings.c:571 +msgid "Show crash dialog" +msgstr "Прикажи прозорче приликом пада програма" + +#: ../midori/midori-websettings.c:572 +msgid "Show a dialog after Midori crashed" +msgstr "Прикажи прозорче при паду Мидорија" + +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:588 +msgid "Show speed dial in new tabs" +msgstr "Прикажи брзе посете у новим листовима" + +#: ../midori/midori-websettings.c:589 +msgid "Show speed dial in newly opened tabs" +msgstr "Укључује приказ брзих адреса у новим листовима" + +#: ../midori/midori-websettings.c:597 +msgid "Download Folder" +msgstr "Фасцикла за преузето" + +#: ../midori/midori-websettings.c:598 +msgid "The folder downloaded files are saved to" +msgstr "Фасцикле у коју се смештају преузете датотеке" + +#: ../midori/midori-websettings.c:617 +msgid "Ask for the destination folder" +msgstr "Питај за одредишну фасциклу" + +#: ../midori/midori-websettings.c:618 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "Пита за одредишну фасциклу приликом преузимања датотеке" + +#: ../midori/midori-websettings.c:637 +msgid "Notify when a transfer has been completed" +msgstr "Обавести ме по завршеном преносу" + +#: ../midori/midori-websettings.c:638 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "Приказује обавештење када се заврши преузимање датотеке" + +#: ../midori/midori-websettings.c:650 +msgid "Download Manager" +msgstr "Преузимач датотека" + +#: ../midori/midori-websettings.c:651 +msgid "An external download manager" +msgstr "Спољни програм за преузимање датотека" + +#: ../midori/midori-websettings.c:659 +msgid "Text Editor" +msgstr "Уређивач текста" + +#: ../midori/midori-websettings.c:660 +msgid "An external text editor" +msgstr "Спољни програм за уређивање текста" + +#: ../midori/midori-websettings.c:675 +msgid "News Aggregator" +msgstr "Читач вести" + +#: ../midori/midori-websettings.c:676 +msgid "An external news aggregator" +msgstr "Спољни програм за читање вести" + +#: ../midori/midori-websettings.c:684 +msgid "Location entry Search" +msgstr "Претрага у поље за адресе" + +#: ../midori/midori-websettings.c:685 +msgid "The search to perform inside the location entry" +msgstr "Додаје могућност претраге из поља за унос адреса" + +#: ../midori/midori-websettings.c:693 +msgid "Preferred Encoding" +msgstr "Предност кодирању" + +#: ../midori/midori-websettings.c:694 +msgid "The preferred character encoding" +msgstr "Кодирање знакова које ће бити у предности" + +#: ../midori/midori-websettings.c:704 +msgid "Always Show Tabbar" +msgstr "Увек прикажи језичке" + +#: ../midori/midori-websettings.c:705 +msgid "Always show the tabbar" +msgstr "Увек приказује траку са језичцима" + +#: ../midori/midori-websettings.c:713 +msgid "Close Buttons on Tabs" +msgstr "Прикажи дугме за затварање листова" + +#: ../midori/midori-websettings.c:714 +msgid "Whether tabs have close buttons" +msgstr "Приказује дугме за затварање на сваком листу" + +# bug(slobo): једноставно разлистај? +#: ../midori/midori-websettings.c:722 +msgid "Open new pages in" +msgstr "Отвори нове странице у" + +#: ../midori/midori-websettings.c:723 +msgid "Where to open new pages" +msgstr "Одређује где да се отварају нове странице" + +#: ../midori/midori-websettings.c:732 +msgid "Open external pages in" +msgstr "Отвори спољне странице у" + +#: ../midori/midori-websettings.c:733 +msgid "Where to open externally opened pages" +msgstr "Одређује где се отварају спољне странице" + +#: ../midori/midori-websettings.c:746 +msgid "Middle click opens Selection" +msgstr "Отвори изабрано на средњи клик" + +#: ../midori/midori-websettings.c:747 +msgid "Load an address from the selection via middle click" +msgstr "Учитава адресу из изабраног на средњи клик мишем" + +#: ../midori/midori-websettings.c:755 +msgid "Open tabs in the background" +msgstr "Отвори листове у позадини" + +#: ../midori/midori-websettings.c:756 +msgid "Whether to open new tabs in the background" +msgstr "Не прелази на нови лист већ га отвара у позадини" + +#: ../midori/midori-websettings.c:764 +msgid "Open Tabs next to Current" +msgstr "Отвори лист поред тренутног" + +#: ../midori/midori-websettings.c:765 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Одређује да ли се нови лист отвара поред текућег или поред последњег листа" + +#: ../midori/midori-websettings.c:773 +msgid "Open popups in tabs" +msgstr "Смести искачуће прозоре у лист" + +#: ../midori/midori-websettings.c:774 +msgid "Whether to open popup windows in tabs" +msgstr "Отвара искачуће прозоре у новим листовима" + +#: ../midori/midori-websettings.c:790 +msgid "Zoom Text and Images" +msgstr "Увећај текст и слике" + +#: ../midori/midori-websettings.c:791 +msgid "Whether to zoom text and images" +msgstr "Повећај текст и слике" + +#: ../midori/midori-websettings.c:806 +msgid "Find inline while typing" +msgstr "Нађи док куцам" + +#: ../midori/midori-websettings.c:807 +msgid "Whether to automatically find inline while typing" +msgstr "Аутоматски проверава писање док куцате текст" + +#: ../midori/midori-websettings.c:815 +msgid "Accept cookies" +msgstr "Прихвати колачиће" + +#: ../midori/midori-websettings.c:816 +msgid "What type of cookies to accept" +msgstr "Које колачиће да прихватим" + +#: ../midori/midori-websettings.c:825 +msgid "Original cookies only" +msgstr "Само оригиналне колачиће" + +#: ../midori/midori-websettings.c:826 +msgid "Accept cookies from the original website only" +msgstr "Прихвата колачиће само са оригиналних веб страница" + +#: ../midori/midori-websettings.c:834 +msgid "Maximum cookie age" +msgstr "Старост колачића" + +#: ../midori/midori-websettings.c:835 +msgid "The maximum number of days to save cookies for" +msgstr "Број дана након чега се уклањају колачићи са рачунара" + +#: ../midori/midori-websettings.c:845 +msgid "Remember last visited pages" +msgstr "Запамти последње посећене странице" + +#: ../midori/midori-websettings.c:846 +msgid "Whether the last visited pages are saved" +msgstr "Чува странице које сте последње посетили" + +#: ../midori/midori-websettings.c:854 +msgid "Maximum history age" +msgstr "Старост историјата" + +#: ../midori/midori-websettings.c:855 +msgid "The maximum number of days to save the history for" +msgstr "Број дана након којих се уклања историјат посета страница" + +#: ../midori/midori-websettings.c:863 +msgid "Remember last form inputs" +msgstr "Запамти последње уносе у поља" + +#: ../midori/midori-websettings.c:864 +msgid "Whether the last form inputs are saved" +msgstr "Чува последње уносе у поља веб страница" + +#: ../midori/midori-websettings.c:872 +msgid "Remember last downloaded files" +msgstr "Запамти последње преузете датотеке" + +#: ../midori/midori-websettings.c:873 +msgid "Whether the last downloaded files are saved" +msgstr "Чува датотеке које сте последње преузели" + +#: ../midori/midori-websettings.c:883 +msgid "Proxy Server" +msgstr "Прокси сервер" + +#: ../midori/midori-websettings.c:884 +msgid "The proxy server used for HTTP connections" +msgstr "Прокси сервер за ХТТП везе" + +#: ../midori/midori-websettings.c:899 +msgid "Detect proxy server automatically" +msgstr "Сам одреди прокси сервер" + +#: ../midori/midori-websettings.c:900 +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:916 +msgid "Identify as" +msgstr "Представи се као" + +#: ../midori/midori-websettings.c:917 +msgid "What to identify as to web pages" +msgstr "Одређује како се програм представља веб страницама" + +#: ../midori/midori-websettings.c:933 +msgid "Identification string" +msgstr "Реченица за представање" + +#: ../midori/midori-websettings.c:934 +msgid "The application identification string" +msgstr "Реченица која одређује како веб странице препознају програм" + +#: ../midori/midori-websettings.c:942 +msgid "Cache size" +msgstr "Величина оставе" + +#: ../midori/midori-websettings.c:943 +msgid "The allowed size of the cache" +msgstr "Дозвољена величина оставе" + +#: ../midori/midori-view.c:686 +#, 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:688 ../midori/midori-view.c:2701 +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Грешка" + +#: ../midori/midori-view.c:691 +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:721 ../midori/midori-view.c:2705 +#, c-format +msgid "Not found - %s" +msgstr "Није пронађено - %s" + +#: ../midori/midori-view.c:1095 +msgid "Open _Link" +msgstr "_Отвори везу" + +#: ../midori/midori-view.c:1097 +msgid "Open Link in New _Tab" +msgstr "Отвори везу у новом _листу" + +#: ../midori/midori-view.c:1114 +msgid "Open Link in New _Window" +msgstr "Отвори везу у _новом прозору" + +#: ../midori/midori-view.c:1123 +msgid "_Download Link destination" +msgstr "Преузми _циљну датотеку" + +#: ../midori/midori-view.c:1129 +msgid "_Save Link destination" +msgstr "Сачувај ци_љну датотеку" + +#: ../midori/midori-view.c:1138 +msgid "Download with Download _Manager" +msgstr "Пре_узми помоћу спољашњег програма" + +#: ../midori/midori-view.c:1167 +msgid "Search _with" +msgstr "Пре_тражи са" + +#: ../midori/midori-view.c:1195 +msgid "_Search the Web" +msgstr "П_ретражи Интернет" + +# bug: no plural-forms +#: ../midori/midori-view.c:1205 +msgid "Open Address in New _Tab" +msgstr "Отвору адресу у новом _листу" + +#: ../midori/midori-view.c:1372 +msgid "Open or download file" +msgstr "Отвори или преузми датотеку" + +#: ../midori/midori-view.c:1389 +#, c-format +msgid "File Type: '%s'" +msgstr "Врста датотеке: „%s“" + +#: ../midori/midori-view.c:1392 +#, 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:1396 +#, c-format +msgid "Open %s" +msgstr "Отвори %s" + +#: ../midori/midori-view.c:1816 +#, c-format +msgid "Inspect page - %s" +msgstr "Инспекција странице — %s" + +#: ../midori/midori-view.c:2001 ../midori/midori-view.c:2002 +msgid "Search" +msgstr "Нађи" + +#: ../midori/midori-view.c:2003 +msgid "Click to add a shortcut" +msgstr "Кликните за додавање пречице" + +#: ../midori/midori-view.c:2004 +msgid "Enter shortcut address" +msgstr "Унесите адресу за пречицу" + +#: ../midori/midori-view.c:2005 +msgid "Enter shortcut title" +msgstr "Унесите наслов за пречицу" + +#: ../midori/midori-view.c:2006 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Да ли заиста желите да обришете ову пречицу?" + +#: ../midori/midori-view.c:2038 +#, c-format +msgid "Document cannot be displayed" +msgstr "Не могу да прикажем докумант" + +#: ../midori/midori-view.c:2055 +#, c-format +msgid "No documentation installed" +msgstr "Није инсталирана помоћ" + +#: ../midori/midori-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "Поставке за %s" + +#. Page "General" +#: ../midori/midori-preferences.c:398 +msgid "General" +msgstr "Опште" + +#: ../midori/midori-preferences.c:399 +msgid "Startup" +msgstr "Покретање" + +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "Искористи тренутну страницу" + +#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Преноси" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:440 +msgid "Appearance" +msgstr "Изглед" + +#: ../midori/midori-preferences.c:441 +msgid "Font settings" +msgstr "Подешавање фонтова" + +#: ../midori/midori-preferences.c:443 +msgid "Default Font Family" +msgstr "Уобичајени фонтови" + +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "Подразумевани фонтови за приказ текста" + +#: ../midori/midori-preferences.c:450 +msgid "The default font size used to display text" +msgstr "Подразумевани величина фонтова за приказ текста" + +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "Фонтови задате ширине" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "Подразумевани фонтови задате ширине за приказ текста" + +#: ../midori/midori-preferences.c:458 +msgid "Minimum Font Size" +msgstr "Најмања величина фонта" + +#: ../midori/midori-preferences.c:461 +msgid "The minimum font size used to display text" +msgstr "најмања величина фонтова за приказ текста" + +#: ../midori/midori-preferences.c:468 +msgid "Encoding" +msgstr "Кодирање" + +#: ../midori/midori-preferences.c:471 +msgid "The character encoding to use by default" +msgstr "Подразумевано кодирање текста" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:478 +msgid "Behavior" +msgstr "Понашање" + +#: ../midori/midori-preferences.c:479 +msgid "Features" +msgstr "Могућности" + +#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54 +msgid "Load images automatically" +msgstr "Сам учитај слике" + +#: ../midori/midori-preferences.c:483 +msgid "Load and display images automatically" +msgstr "Учитава и аутоматски приказује слике" + +#: ../midori/midori-preferences.c:486 +msgid "Shrink images automatically" +msgstr "Сам умањи слике" + +#: ../midori/midori-preferences.c:487 +msgid "Automatically shrink standalone images to fit" +msgstr "Сам умањи слике како би се уклопиле у страницу" + +#: ../midori/midori-preferences.c:490 +msgid "Print background images" +msgstr "Прикажи позадинске слике" + +#: ../midori/midori-preferences.c:491 +msgid "Whether background images should be printed" +msgstr "Одређује да ли треба приказати слике за позадину" + +#: ../midori/midori-preferences.c:494 +msgid "Resizable text areas" +msgstr "Омогући промену величине текста" + +#: ../midori/midori-preferences.c:495 +msgid "Whether text areas are resizable" +msgstr "Омогућава промену величине области са текстом" + +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 +msgid "Enable scripts" +msgstr "Укључи скрипте" + +#: ../midori/midori-preferences.c:499 +msgid "Enable embedded scripting languages" +msgstr "укључује уметнуте језике за скрипте" + +#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72 +msgid "Enable Netscape plugins" +msgstr "Укључи Netscape додатке" + +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" +msgstr "Омогућава објекте са угнежђеним Netscape додацима" + +#: ../midori/midori-preferences.c:506 +msgid "Enforce 96 dots per inch" +msgstr "Приморај 96 тачака по инчу" + +#: ../midori/midori-preferences.c:507 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Приморава густину тачака екрана од 96 ТПИ" + +#: ../midori/midori-preferences.c:510 +msgid "Enable developer tools" +msgstr "Укључи алате за развој" + +#: ../midori/midori-preferences.c:511 +msgid "Enable special extensions for developers" +msgstr "Укључи додатна проширења за развој" + +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "Провера писања" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "Укључи проверу писања" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "Укључи проверу писања док куцам" + +#: ../midori/midori-preferences.c:525 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" +"Списак језика језика за проверу писања раздвојени зарезом " +"(нpr. en_GB,sh_YU,sr_YU)" + +#. Page "Interface" +#: ../midori/midori-preferences.c:530 +msgid "Interface" +msgstr "Сучеље" + +#: ../midori/midori-preferences.c:531 +msgid "Navigationbar" +msgstr "Главна трака" + +#: ../midori/midori-preferences.c:542 +msgid "Browsing" +msgstr "Разгледање" + +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "Програми" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "Спољни програми" + +#. Page "Network" +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:620 +msgid "Network" +msgstr "Мрежа" + +#: ../midori/midori-preferences.c:647 +msgid "MB" +msgstr "МБ" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:652 +msgid "Privacy" +msgstr "Приватност" + +#: ../midori/midori-preferences.c:653 +msgid "Web Cookies" +msgstr "Колачићи" + +#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676 +msgid "days" +msgstr "дана" + +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:314 +msgid "Empty" +msgstr "Празно" + +#: ../midori/midori-searchaction.c:904 +msgid "Add search engine" +msgstr "Додај претраживач" + +#: ../midori/midori-searchaction.c:904 +msgid "Edit search engine" +msgstr "Уреди претрачивач" + +#: ../midori/midori-searchaction.c:932 +msgid "_Name:" +msgstr "_Име:" + +#: ../midori/midori-searchaction.c:976 +msgid "_Icon:" +msgstr "И_коница:" + +#: ../midori/midori-searchaction.c:990 +msgid "_Token:" +msgstr "_Фраза:" + +#: ../midori/midori-searchaction.c:1195 +msgid "Manage Search Engines" +msgstr "Подеси претраживаче" + +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "_Постави као подразумевани" + +#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 +msgid "Could not run external program." +msgstr "Не могу да покренем спољни програм." + +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:520 +msgid "Warning: You are using a superuser account!" +msgstr "Упозорење: Користите администраторски налог!" + +#: ../midori/sokoke.c:871 +msgid "_Bookmark" +msgstr "_Обележивач" + +#: ../midori/sokoke.c:873 +msgid "_Add Bookmark" +msgstr "_Додај обележивач" + +#: ../midori/sokoke.c:874 +msgid "_Console" +msgstr "_Конзола" + +#: ../midori/sokoke.c:875 +msgid "_Extensions" +msgstr "П_роширења" + +#: ../midori/sokoke.c:876 +msgid "_History" +msgstr "_Историјат" + +#: ../midori/sokoke.c:877 +msgid "_Homepage" +msgstr "На по_четну страницу" + +#: ../midori/sokoke.c:878 +msgid "_Userscripts" +msgstr "Личне _скрипте" + +#: ../midori/sokoke.c:879 +msgid "User_styles" +msgstr "Лични с_тилови" + +#: ../midori/sokoke.c:880 +msgid "New _Tab" +msgstr "Нови _лист" + +#: ../midori/sokoke.c:881 +msgid "_Transfers" +msgstr "Пр_еноиси" + +#: ../midori/sokoke.c:882 +msgid "Netscape p_lugins" +msgstr "Netscape _додаци" + +#: ../midori/sokoke.c:883 +msgid "_Closed Tabs and Windows" +msgstr "_Затворени листови и прозори" + +#: ../midori/sokoke.c:884 +msgid "New _Window" +msgstr "_Нови прозор" + +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 +msgid "Userscripts" +msgstr "Личне скрипте" + +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 +msgid "Userstyles" +msgstr "Лични стилови" + +#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Укључи" + +#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "Укључи" + +#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154 +msgid "_Disable" +msgstr "_Искључи" + +#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "Искључи" + +#: ../panels/midori-bookmarks.c:107 +msgid "Bookmarks" +msgstr "Обележивачи" + +#: ../panels/midori-bookmarks.c:238 +msgid "Edit the selected bookmark" +msgstr "Уреди изабрани обележивач" + +#: ../panels/midori-bookmarks.c:246 +msgid "Delete the selected bookmark" +msgstr "Уклони изабрани обележивач" + +#: ../panels/midori-bookmarks.c:591 +msgid "Separator" +msgstr "Раздвајач" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Конзола" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Проширења" + +#: ../panels/midori-history.c:162 +msgid "Are you sure you want to remove all history items?" +msgstr "Да ли заиста желите да уклоните све ставке из историјата?" + +#: ../panels/midori-history.c:217 +msgid "Bookmark the selected history item" +msgstr "Постави изабрани из историјата у обележиваче" + +#: ../panels/midori-history.c:226 +msgid "Delete the selected history item" +msgstr "Уклони изабрану ставку из историјата" + +#: ../panels/midori-history.c:234 +msgid "Clear the entire history" +msgstr "Очисти историјат" + +#: ../panels/midori-history.c:599 +msgid "A week ago" +msgstr "Пре недељу дана" + +#: ../panels/midori-history.c:604 +#, c-format +msgid "%d day ago" +msgstr "Пре %d дан" + +#: ../panels/midori-history.c:605 +#, c-format +msgid "%d days ago" +msgstr "Пре %d дана" + +#: ../panels/midori-history.c:612 +msgid "Today" +msgstr "Данас" + +#: ../panels/midori-history.c:614 +msgid "Yesterday" +msgstr "Јуче" + +#: ../panels/midori-plugins.c:87 +msgid "Netscape plugins" +msgstr "Netscape додаци" + +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s од %s" + +#: ../katze/katze-http-auth.c:97 +msgid "Authentication Required" +msgstr "Потребна је пријава" + +#: ../katze/katze-http-auth.c:113 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Потребно су корисничко име и лозинка за\n" +"отварање ове странице:" + +#: ../katze/katze-http-auth.c:127 +msgid "Username" +msgstr "Корисничко име" + +#: ../katze/katze-http-auth.c:138 +msgid "Password" +msgstr "Лозинка" + +#: ../katze/katze-throbber.c:828 +#, c-format +#, fuzzy +msgid "Named icon '%s' couldn't be loaded" +msgstr "Не могу да именовану учитам иконицу „%s“" + +#: ../katze/katze-throbber.c:841 +#, c-format +#, fuzzy +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Не могу да учитам сток иконицу „%s“" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Оквири са анимацијама су неисправни" + +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:385 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Вредност „%s“ није исправна за %s" + +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:244 +msgid "Choose file" +msgstr "Изаберите датотеку" + +#: ../katze/katze-utils.c:230 +msgid "Choose folder" +msgstr "Изаберите фасциклу" + +#: ../extensions/colorful-tabs.c:115 +msgid "Tint tabs distinctly" +msgstr "Другачије обоји листове" + +#: ../extensions/colorful-tabs.c:151 +msgid "Colorful Tabs" +msgstr "Листови у боји" + +#: ../extensions/colorful-tabs.c:152 +msgid "Tint each tab distinctly" +msgstr "Боји сваку картицу другачије" + +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "На крају сесије" + +#: ../extensions/cookie-manager.c:204 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Домаћин: %s\n" +"Име: %s\n" +"Вредност: %s\n" +"Путања: %s\n" +"Сигурност: %s\n" +"Истиче: %s" + +#: ../extensions/cookie-manager.c:210 +msgid "Yes" +msgstr "Да" + +#: ../extensions/cookie-manager.c:210 +msgid "No" +msgstr "Не" + +#: ../extensions/cookie-manager.c:493 +msgid "Do you really want to delete all cookies?" +msgstr "Да ли желите да обришете све колачиће" + +#: ../extensions/cookie-manager.c:495 +msgid "Question" +msgstr "Питање" + +#: ../extensions/cookie-manager.c:504 +msgid "Only cookies which match the filter will be deleted." +msgstr "Биће обрисани само колачићи који се поклапају са задатим филтером." + +#: ../extensions/cookie-manager.c:682 +msgid "Name" +msgstr "Име" + +#: ../extensions/cookie-manager.c:742 +msgid "_Expand All" +msgstr "_Прошири све" + +#: ../extensions/cookie-manager.c:750 +msgid "_Collapse All" +msgstr "_Сакупи све" + +#: ../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 "" +"Брише све приказане колачиће. Уколико је постављен филтер обрисаће само " +"колачиће који се поклапају са филтером." + +#: ../extensions/cookie-manager.c:838 +msgid "Expand All" +msgstr "Прошири све" + +#: ../extensions/cookie-manager.c:845 +msgid "Collapse All" +msgstr "Сакупи све" + +#: ../extensions/cookie-manager.c:876 +msgid "Filter:" +msgstr "Филтер:" + +#: ../extensions/cookie-manager.c:881 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Унесите реч за филтрирање колачића чији се називи или адресе поклапају са " +"филтером" + +#: ../extensions/cookie-manager.c:916 ../extensions/cookie-manager.c:964 +msgid "Cookie Manager" +msgstr "Управник колачићима" + +#: ../extensions/cookie-manager.c:948 +msgid "_Cookie Manager" +msgstr "_Управник колачићима" + +#: ../extensions/cookie-manager.c:965 +msgid "List, view and delete cookies" +msgstr "Исписује, уређује и уклања колачиће" + +#: ../extensions/feed-panel/feed-atom.c:242 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "Не могу да нађем потребни Атом „entry“ међу XML подацима." + +#: ../extensions/feed-panel/feed-atom.c:348 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "Не могу да нађем потребни Атом „fees“ међу XML подацима." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Задњи пит ажуриран: %s." + +#: ../extensions/feed-panel/feed-panel.c:664 +msgid "Feeds" +msgstr "Доводи" + +#: ../extensions/feed-panel/feed-panel.c:717 +msgid "Add new feed" +msgstr "Додај нови довод" + +#: ../extensions/feed-panel/feed-panel.c:724 +msgid "Delete feed" +msgstr "Обричи довод" + +#: ../extensions/feed-panel/feed-panel.c:807 +msgid "_Feeds" +msgstr "_Доводи" + +#: ../extensions/feed-panel/feed-parse.c:175 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Не могу да нађем изворне податке међу XML подацима." + +#: ../extensions/feed-panel/feed-parse.c:215 +#, c-format +msgid "Unsupported feed format." +msgstr "Није подржан формат довода." + +#: ../extensions/feed-panel/feed-parse.c:245 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Не могу да обрадим XML довод: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "Не могу да нађем елемент „channel“ међу XML подацима." + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Пронађено је неподржано издање вести." + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "Не могу да нађем потребни „item“ елемент вести међу XML подацима." + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "Не могу да нађем потребни „channel“ елемент вести међу XML подацима." + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Довод „%s“ већ постоји" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Грешка при учитавању додова „%s“" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "Нови довод" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Површ са доводима" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "Чита Атоме / доводе са вестима" + +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "Гестови миша" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "Управља Мидоријем помоћу миша" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +msgid "Pageholder" +msgstr "Уметнута страница" + +#: ../extensions/page-holder.c:161 +msgid "_Pageholder" +msgstr "_Уметнута страница" + +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "Могућности линије са стањем" + +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "Једноставно укључује и искључује опције на веб страницама" diff --git a/po/sr@latin.po b/po/sr@latin.po new file mode 100644 index 00000000..ee5550b0 --- /dev/null +++ b/po/sr@latin.po @@ -0,0 +1,2063 @@ +# Serbian translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Miloš Popović 2009 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.7\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-06-08 11:15+0000\n" +"PO-Revision-Date: 2009-06-30 00:00+100\n" +"Last-Translator: Miloš Popović \n" +"Language-Team: Serbian (sr) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Jednostavan Internet preglednik" + +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1449 +#: ../midori/main.c:1457 ../midori/main.c:1468 +#: ../midori/midori-websettings.c:277 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Internet preglednik" + +#: ../midori/main.c:96 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Ne mogu da učitam podešavanja: %s\n" + +#: ../midori/main.c:151 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Vrednost „%s“ je neispravna za %s" + +#: ../midori/main.c:158 ../midori/main.c:238 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Neispravna je vrednost „%s“ u podešavanjima" + +#: ../midori/main.c:350 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Ne mogu da otvorim bazu podataka: %s\n" + +#: ../midori/main.c:382 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Ne mogu da pokrenem tvrdnju iz baze podataka: %s\n" + +#: ../midori/main.c:436 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Ne mogu da uklonim stavku iz istorijata: %s\n" + +#: ../midori/main.c:460 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Ne mogu da očistim istorijat: %s\n" + +#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Ne mogu da dodam stavku u istorijat: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:712 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Ne mogu da uklonim stare stavke iz istorijata: %s\n" + +#: ../midori/main.c:741 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Ne mogu da sačuvam podešavanja. %s" + +#: ../midori/main.c:770 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Ne mogu da sačuvam pretraživače. %s" + +#: ../midori/main.c:789 ../midori/main.c:817 ../midori/main.c:846 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Ne mogu da sačuvam obeleživače. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:869 ../midori/main.c:892 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Ne mogu da sačuvam dokument. %s" + +#: ../midori/main.c:965 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Ne mogu da sačuvam sesiju. %s" + +#: ../midori/main.c:1092 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Izgleda da je Midori neispravno završio rad prilikom poslednjeg pokretanja. " +"Ukoliko se ovo često ponavlja pokušajte neki od ponuđenih predloga." + +#: ../midori/main.c:1107 +msgid "Modify _preferences" +msgstr "Izmeni pos_tavke" + +#: ../midori/main.c:1111 +msgid "Reset the last _session" +msgstr "Vrati poslednju sesiju" + +#: ../midori/main.c:1116 +msgid "Disable all _extensions" +msgstr "Isključi sva p_roširenja" + +#: ../midori/main.c:1315 +msgid "No filename specified" +msgstr "Nije izabrano ime datoteke" + +#: ../midori/main.c:1338 +msgid "An unknown error occured." +msgstr "Nepoznata greška." + +#: ../midori/main.c:1370 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Snimak je sačuvan u: %s\n" + +#: ../midori/main.c:1391 +msgid "Run ADDRESS as a web application" +msgstr "Pokreće ADRESU kao veb program" + +#: ../midori/main.c:1391 +msgid "ADDRESS" +msgstr "ADRESA" + +#: ../midori/main.c:1393 +msgid "Use FOLDER as configuration folder" +msgstr "Koristi FASCIKLU za čuvanje podešavanja" + +#: ../midori/main.c:1393 +msgid "FOLDER" +msgstr "FASCIKLA" + +#: ../midori/main.c:1395 +msgid "Run the specified filename as javascript" +msgstr "Pokreće izabranu datoteku kao java skriptu" + +#: ../midori/main.c:1398 +msgid "Take a snapshot of the specified URI" +msgstr "Pravi snimak izabrane adrese" + +#: ../midori/main.c:1401 +msgid "Display program version" +msgstr "Ispisuje izdanje programa" + +#: ../midori/main.c:1403 +msgid "Addresses" +msgstr "Adrese" + +#: ../midori/main.c:1446 +msgid "[Addresses]" +msgstr "[Adrese]" + +#: ../midori/main.c:1469 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Pošaljite komentar, preglog i izveštaj greške na:" + +#: ../midori/main.c:1471 +msgid "Check for new versions at:" +msgstr "Preuzmite novije izdanje sa:" + +#: ../midori/main.c:1548 +msgid "The specified configuration folder is invalid." +msgstr "Izabrana fascikla sa podešavanjima je neispravna." + +#: ../midori/main.c:1583 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Već je pokrenut jedan Midori prozor, ali ne daje odziv.\n" + +#: ../midori/main.c:1633 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Ne mogu da učitam pretraživače. %s\n" + +#: ../midori/main.c:1645 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Ne mogu da učitam obeleživače: %s\n" + +#: ../midori/main.c:1660 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Ne mogu da učitam sesiju: %s\n" + +#: ../midori/main.c:1673 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Ne mogu da učitam smeće: %s\n" + +#: ../midori/main.c:1686 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Ne mogu da učitam istorijat: %s\n" + +#: ../midori/main.c:1698 +msgid "The following errors occured:" +msgstr "Javile su se sledeće greške:" + +#: ../midori/main.c:1714 +msgid "_Ignore" +msgstr "_Zanemari" + +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Nije nađena datoteka." + +#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Dokument je lošeg formatiran." + +#: ../midori/midori-array.c:338 ../midori/sokoke.c:716 +#, c-format +msgid "Writing failed." +msgstr "Neuspešan upis." + +#: ../midori/midori-browser.c:287 ../midori/midori-browser.c:3819 +#: ../midori/midori-browser.c:3825 +msgid "Reload the current page" +msgstr "Osvežava stranicu koju ste otvorili" + +#: ../midori/midori-browser.c:298 ../midori/midori-browser.c:3822 +msgid "Stop loading the current page" +msgstr "Prekida stranice na kojoj se nalazite" + +#: ../midori/midori-browser.c:360 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% učitano" + +#: ../midori/midori-browser.c:385 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Neočekivana radnja „%s“." + +#: ../midori/midori-browser.c:603 +msgid "New folder" +msgstr "Nova fascikla" + +#: ../midori/midori-browser.c:603 +msgid "Edit folder" +msgstr "Uredi fasciklu" + +#: ../midori/midori-browser.c:605 +msgid "New bookmark" +msgstr "Novi obeleživač" + +#: ../midori/midori-browser.c:605 +msgid "Edit bookmark" +msgstr "Uredi obeleživač" + +#: ../midori/midori-browser.c:635 +msgid "_Title:" +msgstr "_Naslov:" + +#: ../midori/midori-browser.c:648 ../midori/midori-searchaction.c:948 +msgid "_Description:" +msgstr "_Opis:" + +#: ../midori/midori-browser.c:667 ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 +msgid "_Address:" +msgstr "_Adresa:" + +#: ../midori/midori-browser.c:686 +msgid "_Folder:" +msgstr "_Fascikla:" + +#: ../midori/midori-browser.c:691 ../midori/midori-browser.c:732 +msgid "Toplevel folder" +msgstr "Najviša fascikla" + +#: ../midori/midori-browser.c:808 +msgid "Save file as" +msgstr "Sačuvaj datoteku kao" + +#: ../midori/midori-browser.c:1119 +#, c-format +msgid "The file %s has been downloaded." +msgstr "Datoteka %s je preuzeta." + +#: ../midori/midori-browser.c:1123 +msgid "Transfer completed" +msgstr "Preuzimanje je završeno" + +#: ../midori/midori-browser.c:1820 +msgid "Open file" +msgstr "Otvori datoteku" + +#: ../midori/midori-browser.c:3152 ../panels/midori-bookmarks.c:778 +#: ../panels/midori-history.c:808 +msgid "Open all in _Tabs" +msgstr "Otvori s_ve u listovima" + +# bug: no plural-forms +#: ../midori/midori-browser.c:3159 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:542 +msgid "Open in New _Tab" +msgstr "Otvoru u novom _listu" + +#: ../midori/midori-browser.c:3162 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:544 +msgid "Open in New _Window" +msgstr "Otvori u _novom prozoru" + +#: ../midori/midori-browser.c:3425 +msgid "Clear Private Data" +msgstr "Očisti lične podatke" + +#: ../midori/midori-browser.c:3428 +msgid "_Clear private data" +msgstr "O_čisti lične podatke" + +#: ../midori/midori-browser.c:3441 +msgid "Clear the following data:" +msgstr "Čišćenje sledećih podataka:" + +#: ../midori/midori-browser.c:3449 ../midori/midori-preferences.c:669 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Istorijat" + +#: ../midori/midori-browser.c:3452 +msgid "Cookies" +msgstr "Kolačići" + +#: ../midori/midori-browser.c:3455 +msgid "'Flash' Cookies" +msgstr "Fleš kolačići" + +#: ../midori/midori-browser.c:3458 +msgid "Website icons" +msgstr "Ikonice veb stranica" + +#: ../midori/midori-browser.c:3538 +msgid "A lightweight web browser." +msgstr "Jednostavan Internet preglednik." + +#: ../midori/midori-browser.c:3546 +msgid "translator-credits" +msgstr "" +"Miloš Popović \n" +"\n" +"http://prevod.org — prevod na srpski jezik." + +#: ../midori/midori-browser.c:3750 +msgid "_File" +msgstr "_Datoteka" + +#: ../midori/midori-browser.c:3753 +msgid "Open a new window" +msgstr "Otvori novi prozor" + +#: ../midori/midori-browser.c:3756 +msgid "Open a new tab" +msgstr "Otvara novi list" + +#: ../midori/midori-browser.c:3759 +msgid "Open a file" +msgstr "Otvori datoteku" + +#: ../midori/midori-browser.c:3762 +msgid "Save to a file" +msgstr "Sačuvaj u datoteku" + +#: ../midori/midori-browser.c:3764 ../midori/midori-view.c:1256 +msgid "Add to Speed _dial" +msgstr "Dodaj u _brze posete" + +#: ../midori/midori-browser.c:3765 +msgid "Add shortcut to speed dial" +msgstr "Dodaje ovu adresu u brze posete" + +#: ../midori/midori-browser.c:3767 +msgid "_Close Tab" +msgstr "Z_atvori list" + +#: ../midori/midori-browser.c:3768 +msgid "Close the current tab" +msgstr "Zatvara ovaj list" + +#: ../midori/midori-browser.c:3770 +msgid "C_lose Window" +msgstr "_Zatvori prozor" + +#: ../midori/midori-browser.c:3771 +msgid "Close this window" +msgstr "Zatvara ovaj prozor" + +#: ../midori/midori-browser.c:3774 +msgid "Print the current page" +msgstr "Štampaj tekuću stranicu" + +#: ../midori/midori-browser.c:3777 +msgid "Quit the application" +msgstr "Zatvori program" + +#: ../midori/midori-browser.c:3779 +msgid "_Edit" +msgstr "_Uređivanje" + +#: ../midori/midori-browser.c:3782 +msgid "Cut the selected text" +msgstr "Iseca izabrani tekst i smešta ga spisak isečaka" + +#: ../midori/midori-browser.c:3785 ../midori/midori-browser.c:3788 +msgid "Copy the selected text" +msgstr "Umnožava izabrani tekst u spisak isečaka" + +#: ../midori/midori-browser.c:3791 +msgid "Paste text from the clipboard" +msgstr "Ubacuje tekst iz spiska isečaka" + +#: ../midori/midori-browser.c:3794 +msgid "Delete the selected text" +msgstr "Briše izabrani tekst" + +#: ../midori/midori-browser.c:3797 +msgid "Select all text" +msgstr "Izabire sav tekst" + +#: ../midori/midori-browser.c:3800 +msgid "Find a word or phrase in the page" +msgstr "Traži željenu reč ili izraz unutar stranici" + +#: ../midori/midori-browser.c:3802 +msgid "Find _Next" +msgstr "Traži _sledeće" + +#: ../midori/midori-browser.c:3803 +msgid "Find the next occurrence of a word or phrase" +msgstr "Pronalazi sledeću pojavu reči ili izraza" + +#: ../midori/midori-browser.c:3805 +msgid "Find _Previous" +msgstr "Traži _prethodno" + +#: ../midori/midori-browser.c:3806 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Pronalazi prethodnu pojavu reči ili izraza" + +#: ../midori/midori-browser.c:3809 +msgid "_Quick Find" +msgstr "Brzo _nađi" + +#: ../midori/midori-browser.c:3810 +msgid "Quickly jump to a word or phrase" +msgstr "Brzo pronalazi reč ili izraz" + +#: ../midori/midori-browser.c:3813 +msgid "Configure the application preferences" +msgstr "Podesite postavke programa" + +#: ../midori/midori-browser.c:3815 +msgid "_View" +msgstr "P_regled" + +#: ../midori/midori-browser.c:3816 +msgid "_Toolbars" +msgstr "Palete a_lata" + +#: ../midori/midori-browser.c:3828 +msgid "Increase the zoom level" +msgstr "Uvećaj prikaz" + +#: ../midori/midori-browser.c:3831 +msgid "Decrease the zoom level" +msgstr "Umanji prikaz" + +#: ../midori/midori-browser.c:3834 +msgid "Reset the zoom level" +msgstr "Vrati veličinu prikaza" + +#: ../midori/midori-browser.c:3835 +msgid "_Encoding" +msgstr "_Kodiranje" + +#: ../midori/midori-browser.c:3837 +msgid "_Automatic" +msgstr "_Sam odredi" + +#: ../midori/midori-browser.c:3840 ../midori/midori-websettings.c:204 +msgid "Chinese (BIG5)" +msgstr "Kineski (BIG5)" + +#: ../midori/midori-browser.c:3843 ../midori/midori-websettings.c:205 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japanski (_Shift_JIS)" + +#: ../midori/midori-browser.c:3846 ../midori/midori-websettings.c:206 +msgid "Russian (KOI8-R)" +msgstr "Ruski (KOI8-R)" + +#: ../midori/midori-browser.c:3849 ../midori/midori-websettings.c:207 +msgid "Unicode (UTF-8)" +msgstr "Unikod (UTF-_8)" + +#: ../midori/midori-browser.c:3852 ../midori/midori-websettings.c:208 +msgid "Western (ISO-8859-1)" +msgstr "Zapadni (I_SO-8859-1)" + +#: ../midori/midori-browser.c:3855 ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:281 +msgid "Custom..." +msgstr "Proizvoljno..." + +#: ../midori/midori-browser.c:3858 ../midori/midori-view.c:1275 +msgid "View _Source" +msgstr "_Izvorno izdanje stranice" + +#: ../midori/midori-browser.c:3859 +msgid "View the source code of the page" +msgstr "Prikazuje izvorni kod stranice" + +#: ../midori/midori-browser.c:3861 +msgid "View Selection Source" +msgstr "I_zvorno izdanje izabranog" + +#: ../midori/midori-browser.c:3862 +msgid "View the source code of the selection" +msgstr "Prikazuje izvorni kod izabranog dela stranice" + +#: ../midori/midori-browser.c:3866 +msgid "Toggle fullscreen view" +msgstr "Prikazuje program preko celog ekrana" + +#: ../midori/midori-browser.c:3868 +msgid "_Go" +msgstr "_Idi" + +#: ../midori/midori-browser.c:3871 +msgid "Go back to the previous page" +msgstr "Ide na prethodnu stranicu" + +#: ../midori/midori-browser.c:3874 +msgid "Go forward to the next page" +msgstr "Ide na sledeću stranicu" + +#: ../midori/midori-browser.c:3877 +msgid "Go to your homepage" +msgstr "Ide na početnu stranu" + +#: ../midori/midori-browser.c:3879 +msgid "Empty Trash" +msgstr "Isprazni smeće" + +#: ../midori/midori-browser.c:3880 +msgid "Delete the contents of the trash" +msgstr "Briše sav sadržaj iz smeća" + +#: ../midori/midori-browser.c:3882 ../midori/midori-view.c:1233 +msgid "Undo Close Tab" +msgstr "Vrati list" + +#: ../midori/midori-browser.c:3883 +msgid "Open the last closed tab" +msgstr "Otvara list koji ste poslednji zatvorili" + +#: ../midori/midori-browser.c:3887 ../panels/midori-bookmarks.c:230 +msgid "Add a new bookmark" +msgstr "Dodaj obeleživač" + +#: ../midori/midori-browser.c:3889 ../panels/midori-bookmarks.c:259 +msgid "Add a new folder" +msgstr "Dodaj novu fasciklu" + +#: ../midori/midori-browser.c:3890 +msgid "Add a new bookmark folder" +msgstr "Dodaje novu fasciklu za obeleživače" + +#: ../midori/midori-browser.c:3891 +msgid "_Tools" +msgstr "_Alati" + +#: ../midori/midori-browser.c:3893 ../midori/midori-searchaction.c:493 +msgid "_Manage Search Engines" +msgstr "Po_desi pretraživače" + +#: ../midori/midori-browser.c:3894 +msgid "Add, edit and remove search engines..." +msgstr "Otvara prozorče za dodavanje, uređivanje ili uklanjanje pretraživača." + +#: ../midori/midori-browser.c:3897 +msgid "_Clear Private Data" +msgstr "Očisti _lične podatke" + +#: ../midori/midori-browser.c:3898 +msgid "Clear private data..." +msgstr "Briše sve lične podatke." + +#: ../midori/midori-browser.c:3902 +msgid "_Previous Tab" +msgstr "_Prethodni list" + +#: ../midori/midori-browser.c:3903 +msgid "Switch to the previous tab" +msgstr "Ide na prethodni list" + +#: ../midori/midori-browser.c:3905 +msgid "_Next Tab" +msgstr "_Sledeći list" + +#: ../midori/midori-browser.c:3906 +msgid "Switch to the next tab" +msgstr "Ide na naredni list" + +#: ../midori/midori-browser.c:3908 +msgid "_Help" +msgstr "_Pomoć" + +#: ../midori/midori-browser.c:3910 +msgid "_Contents" +msgstr "_Sadržaj" + +#: ../midori/midori-browser.c:3911 +msgid "Show the documentation" +msgstr "Prikazuje pomoć za upotrebu programa" + +#: ../midori/midori-browser.c:3913 +msgid "_Frequent Questions" +msgstr "_Česta pitanja" + +#: ../midori/midori-browser.c:3914 +msgid "Show the Frequently Asked Questions" +msgstr "Prikazuje često postavljena pitanja" + +#: ../midori/midori-browser.c:3916 +msgid "_Report a Bug" +msgstr "Prijavi _grešku" + +#: ../midori/midori-browser.c:3917 +msgid "Open Midori's bug tracker" +msgstr "Otvara Midorijevu stranicu za prijavu greški" + +#: ../midori/midori-browser.c:3920 +msgid "Show information about the program" +msgstr "Prikazuje podatke o programu" + +#: ../midori/midori-browser.c:3927 +msgid "P_rivate Browsing" +msgstr "Čuvanje priva_tnosti" + +#: ../midori/midori-browser.c:3928 +msgid "Don't save any private data while browsing" +msgstr "Ne čuva nikakve lične podatke tokom razgledanja Interneta" + +#: ../midori/midori-browser.c:3933 +msgid "_Menubar" +msgstr "Traka sa _menijem" + +#: ../midori/midori-browser.c:3934 +msgid "Show menubar" +msgstr "Prikazuje meni programa" + +#: ../midori/midori-browser.c:3937 +msgid "_Navigationbar" +msgstr "_Glavna traka" + +#: ../midori/midori-browser.c:3938 +msgid "Show navigationbar" +msgstr "Prikazuje površ za kretanje kroz veb stranice" + +#: ../midori/midori-browser.c:3941 +msgid "Side_panel" +msgstr "Bočna _površ" + +#: ../midori/midori-browser.c:3942 +msgid "Show sidepanel" +msgstr "Prikazuje bočnu površ" + +#: ../midori/midori-browser.c:3945 +msgid "_Bookmarkbar" +msgstr "_Obeleživači" + +#: ../midori/midori-browser.c:3946 +msgid "Show bookmarkbar" +msgstr "Prikazuje površ sa obeleživačima" + +#: ../midori/midori-browser.c:3949 +msgid "_Transferbar" +msgstr "Prenosi" + +#: ../midori/midori-browser.c:3950 +msgid "Show transferbar" +msgstr "Prikazuje traku sa prenosima datoteka" + +#: ../midori/midori-browser.c:3953 +msgid "_Statusbar" +msgstr "Traka sa sta_njem" + +#: ../midori/midori-browser.c:3954 +msgid "Show statusbar" +msgstr "Prikazuje ili sakriva traku sa stanjem" + +#: ../midori/midori-browser.c:4389 +msgid "_Separator" +msgstr "_Razdvajač" + +#: ../midori/midori-browser.c:4396 +msgid "_Location..." +msgstr "Na _adresu..." + +#: ../midori/midori-browser.c:4398 +msgid "Open a particular location" +msgstr "Otvara izabranu adresu" + +#: ../midori/midori-browser.c:4420 +msgid "_Web Search..." +msgstr "P_retraži Internet..." + +#: ../midori/midori-browser.c:4422 +msgid "Run a web search" +msgstr "Ide na stranicu za pretragu Interneta" + +#: ../midori/midori-browser.c:4443 +msgid "Reopen a previously closed tab or window" +msgstr "Vrati prethodne prozore i listove čitača" + +#: ../midori/midori-browser.c:4458 +msgid "_Recently visited pages" +msgstr "_Skorašnje stranice" + +#: ../midori/midori-browser.c:4460 +msgid "Reopen pages that you visited earlier" +msgstr "Otvara stranice koje ste ranije posetili" + +#: ../midori/midori-browser.c:4475 ../midori/sokoke.c:872 +msgid "_Bookmarks" +msgstr "_Obeleživači" + +#: ../midori/midori-browser.c:4477 +msgid "Show the saved bookmarks" +msgstr "Prikazuje sačuvane obeleživače" + +#: ../midori/midori-browser.c:4492 +msgid "_Window" +msgstr "_Prozor" + +#: ../midori/midori-browser.c:4494 +msgid "Show a list of all open tabs" +msgstr "Prikazuje spisak svih otvorenih listova" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:4674 +msgid "_Inline Find:" +msgstr "_Traži izraz:" + +#: ../midori/midori-browser.c:4699 +msgid "Previous" +msgstr "Prethodno" + +#: ../midori/midori-browser.c:4704 +msgid "Next" +msgstr "Sledeće" + +#: ../midori/midori-browser.c:4709 +msgid "Match Case" +msgstr "Uporedi velčinu slova" + +#: ../midori/midori-browser.c:4717 +msgid "Highlight Matches" +msgstr "Istakni nađeno" + +#: ../midori/midori-browser.c:4727 +msgid "Close Findbar" +msgstr "Zatvara traku za pretragu stranice" + +#: ../midori/midori-browser.c:4762 ../extensions/cookie-manager.c:821 +msgid "Delete All" +msgstr "Obriši _sve" + +#: ../midori/midori-browser.c:5084 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Neočekivana postavka „%s“" + +#: ../midori/midori-panel.c:333 +msgid "Detach chosen panel from the window" +msgstr "Otkači površ iz prozora" + +#: ../midori/midori-panel.c:335 +msgid "Whether to detach the chosen panel from the window" +msgstr "Otkačuje izabranu površ iz prozora" + +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:535 +msgid "Align sidepanel on the right" +msgstr "Postavi bočnu površ desno" + +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:536 +msgid "Whether to align the sidepanel on the right" +msgstr "Određuje da li da se bočna površ ravna sa desnom stranom" + +#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 +msgid "Close panel" +msgstr "Zatvori površ" + +#: ../midori/midori-websettings.c:187 ../midori/midori-view.c:1999 +#: ../midori/midori-view.c:2176 +msgid "Blank page" +msgstr "Prazna strana" + +#: ../midori/midori-websettings.c:188 ../midori/midori-websettings.c:555 +msgid "Homepage" +msgstr "Početna stranica" + +#: ../midori/midori-websettings.c:189 +msgid "Last open pages" +msgstr "Poslednje stranice" + +#: ../midori/midori-websettings.c:224 +msgid "New tab" +msgstr "novom listu" + +#: ../midori/midori-websettings.c:225 +msgid "New window" +msgstr "novom prozoru" + +#: ../midori/midori-websettings.c:226 +msgid "Current tab" +msgstr "trenutnom listu" + +#: ../midori/midori-websettings.c:241 +msgid "Default" +msgstr "Uobičajeno" + +#: ../midori/midori-websettings.c:242 +msgid "Icons" +msgstr "Ikonice" + +#: ../midori/midori-websettings.c:243 +msgid "Text" +msgstr "Tekst" + +#: ../midori/midori-websettings.c:244 +msgid "Both" +msgstr "Tekst ispod ikonica" + +#: ../midori/midori-websettings.c:245 +msgid "Both horizontal" +msgstr "Tekst pored ikonica" + +#: ../midori/midori-websettings.c:260 +msgid "All cookies" +msgstr "Sve kolačiće" + +#: ../midori/midori-websettings.c:261 +msgid "Session cookies" +msgstr "Kolačiće sesije" + +#: ../midori/midori-websettings.c:262 ../panels/midori-addons.c:94 +msgid "None" +msgstr "Ništa" + +#: ../midori/midori-websettings.c:278 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:279 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:280 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:333 +msgid "Remember last window size" +msgstr "Zapamti veličinu prozora" + +#: ../midori/midori-websettings.c:334 +msgid "Whether to save the last window size" +msgstr "Da li da sačuvam poslednju veličinu prozora" + +#: ../midori/midori-websettings.c:342 +msgid "Last window width" +msgstr "Širina prozora" + +#: ../midori/midori-websettings.c:343 +msgid "The last saved window width" +msgstr "Poslednja sačuvana širina prozora" + +#: ../midori/midori-websettings.c:351 +msgid "Last window height" +msgstr "Visina prozora" + +#: ../midori/midori-websettings.c:352 +msgid "The last saved window height" +msgstr "Poslednja sačuvana visina prozora" + +#: ../midori/midori-websettings.c:377 +msgid "Last panel position" +msgstr "Mesto panela" + +#: ../midori/midori-websettings.c:378 +msgid "The last saved panel position" +msgstr "Poslednje sačuvano mesto panela" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:387 +msgid "Last panel page" +msgstr "Poslednja stanica panela" + +#: ../midori/midori-websettings.c:388 +msgid "The last saved panel page" +msgstr "Poslednja sačuvana stranica u panelu" + +#: ../midori/midori-websettings.c:396 +msgid "Last Web search" +msgstr "Poslednja pretraga" + +#: ../midori/midori-websettings.c:397 +msgid "The last saved Web search" +msgstr "Poslednja sačuvana Internet pretraga" + +#: ../midori/midori-websettings.c:406 +msgid "Show Menubar" +msgstr "Prikaži meni" + +#: ../midori/midori-websettings.c:407 +msgid "Whether to show the menubar" +msgstr "Određuje da li je prikazana traka sa menijem" + +#: ../midori/midori-websettings.c:415 +msgid "Show Navigationbar" +msgstr "Prikaži glavnu traku" + +#: ../midori/midori-websettings.c:416 +msgid "Whether to show the navigationbar" +msgstr "Određuje da li je prikazana glavna traka" + +#: ../midori/midori-websettings.c:424 +msgid "Show Bookmarkbar" +msgstr "Prikaži obeleživače" + +#: ../midori/midori-websettings.c:425 +msgid "Whether to show the bookmarkbar" +msgstr "Određuje da li su prikazani obeleživači" + +#: ../midori/midori-websettings.c:433 +msgid "Show Panel" +msgstr "Prikaži bočnu površ" + +#: ../midori/midori-websettings.c:434 +msgid "Whether to show the panel" +msgstr "Određuje da li je prikazana bočna površ" + +#: ../midori/midori-websettings.c:449 +msgid "Show Transferbar" +msgstr "Prikaži prenose" + +#: ../midori/midori-websettings.c:450 +msgid "Whether to show the transferbar" +msgstr "Određuje da li je prikazana traka sa prenosima" + +#: ../midori/midori-websettings.c:458 +msgid "Show Statusbar" +msgstr "Prikaži traku sa stanjem" + +#: ../midori/midori-websettings.c:459 +msgid "Whether to show the statusbar" +msgstr "Određuje da li je prikazana traka sa stanjem" + +#: ../midori/midori-websettings.c:468 +msgid "Toolbar Style" +msgstr "Izgled trake sa alatkama" + +#: ../midori/midori-websettings.c:469 +msgid "The style of the toolbar" +msgstr "Određuje izgled trake sa alatkama" + +#: ../midori/midori-websettings.c:485 +msgid "Show progress in location entry" +msgstr "Prikaži napredak u polje za adrese" + +#: ../midori/midori-websettings.c:486 +msgid "Whether to show loading progress in the location entry" +msgstr "Prikazuje napredak učitavanja stranice u polje za unos adresa" + +#: ../midori/midori-websettings.c:501 +msgid "Search engines in location completion" +msgstr "Prikaži pretraživače u polje za adresu" + +#: ../midori/midori-websettings.c:502 +msgid "Whether to show search engines in the location completion" +msgstr "Prikazuje pretraživače u polje za unos adresa" + +#: ../midori/midori-websettings.c:510 +msgid "Toolbar Items" +msgstr "Stavke u traci sa alatkama" + +#: ../midori/midori-websettings.c:511 +msgid "The items to show on the toolbar" +msgstr "Stavke prikazane u traci sa alatkama" + +#: ../midori/midori-websettings.c:519 +msgid "Compact Sidepanel" +msgstr "Sabij bočnu površ" + +#: ../midori/midori-websettings.c:520 +msgid "Whether to make the sidepanel compact" +msgstr "Zbija neke stavke u bočnoj površi" + +#: ../midori/midori-websettings.c:545 +msgid "Load on Startup" +msgstr "Učitaj po pokretanju" + +#: ../midori/midori-websettings.c:546 +msgid "What to load on startup" +msgstr "Određuje šta se učitava po pokretanju" + +#: ../midori/midori-websettings.c:556 +msgid "The homepage" +msgstr "Početna stranica" + +#: ../midori/midori-websettings.c:571 +msgid "Show crash dialog" +msgstr "Prikaži prozorče prilikom pada programa" + +#: ../midori/midori-websettings.c:572 +msgid "Show a dialog after Midori crashed" +msgstr "Prikaži prozorče pri padu Midorija" + +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:588 +msgid "Show speed dial in new tabs" +msgstr "Prikaži brze posete u novim listovima" + +#: ../midori/midori-websettings.c:589 +msgid "Show speed dial in newly opened tabs" +msgstr "Uključuje prikaz brzih adresa u novim listovima" + +#: ../midori/midori-websettings.c:597 +msgid "Download Folder" +msgstr "Fascikla za preuzeto" + +#: ../midori/midori-websettings.c:598 +msgid "The folder downloaded files are saved to" +msgstr "Fascikle u koju se smeštaju preuzete datoteke" + +#: ../midori/midori-websettings.c:617 +msgid "Ask for the destination folder" +msgstr "Pitaj za odredišnu fasciklu" + +#: ../midori/midori-websettings.c:618 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "Pita za odredišnu fasciklu prilikom preuzimanja datoteke" + +#: ../midori/midori-websettings.c:637 +msgid "Notify when a transfer has been completed" +msgstr "Obavesti me po završenom prenosu" + +#: ../midori/midori-websettings.c:638 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "Prikazuje obaveštenje kada se završi preuzimanje datoteke" + +#: ../midori/midori-websettings.c:650 +msgid "Download Manager" +msgstr "Preuzimač datoteka" + +#: ../midori/midori-websettings.c:651 +msgid "An external download manager" +msgstr "Spoljni program za preuzimanje datoteka" + +#: ../midori/midori-websettings.c:659 +msgid "Text Editor" +msgstr "Uređivač teksta" + +#: ../midori/midori-websettings.c:660 +msgid "An external text editor" +msgstr "Spoljni program za uređivanje teksta" + +#: ../midori/midori-websettings.c:675 +msgid "News Aggregator" +msgstr "Čitač vesti" + +#: ../midori/midori-websettings.c:676 +msgid "An external news aggregator" +msgstr "Spoljni program za čitanje vesti" + +#: ../midori/midori-websettings.c:684 +msgid "Location entry Search" +msgstr "Pretraga u polje za adrese" + +#: ../midori/midori-websettings.c:685 +msgid "The search to perform inside the location entry" +msgstr "Dodaje mogućnost pretrage iz polja za unos adresa" + +#: ../midori/midori-websettings.c:693 +msgid "Preferred Encoding" +msgstr "Prednost kodiranju" + +#: ../midori/midori-websettings.c:694 +msgid "The preferred character encoding" +msgstr "Kodiranje znakova koje će biti u prednosti" + +#: ../midori/midori-websettings.c:704 +msgid "Always Show Tabbar" +msgstr "Uvek prikaži jezičke" + +#: ../midori/midori-websettings.c:705 +msgid "Always show the tabbar" +msgstr "Uvek prikazuje traku sa jezičcima" + +#: ../midori/midori-websettings.c:713 +msgid "Close Buttons on Tabs" +msgstr "Prikaži dugme za zatvaranje listova" + +#: ../midori/midori-websettings.c:714 +msgid "Whether tabs have close buttons" +msgstr "Prikazuje dugme za zatvaranje na svakom listu" + +# bug(slobo): jednostavno razlistaj? +#: ../midori/midori-websettings.c:722 +msgid "Open new pages in" +msgstr "Otvori nove stranice u" + +#: ../midori/midori-websettings.c:723 +msgid "Where to open new pages" +msgstr "Određuje gde da se otvaraju nove stranice" + +#: ../midori/midori-websettings.c:732 +msgid "Open external pages in" +msgstr "Otvori spoljne stranice u" + +#: ../midori/midori-websettings.c:733 +msgid "Where to open externally opened pages" +msgstr "Određuje gde se otvaraju spoljne stranice" + +#: ../midori/midori-websettings.c:746 +msgid "Middle click opens Selection" +msgstr "Otvori izabrano na srednji klik" + +#: ../midori/midori-websettings.c:747 +msgid "Load an address from the selection via middle click" +msgstr "Učitava adresu iz izabranog na srednji klik mišem" + +#: ../midori/midori-websettings.c:755 +msgid "Open tabs in the background" +msgstr "Otvori listove u pozadini" + +#: ../midori/midori-websettings.c:756 +msgid "Whether to open new tabs in the background" +msgstr "Ne prelazi na novi list već ga otvara u pozadini" + +#: ../midori/midori-websettings.c:764 +msgid "Open Tabs next to Current" +msgstr "Otvori list pored trenutnog" + +#: ../midori/midori-websettings.c:765 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Određuje da li se novi list otvara pored tekućeg ili pored poslednjeg lista" + +#: ../midori/midori-websettings.c:773 +msgid "Open popups in tabs" +msgstr "Smesti iskačuće prozore u list" + +#: ../midori/midori-websettings.c:774 +msgid "Whether to open popup windows in tabs" +msgstr "Otvara iskačuće prozore u novim listovima" + +#: ../midori/midori-websettings.c:790 +msgid "Zoom Text and Images" +msgstr "Uvećaj tekst i slike" + +#: ../midori/midori-websettings.c:791 +msgid "Whether to zoom text and images" +msgstr "Povećaj tekst i slike" + +#: ../midori/midori-websettings.c:806 +msgid "Find inline while typing" +msgstr "Nađi dok kucam" + +#: ../midori/midori-websettings.c:807 +msgid "Whether to automatically find inline while typing" +msgstr "Automatski proverava pisanje dok kucate tekst" + +#: ../midori/midori-websettings.c:815 +msgid "Accept cookies" +msgstr "Prihvati kolačiće" + +#: ../midori/midori-websettings.c:816 +msgid "What type of cookies to accept" +msgstr "Koje kolačiće da prihvatim" + +#: ../midori/midori-websettings.c:825 +msgid "Original cookies only" +msgstr "Samo originalne kolačiće" + +#: ../midori/midori-websettings.c:826 +msgid "Accept cookies from the original website only" +msgstr "Prihvata kolačiće samo sa originalnih veb stranica" + +#: ../midori/midori-websettings.c:834 +msgid "Maximum cookie age" +msgstr "Starost kolačića" + +#: ../midori/midori-websettings.c:835 +msgid "The maximum number of days to save cookies for" +msgstr "Broj dana nakon čega se uklanjaju kolačići sa računara" + +#: ../midori/midori-websettings.c:845 +msgid "Remember last visited pages" +msgstr "Zapamti poslednje posećene stranice" + +#: ../midori/midori-websettings.c:846 +msgid "Whether the last visited pages are saved" +msgstr "Čuva stranice koje ste poslednje posetili" + +#: ../midori/midori-websettings.c:854 +msgid "Maximum history age" +msgstr "Starost istorijata" + +#: ../midori/midori-websettings.c:855 +msgid "The maximum number of days to save the history for" +msgstr "Broj dana nakon kojih se uklanja istorijat poseta stranica" + +#: ../midori/midori-websettings.c:863 +msgid "Remember last form inputs" +msgstr "Zapamti poslednje unose u polja" + +#: ../midori/midori-websettings.c:864 +msgid "Whether the last form inputs are saved" +msgstr "Čuva poslednje unose u polja veb stranica" + +#: ../midori/midori-websettings.c:872 +msgid "Remember last downloaded files" +msgstr "Zapamti poslednje preuzete datoteke" + +#: ../midori/midori-websettings.c:873 +msgid "Whether the last downloaded files are saved" +msgstr "Čuva datoteke koje ste poslednje preuzeli" + +#: ../midori/midori-websettings.c:883 +msgid "Proxy Server" +msgstr "Proksi server" + +#: ../midori/midori-websettings.c:884 +msgid "The proxy server used for HTTP connections" +msgstr "Proksi server za HTTP veze" + +#: ../midori/midori-websettings.c:899 +msgid "Detect proxy server automatically" +msgstr "Sam odredi proksi server" + +#: ../midori/midori-websettings.c:900 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Pokušava da sam odredi proksi server na osnovu okruženja" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:916 +msgid "Identify as" +msgstr "Predstavi se kao" + +#: ../midori/midori-websettings.c:917 +msgid "What to identify as to web pages" +msgstr "Određuje kako se program predstavlja veb stranicama" + +#: ../midori/midori-websettings.c:933 +msgid "Identification string" +msgstr "Rečenica za predstavanje" + +#: ../midori/midori-websettings.c:934 +msgid "The application identification string" +msgstr "Rečenica koja određuje kako veb stranice prepoznaju program" + +#: ../midori/midori-websettings.c:942 +msgid "Cache size" +msgstr "Veličina ostave" + +#: ../midori/midori-websettings.c:943 +msgid "The allowed size of the cache" +msgstr "Dozvoljena veličina ostave" + +#: ../midori/midori-view.c:686 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Ne mogu da učitam stranicu „%s“." + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#: ../midori/midori-view.c:688 ../midori/midori-view.c:2701 +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Greška" + +#: ../midori/midori-view.c:691 +msgid "Try again" +msgstr "Pokušaj ponovo" + +#. 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 +#, c-format +msgid "Not found - %s" +msgstr "Nije pronađeno - %s" + +#: ../midori/midori-view.c:1095 +msgid "Open _Link" +msgstr "_Otvori vezu" + +#: ../midori/midori-view.c:1097 +msgid "Open Link in New _Tab" +msgstr "Otvori vezu u novom _listu" + +#: ../midori/midori-view.c:1114 +msgid "Open Link in New _Window" +msgstr "Otvori vezu u _novom prozoru" + +#: ../midori/midori-view.c:1123 +msgid "_Download Link destination" +msgstr "Preuzmi _ciljnu datoteku" + +#: ../midori/midori-view.c:1129 +msgid "_Save Link destination" +msgstr "Sačuvaj ci_ljnu datoteku" + +#: ../midori/midori-view.c:1138 +msgid "Download with Download _Manager" +msgstr "Pre_uzmi pomoću spoljašnjeg programa" + +#: ../midori/midori-view.c:1167 +msgid "Search _with" +msgstr "Pre_traži sa" + +#: ../midori/midori-view.c:1195 +msgid "_Search the Web" +msgstr "P_retraži Internet" + +# bug: no plural-forms +#: ../midori/midori-view.c:1205 +msgid "Open Address in New _Tab" +msgstr "Otvoru adresu u novom _listu" + +#: ../midori/midori-view.c:1372 +msgid "Open or download file" +msgstr "Otvori ili preuzmi datoteku" + +#: ../midori/midori-view.c:1389 +#, c-format +msgid "File Type: '%s'" +msgstr "Vrsta datoteke: „%s“" + +#: ../midori/midori-view.c:1392 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Vrsta datoteke: %s („%s“)" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1396 +#, c-format +msgid "Open %s" +msgstr "Otvori %s" + +#: ../midori/midori-view.c:1816 +#, c-format +msgid "Inspect page - %s" +msgstr "Inspekcija stranice — %s" + +#: ../midori/midori-view.c:2001 ../midori/midori-view.c:2002 +msgid "Search" +msgstr "Nađi" + +#: ../midori/midori-view.c:2003 +msgid "Click to add a shortcut" +msgstr "Kliknite za dodavanje prečice" + +#: ../midori/midori-view.c:2004 +msgid "Enter shortcut address" +msgstr "Unesite adresu za prečicu" + +#: ../midori/midori-view.c:2005 +msgid "Enter shortcut title" +msgstr "Unesite naslov za prečicu" + +#: ../midori/midori-view.c:2006 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Da li zaista želite da obrišete ovu prečicu?" + +#: ../midori/midori-view.c:2038 +#, c-format +msgid "Document cannot be displayed" +msgstr "Ne mogu da prikažem dokumant" + +#: ../midori/midori-view.c:2055 +#, c-format +msgid "No documentation installed" +msgstr "Nije instalirana pomoć" + +#: ../midori/midori-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "Postavke za %s" + +#. Page "General" +#: ../midori/midori-preferences.c:398 +msgid "General" +msgstr "Opšte" + +#: ../midori/midori-preferences.c:399 +msgid "Startup" +msgstr "Pokretanje" + +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "Iskoristi trenutnu stranicu" + +#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Prenosi" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:440 +msgid "Appearance" +msgstr "Izgled" + +#: ../midori/midori-preferences.c:441 +msgid "Font settings" +msgstr "Podešavanje fontova" + +#: ../midori/midori-preferences.c:443 +msgid "Default Font Family" +msgstr "Uobičajeni fontovi" + +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "Podrazumevani fontovi za prikaz teksta" + +#: ../midori/midori-preferences.c:450 +msgid "The default font size used to display text" +msgstr "Podrazumevani veličina fontova za prikaz teksta" + +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "Fontovi zadate širine" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "Podrazumevani fontovi zadate širine za prikaz teksta" + +#: ../midori/midori-preferences.c:458 +msgid "Minimum Font Size" +msgstr "Najmanja veličina fonta" + +#: ../midori/midori-preferences.c:461 +msgid "The minimum font size used to display text" +msgstr "najmanja veličina fontova za prikaz teksta" + +#: ../midori/midori-preferences.c:468 +msgid "Encoding" +msgstr "Kodiranje" + +#: ../midori/midori-preferences.c:471 +msgid "The character encoding to use by default" +msgstr "Podrazumevano kodiranje teksta" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:478 +msgid "Behavior" +msgstr "Ponašanje" + +#: ../midori/midori-preferences.c:479 +msgid "Features" +msgstr "Mogućnosti" + +#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54 +msgid "Load images automatically" +msgstr "Sam učitaj slike" + +#: ../midori/midori-preferences.c:483 +msgid "Load and display images automatically" +msgstr "Učitava i automatski prikazuje slike" + +#: ../midori/midori-preferences.c:486 +msgid "Shrink images automatically" +msgstr "Sam umanji slike" + +#: ../midori/midori-preferences.c:487 +msgid "Automatically shrink standalone images to fit" +msgstr "Sam umanji slike kako bi se uklopile u stranicu" + +#: ../midori/midori-preferences.c:490 +msgid "Print background images" +msgstr "Prikaži pozadinske slike" + +#: ../midori/midori-preferences.c:491 +msgid "Whether background images should be printed" +msgstr "Određuje da li treba prikazati slike za pozadinu" + +#: ../midori/midori-preferences.c:494 +msgid "Resizable text areas" +msgstr "Omogući promenu veličine teksta" + +#: ../midori/midori-preferences.c:495 +msgid "Whether text areas are resizable" +msgstr "Omogućava promenu veličine oblasti sa tekstom" + +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 +msgid "Enable scripts" +msgstr "Uključi skripte" + +#: ../midori/midori-preferences.c:499 +msgid "Enable embedded scripting languages" +msgstr "uključuje umetnute jezike za skripte" + +#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72 +msgid "Enable Netscape plugins" +msgstr "Uključi Netscape dodatke" + +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" +msgstr "Omogućava objekte sa ugnežđenim Netscape dodacima" + +#: ../midori/midori-preferences.c:506 +msgid "Enforce 96 dots per inch" +msgstr "Primoraj 96 tačaka po inču" + +#: ../midori/midori-preferences.c:507 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Primorava gustinu tačaka ekrana od 96 TPI" + +#: ../midori/midori-preferences.c:510 +msgid "Enable developer tools" +msgstr "Uključi alate za razvoj" + +#: ../midori/midori-preferences.c:511 +msgid "Enable special extensions for developers" +msgstr "Uključi dodatna proširenja za razvoj" + +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "Provera pisanja" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "Uključi proveru pisanja" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "Uključi proveru pisanja dok kucam" + +#: ../midori/midori-preferences.c:525 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" +"Spisak jezika jezika za proveru pisanja razdvojeni zarezom " +"(npr. en_GB,sh_YU,sr_YU)" + +#. Page "Interface" +#: ../midori/midori-preferences.c:530 +msgid "Interface" +msgstr "Sučelje" + +#: ../midori/midori-preferences.c:531 +msgid "Navigationbar" +msgstr "Glavna traka" + +#: ../midori/midori-preferences.c:542 +msgid "Browsing" +msgstr "Razgledanje" + +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "Programi" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "Spoljni programi" + +#. Page "Network" +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:620 +msgid "Network" +msgstr "Mreža" + +#: ../midori/midori-preferences.c:647 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:652 +msgid "Privacy" +msgstr "Privatnost" + +#: ../midori/midori-preferences.c:653 +msgid "Web Cookies" +msgstr "Kolačići" + +#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676 +msgid "days" +msgstr "dana" + +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:314 +msgid "Empty" +msgstr "Prazno" + +#: ../midori/midori-searchaction.c:904 +msgid "Add search engine" +msgstr "Dodaj pretraživač" + +#: ../midori/midori-searchaction.c:904 +msgid "Edit search engine" +msgstr "Uredi pretračivač" + +#: ../midori/midori-searchaction.c:932 +msgid "_Name:" +msgstr "_Ime:" + +#: ../midori/midori-searchaction.c:976 +msgid "_Icon:" +msgstr "I_konica:" + +#: ../midori/midori-searchaction.c:990 +msgid "_Token:" +msgstr "_Fraza:" + +#: ../midori/midori-searchaction.c:1195 +msgid "Manage Search Engines" +msgstr "Podesi pretraživače" + +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "_Postavi kao podrazumevani" + +#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 +msgid "Could not run external program." +msgstr "Ne mogu da pokrenem spoljni program." + +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:520 +msgid "Warning: You are using a superuser account!" +msgstr "Upozorenje: Koristite administratorski nalog!" + +#: ../midori/sokoke.c:871 +msgid "_Bookmark" +msgstr "_Obeleživač" + +#: ../midori/sokoke.c:873 +msgid "_Add Bookmark" +msgstr "_Dodaj obeleživač" + +#: ../midori/sokoke.c:874 +msgid "_Console" +msgstr "_Konzola" + +#: ../midori/sokoke.c:875 +msgid "_Extensions" +msgstr "P_roširenja" + +#: ../midori/sokoke.c:876 +msgid "_History" +msgstr "_Istorijat" + +#: ../midori/sokoke.c:877 +msgid "_Homepage" +msgstr "Na po_četnu stranicu" + +#: ../midori/sokoke.c:878 +msgid "_Userscripts" +msgstr "Lične _skripte" + +#: ../midori/sokoke.c:879 +msgid "User_styles" +msgstr "Lični s_tilovi" + +#: ../midori/sokoke.c:880 +msgid "New _Tab" +msgstr "Novi _list" + +#: ../midori/sokoke.c:881 +msgid "_Transfers" +msgstr "Pr_enoisi" + +#: ../midori/sokoke.c:882 +msgid "Netscape p_lugins" +msgstr "Netscape _dodaci" + +#: ../midori/sokoke.c:883 +msgid "_Closed Tabs and Windows" +msgstr "_Zatvoreni listovi i prozori" + +#: ../midori/sokoke.c:884 +msgid "New _Window" +msgstr "_Novi prozor" + +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 +msgid "Userscripts" +msgstr "Lične skripte" + +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 +msgid "Userstyles" +msgstr "Lični stilovi" + +#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Uključi" + +#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "Uključi" + +#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154 +msgid "_Disable" +msgstr "_Isključi" + +#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "Isključi" + +#: ../panels/midori-bookmarks.c:107 +msgid "Bookmarks" +msgstr "Obeleživači" + +#: ../panels/midori-bookmarks.c:238 +msgid "Edit the selected bookmark" +msgstr "Uredi izabrani obeleživač" + +#: ../panels/midori-bookmarks.c:246 +msgid "Delete the selected bookmark" +msgstr "Ukloni izabrani obeleživač" + +#: ../panels/midori-bookmarks.c:591 +msgid "Separator" +msgstr "Razdvajač" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konzola" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Proširenja" + +#: ../panels/midori-history.c:162 +msgid "Are you sure you want to remove all history items?" +msgstr "Da li zaista želite da uklonite sve stavke iz istorijata?" + +#: ../panels/midori-history.c:217 +msgid "Bookmark the selected history item" +msgstr "Postavi izabrani iz istorijata u obeleživače" + +#: ../panels/midori-history.c:226 +msgid "Delete the selected history item" +msgstr "Ukloni izabranu stavku iz istorijata" + +#: ../panels/midori-history.c:234 +msgid "Clear the entire history" +msgstr "Očisti istorijat" + +#: ../panels/midori-history.c:599 +msgid "A week ago" +msgstr "Pre nedelju dana" + +#: ../panels/midori-history.c:604 +#, c-format +msgid "%d day ago" +msgstr "Pre %d dan" + +#: ../panels/midori-history.c:605 +#, c-format +msgid "%d days ago" +msgstr "Pre %d dana" + +#: ../panels/midori-history.c:612 +msgid "Today" +msgstr "Danas" + +#: ../panels/midori-history.c:614 +msgid "Yesterday" +msgstr "Juče" + +#: ../panels/midori-plugins.c:87 +msgid "Netscape plugins" +msgstr "Netscape dodaci" + +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s od %s" + +#: ../katze/katze-http-auth.c:97 +msgid "Authentication Required" +msgstr "Potrebna je prijava" + +#: ../katze/katze-http-auth.c:113 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Potrebno su korisničko ime i lozinka za\n" +"otvaranje ove stranice:" + +#: ../katze/katze-http-auth.c:127 +msgid "Username" +msgstr "Korisničko ime" + +#: ../katze/katze-http-auth.c:138 +msgid "Password" +msgstr "Lozinka" + +#: ../katze/katze-throbber.c:828 +#, c-format +#, fuzzy +msgid "Named icon '%s' couldn't be loaded" +msgstr "Ne mogu da imenovanu učitam ikonicu „%s“" + +#: ../katze/katze-throbber.c:841 +#, c-format +#, fuzzy +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Ne mogu da učitam stok ikonicu „%s“" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Okviri sa animacijama su neispravni" + +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:385 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Vrednost „%s“ nije ispravna za %s" + +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:244 +msgid "Choose file" +msgstr "Izaberite datoteku" + +#: ../katze/katze-utils.c:230 +msgid "Choose folder" +msgstr "Izaberite fasciklu" + +#: ../extensions/colorful-tabs.c:115 +msgid "Tint tabs distinctly" +msgstr "Drugačije oboji listove" + +#: ../extensions/colorful-tabs.c:151 +msgid "Colorful Tabs" +msgstr "Listovi u boji" + +#: ../extensions/colorful-tabs.c:152 +msgid "Tint each tab distinctly" +msgstr "Boji svaku karticu drugačije" + +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "Na kraju sesije" + +#: ../extensions/cookie-manager.c:204 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Domaćin: %s\n" +"Ime: %s\n" +"Vrednost: %s\n" +"Putanja: %s\n" +"Sigurnost: %s\n" +"Ističe: %s" + +#: ../extensions/cookie-manager.c:210 +msgid "Yes" +msgstr "Da" + +#: ../extensions/cookie-manager.c:210 +msgid "No" +msgstr "Ne" + +#: ../extensions/cookie-manager.c:493 +msgid "Do you really want to delete all cookies?" +msgstr "Da li želite da obrišete sve kolačiće" + +#: ../extensions/cookie-manager.c:495 +msgid "Question" +msgstr "Pitanje" + +#: ../extensions/cookie-manager.c:504 +msgid "Only cookies which match the filter will be deleted." +msgstr "Biće obrisani samo kolačići koji se poklapaju sa zadatim filterom." + +#: ../extensions/cookie-manager.c:682 +msgid "Name" +msgstr "Ime" + +#: ../extensions/cookie-manager.c:742 +msgid "_Expand All" +msgstr "_Proširi sve" + +#: ../extensions/cookie-manager.c:750 +msgid "_Collapse All" +msgstr "_Sakupi sve" + +#: ../extensions/cookie-manager.c:823 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Briše sve prikazane kolačiće. Ukoliko je postavljen filter obrisaće samo " +"kolačiće koji se poklapaju sa filterom." + +#: ../extensions/cookie-manager.c:838 +msgid "Expand All" +msgstr "Proširi sve" + +#: ../extensions/cookie-manager.c:845 +msgid "Collapse All" +msgstr "Sakupi sve" + +#: ../extensions/cookie-manager.c:876 +msgid "Filter:" +msgstr "Filter:" + +#: ../extensions/cookie-manager.c:881 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Unesite reč za filtriranje kolačića čiji se nazivi ili adrese poklapaju sa " +"filterom" + +#: ../extensions/cookie-manager.c:916 ../extensions/cookie-manager.c:964 +msgid "Cookie Manager" +msgstr "Upravnik kolačićima" + +#: ../extensions/cookie-manager.c:948 +msgid "_Cookie Manager" +msgstr "_Upravnik kolačićima" + +#: ../extensions/cookie-manager.c:965 +msgid "List, view and delete cookies" +msgstr "Ispisuje, uređuje i uklanja kolačiće" + +#: ../extensions/feed-panel/feed-atom.c:242 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "Ne mogu da nađem potrebni Atom „entry“ među XML podacima." + +#: ../extensions/feed-panel/feed-atom.c:348 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "Ne mogu da nađem potrebni Atom „fees“ među XML podacima." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Zadnji pit ažuriran: %s." + +#: ../extensions/feed-panel/feed-panel.c:664 +msgid "Feeds" +msgstr "Dovodi" + +#: ../extensions/feed-panel/feed-panel.c:717 +msgid "Add new feed" +msgstr "Dodaj novi dovod" + +#: ../extensions/feed-panel/feed-panel.c:724 +msgid "Delete feed" +msgstr "Obriči dovod" + +#: ../extensions/feed-panel/feed-panel.c:807 +msgid "_Feeds" +msgstr "_Dovodi" + +#: ../extensions/feed-panel/feed-parse.c:175 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Ne mogu da nađem izvorne podatke među XML podacima." + +#: ../extensions/feed-panel/feed-parse.c:215 +#, c-format +msgid "Unsupported feed format." +msgstr "Nije podržan format dovoda." + +#: ../extensions/feed-panel/feed-parse.c:245 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Ne mogu da obradim XML dovod: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "Ne mogu da nađem element „channel“ među XML podacima." + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Pronađeno je nepodržano izdanje vesti." + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "Ne mogu da nađem potrebni „item“ element vesti među XML podacima." + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "Ne mogu da nađem potrebni „channel“ element vesti među XML podacima." + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Dovod „%s“ već postoji" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Greška pri učitavanju dodova „%s“" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "Novi dovod" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Površ sa dovodima" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "Čita Atome / dovode sa vestima" + +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "Gestovi miša" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "Upravlja Midorijem pomoću miša" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +msgid "Pageholder" +msgstr "Umetnuta stranica" + +#: ../extensions/page-holder.c:161 +msgid "_Pageholder" +msgstr "_Umetnuta stranica" + +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "Mogućnosti linije sa stanjem" + +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "Jednostavno uključuje i isključuje opcije na veb stranicama" diff --git a/po/tr.po b/po/tr.po index 01e7540d..c82a2f14 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2,13 +2,14 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Mirat Can Bayrak +# Gökmen Görgen msgid "" msgstr "" -"Project-Id-Version: midori 0.1.0\n" +"Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-12-06 05:25+0100\n" -"PO-Revision-Date: 2008-11-10 16:53+0200\n" -"Last-Translator: Mirat Can Bayrak \n" +"PO-Revision-Date: 2009-07-11 15:15+0200\n" +"Last-Translator: Gökmen Görgen \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -19,8 +20,11 @@ msgstr "" msgid "Lightweight web browser" msgstr "Hafif web tarayıcı " -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +#: ../midori.desktop.in.h:2 +#: ../midori/main.c:1338 +#: ../midori/main.c:1347 +#: ../midori/main.c:1370 +#: ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -32,7 +36,8 @@ msgstr "Web Tarayıcı" msgid "_Bookmark" msgstr "_Yer imi" -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 +#: ../midori/main.c:87 +#: ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Yer İmleri" @@ -42,11 +47,11 @@ msgstr "_Yer İmi Ekle" #: ../midori/main.c:89 msgid "_Console" -msgstr "_Konsol" +msgstr "_Uçbirim" #: ../midori/main.c:90 msgid "_Extensions" -msgstr "_Eklentiler" +msgstr "_Ek Özellikler" #: ../midori/main.c:91 msgid "_History" @@ -62,11 +67,11 @@ msgstr "_Kullanıcı betikleri" #: ../midori/main.c:94 msgid "User_styles" -msgstr "Kullanıcı _stilleri" +msgstr "Kullanıcı _biçimleri" #: ../midori/main.c:95 msgid "New _Tab" -msgstr "Yeni _Tab" +msgstr "Yeni _Sekme" #: ../midori/main.c:96 msgid "_Transfers" @@ -74,7 +79,7 @@ msgstr "_Aktarımlar" #: ../midori/main.c:97 msgid "_Closed Tabs and Windows" -msgstr "_Kapatılmış Pencereler ve Tablar" +msgstr "_Kapatılmış Pencereler ve Sekmeler" #: ../midori/main.c:98 msgid "New _Window" @@ -90,20 +95,23 @@ msgstr "Ayarlar yüklenemedi: %s\n" msgid "Value '%s' is invalid for %s" msgstr "'%s' değeri şunun için yanlış : %s" -#: ../midori/main.c:205 ../midori/main.c:275 -#, fuzzy, c-format +#: ../midori/main.c:205 +#: ../midori/main.c:275 +#, c-format msgid "Invalid configuration value '%s'" -msgstr "İşlenemeyen ayar değeri '%s'" +msgstr "Geçersiz yapılandırma değeri '%s'" #: ../midori/main.c:532 msgid "File not found." -msgstr "Dosya bulunamadı" +msgstr "Dosya bulunamadı." -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/main.c:540 +#: ../midori/main.c:549 msgid "Malformed document." -msgstr "Bozuk biçimli döküman" +msgstr "Kötü biçimlendirilmiş belge." -#: ../midori/main.c:571 ../midori/main.c:603 +#: ../midori/main.c:571 +#: ../midori/main.c:603 #, c-format msgid "Failed to open database: %s\n" msgstr "Şu veri tabanı açılamadı: %s\n" @@ -118,7 +126,8 @@ msgstr "Şu geçmiş öğesi silinemedi: %s\n" msgid "Failed to clear history: %s\n" msgstr "Geçmiş temizlenemedi: %s\n" -#: ../midori/main.c:714 ../midori/main.c:728 +#: ../midori/main.c:714 +#: ../midori/main.c:728 #, c-format msgid "Failed to add history item: %s\n" msgstr "Geçmiş öğesi eklenemedi: %s\n" @@ -129,27 +138,29 @@ msgstr "Geçmiş öğesi eklenemedi: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Eski geçmiş öğeleri silinemedi: %s\n" -#: ../midori/main.c:976 ../midori/sokoke.c:459 +#: ../midori/main.c:976 +#: ../midori/sokoke.c:459 #, c-format msgid "Writing failed." -msgstr "Yazma işlemi gerçekleştirilemedi" +msgstr "Yazma işlemi gerçekleştirilemedi." -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +#: ../midori/main.c:1000 +#: ../midori/midori-preferences.c:350 msgid "Transfers" msgstr "Aktarımlar" #: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" -msgstr "Bu oturum kaydedilemedi. %s" +msgstr "Oturum kaydedilemedi. %s" #: ../midori/main.c:1297 msgid "Run the specified filename as javascript" -msgstr "Belirtilen dosyayı javascript olarak kabul et ve çalıştır" +msgstr "Belirtilen dosya ismini javascript olarak çalıştır" #: ../midori/main.c:1299 msgid "Display program version" -msgstr "Program versiyonunu göster" +msgstr "Uygulama sürümünü göster" #: ../midori/main.c:1301 msgid "URIs" @@ -161,22 +172,20 @@ msgstr "[URIs]" #: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" -msgstr "" -"Lütfen yorumlarınızı, isteklerinizi ve yakaladığınız hataları şuraya " -"raporlayın:" +msgstr "Lütfen yorumlarınızı, isteklerinizi ve yakaladığınız hataları şuraya raporlayın:" #: ../midori/main.c:1373 msgid "Check for new versions at:" -msgstr "Yeni versiyonlar için şurayı kontrol edin:" +msgstr "Yeni sürümler için şuraya bakın:" #: ../midori/main.c:1394 msgid "No filename specified" -msgstr "Dosya ismi belirtlilmedi" +msgstr "Dosya ismi belirtilmedi" #: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" -msgstr "Şu anda Midori'nin başka bir örneği çalışıyor fakat cevap vermiyor.\n" +msgstr "Şu anda Midori'nin başka bir örneği çalışıyor; ama cevap vermiyor.\n" #: ../midori/main.c:1447 #, c-format @@ -204,7 +213,7 @@ msgstr "Şu hatalar ortaya çıktı:" #: ../midori/main.c:1520 msgid "_Ignore" -msgstr "" +msgstr "_Yoksay" #: ../midori/main.c:1688 #, c-format @@ -226,12 +235,14 @@ msgstr "Çöp kutusu kaydedilemedi. %s" msgid "The configuration couldn't be saved. %s" msgstr "Ayarlar kaydedilemedi. %s" -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:249 +#: ../midori/midori-browser.c:3130 #: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Bu sayfayı yeniden yükle" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:261 +#: ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Bu sayfayı yüklemeyi durdur" @@ -243,7 +254,7 @@ msgstr "%d%% yüklendi" #: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." -msgstr "beklenmedik hareket '%s'." +msgstr "Beklenmedik eylem '%s'." #: ../midori/midori-browser.c:508 msgid "New bookmark" @@ -257,21 +268,23 @@ msgstr "Yer imini düzenle" msgid "_Title:" msgstr "_Başlık:" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:543 +#: ../midori/midori-searchaction.c:841 msgid "_Description:" msgstr "_Açıklama:" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:562 +#: ../midori/midori-searchaction.c:855 msgid "_URL:" msgstr "_URL:" #: ../midori/midori-browser.c:578 msgid "_Folder:" -msgstr "_Klasör:" +msgstr "_Dizin:" #: ../midori/midori-browser.c:582 msgid "Root" -msgstr "Root" +msgstr "Kök" #: ../midori/midori-browser.c:668 msgid "Save file as" @@ -283,11 +296,11 @@ msgstr "Dosya aç" #: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" -msgstr "Yeni tabda aç" +msgstr "Yeni _Sekmede Aç" #: ../midori/midori-browser.c:2330 msgid "Open in New _Window" -msgstr "Yeni Pencerede aç" +msgstr "Yeni _Pencerede aç" #: ../midori/midori-browser.c:2601 msgid "Separator" @@ -296,7 +309,7 @@ msgstr "Ayraç" #: ../midori/midori-browser.c:2712 #, c-format msgid "A week ago" -msgstr "" +msgstr "Bir hafta önce" #: ../midori/midori-browser.c:2718 #, c-format @@ -313,15 +326,17 @@ msgstr "Dün" #: ../midori/midori-browser.c:2816 msgid "A lightweight web browser." -msgstr "Hafif bir web tarayıcısı" +msgstr "Hafif bir web tarayıcı." #: ../midori/midori-browser.c:2824 msgid "translator-credits" -msgstr "Mirat Can Bayrak " +msgstr "" +"Mirat Can Bayrak \n" +"Gökmen Görgen " #: ../midori/midori-browser.c:2958 msgid "Are you sure you want to remove all history items?" -msgstr "Bütün geçmiş öğelerini silmek istediğinizden emin misiniz?" +msgstr "Bütün geçmiş ögelerini silmek istediğinizden emin misiniz?" #: ../midori/midori-browser.c:3064 msgid "_File" @@ -333,7 +348,7 @@ msgstr "Yeni bir pencerede aç" #: ../midori/midori-browser.c:3070 msgid "Open a new tab" -msgstr "Yeni bir tabda aç" +msgstr "Yeni bir sekmede aç" #: ../midori/midori-browser.c:3073 msgid "Open a file" @@ -345,11 +360,11 @@ msgstr "Bir dosyaya kaydet" #: ../midori/midori-browser.c:3078 msgid "_Close Tab" -msgstr "_Tabı kapat" +msgstr "Sekmeyi _kapat" #: ../midori/midori-browser.c:3079 msgid "Close the current tab" -msgstr "Geçerli tabı kapat" +msgstr "Geçerli sekmeyi kapat" #: ../midori/midori-browser.c:3081 msgid "C_lose Window" @@ -375,7 +390,8 @@ msgstr "_Düzenle" msgid "Cut the selected text" msgstr "Seçili metni kes" -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "Seçili metni kopyala" @@ -417,11 +433,11 @@ msgstr "Ç_abuk Bul" #: ../midori/midori-browser.c:3121 msgid "Quickly jump to a word or phrase" -msgstr "Hemen kelime yada ibarenin olduğu noktaya zıpla" +msgstr "Hemen kelime yada ibarenin olduğu yeri göster" #: ../midori/midori-browser.c:3124 msgid "Configure the application preferences" -msgstr "Uygulamanın ayarlarını düzenle" +msgstr "Uygulama tercihlerini yapılandır" #: ../midori/midori-browser.c:3126 msgid "_View" @@ -437,31 +453,32 @@ msgstr "Yakınlaştırma seviyesini arttır" #: ../midori/midori-browser.c:3142 msgid "Decrease the zoom level" -msgstr "Yakınlaşma seviyesini azalt" +msgstr "Yakınlaştırma seviyesini azalt" #: ../midori/midori-browser.c:3145 msgid "Reset the zoom level" -msgstr "Yakınlaşma oranını sıfırla" +msgstr "Yakınlaştırma oranını sıfırla" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +#: ../midori/midori-browser.c:3147 +#: ../midori/midori-view.c:998 msgid "View _Source" -msgstr "Ka_ynağı Gör" +msgstr "_Sayfa Kaynağını görüntüle" #: ../midori/midori-browser.c:3148 msgid "View the source code of the page" -msgstr "Geçerli sayfanın kaynak kodunu gör" +msgstr "Geçerli sayfanın kaynak kodunu görüntüle" #: ../midori/midori-browser.c:3150 msgid "View Selection Source" -msgstr "Seçim kaynağını gör" +msgstr "Seçim Kaynağını Görüntüle" #: ../midori/midori-browser.c:3151 msgid "View the source code of the selection" -msgstr "Geçerli seçime ait kaynak kodu gör" +msgstr "Geçerli seçime ait kaynak kodu görüntüle" #: ../midori/midori-browser.c:3155 msgid "Toggle fullscreen view" -msgstr "Tam ekran modunu aç/kapat" +msgstr "Tam ekran modunu aç / kapat" #: ../midori/midori-browser.c:3157 msgid "_Go" @@ -487,13 +504,14 @@ msgstr "Çöp Kutusunu Boşalt" msgid "Delete the contents of the trash" msgstr "Çöp Kutusu içerisindeki bütün içeriği sil" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +#: ../midori/midori-browser.c:3171 +#: ../midori/midori-view.c:970 msgid "Undo Close Tab" -msgstr "Tab kapatmayı geri al" +msgstr "Sekme kapatmayı geri al" #: ../midori/midori-browser.c:3172 msgid "Open the last closed tab" -msgstr "Son kapatılan tabı geri açar" +msgstr "Son kapatılan sekmeyi aç" #: ../midori/midori-browser.c:3176 msgid "Add a new bookmark" @@ -523,7 +541,8 @@ msgstr "Seçili geçmiş öğesini yer imlerine ekle" msgid "_Tools" msgstr "_Araçlar" -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3195 +#: ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "Arama _Motorlarını Yönet" @@ -533,19 +552,19 @@ msgstr "Arama motorlarını ekle, sil ve düzenle..." #: ../midori/midori-browser.c:3200 msgid "_Previous Tab" -msgstr "Ön_ceki Tab" +msgstr "Ön_ceki Sekme" #: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" -msgstr "Önceki taba geç" +msgstr "Önceki sekmeye geç" #: ../midori/midori-browser.c:3203 msgid "_Next Tab" -msgstr "So_nraki Tab" +msgstr "So_nraki Sekme" #: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" -msgstr "Sonraki taba geç" +msgstr "Sonraki sekmeye geç" #: ../midori/midori-browser.c:3206 msgid "_Help" @@ -557,15 +576,15 @@ msgstr "_İçerik" #: ../midori/midori-browser.c:3209 msgid "Show the documentation" -msgstr "Dökümantasyonu göster" +msgstr "Belgelendirmeyi göster" #: ../midori/midori-browser.c:3211 msgid "_Frequent questions" -msgstr "_Sıkça sorulan sorular" +msgstr "_Sık sorulan sorular" #: ../midori/midori-browser.c:3212 msgid "Show the Frequently Asked Questions" -msgstr "Sıkça sorulan soruları gösterir" +msgstr "Sık Sorulan Soruları Göster" #: ../midori/midori-browser.c:3214 msgid "_Report a bug" @@ -573,15 +592,15 @@ msgstr "Hata _Raporla" #: ../midori/midori-browser.c:3215 msgid "Open Midori's bug tracker" -msgstr "Midori'nin hata takip sistemini açar" +msgstr "Midori'nin hata takip sistemini aç" #: ../midori/midori-browser.c:3218 msgid "Show information about the program" -msgstr "Program hakkında bilgi gösterir" +msgstr "Uygulama hakkında bilgi göster" #: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" -msgstr "G_izli Gezinti" +msgstr "G_izli Gezinme" #: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" @@ -597,7 +616,7 @@ msgstr "Menü çubuğunu göster" #: ../midori/midori-browser.c:3235 msgid "_Navigationbar" -msgstr "_Gezinti araç Çubuğu" +msgstr "Gezi_nti araç Çubuğu" #: ../midori/midori-browser.c:3236 msgid "Show navigationbar" @@ -613,7 +632,7 @@ msgstr "Yan paneli göster" #: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" -msgstr "_Yer imi araç çubuğu" +msgstr "Yer imi araç çu_buğu" #: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" @@ -621,11 +640,11 @@ msgstr "Yer imi araç çubuğunu göster" #: ../midori/midori-browser.c:3247 msgid "_Transferbar" -msgstr "_Aktarım araç çubuğu" +msgstr "Ak_tarım çubuğu" #: ../midori/midori-browser.c:3248 msgid "Show transferbar" -msgstr "Aktarım araç çubuğunu göster" +msgstr "Aktarım çubuğunu göster" #: ../midori/midori-browser.c:3251 msgid "_Statusbar" @@ -645,15 +664,15 @@ msgstr "Belirli bir konumu aç" #: ../midori/midori-browser.c:3695 msgid "_Web Search..." -msgstr "_Ağ Araması..." +msgstr "_Web Arama..." #: ../midori/midori-browser.c:3697 msgid "Run a web search" -msgstr "Bir ağ araması gerçekleştir" +msgstr "Bir web arama gerçekleştir" #: ../midori/midori-browser.c:3716 msgid "Reopen a previously closed tab or window" -msgstr "Daha önce kapatılmış bir pencereyi ya da tabı yeniden aç" +msgstr "Daha önce kapatılmış pencereyi ya da sekmeyi yeniden aç" #: ../midori/midori-browser.c:3729 msgid "_Recently visited pages" @@ -673,13 +692,14 @@ msgstr "_Pencere" #: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" -msgstr "Açık tabların bir listesini göster" +msgstr "Açık sekmelerin bir listesini göster" #: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "Yer imleri" -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +#: ../midori/midori-browser.c:3926 +#: ../midori/midori-preferences.c:517 msgid "History" msgstr "Geçmiş" @@ -690,30 +710,33 @@ msgstr "Sat_ıriçi bul:" #: ../midori/midori-browser.c:4004 msgid "Match Case" -msgstr "Duruma Eşle" +msgstr "Büyük - Küçük Harf Duyarlı" #: ../midori/midori-browser.c:4012 msgid "Highlight Matches" -msgstr "Eşlemeleri Işıklandır" +msgstr "Eşleşenleri Vurgula" #: ../midori/midori-browser.c:4021 msgid "Close Findbar" -msgstr "Arama çubuğunu Kapat" +msgstr "Arama Çubuğunu Kapat" #: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Beklenmedik ayar '%s'" -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:223 +#: ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Paneli kapat" -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +#: ../midori/midori-websettings.c:131 +#: ../midori/midori-view.c:1635 msgid "Blank page" -msgstr "Blank page" +msgstr "Boş sayfa" -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Anasayfa" @@ -771,21 +794,22 @@ msgstr "Metin" #: ../midori/midori-websettings.c:188 msgid "Both" -msgstr "Her ikiside" +msgstr "Her ikisi de" #: ../midori/midori-websettings.c:189 msgid "Both horizontal" -msgstr "İkiside yatay" +msgstr "İkisi de yatay" #: ../midori/midori-websettings.c:204 msgid "All cookies" -msgstr "Tüm kurabiyeler" +msgstr "Bütün çerezler" #: ../midori/midori-websettings.c:205 msgid "Session cookies" -msgstr "Oturum kurabiyeleri" +msgstr "Oturum çerezleri" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:206 +#: ../panels/midori-addons.c:97 msgid "None" msgstr "Yok" @@ -795,7 +819,7 @@ msgstr "Son pencerenin ölçülerini hatırla" #: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" -msgstr "" +msgstr "Son pencere boyu kaydedilsin" #: ../midori/midori-websettings.c:255 msgid "Last window width" @@ -832,11 +856,11 @@ msgstr "Son kaydedilmiş panel sayfası" #: ../midori/midori-websettings.c:292 msgid "Last Web search" -msgstr "Son ağ araması" +msgstr "Son Web Arama" #: ../midori/midori-websettings.c:293 msgid "The last saved Web search" -msgstr "Kaydedilmiş son ağ araması" +msgstr "Kaydedilmiş son web arama" #: ../midori/midori-websettings.c:302 msgid "Show Menubar" @@ -844,7 +868,7 @@ msgstr "Menü Çubuğunu Göster" #: ../midori/midori-websettings.c:303 msgid "Whether to show the menubar" -msgstr "" +msgstr "Menü çubuğu gösterilsin" #: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" @@ -852,7 +876,7 @@ msgstr "Gezinti Araç Çubuğunu Göster" #: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" -msgstr "" +msgstr "Navigasyon çubuğu gösterilsin" #: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" @@ -860,7 +884,7 @@ msgstr "Yer İmi Araç Çubuğunu Göster" #: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" -msgstr "" +msgstr "Yer imi araç çubuğu gösterilsin" #: ../midori/midori-websettings.c:329 msgid "Show Panel" @@ -868,7 +892,7 @@ msgstr "Paneli Göster" #: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" -msgstr "" +msgstr "Panel çubuğu gösterilsin" #: ../midori/midori-websettings.c:338 msgid "Show Statusbar" @@ -876,15 +900,15 @@ msgstr "Durum Çubuğunu Göster" #: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" -msgstr "" +msgstr "Durum çubuğu gösterilsin" #: ../midori/midori-websettings.c:348 msgid "Toolbar Style" -msgstr "Araç Çubuğu Sitili" +msgstr "Araç Çubuğu Biçimi" #: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" -msgstr "Araç çubuğunun sitili" +msgstr "Araç çubuğunun biçimi" #: ../midori/midori-websettings.c:358 msgid "Toolbar Items" @@ -892,7 +916,7 @@ msgstr "Araç Çubuğu Öğeleri" #: ../midori/midori-websettings.c:359 msgid "The items to show on the toolbar" -msgstr "Araç çubuğunun üzerinde gösterilecek öğeler" +msgstr "Araç çubuğunun üzerinde gösterilecek ögeler" #: ../midori/midori-websettings.c:367 msgid "Compact Sidepanel" @@ -900,7 +924,7 @@ msgstr "Küçük Yan Panel" #: ../midori/midori-websettings.c:368 msgid "Whether to make the sidepanel compact" -msgstr "" +msgstr "Yan panel küçük gösterilsin" #: ../midori/midori-websettings.c:377 msgid "Load on Startup" @@ -912,15 +936,15 @@ msgstr "Açılışta ne yüklenecek" #: ../midori/midori-websettings.c:388 msgid "The homepage" -msgstr "anasayfa" +msgstr "Anasayfa" #: ../midori/midori-websettings.c:396 msgid "Download Folder" -msgstr "İndirilecek Klasör" +msgstr "Dosya Kayıt Yeri" #: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" -msgstr "İndirilen dosyaların kaydedileceği klasör" +msgstr "İndirilen dosyaların kaydedileceği dizin" #: ../midori/midori-websettings.c:405 msgid "Download Manager" @@ -940,11 +964,11 @@ msgstr "Harici metin düzenleyici" #: ../midori/midori-websettings.c:423 msgid "Location entry Search" -msgstr "Konum girişi Arama" +msgstr "Konum Girişi Arama" #: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" -msgstr "Konum girişi içerisinde yapılacak arama" +msgstr "Konum girişi içinde yapılacak arama" #: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" @@ -956,27 +980,27 @@ msgstr "Tercih edilen karakter kodlaması" #: ../midori/midori-websettings.c:443 msgid "Always Show Tabbar" -msgstr "Tab Çubuğunu Her Zaman Göster" +msgstr "Sekme Çubuğunu Her Zaman Göster" #: ../midori/midori-websettings.c:444 msgid "Always show the tabbar" -msgstr "Tab Çubuğunu Her Zaman Göster" +msgstr "Sekme çubuğunu her zaman göster" #: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" -msgstr "Tablardaki Düğmeleri Kapat" +msgstr "Sekmelerde kapatma düğmesi" #: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" -msgstr "" +msgstr "Sekmelerde kapatma düğmesi olsun" #: ../midori/midori-websettings.c:462 msgid "Open new pages in" -msgstr "Yeni sayfaları aç" +msgstr "Yeni sayfaları şurada aç" #: ../midori/midori-websettings.c:463 msgid "Where to open new pages" -msgstr "Yeni sayfalar nereye açılacak" +msgstr "Yeni sayfaların açılacağı yer" #: ../midori/midori-websettings.c:473 msgid "Open external pages in" @@ -984,63 +1008,63 @@ msgstr "Harici sayfaları şu şekilde aç" #: ../midori/midori-websettings.c:474 msgid "Where to open externally opened pages" -msgstr "Harici açılan sayfalar nereye açılacak" +msgstr "Harici açılmış sayfaların açılacağı yer" #: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" -msgstr "Orta tuş seçimi açar" +msgstr "Orta tuşla seçimi aç" #: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" -msgstr "Orta tuş ile seçim içinden bir url yükle" +msgstr "Orta tuşla seçim içinden bir URL yükle" #: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" -msgstr "Tabları arkaplanda aç" +msgstr "Sekmeleri arkaplanda aç" #: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" -msgstr "" +msgstr "Sekmeler arka planda açılsın" #: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" -msgstr "Tabları geçerliden sonrakine aç" +msgstr "Sekmeleri geçerli sekmeden sonrakine aç" #: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" +msgstr "Yeni sekmelerin hangi sekmeden sonra açılacağını belirle" #: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" -msgstr "Popup pencereleri tablarda aç" +msgstr "Açılır pencereleri sekmelerde aç" #: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" -msgstr "" +msgstr "Açılır pencereler sekmelerde açılsın" #: ../midori/midori-websettings.c:537 msgid "Accept cookies" -msgstr "Kurabiyeleri kabul et" +msgstr "Çerezleri kabul et" #: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" -msgstr "Hangi tür kurabiyeler kabul edilecek" +msgstr "Kabul edilecek çerez türleri" #: ../midori/midori-websettings.c:547 msgid "Original cookies only" -msgstr "Sadece orjinal kurabiyeler" +msgstr "Sadece gerçek çerezler" #: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" -msgstr "Sadece orjinal web sitesine ait kurabiyeleri kabul et" +msgstr "Sadece asıl internet sitelerinden gelen çerezleri kabul et" #: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" -msgstr "Azami kurabiye ömrü" +msgstr "En çok çerez süresi" #: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" -msgstr "Kurabiyelerin saklanacağı azami gün sayısı" +msgstr "Çerezlerin saklanacağı en çok gün sayısı" #: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" @@ -1048,15 +1072,15 @@ msgstr "Son ziyaret edilen sayfaları hatırla" #: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" -msgstr "Eğer son ziyaret edilen sayfalar kaydedilmiş ise" +msgstr "Eğer son ziyaret edilen sayfalar kaydedilmişse" #: ../midori/midori-websettings.c:576 msgid "Maximum history age" -msgstr "Azami geçmiş yaşı" +msgstr "En çok geçmiş süresi" #: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" -msgstr "Geçmişin saklanacağı azami gün sayısı" +msgstr "Geçmişin saklanacağı en çok gün sayısı" #: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" @@ -1064,7 +1088,7 @@ msgstr "Son form girişlerini hatırla" #: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" -msgstr "Son form girişlerinin saklanacağı azami gün sayısı" +msgstr "Son form girişlerinin saklanacağı en çok gün sayısı" #: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" @@ -1072,7 +1096,7 @@ msgstr "Son indirilmiş dosyaları hatırla" #: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" -msgstr "Eğer son indirilmiş dosyalar kaydedildiyse" +msgstr "Eğer son indirilmiş dosyalar kaydedilmişse" #: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" @@ -1094,24 +1118,23 @@ msgstr "İzin verilen önbellek boyutu" #: ../midori/midori-view.c:632 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "Bulunamadı - %s" #: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" -msgstr "Bağlantıyı Yeni _Tabda Aç" +msgstr "Bağlantıyı Yeni _Sekmede Aç" #: ../midori/midori-view.c:925 -#, fuzzy msgid "_Save Link destination" -msgstr "Bağlantı Konumunu İnd_ir" +msgstr "Bağlantı konumunu kay_det" #: ../midori/midori-view.c:933 msgid "_Download Link destination" -msgstr "Bağlantı Konumunu İnd_ir" +msgstr "Bağlantı konumunu İnd_ir" #: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" -msgstr "URL'yi Yeni _Tabda aç" +msgstr "URL'yi yeni _sekmede aç" #: ../midori/midori-view.c:1365 #, c-format @@ -1123,9 +1146,9 @@ msgid "Source" msgstr "Kaynak" #: ../midori/midori-view.c:1527 -#, fuzzy, c-format +#, c-format msgid "No documentation installed" -msgstr "Dökümantasyonu göster" +msgstr "Kurulmuş belgelendirme yok" #: ../midori/midori-preferences.c:87 #, c-format @@ -1148,15 +1171,15 @@ msgstr "Görünüm" #: ../midori/midori-preferences.c:387 msgid "Font settings" -msgstr "Font seçenekleri" +msgstr "Yazıtipi seçenekleri" #: ../midori/midori-preferences.c:389 msgid "Default Font Family" -msgstr "Öntanımlı Font Ailesi" +msgstr "Öntanımlı Yazıtipi Ailesi" #: ../midori/midori-preferences.c:397 msgid "Minimum Font Size" -msgstr "Minimum Font Boyutu" +msgstr "En Küçük Yazıtipi Boyutu" #. Page "Behavior" #: ../midori/midori-preferences.c:407 @@ -1167,28 +1190,30 @@ msgstr "Davranış" msgid "Features" msgstr "Özellikler" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:411 +#: ../extensions/statusbar-features.c:32 msgid "Load images automatically" -msgstr "İmajları otomatik yükle" +msgstr "Resimleri otomatik yükle" #: ../midori/midori-preferences.c:414 msgid "Shrink images automatically" -msgstr "İmajları otomatik küçült" +msgstr "Resimleri otomatik küçült" #: ../midori/midori-preferences.c:417 -#, fuzzy msgid "Print background images" -msgstr "Arkaplanları yazdır" +msgstr "Arkaplan resimlerini yazdır" #: ../midori/midori-preferences.c:420 msgid "Resizable text areas" -msgstr "Yeniden boyutlandırılabilir metin alanları" +msgstr "Metin alanlarını yeniden boyutlandır" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:423 +#: ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Betiklere izin ver" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:426 +#: ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Eklentilere İzin ver" @@ -1209,7 +1234,8 @@ msgstr "Gezinti Araç Çubuğu" msgid "Browsing" msgstr "Gözden Geçiriliyor" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:481 msgid "Network" msgstr "Ağ" @@ -1224,13 +1250,15 @@ msgstr "Gizlilik" #: ../midori/midori-preferences.c:500 msgid "Web Cookies" -msgstr "Web Kurabiyeleri" +msgstr "Web Çerezleri" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:513 +#: ../midori/midori-preferences.c:524 msgid "days" -msgstr "günler" +msgstr "gün" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:456 +#: ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Boş" @@ -1248,29 +1276,31 @@ msgstr "_İsim:" #: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" -msgstr "_İkon (isim ya da dosya):" +msgstr "S_imge (isim ya da dosya):" #: ../midori/midori-searchaction.c:883 msgid "_Token:" -msgstr "_Alındı:" +msgstr "İşare_t:" #: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "Arama motorlarını yönet" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +#: ../midori/sokoke.c:63 +#: ../midori/sokoke.c:75 msgid "Could not run external program." -msgstr "Harici program çalıştırılamadı" +msgstr "Harici uygulama çalıştırılamadı." #: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" -msgstr "Dikkat: Süperkullanıcı hesabı kullanıyorsunuz!" +msgstr "Dikkat: Süper kullanıcı hesabı kullanıyorsunuz!" #: ../midori/gjs.c:514 msgid "An unknown error occured." -msgstr "Bilinmeyen hata oluştu" +msgstr "Bilinmeyen bir sorun oluştu." -#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#: ../midori/gjs.c:742 +#: ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "%s böyle bir özelliğe sahip değil '%s'" @@ -1285,59 +1315,66 @@ msgstr "%s şuna eşitlenemiyor %s.%s" msgid "%s.%s cannot be accessed" msgstr "Erişilemiyor: %s.%s " -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +#: ../panels/midori-addons.c:98 +#: ../panels/midori-addons.c:144 msgid "Userscripts" msgstr "Kullanıcı Betikleri" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:99 +#: ../panels/midori-addons.c:146 msgid "Userstyles" -msgstr "Kullanıcı Stilleri" +msgstr "Kullanıcı Biçimleri" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1006 +#: ../panels/midori-extensions.c:144 msgid "_Enable" -msgstr "_Etkin" +msgstr "_Etkinleştir" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1015 +#: ../panels/midori-extensions.c:153 msgid "_Disable" -msgstr "_Kapalı" +msgstr "_Devre dışı bırak" #: ../panels/midori-console.c:87 msgid "Console" -msgstr "Konsole" +msgstr "Uçbirim" #: ../panels/midori-extensions.c:87 msgid "Extensions" -msgstr "Eklentiler" +msgstr "Ek Özellikler" #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "'%s' olarak isimlendirilmiş ikon yüklenemiyor" +msgstr "'%s' olarak isimlendirilmiş simge yüklenemiyor" #: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "'%s' stok ikonu yüklenemedi" +msgstr "'%s' stok simgesi yüklenemedi" #: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" msgstr "Animasyon kareleri kırık" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:154 +#: ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' özelliği %s için geçersiz" -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:178 +#: ../katze/katze-utils.c:217 msgid "Choose file" -msgstr "Dosya Seç" +msgstr "Dosya seç" #: ../katze/katze-utils.c:198 msgid "Choose folder" -msgstr "Klasör seç" +msgstr "Dizin seç" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:109 +#: ../extensions/page-holder.c:144 msgid "Pageholder" msgstr "Sayfa Tutucu" @@ -1347,34 +1384,28 @@ msgstr "_Sayfa tutucu" #: ../extensions/statusbar-features.c:30 msgid "Images" -msgstr "" +msgstr "Resimler" #: ../extensions/statusbar-features.c:37 -#, fuzzy msgid "Scripts" -msgstr "Kullanıcı Betikleri" +msgstr "Betikler" #: ../extensions/statusbar-features.c:44 msgid "Plugins" -msgstr "" +msgstr "Eklentiler" #~ msgid "Open in Page_holder..." #~ msgstr "Sayfa_tutucu içerisinde aç" - #~ msgid "Open the current page in the pageholder" #~ msgstr "Geçerli sayfayı sayfa tutucu içinde aç" - #~ msgid "Last pageholder URI" #~ msgstr "Son sayfa tutacı URI" - #~ msgid "The URI last opened in the pageholder" #~ msgstr "Sayfa tutucu içinde son açılan URI" - #~ msgid "Load Provisional" #~ msgstr "Koşullu Yükle" - #~ msgid "Load Committed" #~ msgstr "İşlenmişi Yükle" - #~ msgid "Load Finished" #~ msgstr "Tamamlananı Yükle" + diff --git a/po/zh_CN.po b/po/zh_CN.po index 5c045b9e..2c17b106 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.6\n" +"Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-10 16:06+0200\n" -"PO-Revision-Date: 2009-05-20 10:56+0800\n" +"POT-Creation-Date: 2009-06-19 09:03+0800\n" +"PO-Revision-Date: 2009-06-19 09:12+0800\n" "Last-Translator: Stanley Zhang \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgid "Lightweight web browser" msgstr "轻量的 Web 浏览器" #: ../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:1339 +#: ../midori/main.c:1480 +#: ../midori/main.c:1488 +#: ../midori/main.c:1499 +#: ../midori/midori-websettings.c:285 msgid "Midori" msgstr "Midori" @@ -87,141 +87,145 @@ msgstr "删除旧的历史项目失败: %s\n" msgid "The configuration couldn't be saved. %s" msgstr "配置无法保存. %s" -#: ../midori/main.c:770 +#: ../midori/main.c:779 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "搜索引擎无法保存. %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 "书签无法保存. %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 "垃圾箱无法保存. %s" -#: ../midori/main.c:965 +#: ../midori/main.c:974 #, c-format msgid "The session couldn't be saved. %s" msgstr "会话无法保存. %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 "Midori 好像在上次运行时崩溃了. 如果这种情况反复出现, 请尝试下面的选项来解决此问题." -#: ../midori/main.c:1107 +#: ../midori/main.c:1116 msgid "Modify _preferences" msgstr "修改首选项(_p)" -#: ../midori/main.c:1111 +#: ../midori/main.c:1120 msgid "Reset the last _session" msgstr "重置最后的会话(_s)" -#: ../midori/main.c:1116 +#: ../midori/main.c:1125 msgid "Disable all _extensions" msgstr "关闭所有的扩展(_e)" -#: ../midori/main.c:1315 +#: ../midori/main.c:1339 msgid "No filename specified" msgstr "没有指定文件名" -#: ../midori/main.c:1338 +#: ../midori/main.c:1362 msgid "An unknown error occured." msgstr "发生了一个未知的错误." -#: ../midori/main.c:1370 +#: ../midori/main.c:1395 #, c-format msgid "Snapshot saved to: %s\n" msgstr "截图保存到: %s\n" -#: ../midori/main.c:1391 +#: ../midori/main.c:1417 msgid "Run ADDRESS as a web application" msgstr "将 ADDRESS 作为 Web 应用程序运行" -#: ../midori/main.c:1391 +#: ../midori/main.c:1417 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1393 +#: ../midori/main.c:1419 msgid "Use FOLDER as configuration folder" msgstr "使用 FOLDER 作为设置目录" -#: ../midori/main.c:1393 +#: ../midori/main.c:1419 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1395 +#: ../midori/main.c:1422 msgid "Run the specified filename as javascript" msgstr "将指定的文件当作 Javascript 执行" -#: ../midori/main.c:1398 +#: ../midori/main.c:1426 msgid "Take a snapshot of the specified URI" msgstr "对指定 URI 截图" -#: ../midori/main.c:1401 +#: ../midori/main.c:1429 +msgid "Execute the specified command" +msgstr "执行特定命令" + +#: ../midori/main.c:1431 msgid "Display program version" msgstr "显示程序版本" -#: ../midori/main.c:1403 +#: ../midori/main.c:1433 msgid "Addresses" msgstr "地址" -#: ../midori/main.c:1446 +#: ../midori/main.c:1477 msgid "[Addresses]" msgstr "[地址]" -#: ../midori/main.c:1469 +#: ../midori/main.c:1500 msgid "Please report comments, suggestions and bugs to:" msgstr "请将意见、建议和问题反馈到:" -#: ../midori/main.c:1471 +#: ../midori/main.c:1502 msgid "Check for new versions at:" msgstr "在此检查新版本:" -#: ../midori/main.c:1548 +#: ../midori/main.c:1581 msgid "The specified configuration folder is invalid." msgstr "无效的配置文件目录. " -#: ../midori/main.c:1583 +#: ../midori/main.c:1617 msgid "An instance of Midori is already running but not responding.\n" msgstr "已经有一个 Midori 在运行, 但没有响应.\n" -#: ../midori/main.c:1633 +#: ../midori/main.c:1667 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "搜索引擎无法加载. %s\n" -#: ../midori/main.c:1645 +#: ../midori/main.c:1679 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "书签无法加载: %s\n" -#: ../midori/main.c:1660 +#: ../midori/main.c:1694 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "会话无法加载: %s\n" -#: ../midori/main.c:1673 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "垃圾箱无法加载: %s\n" -#: ../midori/main.c:1686 +#: ../midori/main.c:1720 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "历史记录无法加载: %s\n" -#: ../midori/main.c:1698 +#: ../midori/main.c:1732 msgid "The following errors occured:" msgstr "发生以下错误:" -#: ../midori/main.c:1714 +#: ../midori/main.c:1748 msgid "_Ignore" msgstr "忽略(_I)" @@ -235,1209 +239,1227 @@ msgid "Malformed document." msgstr "异常的文件." #: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:716 +#: ../midori/sokoke.c:700 #, c-format msgid "Writing failed." msgstr "写失败." -#: ../midori/midori-browser.c:287 -#: ../midori/midori-browser.c:3819 -#: ../midori/midori-browser.c:3825 +#: ../midori/midori-browser.c:296 +#: ../midori/midori-browser.c:4021 +#: ../midori/midori-browser.c:4027 msgid "Reload the current page" msgstr "重新载入当前页" -#: ../midori/midori-browser.c:298 -#: ../midori/midori-browser.c:3822 +#: ../midori/midori-browser.c:307 +#: ../midori/midori-browser.c:4024 msgid "Stop loading the current page" msgstr "停止载入当前页" -#: ../midori/midori-browser.c:360 +#: ../midori/midori-browser.c:368 #, c-format msgid "%d%% loaded" msgstr "%d%% 已加载" -#: ../midori/midori-browser.c:385 +#: ../midori/midori-browser.c:393 #, c-format msgid "Unexpected action '%s'." msgstr "意外的活动 '%s'." -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:575 msgid "New folder" msgstr "新建目录" -#: ../midori/midori-browser.c:603 +#: ../midori/midori-browser.c:575 msgid "Edit folder" msgstr "编辑目录" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:577 msgid "New bookmark" msgstr "新建书签" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:577 msgid "Edit bookmark" msgstr "编辑书签" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:607 msgid "_Title:" msgstr "标题(_T): " -#: ../midori/midori-browser.c:648 +#: ../midori/midori-browser.c:620 #: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "描述(_D):" -#: ../midori/midori-browser.c:667 +#: ../midori/midori-browser.c:639 #: ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "地址(_A):" -#: ../midori/midori-browser.c:686 +#: ../midori/midori-browser.c:658 msgid "_Folder:" msgstr "目录(_F):" -#: ../midori/midori-browser.c:691 -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:663 +#: ../midori/midori-browser.c:704 msgid "Toplevel folder" msgstr "最上层目录" -#: ../midori/midori-browser.c:808 +#: ../midori/midori-browser.c:780 msgid "Save file as" msgstr "文件另存为" -#: ../midori/midori-browser.c:1119 +#: ../midori/midori-browser.c:1127 #, c-format msgid "The file %s has been downloaded." msgstr "文件 %s 已下载." -#: ../midori/midori-browser.c:1123 +#: ../midori/midori-browser.c:1131 msgid "Transfer completed" msgstr "下载完成" -#: ../midori/midori-browser.c:1820 +#: ../midori/midori-browser.c:1272 +msgid "Save file" +msgstr "保存文件" + +#: ../midori/midori-browser.c:1899 msgid "Open file" msgstr "打开文件" -#: ../midori/midori-browser.c:3152 -#: ../panels/midori-bookmarks.c:778 -#: ../panels/midori-history.c:808 +#: ../midori/midori-browser.c:3290 +#: ../panels/midori-bookmarks.c:781 +#: ../panels/midori-history.c:812 msgid "Open all in _Tabs" msgstr "在新标签页中打开所有项(_T)" -#: ../midori/midori-browser.c:3159 -#: ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:814 +#: ../midori/midori-browser.c:3297 +#: ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:818 #: ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "在新标签页中打开(_T)" -#: ../midori/midori-browser.c:3162 -#: ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:816 +#: ../midori/midori-browser.c:3300 +#: ../panels/midori-bookmarks.c:789 +#: ../panels/midori-history.c:820 #: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "在新窗口中打开(_W)" -#: ../midori/midori-browser.c:3425 +#: ../midori/midori-browser.c:3600 msgid "Clear Private Data" msgstr "清除隐私数据" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3604 msgid "_Clear private data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:3441 +#: ../midori/midori-browser.c:3617 msgid "Clear the following data:" msgstr "清除以下的数据:" -#: ../midori/midori-browser.c:3449 -#: ../midori/midori-preferences.c:669 +#: ../midori/midori-browser.c:3627 +#: ../midori/midori-preferences.c:675 #: ../panels/midori-history.c:108 msgid "History" msgstr "历史" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3632 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3637 msgid "'Flash' Cookies" msgstr "由 Flash 建立的 Cookies" -#: ../midori/midori-browser.c:3458 +#: ../midori/midori-browser.c:3642 msgid "Website icons" msgstr "网站图标" -#: ../midori/midori-browser.c:3538 +#: ../midori/midori-browser.c:3647 +#: ../midori/sokoke.c:867 +msgid "_Closed Tabs and Windows" +msgstr "关闭的标签页和窗口(_C)" + +#: ../midori/midori-browser.c:3730 msgid "A lightweight web browser." msgstr "轻量级的 Web 浏览器." -#: ../midori/midori-browser.c:3546 +#: ../midori/midori-browser.c:3738 msgid "translator-credits" msgstr "张翼 " -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:3955 msgid "_File" msgstr "文件(_F)" -#: ../midori/midori-browser.c:3753 +#: ../midori/midori-browser.c:3958 msgid "Open a new window" msgstr "新建窗口" -#: ../midori/midori-browser.c:3756 +#: ../midori/midori-browser.c:3961 msgid "Open a new tab" msgstr "新建标签页" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3964 msgid "Open a file" msgstr "打开文件" -#: ../midori/midori-browser.c:3762 +#: ../midori/midori-browser.c:3967 msgid "Save to a file" msgstr "保存到文件" -#: ../midori/midori-browser.c:3764 -#: ../midori/midori-view.c:1256 +#: ../midori/midori-browser.c:3969 +#: ../midori/midori-view.c:1340 msgid "Add to Speed _dial" msgstr "添加到快速拨号(_d)" -#: ../midori/midori-browser.c:3765 +#: ../midori/midori-browser.c:3970 msgid "Add shortcut to speed dial" msgstr "添加快捷方式到快速拨号" -#: ../midori/midori-browser.c:3767 +#: ../midori/midori-browser.c:3972 msgid "_Close Tab" msgstr "关闭标签页(_C)" -#: ../midori/midori-browser.c:3768 +#: ../midori/midori-browser.c:3973 msgid "Close the current tab" msgstr "关闭当前标签页" -#: ../midori/midori-browser.c:3770 +#: ../midori/midori-browser.c:3975 msgid "C_lose Window" msgstr "关闭窗口(_l)" -#: ../midori/midori-browser.c:3771 +#: ../midori/midori-browser.c:3976 msgid "Close this window" msgstr "关闭此窗口" -#: ../midori/midori-browser.c:3774 +#: ../midori/midori-browser.c:3979 msgid "Print the current page" msgstr "打印当前页" -#: ../midori/midori-browser.c:3777 +#: ../midori/midori-browser.c:3982 msgid "Quit the application" msgstr "退出程序" -#: ../midori/midori-browser.c:3779 +#: ../midori/midori-browser.c:3984 msgid "_Edit" msgstr "编辑(_E)" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:3987 msgid "Cut the selected text" msgstr "剪切选中的文本" -#: ../midori/midori-browser.c:3785 -#: ../midori/midori-browser.c:3788 +#: ../midori/midori-browser.c:3990 +#: ../midori/midori-browser.c:3993 msgid "Copy the selected text" msgstr "复制选中的文本" -#: ../midori/midori-browser.c:3791 +#: ../midori/midori-browser.c:3996 msgid "Paste text from the clipboard" msgstr "从剪贴板粘帖文本" -#: ../midori/midori-browser.c:3794 +#: ../midori/midori-browser.c:3999 msgid "Delete the selected text" msgstr "删除选中的文本" -#: ../midori/midori-browser.c:3797 +#: ../midori/midori-browser.c:4002 msgid "Select all text" msgstr "选取所有文本" -#: ../midori/midori-browser.c:3800 +#: ../midori/midori-browser.c:4005 msgid "Find a word or phrase in the page" msgstr "在页面中查找词或短语" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:4007 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../midori/midori-browser.c:3803 +#: ../midori/midori-browser.c:4008 msgid "Find the next occurrence of a word or phrase" msgstr "查找下一处" -#: ../midori/midori-browser.c:3805 +#: ../midori/midori-browser.c:4010 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../midori/midori-browser.c:3806 +#: ../midori/midori-browser.c:4011 msgid "Find the previous occurrence of a word or phrase" msgstr "查找上一处" -#: ../midori/midori-browser.c:3809 -msgid "_Quick Find" -msgstr "快速查找(_Q)" - -#: ../midori/midori-browser.c:3810 -msgid "Quickly jump to a word or phrase" -msgstr "快速跳转到一个词或短语" - -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:4015 msgid "Configure the application preferences" msgstr "设置程序首选项" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:4017 msgid "_View" msgstr "查看(_V)" -#: ../midori/midori-browser.c:3816 +#: ../midori/midori-browser.c:4018 msgid "_Toolbars" msgstr "工具栏(_T)" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:4030 msgid "Increase the zoom level" msgstr "提高放大倍数" -#: ../midori/midori-browser.c:3831 +#: ../midori/midori-browser.c:4033 msgid "Decrease the zoom level" msgstr "缩小放大倍数" -#: ../midori/midori-browser.c:3834 +#: ../midori/midori-browser.c:4036 msgid "Reset the zoom level" msgstr "重置放大倍数" -#: ../midori/midori-browser.c:3835 +#: ../midori/midori-browser.c:4037 msgid "_Encoding" msgstr "编码(_E)" -#: ../midori/midori-browser.c:3837 +#: ../midori/midori-browser.c:4039 msgid "_Automatic" msgstr "自动(_A)" -#: ../midori/midori-browser.c:3840 -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:4042 +#: ../midori/midori-websettings.c:212 msgid "Chinese (BIG5)" msgstr "繁体中文 (BIG5)" -#: ../midori/midori-browser.c:3843 -#: ../midori/midori-websettings.c:205 -msgid "Japanese (SHIFT_JIS)" -msgstr "日语 (SHIFT_JIS)" +#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic +#: ../midori/midori-browser.c:4046 +msgid "Japanese (SHIFT__JIS)" +msgstr "日语 (SHIFT__JIS)" -#: ../midori/midori-browser.c:3846 -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-browser.c:4049 +#: ../midori/midori-websettings.c:214 msgid "Russian (KOI8-R)" msgstr "俄语 (KOI8-R)" -#: ../midori/midori-browser.c:3849 -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-browser.c:4052 +#: ../midori/midori-websettings.c:215 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3852 -#: ../midori/midori-websettings.c:208 +#: ../midori/midori-browser.c:4055 +#: ../midori/midori-websettings.c:216 msgid "Western (ISO-8859-1)" msgstr "西方 (ISO-8859-1)" -#: ../midori/midori-browser.c:3855 -#: ../midori/midori-websettings.c:209 -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-browser.c:4058 +#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:289 msgid "Custom..." msgstr "定制 ..." -#: ../midori/midori-browser.c:3858 -#: ../midori/midori-view.c:1275 -msgid "View _Source" -msgstr "查看源码(_S)" +#: ../midori/midori-browser.c:4061 +#: ../midori/midori-view.c:1359 +msgid "View So_urce" +msgstr "查看源码(_u)" -#: ../midori/midori-browser.c:3859 +#: ../midori/midori-browser.c:4062 msgid "View the source code of the page" msgstr "查看本页的源代码" -#: ../midori/midori-browser.c:3861 +#: ../midori/midori-browser.c:4064 msgid "View Selection Source" msgstr "查看选中部分的源代码" -#: ../midori/midori-browser.c:3862 +#: ../midori/midori-browser.c:4065 msgid "View the source code of the selection" msgstr "查看选中部分的源代码" -#: ../midori/midori-browser.c:3866 +#: ../midori/midori-browser.c:4069 msgid "Toggle fullscreen view" msgstr "全屏浏览" -#: ../midori/midori-browser.c:3868 +#: ../midori/midori-browser.c:4071 msgid "_Go" msgstr "位置(_G)" -#: ../midori/midori-browser.c:3871 +#: ../midori/midori-browser.c:4074 msgid "Go back to the previous page" msgstr "返回上一页" -#: ../midori/midori-browser.c:3874 +#: ../midori/midori-browser.c:4077 msgid "Go forward to the next page" msgstr "转到下一页" -#: ../midori/midori-browser.c:3877 +#: ../midori/midori-browser.c:4080 msgid "Go to your homepage" msgstr "回到主页" -#: ../midori/midori-browser.c:3879 +#: ../midori/midori-browser.c:4082 msgid "Empty Trash" msgstr "清空垃圾箱" -#: ../midori/midori-browser.c:3880 +#: ../midori/midori-browser.c:4083 msgid "Delete the contents of the trash" msgstr "删除垃圾箱中的内容" -#: ../midori/midori-browser.c:3882 -#: ../midori/midori-view.c:1233 -msgid "Undo Close Tab" -msgstr "撤销关闭标签页" +#: ../midori/midori-browser.c:4085 +#: ../midori/midori-view.c:1317 +msgid "Undo _Close Tab" +msgstr "撤销关闭标签页(_C)" -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:4086 msgid "Open the last closed tab" msgstr "打开最后关闭的标签页" -#: ../midori/midori-browser.c:3887 -#: ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:4090 +#: ../panels/midori-bookmarks.c:231 msgid "Add a new bookmark" msgstr "添加一个新书签" -#: ../midori/midori-browser.c:3889 -#: ../panels/midori-bookmarks.c:259 -msgid "Add a new folder" -msgstr "添加新书签目录" +#: ../midori/midori-browser.c:4092 +msgid "Add a new _folder" +msgstr "添加新目录(_f)" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:4093 msgid "Add a new bookmark folder" msgstr "添加一个新书签目录" -#: ../midori/midori-browser.c:3891 +#: ../midori/midori-browser.c:4094 msgid "_Tools" msgstr "工具(_T)" -#: ../midori/midori-browser.c:3893 +#: ../midori/midori-browser.c:4096 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "管理搜索引擎(_M)" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:4097 msgid "Add, edit and remove search engines..." msgstr "添加, 编辑和移除搜索引擎" -#: ../midori/midori-browser.c:3897 +#: ../midori/midori-browser.c:4100 msgid "_Clear Private Data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:3898 +#: ../midori/midori-browser.c:4101 msgid "Clear private data..." msgstr "清除隐私数据 ..." -#: ../midori/midori-browser.c:3902 +#: ../midori/midori-browser.c:4105 msgid "_Previous Tab" msgstr "上一个标签页(_P)" -#: ../midori/midori-browser.c:3903 +#: ../midori/midori-browser.c:4106 msgid "Switch to the previous tab" msgstr "转到上一个标签页" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4108 msgid "_Next Tab" msgstr "下一个标签页(_N)" -#: ../midori/midori-browser.c:3906 +#: ../midori/midori-browser.c:4109 msgid "Switch to the next tab" msgstr "转到上一个标签页" -#: ../midori/midori-browser.c:3908 +#: ../midori/midori-browser.c:4111 msgid "_Help" msgstr "帮助(_H)" -#: ../midori/midori-browser.c:3910 +#: ../midori/midori-browser.c:4113 msgid "_Contents" msgstr "内容(_C)" -#: ../midori/midori-browser.c:3911 +#: ../midori/midori-browser.c:4114 msgid "Show the documentation" msgstr "显示文档" -#: ../midori/midori-browser.c:3913 +#: ../midori/midori-browser.c:4116 msgid "_Frequent Questions" msgstr "常见问题(_F)" -#: ../midori/midori-browser.c:3914 +#: ../midori/midori-browser.c:4117 msgid "Show the Frequently Asked Questions" msgstr "显示常见问题" -#: ../midori/midori-browser.c:3916 +#: ../midori/midori-browser.c:4119 msgid "_Report a Bug" msgstr "反馈错误(_R)" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4120 msgid "Open Midori's bug tracker" msgstr "打开 Midori 的错误跟踪器" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4123 msgid "Show information about the program" msgstr "显示此程序的信息" -#: ../midori/midori-browser.c:3927 +#: ../midori/midori-browser.c:4130 msgid "P_rivate Browsing" msgstr "隐私浏览(_r)" -#: ../midori/midori-browser.c:3928 +#: ../midori/midori-browser.c:4131 msgid "Don't save any private data while browsing" msgstr "在浏览时不保存任何隐私数据" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4136 msgid "_Menubar" msgstr "菜单栏(_M)" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4137 msgid "Show menubar" msgstr "显示菜单栏" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4140 msgid "_Navigationbar" msgstr "导航栏(_N)" -#: ../midori/midori-browser.c:3938 +#: ../midori/midori-browser.c:4141 msgid "Show navigationbar" msgstr "显示导航栏" -#: ../midori/midori-browser.c:3941 +#: ../midori/midori-browser.c:4144 msgid "Side_panel" msgstr "侧边栏(_p)" -#: ../midori/midori-browser.c:3942 +#: ../midori/midori-browser.c:4145 msgid "Show sidepanel" msgstr "显示侧边栏" -#: ../midori/midori-browser.c:3945 +#: ../midori/midori-browser.c:4148 msgid "_Bookmarkbar" msgstr "书签栏(_B)" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4149 msgid "Show bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:4152 msgid "_Transferbar" msgstr "传输栏(_T)" -#: ../midori/midori-browser.c:3950 +#: ../midori/midori-browser.c:4153 msgid "Show transferbar" msgstr "显示传输栏" -#: ../midori/midori-browser.c:3953 +#: ../midori/midori-browser.c:4156 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../midori/midori-browser.c:3954 +#: ../midori/midori-browser.c:4157 msgid "Show statusbar" msgstr "显示状态栏" -#: ../midori/midori-browser.c:4389 +#: ../midori/midori-browser.c:4581 msgid "_Separator" msgstr "分割符(_S)" -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:4588 msgid "_Location..." msgstr "位置(_L)" -#: ../midori/midori-browser.c:4398 +#: ../midori/midori-browser.c:4590 msgid "Open a particular location" msgstr "打开一个指定位置" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4614 msgid "_Web Search..." msgstr "搜索 Web(_W)" -#: ../midori/midori-browser.c:4422 +#: ../midori/midori-browser.c:4616 msgid "Run a web search" msgstr "执行 Web 搜索" -#: ../midori/midori-browser.c:4443 +#: ../midori/midori-browser.c:4637 msgid "Reopen a previously closed tab or window" msgstr "重新打开以前关闭的标签页或窗口" -#: ../midori/midori-browser.c:4458 +#: ../midori/midori-browser.c:4652 msgid "_Recently visited pages" msgstr "最近访问的页面(_R)" -#: ../midori/midori-browser.c:4460 +#: ../midori/midori-browser.c:4654 msgid "Reopen pages that you visited earlier" msgstr "重新打开以前访问过的页面" -#: ../midori/midori-browser.c:4475 -#: ../midori/sokoke.c:872 +#: ../midori/midori-browser.c:4669 +#: ../midori/sokoke.c:856 msgid "_Bookmarks" msgstr "书签(_B)" -#: ../midori/midori-browser.c:4477 +#: ../midori/midori-browser.c:4671 msgid "Show the saved bookmarks" msgstr "显示保存的书签" -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4686 msgid "_Window" msgstr "窗口(_W)" -#: ../midori/midori-browser.c:4494 +#: ../midori/midori-browser.c:4688 msgid "Show a list of all open tabs" msgstr "显示所有标签页的列表" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4674 +#: ../midori/midori-browser.c:4863 msgid "_Inline Find:" msgstr "查找(_I):" -#: ../midori/midori-browser.c:4699 +#: ../midori/midori-browser.c:4888 msgid "Previous" msgstr "上一个" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4893 msgid "Next" msgstr "下一个" -#: ../midori/midori-browser.c:4709 +#: ../midori/midori-browser.c:4898 msgid "Match Case" msgstr "区分大小写" -#: ../midori/midori-browser.c:4717 +#: ../midori/midori-browser.c:4906 msgid "Highlight Matches" msgstr "高亮显示匹配" -#: ../midori/midori-browser.c:4727 +#: ../midori/midori-browser.c:4916 msgid "Close Findbar" msgstr "关闭查找栏" -#: ../midori/midori-browser.c:4762 -#: ../extensions/cookie-manager.c:821 +#: ../midori/midori-browser.c:4951 +#: ../extensions/cookie-manager/cookie-manager-page.c:109 msgid "Delete All" msgstr "删除所有项目" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5265 #, c-format msgid "Unexpected setting '%s'" msgstr "意外的设置 '%s'" +#: ../midori/midori-locationaction.c:915 +#, c-format +msgid "Search with %s" +msgstr "使用%s搜索" + #: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "从窗口中分离选择的面板" -#: ../midori/midori-panel.c:335 -msgid "Whether to detach the chosen panel from the window" -msgstr "将选中的面板从窗口中分离" +#: ../midori/midori-panel.c:343 +#: ../midori/midori-panel.c:508 +msgid "Align sidepanel to the right" +msgstr "侧边栏放置到右侧" -#: ../midori/midori-panel.c:345 -#: ../midori/midori-websettings.c:535 -msgid "Align sidepanel on the right" -msgstr "侧边栏摆放到右侧" - -#: ../midori/midori-panel.c:347 -#: ../midori/midori-websettings.c:536 -msgid "Whether to align the sidepanel on the right" -msgstr "让侧边栏摆放到右侧" - -#: ../midori/midori-panel.c:357 -#: ../midori/midori-panel.c:358 +#: ../midori/midori-panel.c:353 +#: ../midori/midori-panel.c:354 msgid "Close panel" msgstr "关闭侧边栏" -#: ../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 "侧边栏放置到左侧" + +#: ../midori/midori-websettings.c:195 +#: ../midori/midori-view.c:2262 msgid "Blank page" msgstr "空白页面" -#: ../midori/midori-websettings.c:188 -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:196 +#: ../midori/midori-websettings.c:563 msgid "Homepage" msgstr "主页" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:197 msgid "Last open pages" msgstr "最后打开页面" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:213 +msgid "Japanese (SHIFT_JIS)" +msgstr "日语 (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:232 msgid "New tab" msgstr "新建标签页" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:233 msgid "New window" msgstr "新建窗口" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:234 msgid "Current tab" msgstr "当前标签页" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:249 msgid "Default" msgstr "缺省" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:250 msgid "Icons" msgstr "图标" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:251 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:252 msgid "Both" msgstr "图标及文字" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:253 msgid "Both horizontal" msgstr "水平摆放的图标和文字" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:268 msgid "All cookies" msgstr "所有 Cookies" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:269 msgid "Session cookies" msgstr "会话 Cookies" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:270 #: ../panels/midori-addons.c:94 msgid "None" msgstr "无" -#: ../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 "记住上次窗口的大小" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:342 msgid "Whether to save the last window size" msgstr "是否保存上次窗口的大小" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:350 msgid "Last window width" msgstr "上次窗口的宽度" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:351 msgid "The last saved window width" msgstr "上次保存的窗口宽度" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:359 msgid "Last window height" msgstr "上次窗口的高度" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:360 msgid "The last saved window height" msgstr "上次保存的窗口高度" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:385 msgid "Last panel position" msgstr "上次的侧边栏位置" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel position" msgstr "上次保存的侧边栏位置" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:395 msgid "Last panel page" msgstr "上次的侧边栏页" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:396 msgid "The last saved panel page" msgstr "上次保存的侧边栏页" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:404 msgid "Last Web search" msgstr "上次的 Web 搜索" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:405 msgid "The last saved Web search" msgstr "上次保存的 Web 搜索" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:414 msgid "Show Menubar" msgstr "显示菜单栏" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:415 msgid "Whether to show the menubar" msgstr "是否显示菜单栏" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:423 msgid "Show Navigationbar" msgstr "显示导航栏" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:424 msgid "Whether to show the navigationbar" msgstr "是否显示导航栏" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:432 msgid "Show Bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:433 msgid "Whether to show the bookmarkbar" msgstr "是否显示书签栏" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:441 msgid "Show Panel" msgstr "显示侧边栏" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the panel" msgstr "是否显示侧边栏" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:457 msgid "Show Transferbar" msgstr "显示传输栏" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the transferbar" msgstr "是否显示传输栏" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:466 msgid "Show Statusbar" msgstr "显示状态栏" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the statusbar" msgstr "是否显示状态栏" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:476 msgid "Toolbar Style" msgstr "工具栏样式" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:477 msgid "The style of the toolbar" msgstr "工具栏的样式" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:493 msgid "Show progress in location entry" msgstr "在地址输入框中显示进度" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:494 msgid "Whether to show loading progress in the location entry" msgstr "是否在地址输入框中显示加载进度" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:509 msgid "Search engines in location completion" msgstr "地址补全中显示搜索引擎" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:510 msgid "Whether to show search engines in the location completion" msgstr "是否在地址补全中显示搜索引擎" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:518 msgid "Toolbar Items" msgstr "工具栏中的项目" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:519 msgid "The items to show on the toolbar" msgstr "在工具栏中显示的项目" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:527 msgid "Compact Sidepanel" msgstr "紧凑侧边栏" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:528 msgid "Whether to make the sidepanel compact" msgstr "是否让侧边栏紧凑显示" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:543 +msgid "Align sidepanel on the right" +msgstr "侧边栏摆放到右侧" + +#: ../midori/midori-websettings.c:544 +msgid "Whether to align the sidepanel on the right" +msgstr "让侧边栏摆放到右侧" + +#: ../midori/midori-websettings.c:553 msgid "Load on Startup" msgstr "启动时加载" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:554 msgid "What to load on startup" msgstr "启动时加载的项目" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:564 msgid "The homepage" msgstr "主页" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:579 msgid "Show crash dialog" msgstr "显示崩溃提示对话框" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:580 msgid "Show a dialog after Midori crashed" msgstr "当 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 "在新标签页中显示快速拨号" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:597 msgid "Show speed dial in newly opened tabs" msgstr "在新标签页中显示快速拨号" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:605 msgid "Download Folder" msgstr "下载目录" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:606 msgid "The folder downloaded files are saved to" msgstr "下载的文件将保存到此目录" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:625 msgid "Ask for the destination folder" msgstr "询问保存目录" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:626 msgid "Whether to ask for the destination folder when downloading a file" msgstr "是否在下载文件时询问保存目录" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:645 msgid "Notify when a transfer has been completed" msgstr "下载完成后显示提示" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:646 msgid "Whether to show a notification when a transfer has been completed" msgstr "是否在下载完成时显示提示信息" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:658 msgid "Download Manager" msgstr "下载管理器" -#: ../midori/midori-websettings.c:651 +#: ../midori/midori-websettings.c:659 msgid "An external download manager" msgstr "外部的下载管理器" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:667 msgid "Text Editor" msgstr "文本编辑器" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:668 msgid "An external text editor" msgstr "外部的文本编辑器" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:683 msgid "News Aggregator" msgstr "新闻聚合器" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:684 msgid "An external news aggregator" msgstr "外部的新闻聚合查看器" -#: ../midori/midori-websettings.c:684 +#: ../midori/midori-websettings.c:692 msgid "Location entry Search" msgstr "地址栏查找" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:693 msgid "The search to perform inside the location entry" msgstr "在地址输入框中执行的查找" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:701 msgid "Preferred Encoding" msgstr "首选的编码" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:702 msgid "The preferred character encoding" msgstr "首选的字符编码集" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:712 msgid "Always Show Tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:713 msgid "Always show the tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:721 msgid "Close Buttons on Tabs" msgstr "标签栏上显示关闭按钮" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:722 msgid "Whether tabs have close buttons" msgstr "是否在标签栏上显示关闭按钮" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:730 msgid "Open new pages in" msgstr "打开新的页面在" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:731 msgid "Where to open new pages" msgstr "在那里打开新的页面" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:740 msgid "Open external pages in" msgstr "打开外部页面在" -#: ../midori/midori-websettings.c:733 +#: ../midori/midori-websettings.c:741 msgid "Where to open externally opened pages" msgstr "在那里打开外部页面" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:754 msgid "Middle click opens Selection" msgstr "鼠标中键打开地址" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:755 msgid "Load an address from the selection via middle click" msgstr "用鼠标中键单击打开选中地址" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:763 msgid "Open tabs in the background" msgstr "在后台打开标签页" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:764 msgid "Whether to open new tabs in the background" msgstr "是否在后台打开标签页" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:772 msgid "Open Tabs next to Current" msgstr "在当前标签页后打开新标签" -#: ../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 "是否在当前标签页后打开新标签或者在最后的标签页后打开" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:781 msgid "Open popups in tabs" msgstr "在标签页中打开弹出窗口" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:782 msgid "Whether to open popup windows in tabs" msgstr "是否在标签页中打开弹出窗口" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:798 msgid "Zoom Text and Images" msgstr "缩放文字和图像" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:799 msgid "Whether to zoom text and images" msgstr "是否缩放文字和图像" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:814 msgid "Find inline while typing" msgstr "输入时自动补全" -#: ../midori/midori-websettings.c:807 +#: ../midori/midori-websettings.c:815 msgid "Whether to automatically find inline while typing" msgstr "是否输入时自动补全地址" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:823 msgid "Accept cookies" msgstr "接收 Cookies" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:824 msgid "What type of cookies to accept" msgstr "接收什么类型的 Cookies" -#: ../midori/midori-websettings.c:825 +#: ../midori/midori-websettings.c:833 msgid "Original cookies only" msgstr "只接收原始 Cookies" -#: ../midori/midori-websettings.c:826 +#: ../midori/midori-websettings.c:834 msgid "Accept cookies from the original website only" msgstr "只接收原始网站的 Cookies" -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:842 msgid "Maximum cookie age" msgstr "最长 Cookie 有效期" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:843 msgid "The maximum number of days to save cookies for" msgstr "最长保存 Cookie 多少天" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:853 msgid "Remember last visited pages" msgstr "记录上次访问的页面" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:854 msgid "Whether the last visited pages are saved" msgstr "是否记录上次访问的页面" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:862 msgid "Maximum history age" msgstr "最长历史有效期" -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:863 msgid "The maximum number of days to save the history for" msgstr "最长保存历史多少天" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:871 msgid "Remember last form inputs" msgstr "记录上次的表格输入" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:872 msgid "Whether the last form inputs are saved" msgstr "是否记录上次的表格输入" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:880 msgid "Remember last downloaded files" msgstr "记录上次下载的文件" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:881 msgid "Whether the last downloaded files are saved" msgstr "是否保存上次下载的文件" -#: ../midori/midori-websettings.c:883 +#: ../midori/midori-websettings.c:891 msgid "Proxy Server" msgstr "代理服务器" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:892 msgid "The proxy server used for HTTP connections" msgstr "HTTP 连接所使用的代理服务器" -#: ../midori/midori-websettings.c:899 +#: ../midori/midori-websettings.c:907 msgid "Detect proxy server automatically" msgstr "自动检测代理服务器" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:908 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:916 +#: ../midori/midori-websettings.c:924 msgid "Identify as" msgstr "识别为" -#: ../midori/midori-websettings.c:917 +#: ../midori/midori-websettings.c:925 msgid "What to identify as to web pages" msgstr "让页面识别为什么" -#: ../midori/midori-websettings.c:933 +#: ../midori/midori-websettings.c:941 msgid "Identification string" msgstr "识别字符串" -#: ../midori/midori-websettings.c:934 +#: ../midori/midori-websettings.c:942 msgid "The application identification string" msgstr "应用程序识别字符串" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:950 msgid "Cache size" msgstr "缓存大小" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:951 msgid "The allowed size of the cache" msgstr "允许的缓存大小" -#: ../midori/midori-view.c:686 +#: ../midori/midori-websettings.c:966 +msgid "Clear private data" +msgstr "清除隐私数据" + +#: ../midori/midori-websettings.c:967 +msgid "The private data selected for deletion" +msgstr "选择删除的隐私数据" + +#: ../midori/midori-view.c:749 #, 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:688 -#: ../midori/midori-view.c:2701 +#: ../midori/midori-view.c:751 +#: ../midori/midori-view.c:2807 #: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "错误" -#: ../midori/midori-view.c:691 +#: ../midori/midori-view.c:754 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:721 -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:784 +#: ../midori/midori-view.c:2811 #, c-format msgid "Not found - %s" msgstr "没有找到 - %s" -#: ../midori/midori-view.c:1095 +#: ../midori/midori-view.c:1182 msgid "Open _Link" msgstr "打开链接(_L)" -#: ../midori/midori-view.c:1097 +#: ../midori/midori-view.c:1184 msgid "Open Link in New _Tab" msgstr "在新标签页中打开链接(_T)" -#: ../midori/midori-view.c:1114 +#: ../midori/midori-view.c:1201 msgid "Open Link in New _Window" msgstr "在新窗口中打开链接(_W)" -#: ../midori/midori-view.c:1123 +#: ../midori/midori-view.c:1207 msgid "_Download Link destination" msgstr "下载链接目标(_D)" -#: ../midori/midori-view.c:1129 +#: ../midori/midori-view.c:1213 msgid "_Save Link destination" msgstr "保存链接目标(_S)" -#: ../midori/midori-view.c:1138 +#: ../midori/midori-view.c:1222 msgid "Download with Download _Manager" msgstr "用下载管理器下载(_M)" -#: ../midori/midori-view.c:1167 +#: ../midori/midori-view.c:1251 msgid "Search _with" msgstr "搜索(_w)" -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1279 msgid "_Search the Web" msgstr "搜索 Web(_S)" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1289 msgid "Open Address in New _Tab" msgstr "在新标签页中打开地址(_T)" -#: ../midori/midori-view.c:1372 +#: ../midori/midori-view.c:1456 msgid "Open or download file" msgstr "打开或下载文件" -#: ../midori/midori-view.c:1389 +#: ../midori/midori-view.c:1473 #, c-format msgid "File Type: '%s'" msgstr "文件类型: '%s'" -#: ../midori/midori-view.c:1392 +#: ../midori/midori-view.c:1476 #, 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:1396 +#: ../midori/midori-view.c:1480 #, c-format msgid "Open %s" msgstr "打开 %s" -#: ../midori/midori-view.c:1816 +#: ../midori/midori-view.c:1898 #, c-format msgid "Inspect page - %s" msgstr "检查页面 - %s" -#: ../midori/midori-view.c:2001 -#: ../midori/midori-view.c:2002 -msgid "Search" -msgstr "搜索" +#: ../midori/midori-view.c:2088 +msgid "Speed dial" +msgstr "快速拨号" -#: ../midori/midori-view.c:2003 +#: ../midori/midori-view.c:2089 msgid "Click to add a shortcut" msgstr "单击添加快捷方式" -#: ../midori/midori-view.c:2004 +#: ../midori/midori-view.c:2090 msgid "Enter shortcut address" msgstr "输入快捷方式地址" -#: ../midori/midori-view.c:2005 +#: ../midori/midori-view.c:2091 msgid "Enter shortcut title" msgstr "输入快捷方式标题" -#: ../midori/midori-view.c:2006 +#: ../midori/midori-view.c:2092 msgid "Are you sure you want to delete this shortcut?" msgstr "确认删除此快捷方式?" -#: ../midori/midori-view.c:2038 +#: ../midori/midori-view.c:2122 #, c-format msgid "Document cannot be displayed" msgstr "文档无法显示" -#: ../midori/midori-view.c:2055 +#: ../midori/midori-view.c:2139 #, c-format msgid "No documentation installed" msgstr "没有安装文档" @@ -1490,166 +1512,171 @@ msgstr "显示文字的缺省字体大小" msgid "Fixed-width Font Family" msgstr "定宽字体" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:457 msgid "The font family used to display fixed-width text" msgstr "显示定宽文本的字形" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:460 +msgid "The font size used to display fixed-width text" +msgstr "显示定宽文本的字体大小" + +#: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" msgstr "最小字体尺寸" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" msgstr "显示文字的最小字体尺寸" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:473 msgid "Encoding" msgstr "编码" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:476 msgid "The character encoding to use by default" msgstr "缺省的字符编码" #. Page "Behavior" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:483 msgid "Behavior" msgstr "行为" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:484 msgid "Features" msgstr "特性" -#: ../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 "自动加载图像" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:488 msgid "Load and display images automatically" msgstr "自动加载和显示图像" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:491 msgid "Shrink images automatically" msgstr "自动缩小图像" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:492 msgid "Automatically shrink standalone images to fit" msgstr "自动缩小单独的图像以适合屏幕" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:495 msgid "Print background images" msgstr "打印背景图" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:496 msgid "Whether background images should be printed" msgstr "是否打印页面的背景图" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:499 msgid "Resizable text areas" msgstr "可缩放的文本区" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:500 msgid "Whether text areas are resizable" msgstr "文本区能否缩放" -#: ../midori/midori-preferences.c:498 -#: ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:503 +#: ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "启用脚本" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:504 msgid "Enable embedded scripting languages" msgstr "启用网页中的脚本" -#: ../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 "启用 Netscape 插件" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:508 msgid "Enable embedded Netscape plugin objects" msgstr "启用嵌入的 Netscape 插件对象" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:511 msgid "Enforce 96 dots per inch" msgstr "强制每英寸96点" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:512 msgid "Enforce a video dot density of 96 DPI" msgstr "强制画面点密度为 96DPI" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:515 msgid "Enable developer tools" msgstr "启用开发工具" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:516 msgid "Enable special extensions for developers" msgstr "启用给开发者的特殊扩展" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:523 msgid "Spell Checking" msgstr "拼写检查" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:526 msgid "Enable Spell Checking" msgstr "启用拼写检查" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:527 msgid "Enable spell checking while typing" msgstr "启用输入时拼写检查" -#: ../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 "用逗号分隔的语言列表, 比如 \"zh_CN,en_GB\"" #. Page "Interface" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:536 msgid "Interface" msgstr "界面" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:537 msgid "Navigationbar" msgstr "导航条" -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:548 msgid "Browsing" msgstr "浏览" #. Page "Applications" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:578 msgid "Applications" msgstr "应用" -#: ../midori/midori-preferences.c:573 +#: ../midori/midori-preferences.c:579 msgid "External applications" msgstr "外部应用程序" #. 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 "网络" -#: ../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 "隐私" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:659 msgid "Web Cookies" msgstr "网页 Cookies" -#: ../midori/midori-preferences.c:666 -#: ../midori/midori-preferences.c:676 +#: ../midori/midori-preferences.c:672 +#: ../midori/midori-preferences.c:682 msgid "days" msgstr "天" #: ../midori/midori-searchaction.c:484 -#: ../katze/katze-arrayaction.c:314 +#: ../katze/katze-arrayaction.c:331 msgid "Empty" msgstr "清空" @@ -1673,73 +1700,64 @@ msgstr "图标(_I)" msgid "_Token:" msgstr "记号(_T):" -#: ../midori/midori-searchaction.c:1195 +#: ../midori/midori-searchaction.c:1209 msgid "Manage Search Engines" msgstr "管理搜索引擎" -#: ../midori/midori-searchaction.c:1292 +#: ../midori/midori-searchaction.c:1308 msgid "Use as _default" msgstr "作为缺省(_d)" -#: ../midori/sokoke.c:162 -#: ../midori/sokoke.c:174 +#: ../midori/sokoke.c:172 +#: ../midori/sokoke.c:184 msgid "Could not run external program." msgstr "无法运行外部程序." -#. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:520 -msgid "Warning: You are using a superuser account!" -msgstr "警告: 你正在使用超级用户帐号!" - -#: ../midori/sokoke.c:871 +#: ../midori/sokoke.c:855 msgid "_Bookmark" msgstr "书签(_B)" -#: ../midori/sokoke.c:873 -msgid "_Add Bookmark" -msgstr "添加书签(_A)" +#: ../midori/sokoke.c:857 +msgid "Add Boo_kmark" +msgstr "添加书签(_k)" -#: ../midori/sokoke.c:874 +#: ../midori/sokoke.c:858 msgid "_Console" msgstr "控制台(_C)" -#: ../midori/sokoke.c:875 +#: ../midori/sokoke.c:859 msgid "_Extensions" msgstr "扩展(_E)" -#: ../midori/sokoke.c:876 +#: ../midori/sokoke.c:860 msgid "_History" msgstr "历史(_H)" -#: ../midori/sokoke.c:877 +#: ../midori/sokoke.c:861 msgid "_Homepage" msgstr "主页(_H)" -#: ../midori/sokoke.c:878 +#: ../midori/sokoke.c:862 msgid "_Userscripts" msgstr "用户脚本(_U)" -#: ../midori/sokoke.c:879 +#: ../midori/sokoke.c:863 msgid "User_styles" msgstr "用户样式(_s)" -#: ../midori/sokoke.c:880 +#: ../midori/sokoke.c:864 msgid "New _Tab" msgstr "新建标签页(_T)" -#: ../midori/sokoke.c:881 +#: ../midori/sokoke.c:865 msgid "_Transfers" msgstr "传输(_T)" -#: ../midori/sokoke.c:882 +#: ../midori/sokoke.c:866 msgid "Netscape p_lugins" msgstr "Netscape 插件(_l)" -#: ../midori/sokoke.c:883 -msgid "_Closed Tabs and Windows" -msgstr "关闭的标签页和窗口(_C)" - -#: ../midori/sokoke.c:884 +#: ../midori/sokoke.c:868 msgid "New _Window" msgstr "新建窗口(_W)" @@ -1753,39 +1771,23 @@ msgstr "用户脚本" msgid "Userstyles" msgstr "用户样式" -#: ../panels/midori-addons.c:927 -#: ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "启用(_E)" - -#: ../panels/midori-addons.c:928 -#: ../panels/midori-extensions.c:145 -msgid "Enable" -msgstr "启用" - -#: ../panels/midori-addons.c:937 -#: ../panels/midori-extensions.c:154 -msgid "_Disable" -msgstr "关闭(_D)" - -#: ../panels/midori-addons.c:938 -#: ../panels/midori-extensions.c:155 -msgid "Disable" -msgstr "关闭" - -#: ../panels/midori-bookmarks.c:107 +#: ../panels/midori-bookmarks.c:108 msgid "Bookmarks" msgstr "书签" -#: ../panels/midori-bookmarks.c:238 +#: ../panels/midori-bookmarks.c:239 msgid "Edit the selected bookmark" msgstr "编辑选中的书签" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" msgstr "删除选中的书签" -#: ../panels/midori-bookmarks.c:591 +#: ../panels/midori-bookmarks.c:260 +msgid "Add a new folder" +msgstr "添加新书签目录" + +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "分隔符" @@ -1793,7 +1795,7 @@ msgstr "分隔符" msgid "Console" msgstr "控制台" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "扩展" @@ -1813,37 +1815,43 @@ msgstr "删除选中的历史项" msgid "Clear the entire history" msgstr "清空全部历史" -#: ../panels/midori-history.c:599 +#: ../panels/midori-history.c:601 msgid "A week ago" msgstr "一周以前" -#: ../panels/midori-history.c:604 -#, c-format +#: ../panels/midori-history.c:606 +#, fuzzy, c-format msgid "%d day ago" -msgstr "%d 天以前" +msgid_plural "%d days ago" +msgstr[0] "%d 天以前" +msgstr[1] "%d 天以前" -#: ../panels/midori-history.c:605 -#, c-format -msgid "%d days ago" -msgstr "%d 天以前" - -#: ../panels/midori-history.c:612 +#: ../panels/midori-history.c:614 msgid "Today" msgstr "今天" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:616 msgid "Yesterday" msgstr "昨天" #: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:108 msgid "Netscape plugins" msgstr "Netscape 插件" -#: ../panels/midori-transfers.c:256 +#: ../panels/midori-transfers.c:271 #, c-format msgid "%s of %s" msgstr "已下载 %s, 共 %s " +#: ../panels/midori-transfers.c:479 +msgid "Open Destination _Folder" +msgstr "打开保存目录(_F)" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "复制连接地址(_a)" + #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "需要认证" @@ -1878,21 +1886,37 @@ msgstr "库存图标 '%s' 无法加载" msgid "Animation frames are broken" msgstr "动画帧损坏" -#: ../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 "属性 '%s' 在 '%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 "选择文件" -#: ../katze/katze-utils.c:230 +#: ../katze/katze-utils.c:250 msgid "Choose folder" msgstr "选择目录" +#: ../extensions/adblock.c:78 +msgid "Configure Advertisement filters" +msgstr "设置广告过滤器" + +#: ../extensions/adblock.c:214 +msgid "Configure _Advertisement filters..." +msgstr "设置广告过滤器(_A)" + +#: ../extensions/adblock.c:374 +msgid "Advertisement blocker" +msgstr "广告屏蔽" + +#: ../extensions/adblock.c:375 +msgid "Block advertisements according to a filter list" +msgstr "根据过滤列表屏蔽广告" + #: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "彩色标签" @@ -1905,11 +1929,40 @@ msgstr "多彩标签" msgid "Tint each tab distinctly" msgstr "用不同颜色区分标签页" -#: ../extensions/cookie-manager.c:201 +#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "Cookie 管理器" + +#: ../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 "删除所有 Cookies. 如果已设置了一个过滤器, 则只删除匹配过滤字符串的 Cookies." + +#: ../extensions/cookie-manager/cookie-manager-page.c:126 +msgid "Expand All" +msgstr "展开所有项目" + +#: ../extensions/cookie-manager/cookie-manager-page.c:133 +msgid "Collapse All" +msgstr "折叠所有项目" + +#: ../extensions/cookie-manager/cookie-manager-page.c:460 +msgid "Do you really want to delete all cookies?" +msgstr "确认删除所有的 Cookie?" + +#: ../extensions/cookie-manager/cookie-manager-page.c:462 +msgid "Question" +msgstr "问题" + +#: ../extensions/cookie-manager/cookie-manager-page.c:471 +msgid "Only cookies which match the filter will be deleted." +msgstr "只删除匹配过滤字符串的 Cookies" + +#: ../extensions/cookie-manager/cookie-manager-page.c:539 msgid "At the end of the session" msgstr "在会话结束时" -#: ../extensions/cookie-manager.c:204 +#: ../extensions/cookie-manager/cookie-manager-page.c:542 #, c-format msgid "" "Host: %s\n" @@ -1926,68 +1979,39 @@ msgstr "" "安全: %s\n" "过期: %s" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "Yes" msgstr "是" -#: ../extensions/cookie-manager.c:210 +#: ../extensions/cookie-manager/cookie-manager-page.c:548 msgid "No" msgstr "无" -#: ../extensions/cookie-manager.c:493 -msgid "Do you really want to delete all cookies?" -msgstr "确认删除所有的 Cookie?" - -#: ../extensions/cookie-manager.c:495 -msgid "Question" -msgstr "问题" - -#: ../extensions/cookie-manager.c:504 -msgid "Only cookies which match the filter will be deleted." -msgstr "只删除匹配过滤字符串的 Cookies" - -#: ../extensions/cookie-manager.c:682 +#: ../extensions/cookie-manager/cookie-manager-page.c:811 msgid "Name" msgstr "名称" -#: ../extensions/cookie-manager.c:742 +#: ../extensions/cookie-manager/cookie-manager-page.c:862 msgid "_Expand All" msgstr "展开所有项目(_E)" -#: ../extensions/cookie-manager.c:750 +#: ../extensions/cookie-manager/cookie-manager-page.c:870 msgid "_Collapse All" msgstr "折叠所有项目(_C)" -#: ../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 "删除所有 Cookies. 如果已设置了一个过滤器, 则只删除匹配过滤字符串的 Cookies." - -#: ../extensions/cookie-manager.c:838 -msgid "Expand All" -msgstr "展开所有项目" - -#: ../extensions/cookie-manager.c:845 -msgid "Collapse All" -msgstr "折叠所有项目" - -#: ../extensions/cookie-manager.c:876 +#: ../extensions/cookie-manager/cookie-manager-page.c:923 msgid "Filter:" msgstr "过滤器(_F):" -#: ../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 "输入过滤字符串以只显示域名相符的 Cookies" -#: ../extensions/cookie-manager.c:916 -#: ../extensions/cookie-manager.c:964 -msgid "Cookie Manager" -msgstr "Cookie 管理器" - -#: ../extensions/cookie-manager.c:948 +#: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" msgstr "Cookie 管理器(_C)" -#: ../extensions/cookie-manager.c:965 +#: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" msgstr "查看和删除 Cookies" @@ -2022,17 +2046,17 @@ msgstr "删除所有订阅" msgid "_Feeds" msgstr "订阅(_F)" -#: ../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 "查找订阅的 XML 数据根元素失败." -#: ../extensions/feed-panel/feed-parse.c:215 +#: ../extensions/feed-panel/feed-parse.c:225 #, c-format msgid "Unsupported feed format." msgstr "不支持的订阅格式." -#: ../extensions/feed-panel/feed-parse.c:245 +#: ../extensions/feed-panel/feed-parse.c:255 #, c-format msgid "Failed to parse XML feed: %s" msgstr "解析 XML 订阅失败: %s" @@ -2045,11 +2069,11 @@ msgstr "查找 RSS XML 数据中的 \"channel\" 元素失败." msgid "Unsupported RSS version found." msgstr "不支持的 RSS 版本." -#: ../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 "查找必需的 XML 数据中的 RSS \"item\" 元素失败." -#: ../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 "查找必需的 XML 数据中的 RSS \"channel\" 元素失败." @@ -2075,11 +2099,11 @@ msgstr "订阅面板" msgid "Read Atom/ RSS feeds" msgstr "阅读 Atom/ RSS 订阅" -#: ../extensions/mouse-gestures/main.c:216 +#: ../extensions/mouse-gestures/main.c:236 msgid "Mouse Gestures" msgstr "鼠标手势" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures/main.c:237 msgid "Control Midori by moving the mouse" msgstr "用鼠标移动控制 Midori" @@ -2093,11 +2117,35 @@ msgstr "常驻页面" msgid "_Pageholder" msgstr "常驻页面(_P)" -#: ../extensions/statusbar-features.c:104 +#: ../extensions/shortcuts.c:156 +msgid "Configure Keyboard shortcuts" +msgstr "设置快捷键" + +#: ../extensions/shortcuts.c:253 +msgid "Configure Sh_ortcuts..." +msgstr "设置快捷键(_o)" + +#: ../extensions/shortcuts.c:285 +msgid "Shortcuts" +msgstr "快捷键" + +#: ../extensions/shortcuts.c:286 +msgid "View and edit keyboard shortcuts" +msgstr "查看和编辑快捷键" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "图像" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "脚本" + +#: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" msgstr "状态栏特性" -#: ../extensions/statusbar-features.c:105 +#: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" msgstr "方便的开关网页中的特性" diff --git a/tests/completion.c b/tests/completion.c index 80ca112a..ff802bc1 100644 --- a/tests/completion.c +++ b/tests/completion.c @@ -282,6 +282,8 @@ int main (int argc, char** argv) { + /* libSoup uses threads, so we need to initialize threads. */ + if (!g_thread_supported ()) g_thread_init (NULL); g_test_init (&argc, &argv, NULL); gtk_init_check (&argc, &argv); diff --git a/tests/extensions.c b/tests/extensions.c index e71a353d..372eccf8 100644 --- a/tests/extensions.c +++ b/tests/extensions.c @@ -167,15 +167,81 @@ extension_settings (void) midori_extension_deactivate (extension); } +static void +extension_activate (gconstpointer data) +{ + MidoriApp* app = midori_app_new (); + MidoriExtension* extension = MIDORI_EXTENSION (data); + /* g_signal_emit_by_name (extension, "activate", app); + midori_extension_deactivate (extension); */ + g_object_unref (app); +} + +static void +load_extensions (void) +{ + if (g_module_supported ()) + { + GDir* extension_dir = g_dir_open (EXTENSION_PATH, 0, NULL); + if (extension_dir != NULL) + { + const gchar* filename; + + while ((filename = g_dir_read_name (extension_dir))) + { + gchar* fullname; + GModule* module; + typedef MidoriExtension* (*extension_init_func)(void); + extension_init_func extension_init; + + /* Ignore files which don't have the correct suffix */ + if (!g_str_has_suffix (filename, G_MODULE_SUFFIX)) + continue; + + fullname = g_build_filename (EXTENSION_PATH, filename, NULL); + module = g_module_open (fullname, G_MODULE_BIND_LOCAL); + g_free (fullname); + + if (module && g_module_symbol (module, "extension_init", + (gpointer) &extension_init)) + { + guint length; + gchar* name; + gchar* path; + typedef MidoriExtension* (*extension_test_func)(const gchar* path); + extension_test_func extension_test; + + if (g_str_has_prefix (filename, "lib")) + filename = &filename[3]; + length = strlen (filename); + name = g_strdup (filename); + name[length - strlen (G_MODULE_SUFFIX) - 1] = '\0'; + path = g_strconcat ("/extensions/", name, "/activate", NULL); + g_free (name); + g_test_add_data_func (path, extension_init (), extension_activate); + g_free (path); + if (g_module_symbol (module, "extension_test", + (gpointer) &extension_test)) + extension_test (path); + } + } + g_dir_close (extension_dir); + } + } +} + int main (int argc, char** argv) { g_test_init (&argc, &argv, NULL); gtk_init_check (&argc, &argv); + if (!g_thread_supported ()) g_thread_init (NULL); g_test_add_func ("/extensions/create", extension_create); g_test_add_func ("/extensions/settings", extension_settings); + load_extensions (); + return g_test_run (); } diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 10f45e8f..a771786d 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -141,6 +141,7 @@ magic_uri_search (void) test_input ("max@mustermann.de", NULL); test_input ("g max@mustermann.de", NULL); test_input ("g inurl:http://twotoasts.de bug", NULL); + test_input ("sm", SM); } static void diff --git a/tests/properties.c b/tests/properties.c index deb6266e..6d9ecffb 100644 --- a/tests/properties.c +++ b/tests/properties.c @@ -17,6 +17,29 @@ #include "midori-bookmarks.h" #include "sokoke.h" +typedef struct +{ + const gchar* type; + const gchar* property; +} ObjectProperty; + +static ObjectProperty properties_object_skip[] = +{ + { "MidoriWebSettings", "ident-string" }, +}; + +static gboolean +properties_should_skip (const gchar* type, + const gchar* property) +{ + guint i; + for (i = 0; i < G_N_ELEMENTS (properties_object_skip); i++) + if (g_str_equal (properties_object_skip[i].type, type)) + if (g_str_equal (properties_object_skip[i].property, property)) + return TRUE; + return FALSE; +} + #define pspec_is_writable(pspec) (pspec->flags & G_PARAM_WRITABLE \ && !(pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))) @@ -35,11 +58,26 @@ properties_object_get_set (GObject* object) GType type = G_PARAM_SPEC_TYPE (pspec); const gchar* property = g_param_spec_get_name (pspec); void* value = NULL; + guint j; /* Skip properties of parent classes */ if (pspec->owner_type != G_OBJECT_TYPE (object)) continue; + /* Skip properties that cannot be tested generically */ + if (properties_should_skip (G_OBJECT_TYPE_NAME (object), property)) + continue; + + /* Verify that the ID is unique */ + if (pspecs[i]->owner_type == G_OBJECT_TYPE (object)) + for (j = 0; j < n_properties; j++) + if (i != j && pspecs[j]->owner_type == G_OBJECT_TYPE (object)) + if (pspec->param_id == pspecs[j]->param_id) + g_error ("Duplicate ID %d of %s and %s", + pspec->param_id, + g_param_spec_get_name (pspec), + g_param_spec_get_name (pspecs[j])); + g_object_get (object, property, &value, NULL); if (type == G_TYPE_PARAM_BOOLEAN) { @@ -84,25 +122,25 @@ properties_object_get_set (GObject* object) { GEnumClass* enum_class = G_ENUM_CLASS ( g_type_class_ref (pspec->value_type)); - gint j; if (pspec_is_writable (pspec)) { + gint k; g_object_set (object, property, G_PARAM_SPEC_ENUM (pspec)->default_value, NULL); - for (j = enum_class->minimum; j < enum_class->maximum; j++) + for (k = enum_class->minimum; k < enum_class->maximum; k++) { - GEnumValue* enum_value = g_enum_get_value (enum_class, j); + GEnumValue* enum_value = g_enum_get_value (enum_class, k); if (!enum_value) g_error ("%s.%s has no value %d", - G_OBJECT_TYPE_NAME (object), property, j); + G_OBJECT_TYPE_NAME (object), property, k); GEnumValue* enum_value_ = g_enum_get_value_by_name (enum_class, enum_value->value_name); if (!enum_value) g_error ("%s.%s has no value '%s'", G_OBJECT_TYPE_NAME (object), property, enum_value->value_name); g_assert_cmpint (enum_value->value, ==, enum_value_->value); - g_object_set (object, property, j, NULL); + g_object_set (object, property, k, NULL); } } diff --git a/tests/wscript_build b/tests/wscript_build index 2de915cb..946ebbb6 100644 --- a/tests/wscript_build +++ b/tests/wscript_build @@ -2,6 +2,8 @@ # WAF build script for midori # This file is licensed under the terms of the expat license, see the file EXPAT. +import os + tests = os.listdir ('tests') for test in tests: folder = 'tests' + os.sep + test @@ -24,6 +26,7 @@ for test in tests: obj = bld.new_task_gen ('cc', 'program') obj.target = 'test-' + target obj.includes = '.. ../midori ../panels' + obj.cflags = ['-DEXTENSION_PATH="' + os.path.abspath ('_build_/default/extensions') + '"'] obj.source = source obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' obj.uselib_local = 'panels' diff --git a/wscript b/wscript index dd42f2fd..d6ef7380 100644 --- a/wscript +++ b/wscript @@ -19,10 +19,13 @@ import Utils import pproc as subprocess import os import UnitTest +import Task +from TaskGen import extension +import misc major = 0 minor = 1 -micro = 7 +micro = 8 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) @@ -38,24 +41,45 @@ srcdir = '.' blddir = '_build_' def option_enabled (option): - if eval ('Options.options.enable_' + option): + if getattr (Options.options, 'enable_' + option): return True - if eval ('Options.options.disable_' + option): + if getattr (Options.options, 'disable_' + option): return False return True +def is_mingw (env): + if 'CC' in env: + cc = env['CC'] + if not isinstance (cc, str): + cc = ''.join (cc) + return cc.find ('mingw') != -1# or cc.find ('wine') != -1 + return False + +# Compile Win32 res files to (resource) object files +@extension ('.rc') +def rc_file(self, node): + rctask = self.create_task ('winrc') + rctask.set_inputs (node) + rctask.set_outputs (node.change_ext ('.rc.o')) + self.compiled_tasks.append (rctask) +Task.simple_task_type ('winrc', '${WINRC} -o${TGT} ${SRC}', color='BLUE', + before='cc cxx', shell=False) + def configure (conf): def option_checkfatal (option, desc): - if eval ('Options.options.enable_' + option): + if hasattr (Options.options, 'enable_' + option): + if getattr (Options.options, 'enable_' + option): Utils.pprint ('RED', desc + ' N/A') sys.exit (1) - def dirname_default (dirname, default): - if eval ('Options.options.' + dirname) == '': + def dirname_default (dirname, default, defname=None): + if getattr (Options.options, dirname) == '': dirvalue = default else: - dirvalue = eval ('Options.options.' + dirname) - conf.define (dirname, dirvalue) + dirvalue = getattr (Options.options, dirname) + if not defname: + defname = dirname + conf.define (defname, dirvalue) return dirvalue conf.check_tool ('compiler_cc') @@ -85,13 +109,47 @@ def configure (conf): nls = 'no ' conf.define ('ENABLE_NLS', [0,1][nls == 'yes']) - dirname_default ('DATADIR', os.path.join (conf.env['PREFIX'], 'share')) - dirname_default ('DOCDIR', os.path.join (conf.env['DATADIR'], 'doc')) + if conf.find_program ('rsvg-convert', var='RSVG_CONVERT'): + icons = 'yes' + else: + icons = 'no ' + + if is_mingw (conf.env) or Options.platform == 'win32': + if not conf.find_program ('convert', var='CONVERT'): + Utils.pprint ('YELLOW', 'midori.ico won\'t be created') + conf.find_program ('windres', var='WINRC') + + # This is specific to cross compiling with mingw + if is_mingw (conf.env) and Options.platform != 'win32': + if not 'AR' in os.environ and not 'RANLIB' in os.environ: + conf.env['AR'] = os.environ['CC'][:-3] + 'ar' + if conf.find_program (os.environ['CC'][:-3] + 'windres', var='WINRC'): + os.environ['WINRC'] = os.environ['CC'][:-3] + 'windres' + Options.platform = 'win32' + # Make sure we don't have -fPIC in the CCFLAGS + conf.env["shlib_CCFLAGS"] = [] + # Adjust file naming + conf.env["shlib_PATTERN"] = 'lib%s.dll' + conf.env['program_PATTERN'] = '%s.exe' + # Use Visual C++ compatible alignment + conf.env.append_value ('CCFLAGS', '-mms-bitfields') + conf.env['staticlib_LINKFLAGS'] = [] + + Utils.pprint ('BLUE', 'Mingw recognized, assuming cross compile.') + + if conf.env['CONVERT'] and not conf.env['WINRC']: + Utils.pprint ('YELLOW', 'midori.ico won\'t be created') + dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib')) if conf.env['PREFIX'] == '/usr': dirname_default ('SYSCONFDIR', '/etc') else: dirname_default ('SYSCONFDIR', os.path.join (conf.env['PREFIX'], 'etc')) + dirname_default ('DATADIR', os.path.join (conf.env['PREFIX'], 'share'), + # Use MDATADIR because DATADIR is a constant in objidl.h on Windows + 'MDATADIR') + conf.undefine ('DATADIR') + dirname_default ('DOCDIR', os.path.join (conf.env['MDATADIR'], 'doc')) if option_enabled ('apidocs'): conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') @@ -107,33 +165,37 @@ def configure (conf): else: api_docs = 'no ' - def check_pkg (name, version='', mandatory=True, var=None): + def check_pkg (name, version='', mandatory=True, var=None, args=''): if not var: var = name.split ('-')[0].upper () - conf.check_cfg (package=name, uselib_store=var, args='--cflags --libs', + conf.check_cfg (package=name, uselib_store=var, args='--cflags --libs ' + args, atleast_version=version, mandatory=mandatory) + return conf.env['HAVE_' + var] if option_enabled ('unique'): check_pkg ('unique-1.0', '0.9', False) unique = ['N/A', 'yes'][conf.env['HAVE_UNIQUE'] == 1] + if unique != 'yes': + option_checkfatal ('unique', 'single instance') else: - option_checkfatal ('unique', 'single instance') unique = 'no ' conf.define ('HAVE_UNIQUE', [0,1][unique == 'yes']) if option_enabled ('libidn'): check_pkg ('libidn', '1.0', False) libidn = ['N/A','yes'][conf.env['HAVE_LIBIDN'] == 1] + if libidn != 'yes': + option_checkfatal ('libidn', 'international domain names') else: - option_checkfatal ('libidn', 'international domain names') libidn = 'no ' conf.define ('HAVE_LIBIDN', [0,1][libidn == 'yes']) if option_enabled ('sqlite'): check_pkg ('sqlite3', '3.0', False, var='SQLITE') sqlite = ['N/A','yes'][conf.env['HAVE_SQLITE'] == 1] + if sqlite != 'yes': + option_checkfatal ('sqlite', 'history database') else: - option_checkfatal ('sqlite', 'history database') sqlite = 'no ' conf.define ('HAVE_SQLITE', [0,1][sqlite == 'yes']) @@ -141,29 +203,44 @@ def configure (conf): check_pkg ('gmodule-2.0', '2.8.0', False) check_pkg ('gthread-2.0', '2.8.0', False) check_pkg ('gio-2.0', '2.16.0') - check_pkg ('gtk+-2.0', '2.10.0', var='GTK') - check_pkg ('webkit-1.0', '1.1.1') + args = '' + if Options.platform == 'win32': + args = '--define-variable=target=win32' + check_pkg ('gtk+-2.0', '2.10.0', var='GTK', args=args) + check_pkg ('webkit-1.0', '1.1.1', args=args) check_pkg ('libsoup-2.4', '2.25.2') conf.define ('HAVE_LIBSOUP_2_25_2', 1) check_pkg ('libxml-2.0', '2.6') if option_enabled ('hildon'): - check_pkg ('hildon-1', mandatory=False, var='HILDON') - if conf.env['HAVE_HILDON'] == 1: - check_pkg ('libosso', mandatory=False, var='HILDON') + if check_pkg ('hildon-1', mandatory=False, var='HILDON'): + check_pkg ('libosso', var='HILDON') hildon = ['N/A','yes'][conf.env['HAVE_HILDON'] == 1] + if hildon != 'yes': + option_checkfatal ('hildon', 'Maemo integration') else: - option_checkfatal ('hildon', 'Maemo integration') hildon = 'no ' conf.define ('HAVE_HILDON', [0,1][hildon == 'yes']) - conf.check (header_name='unistd.h') - conf.define ('HAVE_OSX', int(sys.platform == 'darwin')) + # Store options in env, since 'Options' is not persistent + if 'CC' in os.environ: conf.env['CC'] = os.environ['CC'].split() + conf.env['addons'] = option_enabled ('addons') + conf.env['docs'] = option_enabled ('docs') - if conf.find_program ('rsvg-convert', var='RSVG_CONVERT'): - icons = 'yes' - else: - icons = 'no ' + conf.check (header_name='unistd.h') + if not conf.env['HAVE_UNIQUE']: + if Options.platform == 'win32': + conf.check (lib='ws2_32') + check_pkg ('openssl', mandatory=False) + conf.define ('USE_SSL', [0,1][conf.env['HAVE_OPENSSL'] == 1]) + conf.define ('HAVE_NETDB_H', [0,1][conf.check (header_name='netdb.h')]) + conf.check (header_name='sys/wait.h') + conf.check (header_name='sys/select.h') + conf.check (function_name='inet_aton') + conf.check (function_name='inet_addr') + conf.define ('HAVE_OSX', int(sys.platform == 'darwin')) + if Options.platform == 'win32': + conf.env.append_value ('LINKFLAGS', '-mwindows') conf.define ('PACKAGE_VERSION', VERSION) conf.define ('PACKAGE_NAME', APPNAME) @@ -205,22 +282,22 @@ def configure (conf): Utils.pprint ('RED', 'No debugging level support for ' + compiler) sys.exit (1) - print - print "Optional build time dependencies:" - print "Localization: " + nls + " (intltool)" - print "Icon optimizations: " + icons + " (rsvg-convert)" - print "User documentation: " + user_docs + " (docutils)" - print "API documentation: " + api_docs + " (gtk-doc)" - print - print "Single instance: " + unique + " (unique)" + print ''' + Localization: %(nls)s (intltool) + Icon optimizations: %(icons)s (rsvg-convert) + Persistent history: %(sqlite)s (sqlite3) + + IDN support: %(libidn)s (libidn) + User documentation: %(user_docs)s (docutils) + API documentation: %(api_docs)s (gtk-doc) + ''' % locals () if unique == 'yes' and conf.check_cfg (modversion='unique-1.0') == '1.0.4': - Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.') - Utils.pprint ('RED', 'Please use an older or newer version.') - print "IDN support: " + libidn + " (libidn)" - print "Persistent history: " + sqlite + " (sqlite3)" - print "Maemo integration: " + hildon + " (hildon)" + Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.') + Utils.pprint ('RED', 'Please use an older or newer version.') def set_options (opt): + def is_maemo (): return os.path.exists ('/etc/osso-af-init/osso-gtk.defs') + def add_enable_option (option, desc, group=None, disable=False): if group == None: group = opt @@ -258,15 +335,44 @@ def set_options (opt): add_enable_option ('libidn', 'international domain name support', group) add_enable_option ('sqlite', 'history database support', group) add_enable_option ('addons', 'building of extensions', group) - add_enable_option ('hildon', 'Maemo integration', group) + add_enable_option ('hildon', 'Maemo integration', group, disable=not is_maemo ()) def build (bld): + def image_to_win32ico (task): + 'Converts an image to a Win32 ico' + + if not os.path.exists (bld.env['CONVERT']): + return 1 + + infile = task.inputs[0].abspath (task.env) + outfile = task.outputs[0].abspath (task.env) + command = bld.env['CONVERT'] + ' -background transparent \ + -geometry 16x16 -extent 16x16 ' + \ + infile + ' ' + outfile + if Utils.exec_command (command): + return 1 + + if task.chmod: + os.chmod (outfile, task.chmod) + return 0 + + if bld.env['WINRC']: + obj = bld.new_task_gen ('copy', + fun = image_to_win32ico, + source = 'icons/16x16/midori.png', + target = 'data/midori.ico', + before = 'cc') + + bld.add_group () + bld.add_subdirs ('katze midori icons') - if option_enabled ('addons'): + if bld.env['addons']: bld.add_subdirs ('extensions') - if option_enabled ('docs'): + bld.add_group () + + if bld.env['docs']: bld.install_files ('${DOCDIR}/' + APPNAME + '/', \ 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') @@ -295,39 +401,40 @@ def build (bld): bld.add_subdirs ('docs/api') bld.install_files ('${DOCDIR}/midori/api/', blddir + '/docs/api/*') - if bld.env['HAVE_HILDON']: - appdir = '${DATADIR}/applications/hildon' - bld.install_files ('${DATADIR}/dbus-1/services', - 'data/com.nokia.' + APPNAME + '.service') - else: - appdir = '${DATADIR}/applications' - if bld.env['INTLTOOL']: - obj = bld.new_task_gen ('intltool_in') - obj.source = 'data/' + APPNAME + '.desktop.in' - obj.install_path = appdir - obj.flags = '-d' - bld.install_files (appdir, 'data/' + APPNAME + '.desktop') - else: - folder = os.path.dirname (bld.env['waf_config_files'][0]) + '/data' - Utils.check_dir (folder) - desktop = APPNAME + '.desktop' - pre = open ('data/' + desktop + '.in') - after = open (folder + '/' + desktop, 'w') - try: + if not is_mingw (bld.env) and Options.platform != 'win32': + if bld.env['HAVE_HILDON']: + appdir = '${MDATADIR}/applications/hildon' + bld.install_files ('${MDATADIR}/dbus-1/services', + 'data/com.nokia.' + APPNAME + '.service') + else: + appdir = '${MDATADIR}/applications' + if bld.env['INTLTOOL']: + obj = bld.new_task_gen ('intltool_in') + obj.source = 'data/' + APPNAME + '.desktop.in' + obj.install_path = appdir + obj.flags = ['-d', '-c'] + bld.install_files (appdir, 'data/' + APPNAME + '.desktop') + else: + folder = os.path.abspath (blddir + '/default/data') + Utils.check_dir (folder) + desktop = APPNAME + '.desktop' + pre = open ('data/' + desktop + '.in') + after = open (folder + '/' + desktop, 'w') try: - for line in pre: - if line != '': - if line[0] == '_': - after.write (line[1:]) - else: - after.write (line) - after.close () - Utils.pprint ('BLUE', desktop + '.in -> ' + desktop) - bld.install_files (appdir, folder + '/' + desktop) - except: - Utils.pprint ('BLUE', 'File ' + desktop + ' not generated') - finally: - pre.close () + try: + for line in pre: + if line != '': + if line[0] == '_': + after.write (line[1:]) + else: + after.write (line) + after.close () + Utils.pprint ('BLUE', desktop + '.in -> ' + desktop) + bld.install_files (appdir, folder + '/' + desktop) + except: + Utils.pprint ('BLUE', 'File ' + desktop + ' not generated') + finally: + pre.close () if bld.env['RSVG_CONVERT']: Utils.check_dir (blddir + '/data') @@ -335,20 +442,20 @@ def build (bld): ' -o ' + blddir + '/data/logo-shade.png ' + \ srcdir + '/data/logo-shade.svg' if not Utils.exec_command (command): - bld.install_files ('${DATADIR}/' + APPNAME + '/res', blddir + '/data/logo-shade.png') + bld.install_files ('${MDATADIR}/' + APPNAME + '/res', blddir + '/data/logo-shade.png') else: Utils.pprint ('BLUE', "logo-shade could not be rasterized.") - bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/error.html') - bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/speeddial-head.html') - bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/speeddial.json') - bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/mootools.js') + bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/error.html') + bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/speeddial-head.html') + bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/speeddial.json') + bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/mootools.js') if Options.commands['check']: bld.add_subdirs ('tests') def shutdown (): if Options.commands['install'] or Options.commands['uninstall']: - dir = Build.bld.get_install_path ('${DATADIR}/icons/hicolor') + dir = Build.bld.get_install_path ('${MDATADIR}/icons/hicolor') icon_cache_updated = False if not Options.options.destdir: # update the pixmap cache directory @@ -394,9 +501,11 @@ def shutdown (): Utils.pprint ('RED', "Make sure intltool is installed.") os.chdir ('..') elif Options.options.run: - folder = os.path.dirname (Build.bld.env['waf_config_files'][0]) + folder = os.path.abspath (blddir + '/default') try: - relfolder = os.path.relpath (folder) + relfolder = folder + if not is_mingw (Build.bld.env): + relfolder = os.path.relpath (folder) except: pass try: @@ -417,8 +526,14 @@ def shutdown (): 'LC_MESSAGES' + os.sep + APPNAME + '.mo') except: pass - command = relfolder + os.sep + APPNAME + os.sep + APPNAME - print ext + ' ' + nls + ' ' + command - Utils.exec_command (ext + ' ' + nls + ' ' + command) - except: - Utils.pprint ('RED', "Failed to run application.") + command = ext + ' ' + nls + ' ' + if is_mingw (Build.bld.env): + # This works only if everything is installed to that prefix + os.chdir (Build.bld.env['PREFIX'] + os.sep + 'bin') + command += ' wine cmd /k "PATH=%PATH%;' + Build.bld.env['PREFIX'] + os.sep + 'bin' + ' && ' + APPNAME + '.exe"' + else: + command += ' ' + relfolder + os.sep + APPNAME + os.sep + APPNAME + print command + Utils.exec_command (command) + except Exception, msg: + Utils.pprint ('RED', "Failed to run application: " + str (msg))